diff options
author | Andrew Morton <akpm@linux-foundation.org> | 2008-02-06 04:36:42 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-06 13:41:02 -0500 |
commit | 941e492bdb1239d2ca8f5736cdfd3ff83d00cb90 (patch) | |
tree | 6c048ee92ec94cbced1881308e14c2541321f077 /init | |
parent | 83bad1d764b836a482b88e0a1f44d7a5c3e1fee0 (diff) |
read_current_timer() cleanups
- All implementations can be __devinit
- The function prototypes were in asm/timex.h but they all must be the same,
so create a single declaration in linux/timex.h.
- uninline the sparc64 version to match the other architectures
- Don't bother #defining ARCH_HAS_READ_CURRENT_TIMER to a particular value.
[ezk@cs.sunysb.edu: fix build]
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Haavard Skinnemoen <hskinnemoen@atmel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'init')
-rw-r--r-- | init/calibrate.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/init/calibrate.c b/init/calibrate.c index 2d3d73bd4ce1..1d87891b6fcd 100644 --- a/init/calibrate.c +++ b/init/calibrate.c | |||
@@ -7,8 +7,7 @@ | |||
7 | #include <linux/jiffies.h> | 7 | #include <linux/jiffies.h> |
8 | #include <linux/delay.h> | 8 | #include <linux/delay.h> |
9 | #include <linux/init.h> | 9 | #include <linux/init.h> |
10 | 10 | #include <linux/timex.h> | |
11 | #include <asm/timex.h> | ||
12 | 11 | ||
13 | unsigned long preset_lpj; | 12 | unsigned long preset_lpj; |
14 | static int __init lpj_setup(char *str) | 13 | static int __init lpj_setup(char *str) |