Disabling BFS breaks building. Keep wrong variable type from mainline to fix build. -ck --- include/linux/sched.h | 6 +++--- kernel/sched_bfs.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) Index: linux-3.1-ck2/include/linux/sched.h =================================================================== --- linux-3.1-ck2.orig/include/linux/sched.h 2011-11-11 16:20:14.000000000 +1100 +++ linux-3.1-ck2/include/linux/sched.h 2011-11-11 16:29:27.413748241 +1100 @@ -2679,16 +2679,16 @@ extern void signal_wake_up(struct task_s */ #ifdef CONFIG_SMP -static inline int task_cpu(const struct task_struct *p) +static inline unsigned int task_cpu(const struct task_struct *p) { return task_thread_info(p)->cpu; } -extern void set_task_cpu(struct task_struct *p, int cpu); +extern void set_task_cpu(struct task_struct *p, unsigned int cpu); #else -static inline int task_cpu(const struct task_struct *p) +static inline unsigned int task_cpu(const struct task_struct *p) { return 0; } Index: linux-3.1-ck2/kernel/sched_bfs.c =================================================================== --- linux-3.1-ck2.orig/kernel/sched_bfs.c 2011-11-11 13:28:46.000000000 +1100 +++ linux-3.1-ck2/kernel/sched_bfs.c 2011-11-11 16:32:20.790736124 +1100 @@ -1022,7 +1022,7 @@ static inline void deactivate_task(struc } #ifdef CONFIG_SMP -void set_task_cpu(struct task_struct *p, int cpu) +void set_task_cpu(struct task_struct *p, unsigned int cpu) { #ifdef CONFIG_LOCKDEP /*