hc
2024-10-12 a5969cabbb4660eab42b6ef0412cbbd1200cf14d
kernel/arch/sh/kernel/machvec.c
....@@ -1,3 +1,4 @@
1
+// SPDX-License-Identifier: GPL-2.0
12 /*
23 * arch/sh/kernel/machvec.c
34 *
....@@ -5,10 +6,6 @@
56 *
67 * Copyright (C) 1999 Niibe Yutaka
78 * Copyright (C) 2002 - 2007 Paul Mundt
8
- *
9
- * This file is subject to the terms and conditions of the GNU General Public
10
- * License. See the file "COPYING" in the main directory of this archive
11
- * for more details.
129 */
1310 #include <linux/init.h>
1411 #include <linux/string.h>
....@@ -18,12 +15,13 @@
1815 #include <asm/setup.h>
1916 #include <asm/io.h>
2017 #include <asm/irq.h>
18
+#include <asm/processor.h>
2119
2220 #define MV_NAME_SIZE 32
2321
2422 #define for_each_mv(mv) \
25
- for ((mv) = (struct sh_machine_vector *)&__machvec_start; \
26
- (mv) && (unsigned long)(mv) < (unsigned long)&__machvec_end; \
23
+ for ((mv) = (struct sh_machine_vector *)__machvec_start; \
24
+ (mv) && (unsigned long)(mv) < (unsigned long)__machvec_end; \
2725 (mv)++)
2826
2927 static struct sh_machine_vector * __init get_mv_byname(const char *name)
....@@ -67,10 +65,10 @@
6765
6866 mvp = get_mv_byname(mv_name);
6967 if (unlikely(!mvp)) {
70
- printk("Available vectors:\n\n\t'%s', ", sh_mv.mv_name);
68
+ pr_info("Available vectors:\n\n\t'%s', ", sh_mv.mv_name);
7169 for_each_mv(mvp)
72
- printk("'%s', ", mvp->mv_name);
73
- printk("\n\n");
70
+ pr_cont("'%s', ", mvp->mv_name);
71
+ pr_cont("\n\n");
7472 panic("Failed to select machvec '%s' -- halting.\n",
7573 mv_name);
7674 } else
....@@ -89,8 +87,8 @@
8987 if (!machvec_selected) {
9088 unsigned long machvec_size;
9189
92
- machvec_size = ((unsigned long)&__machvec_end -
93
- (unsigned long)&__machvec_start);
90
+ machvec_size = ((unsigned long)__machvec_end -
91
+ (unsigned long)__machvec_start);
9492
9593 /*
9694 * Sanity check for machvec section alignment. Ensure
....@@ -104,10 +102,10 @@
104102 * vector (usually the only one) from .machvec.init.
105103 */
106104 if (machvec_size >= sizeof(struct sh_machine_vector))
107
- sh_mv = *(struct sh_machine_vector *)&__machvec_start;
105
+ sh_mv = *(struct sh_machine_vector *)__machvec_start;
108106 }
109107
110
- printk(KERN_NOTICE "Booting machvec: %s\n", get_system_type());
108
+ pr_notice("Booting machvec: %s\n", get_system_type());
111109
112110 /*
113111 * Manually walk the vec, fill in anything that the board hasn't yet