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/sh/include/asm | |
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/sh/include/asm')
-rw-r--r-- | arch/sh/include/asm/processor.h | 5 | ||||
-rw-r--r-- | arch/sh/include/asm/thread_info.h | 11 |
2 files changed, 1 insertions, 15 deletions
diff --git a/arch/sh/include/asm/processor.h b/arch/sh/include/asm/processor.h index a229c393826a..6dbc1be28a0f 100644 --- a/arch/sh/include/asm/processor.h +++ b/arch/sh/include/asm/processor.h | |||
@@ -85,10 +85,6 @@ struct sh_cpuinfo { | |||
85 | struct tlb_info itlb; | 85 | struct tlb_info itlb; |
86 | struct tlb_info dtlb; | 86 | struct tlb_info dtlb; |
87 | 87 | ||
88 | #ifdef CONFIG_SMP | ||
89 | struct task_struct *idle; | ||
90 | #endif | ||
91 | |||
92 | unsigned int phys_bits; | 88 | unsigned int phys_bits; |
93 | unsigned long flags; | 89 | unsigned long flags; |
94 | } __attribute__ ((aligned(L1_CACHE_BYTES))); | 90 | } __attribute__ ((aligned(L1_CACHE_BYTES))); |
@@ -102,7 +98,6 @@ extern struct sh_cpuinfo cpu_data[]; | |||
102 | #define cpu_relax() barrier() | 98 | #define cpu_relax() barrier() |
103 | 99 | ||
104 | void default_idle(void); | 100 | void default_idle(void); |
105 | void cpu_idle_wait(void); | ||
106 | void stop_this_cpu(void *); | 101 | void stop_this_cpu(void *); |
107 | 102 | ||
108 | /* Forward decl */ | 103 | /* Forward decl */ |
diff --git a/arch/sh/include/asm/thread_info.h b/arch/sh/include/asm/thread_info.h index 20ee40af16e9..b6902061d4dc 100644 --- a/arch/sh/include/asm/thread_info.h +++ b/arch/sh/include/asm/thread_info.h | |||
@@ -88,22 +88,13 @@ static inline struct thread_info *current_thread_info(void) | |||
88 | return ti; | 88 | return ti; |
89 | } | 89 | } |
90 | 90 | ||
91 | /* thread information allocation */ | ||
92 | #if THREAD_SHIFT >= PAGE_SHIFT | ||
93 | |||
94 | #define THREAD_SIZE_ORDER (THREAD_SHIFT - PAGE_SHIFT) | 91 | #define THREAD_SIZE_ORDER (THREAD_SHIFT - PAGE_SHIFT) |
95 | 92 | ||
96 | #endif | ||
97 | |||
98 | extern struct thread_info *alloc_thread_info_node(struct task_struct *tsk, int node); | ||
99 | extern void free_thread_info(struct thread_info *ti); | ||
100 | extern void arch_task_cache_init(void); | 93 | extern void arch_task_cache_init(void); |
101 | #define arch_task_cache_init arch_task_cache_init | ||
102 | extern int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src); | 94 | extern int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src); |
95 | extern void arch_release_task_struct(struct task_struct *tsk); | ||
103 | extern void init_thread_xstate(void); | 96 | extern void init_thread_xstate(void); |
104 | 97 | ||
105 | #define __HAVE_ARCH_THREAD_INFO_ALLOCATOR | ||
106 | |||
107 | #endif /* __ASSEMBLY__ */ | 98 | #endif /* __ASSEMBLY__ */ |
108 | 99 | ||
109 | /* | 100 | /* |