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
This commit is contained in:
commit
4e838c7e6e
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue