@@ -1,7 +1,7 @@

 From d5e7229bec41406a4040a1ac9131e24cb1f8768d Mon Sep 17 00:00:00 2001

 From: Alexey Makhalov <amakhalov@vmware.com>

 Date: Wed, 30 Sep 2015 23:00:00 +0000

-Subject: [PATCH 1/7] Measure correct boot time.

+Subject: [PATCH 01/11] Measure correct boot time.

 ---

  arch/x86/Kconfig          |  8 ++++++++

@@ -98,7 +98,7 @@ index 5650655..c386186 100644

 From 500436e32d4dffae5d78f12be72c2e6784ab8cfb Mon Sep 17 00:00:00 2001

 From: Alexey Makhalov <amakhalov@vmware.com>

 Date: Fri, 2 Oct 2015 20:00:06 +0000

-Subject: [PATCH 2/7] PV io_delay for VMware guest.

+Subject: [PATCH 02/11] PV io_delay for VMware guest.

 ---

  arch/x86/kernel/cpu/vmware.c | 13 +++++++++++++

@@ -149,7 +149,7 @@ index 628a059..8fdd031 100644

 From adff5db39b45d8adef2b4579ec46ab1bb721a81f Mon Sep 17 00:00:00 2001

 From: Alexey Makhalov <amakhalov@vmware.com>

 Date: Wed, 7 Oct 2015 22:53:18 +0000

-Subject: [PATCH 3/7] Improved tsc based sched_clock & clocksource.

+Subject: [PATCH 03/11] Improved tsc based sched_clock & clocksource.

 ---

  arch/x86/Kconfig             |  1 +

@@ -327,7 +327,7 @@ index c0a2051..284a7ba 100644

 From 3bd5760c3b1f6cb39568361561d7d1e5440f1109 Mon Sep 17 00:00:00 2001

 From: Alexey Makhalov <amakhalov@vmware.com>

 Date: Mon, 12 Oct 2015 22:43:38 +0000

-Subject: [PATCH 4/7] Move read_boot_clock64 into pv_time_ops.

+Subject: [PATCH 04/11] Move read_boot_clock64 into pv_time_ops.

 ---

  arch/x86/Kconfig                      | 14 ++++++--

@@ -635,7 +635,7 @@ index 284a7ba..615aeb4 100644

 From aa93eaec3f709633007ab6ce3ddbb8aaa455b557 Mon Sep 17 00:00:00 2001

 From: Alexey Makhalov <amakhalov@vmware.com>

 Date: Thu, 5 Nov 2015 21:02:52 +0000

-Subject: [PATCH 5/7] Fix clocksource_vmware issue in VM version <= 10

+Subject: [PATCH 05/11] Fix clocksource_vmware issue in VM version <= 10

 ---

  arch/x86/kernel/cpu/vmware.c | 48 +++++++++++++++++++++++++++++++++++++++++---

@@ -733,7 +733,7 @@ index 1bf1fe3..0b89bb9 100644

 From 245c6ff168fabde177b5b6023356b6005b0efbef Mon Sep 17 00:00:00 2001

 From: Alexey Makhalov <amakhalov@vmware.com>

 Date: Tue, 10 Nov 2015 11:46:57 +0000

-Subject: [PATCH 6/7] Get lapic timer frequency from HV, skip calibration

+Subject: [PATCH 06/11] Get lapic timer frequency from HV, skip calibration

 ---

  arch/x86/kernel/cpu/vmware.c | 48 +++++---------------------------------------

@@ -823,7 +823,7 @@ index 0b89bb9..b16618b 100644

 From 23055114ca27a04044ebbe38853834e0aa869da0 Mon Sep 17 00:00:00 2001

 From: Alexey Makhalov <amakhalov@vmware.com>

 Date: Tue, 15 Dec 2015 21:31:18 +0000

-Subject: [PATCH 7/7] Skip rdrand reseed

+Subject: [PATCH 07/11] Skip rdrand reseed

 ---

  arch/x86/kernel/cpu/common.c | 2 ++

@@ -864,3 +864,452 @@ index 136ac74..0685891 100644

 -- 

 1.9.1

+

+From bd806a16d202bf9dc41fbe3f8e39545e704adf9e Mon Sep 17 00:00:00 2001

+From: Alexey Makhalov <amakhalov@vmware.com>

+Date: Thu, 3 Dec 2015 00:46:46 +0000

+Subject: [PATCH 08/11] STA implementation. first version.

+

+---

+ arch/x86/kernel/cpu/vmware.c | 163 +++++++++++++++++++++++++++++++++++++++++++

+ 1 file changed, 163 insertions(+)

+

+diff --git a/arch/x86/kernel/cpu/vmware.c b/arch/x86/kernel/cpu/vmware.c

+index b16618b..cf1fb64 100644

+--- a/arch/x86/kernel/cpu/vmware.c

+@@ -28,6 +28,8 @@

+ #include <asm/hypervisor.h>

+ #include <asm/timer.h>

+ #include <linux/sched.h>

++#include <linux/cpu.h>

++#include <asm/pci_x86.h>

+ 

+ #define CPUID_VMWARE_INFO_LEAF	0x40000000

+ #define VMWARE_HYPERVISOR_MAGIC	0x564D5868

+@@ -38,6 +40,10 @@

+ #define VMWARE_PORT_CMD_GETVCPU_INFO	68

+ #define VMWARE_PORT_CMD_LEGACY_X2APIC	3

+ #define VMWARE_PORT_CMD_VCPU_RESERVED	31

++#define VMWARE_PORT_CMD_STEALCLOCK	91

++# define CMD_STEALCLOCK_ENABLE		0

++# define CMD_STEALCLOCK_DISABLE		1

++

+ 

+ #define VMWARE_PORT(cmd, eax, ebx, ecx, edx)				\

+ 	__asm__("inl (%%dx)" :						\

+@@ -47,6 +53,34 @@

+ 			"2"(VMWARE_HYPERVISOR_PORT), "3"(UINT_MAX) :	\

+ 			"memory");

+ 

++struct vmware_steal_time {

++	uint64_t clock;	/* stolen time counter in units of vtsc */

++	uint64_t reserved;

++};

++static DEFINE_PER_CPU(struct vmware_steal_time, steal_time) __aligned(64);

++static int has_steal_clock = 0;

++

++static int vmware_cmd_stealclock(int subcmd, uint32_t arg1, uint32_t arg2)

++{

++	uint32_t result, info;

++	__asm__ __volatile__ ("inl (%%dx)"

++		:	"=a" (result),

++			"=c" (info)

++		:       "a"  (VMWARE_HYPERVISOR_MAGIC),

++			"c"  (VMWARE_PORT_CMD_STEALCLOCK),

++			"d"  (VMWARE_HYPERVISOR_PORT),

++			"b"  (subcmd),

++			"S"  (arg1),

++			"D"  (arg2));

++	return result;

++}

++#define STEALCLOCK_ENABLE(pa)					\

++	vmware_cmd_stealclock(CMD_STEALCLOCK_ENABLE,		\

++			      (pa) >> 32, (pa) & 0xffffffff)

++

++#define STEALCLOCK_DISABLE()					\

++	vmware_cmd_stealclock(CMD_STEALCLOCK_DISABLE, 0, 0)

++

+ static inline int __vmware_platform(void)

+ {

+ 	uint32_t eax, ebx, ecx, edx;

+@@ -134,6 +168,114 @@ static void vmware_read_boot_clock64(struct timespec64 *ts)

+ 	}

+ }

+ 

++static uint64_t vmware_steal_clock(int cpu)

++{

++	struct vmware_steal_time *steal;

++

++	steal = &per_cpu(steal_time, cpu);

++	return mul_u64_u32_shr(steal->clock, vmware_cyc2ns.cyc2ns_mul,

++			       CYC2NS_SCALE_FACTOR);

++}

++

++static void vmware_register_steal_time(void)

++{

++	int cpu = smp_processor_id();

++	struct vmware_steal_time *st = &per_cpu(steal_time, cpu);

++

++	if (!has_steal_clock)

++		return;

++

++	memset(st, 0, sizeof(*st));

++

++	if (STEALCLOCK_ENABLE(slow_virt_to_phys(st)) != 0) {

++		has_steal_clock = 0;

++		return;

++	}

++

++	pr_info("vmware-stealtime: cpu %d, pa %llx\n",

++		cpu, (unsigned long long) slow_virt_to_phys(st));

++}

++

++void vmware_disable_steal_time(void)

++{

++	if (!has_steal_clock)

++		return;

++

++	STEALCLOCK_DISABLE();

++}

++

++static void vmware_guest_cpu_init(void)

++{

++	if (has_steal_clock)

++		vmware_register_steal_time();

++}

++

++#ifdef CONFIG_SMP

++static void __init vmware_smp_prepare_boot_cpu(void)

++{

++	vmware_guest_cpu_init();

++	native_smp_prepare_boot_cpu();

++}

++

++static void vmware_guest_cpu_online(void *dummy)

++{

++	vmware_guest_cpu_init();

++}

++

++static void vmware_guest_cpu_offline(void *dummy)

++{

++	vmware_disable_steal_time();

++}

++

++static int vmware_cpu_notify(struct notifier_block *self, unsigned long action,

++			  void *hcpu)

++{

++	int cpu = (unsigned long)hcpu;

++	switch (action) {

++	case CPU_ONLINE:

++	case CPU_DOWN_FAILED:

++	case CPU_ONLINE_FROZEN:

++		smp_call_function_single(cpu, vmware_guest_cpu_online,

++			NULL, 0);

++		break;

++	case CPU_DOWN_PREPARE:

++	case CPU_DOWN_PREPARE_FROZEN:

++		smp_call_function_single(cpu, vmware_guest_cpu_offline,

++			NULL, 1);

++		break;

++	default:

++		break;

++	}

++	return NOTIFY_OK;

++}

++

++static struct notifier_block vmware_cpu_notifier = {

++        .notifier_call  = vmware_cpu_notify,

++};

++#endif

++

++static int sta_enabled = 1; /* steal time accounting */

++static int parse_vmw_no_sta(char *arg)

++{

++        sta_enabled = 0;

++        return 0;

++}

++

++early_param("vmw-no-sta", parse_vmw_no_sta);

++

++static __init int activate_jump_labels(void)

++{

++	if (has_steal_clock) {

++		static_key_slow_inc(&paravirt_steal_enabled);

++		if (sta_enabled)

++			static_key_slow_inc(&paravirt_steal_rq_enabled);

++	}

++

++	return 0;

++}

++arch_initcall(activate_jump_labels);

++

++

+ static void __init paravirt_ops_setup(void)

+ {

+ 	pv_info.name = "VMware";

+@@ -141,9 +283,18 @@ static void __init paravirt_ops_setup(void)

+ 	pv_time_ops.sched_clock = vmware_sched_clock;

+ 	pv_time_ops.read_boot_clock64 = vmware_read_boot_clock64;

+ 

++	/*

++	 * TODO: check for STEAL_TIME support

++	 */

++	if (1) {

++		has_steal_clock = 1;

++		pv_time_ops.steal_clock = vmware_steal_clock;

++	}

++

+ #ifdef CONFIG_X86_IO_APIC

+ 	no_timer_check = 1;

+ #endif

++

+ }

+ 

+ static void __init vmware_platform_setup(void)

+@@ -176,6 +327,18 @@ static void __init vmware_platform_setup(void)

+ 	clocksource_register_khz(&clocksource_vmware, vtsc_khz);

+ 

+ 	paravirt_ops_setup();

++

++#ifdef CONFIG_SMP

++	smp_ops.smp_prepare_boot_cpu = vmware_smp_prepare_boot_cpu;

++	register_cpu_notifier(&vmware_cpu_notifier);

++#else

++	vmware_guest_cpu_init();

++#endif

++

++#ifdef CONFIG_PCI

++	/* PCI BIOS service won't work from a PV guest. */

++	pci_probe &= ~PCI_PROBE_BIOS;

++#endif

+ }

+ 

+ /*

+-- 

+1.9.1

+

+

+From 8496145f4f5fcd430e5d8f493066a8e54aaaf96b Mon Sep 17 00:00:00 2001

+From: Alexey Makhalov <amakhalov@vmware.com>

+Date: Wed, 13 Jan 2016 22:54:04 +0000

+Subject: [PATCH 09/11] STA. updated version

+

+---

+ arch/x86/kernel/cpu/vmware.c | 34 ++++++++++++++++++++++++----------

+ 1 file changed, 24 insertions(+), 10 deletions(-)

+

+diff --git a/arch/x86/kernel/cpu/vmware.c b/arch/x86/kernel/cpu/vmware.c

+index cf1fb64..196703c 100644

+--- a/arch/x86/kernel/cpu/vmware.c

+@@ -41,16 +41,23 @@

+ #define VMWARE_PORT_CMD_LEGACY_X2APIC	3

+ #define VMWARE_PORT_CMD_VCPU_RESERVED	31

+ #define VMWARE_PORT_CMD_STEALCLOCK	91

+-# define CMD_STEALCLOCK_ENABLE		0

+-# define CMD_STEALCLOCK_DISABLE		1

++# define CMD_STEALCLOCK_STATUS		0

++#  define STEALCLOCK_IS_NOT_AVALIABLE	0

++#  define STEALCLOCK_IS_ENABLED		1

++#  define STEALCLOCK_IS_DISABLED	2

++# define CMD_STEALCLOCK_ENABLE		1

++# define CMD_STEALCLOCK_DISABLE		2

+ 

+ 

+ #define VMWARE_PORT(cmd, eax, ebx, ecx, edx)				\

++	VMWARE_PORT2(cmd, eax, ebx, ecx, edx, UINT_MAX)

++

++#define VMWARE_PORT2(cmd, eax, ebx, ecx, edx, arg)			\

+ 	__asm__("inl (%%dx)" :						\

+ 			"=a"(eax), "=c"(ecx), "=d"(edx), "=b"(ebx) :	\

+ 			"0"(VMWARE_HYPERVISOR_MAGIC),			\

+ 			"1"(VMWARE_PORT_CMD_##cmd),			\

+-			"2"(VMWARE_HYPERVISOR_PORT), "3"(UINT_MAX) :	\

++			"2"(VMWARE_HYPERVISOR_PORT), "3"(arg) :		\

+ 			"memory");

+ 

+ struct vmware_steal_time {

+@@ -60,6 +67,13 @@ struct vmware_steal_time {

+ static DEFINE_PER_CPU(struct vmware_steal_time, steal_time) __aligned(64);

+ static int has_steal_clock = 0;

+ 

++static int vmware_is_stealclock_available(void)

++{

++	uint32_t eax, ebx, ecx, edx;

++	VMWARE_PORT2(STEALCLOCK, eax, ebx, ecx, edx, CMD_STEALCLOCK_STATUS);

++	printk("%s:%d %d %d\n", __FUNCTION__, __LINE__, eax, ebx);

++	return eax == 0 && ebx != STEALCLOCK_IS_NOT_AVALIABLE;

++}

+ static int vmware_cmd_stealclock(int subcmd, uint32_t arg1, uint32_t arg2)

+ {

+ 	uint32_t result, info;

+@@ -283,10 +297,7 @@ static void __init paravirt_ops_setup(void)

+ 	pv_time_ops.sched_clock = vmware_sched_clock;

+ 	pv_time_ops.read_boot_clock64 = vmware_read_boot_clock64;

+ 

+-	/*

+-	 * TODO: check for STEAL_TIME support

+-	 */

+-	if (1) {

++	if (vmware_is_stealclock_available()) {

+ 		has_steal_clock = 1;

+ 		pv_time_ops.steal_clock = vmware_steal_clock;

+ 	}

+@@ -328,12 +339,15 @@ static void __init vmware_platform_setup(void)

+ 

+ 	paravirt_ops_setup();

+ 

++	/* vmware_cpu_notifier is used only by STA */

++	if (has_steal_clock) {

+ #ifdef CONFIG_SMP

+-	smp_ops.smp_prepare_boot_cpu = vmware_smp_prepare_boot_cpu;

+-	register_cpu_notifier(&vmware_cpu_notifier);

++		smp_ops.smp_prepare_boot_cpu = vmware_smp_prepare_boot_cpu;

++		register_cpu_notifier(&vmware_cpu_notifier);

+ #else

+-	vmware_guest_cpu_init();

++		vmware_guest_cpu_init();

+ #endif

++	}

+ 

+ #ifdef CONFIG_PCI

+ 	/* PCI BIOS service won't work from a PV guest. */

+-- 

+1.9.1

+

+

+From a8f165433de453994aef84a9d6bf1704a18b3a95 Mon Sep 17 00:00:00 2001

+From: Alexey Makhalov <amakhalov@vmware.com>

+Date: Tue, 15 Mar 2016 22:29:23 +0000

+Subject: [PATCH 10/11] STA: version with a single backdoor command.

+

+---

+ arch/x86/kernel/cpu/vmware.c | 35 +++++++++++++++--------------------

+ 1 file changed, 15 insertions(+), 20 deletions(-)

+

+diff --git a/arch/x86/kernel/cpu/vmware.c b/arch/x86/kernel/cpu/vmware.c

+index 196703c..743b8ad 100644

+--- a/arch/x86/kernel/cpu/vmware.c

+@@ -41,12 +41,9 @@

+ #define VMWARE_PORT_CMD_LEGACY_X2APIC	3

+ #define VMWARE_PORT_CMD_VCPU_RESERVED	31

+ #define VMWARE_PORT_CMD_STEALCLOCK	91

+-# define CMD_STEALCLOCK_STATUS		0

+-#  define STEALCLOCK_IS_NOT_AVALIABLE	0

+-#  define STEALCLOCK_IS_ENABLED		1

+-#  define STEALCLOCK_IS_DISABLED	2

+-# define CMD_STEALCLOCK_ENABLE		1

+-# define CMD_STEALCLOCK_DISABLE		2

++# define STEALCLOCK_IS_NOT_AVALIABLE	-1

++# define STEALCLOCK_IS_DISABLED		0

++# define STEALCLOCK_IS_ENABLED		1

+ 

+ 

+ #define VMWARE_PORT(cmd, eax, ebx, ecx, edx)				\

+@@ -62,19 +59,12 @@

+ 

+ struct vmware_steal_time {

+ 	uint64_t clock;	/* stolen time counter in units of vtsc */

+-	uint64_t reserved;

++	uint64_t reserved[7];

+ };

+ static DEFINE_PER_CPU(struct vmware_steal_time, steal_time) __aligned(64);

+ static int has_steal_clock = 0;

+ 

+-static int vmware_is_stealclock_available(void)

+-{

+-	uint32_t eax, ebx, ecx, edx;

+-	VMWARE_PORT2(STEALCLOCK, eax, ebx, ecx, edx, CMD_STEALCLOCK_STATUS);

+-	printk("%s:%d %d %d\n", __FUNCTION__, __LINE__, eax, ebx);

+-	return eax == 0 && ebx != STEALCLOCK_IS_NOT_AVALIABLE;

+-}

+-static int vmware_cmd_stealclock(int subcmd, uint32_t arg1, uint32_t arg2)

++static int vmware_cmd_stealclock(uint32_t arg1, uint32_t arg2)

+ {

+ 	uint32_t result, info;

+ 	__asm__ __volatile__ ("inl (%%dx)"

+@@ -83,17 +73,22 @@ static int vmware_cmd_stealclock(int subcmd, uint32_t arg1, uint32_t arg2)

+ 		:       "a"  (VMWARE_HYPERVISOR_MAGIC),

+ 			"c"  (VMWARE_PORT_CMD_STEALCLOCK),

+ 			"d"  (VMWARE_HYPERVISOR_PORT),

+-			"b"  (subcmd),

++			"b"  (0),

+ 			"S"  (arg1),

+ 			"D"  (arg2));

+ 	return result;

+ }

+ #define STEALCLOCK_ENABLE(pa)					\

+-	vmware_cmd_stealclock(CMD_STEALCLOCK_ENABLE,		\

+-			      (pa) >> 32, (pa) & 0xffffffff)

++	(vmware_cmd_stealclock((pa) >> 32, (pa) & 0xffffffff)   \

++			== STEALCLOCK_IS_ENABLED)

+ 

+ #define STEALCLOCK_DISABLE()					\

+-	vmware_cmd_stealclock(CMD_STEALCLOCK_DISABLE, 0, 0)

++	vmware_cmd_stealclock(0, 1)

++

++static int vmware_is_stealclock_available(void)

++{

++	return STEALCLOCK_DISABLE() != STEALCLOCK_IS_NOT_AVALIABLE;

++}

+ 

+ static inline int __vmware_platform(void)

+ {

+@@ -201,7 +196,7 @@ static void vmware_register_steal_time(void)

+ 

+ 	memset(st, 0, sizeof(*st));

+ 

+-	if (STEALCLOCK_ENABLE(slow_virt_to_phys(st)) != 0) {

++	if (!STEALCLOCK_ENABLE(slow_virt_to_phys(st))) {

+ 		has_steal_clock = 0;

+ 		return;

+ 	}

+-- 

+1.9.1

+

+

+From 27b9b08cf68f55fbfa297eb047f7d1309e0a60cf Mon Sep 17 00:00:00 2001

+From: Alexey Makhalov <amakhalov@vmware.com>

+Date: Fri, 25 Mar 2016 01:14:17 +0000

+Subject: [PATCH 11/11] Remove delays for smpboot

+

+---

+ arch/x86/kernel/smpboot.c | 6 +++---

+ 1 file changed, 3 insertions(+), 3 deletions(-)

+

+diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c

+index b1f3ed9..8f0be52 100644

+--- a/arch/x86/kernel/smpboot.c

+@@ -560,7 +560,7 @@ wakeup_secondary_cpu_via_nmi(int apicid, unsigned long start_eip)

+ 	/*

+ 	 * Give the other CPU some time to accept the IPI.

+ 	 */

+-	udelay(200);

++//	udelay(200);

+ 	if (APIC_INTEGRATED(apic_version[boot_cpu_physical_apicid])) {

+ 		maxlvt = lapic_get_maxlvt();

+ 		if (maxlvt > 3)			/* Due to the Pentium erratum 3AP.  */

+@@ -665,7 +665,7 @@ wakeup_secondary_cpu_via_init(int phys_apicid, unsigned long start_eip)

+ 		/*

+ 		 * Give the other CPU some time to accept the IPI.

+ 		 */

+-		udelay(300);

++//		udelay(300);

+ 

+ 		pr_debug("Startup point 1\n");

+ 

+@@ -675,7 +675,7 @@ wakeup_secondary_cpu_via_init(int phys_apicid, unsigned long start_eip)

+ 		/*

+ 		 * Give the other CPU some time to accept the IPI.

+ 		 */

+-		udelay(200);

++//		udelay(200);

+ 

+ 		if (maxlvt > 3)		/* Due to the Pentium erratum 3AP.  */

+ 			apic_write(APIC_ESR, 0);

+-- 

+1.9.1

+

@@ -15,9 +15,11 @@ CONFIG_HAVE_LATENCYTOP_SUPPORT=y

 CONFIG_MMU=y

 CONFIG_NEED_DMA_MAP_STATE=y

 CONFIG_NEED_SG_DMA_LENGTH=y

+CONFIG_GENERIC_ISA_DMA=y

 CONFIG_GENERIC_BUG=y

 CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y

 CONFIG_GENERIC_HWEIGHT=y

+CONFIG_ARCH_MAY_HAVE_PC_FDC=y

 CONFIG_RWSEM_XCHGADD_ALGORITHM=y

 CONFIG_GENERIC_CALIBRATE_DELAY=y

 CONFIG_ARCH_HAS_CPU_RELAX=y

@@ -102,18 +104,17 @@ CONFIG_GENERIC_CMOS_UPDATE=y

 CONFIG_TICK_ONESHOT=y

 CONFIG_NO_HZ_COMMON=y

 # CONFIG_HZ_PERIODIC is not set

-# CONFIG_NO_HZ_IDLE is not set

-CONFIG_NO_HZ_FULL=y

-# CONFIG_NO_HZ_FULL_ALL is not set

-# CONFIG_NO_HZ_FULL_SYSIDLE is not set

+CONFIG_NO_HZ_IDLE=y

+# CONFIG_NO_HZ_FULL is not set

 CONFIG_NO_HZ=y

 CONFIG_HIGH_RES_TIMERS=y

 #

 # CPU/Task time and stats accounting

 #

-CONFIG_VIRT_CPU_ACCOUNTING=y

-CONFIG_VIRT_CPU_ACCOUNTING_GEN=y

+CONFIG_TICK_CPU_ACCOUNTING=y

+# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set

+# CONFIG_IRQ_TIME_ACCOUNTING is not set

 CONFIG_BSD_PROCESS_ACCT=y

 CONFIG_BSD_PROCESS_ACCT_V3=y

 CONFIG_TASKSTATS=y

@@ -129,14 +130,11 @@ CONFIG_TREE_RCU=y

 CONFIG_SRCU=y

 # CONFIG_TASKS_RCU is not set

 CONFIG_RCU_STALL_COMMON=y

-CONFIG_CONTEXT_TRACKING=y

-CONFIG_RCU_USER_QS=y

-# CONFIG_CONTEXT_TRACKING_FORCE is not set

 # CONFIG_TREE_RCU_TRACE is not set

 CONFIG_RCU_NOCB_CPU=y

-# CONFIG_RCU_NOCB_CPU_NONE is not set

+CONFIG_RCU_NOCB_CPU_NONE=y

 # CONFIG_RCU_NOCB_CPU_ZERO is not set

-CONFIG_RCU_NOCB_CPU_ALL=y

+# CONFIG_RCU_NOCB_CPU_ALL is not set

 # CONFIG_RCU_EXPEDITE_BOOT is not set

 # CONFIG_BUILD_BIN2C is not set

 # CONFIG_IKCONFIG is not set

@@ -191,18 +189,18 @@ CONFIG_HAVE_UID16=y

 CONFIG_SYSCTL_EXCEPTION_TRACE=y

 CONFIG_HAVE_PCSPKR_PLATFORM=y

 CONFIG_BPF=y

-CONFIG_EXPERT=y

-# CONFIG_UID16 is not set

+# CONFIG_EXPERT is not set

+CONFIG_UID16=y

 CONFIG_MULTIUSER=y

 CONFIG_SGETMASK_SYSCALL=y

-# CONFIG_SYSFS_SYSCALL is not set

-CONFIG_SYSCTL_SYSCALL=y

+CONFIG_SYSFS_SYSCALL=y

+# CONFIG_SYSCTL_SYSCALL is not set

 CONFIG_KALLSYMS=y

-CONFIG_KALLSYMS_ALL=y

+# CONFIG_KALLSYMS_ALL is not set

 CONFIG_PRINTK=y

 CONFIG_BUG=y

 CONFIG_ELF_CORE=y

-# CONFIG_PCSPKR_PLATFORM is not set

+CONFIG_PCSPKR_PLATFORM=y

 CONFIG_BASE_FULL=y

 CONFIG_FUTEX=y

 CONFIG_EPOLL=y

@@ -223,12 +221,9 @@ CONFIG_HAVE_PERF_EVENTS=y

 CONFIG_PERF_EVENTS=y

 # CONFIG_DEBUG_PERF_USE_VMALLOC is not set

 CONFIG_VM_EVENT_COUNTERS=y

-CONFIG_SLUB_DEBUG=y

 # CONFIG_COMPAT_BRK is not set

-# CONFIG_SLAB is not set

-CONFIG_SLUB=y

-# CONFIG_SLOB is not set

-CONFIG_SLUB_CPU_PARTIAL=y

+CONFIG_SLAB=y

+# CONFIG_SLUB is not set

 CONFIG_SYSTEM_TRUSTED_KEYRING=y

 # CONFIG_PROFILING is not set

 CONFIG_HAVE_OPROFILE=y

@@ -259,7 +254,6 @@ CONFIG_HAVE_PERF_REGS=y

 CONFIG_HAVE_PERF_USER_STACK_DUMP=y

 CONFIG_HAVE_ARCH_JUMP_LABEL=y

 CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y

-CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y

 CONFIG_HAVE_CMPXCHG_LOCAL=y

 CONFIG_HAVE_CMPXCHG_DOUBLE=y

 CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y

@@ -381,7 +375,7 @@ CONFIG_PARAVIRT=y

 # CONFIG_KVM_GUEST is not set

 CONFIG_VMWARE=y

 CONFIG_VMWARE_ONLY=y

-# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set

+CONFIG_PARAVIRT_TIME_ACCOUNTING=y

 CONFIG_PARAVIRT_CLOCK=y

 CONFIG_NO_BOOTMEM=y

 # CONFIG_MK8 is not set

@@ -399,18 +393,18 @@ CONFIG_X86_CMPXCHG64=y

 CONFIG_X86_CMOV=y

 CONFIG_X86_MINIMUM_CPU_FAMILY=64

 CONFIG_X86_DEBUGCTLMSR=y

-CONFIG_PROCESSOR_SELECT=y

 CONFIG_CPU_SUP_INTEL=y

-# CONFIG_CPU_SUP_AMD is not set

-# CONFIG_CPU_SUP_CENTAUR is not set

+CONFIG_CPU_SUP_AMD=y

+CONFIG_CPU_SUP_CENTAUR=y

 CONFIG_HPET_TIMER=y

 CONFIG_HPET_EMULATE_RTC=y

 CONFIG_DMI=y

+# CONFIG_GART_IOMMU is not set

 # CONFIG_CALGARY_IOMMU is not set

 CONFIG_SWIOTLB=y

 CONFIG_IOMMU_HELPER=y

 # CONFIG_MAXSMP is not set

-CONFIG_NR_CPUS=32

+CONFIG_NR_CPUS=128

 # CONFIG_SCHED_SMT is not set

 CONFIG_SCHED_MC=y

 CONFIG_PREEMPT_NONE=y

@@ -501,7 +495,7 @@ CONFIG_HZ=250

 CONFIG_SCHED_HRTICK=y

 # CONFIG_KEXEC is not set

 # CONFIG_CRASH_DUMP is not set

-CONFIG_PHYSICAL_START=0x100000

+CONFIG_PHYSICAL_START=0x1000000

 CONFIG_RELOCATABLE=y

 # CONFIG_RANDOMIZE_BASE is not set

 CONFIG_PHYSICAL_ALIGN=0x1000000

@@ -540,7 +534,7 @@ CONFIG_ACPI_HOTPLUG_CPU=y

 # CONFIG_ACPI_INITRD_TABLE_OVERRIDE is not set

 # CONFIG_ACPI_DEBUG is not set

 # CONFIG_ACPI_PCI_SLOT is not set

-# CONFIG_X86_PM_TIMER is not set

+CONFIG_X86_PM_TIMER=y

 CONFIG_ACPI_CONTAINER=y

 CONFIG_ACPI_HOTPLUG_MEMORY=y

 CONFIG_ACPI_HOTPLUG_IOAPIC=y

@@ -582,11 +576,14 @@ CONFIG_PCI=y

 CONFIG_PCI_DIRECT=y

 # CONFIG_PCI_MMCONFIG is not set

 CONFIG_PCI_DOMAINS=y

-# CONFIG_PCI_CNB20LE_QUIRK is not set

 CONFIG_PCIEPORTBUS=y

 # CONFIG_HOTPLUG_PCI_PCIE is not set

 # CONFIG_PCIEAER is not set

-# CONFIG_PCIEASPM is not set

+CONFIG_PCIEASPM=y

+# CONFIG_PCIEASPM_DEBUG is not set

+CONFIG_PCIEASPM_DEFAULT=y

+# CONFIG_PCIEASPM_POWERSAVE is not set

+# CONFIG_PCIEASPM_PERFORMANCE is not set

 CONFIG_PCI_BUS_ADDR_T_64BIT=y

 CONFIG_PCI_MSI=y

 CONFIG_PCI_MSI_IRQ_DOMAIN=y

@@ -602,11 +599,12 @@ CONFIG_PCI_LABEL=y

 #

 # PCI host controller drivers

 #

-# CONFIG_ISA_DMA_API is not set

+CONFIG_ISA_DMA_API=y

+CONFIG_AMD_NB=y

 # CONFIG_PCCARD is not set

 CONFIG_HOTPLUG_PCI=y

 CONFIG_HOTPLUG_PCI_ACPI=y

-CONFIG_HOTPLUG_PCI_ACPI_IBM=m

+# CONFIG_HOTPLUG_PCI_ACPI_IBM is not set

 # CONFIG_HOTPLUG_PCI_CPCI is not set

 # CONFIG_HOTPLUG_PCI_SHPC is not set

 # CONFIG_RAPIDIO is not set

@@ -1101,7 +1099,7 @@ CONFIG_EXTRA_FIRMWARE=""

 # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set

 CONFIG_ALLOW_DEV_COREDUMP=y

 # CONFIG_DEBUG_DRIVER is not set

-CONFIG_DEBUG_DEVRES=y

+# CONFIG_DEBUG_DEVRES is not set

 # CONFIG_SYS_HYPERVISOR is not set

 # CONFIG_GENERIC_CPU_DEVICES is not set

 CONFIG_GENERIC_CPU_AUTOPROBE=y

@@ -1125,6 +1123,7 @@ CONFIG_PNP_DEBUG_MESSAGES=y

 CONFIG_PNPACPI=y

 CONFIG_BLK_DEV=y

 # CONFIG_BLK_DEV_NULL_BLK is not set

+# CONFIG_BLK_DEV_FD is not set

 # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set

 # CONFIG_BLK_CPQ_CISS_DA is not set

 # CONFIG_BLK_DEV_DAC960 is not set

@@ -1292,10 +1291,13 @@ CONFIG_SCSI_MPT3SAS_MAX_SGE=128

 CONFIG_SCSI_MPT3SAS_LOGGING=y

 # CONFIG_SCSI_UFSHCD is not set

 # CONFIG_SCSI_HPTIOP is not set

+# CONFIG_SCSI_BUSLOGIC is not set

 CONFIG_VMWARE_PVSCSI=y

 # CONFIG_SCSI_SNIC is not set

 # CONFIG_SCSI_DMX3191D is not set

+# CONFIG_SCSI_EATA is not set

 # CONFIG_SCSI_FUTURE_DOMAIN is not set

+# CONFIG_SCSI_GDTH is not set

 # CONFIG_SCSI_ISCI is not set

 # CONFIG_SCSI_IPS is not set

 # CONFIG_SCSI_INITIO is not set

@@ -1395,7 +1397,6 @@ CONFIG_ATA_PIIX=m

 # CONFIG_PATA_MPIIX is not set

 # CONFIG_PATA_NS87410 is not set

 # CONFIG_PATA_OPTI is not set

-# CONFIG_PATA_PLATFORM is not set

 # CONFIG_PATA_RZ1000 is not set

 #

@@ -1604,16 +1605,16 @@ CONFIG_KEYBOARD_ATKBD=y

 # CONFIG_KEYBOARD_XTKBD is not set

 CONFIG_INPUT_MOUSE=y

 CONFIG_MOUSE_PS2=m

-# CONFIG_MOUSE_PS2_ALPS is not set

-# CONFIG_MOUSE_PS2_LOGIPS2PP is not set

-# CONFIG_MOUSE_PS2_SYNAPTICS is not set

-# CONFIG_MOUSE_PS2_CYPRESS is not set

-# CONFIG_MOUSE_PS2_LIFEBOOK is not set

-# CONFIG_MOUSE_PS2_TRACKPOINT is not set

+CONFIG_MOUSE_PS2_ALPS=y

+CONFIG_MOUSE_PS2_LOGIPS2PP=y

+CONFIG_MOUSE_PS2_SYNAPTICS=y

+CONFIG_MOUSE_PS2_CYPRESS=y

+CONFIG_MOUSE_PS2_LIFEBOOK=y

+CONFIG_MOUSE_PS2_TRACKPOINT=y

 # CONFIG_MOUSE_PS2_ELANTECH is not set

 # CONFIG_MOUSE_PS2_SENTELIC is not set

 # CONFIG_MOUSE_PS2_TOUCHKIT is not set

-# CONFIG_MOUSE_PS2_FOCALTECH is not set

+CONFIG_MOUSE_PS2_FOCALTECH=y

 # CONFIG_MOUSE_PS2_VMMOUSE is not set

 # CONFIG_MOUSE_SERIAL is not set

 # CONFIG_MOUSE_APPLETOUCH is not set

@@ -1688,7 +1689,6 @@ CONFIG_SERIAL_CORE=m

 # CONFIG_SERIAL_ARC is not set

 # CONFIG_SERIAL_RP2 is not set

 # CONFIG_SERIAL_FSL_LPUART is not set

-CONFIG_TTY_PRINTK=y

 # CONFIG_IPMI_HANDLER is not set

 # CONFIG_HW_RANDOM is not set

 # CONFIG_NVRAM is not set

@@ -1890,7 +1890,8 @@ CONFIG_BCMA_POSSIBLE=y

 # Graphics support

 #

 # CONFIG_AGP is not set

-# CONFIG_VGA_ARB is not set

+CONFIG_VGA_ARB=y

+CONFIG_VGA_ARB_MAX_GPUS=16

 # CONFIG_VGA_SWITCHEROO is not set

 #

@@ -2093,12 +2094,6 @@ CONFIG_USB_HID=m

 # CONFIG_USB_HIDDEV is not set

 #

-# USB HID Boot Protocol drivers

-#

-# CONFIG_USB_KBD is not set

-# CONFIG_USB_MOUSE is not set

-

-#

 # I2C HID support

 #

 # CONFIG_I2C_HID is not set

@@ -2115,7 +2110,6 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

 CONFIG_USB_DEFAULT_PERSIST=y

 # CONFIG_USB_DYNAMIC_MINORS is not set

 # CONFIG_USB_OTG_WHITELIST is not set

-# CONFIG_USB_OTG_BLACKLIST_HUB is not set

 # CONFIG_USB_OTG_FSM is not set

 # CONFIG_USB_ULPI_BUS is not set

 CONFIG_USB_MON=m

@@ -2338,6 +2332,7 @@ CONFIG_VIRT_DRIVERS=y

 # Clock Source drivers

 #

 CONFIG_CLKEVT_I8253=y

+CONFIG_I8253_LOCK=y

 CONFIG_CLKBLD_I8253=y

 # CONFIG_ATMEL_PIT is not set

 # CONFIG_SH_TIMER_CMT is not set

@@ -2497,7 +2492,7 @@ CONFIG_NETWORK_FILESYSTEMS=y

 CONFIG_NFS_FS=m

 CONFIG_NFS_V2=m

 CONFIG_NFS_V3=m

-# CONFIG_NFS_V3_ACL is not set

+CONFIG_NFS_V3_ACL=y

 CONFIG_NFS_V4=m

 # CONFIG_NFS_SWAP is not set

 CONFIG_NFS_V4_1=y

@@ -2507,8 +2502,8 @@ CONFIG_PNFS_BLOCK=m

 CONFIG_PNFS_FLEXFILE_LAYOUT=m

 CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"

 # CONFIG_NFS_V4_1_MIGRATION is not set

-# CONFIG_NFS_USE_LEGACY_DNS is not set

-CONFIG_NFS_USE_KERNEL_DNS=y

+CONFIG_NFS_USE_LEGACY_DNS=y

+CONFIG_NFS_DEBUG=y

 CONFIG_NFSD=m

 CONFIG_NFSD_V3=y

 # CONFIG_NFSD_V3_ACL is not set

@@ -2518,11 +2513,12 @@ CONFIG_NFSD_PNFS=y

 CONFIG_GRACE_PERIOD=m

 CONFIG_LOCKD=m

 CONFIG_LOCKD_V4=y

+CONFIG_NFS_ACL_SUPPORT=m

 CONFIG_NFS_COMMON=y

 CONFIG_SUNRPC=m

 CONFIG_SUNRPC_GSS=m

 CONFIG_SUNRPC_BACKCHANNEL=y

-# CONFIG_SUNRPC_DEBUG is not set

+CONFIG_SUNRPC_DEBUG=y

 # CONFIG_CEPH_FS is not set

 CONFIG_CIFS=m

 # CONFIG_CIFS_STATS is not set

@@ -2598,7 +2594,7 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y

 #

 CONFIG_PRINTK_TIME=y

 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4

-CONFIG_BOOT_PRINTK_DELAY=y

+# CONFIG_BOOT_PRINTK_DELAY is not set

 CONFIG_DYNAMIC_DEBUG=y

 #

@@ -2616,10 +2612,9 @@ CONFIG_DEBUG_FS=y

 # CONFIG_HEADERS_CHECK is not set

 CONFIG_DEBUG_SECTION_MISMATCH=y

 CONFIG_ARCH_WANT_FRAME_POINTERS=y

-CONFIG_FRAME_POINTER=y

+# CONFIG_FRAME_POINTER is not set

 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set

-CONFIG_MAGIC_SYSRQ=y

-CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1

+# CONFIG_MAGIC_SYSRQ is not set

 CONFIG_DEBUG_KERNEL=y

 #

@@ -2628,22 +2623,20 @@ CONFIG_DEBUG_KERNEL=y

 # CONFIG_PAGE_EXTENSION is not set

 # CONFIG_DEBUG_PAGEALLOC is not set

 # CONFIG_DEBUG_OBJECTS is not set

-# CONFIG_SLUB_DEBUG_ON is not set

-# CONFIG_SLUB_STATS is not set

+# CONFIG_DEBUG_SLAB is not set

 CONFIG_HAVE_DEBUG_KMEMLEAK=y

 # CONFIG_DEBUG_KMEMLEAK is not set

 # CONFIG_DEBUG_STACK_USAGE is not set

 # CONFIG_DEBUG_VM is not set

 # CONFIG_DEBUG_VIRTUAL is not set

-# CONFIG_DEBUG_MEMORY_INIT is not set

+CONFIG_DEBUG_MEMORY_INIT=y

 # CONFIG_DEBUG_PER_CPU_MAPS is not set

 CONFIG_HAVE_DEBUG_STACKOVERFLOW=y

 # CONFIG_DEBUG_STACKOVERFLOW is not set

 CONFIG_HAVE_ARCH_KMEMCHECK=y

 # CONFIG_KMEMCHECK is not set

 CONFIG_HAVE_ARCH_KASAN=y

-# CONFIG_KASAN is not set

-CONFIG_DEBUG_SHIRQ=y

+# CONFIG_DEBUG_SHIRQ is not set

 #

 # Debug Lockups and Hangs

@@ -2656,9 +2649,9 @@ CONFIG_PANIC_TIMEOUT=0

 CONFIG_SCHED_DEBUG=y

 CONFIG_SCHED_INFO=y

 CONFIG_SCHEDSTATS=y

-CONFIG_SCHED_STACK_END_CHECK=y

+# CONFIG_SCHED_STACK_END_CHECK is not set

 # CONFIG_DEBUG_TIMEKEEPING is not set

-CONFIG_TIMER_STATS=y

+# CONFIG_TIMER_STATS is not set