Commit 4e838c7e authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'upstream-linus' of git://

* 'upstream-linus' of git://
  pata_cs5536: avoid implicit MSR API inclusion on x86-64
parents bbbcde9d ff5dd32b
......@@ -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)");
#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
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment