Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 79689
b: refs/heads/master
c: b10db7f
h: refs/heads/master
i:
  79687: b6ef689
v: v3
  • Loading branch information
Pavel Machek authored and Ingo Molnar committed Jan 30, 2008
1 parent f37625e commit 2249771
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4c9dc6412247abf4972080c51cd16a58c4009c19
refs/heads/master: b10db7f0d2b589a7f88dc3026e150756cb437a28
3 changes: 2 additions & 1 deletion trunk/arch/x86/kernel/hpet.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
#define HPET_MASK CLOCKSOURCE_MASK(32)
#define HPET_SHIFT 22

/* FSEC = 10^-15 NSEC = 10^-9 */
/* FSEC = 10^-15
NSEC = 10^-9 */
#define FSEC_PER_NSEC 1000000

/*
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/x86/kernel/process_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ static inline void play_dead(void)
* low exit latency (ie sit in a loop waiting for
* somebody to say that they'd like to reschedule)
*/
void cpu_idle (void)
void cpu_idle(void)
{
current_thread_info()->status |= TS_POLLING;
/* endless idle loop with no priority at all */
Expand Down
4 changes: 3 additions & 1 deletion trunk/kernel/softirq.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
*
* Copyright (C) 1992 Linus Torvalds
*
* Rewritten. Old one was good in 2.2, but in 2.3 it was immoral. --ANK (990903)
* Distribute under GPLv2.
*
* Rewritten. Old one was good in 2.2, but in 2.3 it was immoral. --ANK (990903)
*/

#include <linux/module.h>
Expand Down
2 changes: 1 addition & 1 deletion trunk/kernel/time/tick-sched.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*
* Started by: Thomas Gleixner and Ingo Molnar
*
* For licencing details see kernel-base/COPYING
* Distribute under GPLv2.
*/
#include <linux/cpu.h>
#include <linux/err.h>
Expand Down
2 changes: 1 addition & 1 deletion trunk/kernel/time/timer_stats.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
* the pid and cmdline from the owner process if applicable.
*
* Start/stop data collection:
* # echo 1[0] >/proc/timer_stats
* # echo [1|0] >/proc/timer_stats
*
* Display the information collected so far:
* # cat /proc/timer_stats
Expand Down

0 comments on commit 2249771

Please sign in to comment.