mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
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
This commit is contained in:
commit
050ba07cdc
2 changed files with 6 additions and 5 deletions
|
@ -9075,6 +9075,12 @@ F: drivers/staging/vme/
|
||||||
F: drivers/vme/
|
F: drivers/vme/
|
||||||
F: include/linux/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
|
VMWARE VMXNET3 ETHERNET DRIVER
|
||||||
M: Shreyas Bhatewara <sbhatewara@vmware.com>
|
M: Shreyas Bhatewara <sbhatewara@vmware.com>
|
||||||
M: "VMware, Inc." <pv-drivers@vmware.com>
|
M: "VMware, Inc." <pv-drivers@vmware.com>
|
||||||
|
|
|
@ -62,11 +62,6 @@ void __init default_banner(void)
|
||||||
pv_info.name);
|
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. */
|
/* Undefined instruction for dealing with missing ops pointers. */
|
||||||
static const unsigned char ud2a[] = { 0x0f, 0x0b };
|
static const unsigned char ud2a[] = { 0x0f, 0x0b };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue