Linux v4.5-12257-g8b97be054572

- staging, timers, perf, irq, x86, sched, locking merges

6 files changed, 16 insertions, 61 deletions

diff --git a/config-x86-generic b/config-x86-generic
index 606227d45..29c7aa913 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -19,6 +19,8 @@ CONFIG_MICROCODE_INTEL_EARLY=y
 CONFIG_MICROCODE_AMD=y
 CONFIG_MICROCODE_AMD_EARLY=y
 
+CONFIG_PERF_EVENTS_AMD_POWER=m
+
 CONFIG_X86_MSR=y
 CONFIG_X86_CPUID=y
 CONFIG_EDD=m
diff --git a/gitrev b/gitrev
index d025a5181..fa0e64c36 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-aca04ce5dbda50758b813b1e3d710098991cfa9a
+8b97be054572fc769619184dcc174e280a5c851c
diff --git a/kernel.spec b/kernel.spec
index 4703cb7d4..c06e6a6c4 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -69,7 +69,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 0
 # The git snapshot level
-%define gitrev 23
+%define gitrev 24
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -614,9 +614,6 @@ Patch665: netfilter-x_tables-deal-with-bogus-nextoffset-values.patch
 
 Patch667: intel_pstate-Do-not-call-wrmsrl_on_cpu-with-disabled.patch
 
-#rhbz 1318596
-Patch668: x86-tsc-Prevent-NULL-pointer-deref-in-calibrate_dela.patch
-
 #CVE-2016-3137 rhbz 1317010 1316996
 Patch672: cypress_m8-add-sanity-checking.patch
 
@@ -2165,6 +2162,10 @@ fi
 #
 # 
 %changelog
+* Thu Mar 24 2016 Josh Boyer <jwboyer@fedoraproject.org> - 4.6.0-0.rc0.git24.1
+- Linux v4.5-12257-g8b97be054572
+- staging, timers, perf, irq, x86, sched, locking merges
+
 * Thu Mar 24 2016 jwboyer@gmail.com - 4.6.0-0.rc0.git23.1
 - Linux v4.5-12149-gaca04ce
 - net, pwm, target, platform-drivers merges
diff --git a/sources b/sources
index 3b06ba717..2cdd5151f 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 a60d48eee08ec0536d5efb17ca819aef  linux-4.5.tar.xz
 6f557fe90b800b615c85c2ca04da6154  perf-man-4.5.tar.gz
-abe8776dc52dc9be730b3bab89855b41  patch-4.5-git23.xz
+2fa0353a02b97c54626e54d130a098bf  patch-4.5-git24.xz
diff --git a/x86-Lock-down-IO-port-access-when-module-security-is.patch b/x86-Lock-down-IO-port-access-when-module-security-is.patch
index 708006c2e..185b1da99 100644
--- a/x86-Lock-down-IO-port-access-when-module-security-is.patch
+++ b/x86-Lock-down-IO-port-access-when-module-security-is.patch
@@ -1,8 +1,7 @@
-From 7a3cdd26e6d38031338a6cb591ec2f3faaa9234b Mon Sep 17 00:00:00 2001
+From 8010b5eb4680df797575e6306d4d891200e303ab Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <matthew.garrett@nebula.com>
 Date: Thu, 8 Mar 2012 10:35:59 -0500
-Subject: [PATCH 03/20] x86: Lock down IO port access when module security is
- enabled
+Subject: [PATCH] x86: Lock down IO port access when module security is enabled
 
 IO port access would permit users to gain access to PCI configuration
 registers, which in turn (on a lot of hardware) give access to MMIO register
@@ -16,7 +15,7 @@ Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
  2 files changed, 7 insertions(+), 2 deletions(-)
 
 diff --git a/arch/x86/kernel/ioport.c b/arch/x86/kernel/ioport.c
-index 37dae792dbbe..1ecc03ca3c15 100644
+index 589b3193f102..ab8372443efb 100644
 --- a/arch/x86/kernel/ioport.c
 +++ b/arch/x86/kernel/ioport.c
 @@ -15,6 +15,7 @@
@@ -36,7 +35,7 @@ index 37dae792dbbe..1ecc03ca3c15 100644
  		return -EPERM;
  
  	/*
-@@ -103,7 +104,7 @@ SYSCALL_DEFINE1(iopl, unsigned int, level)
+@@ -108,7 +109,7 @@ SYSCALL_DEFINE1(iopl, unsigned int, level)
  		return -EINVAL;
  	/* Trying to gain more privileges? */
  	if (level > old) {
@@ -44,9 +43,9 @@ index 37dae792dbbe..1ecc03ca3c15 100644
 +		if (!capable(CAP_SYS_RAWIO) || secure_modules())
  			return -EPERM;
  	}
- 	regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12);
+ 	regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) |
 diff --git a/drivers/char/mem.c b/drivers/char/mem.c
-index 6b1721f978c2..53fe675f9bd7 100644
+index 71025c2f6bbb..86e5bfa91563 100644
 --- a/drivers/char/mem.c
 +++ b/drivers/char/mem.c
 @@ -27,6 +27,7 @@
@@ -68,5 +67,5 @@ index 6b1721f978c2..53fe675f9bd7 100644
  		return -EFAULT;
  	while (count-- > 0 && i < 65536) {
 -- 
-2.4.3
+2.5.5
 
diff --git a/x86-tsc-Prevent-NULL-pointer-deref-in-calibrate_dela.patch b/x86-tsc-Prevent-NULL-pointer-deref-in-calibrate_dela.patch
deleted file mode 100644
index fec34743f..000000000
--- a/x86-tsc-Prevent-NULL-pointer-deref-in-calibrate_dela.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 6b1292e2e61669457398e3b55e46490e7efca5f0 Mon Sep 17 00:00:00 2001
-From: Thomas Gleixner <tglx@linutronix.de>
-Date: Fri, 18 Mar 2016 08:35:29 +0100
-Subject: [PATCH] x86/tsc: Prevent NULL pointer deref in
- calibrate_delay_is_known()
-
-The topology_core_cpumask is used to find a neighbour cpu in
-calibrate_delay_is_known(). It might not be allocated at the first invocation
-of that function on the boot cpu, when CONFIG_CPUMASK_OFFSTACK is set.
-
-The mask is allocated later in native_smp_prepare_cpus. As a consequence the
-underlying find_next_bit() call dereferences a NULL pointer.
-
-Add a proper check to prevent this.
-
-Reported-by: Richard W.M. Jones <rjones@redhat.com>
-Fixes: c25323c07345 "x86/tsc: Use topology functions"
-Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-Cc: Josh Boyer <jwboyer@fedoraproject.org>
----
- arch/x86/kernel/tsc.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
-index 56380440d862..99b5e0809ead 100644
---- a/arch/x86/kernel/tsc.c
-+++ b/arch/x86/kernel/tsc.c
-@@ -1306,11 +1306,15 @@ void __init tsc_init(void)
- unsigned long calibrate_delay_is_known(void)
- {
- 	int sibling, cpu = smp_processor_id();
-+	struct cpumask *mask = topology_core_cpumask(cpu);
- 
- 	if (!tsc_disabled && !cpu_has(&cpu_data(cpu), X86_FEATURE_CONSTANT_TSC))
- 		return 0;
- 
--	sibling = cpumask_any_but(topology_core_cpumask(cpu), cpu);
-+	if (!mask)
-+		return 0;
-+
-+	sibling = cpumask_any_but(mask, cpu);
- 	if (sibling < nr_cpu_ids)
- 		return cpu_data(sibling).loops_per_jiffy;
- 	return 0;
--- 
-2.5.0
-