diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/relay.c | 3 | ||||
-rw-r--r-- | kernel/timer.c | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kernel/relay.c b/kernel/relay.c index ef8a935710a2..577f251c7e28 100644 --- a/kernel/relay.c +++ b/kernel/relay.c | |||
@@ -474,13 +474,12 @@ static void setup_callbacks(struct rchan *chan, | |||
474 | } | 474 | } |
475 | 475 | ||
476 | /** | 476 | /** |
477 | * | ||
478 | * relay_hotcpu_callback - CPU hotplug callback | 477 | * relay_hotcpu_callback - CPU hotplug callback |
479 | * @nb: notifier block | 478 | * @nb: notifier block |
480 | * @action: hotplug action to take | 479 | * @action: hotplug action to take |
481 | * @hcpu: CPU number | 480 | * @hcpu: CPU number |
482 | * | 481 | * |
483 | * Returns the success/failure of the operation. (NOTIFY_OK, NOTIFY_BAD) | 482 | * Returns the success/failure of the operation. (%NOTIFY_OK, %NOTIFY_BAD) |
484 | */ | 483 | */ |
485 | static int __cpuinit relay_hotcpu_callback(struct notifier_block *nb, | 484 | static int __cpuinit relay_hotcpu_callback(struct notifier_block *nb, |
486 | unsigned long action, | 485 | unsigned long action, |
diff --git a/kernel/timer.c b/kernel/timer.c index d033313bf53c..6663a87f7304 100644 --- a/kernel/timer.c +++ b/kernel/timer.c | |||
@@ -711,6 +711,7 @@ static unsigned long cmp_next_hrtimer_event(unsigned long now, | |||
711 | 711 | ||
712 | /** | 712 | /** |
713 | * next_timer_interrupt - return the jiffy of the next pending timer | 713 | * next_timer_interrupt - return the jiffy of the next pending timer |
714 | * @now: current time (in jiffies) | ||
714 | */ | 715 | */ |
715 | unsigned long get_next_timer_interrupt(unsigned long now) | 716 | unsigned long get_next_timer_interrupt(unsigned long now) |
716 | { | 717 | { |