@@ -1,53 +1,37 @@

-From f08c191ec706f9f381e992709262650dba07f0f3 Mon Sep 17 00:00:00 2001

+From 7f6aac4ffc7feb6ed143d936f0457edcfc078aa0 Mon Sep 17 00:00:00 2001

 From: Alexey Makhalov <amakhalov@vmware.com>

 Date: Tue, 29 Sep 2015 15:58:41 -0700

 Subject: [PATCH] clean linux patch set.

 ---

- arch/x86/kernel/cpu/perf_event_intel.c    |  2 +-

- arch/x86/kernel/cpu/perf_event_intel_pt.c |  4 ++++

- arch/x86/kernel/tsc.c                     |  3 +++

- drivers/tty/sysrq.c                       |  4 +++-

- drivers/video/console/fbcon.c             |  2 +-

- include/linux/blkdev.h                    |  2 +-

- init/do_mounts.c                          |  4 +++-

- kernel/fork.c                             | 39 ++++++++++++++++++-------------

- mm/vmstat.c                               |  2 +-

- 9 files changed, 40 insertions(+), 22 deletions(-)

+ arch/x86/kernel/cpu/perf_event_intel.c |  2 +-

+ arch/x86/kernel/tsc.c                  |  3 +++

+ drivers/tty/sysrq.c                    |  4 +++-

+ drivers/video/console/fbcon.c          |  2 +-

+ include/linux/blkdev.h                 |  2 +-

+ init/do_mounts.c                       |  4 +++-

+ kernel/fork.c                          | 39 ++++++++++++++++++++--------------

+ mm/vmstat.c                            |  2 +-

+ 8 files changed, 36 insertions(+), 22 deletions(-)

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

-index 6326ae2..136a14b 100644

+index e2a4300..1abd753 100644

 --- a/arch/x86/kernel/cpu/perf_event_intel.c

 +++ b/arch/x86/kernel/cpu/perf_event_intel.c

-@@ -3338,7 +3338,7 @@ __init int intel_pmu_init(void)

+@@ -3604,7 +3604,7 @@ __init int intel_pmu_init(void)

  	 */

  	if (x86_pmu.extra_regs) {

  		for (er = x86_pmu.extra_regs; er->msr; er++) {

--			er->extra_msr_access = check_msr(er->msr, 0x1ffUL);

+-			er->extra_msr_access = check_msr(er->msr, 0x11UL);

 +			er->extra_msr_access = false;

  			/* Disable LBR select mapping */

  			if ((er->idx == EXTRA_REG_LBR) && !er->extra_msr_access)

  				x86_pmu.lbr_sel_map = NULL;

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

-index 183de71..f205baf 100644

-+++ b/arch/x86/kernel/cpu/perf_event_intel_pt.c

-@@ -1060,6 +1060,10 @@ static __init int pt_init(void)

- {

- 	int ret, cpu, prior_warn = 0;

- 

-+

-+	if (!test_cpu_cap(&boot_cpu_data, X86_FEATURE_INTEL_PT))

-+		return -ENODEV;

-+

- 	BUILD_BUG_ON(sizeof(struct topa) > PAGE_SIZE);

- 	get_online_cpus();

- 	for_each_online_cpu(cpu) {

 diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c

-index 7437b41..c6f2c49 100644

+index c7c4d9c..8913f79 100644

 --- a/arch/x86/kernel/tsc.c

 +++ b/arch/x86/kernel/tsc.c

-@@ -1241,6 +1241,9 @@ unsigned long calibrate_delay_is_known(void)

+@@ -1253,6 +1253,9 @@ unsigned long calibrate_delay_is_known(void)

  	if (!tsc_disabled && !cpu_has(&cpu_data(cpu), X86_FEATURE_CONSTANT_TSC))

  		return 0;

@@ -58,10 +42,10 @@ index 7437b41..c6f2c49 100644

  		if (cpu_data(i).phys_proc_id == cpu_data(cpu).phys_proc_id)

  			return cpu_data(i).loops_per_jiffy;

 diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c

-index b5b4278..ec1bb75 100644

+index 5381a72..6aa6e81 100644

 --- a/drivers/tty/sysrq.c

 +++ b/drivers/tty/sysrq.c

-@@ -1047,8 +1047,10 @@ static int __sysrq_swap_key_ops(int key, struct sysrq_key_op *insert_op_p,

+@@ -1058,8 +1058,10 @@ static int __sysrq_swap_key_ops(int key, struct sysrq_key_op *insert_op_p,

  	 * A concurrent __handle_sysrq either got the old op or the new op.

  	 * Wait for it to go away before returning, so the code for an old

  	 * op is not freed (eg. on module unload) while it is in use.

@@ -74,7 +58,7 @@ index b5b4278..ec1bb75 100644

  	return retval;

  }

 diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c

-index 1aaf893..ac6c143 100644

+index 92f3949..4ff61d7 100644

 --- a/drivers/video/console/fbcon.c

 +++ b/drivers/video/console/fbcon.c

 @@ -146,7 +146,7 @@ static const struct consw fb_con;

@@ -87,11 +71,11 @@ index 1aaf893..ac6c143 100644

  #define divides(a, b)	((!(a) || (b)%(a)) ? 0 : 1)

 diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h

-index d4068c1..1dfe7ef 100644

+index c70e358..72f56a8 100644

 --- a/include/linux/blkdev.h

 +++ b/include/linux/blkdev.h

-@@ -37,7 +37,7 @@ struct blkcg_gq;

- struct blk_flush_queue;

+@@ -38,7 +38,7 @@ struct blk_flush_queue;

+ struct pr_ops;

  #define BLKDEV_MIN_RQ	4

 -#define BLKDEV_MAX_RQ	128	/* Default maximum */

@@ -122,7 +106,7 @@ index dea5de9..da84094 100644

  	md_run_setup();

 diff --git a/kernel/fork.c b/kernel/fork.c

-index dbd9b8d..a84f4b5 100644

+index 1155eac..3a790cf 100644

 --- a/kernel/fork.c

 +++ b/kernel/fork.c

 @@ -74,6 +74,7 @@

@@ -133,7 +117,7 @@ index dbd9b8d..a84f4b5 100644

  #include <linux/sysctl.h>

  #include <asm/pgtable.h>

-@@ -685,6 +686,26 @@ void __mmdrop(struct mm_struct *mm)

+@@ -689,6 +690,26 @@ void __mmdrop(struct mm_struct *mm)

  }

  EXPORT_SYMBOL_GPL(__mmdrop);

@@ -160,7 +144,7 @@ index dbd9b8d..a84f4b5 100644

  /*

   * Decrement the use count and release all resources for an mm.

   */

-@@ -692,22 +713,8 @@ void mmput(struct mm_struct *mm)

+@@ -696,22 +717,8 @@ void mmput(struct mm_struct *mm)

  {

  	might_sleep();

@@ -186,12 +170,12 @@ index dbd9b8d..a84f4b5 100644

  EXPORT_SYMBOL_GPL(mmput);

 diff --git a/mm/vmstat.c b/mm/vmstat.c

-index 4f5cd97..c176f8b 100644

+index c54fd29..f0baa1a 100644

 --- a/mm/vmstat.c

 +++ b/mm/vmstat.c

-@@ -1358,7 +1358,7 @@ static const struct file_operations proc_vmstat_file_operations = {

- 

+@@ -1381,7 +1381,7 @@ static const struct file_operations proc_vmstat_file_operations = {

  #ifdef CONFIG_SMP

+ static struct workqueue_struct *vmstat_wq;

  static DEFINE_PER_CPU(struct delayed_work, vmstat_work);

 -int sysctl_stat_interval __read_mostly = HZ;

 +int sysctl_stat_interval __read_mostly = 8 * HZ;

@@ -1,4 +1,4 @@

-From 017e5bbfc985494ee7116e4c92005c53b1ce68ab Mon Sep 17 00:00:00 2001

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

 From: Alexey Makhalov <amakhalov@vmware.com>

 Date: Tue, 29 Sep 2015 15:55:49 -0700

 Subject: [PATCH] pci/probe.c: Hardcodded pci probe.

@@ -8,10 +8,10 @@ Subject: [PATCH] pci/probe.c: Hardcodded pci probe.

  1 file changed, 310 insertions(+), 2 deletions(-)

 diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c

-index f6ae0d0..6ecda24 100644

+index edb1984..522bdaa 100644

 --- a/drivers/pci/probe.c

 +++ b/drivers/pci/probe.c

-@@ -159,6 +159,281 @@ static inline unsigned long decode_bar(struct pci_dev *dev, u32 bar)

+@@ -162,6 +162,281 @@ static inline unsigned long decode_bar(struct pci_dev *dev, u32 bar)

  #define PCI_COMMAND_DECODE_ENABLE	(PCI_COMMAND_MEMORY | PCI_COMMAND_IO)

@@ -293,7 +293,7 @@ index f6ae0d0..6ecda24 100644

  /**

   * pci_read_base - read a PCI BAR

   * @dev: the PCI device

-@@ -178,6 +453,13 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,

+@@ -181,6 +456,13 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,

  	mask = type ? PCI_ROM_ADDRESS_MASK : ~0;

@@ -307,7 +307,7 @@ index f6ae0d0..6ecda24 100644

  	/* No printks while decoding is disabled! */

  	if (!dev->mmio_always_on) {

  		pci_read_config_word(dev, PCI_COMMAND, &orig_cmd);

-@@ -187,7 +469,6 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,

+@@ -190,7 +472,6 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,

  		}

  	}

@@ -315,7 +315,7 @@ index f6ae0d0..6ecda24 100644

  	pci_read_config_dword(dev, pos, &l);

  	pci_write_config_dword(dev, pos, l | mask);

-@@ -1108,6 +1389,28 @@ int pci_cfg_space_size(struct pci_dev *dev)

+@@ -1145,6 +1426,28 @@ int pci_cfg_space_size(struct pci_dev *dev)

  #define LEGACY_IO_RESOURCE	(IORESOURCE_IO | IORESOURCE_PCI_FIXED)

@@ -344,7 +344,7 @@ index f6ae0d0..6ecda24 100644

  void pci_msi_setup_pci_dev(struct pci_dev *dev)

  {

  	/*

-@@ -1142,6 +1445,7 @@ int pci_setup_device(struct pci_dev *dev)

+@@ -1178,6 +1481,7 @@ int pci_setup_device(struct pci_dev *dev)

  	int pos = 0;

  	struct pci_bus_region region;

  	struct resource *res;

@@ -352,7 +352,7 @@ index f6ae0d0..6ecda24 100644

  	if (pci_read_config_byte(dev, PCI_HEADER_TYPE, &hdr_type))

  		return -EIO;

-@@ -1191,7 +1495,11 @@ int pci_setup_device(struct pci_dev *dev)

+@@ -1224,7 +1528,11 @@ int pci_setup_device(struct pci_dev *dev)

  		if (class == PCI_CLASS_BRIDGE_PCI)

  			goto bad;

  		pci_read_irq(dev);

@@ -1,4 +1,4 @@

-From 27f91aa3957467bfa18d62e893acee57c89ee4fc Mon Sep 17 00:00:00 2001

+From 467ddac279a00201bb732e7daa2794d61441075d Mon Sep 17 00:00:00 2001

 From: Alexey Makhalov <amakhalov@vmware.com>

 Date: Tue, 29 Sep 2015 16:01:17 -0700

 Subject: [PATCH] reboot.c: Hardcodded piix4 poweroff.

@@ -8,7 +8,7 @@ Subject: [PATCH] reboot.c: Hardcodded piix4 poweroff.

  1 file changed, 1 insertion(+)

 diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c

-index 86db4bc..259eafc 100644

+index 02693dd..e1eba75 100644

 --- a/arch/x86/kernel/reboot.c

 +++ b/arch/x86/kernel/reboot.c

 @@ -653,6 +653,7 @@ static void native_machine_halt(void)

@@ -1,4 +1,4 @@

-From 11a83da2120bf724d143df59c3ebce5fdec19a67 Mon Sep 17 00:00:00 2001

+From 721dc6e6bc3473ecdc96dede6d02d0520bb78d2b Mon Sep 17 00:00:00 2001

 From: Alexey Makhalov <amakhalov@vmware.com>

 Date: Tue, 29 Sep 2015 16:02:20 -0700

 Subject: [PATCH] scsi/sd.c: Lower log level for "Assuming drive cache..."

@@ -9,10 +9,10 @@ Subject: [PATCH] scsi/sd.c: Lower log level for "Assuming drive cache..."

  1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c

-index a20da8c..bbdc773 100644

+index 4e08d1c..2fe5106 100644

 --- a/drivers/scsi/sd.c

 +++ b/drivers/scsi/sd.c

-@@ -2483,7 +2483,7 @@ defaults:

+@@ -2590,7 +2590,7 @@ defaults:

  				"Assuming drive cache: write back\n");

  		sdkp->WCE = 1;

  	} else {

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

-From d5e7229bec41406a4040a1ac9131e24cb1f8768d Mon Sep 17 00:00:00 2001

+From 6021a95a6b7ffb8df8823337d4ca05807c2eb6e5 Mon Sep 17 00:00:00 2001

 From: Alexey Makhalov <amakhalov@vmware.com>

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

-Subject: [PATCH 01/12] Measure correct boot time.

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

 ---

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

@@ -10,10 +10,10 @@ Subject: [PATCH 01/12] Measure correct boot time.

  3 files changed, 35 insertions(+)

 diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig

-index b3a1a5d..24141ac 100644

+index db3622f..3f6337e 100644

 --- a/arch/x86/Kconfig

 +++ b/arch/x86/Kconfig

-@@ -708,6 +708,14 @@ config KVM_DEBUG_FS

+@@ -710,6 +710,14 @@ config KVM_DEBUG_FS

  	  Statistics are displayed in debugfs filesystem. Enabling this option

  	  may incur significant overhead.

@@ -29,7 +29,7 @@ index b3a1a5d..24141ac 100644

  config PARAVIRT_TIME_ACCOUNTING

 diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S

-index 1d40ca8..eccf2d7 100644

+index ffdc0e8..0f54608 100644

 --- a/arch/x86/kernel/head_64.S

 +++ b/arch/x86/kernel/head_64.S

 @@ -65,6 +65,16 @@ startup_64:

@@ -46,10 +46,10 @@ index 1d40ca8..eccf2d7 100644

 +	mov	%rdx, tsc_at_head(%rip)

 +#endif

 +

- 	/*

- 	 * Compute the delta between the address I am compiled to run at and the

- 	 * address I am actually running at.

-@@ -512,6 +522,12 @@ early_gdt_descr:

+ 	/* Sanitize CPU configuration */

+ 	call verify_cpu

+ 

+@@ -520,6 +530,12 @@ early_gdt_descr:

  early_gdt_descr_base:

  	.quad	INIT_PER_CPU_VAR(gdt_page)

@@ -63,10 +63,10 @@ index 1d40ca8..eccf2d7 100644

  	/* This must match the first entry in level2_kernel_pgt */

  	.quad   0x0000000000000000

 diff --git a/init/main.c b/init/main.c

-index 5650655..c386186 100644

+index 9e64d70..ccc9a22 100644

 --- a/init/main.c

 +++ b/init/main.c

-@@ -929,6 +929,9 @@ static int try_to_run_init_process(const char *init_filename)

+@@ -928,6 +928,9 @@ static int try_to_run_init_process(const char *init_filename)

  }

  static noinline void __init kernel_init_freeable(void);

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

  static int __ref kernel_init(void *unused)

  {

-@@ -944,6 +947,14 @@ static int __ref kernel_init(void *unused)

+@@ -943,6 +946,14 @@ static int __ref kernel_init(void *unused)

  	flush_delayed_fput();

@@ -95,10 +95,10 @@ index 5650655..c386186 100644

 1.9.1

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

+From 1dc2e9f9a9d8d8065fa096b5551ca646086a72ed Mon Sep 17 00:00:00 2001

 From: Alexey Makhalov <amakhalov@vmware.com>

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

-Subject: [PATCH 02/12] PV io_delay for VMware guest.

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

 ---

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

@@ -146,10 +146,10 @@ index 628a059..8fdd031 100644

 1.9.1

-From adff5db39b45d8adef2b4579ec46ab1bb721a81f Mon Sep 17 00:00:00 2001

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

 From: Alexey Makhalov <amakhalov@vmware.com>

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

-Subject: [PATCH 03/12] Improved tsc based sched_clock & clocksource.

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

 ---

  arch/x86/Kconfig             |  1 +

@@ -159,10 +159,10 @@ Subject: [PATCH 03/12] Improved tsc based sched_clock & clocksource.

  4 files changed, 69 insertions(+), 11 deletions(-)

 diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig

-index 24141ac..ca0be27 100644

+index 3f6337e..8182ad6 100644

 --- a/arch/x86/Kconfig

 +++ b/arch/x86/Kconfig

-@@ -711,6 +711,7 @@ config KVM_DEBUG_FS

+@@ -713,6 +713,7 @@ config KVM_DEBUG_FS

  config VMWARE

  	bool "VMware Guest support"

  	depends on PARAVIRT

@@ -277,10 +277,10 @@ index 8fdd031..004825e 100644

 +	}

 +}

 diff --git a/init/main.c b/init/main.c

-index c386186..5650655 100644

+index ccc9a22..9e64d70 100644

 --- a/init/main.c

 +++ b/init/main.c

-@@ -929,9 +929,6 @@ static int try_to_run_init_process(const char *init_filename)

+@@ -928,9 +928,6 @@ static int try_to_run_init_process(const char *init_filename)

  }

  static noinline void __init kernel_init_freeable(void);

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

  static int __ref kernel_init(void *unused)

  {

-@@ -947,14 +944,6 @@ static int __ref kernel_init(void *unused)

+@@ -946,14 +943,6 @@ static int __ref kernel_init(void *unused)

  	flush_delayed_fput();

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

  		ret = run_init_process(ramdisk_execute_command);

  		if (!ret)

 diff --git a/kernel/sched/clock.c b/kernel/sched/clock.c

-index c0a2051..284a7ba 100644

+index caf4041..86d8a78 100644

 --- a/kernel/sched/clock.c

 +++ b/kernel/sched/clock.c

 @@ -385,8 +385,10 @@ u64 cpu_clock(int cpu)

@@ -324,10 +324,10 @@ index c0a2051..284a7ba 100644

 1.9.1

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

+From 543bcc0aa46846859c92be5effde0d900a456c2a Mon Sep 17 00:00:00 2001

 From: Alexey Makhalov <amakhalov@vmware.com>

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

-Subject: [PATCH 04/12] Move read_boot_clock64 into pv_time_ops.

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

 ---

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

@@ -341,10 +341,10 @@ Subject: [PATCH 04/12] Move read_boot_clock64 into pv_time_ops.

  8 files changed, 83 insertions(+), 38 deletions(-)

 diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig

-index ca0be27..d3ef8ef 100644

+index 8182ad6..4c3d10a 100644

 --- a/arch/x86/Kconfig

 +++ b/arch/x86/Kconfig

-@@ -709,13 +709,23 @@ config KVM_DEBUG_FS

+@@ -711,13 +711,23 @@ config KVM_DEBUG_FS

  	  may incur significant overhead.

  config VMWARE

@@ -371,10 +371,10 @@ index ca0be27..d3ef8ef 100644

  source "arch/x86/lguest/Kconfig"

 diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h

-index d143bfa..ffcbd18 100644

+index c759b3c..5ee3378 100644

 --- a/arch/x86/include/asm/paravirt.h

 +++ b/arch/x86/include/asm/paravirt.h

-@@ -201,6 +201,11 @@ static inline u64 paravirt_steal_clock(int cpu)

+@@ -198,6 +198,11 @@ static inline u64 paravirt_steal_clock(int cpu)

  	return PVOP_CALL1(u64, pv_time_ops.steal_clock, cpu);

  }

@@ -387,7 +387,7 @@ index d143bfa..ffcbd18 100644

  {

  	return PVOP_CALL1(u64, pv_cpu_ops.read_pmc, counter);

 diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h

-index a6b8f9f..7adcd55 100644

+index 3d44191..2e76e4a 100644

 --- a/arch/x86/include/asm/paravirt_types.h

 +++ b/arch/x86/include/asm/paravirt_types.h

 @@ -51,6 +51,10 @@ struct mm_struct;

@@ -401,10 +401,10 @@ index a6b8f9f..7adcd55 100644

  /*

   * Wrapper type for pointers to code which uses the non-standard

-@@ -98,6 +102,7 @@ struct pv_time_ops {

+@@ -102,6 +106,7 @@ struct pv_lazy_ops {

+ struct pv_time_ops {

  	unsigned long long (*sched_clock)(void);

  	unsigned long long (*steal_clock)(int cpu);

- 	unsigned long (*get_tsc_khz)(void);

 +	void (*read_boot_clock64)(struct timespec64 *ts);

  };

@@ -543,7 +543,7 @@ index 004825e..1bf1fe3 100644

 -	}

 -}

 diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S

-index eccf2d7..1dfd805 100644

+index 0f54608..1bc0140 100644

 --- a/arch/x86/kernel/head_64.S

 +++ b/arch/x86/kernel/head_64.S

 @@ -65,7 +65,7 @@ startup_64:

@@ -555,7 +555,7 @@ index eccf2d7..1dfd805 100644

  	/*

  	 * Read a TSC value first

  	 */

-@@ -522,12 +522,6 @@ early_gdt_descr:

+@@ -530,12 +530,6 @@ early_gdt_descr:

  early_gdt_descr_base:

  	.quad	INIT_PER_CPU_VAR(gdt_page)

@@ -569,10 +569,10 @@ index eccf2d7..1dfd805 100644

  	/* This must match the first entry in level2_kernel_pgt */

  	.quad   0x0000000000000000

 diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c

-index 58bcfb6..abf40ec 100644

+index c2130ae..0bb48cb 100644

 --- a/arch/x86/kernel/paravirt.c

 +++ b/arch/x86/kernel/paravirt.c

-@@ -210,6 +210,12 @@ static u64 native_steal_clock(int cpu)

+@@ -218,6 +218,12 @@ static u64 native_steal_clock(int cpu)

  	return 0;

  }

@@ -585,7 +585,7 @@ index 58bcfb6..abf40ec 100644

  /* These are in entry.S */

  extern void native_iret(void);

  extern void native_irq_enable_sysexit(void);

-@@ -320,6 +326,7 @@ struct pv_init_ops pv_init_ops = {

+@@ -328,6 +334,7 @@ struct pv_init_ops pv_init_ops = {

  struct pv_time_ops pv_time_ops = {

  	.sched_clock = native_sched_clock,

  	.steal_clock = native_steal_clock,

@@ -594,10 +594,10 @@ index 58bcfb6..abf40ec 100644

  __visible struct pv_irq_ops pv_irq_ops = {

 diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c

-index 80f874b..0d7022e 100644

+index d2bbe34..0003203 100644

 --- a/arch/x86/kernel/setup.c

 +++ b/arch/x86/kernel/setup.c

-@@ -1289,3 +1289,12 @@ static int __init register_kernel_offset_dumper(void)

+@@ -1280,3 +1280,12 @@ static int __init register_kernel_offset_dumper(void)

  	return 0;

  }

  __initcall(register_kernel_offset_dumper);

@@ -611,7 +611,7 @@ index 80f874b..0d7022e 100644

 +}

 +#endif

 diff --git a/kernel/sched/clock.c b/kernel/sched/clock.c

-index 284a7ba..615aeb4 100644

+index 86d8a78..377ab5a 100644

 --- a/kernel/sched/clock.c

 +++ b/kernel/sched/clock.c

 @@ -385,7 +385,12 @@ u64 cpu_clock(int cpu)

@@ -632,10 +632,10 @@ index 284a7ba..615aeb4 100644

 1.9.1

-From aa93eaec3f709633007ab6ce3ddbb8aaa455b557 Mon Sep 17 00:00:00 2001

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

 From: Alexey Makhalov <amakhalov@vmware.com>

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

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

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

 ---

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

@@ -730,10 +730,10 @@ index 1bf1fe3..0b89bb9 100644

 1.9.1

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

+From 15e6d2cc5239e58ab805f882650ad7de9b163228 Mon Sep 17 00:00:00 2001

 From: Alexey Makhalov <amakhalov@vmware.com>

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

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

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

 ---

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

@@ -820,10 +820,10 @@ index 0b89bb9..b16618b 100644

 1.9.1

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

+From 10ebf94df7ed241429a04b2cc3c2d590dd97d7dd Mon Sep 17 00:00:00 2001

 From: Alexey Makhalov <amakhalov@vmware.com>

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

-Subject: [PATCH 07/12] Skip rdrand reseed

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

 ---

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

@@ -831,10 +831,10 @@ Subject: [PATCH 07/12] Skip rdrand reseed

  2 files changed, 4 insertions(+)

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

-index cb9e5df..5327c74 100644

+index c2b7522..45a37da 100644

 --- a/arch/x86/kernel/cpu/common.c

 +++ b/arch/x86/kernel/cpu/common.c

-@@ -943,7 +943,9 @@ static void identify_cpu(struct cpuinfo_x86 *c)

+@@ -944,7 +944,9 @@ static void identify_cpu(struct cpuinfo_x86 *c)

  #endif

  	init_hypervisor(c);

@@ -865,10 +865,10 @@ index 136ac74..0685891 100644

 1.9.1

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

+From 237e42455bd98cf6e0e0725d35bba1b6d0d04822 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/12] STA implementation. first version.

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

 ---

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

@@ -1090,10 +1090,10 @@ index b16618b..cf1fb64 100644

 1.9.1

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

+From 21249118757b7232948c8401ba5d0b039cd0fa35 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/12] STA. updated version

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

 ---

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

@@ -1179,10 +1179,10 @@ index cf1fb64..196703c 100644

 1.9.1

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

+From 7061430a3c8906e67978da76a73967b0b26aece7 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/12] STA: version with a single backdoor command.

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

 ---

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

@@ -1270,20 +1270,20 @@ index 196703c..743b8ad 100644

 1.9.1

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

+From ee3ab56a4bdca7e514b4d07b6a70f724cde7f0f5 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/12] Remove delays for smpboot

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

 ---

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

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

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

+ 1 file changed, 1 insertion(+), 1 deletion(-)

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

-index b1f3ed9..8f0be52 100644

+index fbabe4f..5a18dd6 100644

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

 +++ b/arch/x86/kernel/smpboot.c

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

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

  	/*

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

  	 */

@@ -1292,32 +1292,14 @@ index b1f3ed9..8f0be52 100644

  	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

-From 3fe2ad9c5031e059849ba0970ccee95ce07f8239 Mon Sep 17 00:00:00 2001

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

 From: Alexey Makhalov <amakhalov@vmware.com>

 Date: Tue, 29 Mar 2016 21:14:46 +0000

-Subject: [PATCH 12/12] kmsg_dumper to vmware.log

+Subject: [PATCH 12/13] kmsg_dumper to vmware.log

 ---

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

@@ -1506,3 +1488,56 @@ index 743b8ad..e9f7d52 100644

 -- 

 1.9.1

+

+From 9edf1bf3a56c8c8048d2958d13283df5a283acd1 Mon Sep 17 00:00:00 2001

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

+Date: Mon, 9 May 2016 04:14:03 -0700

+Subject: [PATCH 13/13] __native_read_tsc() -> rdtsc()

+

+---

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

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

+

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

+index e9f7d52..57cef56 100644

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

+@@ -130,7 +130,7 @@ uint64_t __initdata vtsc_khz;

+ 

+ static cycle_t vmware_clock_get_cycles(struct clocksource *cs)

+ {

+-	return __native_read_tsc();

++	return rdtsc();

+ }

+ 

+ static struct clocksource clocksource_vmware = {

+@@ -154,7 +154,7 @@ static u64 vmware_sched_clock(void)

+ {

+ 	u64 ret;

+ 

+-	ret = __native_read_tsc() - vmware_cyc2ns.cyc2ns_offset;

++	ret = rdtsc() - vmware_cyc2ns.cyc2ns_offset;

+ 	ret = mul_u64_u32_shr(ret, vmware_cyc2ns.cyc2ns_mul, CYC2NS_SCALE_FACTOR);

+ 	return ret;

+ }

+@@ -169,7 +169,7 @@ static void vmware_read_boot_clock64(struct timespec64 *ts)

+ 	u32 rem;

+ 

+ 	read_persistent_clock64(&now);

+-	delta = __native_read_tsc() - vmware_cyc2ns.cyc2ns_offset;

++	delta = rdtsc() - vmware_cyc2ns.cyc2ns_offset;

+ 	delta_nsec = mul_u64_u32_shr(delta, vmware_cyc2ns.cyc2ns_mul,

+ 					CYC2NS_SCALE_FACTOR);

+ 	ts->tv_sec = now.tv_sec - div_s64_rem(delta_nsec, NSEC_PER_SEC, &rem);

+@@ -369,7 +369,7 @@ static void __init vmware_platform_setup(void)

+ static uint32_t __init vmware_platform(void)

+ {

+ #ifndef CONFIG_VMWARE_ONLY

+-	tsc_at_head = __native_read_tsc();

++	tsc_at_head = rdtsc();

+ #endif

+ 	if (cpu_has_hypervisor) {

+ 		unsigned int eax;

+-- 

+1.9.1

+

@@ -1,4 +1,4 @@

-From ffc0634118254dde4449900a65fc8bdb3d7a52d0 Mon Sep 17 00:00:00 2001

+From 5ff0b9e728e23e54001c2bb6df29d85ac2c5e08f Mon Sep 17 00:00:00 2001

 From: Alexey Makhalov <amakhalov@vmware.com>

 Date: Fri, 25 Mar 2016 21:51:12 +0000

 Subject: [PATCH] sunrpc: xs_bind uses ip_local_reserved_ports

@@ -8,10 +8,10 @@ Subject: [PATCH] sunrpc: xs_bind uses ip_local_reserved_ports

  1 file changed, 6 insertions(+), 1 deletion(-)

 diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c

-index 0030376..c58db46 100644

+index 2ffaf6a..90543d6 100644

 --- a/net/sunrpc/xprtsock.c

 +++ b/net/sunrpc/xprtsock.c

-@@ -1690,9 +1690,11 @@ static unsigned short xs_next_srcport(struct sock_xprt *transport, unsigned shor

+@@ -1798,9 +1798,11 @@ static unsigned short xs_next_srcport(struct sock_xprt *transport, unsigned shor

  static int xs_bind(struct sock_xprt *transport, struct socket *sock)

  {

  	struct sockaddr_storage myaddr;

@@ -24,7 +24,7 @@ index 0030376..c58db46 100644

  	/*

  	 * If we are asking for any ephemeral port (i.e. port == 0 &&

-@@ -1714,6 +1716,8 @@ static int xs_bind(struct sock_xprt *transport, struct socket *sock)

+@@ -1822,6 +1824,8 @@ static int xs_bind(struct sock_xprt *transport, struct socket *sock)

  	memcpy(&myaddr, &transport->srcaddr, transport->xprt.addrlen);

  	do {

@@ -33,7 +33,7 @@ index 0030376..c58db46 100644

  		rpc_set_port((struct sockaddr *)&myaddr, port);

  		err = kernel_bind(sock, (struct sockaddr *)&myaddr,

  				transport->xprt.addrlen);

-@@ -1721,6 +1725,7 @@ static int xs_bind(struct sock_xprt *transport, struct socket *sock)

+@@ -1829,6 +1833,7 @@ static int xs_bind(struct sock_xprt *transport, struct socket *sock)

  			transport->srcport = port;

  			break;

  		}

deleted file mode 100644

@@ -1,75 +0,0 @@

-From 7ca88764d45c209791e8813131c1457c2e9e51e7 Mon Sep 17 00:00:00 2001

-From: Yevgeny Pats <yevgeny@perception-point.io>

-Date: Mon, 11 Jan 2016 12:05:28 +0000

-Subject: KEYS: Fix keyring ref leak in join_session_keyring()

-

-If a thread is asked to join as a session keyring the keyring that's already

-set as its session, we leak a keyring reference.

-

-This can be tested with the following program:

-

-	#include <stddef.h>

-	#include <stdio.h>

-	#include <sys/types.h>

-	#include <keyutils.h>

-

-	int main(int argc, const char *argv[])

-	{

-		int i = 0;

-		key_serial_t serial;

-

-		serial = keyctl(KEYCTL_JOIN_SESSION_KEYRING,

-				"leaked-keyring");

-		if (serial < 0) {

-			perror("keyctl");

-			return -1;

-		}

-

-		if (keyctl(KEYCTL_SETPERM, serial,

-			   KEY_POS_ALL | KEY_USR_ALL) < 0) {

-			perror("keyctl");

-			return -1;

-		}

-

-		for (i = 0; i < 100; i++) {

-			serial = keyctl(KEYCTL_JOIN_SESSION_KEYRING,

-					"leaked-keyring");

-			if (serial < 0) {

-				perror("keyctl");

-				return -1;

-			}

-		}

-

-		return 0;

-	}

-

-If, after the program has run, there something like the following line in

-/proc/keys:

-

-3f3d898f I--Q---   100 perm 3f3f0000     0     0 keyring   leaked-keyring: empty

-

-with a usage count of 100 * the number of times the program has been run,

-then the kernel is malfunctioning.  If leaked-keyring has zero usages or

-has been garbage collected, then the problem is fixed.

-

-Reported-by: Yevgeny Pats <yevgeny@perception-point.io>

-Signed-off-by: David Howells <dhowells@redhat.com>

- security/keys/process_keys.c | 1 +

- 1 file changed, 1 insertion(+)

-

-diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c

-index a3f85d2..e6d50172 100644

-+++ b/security/keys/process_keys.c

-@@ -794,6 +794,7 @@ long join_session_keyring(const char *name)

- 		ret = PTR_ERR(keyring);

- 		goto error2;

- 	} else if (keyring == new->session_keyring) {

-+		key_put(keyring);

- 		ret = 0;

- 		goto error2;

- 	}

-2.7.0.rc3

-

deleted file mode 100644

@@ -1,53 +0,0 @@

-From	Quentin Casasnovas <>

-Subject	[PATCH] RDS: fix race condition when sending a message on unbound socket.

-Date	Fri, 16 Oct 2015 17:11:42 +0200

-	

-

-Sasha's found a NULL pointer dereference in the RDS connection code when

-sending a message to an apparently unbound socket.  The problem is caused

-by the code checking if the socket is bound in rds_sendmsg(), which checks

-the rs_bound_addr field without taking a lock on the socket.  This opens a

-race where rs_bound_addr is temporarily set but where the transport is not

-in rds_bind(), leading to a NULL pointer dereference when trying to

-dereference 'trans' in __rds_conn_create().

-

-Vegard wrote a reproducer for this issue, so kindly ask him to share if

-you're interested.

-

-I cannot reproduce the NULL pointer dereference using Vegard's reproducer

-with this patch, whereas I could without.

-

-Complete earlier incomplete fix to CVE-2015-6937:

-

-  74e98eb08588 ("RDS: verify the underlying transport exists before creating a connection")

-

-Signed-off-by: Quentin Casasnovas <quentin.casasnovas@oracle.com>

-Reviewed-by: Vegard Nossum <vegard.nossum@oracle.com>

-Reviewed-by: Sasha Levin <sasha.levin@oracle.com>

-Cc: Vegard Nossum <vegard.nossum@oracle.com>

-Cc: Sasha Levin <sasha.levin@oracle.com>

-Cc: Chien Yen <chien.yen@oracle.com>

-Cc: Santosh Shilimkar <santosh.shilimkar@oracle.com>

-Cc: David S. Miller <davem@davemloft.net>

-Cc: stable@vger.kernel.org

-diff -ru a/net/rds/send.c b/net/rds/send.c

-+++ b/net/rds/send.c	2016-02-03 15:10:09.535283384 -0800

-@@ -986,11 +986,13 @@

- 		release_sock(sk);

- 	}

- 

--	/* racing with another thread binding seems ok here */

-+        lock_sock(sk);

- 	if (daddr == 0 || rs->rs_bound_addr == 0) {

-+                release_sock(sk);

- 		ret = -ENOTCONN; /* XXX not a great errno */

- 		goto out;

- 	}

-+        release_sock(sk);

- 

- 	/* size of rm including all sgs */

- 	ret = rds_rm_size(msg, payload_len);

-2.4.9

deleted file mode 100644

@@ -1,110 +0,0 @@

-From 0fdea1e8a2853f79d39b8555cc9de16a7e0ab26f Mon Sep 17 00:00:00 2001

-From: Trond Myklebust <trond.myklebust@primarydata.com>

-Date: Wed, 16 Sep 2015 23:43:17 -0400

-Subject: [PATCH] SUNRPC: Ensure that we wait for connections to complete

- before retrying

-

-Commit 718ba5b87343, moved the responsibility for unlocking the socket to

-xs_tcp_setup_socket, meaning that the socket will be unlocked before we