diff --git a/[refs] b/[refs] index e447dcf9214a..45f2efcd3dbc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e3a4fab0c0c30e21e104712f4e9cb39f175d0f21 +refs/heads/master: 529eaccd900a59724619b4a6ef6579fd518d5218 diff --git a/trunk/kernel/time/tick-sched.c b/trunk/kernel/time/tick-sched.c index 3840f6dff7eb..c65ba0faa98f 100644 --- a/trunk/kernel/time/tick-sched.c +++ b/trunk/kernel/time/tick-sched.c @@ -250,7 +250,7 @@ void tick_nohz_stop_sched_tick(int inidle) if (ratelimit < 10) { printk(KERN_ERR "NOHZ: local_softirq_pending %02x\n", - local_softirq_pending()); + (unsigned int) local_softirq_pending()); ratelimit++; } goto end;