Commit ff5dd32b authored by Jeff Garzik's avatar Jeff Garzik Committed by Jeff Garzik

pata_cs5536: avoid implicit MSR API inclusion on x86-64

We don't need or want MSR usage here, on x86-64.
x86-64 was disabled intentionally in Kconfig, but commit
9272dcc2 changed that.

drivers/ata/pata_cs5536.c:47:1: warning: "rdmsr" redefined
In file included from arch/x86/include/asm/irqflags.h:60,
                 from include/linux/irqflags.h:15,
                 from arch/x86/include/asm/system.h:11,
                 from arch/x86/include/asm/processor.h:17,
                 from include/linux/prefetch.h:14,
                 from include/linux/list.h:7,
                 from include/linux/module.h:9,
                 from drivers/ata/pata_cs5536.c:33:
arch/x86/include/asm/paravirt.h:146:1: warning: this is the location of the previous definition
drivers/ata/pata_cs5536.c:48:1: warning: "wrmsr" redefined
arch/x86/include/asm/paravirt.h:154:1: warning: this is the location of the previous definition
Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent d7c1255a
...@@ -44,6 +44,8 @@ static int use_msr; ...@@ -44,6 +44,8 @@ static int use_msr;
module_param_named(msr, use_msr, int, 0644); module_param_named(msr, use_msr, int, 0644);
MODULE_PARM_DESC(msr, "Force using MSR to configure IDE function (Default: 0)"); MODULE_PARM_DESC(msr, "Force using MSR to configure IDE function (Default: 0)");
#else #else
#undef rdmsr /* avoid accidental MSR usage on, e.g. x86-64 */
#undef wrmsr
#define rdmsr(x, y, z) do { } while (0) #define rdmsr(x, y, z) do { } while (0)
#define wrmsr(x, y, z) do { } while (0) #define wrmsr(x, y, z) do { } while (0)
#define use_msr 0 #define use_msr 0
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment