From f2a7b303d6e0bfb75b611b560af218608e50011f Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Wed, 4 Sep 2013 09:43:30 -0700 Subject: [PATCH 1/2] x86, paravirt: Remove duplicate definition for DEF_NATIVE DEF_NATIVE() is defined in paravirt_types.h, remove duplicate definition in paravirt.c Reported-by: Linus Torvalds Signed-off-by: H. Peter Anvin Cc: Andi Kleen Cc: Konrad Rzeszutek Wilk Link: http://lkml.kernel.org/r/CA%2B55aFxVv==DC0JdS87V%2BcPr-twN%2BTujYg5XmgHOjJOAkZ4xwQ@mail.gmail.com --- arch/x86/kernel/paravirt.c | 5 ----- 1 file changed, 5 deletions(-) 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 }; From 4488e09b4582c3d9cae1601351e26584e208d877 Mon Sep 17 00:00:00 2001 From: Alok Kataria Date: Wed, 4 Sep 2013 14:23:41 +0530 Subject: [PATCH 2/2] x86, doc: Add an entry in MAINTAINERS for arch/x86/kernel/cpu/vmware.c Add an entry in MAINTAINERS file to reflect the maintainers of this file. Signed-off-by: Alok Kataria Link: http://lkml.kernel.org/r/1378284821.9739.7404.camel@akataria-dtop.eng.vmware.com Signed-off-by: H. Peter Anvin [ hpa: fixed tabs vs spaces ] --- MAINTAINERS | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index defc05383f83..fba8134cf471 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9016,6 +9016,12 @@ F: drivers/staging/vme/ F: drivers/vme/ F: include/linux/vme* +VMWARE HYPERVISOR INTERFACE +M: Alok Kataria +L: virtualization@lists.linux-foundation.org +S: Supported +F: arch/x86/kernel/cpu/vmware.c + VMWARE VMXNET3 ETHERNET DRIVER M: Shreyas Bhatewara M: "VMware, Inc."