diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-05 12:36:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-05 12:36:12 -0700 |
| commit | 050ba07cdc9aaef17e1be251aa8fceb9a919d5d3 (patch) | |
| tree | 11d435a13b4ba670bec21610a19d566b348efeca | |
| parent | 27c053aa8d18d1fa7b83041e36bad20bcdf55514 (diff) | |
| parent | 4488e09b4582c3d9cae1601351e26584e208d877 (diff) | |
| download | linux-050ba07cdc9aaef17e1be251aa8fceb9a919d5d3.tar.bz2 | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar:
"Fix for the annoying paravirt.o build warning under allmodconfig, and
a MAINTAINERS file update"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, doc: Add an entry in MAINTAINERS for arch/x86/kernel/cpu/vmware.c
x86, paravirt: Remove duplicate definition for DEF_NATIVE
| -rw-r--r-- | MAINTAINERS | 6 | ||||
| -rw-r--r-- | arch/x86/kernel/paravirt.c | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 69d42b6ff28a..c9fedf12f144 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9075,6 +9075,12 @@ F: drivers/staging/vme/ F: drivers/vme/ F: include/linux/vme* +VMWARE HYPERVISOR INTERFACE +M: Alok Kataria <akataria@vmware.com> +L: virtualization@lists.linux-foundation.org +S: Supported +F: arch/x86/kernel/cpu/vmware.c + VMWARE VMXNET3 ETHERNET DRIVER M: Shreyas Bhatewara <sbhatewara@vmware.com> M: "VMware, Inc." <pv-drivers@vmware.com> diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c index 884aa4053313..1b10af835c31 100644 --- a/arch/x86/kernel/paravirt.c +++ b/arch/x86/kernel/paravirt.c @@ -62,11 +62,6 @@ void __init default_banner(void) pv_info.name); } -/* Simple instruction patching code. */ -#define DEF_NATIVE(ops, name, code) \ - extern const char start_##ops##_##name[], end_##ops##_##name[]; \ - asm("start_" #ops "_" #name ": " code "; end_" #ops "_" #name ":") - /* Undefined instruction for dealing with missing ops pointers. */ static const unsigned char ud2a[] = { 0x0f, 0x0b }; |