From: Bob Breuer <breuerr@mc.net>
To: sparclinux@vger.kernel.org
Subject: [PATCH 4/4] sparc32: mark smp init functions as cpuinit
Date: Sun, 11 Jun 2006 06:20:39 +0000 [thread overview]
Message-ID: <448BB637.7010301@mc.net> (raw)
[-- Attachment #1: Type: text/plain, Size: 141 bytes --]
Fix the smp related section mismatch warnings by marking the smp init
functions as cpuinit.
Signed-off-by: Bob Breuer <breuerr@mc.net>
---
[-- Attachment #2: sparc32-smp-cpuinit.patch.txt --]
[-- Type: text/plain, Size: 1850 bytes --]
--- linux-2.6.17-rc3/arch/sparc/kernel/smp.c.old 2006-04-22 21:55:33.000000000 -0500
+++ linux-2.6.17-rc3/arch/sparc/kernel/smp.c 2006-04-23 11:10:12.000000000 -0500
@@ -58,7 +58,7 @@ cpumask_t smp_commenced_mask = CPU_MASK_
/* Used to make bitops atomic */
unsigned char bitops_spinlock = 0;
-void __init smp_store_cpu_info(int id)
+void __cpuinit smp_store_cpu_info(int id)
{
int cpu_node;
@@ -293,7 +293,7 @@ void __init smp_setup_cpu_possible_map(v
}
}
-void __devinit smp_prepare_boot_cpu(void)
+void __init smp_prepare_boot_cpu(void)
{
int cpuid = hard_smp_processor_id();
@@ -309,7 +309,7 @@ void __devinit smp_prepare_boot_cpu(void
cpu_set(cpuid, phys_cpu_present_map);
}
-int __devinit __cpu_up(unsigned int cpu)
+int __cpuinit __cpu_up(unsigned int cpu)
{
extern int smp4m_boot_one_cpu(int);
int ret;
--- linux-2.6.17-rc3/arch/sparc/kernel/sun4m_smp.c.old 2006-04-22 18:21:37.000000000 -0500
+++ linux-2.6.17-rc3/arch/sparc/kernel/sun4m_smp.c 2006-04-23 11:14:25.000000000 -0500
@@ -66,7 +66,7 @@ static inline unsigned long swap(volatil
static void smp_setup_percpu_timer(void);
extern void cpu_probe(void);
-void __init smp4m_callin(void)
+void __cpuinit smp4m_callin(void)
{
int cpuid = hard_smp_processor_id();
@@ -112,13 +112,8 @@ void __init smp4m_callin(void)
local_irq_enable();
cpu_set(cpuid, cpu_online_map);
- /* last one in gets all the interrupts (for testing) */
- set_irq_udt(boot_cpu_id);
}
-extern void init_IRQ(void);
-extern void cpu_panic(void);
-
/*
* Cycle through the processors asking the PROM to start each one.
*/
@@ -134,7 +129,7 @@ void __init smp4m_boot_cpus(void)
local_flush_cache_all();
}
-int smp4m_boot_one_cpu(int i)
+int __cpuinit smp4m_boot_one_cpu(int i)
{
extern unsigned long sun4m_cpu_startup;
unsigned long *entry = &sun4m_cpu_startup;
next reply other threads:[~2006-06-11 6:20 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-06-11 6:20 Bob Breuer [this message]
2006-06-20 7:36 ` [PATCH 4/4] sparc32: mark smp init functions as cpuinit David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=448BB637.7010301@mc.net \
--to=breuerr@mc.net \
--cc=sparclinux@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.