diff options
author | Matt Turner <mattst88@gmail.com> | 2017-08-24 08:59:36 -0700 |
---|---|---|
committer | Matt Turner <mattst88@gmail.com> | 2017-08-29 12:01:55 -0700 |
commit | 69f0678239b9f45652e1914efa20a397b3acac7a (patch) | |
tree | fbed24f52c038bf71dceff5bb1bf058b3297bf3f | |
parent | 4f61e0781b701f5eb4f0e186d361c4104659001e (diff) | |
download | linux-stable-69f0678239b9f45652e1914efa20a397b3acac7a.tar.gz linux-stable-69f0678239b9f45652e1914efa20a397b3acac7a.tar.bz2 linux-stable-69f0678239b9f45652e1914efa20a397b3acac7a.zip |
alpha: Fix section mismatches
Signed-off-by: Matt Turner <mattst88@gmail.com>
-rw-r--r-- | arch/alpha/kernel/core_marvel.c | 4 | ||||
-rw-r--r-- | arch/alpha/kernel/smp.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/alpha/kernel/core_marvel.c b/arch/alpha/kernel/core_marvel.c index db72356714c1..03ff832b1cb4 100644 --- a/arch/alpha/kernel/core_marvel.c +++ b/arch/alpha/kernel/core_marvel.c @@ -351,7 +351,7 @@ marvel_init_io7(struct io7 *io7) } } -void +void __init marvel_io7_present(gct6_node *node) { int pe; @@ -406,7 +406,7 @@ marvel_find_console_vga_hose(void) #endif } -gct6_search_struct gct_wanted_node_list[] = { +gct6_search_struct gct_wanted_node_list[] __initdata = { { GCT_TYPE_HOSE, GCT_SUBTYPE_IO_PORT_MODULE, marvel_io7_present }, { 0, 0, NULL } }; diff --git a/arch/alpha/kernel/smp.c b/arch/alpha/kernel/smp.c index 9fc560459ebd..f6726a746427 100644 --- a/arch/alpha/kernel/smp.c +++ b/arch/alpha/kernel/smp.c @@ -115,7 +115,7 @@ wait_boot_cpu_to_stop(int cpuid) /* * Where secondaries begin a life of C. */ -void +void __init smp_callin(void) { int cpuid = hard_smp_processor_id(); |