summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-12-27 10:25:02 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-12-27 10:25:02 -0800
commit4e838c7e6ebaf7b2febaafe2cd598a44fdceb094 (patch)
tree396769da9be766ecbae82c2791bbbc733a5a444b /drivers
parentbbbcde9d9614683fbeb41f00728cfbfb7f75a7ad (diff)
parentff5dd32b997a5a5ce3f4256257991133d694da0b (diff)
downloadlinux-3.10-4e838c7e6ebaf7b2febaafe2cd598a44fdceb094.tar.gz
linux-3.10-4e838c7e6ebaf7b2febaafe2cd598a44fdceb094.tar.bz2
linux-3.10-4e838c7e6ebaf7b2febaafe2cd598a44fdceb094.zip
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: pata_cs5536: avoid implicit MSR API inclusion on x86-64
Diffstat (limited to 'drivers')
-rw-r--r--drivers/ata/pata_cs5536.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/ata/pata_cs5536.c b/drivers/ata/pata_cs5536.c
index a6e6c963b6a..628c8fae593 100644
--- a/drivers/ata/pata_cs5536.c
+++ b/drivers/ata/pata_cs5536.c
@@ -44,6 +44,8 @@ static int use_msr;
module_param_named(msr, use_msr, int, 0644);
MODULE_PARM_DESC(msr, "Force using MSR to configure IDE function (Default: 0)");
#else
+#undef rdmsr /* avoid accidental MSR usage on, e.g. x86-64 */
+#undef wrmsr
#define rdmsr(x, y, z) do { } while (0)
#define wrmsr(x, y, z) do { } while (0)
#define use_msr 0