diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-21 22:43:57 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-21 22:43:57 -0400 |
commit | bf67f3a5c456a18f2e8d062f7e88506ef2cd9837 (patch) | |
tree | 2a2324b2572162059307db82f9238eeb25673a77 /arch/sparc/include/asm/leon.h | |
parent | 226da0dbc84ed97f448523e2a4cb91c27fa68ed9 (diff) | |
parent | 203dacbdca977bedaba61ad2fca75d934060a5d5 (diff) |
Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull smp hotplug cleanups from Thomas Gleixner:
"This series is merily a cleanup of code copied around in arch/* and
not changing any of the real cpu hotplug horrors yet. I wish I'd had
something more substantial for 3.5, but I underestimated the lurking
horror..."
Fix up trivial conflicts in arch/{arm,sparc,x86}/Kconfig and
arch/sparc/include/asm/thread_info_32.h
* 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (79 commits)
um: Remove leftover declaration of alloc_task_struct_node()
task_allocator: Use config switches instead of magic defines
sparc: Use common threadinfo allocator
score: Use common threadinfo allocator
sh-use-common-threadinfo-allocator
mn10300: Use common threadinfo allocator
powerpc: Use common threadinfo allocator
mips: Use common threadinfo allocator
hexagon: Use common threadinfo allocator
m32r: Use common threadinfo allocator
frv: Use common threadinfo allocator
cris: Use common threadinfo allocator
x86: Use common threadinfo allocator
c6x: Use common threadinfo allocator
fork: Provide kmemcache based thread_info allocator
tile: Use common threadinfo allocator
fork: Provide weak arch_release_[task_struct|thread_info] functions
fork: Move thread info gfp flags to header
fork: Remove the weak insanity
sh: Remove cpu_idle_wait()
...
Diffstat (limited to 'arch/sparc/include/asm/leon.h')
-rw-r--r-- | arch/sparc/include/asm/leon.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/sparc/include/asm/leon.h b/arch/sparc/include/asm/leon.h index 24f802beffb9..07659124c140 100644 --- a/arch/sparc/include/asm/leon.h +++ b/arch/sparc/include/asm/leon.h | |||
@@ -270,6 +270,7 @@ struct leon2_cacheregs { | |||
270 | #include <linux/interrupt.h> | 270 | #include <linux/interrupt.h> |
271 | 271 | ||
272 | struct device_node; | 272 | struct device_node; |
273 | struct task_struct; | ||
273 | extern unsigned int leon_build_device_irq(unsigned int real_irq, | 274 | extern unsigned int leon_build_device_irq(unsigned int real_irq, |
274 | irq_flow_handler_t flow_handler, | 275 | irq_flow_handler_t flow_handler, |
275 | const char *name, int do_ack); | 276 | const char *name, int do_ack); |
@@ -289,7 +290,7 @@ extern int leon_smp_nrcpus(void); | |||
289 | extern void leon_clear_profile_irq(int cpu); | 290 | extern void leon_clear_profile_irq(int cpu); |
290 | extern void leon_smp_done(void); | 291 | extern void leon_smp_done(void); |
291 | extern void leon_boot_cpus(void); | 292 | extern void leon_boot_cpus(void); |
292 | extern int leon_boot_one_cpu(int i); | 293 | extern int leon_boot_one_cpu(int i, struct task_struct *); |
293 | void leon_init_smp(void); | 294 | void leon_init_smp(void); |
294 | extern void cpu_idle(void); | 295 | extern void cpu_idle(void); |
295 | extern void init_IRQ(void); | 296 | extern void init_IRQ(void); |
@@ -325,7 +326,7 @@ extern int leon_ipi_irq; | |||
325 | #define init_leon() do {} while (0) | 326 | #define init_leon() do {} while (0) |
326 | #define leon_smp_done() do {} while (0) | 327 | #define leon_smp_done() do {} while (0) |
327 | #define leon_boot_cpus() do {} while (0) | 328 | #define leon_boot_cpus() do {} while (0) |
328 | #define leon_boot_one_cpu(i) 1 | 329 | #define leon_boot_one_cpu(i, t) 1 |
329 | #define leon_init_smp() do {} while (0) | 330 | #define leon_init_smp() do {} while (0) |
330 | 331 | ||
331 | #endif /* !defined(CONFIG_SPARC_LEON) */ | 332 | #endif /* !defined(CONFIG_SPARC_LEON) */ |