diff options
author | H. Peter Anvin <hpa@zytor.com> | 2011-07-21 13:34:05 -0700 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2011-07-21 13:34:05 -0700 |
commit | ae7bd11b471931752e5609094ca0a49386590524 (patch) | |
tree | 4c5ac21a847c6eb25259c63e11b2d8dc9f4defac /include/linux/clocksource.h | |
parent | 8c400f6ce068366bc3517f1036bb99169cfec9cd (diff) | |
download | linux-stable-ae7bd11b471931752e5609094ca0a49386590524.tar.gz linux-stable-ae7bd11b471931752e5609094ca0a49386590524.tar.bz2 linux-stable-ae7bd11b471931752e5609094ca0a49386590524.zip |
clocksource: Change __ARCH_HAS_CLOCKSOURCE_DATA to a CONFIG option
The machinery for __ARCH_HAS_CLOCKSOURCE_DATA assumed a file in
asm-generic would be the default for architectures without their own
file in asm/, but that is not how it works.
Replace it with a Kconfig option instead.
Link: http://lkml.kernel.org/r/4E288AA6.7090804@zytor.com
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Cc: Andy Lutomirski <luto@mit.edu>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'include/linux/clocksource.h')
-rw-r--r-- | include/linux/clocksource.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h index 6bb69702c4fa..59ee970cf89e 100644 --- a/include/linux/clocksource.h +++ b/include/linux/clocksource.h @@ -22,7 +22,9 @@ typedef u64 cycle_t; struct clocksource; +#ifdef CONFIG_ARCH_CLOCKSOURCE_DATA #include <asm/clocksource.h> +#endif /** * struct cyclecounter - hardware abstraction for a free running counter @@ -171,7 +173,7 @@ struct clocksource { u32 shift; u64 max_idle_ns; -#ifdef __ARCH_HAS_CLOCKSOURCE_DATA +#ifdef CONFIG_ARCH_CLOCKSOURCE_DATA struct arch_clocksource_data archdata; #endif |