aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2012-05-05 11:05:48 -0400
committerThomas Gleixner <tglx@linutronix.de>2012-05-08 08:08:46 -0400
commitf5e10287367dcffb5504d19c83e85ca041ca2596 (patch)
treecaa6684a16ed32809b328f858711758dc7b0c9bb /kernel
parent66bb4cda55477efeb1be5c2cbd3785a69b088a8a (diff)
task_allocator: Use config switches instead of magic defines
Replace __HAVE_ARCH_TASK_ALLOCATOR and __HAVE_ARCH_THREAD_ALLOCATOR with proper config switches. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Sam Ravnborg <sam@ravnborg.org> Cc: Tony Luck <tony.luck@intel.com> Link: http://lkml.kernel.org/r/20120505150142.371309416@linutronix.de
Diffstat (limited to 'kernel')
-rw-r--r--kernel/fork.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/kernel/fork.c b/kernel/fork.c
index 7590bd6e8dff..a1793e442b20 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -111,7 +111,7 @@ int nr_processes(void)
111 return total; 111 return total;
112} 112}
113 113
114#ifndef __HAVE_ARCH_TASK_STRUCT_ALLOCATOR 114#ifndef CONFIG_ARCH_TASK_STRUCT_ALLOCATOR
115static struct kmem_cache *task_struct_cachep; 115static struct kmem_cache *task_struct_cachep;
116 116
117static inline struct task_struct *alloc_task_struct_node(int node) 117static inline struct task_struct *alloc_task_struct_node(int node)
@@ -128,8 +128,7 @@ static inline void free_task_struct(struct task_struct *tsk)
128} 128}
129#endif 129#endif
130 130
131#ifndef __HAVE_ARCH_THREAD_INFO_ALLOCATOR 131#ifndef CONFIG_ARCH_THREAD_INFO_ALLOCATOR
132
133void __weak arch_release_thread_info(struct thread_info *ti) { } 132void __weak arch_release_thread_info(struct thread_info *ti) { }
134 133
135/* 134/*
@@ -243,7 +242,7 @@ void __init __weak arch_task_cache_init(void) { }
243 242
244void __init fork_init(unsigned long mempages) 243void __init fork_init(unsigned long mempages)
245{ 244{
246#ifndef __HAVE_ARCH_TASK_STRUCT_ALLOCATOR 245#ifndef CONFIG_ARCH_TASK_STRUCT_ALLOCATOR
247#ifndef ARCH_MIN_TASKALIGN 246#ifndef ARCH_MIN_TASKALIGN
248#define ARCH_MIN_TASKALIGN L1_CACHE_BYTES 247#define ARCH_MIN_TASKALIGN L1_CACHE_BYTES
249#endif 248#endif