aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Zijlstra <peterz@infradead.org>2009-01-16 08:46:40 -0500
committerIngo Molnar <mingo@elte.hu>2009-01-16 09:01:31 -0500
commitceacc2c1c85ac498ca4cf297bdfe5b4aaa9fd0e0 (patch)
tree4bac6a3e5544d90da1ee9437845120204d4bb382
parent398a153b16b09a68739928d4502455db9725ac86 (diff)
sched: make plist a library facility
Ingo Molnar wrote: > here's a new build failure with tip/sched/rt: > > LD .tmp_vmlinux1 > kernel/built-in.o: In function `set_curr_task_rt': > sched.c:(.text+0x3675): undefined reference to `plist_del' > kernel/built-in.o: In function `pick_next_task_rt': > sched.c:(.text+0x37ce): undefined reference to `plist_del' > kernel/built-in.o: In function `enqueue_pushable_task': > sched.c:(.text+0x381c): undefined reference to `plist_del' Eliminate the plist library kconfig and make it available unconditionally. Signed-off-by: Peter Zijlstra <peterz@infradead.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--init/Kconfig1
-rw-r--r--kernel/sched_rt.c21
-rw-r--r--lib/Kconfig6
-rw-r--r--lib/Makefile4
4 files changed, 17 insertions, 15 deletions
diff --git a/init/Kconfig b/init/Kconfig
index a724a149bf3f..19b78aa010e3 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -874,7 +874,6 @@ config SLABINFO
874 874
875config RT_MUTEXES 875config RT_MUTEXES
876 boolean 876 boolean
877 select PLIST
878 877
879config BASE_SMALL 878config BASE_SMALL
880 int 879 int
diff --git a/kernel/sched_rt.c b/kernel/sched_rt.c
index 4230b15fe90e..48d1f6e8497a 100644
--- a/kernel/sched_rt.c
+++ b/kernel/sched_rt.c
@@ -114,14 +114,23 @@ static void dequeue_pushable_task(struct rq *rq, struct task_struct *p)
114 114
115#else 115#else
116 116
117static inline void enqueue_pushable_task(struct rq *rq, struct task_struct *p)
118{
119}
120
121static inline void dequeue_pushable_task(struct rq *rq, struct task_struct *p)
122{
123}
124
117static inline 125static inline
118void enqueue_pushable_task(struct rq *rq, struct task_struct *p) {} 126void inc_rt_migration(struct sched_rt_entity *rt_se, struct rt_rq *rt_rq)
119static inline 127{
120void dequeue_pushable_task(struct rq *rq, struct task_struct *p) {} 128}
121static inline 129
122void inc_rt_migration(struct sched_rt_entity *rt_se, struct rt_rq *rt_rq) {}
123static inline 130static inline
124void dec_rt_migration(struct sched_rt_entity *rt_se, struct rt_rq *rt_rq) {} 131void dec_rt_migration(struct sched_rt_entity *rt_se, struct rt_rq *rt_rq)
132{
133}
125 134
126#endif /* CONFIG_SMP */ 135#endif /* CONFIG_SMP */
127 136
diff --git a/lib/Kconfig b/lib/Kconfig
index 03c2c24b9083..fc8ea1ca59d8 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -136,12 +136,6 @@ config TEXTSEARCH_BM
136config TEXTSEARCH_FSM 136config TEXTSEARCH_FSM
137 tristate 137 tristate
138 138
139#
140# plist support is select#ed if needed
141#
142config PLIST
143 boolean
144
145config HAS_IOMEM 139config HAS_IOMEM
146 boolean 140 boolean
147 depends on !NO_IOMEM 141 depends on !NO_IOMEM
diff --git a/lib/Makefile b/lib/Makefile
index 32b0e64ded27..902d73851044 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -11,7 +11,8 @@ lib-y := ctype.o string.o vsprintf.o cmdline.o \
11 rbtree.o radix-tree.o dump_stack.o \ 11 rbtree.o radix-tree.o dump_stack.o \
12 idr.o int_sqrt.o extable.o prio_tree.o \ 12 idr.o int_sqrt.o extable.o prio_tree.o \
13 sha1.o irq_regs.o reciprocal_div.o argv_split.o \ 13 sha1.o irq_regs.o reciprocal_div.o argv_split.o \
14 proportions.o prio_heap.o ratelimit.o show_mem.o is_single_threaded.o 14 proportions.o prio_heap.o ratelimit.o show_mem.o \
15 is_single_threaded.o plist.o
15 16
16lib-$(CONFIG_MMU) += ioremap.o 17lib-$(CONFIG_MMU) += ioremap.o
17lib-$(CONFIG_SMP) += cpumask.o 18lib-$(CONFIG_SMP) += cpumask.o
@@ -40,7 +41,6 @@ lib-$(CONFIG_GENERIC_FIND_NEXT_BIT) += find_next_bit.o
40lib-$(CONFIG_GENERIC_FIND_LAST_BIT) += find_last_bit.o 41lib-$(CONFIG_GENERIC_FIND_LAST_BIT) += find_last_bit.o
41obj-$(CONFIG_GENERIC_HWEIGHT) += hweight.o 42obj-$(CONFIG_GENERIC_HWEIGHT) += hweight.o
42obj-$(CONFIG_LOCK_KERNEL) += kernel_lock.o 43obj-$(CONFIG_LOCK_KERNEL) += kernel_lock.o
43obj-$(CONFIG_PLIST) += plist.o
44obj-$(CONFIG_DEBUG_PREEMPT) += smp_processor_id.o 44obj-$(CONFIG_DEBUG_PREEMPT) += smp_processor_id.o
45obj-$(CONFIG_DEBUG_LIST) += list_debug.o 45obj-$(CONFIG_DEBUG_LIST) += list_debug.o
46obj-$(CONFIG_DEBUG_OBJECTS) += debugobjects.o 46obj-$(CONFIG_DEBUG_OBJECTS) += debugobjects.o