Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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
9272dcc232b84ccb027d6861077934055d42764d 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: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

authored by

Jeff Garzik and committed by
Jeff Garzik
ff5dd32b d7c1255a

+2
+2
drivers/ata/pata_cs5536.c
··· 44 44 module_param_named(msr, use_msr, int, 0644); 45 45 MODULE_PARM_DESC(msr, "Force using MSR to configure IDE function (Default: 0)"); 46 46 #else 47 + #undef rdmsr /* avoid accidental MSR usage on, e.g. x86-64 */ 48 + #undef wrmsr 47 49 #define rdmsr(x, y, z) do { } while (0) 48 50 #define wrmsr(x, y, z) do { } while (0) 49 51 #define use_msr 0