Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6

[~andy/linux] / kernel / sched.c

diff --git a/kernel/sched.c b/kernel/sched.c
index 7286ccb01082e62b8b73c145d68d904a41338ad3..f06950c8a6ce17b95624bccc63ecfb399d2eb40c 100644 (file)
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -3889,7 +3889,7 @@ pick_next_task(struct rq *rq, struct task_struct *prev)
 asmlinkage void __sched schedule(void)
 {
        struct task_struct *prev, *next;
-       long *switch_count;
+       unsigned long *switch_count;
        struct rq *rq;
        int cpu;