Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
---
kernel/time/tick-broadcast.c | 2 +-
kernel/time/tick-sched.c | 2 +-
kernel/timer.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c
index 8cfb8b2..aa82d7b 100644
--- a/kernel/time/tick-broadcast.c
+++ b/kernel/time/tick-broadcast.c
@@ -508,7 +508,7 @@ static void tick_broadcast_clear_oneshot(int cpu)
}
/**
- * tick_broadcast_setup_highres - setup the broadcast device for highres
+ * tick_broadcast_setup_oneshot - setup the broadcast device
*/
void tick_broadcast_setup_oneshot(struct clock_event_device *bc)
{
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c
index 10a1347..fa99734 100644
--- a/kernel/time/tick-sched.c
+++ b/kernel/time/tick-sched.c
@@ -323,7 +323,7 @@ ktime_t tick_nohz_get_sleep_length(void)
EXPORT_SYMBOL_GPL(tick_nohz_get_sleep_length);
/**
- * nohz_restart_sched_tick - restart the idle tick from the idle task
+ * tick_nohz_restart_sched_tick - restart the idle tick from the idle task
*
* Restart the idle tick when the CPU is woken up from idle
*/
diff --git a/kernel/timer.c b/kernel/timer.c
index fb4e67d..00e44e2 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -790,7 +790,7 @@ static unsigned long cmp_next_hrtimer_event(unsigned long now,
}
/**
- * next_timer_interrupt - return the jiffy of the next pending timer
+ * get_next_timer_interrupt - return the jiffy of the next pending timer
* @now: current time (in jiffies)
*/
unsigned long get_next_timer_interrupt(unsigned long now)
--
1.5.3.rc7
-
| Bart Van Assche | Integration of SCST in the mainstream Linux kernel |
| KAMEZAWA Hiroyuki | Re: 2.6.23-mm1 |
| Greg KH | Re: [PATCH] USB: Only enable autosuspend by default on certain device classes |
| Oliver Neukum | Re: Linux 2.6.21 |
git: | |
| Sander | 'struct task_struct' has no member named 'mems_allowed' (was: Re: 2.6.20-rc4-mm1) |
| Robert Olsson | Re: rib_trie / Fix inflate_threshold_root. Now=15 size=11 bits |
| David Miller | Re: [PATCH 3/3] Convert the UDP hash lock to RCU |
| Jarek Poplawski | [PATCH] pkt_sched: Destroy gen estimators under rtnl_lock(). |
| Gerrit Renker | [PATCH 0/37] dccp: Feature negotiation - last call for comments |
