diff --git a/[refs] b/[refs] index e43c079221af..65299d009f9c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7eee3e677d6e2e9007afcd7d79b0715525aa552e +refs/heads/master: 67ca7bde2e9d3516b5ae0188330ad1059ac03f38 diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index 7286ccb01082..f06950c8a6ce 100644 --- a/trunk/kernel/sched.c +++ b/trunk/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;