Patchwork [git] libata warning fix

login
register
mail settings
Submitter Jeff Garzik
Date Dec. 27, 2010, 12:48 a.m.
Message ID <20101227004804.GA14200@havoc.gtf.org>
Download mbox | patch
Permalink /patch/76728/
State Not Applicable
Delegated to: David Miller
Headers show

Comments

Jeff Garzik - Dec. 27, 2010, 12:48 a.m.
Please pull from 'upstream-linus' branch of
master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream-linus

to receive the following updates:

 drivers/ata/pata_cs5536.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

Jeff Garzik (1):
      pata_cs5536: avoid implicit MSR API inclusion on x86-64

--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/ata/pata_cs5536.c b/drivers/ata/pata_cs5536.c
index a6e6c96..628c8fa 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