Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 050ba07c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 27c053aa 4488e09b

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -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>

arch/x86/kernel/paravirt.c

+0 −5
Original line number Diff line number Diff line
@@ -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 };