2008-11-22 17:34:41

by Al Viro

Subject: [PATCH 5/32] sparc64 trivial section misannotations

Signed-off-by: Al Viro <[email protected]>
---
arch/sparc64/kernel/smp.c | 4 ++--
arch/sparc64/mm/init.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/sparc64/kernel/smp.c b/arch/sparc64/kernel/smp.c
--- a/arch/sparc64/kernel/smp.c
+++ b/arch/sparc64/kernel/smp.c
@@ -282,7 +282,7 @@ static unsigned long kimage_addr_to_ra(void *p)
return kern_base + (val - KERNBASE);
}

-static void ldom_startcpu_cpuid(unsigned int cpu, unsigned long thread_reg)
+static void __cpuinit ldom_startcpu_cpuid(unsigned int cpu, unsigned long thread_reg)
{
extern unsigned long sparc64_ttable_tl0;
extern unsigned long kern_locked_tte_data;
@@ -343,7 +343,7 @@ extern unsigned long sparc64_cpu_startup;
*/
static struct thread_info *cpu_new_thread = NULL;

-static int __devinit smp_boot_one_cpu(unsigned int cpu)
+static int __cpuinit smp_boot_one_cpu(unsigned int cpu)
{
struct trap_per_cpu *tb = &trap_block[cpu];
unsigned long entry =
diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c
--- a/arch/sparc64/mm/init.c
+++ b/arch/sparc64/mm/init.c
@@ -956,7 +956,7 @@ int of_node_to_nid(struct device_node *dp)
return nid;
}

-static void add_node_ranges(void)
+static void __init add_node_ranges(void)
{
int i;

2008-11-26 09:02:40

by David Miller

Subject: Re: [PATCH 5/32] sparc64 trivial section misannotations

From: Al Viro <[email protected]>
Date: Sat, 22 Nov 2008 17:34:04 +0000

> Signed-off-by: Al Viro <[email protected]>

Applied, thanks Al.