diff options
| author |   Thomas Gleixner <tglx@linutronix.de> | 2009-12-07 12:59:46 +0100 |
|---|---|---|
| committer |   Ingo Molnar <mingo@elte.hu> | 2009-12-07 13:16:37 +0100 |
| commit | a946d8f11f0da9cfc714248036fcfd3a794d1e27 (patch) | |
| tree | b6bdf7840edf56397e8bd719f29158ab62a0ce24 /arch/x86/kernel/apic/apic_noop.c | |
| parent | Merge branch 'linus' into x86/urgent (diff) | |
| download | linux-dev-a946d8f11f0da9cfc714248036fcfd3a794d1e27.tar.xz linux-dev-a946d8f11f0da9cfc714248036fcfd3a794d1e27.zip | |
x86: Fix bogus warning in apic_noop.apic_write()
apic_noop is used to provide dummy apic functions. It's installed
when the CPU has no APIC or when the APIC is disabled on the kernel
command line.
The apic_noop implementation of apic_write() warns when the CPU has
an APIC or when the APIC is not disabled.
That's bogus. The warning should only happen when the CPU has an
APIC _AND_ the APIC is not disabled. apic_noop.apic_read() has the
correct check.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Cyrill Gorcunov <gorcunov@openvz.org>
Cc: <stable@kernel.org> # in <= .32 this typo resides in native_apic_write_dummy()
LKML-Reference: <alpine.LFD.2.00.0912071255420.3089@localhost.localdomain>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/apic/apic_noop.c')
| -rw-r--r-- | arch/x86/kernel/apic/apic_noop.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/apic/apic_noop.c b/arch/x86/kernel/apic/apic_noop.c index d9acc3bee0f4..e31b9ffe25f5 100644 --- a/arch/x86/kernel/apic/apic_noop.c +++ b/arch/x86/kernel/apic/apic_noop.c @@ -127,7 +127,7 @@ static u32 noop_apic_read(u32 reg) static void noop_apic_write(u32 reg, u32 v) { - WARN_ON_ONCE((cpu_has_apic || !disable_apic)); + WARN_ON_ONCE(cpu_has_apic && !disable_apic); } struct apic apic_noop = { |