diff options
| author | Len Brown <len.brown@intel.com> | 2009-09-19 04:11:26 (GMT) |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-09-19 04:11:26 (GMT) |
| commit | c602c65b2f81d14456771d1e3f15d1381f4b7efa (patch) | |
| tree | f1f833c8dd6c1519eeb101be32f7fe54a9605af5 /arch/x86/lib/msr-reg-export.c | |
| parent | 3834f47291df475be3f0f0fb7ccaa098967cc054 (diff) | |
| parent | 78f28b7c555359c67c2a0d23f7436e915329421e (diff) | |
| download | linux-fsl-qoriq-c602c65b2f81d14456771d1e3f15d1381f4b7efa.tar.xz | |
Merge branch 'linus' into sfi-release
Conflicts:
arch/x86/kernel/setup.c
drivers/acpi/power.c
init/main.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch/x86/lib/msr-reg-export.c')
| -rw-r--r-- | arch/x86/lib/msr-reg-export.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/lib/msr-reg-export.c b/arch/x86/lib/msr-reg-export.c new file mode 100644 index 0000000..a311cc5 --- /dev/null +++ b/arch/x86/lib/msr-reg-export.c @@ -0,0 +1,5 @@ +#include <linux/module.h> +#include <asm/msr.h> + +EXPORT_SYMBOL(native_rdmsr_safe_regs); +EXPORT_SYMBOL(native_wrmsr_safe_regs); |