summaryrefslogtreecommitdiffstats
path: root/arch/x86/include
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2011-07-21 13:34:05 -0700
committerH. Peter Anvin <hpa@zytor.com>2011-07-21 13:34:05 -0700
commitae7bd11b471931752e5609094ca0a49386590524 (patch)
tree4c5ac21a847c6eb25259c63e11b2d8dc9f4defac /arch/x86/include
parent8c400f6ce068366bc3517f1036bb99169cfec9cd (diff)
downloadlinux-ae7bd11b471931752e5609094ca0a49386590524.tar.gz
linux-ae7bd11b471931752e5609094ca0a49386590524.tar.bz2
linux-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 'arch/x86/include')
-rw-r--r--arch/x86/include/asm/clocksource.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/include/asm/clocksource.h b/arch/x86/include/asm/clocksource.h
index 3882c65dc19b..0bdbbb3b9ce7 100644
--- a/arch/x86/include/asm/clocksource.h
+++ b/arch/x86/include/asm/clocksource.h
@@ -5,8 +5,6 @@
#ifdef CONFIG_X86_64
-#define __ARCH_HAS_CLOCKSOURCE_DATA
-
#define VCLOCK_NONE 0 /* No vDSO clock available. */
#define VCLOCK_TSC 1 /* vDSO should use vread_tsc. */
#define VCLOCK_HPET 2 /* vDSO should use vread_hpet. */