diff options
| author | Borislav Petkov <bp@suse.de> | 2014-07-11 12:43:38 +0200 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2014-07-12 02:28:51 +0200 |
| commit | b08ee5f7e4135d64b8edd769367f8964a725122e (patch) | |
| tree | c23c93542548c4ef5da24ed60d3c5dc038b3b607 /arch/x86/include/asm/mc146818rtc.h | |
| parent | x86/tsc: Get rid of custom DIV_ROUND() macro (diff) | |
| download | linux-b08ee5f7e4135d64b8edd769367f8964a725122e.tar.xz linux-b08ee5f7e4135d64b8edd769367f8964a725122e.zip | |
x86: Simplify __HAVE_ARCH_CMPXCHG tests
Both the 32-bit and 64-bit cmpxchg.h header define __HAVE_ARCH_CMPXCHG
and there's ifdeffery which checks it. But since both bitness define it,
we can just as well move it up to the main cmpxchg header and simpify a
bit of code in doing that.
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: http://lkml.kernel.org/r/20140711104338.GB17083@pd.tnic
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/include/asm/mc146818rtc.h')
| -rw-r--r-- | arch/x86/include/asm/mc146818rtc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/mc146818rtc.h b/arch/x86/include/asm/mc146818rtc.h index a55c7efcc4ed..0f555cc31984 100644 --- a/arch/x86/include/asm/mc146818rtc.h +++ b/arch/x86/include/asm/mc146818rtc.h @@ -13,7 +13,7 @@ #define RTC_ALWAYS_BCD 1 /* RTC operates in binary mode */ #endif -#if defined(CONFIG_X86_32) && defined(__HAVE_ARCH_CMPXCHG) +#if defined(CONFIG_X86_32) /* * This lock provides nmi access to the CMOS/RTC registers. It has some * special properties. It is owned by a CPU and stores the index register |