linux: update to 4.8.15

12 files changed, 3336 insertions, 3642 deletions

diff --git a/target/linux/patches/4.8.11/sparc32.patch b/target/linux/patches/4.8.11/sparc32.patch
deleted file mode 100644
index b11e3b7f1..000000000
--- a/target/linux/patches/4.8.11/sparc32.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-commit 07b5ab3f71d318e52c18cc3b73c1d44c908aacfa
-Author: Andreas Larsson <andreas@gaisler.com>
-Date:   Wed Nov 9 10:43:05 2016 +0100
-
-    sparc32: Fix inverted invalid_frame_pointer checks on sigreturns
-    
-    Signed-off-by: Andreas Larsson <andreas@gaisler.com>
-    Signed-off-by: David S. Miller <davem@davemloft.net>
-
-diff --git a/arch/sparc/kernel/signal_32.c b/arch/sparc/kernel/signal_32.c
-index c3c12ef..9c0c8fd 100644
---- a/arch/sparc/kernel/signal_32.c
-+++ b/arch/sparc/kernel/signal_32.c
-@@ -89,7 +89,7 @@ asmlinkage void do_sigreturn(struct pt_regs *regs)
- 	sf = (struct signal_frame __user *) regs->u_regs[UREG_FP];
- 
- 	/* 1. Make sure we are not getting garbage from the user */
--	if (!invalid_frame_pointer(sf, sizeof(*sf)))
-+	if (invalid_frame_pointer(sf, sizeof(*sf)))
- 		goto segv_and_exit;
- 
- 	if (get_user(ufp, &sf->info.si_regs.u_regs[UREG_FP]))
-@@ -150,7 +150,7 @@ asmlinkage void do_rt_sigreturn(struct pt_regs *regs)
- 
- 	synchronize_user_stack();
- 	sf = (struct rt_signal_frame __user *) regs->u_regs[UREG_FP];
--	if (!invalid_frame_pointer(sf, sizeof(*sf)))
-+	if (invalid_frame_pointer(sf, sizeof(*sf)))
- 		goto segv;
- 
- 	if (get_user(ufp, &sf->regs.u_regs[UREG_FP]))
diff --git a/target/linux/patches/4.8.11/crisv32.patch b/target/linux/patches/4.8.15/crisv32.patch
index cb9b0d028..cb9b0d028 100644
--- a/target/linux/patches/4.8.11/crisv32.patch
+++ b/target/linux/patches/4.8.15/crisv32.patch
diff --git a/target/linux/patches/4.8.11/crisv32_ethernet_driver.patch b/target/linux/patches/4.8.15/crisv32_ethernet_driver.patch
index 0cef202fc..0cef202fc 100644
--- a/target/linux/patches/4.8.11/crisv32_ethernet_driver.patch
+++ b/target/linux/patches/4.8.15/crisv32_ethernet_driver.patch
diff --git a/target/linux/patches/4.8.11/initramfs-nosizelimit.patch b/target/linux/patches/4.8.15/initramfs-nosizelimit.patch
index 40d2f6bd8..40d2f6bd8 100644
--- a/target/linux/patches/4.8.11/initramfs-nosizelimit.patch
+++ b/target/linux/patches/4.8.15/initramfs-nosizelimit.patch
diff --git a/target/linux/patches/4.8.11/ld-or1k.patch b/target/linux/patches/4.8.15/ld-or1k.patch
index 264f9166f..264f9166f 100644
--- a/target/linux/patches/4.8.11/ld-or1k.patch
+++ b/target/linux/patches/4.8.15/ld-or1k.patch
diff --git a/target/linux/patches/4.8.11/macsonic.patch b/target/linux/patches/4.8.15/macsonic.patch
index 75a6fcad2..75a6fcad2 100644
--- a/target/linux/patches/4.8.11/macsonic.patch
+++ b/target/linux/patches/4.8.15/macsonic.patch
diff --git a/target/linux/patches/4.8.11/microblaze-sigaltstack.patch b/target/linux/patches/4.8.15/microblaze-sigaltstack.patch
index c4064e8b9..c4064e8b9 100644
--- a/target/linux/patches/4.8.11/microblaze-sigaltstack.patch
+++ b/target/linux/patches/4.8.15/microblaze-sigaltstack.patch
diff --git a/target/linux/patches/4.8.11/or1k-more-ram.patch b/target/linux/patches/4.8.15/or1k-more-ram.patch
index de848c838..de848c838 100644
--- a/target/linux/patches/4.8.11/or1k-more-ram.patch
+++ b/target/linux/patches/4.8.15/or1k-more-ram.patch
diff --git a/target/linux/patches/4.8.11/patch-realtime b/target/linux/patches/4.8.15/patch-realtime
index 91b37c52f..d3a9ebee7 100644
--- a/target/linux/patches/4.8.11/patch-realtime
+++ b/target/linux/patches/4.8.15/patch-realtime
@@ -1,334 +1,6 @@
-diff --git a/Documentation/hwlat_detector.txt b/Documentation/hwlat_detector.txt
-new file mode 100644
-index 000000000000..cb61516483d3
---- /dev/null
-+++ b/Documentation/hwlat_detector.txt
-@@ -0,0 +1,64 @@
-+Introduction:
-+-------------
-+
-+The module hwlat_detector is a special purpose kernel module that is used to
-+detect large system latencies induced by the behavior of certain underlying
-+hardware or firmware, independent of Linux itself. The code was developed
-+originally to detect SMIs (System Management Interrupts) on x86 systems,
-+however there is nothing x86 specific about this patchset. It was
-+originally written for use by the "RT" patch since the Real Time
-+kernel is highly latency sensitive.
-+
-+SMIs are usually not serviced by the Linux kernel, which typically does not
-+even know that they are occuring. SMIs are instead are set up by BIOS code
-+and are serviced by BIOS code, usually for "critical" events such as
-+management of thermal sensors and fans. Sometimes though, SMIs are used for
-+other tasks and those tasks can spend an inordinate amount of time in the
-+handler (sometimes measured in milliseconds). Obviously this is a problem if
-+you are trying to keep event service latencies down in the microsecond range.
-+
-+The hardware latency detector works by hogging all of the cpus for configurable
-+amounts of time (by calling stop_machine()), polling the CPU Time Stamp Counter
-+for some period, then looking for gaps in the TSC data. Any gap indicates a
-+time when the polling was interrupted and since the machine is stopped and
-+interrupts turned off the only thing that could do that would be an SMI.
-+
-+Note that the SMI detector should *NEVER* be used in a production environment.
-+It is intended to be run manually to determine if the hardware platform has a
-+problem with long system firmware service routines.
-+
-+Usage:
-+------
-+
-+Loading the module hwlat_detector passing the parameter "enabled=1" (or by
-+setting the "enable" entry in "hwlat_detector" debugfs toggled on) is the only
-+step required to start the hwlat_detector. It is possible to redefine the
-+threshold in microseconds (us) above which latency spikes will be taken
-+into account (parameter "threshold=").
-+
-+Example:
-+
-+	# modprobe hwlat_detector enabled=1 threshold=100
-+
-+After the module is loaded, it creates a directory named "hwlat_detector" under
-+the debugfs mountpoint, "/debug/hwlat_detector" for this text. It is necessary
-+to have debugfs mounted, which might be on /sys/debug on your system.
-+
-+The /debug/hwlat_detector interface contains the following files:
-+
-+count			- number of latency spikes observed since last reset
-+enable			- a global enable/disable toggle (0/1), resets count
-+max			- maximum hardware latency actually observed (usecs)
-+sample			- a pipe from which to read current raw sample data
-+			  in the format <timestamp> <latency observed usecs>
-+			  (can be opened O_NONBLOCK for a single sample)
-+threshold		- minimum latency value to be considered (usecs)
-+width			- time period to sample with CPUs held (usecs)
-+			  must be less than the total window size (enforced)
-+window			- total period of sampling, width being inside (usecs)
-+
-+By default we will set width to 500,000 and window to 1,000,000, meaning that
-+we will sample every 1,000,000 usecs (1s) for 500,000 usecs (0.5s). If we
-+observe any latencies that exceed the threshold (initially 100 usecs),
-+then we write to a global sample ring buffer of 8K samples, which is
-+consumed by reading from the "sample" (pipe) debugfs file interface.
-diff --git a/Documentation/sysrq.txt b/Documentation/sysrq.txt
-index 3a3b30ac2a75..9e0745cafbd8 100644
---- a/Documentation/sysrq.txt
-+++ b/Documentation/sysrq.txt
-@@ -59,10 +59,17 @@ On PowerPC - Press 'ALT - Print Screen (or F13) - <command key>,
- On other - If you know of the key combos for other architectures, please
-            let me know so I can add them to this section.
- 
--On all -  write a character to /proc/sysrq-trigger.  e.g.:
--
-+On all -  write a character to /proc/sysrq-trigger, e.g.:
- 		echo t > /proc/sysrq-trigger
- 
-+On all - Enable network SysRq by writing a cookie to icmp_echo_sysrq, e.g.
-+		echo 0x01020304 >/proc/sys/net/ipv4/icmp_echo_sysrq
-+	 Send an ICMP echo request with this pattern plus the particular
-+	 SysRq command key. Example:
-+		# ping -c1 -s57 -p0102030468
-+	 will trigger the SysRq-H (help) command.
-+
-+
- *  What are the 'command' keys?
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- 'b'     - Will immediately reboot the system without syncing or unmounting
-diff --git a/Documentation/trace/histograms.txt b/Documentation/trace/histograms.txt
-new file mode 100644
-index 000000000000..6f2aeabf7faa
---- /dev/null
-+++ b/Documentation/trace/histograms.txt
-@@ -0,0 +1,186 @@
-+		Using the Linux Kernel Latency Histograms
-+
-+
-+This document gives a short explanation how to enable, configure and use
-+latency histograms. Latency histograms are primarily relevant in the
-+context of real-time enabled kernels (CONFIG_PREEMPT/CONFIG_PREEMPT_RT)
-+and are used in the quality management of the Linux real-time
-+capabilities.
-+
-+
-+* Purpose of latency histograms
-+
-+A latency histogram continuously accumulates the frequencies of latency
-+data. There are two types of histograms
-+- potential sources of latencies
-+- effective latencies
-+
-+
-+* Potential sources of latencies
-+
-+Potential sources of latencies are code segments where interrupts,
-+preemption or both are disabled (aka critical sections). To create
-+histograms of potential sources of latency, the kernel stores the time
-+stamp at the start of a critical section, determines the time elapsed
-+when the end of the section is reached, and increments the frequency
-+counter of that latency value - irrespective of whether any concurrently
-+running process is affected by latency or not.
-+- Configuration items (in the Kernel hacking/Tracers submenu)
-+  CONFIG_INTERRUPT_OFF_LATENCY
-+  CONFIG_PREEMPT_OFF_LATENCY
-+
-+
-+* Effective latencies
-+
-+Effective latencies are actually occuring during wakeup of a process. To
-+determine effective latencies, the kernel stores the time stamp when a
-+process is scheduled to be woken up, and determines the duration of the
-+wakeup time shortly before control is passed over to this process. Note
-+that the apparent latency in user space may be somewhat longer, since the
-+process may be interrupted after control is passed over to it but before
-+the execution in user space takes place. Simply measuring the interval
-+between enqueuing and wakeup may also not appropriate in cases when a
-+process is scheduled as a result of a timer expiration. The timer may have
-+missed its deadline, e.g. due to disabled interrupts, but this latency
-+would not be registered. Therefore, the offsets of missed timers are
-+recorded in a separate histogram. If both wakeup latency and missed timer
-+offsets are configured and enabled, a third histogram may be enabled that
-+records the overall latency as a sum of the timer latency, if any, and the
-+wakeup latency. This histogram is called "timerandwakeup".
-+- Configuration items (in the Kernel hacking/Tracers submenu)
-+  CONFIG_WAKEUP_LATENCY
-+  CONFIG_MISSED_TIMER_OFSETS
-+
-+
-+* Usage
-+
-+The interface to the administration of the latency histograms is located
-+in the debugfs file system. To mount it, either enter
-+
-+mount -t sysfs nodev /sys
-+mount -t debugfs nodev /sys/kernel/debug
-+
-+from shell command line level, or add
-+
-+nodev	/sys			sysfs	defaults	0 0
-+nodev	/sys/kernel/debug	debugfs	defaults	0 0
-+
-+to the file /etc/fstab. All latency histogram related files are then
-+available in the directory /sys/kernel/debug/tracing/latency_hist. A
-+particular histogram type is enabled by writing non-zero to the related
-+variable in the /sys/kernel/debug/tracing/latency_hist/enable directory.
-+Select "preemptirqsoff" for the histograms of potential sources of
-+latencies and "wakeup" for histograms of effective latencies etc. The
-+histogram data - one per CPU - are available in the files
-+
-+/sys/kernel/debug/tracing/latency_hist/preemptoff/CPUx
-+/sys/kernel/debug/tracing/latency_hist/irqsoff/CPUx
-+/sys/kernel/debug/tracing/latency_hist/preemptirqsoff/CPUx
-+/sys/kernel/debug/tracing/latency_hist/wakeup/CPUx
-+/sys/kernel/debug/tracing/latency_hist/wakeup/sharedprio/CPUx
-+/sys/kernel/debug/tracing/latency_hist/missed_timer_offsets/CPUx
-+/sys/kernel/debug/tracing/latency_hist/timerandwakeup/CPUx
-+
-+The histograms are reset by writing non-zero to the file "reset" in a
-+particular latency directory. To reset all latency data, use
-+
-+#!/bin/sh
-+
-+TRACINGDIR=/sys/kernel/debug/tracing
-+HISTDIR=$TRACINGDIR/latency_hist
-+
-+if test -d $HISTDIR
-+then
-+  cd $HISTDIR
-+  for i in `find . | grep /reset$`
-+  do
-+    echo 1 >$i
-+  done
-+fi
-+
-+
-+* Data format
-+
-+Latency data are stored with a resolution of one microsecond. The
-+maximum latency is 10,240 microseconds. The data are only valid, if the
-+overflow register is empty. Every output line contains the latency in
-+microseconds in the first row and the number of samples in the second
-+row. To display only lines with a positive latency count, use, for
-+example,
-+
-+grep -v " 0$" /sys/kernel/debug/tracing/latency_hist/preemptoff/CPU0
-+
-+#Minimum latency: 0 microseconds.
-+#Average latency: 0 microseconds.
-+#Maximum latency: 25 microseconds.
-+#Total samples: 3104770694
-+#There are 0 samples greater or equal than 10240 microseconds
-+#usecs	         samples
-+    0	      2984486876
-+    1	        49843506
-+    2	        58219047
-+    3	         5348126
-+    4	         2187960
-+    5	         3388262
-+    6	          959289
-+    7	          208294
-+    8	           40420
-+    9	            4485
-+   10	           14918
-+   11	           18340
-+   12	           25052
-+   13	           19455
-+   14	            5602
-+   15	             969
-+   16	              47
-+   17	              18
-+   18	              14
-+   19	               1
-+   20	               3
-+   21	               2
-+   22	               5
-+   23	               2
-+   25	               1
-+
-+
-+* Wakeup latency of a selected process
-+
-+To only collect wakeup latency data of a particular process, write the
-+PID of the requested process to
-+
-+/sys/kernel/debug/tracing/latency_hist/wakeup/pid
-+
-+PIDs are not considered, if this variable is set to 0.
-+
-+
-+* Details of the process with the highest wakeup latency so far
-+
-+Selected data of the process that suffered from the highest wakeup
-+latency that occurred in a particular CPU are available in the file
-+
-+/sys/kernel/debug/tracing/latency_hist/wakeup/max_latency-CPUx.
-+
-+In addition, other relevant system data at the time when the
-+latency occurred are given.
-+
-+The format of the data is (all in one line):
-+<PID> <Priority> <Latency> (<Timeroffset>) <Command> \
-+<- <PID> <Priority> <Command> <Timestamp>
-+
-+The value of <Timeroffset> is only relevant in the combined timer
-+and wakeup latency recording. In the wakeup recording, it is
-+always 0, in the missed_timer_offsets recording, it is the same
-+as <Latency>.
-+
-+When retrospectively searching for the origin of a latency and
-+tracing was not enabled, it may be helpful to know the name and
-+some basic data of the task that (finally) was switching to the
-+late real-tlme task. In addition to the victim's data, also the
-+data of the possible culprit are therefore displayed after the
-+"<-" symbol.
-+
-+Finally, the timestamp of the time when the latency occurred
-+in <seconds>.<microseconds> after the most recent system boot
-+is provided.
-+
-+These data are also reset when the wakeup histogram is reset.
-diff --git a/arch/Kconfig b/arch/Kconfig
-index fd6e9712af81..085134ee13e9 100644
---- a/arch/Kconfig
-+++ b/arch/Kconfig
-@@ -9,6 +9,7 @@ config OPROFILE
- 	tristate "OProfile system profiling"
- 	depends on PROFILING
- 	depends on HAVE_OPROFILE
-+	depends on !PREEMPT_RT_FULL
- 	select RING_BUFFER
- 	select RING_BUFFER_ALLOW_SWAP
- 	help
-@@ -52,6 +53,7 @@ config KPROBES
- config JUMP_LABEL
-        bool "Optimize very unlikely/likely branches"
-        depends on HAVE_ARCH_JUMP_LABEL
-+       depends on (!INTERRUPT_OFF_HIST && !PREEMPT_OFF_HIST && !WAKEUP_LATENCY_HIST && !MISSED_TIMER_OFFSETS_HIST)
-        help
-          This option enables a transparent branch optimization that
- 	 makes certain almost-always-true or almost-always-false branch
-diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
-index a9c4e48bb7ec..6eefe4f32302 100644
---- a/arch/arm/Kconfig
-+++ b/arch/arm/Kconfig
-@@ -36,7 +36,7 @@ config ARM
- 	select HAVE_ARCH_AUDITSYSCALL if (AEABI && !OABI_COMPAT)
- 	select HAVE_ARCH_BITREVERSE if (CPU_32v7M || CPU_32v7) && !CPU_32v6
- 	select HAVE_ARCH_HARDENED_USERCOPY
--	select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL && !CPU_ENDIAN_BE32 && MMU
-+	select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL && !CPU_ENDIAN_BE32 && MMU && !PREEMPT_RT_BASE
- 	select HAVE_ARCH_KGDB if !CPU_ENDIAN_BE32 && MMU
- 	select HAVE_ARCH_MMAP_RND_BITS if MMU
- 	select HAVE_ARCH_SECCOMP_FILTER if (AEABI && !OABI_COMPAT)
-@@ -75,6 +75,7 @@ config ARM
- 	select HAVE_PERF_EVENTS
- 	select HAVE_PERF_REGS
- 	select HAVE_PERF_USER_STACK_DUMP
-+	select HAVE_PREEMPT_LAZY
- 	select HAVE_RCU_TABLE_FREE if (SMP && ARM_LPAE)
- 	select HAVE_REGS_AND_STACK_ACCESS_API
- 	select HAVE_SYSCALL_TRACEPOINTS
-diff --git a/arch/arm/include/asm/switch_to.h b/arch/arm/include/asm/switch_to.h
-index 12ebfcc1d539..c962084605bc 100644
---- a/arch/arm/include/asm/switch_to.h
-+++ b/arch/arm/include/asm/switch_to.h
+diff -Nur linux-4.8.15.orig/arch/arm/include/asm/switch_to.h linux-4.8.15/arch/arm/include/asm/switch_to.h
+--- linux-4.8.15.orig/arch/arm/include/asm/switch_to.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/arm/include/asm/switch_to.h	2017-01-01 17:07:11.543137886 +0100
 @@ -3,6 +3,13 @@
  
  #include <linux/thread_info.h>
@@ -343,7 +15,7 @@ index 12ebfcc1d539..c962084605bc 100644
  /*
   * For v7 SMP cores running a preemptible kernel we may be pre-empted
   * during a TLB maintenance operation, so execute an inner-shareable dsb
-@@ -25,6 +32,7 @@ extern struct task_struct *__switch_to(struct task_struct *, struct thread_info
+@@ -25,6 +32,7 @@
  #define switch_to(prev,next,last)					\
  do {									\
  	__complete_pending_tlbi();					\
@@ -351,11 +23,10 @@ index 12ebfcc1d539..c962084605bc 100644
  	last = __switch_to(prev,task_thread_info(prev), task_thread_info(next));	\
  } while (0)
  
-diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h
-index 776757d1604a..1f36a4eccc72 100644
---- a/arch/arm/include/asm/thread_info.h
-+++ b/arch/arm/include/asm/thread_info.h
-@@ -49,6 +49,7 @@ struct cpu_context_save {
+diff -Nur linux-4.8.15.orig/arch/arm/include/asm/thread_info.h linux-4.8.15/arch/arm/include/asm/thread_info.h
+--- linux-4.8.15.orig/arch/arm/include/asm/thread_info.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/arm/include/asm/thread_info.h	2017-01-01 17:07:11.547138137 +0100
+@@ -49,6 +49,7 @@
  struct thread_info {
  	unsigned long		flags;		/* low level flags */
  	int			preempt_count;	/* 0 => preemptable, <0 => bug */
@@ -363,7 +34,7 @@ index 776757d1604a..1f36a4eccc72 100644
  	mm_segment_t		addr_limit;	/* address limit */
  	struct task_struct	*task;		/* main task structure */
  	__u32			cpu;		/* cpu */
-@@ -142,7 +143,8 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
+@@ -142,7 +143,8 @@
  #define TIF_SYSCALL_TRACE	4	/* syscall trace active */
  #define TIF_SYSCALL_AUDIT	5	/* syscall auditing active */
  #define TIF_SYSCALL_TRACEPOINT	6	/* syscall tracepoint instrumentation */
@@ -373,7 +44,7 @@ index 776757d1604a..1f36a4eccc72 100644
  
  #define TIF_NOHZ		12	/* in adaptive nohz mode */
  #define TIF_USING_IWMMXT	17
-@@ -152,6 +154,7 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
+@@ -152,6 +154,7 @@
  #define _TIF_SIGPENDING		(1 << TIF_SIGPENDING)
  #define _TIF_NEED_RESCHED	(1 << TIF_NEED_RESCHED)
  #define _TIF_NOTIFY_RESUME	(1 << TIF_NOTIFY_RESUME)
@@ -381,7 +52,7 @@ index 776757d1604a..1f36a4eccc72 100644
  #define _TIF_UPROBE		(1 << TIF_UPROBE)
  #define _TIF_SYSCALL_TRACE	(1 << TIF_SYSCALL_TRACE)
  #define _TIF_SYSCALL_AUDIT	(1 << TIF_SYSCALL_AUDIT)
-@@ -167,7 +170,8 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
+@@ -167,7 +170,8 @@
   * Change these and you break ASM code in entry-common.S
   */
  #define _TIF_WORK_MASK		(_TIF_NEED_RESCHED | _TIF_SIGPENDING | \
@@ -391,11 +62,30 @@ index 776757d1604a..1f36a4eccc72 100644
  
  #endif /* __KERNEL__ */
  #endif /* __ASM_ARM_THREAD_INFO_H */
-diff --git a/arch/arm/kernel/asm-offsets.c b/arch/arm/kernel/asm-offsets.c
-index 608008229c7d..3866da3f7bb7 100644
---- a/arch/arm/kernel/asm-offsets.c
-+++ b/arch/arm/kernel/asm-offsets.c
-@@ -65,6 +65,7 @@ int main(void)
+diff -Nur linux-4.8.15.orig/arch/arm/Kconfig linux-4.8.15/arch/arm/Kconfig
+--- linux-4.8.15.orig/arch/arm/Kconfig	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/arm/Kconfig	2017-01-01 17:07:11.487134269 +0100
+@@ -36,7 +36,7 @@
+ 	select HAVE_ARCH_AUDITSYSCALL if (AEABI && !OABI_COMPAT)
+ 	select HAVE_ARCH_BITREVERSE if (CPU_32v7M || CPU_32v7) && !CPU_32v6
+ 	select HAVE_ARCH_HARDENED_USERCOPY
+-	select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL && !CPU_ENDIAN_BE32 && MMU
++	select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL && !CPU_ENDIAN_BE32 && MMU && !PREEMPT_RT_BASE
+ 	select HAVE_ARCH_KGDB if !CPU_ENDIAN_BE32 && MMU
+ 	select HAVE_ARCH_MMAP_RND_BITS if MMU
+ 	select HAVE_ARCH_SECCOMP_FILTER if (AEABI && !OABI_COMPAT)
+@@ -75,6 +75,7 @@
+ 	select HAVE_PERF_EVENTS
+ 	select HAVE_PERF_REGS
+ 	select HAVE_PERF_USER_STACK_DUMP
++	select HAVE_PREEMPT_LAZY
+ 	select HAVE_RCU_TABLE_FREE if (SMP && ARM_LPAE)
+ 	select HAVE_REGS_AND_STACK_ACCESS_API
+ 	select HAVE_SYSCALL_TRACEPOINTS
+diff -Nur linux-4.8.15.orig/arch/arm/kernel/asm-offsets.c linux-4.8.15/arch/arm/kernel/asm-offsets.c
+--- linux-4.8.15.orig/arch/arm/kernel/asm-offsets.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/arm/kernel/asm-offsets.c	2017-01-01 17:07:11.587140711 +0100
+@@ -65,6 +65,7 @@
    BLANK();
    DEFINE(TI_FLAGS,		offsetof(struct thread_info, flags));
    DEFINE(TI_PREEMPT,		offsetof(struct thread_info, preempt_count));
@@ -403,11 +93,10 @@ index 608008229c7d..3866da3f7bb7 100644
    DEFINE(TI_ADDR_LIMIT,		offsetof(struct thread_info, addr_limit));
    DEFINE(TI_TASK,		offsetof(struct thread_info, task));
    DEFINE(TI_CPU,		offsetof(struct thread_info, cpu));
-diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
-index 9f157e7c51e7..468e224d76aa 100644
---- a/arch/arm/kernel/entry-armv.S
-+++ b/arch/arm/kernel/entry-armv.S
-@@ -220,11 +220,18 @@ ENDPROC(__dabt_svc)
+diff -Nur linux-4.8.15.orig/arch/arm/kernel/entry-armv.S linux-4.8.15/arch/arm/kernel/entry-armv.S
+--- linux-4.8.15.orig/arch/arm/kernel/entry-armv.S	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/arm/kernel/entry-armv.S	2017-01-01 17:07:11.611142259 +0100
+@@ -220,11 +220,18 @@
  
  #ifdef CONFIG_PREEMPT
  	ldr	r8, [tsk, #TI_PREEMPT]		@ get preempt count
@@ -428,7 +117,7 @@ index 9f157e7c51e7..468e224d76aa 100644
  #endif
  
  	svc_exit r5, irq = 1			@ return from exception
-@@ -239,8 +246,14 @@ ENDPROC(__irq_svc)
+@@ -239,8 +246,14 @@
  1:	bl	preempt_schedule_irq		@ irq en/disable is done inside
  	ldr	r0, [tsk, #TI_FLAGS]		@ get new tasks TI_FLAGS
  	tst	r0, #_TIF_NEED_RESCHED
@@ -444,10 +133,9 @@ index 9f157e7c51e7..468e224d76aa 100644
  #endif
  
  __und_fault:
-diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
-index 10c3283d6c19..8872937862cc 100644
---- a/arch/arm/kernel/entry-common.S
-+++ b/arch/arm/kernel/entry-common.S
+diff -Nur linux-4.8.15.orig/arch/arm/kernel/entry-common.S linux-4.8.15/arch/arm/kernel/entry-common.S
+--- linux-4.8.15.orig/arch/arm/kernel/entry-common.S	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/arm/kernel/entry-common.S	2017-01-01 17:07:11.615142513 +0100
 @@ -36,7 +36,9 @@
   UNWIND(.cantunwind	)
  	disable_irq_notrace			@ disable interrupts
@@ -459,7 +147,7 @@ index 10c3283d6c19..8872937862cc 100644
  	bne	fast_work_pending
  
  	/* perform architecture specific actions before user return */
-@@ -62,8 +64,11 @@ ENDPROC(ret_fast_syscall)
+@@ -62,8 +64,11 @@
  	str	r0, [sp, #S_R0 + S_OFF]!	@ save returned r0
  	disable_irq_notrace			@ disable interrupts
  	ldr	r1, [tsk, #TI_FLAGS]		@ re-check for syscall tracing
@@ -472,11 +160,40 @@ index 10c3283d6c19..8872937862cc 100644
   UNWIND(.fnend		)
  ENDPROC(ret_fast_syscall)
  
-diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
-index 612eb530f33f..cd3006dc1fd3 100644
---- a/arch/arm/kernel/process.c
-+++ b/arch/arm/kernel/process.c
-@@ -323,6 +323,30 @@ unsigned long arch_randomize_brk(struct mm_struct *mm)
+diff -Nur linux-4.8.15.orig/arch/arm/kernel/patch.c linux-4.8.15/arch/arm/kernel/patch.c
+--- linux-4.8.15.orig/arch/arm/kernel/patch.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/arm/kernel/patch.c	2017-01-01 17:07:11.623143039 +0100
+@@ -15,7 +15,7 @@
+ 	unsigned int insn;
+ };
+ 
+-static DEFINE_SPINLOCK(patch_lock);
++static DEFINE_RAW_SPINLOCK(patch_lock);
+ 
+ static void __kprobes *patch_map(void *addr, int fixmap, unsigned long *flags)
+ 	__acquires(&patch_lock)
+@@ -32,7 +32,7 @@
+ 		return addr;
+ 
+ 	if (flags)
+-		spin_lock_irqsave(&patch_lock, *flags);
++		raw_spin_lock_irqsave(&patch_lock, *flags);
+ 	else
+ 		__acquire(&patch_lock);
+ 
+@@ -47,7 +47,7 @@
+ 	clear_fixmap(fixmap);
+ 
+ 	if (flags)
+-		spin_unlock_irqrestore(&patch_lock, *flags);
++		raw_spin_unlock_irqrestore(&patch_lock, *flags);
+ 	else
+ 		__release(&patch_lock);
+ }
+diff -Nur linux-4.8.15.orig/arch/arm/kernel/process.c linux-4.8.15/arch/arm/kernel/process.c
+--- linux-4.8.15.orig/arch/arm/kernel/process.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/arm/kernel/process.c	2017-01-01 17:07:11.631143548 +0100
+@@ -323,6 +323,30 @@
  }
  
  #ifdef CONFIG_MMU
@@ -507,11 +224,10 @@ index 612eb530f33f..cd3006dc1fd3 100644
  #ifdef CONFIG_KUSER_HELPERS
  /*
   * The vectors page is always readable from user space for the
-diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
-index 7b8f2141427b..96541e00b74a 100644
---- a/arch/arm/kernel/signal.c
-+++ b/arch/arm/kernel/signal.c
-@@ -572,7 +572,8 @@ do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall)
+diff -Nur linux-4.8.15.orig/arch/arm/kernel/signal.c linux-4.8.15/arch/arm/kernel/signal.c
+--- linux-4.8.15.orig/arch/arm/kernel/signal.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/arm/kernel/signal.c	2017-01-01 17:07:11.659145353 +0100
+@@ -572,7 +572,8 @@
  	 */
  	trace_hardirqs_off();
  	do {
@@ -521,11 +237,10 @@ index 7b8f2141427b..96541e00b74a 100644
  			schedule();
  		} else {
  			if (unlikely(!user_mode(regs)))
-diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
-index 861521606c6d..e5ca865d321b 100644
---- a/arch/arm/kernel/smp.c
-+++ b/arch/arm/kernel/smp.c
-@@ -234,8 +234,6 @@ int __cpu_disable(void)
+diff -Nur linux-4.8.15.orig/arch/arm/kernel/smp.c linux-4.8.15/arch/arm/kernel/smp.c
+--- linux-4.8.15.orig/arch/arm/kernel/smp.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/arm/kernel/smp.c	2017-01-01 17:07:11.671146131 +0100
+@@ -234,8 +234,6 @@
  	flush_cache_louis();
  	local_flush_tlb_all();
  
@@ -534,7 +249,7 @@ index 861521606c6d..e5ca865d321b 100644
  	return 0;
  }
  
-@@ -251,6 +249,9 @@ void __cpu_die(unsigned int cpu)
+@@ -251,6 +249,9 @@
  		pr_err("CPU%u: cpu didn't die\n", cpu);
  		return;
  	}
@@ -544,11 +259,10 @@ index 861521606c6d..e5ca865d321b 100644
  	pr_notice("CPU%u: shutdown\n", cpu);
  
  	/*
-diff --git a/arch/arm/kernel/unwind.c b/arch/arm/kernel/unwind.c
-index 0bee233fef9a..314cfb232a63 100644
---- a/arch/arm/kernel/unwind.c
-+++ b/arch/arm/kernel/unwind.c
-@@ -93,7 +93,7 @@ extern const struct unwind_idx __start_unwind_idx[];
+diff -Nur linux-4.8.15.orig/arch/arm/kernel/unwind.c linux-4.8.15/arch/arm/kernel/unwind.c
+--- linux-4.8.15.orig/arch/arm/kernel/unwind.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/arm/kernel/unwind.c	2017-01-01 17:07:11.671146131 +0100
+@@ -93,7 +93,7 @@
  static const struct unwind_idx *__origin_unwind_idx;
  extern const struct unwind_idx __stop_unwind_idx[];
  
@@ -557,7 +271,7 @@ index 0bee233fef9a..314cfb232a63 100644
  static LIST_HEAD(unwind_tables);
  
  /* Convert a prel31 symbol to an absolute address */
-@@ -201,7 +201,7 @@ static const struct unwind_idx *unwind_find_idx(unsigned long addr)
+@@ -201,7 +201,7 @@
  		/* module unwind tables */
  		struct unwind_table *table;
  
@@ -566,7 +280,7 @@ index 0bee233fef9a..314cfb232a63 100644
  		list_for_each_entry(table, &unwind_tables, list) {
  			if (addr >= table->begin_addr &&
  			    addr < table->end_addr) {
-@@ -213,7 +213,7 @@ static const struct unwind_idx *unwind_find_idx(unsigned long addr)
+@@ -213,7 +213,7 @@
  				break;
  			}
  		}
@@ -575,7 +289,7 @@ index 0bee233fef9a..314cfb232a63 100644
  	}
  
  	pr_debug("%s: idx = %p\n", __func__, idx);
-@@ -529,9 +529,9 @@ struct unwind_table *unwind_table_add(unsigned long start, unsigned long size,
+@@ -529,9 +529,9 @@
  	tab->begin_addr = text_addr;
  	tab->end_addr = text_addr + text_size;
  
@@ -587,7 +301,7 @@ index 0bee233fef9a..314cfb232a63 100644
  
  	return tab;
  }
-@@ -543,9 +543,9 @@ void unwind_table_del(struct unwind_table *tab)
+@@ -543,9 +543,9 @@
  	if (!tab)
  		return;
  
@@ -599,11 +313,10 @@ index 0bee233fef9a..314cfb232a63 100644
  
  	kfree(tab);
  }
-diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
-index c94b90d43772..244dde72018a 100644
---- a/arch/arm/kvm/arm.c
-+++ b/arch/arm/kvm/arm.c
-@@ -584,7 +584,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)
+diff -Nur linux-4.8.15.orig/arch/arm/kvm/arm.c linux-4.8.15/arch/arm/kvm/arm.c
+--- linux-4.8.15.orig/arch/arm/kvm/arm.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/arm/kvm/arm.c	2017-01-01 17:07:11.675146381 +0100
+@@ -584,7 +584,7 @@
  		 * involves poking the GIC, which must be done in a
  		 * non-preemptible context.
  		 */
@@ -612,7 +325,7 @@ index c94b90d43772..244dde72018a 100644
  		kvm_pmu_flush_hwstate(vcpu);
  		kvm_timer_flush_hwstate(vcpu);
  		kvm_vgic_flush_hwstate(vcpu);
-@@ -605,7 +605,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)
+@@ -605,7 +605,7 @@
  			kvm_pmu_sync_hwstate(vcpu);
  			kvm_timer_sync_hwstate(vcpu);
  			kvm_vgic_sync_hwstate(vcpu);
@@ -621,7 +334,7 @@ index c94b90d43772..244dde72018a 100644
  			continue;
  		}
  
-@@ -661,7 +661,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)
+@@ -661,7 +661,7 @@
  
  		kvm_vgic_sync_hwstate(vcpu);
  
@@ -630,11 +343,10 @@ index c94b90d43772..244dde72018a 100644
  
  		ret = handle_exit(vcpu, run, ret);
  	}
-diff --git a/arch/arm/mach-exynos/platsmp.c b/arch/arm/mach-exynos/platsmp.c
-index 98ffe1e62ad5..df9769ddece5 100644
---- a/arch/arm/mach-exynos/platsmp.c
-+++ b/arch/arm/mach-exynos/platsmp.c
-@@ -229,7 +229,7 @@ static void __iomem *scu_base_addr(void)
+diff -Nur linux-4.8.15.orig/arch/arm/mach-exynos/platsmp.c linux-4.8.15/arch/arm/mach-exynos/platsmp.c
+--- linux-4.8.15.orig/arch/arm/mach-exynos/platsmp.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/arm/mach-exynos/platsmp.c	2017-01-01 17:07:11.707148443 +0100
+@@ -229,7 +229,7 @@
  	return (void __iomem *)(S5P_VA_SCU);
  }
  
@@ -643,7 +355,7 @@ index 98ffe1e62ad5..df9769ddece5 100644
  
  static void exynos_secondary_init(unsigned int cpu)
  {
-@@ -242,8 +242,8 @@ static void exynos_secondary_init(unsigned int cpu)
+@@ -242,8 +242,8 @@
  	/*
  	 * Synchronise with the boot thread.
  	 */
@@ -654,7 +366,7 @@ index 98ffe1e62ad5..df9769ddece5 100644
  }
  
  int exynos_set_boot_addr(u32 core_id, unsigned long boot_addr)
-@@ -307,7 +307,7 @@ static int exynos_boot_secondary(unsigned int cpu, struct task_struct *idle)
+@@ -307,7 +307,7 @@
  	 * Set synchronisation state between this boot processor
  	 * and the secondary one
  	 */
@@ -663,7 +375,7 @@ index 98ffe1e62ad5..df9769ddece5 100644
  
  	/*
  	 * The secondary processor is waiting to be released from
-@@ -334,7 +334,7 @@ static int exynos_boot_secondary(unsigned int cpu, struct task_struct *idle)
+@@ -334,7 +334,7 @@
  
  		if (timeout == 0) {
  			printk(KERN_ERR "cpu1 power enable failed");
@@ -672,7 +384,7 @@ index 98ffe1e62ad5..df9769ddece5 100644
  			return -ETIMEDOUT;
  		}
  	}
-@@ -380,7 +380,7 @@ static int exynos_boot_secondary(unsigned int cpu, struct task_struct *idle)
+@@ -380,7 +380,7 @@
  	 * calibrations, then wait for it to finish
  	 */
  fail:
@@ -681,10 +393,9 @@ index 98ffe1e62ad5..df9769ddece5 100644
  
  	return pen_release != -1 ? ret : 0;
  }
-diff --git a/arch/arm/mach-hisi/platmcpm.c b/arch/arm/mach-hisi/platmcpm.c
-index 4b653a8cb75c..b03d5a922cb1 100644
---- a/arch/arm/mach-hisi/platmcpm.c
-+++ b/arch/arm/mach-hisi/platmcpm.c
+diff -Nur linux-4.8.15.orig/arch/arm/mach-hisi/platmcpm.c linux-4.8.15/arch/arm/mach-hisi/platmcpm.c
+--- linux-4.8.15.orig/arch/arm/mach-hisi/platmcpm.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/arm/mach-hisi/platmcpm.c	2017-01-01 17:07:11.747151017 +0100
 @@ -61,7 +61,7 @@
  
  static void __iomem *sysctrl, *fabric;
@@ -694,7 +405,7 @@ index 4b653a8cb75c..b03d5a922cb1 100644
  static u32 fabric_phys_addr;
  /*
   * [0]: bootwrapper physical address
-@@ -113,7 +113,7 @@ static int hip04_boot_secondary(unsigned int l_cpu, struct task_struct *idle)
+@@ -113,7 +113,7 @@
  	if (cluster >= HIP04_MAX_CLUSTERS || cpu >= HIP04_MAX_CPUS_PER_CLUSTER)
  		return -EINVAL;
  
@@ -703,7 +414,7 @@ index 4b653a8cb75c..b03d5a922cb1 100644
  
  	if (hip04_cpu_table[cluster][cpu])
  		goto out;
-@@ -147,7 +147,7 @@ static int hip04_boot_secondary(unsigned int l_cpu, struct task_struct *idle)
+@@ -147,7 +147,7 @@
  
  out:
  	hip04_cpu_table[cluster][cpu]++;
@@ -712,7 +423,7 @@ index 4b653a8cb75c..b03d5a922cb1 100644
  
  	return 0;
  }
-@@ -162,11 +162,11 @@ static void hip04_cpu_die(unsigned int l_cpu)
+@@ -162,11 +162,11 @@
  	cpu = MPIDR_AFFINITY_LEVEL(mpidr, 0);
  	cluster = MPIDR_AFFINITY_LEVEL(mpidr, 1);
  
@@ -726,7 +437,7 @@ index 4b653a8cb75c..b03d5a922cb1 100644
  		return;
  	} else if (hip04_cpu_table[cluster][cpu] > 1) {
  		pr_err("Cluster %d CPU%d boots multiple times\n", cluster, cpu);
-@@ -174,7 +174,7 @@ static void hip04_cpu_die(unsigned int l_cpu)
+@@ -174,7 +174,7 @@
  	}
  
  	last_man = hip04_cluster_is_down(cluster);
@@ -735,7 +446,7 @@ index 4b653a8cb75c..b03d5a922cb1 100644
  	if (last_man) {
  		/* Since it's Cortex A15, disable L2 prefetching. */
  		asm volatile(
-@@ -203,7 +203,7 @@ static int hip04_cpu_kill(unsigned int l_cpu)
+@@ -203,7 +203,7 @@
  	       cpu >= HIP04_MAX_CPUS_PER_CLUSTER);
  
  	count = TIMEOUT_MSEC / POLL_MSEC;
@@ -744,7 +455,7 @@ index 4b653a8cb75c..b03d5a922cb1 100644
  	for (tries = 0; tries < count; tries++) {
  		if (hip04_cpu_table[cluster][cpu])
  			goto err;
-@@ -211,10 +211,10 @@ static int hip04_cpu_kill(unsigned int l_cpu)
+@@ -211,10 +211,10 @@
  		data = readl_relaxed(sysctrl + SC_CPU_RESET_STATUS(cluster));
  		if (data & CORE_WFI_STATUS(cpu))
  			break;
@@ -757,7 +468,7 @@ index 4b653a8cb75c..b03d5a922cb1 100644
  	}
  	if (tries >= count)
  		goto err;
-@@ -231,10 +231,10 @@ static int hip04_cpu_kill(unsigned int l_cpu)
+@@ -231,10 +231,10 @@
  		goto err;
  	if (hip04_cluster_is_down(cluster))
  		hip04_set_snoop_filter(cluster, 0);
@@ -770,11 +481,10 @@ index 4b653a8cb75c..b03d5a922cb1 100644
  	return 0;
  }
  #endif
-diff --git a/arch/arm/mach-omap2/omap-smp.c b/arch/arm/mach-omap2/omap-smp.c
-index b4de3da6dffa..b52893319d75 100644
---- a/arch/arm/mach-omap2/omap-smp.c
-+++ b/arch/arm/mach-omap2/omap-smp.c
-@@ -64,7 +64,7 @@ static const struct omap_smp_config omap5_cfg __initconst = {
+diff -Nur linux-4.8.15.orig/arch/arm/mach-omap2/omap-smp.c linux-4.8.15/arch/arm/mach-omap2/omap-smp.c
+--- linux-4.8.15.orig/arch/arm/mach-omap2/omap-smp.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/arm/mach-omap2/omap-smp.c	2017-01-01 17:07:11.763152049 +0100
+@@ -64,7 +64,7 @@
  	.startup_addr = omap5_secondary_startup,
  };
  
@@ -783,7 +493,7 @@ index b4de3da6dffa..b52893319d75 100644
  
  void __iomem *omap4_get_scu_base(void)
  {
-@@ -131,8 +131,8 @@ static void omap4_secondary_init(unsigned int cpu)
+@@ -131,8 +131,8 @@
  	/*
  	 * Synchronise with the boot thread.
  	 */
@@ -794,7 +504,7 @@ index b4de3da6dffa..b52893319d75 100644
  }
  
  static int omap4_boot_secondary(unsigned int cpu, struct task_struct *idle)
-@@ -146,7 +146,7 @@ static int omap4_boot_secondary(unsigned int cpu, struct task_struct *idle)
+@@ -146,7 +146,7 @@
  	 * Set synchronisation state between this boot processor
  	 * and the secondary one
  	 */
@@ -803,7 +513,7 @@ index b4de3da6dffa..b52893319d75 100644
  
  	/*
  	 * Update the AuxCoreBoot0 with boot state for secondary core.
-@@ -223,7 +223,7 @@ static int omap4_boot_secondary(unsigned int cpu, struct task_struct *idle)
+@@ -223,7 +223,7 @@
  	 * Now the secondary core is starting up let it run its
  	 * calibrations, then wait for it to finish
  	 */
@@ -812,10 +522,9 @@ index b4de3da6dffa..b52893319d75 100644
  
  	return 0;
  }
-diff --git a/arch/arm/mach-prima2/platsmp.c b/arch/arm/mach-prima2/platsmp.c
-index 0875b99add18..18b6d98d2581 100644
---- a/arch/arm/mach-prima2/platsmp.c
-+++ b/arch/arm/mach-prima2/platsmp.c
+diff -Nur linux-4.8.15.orig/arch/arm/mach-prima2/platsmp.c linux-4.8.15/arch/arm/mach-prima2/platsmp.c
+--- linux-4.8.15.orig/arch/arm/mach-prima2/platsmp.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/arm/mach-prima2/platsmp.c	2017-01-01 17:07:11.795154111 +0100
 @@ -22,7 +22,7 @@
  
  static void __iomem *clk_base;
@@ -825,7 +534,7 @@ index 0875b99add18..18b6d98d2581 100644
  
  static void sirfsoc_secondary_init(unsigned int cpu)
  {
-@@ -36,8 +36,8 @@ static void sirfsoc_secondary_init(unsigned int cpu)
+@@ -36,8 +36,8 @@
  	/*
  	 * Synchronise with the boot thread.
  	 */
@@ -836,7 +545,7 @@ index 0875b99add18..18b6d98d2581 100644
  }
  
  static const struct of_device_id clk_ids[]  = {
-@@ -75,7 +75,7 @@ static int sirfsoc_boot_secondary(unsigned int cpu, struct task_struct *idle)
+@@ -75,7 +75,7 @@
  	/* make sure write buffer is drained */
  	mb();
  
@@ -845,7 +554,7 @@ index 0875b99add18..18b6d98d2581 100644
  
  	/*
  	 * The secondary processor is waiting to be released from
-@@ -107,7 +107,7 @@ static int sirfsoc_boot_secondary(unsigned int cpu, struct task_struct *idle)
+@@ -107,7 +107,7 @@
  	 * now the secondary core is starting up let it run its
  	 * calibrations, then wait for it to finish
  	 */
@@ -854,10 +563,9 @@ index 0875b99add18..18b6d98d2581 100644
  
  	return pen_release != -1 ? -ENOSYS : 0;
  }
-diff --git a/arch/arm/mach-qcom/platsmp.c b/arch/arm/mach-qcom/platsmp.c
-index 5494c9e0c909..e8ce157d3548 100644
---- a/arch/arm/mach-qcom/platsmp.c
-+++ b/arch/arm/mach-qcom/platsmp.c
+diff -Nur linux-4.8.15.orig/arch/arm/mach-qcom/platsmp.c linux-4.8.15/arch/arm/mach-qcom/platsmp.c
+--- linux-4.8.15.orig/arch/arm/mach-qcom/platsmp.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/arm/mach-qcom/platsmp.c	2017-01-01 17:07:11.803154626 +0100
 @@ -46,7 +46,7 @@
  
  extern void secondary_startup_arm(void);
@@ -867,7 +575,7 @@ index 5494c9e0c909..e8ce157d3548 100644
  
  #ifdef CONFIG_HOTPLUG_CPU
  static void qcom_cpu_die(unsigned int cpu)
-@@ -60,8 +60,8 @@ static void qcom_secondary_init(unsigned int cpu)
+@@ -60,8 +60,8 @@
  	/*
  	 * Synchronise with the boot thread.
  	 */
@@ -878,7 +586,7 @@ index 5494c9e0c909..e8ce157d3548 100644
  }
  
  static int scss_release_secondary(unsigned int cpu)
-@@ -284,7 +284,7 @@ static int qcom_boot_secondary(unsigned int cpu, int (*func)(unsigned int))
+@@ -284,7 +284,7 @@
  	 * set synchronisation state between this boot processor
  	 * and the secondary one
  	 */
@@ -887,7 +595,7 @@ index 5494c9e0c909..e8ce157d3548 100644
  
  	/*
  	 * Send the secondary CPU a soft interrupt, thereby causing
-@@ -297,7 +297,7 @@ static int qcom_boot_secondary(unsigned int cpu, int (*func)(unsigned int))
+@@ -297,7 +297,7 @@
  	 * now the secondary core is starting up let it run its
  	 * calibrations, then wait for it to finish
  	 */
@@ -896,11 +604,10 @@ index 5494c9e0c909..e8ce157d3548 100644
  
  	return ret;
  }
-diff --git a/arch/arm/mach-spear/platsmp.c b/arch/arm/mach-spear/platsmp.c
-index 8d1e2d551786..7fa56cc78118 100644
---- a/arch/arm/mach-spear/platsmp.c
-+++ b/arch/arm/mach-spear/platsmp.c
-@@ -32,7 +32,7 @@ static void write_pen_release(int val)
+diff -Nur linux-4.8.15.orig/arch/arm/mach-spear/platsmp.c linux-4.8.15/arch/arm/mach-spear/platsmp.c
+--- linux-4.8.15.orig/arch/arm/mach-spear/platsmp.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/arm/mach-spear/platsmp.c	2017-01-01 17:07:11.847157467 +0100
+@@ -32,7 +32,7 @@
  	sync_cache_w(&pen_release);
  }
  
@@ -909,7 +616,7 @@ index 8d1e2d551786..7fa56cc78118 100644
  
  static void __iomem *scu_base = IOMEM(VA_SCU_BASE);
  
-@@ -47,8 +47,8 @@ static void spear13xx_secondary_init(unsigned int cpu)
+@@ -47,8 +47,8 @@
  	/*
  	 * Synchronise with the boot thread.
  	 */
@@ -920,7 +627,7 @@ index 8d1e2d551786..7fa56cc78118 100644
  }
  
  static int spear13xx_boot_secondary(unsigned int cpu, struct task_struct *idle)
-@@ -59,7 +59,7 @@ static int spear13xx_boot_secondary(unsigned int cpu, struct task_struct *idle)
+@@ -59,7 +59,7 @@
  	 * set synchronisation state between this boot processor
  	 * and the secondary one
  	 */
@@ -929,7 +636,7 @@ index 8d1e2d551786..7fa56cc78118 100644
  
  	/*
  	 * The secondary processor is waiting to be released from
-@@ -84,7 +84,7 @@ static int spear13xx_boot_secondary(unsigned int cpu, struct task_struct *idle)
+@@ -84,7 +84,7 @@
  	 * now the secondary core is starting up let it run its
  	 * calibrations, then wait for it to finish
  	 */
@@ -938,11 +645,10 @@ index 8d1e2d551786..7fa56cc78118 100644
  
  	return pen_release != -1 ? -ENOSYS : 0;
  }
-diff --git a/arch/arm/mach-sti/platsmp.c b/arch/arm/mach-sti/platsmp.c
-index ea5a2277ee46..b988e081ac79 100644
---- a/arch/arm/mach-sti/platsmp.c
-+++ b/arch/arm/mach-sti/platsmp.c
-@@ -35,7 +35,7 @@ static void write_pen_release(int val)
+diff -Nur linux-4.8.15.orig/arch/arm/mach-sti/platsmp.c linux-4.8.15/arch/arm/mach-sti/platsmp.c
+--- linux-4.8.15.orig/arch/arm/mach-sti/platsmp.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/arm/mach-sti/platsmp.c	2017-01-01 17:07:11.851157720 +0100
+@@ -35,7 +35,7 @@
  	sync_cache_w(&pen_release);
  }
  
@@ -951,7 +657,7 @@ index ea5a2277ee46..b988e081ac79 100644
  
  static void sti_secondary_init(unsigned int cpu)
  {
-@@ -48,8 +48,8 @@ static void sti_secondary_init(unsigned int cpu)
+@@ -48,8 +48,8 @@
  	/*
  	 * Synchronise with the boot thread.
  	 */
@@ -962,7 +668,7 @@ index ea5a2277ee46..b988e081ac79 100644
  }
  
  static int sti_boot_secondary(unsigned int cpu, struct task_struct *idle)
-@@ -60,7 +60,7 @@ static int sti_boot_secondary(unsigned int cpu, struct task_struct *idle)
+@@ -60,7 +60,7 @@
  	 * set synchronisation state between this boot processor
  	 * and the secondary one
  	 */
@@ -971,7 +677,7 @@ index ea5a2277ee46..b988e081ac79 100644
  
  	/*
  	 * The secondary processor is waiting to be released from
-@@ -91,7 +91,7 @@ static int sti_boot_secondary(unsigned int cpu, struct task_struct *idle)
+@@ -91,7 +91,7 @@
  	 * now the secondary core is starting up let it run its
  	 * calibrations, then wait for it to finish
  	 */
@@ -980,11 +686,10 @@ index ea5a2277ee46..b988e081ac79 100644
  
  	return pen_release != -1 ? -ENOSYS : 0;
  }
-diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
-index 3a2e678b8d30..3ed1e9ba6a01 100644
---- a/arch/arm/mm/fault.c
-+++ b/arch/arm/mm/fault.c
-@@ -430,6 +430,9 @@ do_translation_fault(unsigned long addr, unsigned int fsr,
+diff -Nur linux-4.8.15.orig/arch/arm/mm/fault.c linux-4.8.15/arch/arm/mm/fault.c
+--- linux-4.8.15.orig/arch/arm/mm/fault.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/arm/mm/fault.c	2017-01-01 17:07:11.879159524 +0100
+@@ -430,6 +430,9 @@
  	if (addr < TASK_SIZE)
  		return do_page_fault(addr, fsr, regs);
  
@@ -994,7 +699,7 @@ index 3a2e678b8d30..3ed1e9ba6a01 100644
  	if (user_mode(regs))
  		goto bad_area;
  
-@@ -497,6 +500,9 @@ do_translation_fault(unsigned long addr, unsigned int fsr,
+@@ -497,6 +500,9 @@
  static int
  do_sect_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
  {
@@ -1004,11 +709,10 @@ index 3a2e678b8d30..3ed1e9ba6a01 100644
  	do_bad_area(addr, fsr, regs);
  	return 0;
  }
-diff --git a/arch/arm/mm/highmem.c b/arch/arm/mm/highmem.c
-index d02f8187b1cc..542692dbd40a 100644
---- a/arch/arm/mm/highmem.c
-+++ b/arch/arm/mm/highmem.c
-@@ -34,6 +34,11 @@ static inline pte_t get_fixmap_pte(unsigned long vaddr)
+diff -Nur linux-4.8.15.orig/arch/arm/mm/highmem.c linux-4.8.15/arch/arm/mm/highmem.c
+--- linux-4.8.15.orig/arch/arm/mm/highmem.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/arm/mm/highmem.c	2017-01-01 17:07:11.879159524 +0100
+@@ -34,6 +34,11 @@
  	return *ptep;
  }
  
@@ -1020,7 +724,7 @@ index d02f8187b1cc..542692dbd40a 100644
  void *kmap(struct page *page)
  {
  	might_sleep();
-@@ -54,12 +59,13 @@ EXPORT_SYMBOL(kunmap);
+@@ -54,12 +59,13 @@
  
  void *kmap_atomic(struct page *page)
  {
@@ -1035,7 +739,7 @@ index d02f8187b1cc..542692dbd40a 100644
  	pagefault_disable();
  	if (!PageHighMem(page))
  		return page_address(page);
-@@ -79,7 +85,7 @@ void *kmap_atomic(struct page *page)
+@@ -79,7 +85,7 @@
  
  	type = kmap_atomic_idx_push();
  
@@ -1044,7 +748,7 @@ index d02f8187b1cc..542692dbd40a 100644
  	vaddr = __fix_to_virt(idx);
  #ifdef CONFIG_DEBUG_HIGHMEM
  	/*
-@@ -93,7 +99,10 @@ void *kmap_atomic(struct page *page)
+@@ -93,7 +99,10 @@
  	 * in place, so the contained TLB flush ensures the TLB is updated
  	 * with the new mapping.
  	 */
@@ -1056,7 +760,7 @@ index d02f8187b1cc..542692dbd40a 100644
  
  	return (void *)vaddr;
  }
-@@ -106,44 +115,75 @@ void __kunmap_atomic(void *kvaddr)
+@@ -106,44 +115,75 @@
  
  	if (kvaddr >= (void *)FIXADDR_START) {
  		type = kmap_atomic_idx();
@@ -1138,11 +842,10 @@ index d02f8187b1cc..542692dbd40a 100644
 +	}
 +}
 +#endif
-diff --git a/arch/arm/plat-versatile/platsmp.c b/arch/arm/plat-versatile/platsmp.c
-index c2366510187a..6b60f582b738 100644
---- a/arch/arm/plat-versatile/platsmp.c
-+++ b/arch/arm/plat-versatile/platsmp.c
-@@ -32,7 +32,7 @@ static void write_pen_release(int val)
+diff -Nur linux-4.8.15.orig/arch/arm/plat-versatile/platsmp.c linux-4.8.15/arch/arm/plat-versatile/platsmp.c
+--- linux-4.8.15.orig/arch/arm/plat-versatile/platsmp.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/arm/plat-versatile/platsmp.c	2017-01-01 17:07:11.939163389 +0100
+@@ -32,7 +32,7 @@
  	sync_cache_w(&pen_release);
  }
  
@@ -1151,7 +854,7 @@ index c2366510187a..6b60f582b738 100644
  
  void versatile_secondary_init(unsigned int cpu)
  {
-@@ -45,8 +45,8 @@ void versatile_secondary_init(unsigned int cpu)
+@@ -45,8 +45,8 @@
  	/*
  	 * Synchronise with the boot thread.
  	 */
@@ -1162,7 +865,7 @@ index c2366510187a..6b60f582b738 100644
  }
  
  int versatile_boot_secondary(unsigned int cpu, struct task_struct *idle)
-@@ -57,7 +57,7 @@ int versatile_boot_secondary(unsigned int cpu, struct task_struct *idle)
+@@ -57,7 +57,7 @@
  	 * Set synchronisation state between this boot processor
  	 * and the secondary one
  	 */
@@ -1171,7 +874,7 @@ index c2366510187a..6b60f582b738 100644
  
  	/*
  	 * This is really belt and braces; we hold unintended secondary
-@@ -87,7 +87,7 @@ int versatile_boot_secondary(unsigned int cpu, struct task_struct *idle)
+@@ -87,7 +87,7 @@
  	 * now the secondary core is starting up let it run its
  	 * calibrations, then wait for it to finish
  	 */
@@ -1180,32 +883,10 @@ index c2366510187a..6b60f582b738 100644
  
  	return pen_release != -1 ? -ENOSYS : 0;
  }
-diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
-index bc3f00f586f1..0f3df6d5154a 100644
---- a/arch/arm64/Kconfig
-+++ b/arch/arm64/Kconfig
-@@ -90,6 +90,7 @@ config ARM64
- 	select HAVE_PERF_EVENTS
- 	select HAVE_PERF_REGS
- 	select HAVE_PERF_USER_STACK_DUMP
-+	select HAVE_PREEMPT_LAZY
- 	select HAVE_REGS_AND_STACK_ACCESS_API
- 	select HAVE_RCU_TABLE_FREE
- 	select HAVE_SYSCALL_TRACEPOINTS
-@@ -689,7 +690,7 @@ config XEN_DOM0
- 
- config XEN
- 	bool "Xen guest support on ARM64"
--	depends on ARM64 && OF
-+	depends on ARM64 && OF && !PREEMPT_RT_FULL
- 	select SWIOTLB_XEN
- 	select PARAVIRT
- 	help
-diff --git a/arch/arm64/include/asm/thread_info.h b/arch/arm64/include/asm/thread_info.h
-index abd64bd1f6d9..9170788ffa37 100644
---- a/arch/arm64/include/asm/thread_info.h
-+++ b/arch/arm64/include/asm/thread_info.h
-@@ -49,6 +49,7 @@ struct thread_info {
+diff -Nur linux-4.8.15.orig/arch/arm64/include/asm/thread_info.h linux-4.8.15/arch/arm64/include/asm/thread_info.h
+--- linux-4.8.15.orig/arch/arm64/include/asm/thread_info.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/arm64/include/asm/thread_info.h	2017-01-01 17:07:12.027169062 +0100
+@@ -49,6 +49,7 @@
  	mm_segment_t		addr_limit;	/* address limit */
  	struct task_struct	*task;		/* main task structure */
  	int			preempt_count;	/* 0 => preemptable, <0 => bug */
@@ -1213,7 +894,7 @@ index abd64bd1f6d9..9170788ffa37 100644
  	int			cpu;		/* cpu */
  };
  
-@@ -109,6 +110,7 @@ static inline struct thread_info *current_thread_info(void)
+@@ -109,6 +110,7 @@
  #define TIF_NEED_RESCHED	1
  #define TIF_NOTIFY_RESUME	2	/* callback before returning to user */
  #define TIF_FOREIGN_FPSTATE	3	/* CPU's FP state is not current's */
@@ -1221,7 +902,7 @@ index abd64bd1f6d9..9170788ffa37 100644
  #define TIF_NOHZ		7
  #define TIF_SYSCALL_TRACE	8
  #define TIF_SYSCALL_AUDIT	9
-@@ -124,6 +126,7 @@ static inline struct thread_info *current_thread_info(void)
+@@ -124,6 +126,7 @@
  #define _TIF_NEED_RESCHED	(1 << TIF_NEED_RESCHED)
  #define _TIF_NOTIFY_RESUME	(1 << TIF_NOTIFY_RESUME)
  #define _TIF_FOREIGN_FPSTATE	(1 << TIF_FOREIGN_FPSTATE)
@@ -1229,7 +910,7 @@ index abd64bd1f6d9..9170788ffa37 100644
  #define _TIF_NOHZ		(1 << TIF_NOHZ)
  #define _TIF_SYSCALL_TRACE	(1 << TIF_SYSCALL_TRACE)
  #define _TIF_SYSCALL_AUDIT	(1 << TIF_SYSCALL_AUDIT)
-@@ -132,7 +135,8 @@ static inline struct thread_info *current_thread_info(void)
+@@ -132,7 +135,8 @@
  #define _TIF_32BIT		(1 << TIF_32BIT)
  
  #define _TIF_WORK_MASK		(_TIF_NEED_RESCHED | _TIF_SIGPENDING | \
@@ -1239,11 +920,30 @@ index abd64bd1f6d9..9170788ffa37 100644
  
  #define _TIF_SYSCALL_WORK	(_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
  				 _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP | \
-diff --git a/arch/arm64/kernel/asm-offsets.c b/arch/arm64/kernel/asm-offsets.c
-index 05070b72fc28..acfeddb1283a 100644
---- a/arch/arm64/kernel/asm-offsets.c
-+++ b/arch/arm64/kernel/asm-offsets.c
-@@ -37,6 +37,7 @@ int main(void)
+diff -Nur linux-4.8.15.orig/arch/arm64/Kconfig linux-4.8.15/arch/arm64/Kconfig
+--- linux-4.8.15.orig/arch/arm64/Kconfig	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/arm64/Kconfig	2017-01-01 17:07:11.979165970 +0100
+@@ -90,6 +90,7 @@
+ 	select HAVE_PERF_EVENTS
+ 	select HAVE_PERF_REGS
+ 	select HAVE_PERF_USER_STACK_DUMP
++	select HAVE_PREEMPT_LAZY
+ 	select HAVE_REGS_AND_STACK_ACCESS_API
+ 	select HAVE_RCU_TABLE_FREE
+ 	select HAVE_SYSCALL_TRACEPOINTS
+@@ -689,7 +690,7 @@
+ 
+ config XEN
+ 	bool "Xen guest support on ARM64"
+-	depends on ARM64 && OF
++	depends on ARM64 && OF && !PREEMPT_RT_FULL
+ 	select SWIOTLB_XEN
+ 	select PARAVIRT
+ 	help
+diff -Nur linux-4.8.15.orig/arch/arm64/kernel/asm-offsets.c linux-4.8.15/arch/arm64/kernel/asm-offsets.c
+--- linux-4.8.15.orig/arch/arm64/kernel/asm-offsets.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/arm64/kernel/asm-offsets.c	2017-01-01 17:07:12.079172403 +0100
+@@ -37,6 +37,7 @@
    BLANK();
    DEFINE(TI_FLAGS,		offsetof(struct thread_info, flags));
    DEFINE(TI_PREEMPT,		offsetof(struct thread_info, preempt_count));
@@ -1251,11 +951,10 @@ index 05070b72fc28..acfeddb1283a 100644
    DEFINE(TI_ADDR_LIMIT,		offsetof(struct thread_info, addr_limit));
    DEFINE(TI_TASK,		offsetof(struct thread_info, task));
    DEFINE(TI_CPU,		offsetof(struct thread_info, cpu));
-diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S
-index 441420ca7d08..404792bdca99 100644
---- a/arch/arm64/kernel/entry.S
-+++ b/arch/arm64/kernel/entry.S
-@@ -434,11 +434,16 @@ ENDPROC(el1_sync)
+diff -Nur linux-4.8.15.orig/arch/arm64/kernel/entry.S linux-4.8.15/arch/arm64/kernel/entry.S
+--- linux-4.8.15.orig/arch/arm64/kernel/entry.S	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/arm64/kernel/entry.S	2017-01-01 17:07:12.083172658 +0100
+@@ -434,11 +434,16 @@
  
  #ifdef CONFIG_PREEMPT
  	ldr	w24, [tsk, #TI_PREEMPT]		// get preempt count
@@ -1275,7 +974,7 @@ index 441420ca7d08..404792bdca99 100644
  #endif
  #ifdef CONFIG_TRACE_IRQFLAGS
  	bl	trace_hardirqs_on
-@@ -452,6 +457,7 @@ ENDPROC(el1_irq)
+@@ -452,6 +457,7 @@
  1:	bl	preempt_schedule_irq		// irq en/disable is done inside
  	ldr	x0, [tsk, #TI_FLAGS]		// get new tasks TI_FLAGS
  	tbnz	x0, #TIF_NEED_RESCHED, 1b	// needs rescheduling?
@@ -1283,7 +982,7 @@ index 441420ca7d08..404792bdca99 100644
  	ret	x24
  #endif
  
-@@ -708,6 +714,7 @@ ENDPROC(cpu_switch_to)
+@@ -708,6 +714,7 @@
   */
  work_pending:
  	tbnz	x1, #TIF_NEED_RESCHED, work_resched
@@ -1291,11 +990,29 @@ index 441420ca7d08..404792bdca99 100644
  	/* TIF_SIGPENDING, TIF_NOTIFY_RESUME or TIF_FOREIGN_FPSTATE case */
  	mov	x0, sp				// 'regs'
  	enable_irq				// enable interrupts for do_notify_resume()
-diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
-index 212ff92920d2..71ad38d3d76b 100644
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -2480,7 +2480,7 @@ config MIPS_ASID_BITS_VARIABLE
+diff -Nur linux-4.8.15.orig/arch/Kconfig linux-4.8.15/arch/Kconfig
+--- linux-4.8.15.orig/arch/Kconfig	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/Kconfig	2017-01-01 17:07:11.431130672 +0100
+@@ -9,6 +9,7 @@
+ 	tristate "OProfile system profiling"
+ 	depends on PROFILING
+ 	depends on HAVE_OPROFILE
++	depends on !PREEMPT_RT_FULL
+ 	select RING_BUFFER
+ 	select RING_BUFFER_ALLOW_SWAP
+ 	help
+@@ -52,6 +53,7 @@
+ config JUMP_LABEL
+        bool "Optimize very unlikely/likely branches"
+        depends on HAVE_ARCH_JUMP_LABEL
++       depends on (!INTERRUPT_OFF_HIST && !PREEMPT_OFF_HIST && !WAKEUP_LATENCY_HIST && !MISSED_TIMER_OFFSETS_HIST)
+        help
+          This option enables a transparent branch optimization that
+ 	 makes certain almost-always-true or almost-always-false branch
+diff -Nur linux-4.8.15.orig/arch/mips/Kconfig linux-4.8.15/arch/mips/Kconfig
+--- linux-4.8.15.orig/arch/mips/Kconfig	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/mips/Kconfig	2017-01-01 17:07:12.275185025 +0100
+@@ -2480,7 +2480,7 @@
  #
  config HIGHMEM
  	bool "High Memory Support"
@@ -1304,45 +1021,10 @@ index 212ff92920d2..71ad38d3d76b 100644
  
  config CPU_SUPPORTS_HIGHMEM
  	bool
-diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
-index 792cb1768c8f..ddf5a0fdb25a 100644
---- a/arch/powerpc/Kconfig
-+++ b/arch/powerpc/Kconfig
-@@ -57,10 +57,11 @@ config LOCKDEP_SUPPORT
- 
- config RWSEM_GENERIC_SPINLOCK
- 	bool
-+	default y if PREEMPT_RT_FULL
- 
- config RWSEM_XCHGADD_ALGORITHM
- 	bool
--	default y
-+	default y if !PREEMPT_RT_FULL
- 
- config GENERIC_LOCKBREAK
- 	bool
-@@ -140,6 +141,7 @@ config PPC
- 	select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
- 	select GENERIC_STRNCPY_FROM_USER
- 	select GENERIC_STRNLEN_USER
-+	select HAVE_PREEMPT_LAZY
- 	select HAVE_MOD_ARCH_SPECIFIC
- 	select MODULES_USE_ELF_RELA
- 	select CLONE_BACKWARDS
-@@ -326,7 +328,7 @@ menu "Kernel options"
- 
- config HIGHMEM
- 	bool "High memory support"
--	depends on PPC32
-+	depends on PPC32 && !PREEMPT_RT_FULL
- 
- source kernel/Kconfig.hz
- source kernel/Kconfig.preempt
-diff --git a/arch/powerpc/include/asm/thread_info.h b/arch/powerpc/include/asm/thread_info.h
-index 87e4b2d8dcd4..981e501a4359 100644
---- a/arch/powerpc/include/asm/thread_info.h
-+++ b/arch/powerpc/include/asm/thread_info.h
-@@ -43,6 +43,8 @@ struct thread_info {
+diff -Nur linux-4.8.15.orig/arch/powerpc/include/asm/thread_info.h linux-4.8.15/arch/powerpc/include/asm/thread_info.h
+--- linux-4.8.15.orig/arch/powerpc/include/asm/thread_info.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/powerpc/include/asm/thread_info.h	2017-01-01 17:07:12.499199453 +0100
+@@ -43,6 +43,8 @@
  	int		cpu;			/* cpu we're on */
  	int		preempt_count;		/* 0 => preemptable,
  						   <0 => BUG */
@@ -1351,7 +1033,7 @@ index 87e4b2d8dcd4..981e501a4359 100644
  	unsigned long	local_flags;		/* private flags for thread */
  #ifdef CONFIG_LIVEPATCH
  	unsigned long *livepatch_sp;
-@@ -88,8 +90,7 @@ static inline struct thread_info *current_thread_info(void)
+@@ -88,8 +90,7 @@
  #define TIF_SYSCALL_TRACE	0	/* syscall trace active */
  #define TIF_SIGPENDING		1	/* signal pending */
  #define TIF_NEED_RESCHED	2	/* rescheduling necessary */
@@ -1361,7 +1043,7 @@ index 87e4b2d8dcd4..981e501a4359 100644
  #define TIF_32BIT		4	/* 32 bit binary */
  #define TIF_RESTORE_TM		5	/* need to restore TM FP/VEC/VSX */
  #define TIF_SYSCALL_AUDIT	7	/* syscall auditing active */
-@@ -107,6 +108,8 @@ static inline struct thread_info *current_thread_info(void)
+@@ -107,6 +108,8 @@
  #if defined(CONFIG_PPC64)
  #define TIF_ELF2ABI		18	/* function descriptors must die! */
  #endif
@@ -1370,7 +1052,7 @@ index 87e4b2d8dcd4..981e501a4359 100644
  
  /* as above, but as bit values */
  #define _TIF_SYSCALL_TRACE	(1<<TIF_SYSCALL_TRACE)
-@@ -125,14 +128,16 @@ static inline struct thread_info *current_thread_info(void)
+@@ -125,14 +128,16 @@
  #define _TIF_SYSCALL_TRACEPOINT	(1<<TIF_SYSCALL_TRACEPOINT)
  #define _TIF_EMULATE_STACK_STORE	(1<<TIF_EMULATE_STACK_STORE)
  #define _TIF_NOHZ		(1<<TIF_NOHZ)
@@ -1388,11 +1070,43 @@ index 87e4b2d8dcd4..981e501a4359 100644
  
  /* Bits in local_flags */
  /* Don't move TLF_NAPPING without adjusting the code in entry_32.S */
-diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c
-index b89d14c0352c..81ae8f4c88f6 100644
---- a/arch/powerpc/kernel/asm-offsets.c
-+++ b/arch/powerpc/kernel/asm-offsets.c
-@@ -156,6 +156,7 @@ int main(void)
+diff -Nur linux-4.8.15.orig/arch/powerpc/Kconfig linux-4.8.15/arch/powerpc/Kconfig
+--- linux-4.8.15.orig/arch/powerpc/Kconfig	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/powerpc/Kconfig	2017-01-01 17:07:12.435195331 +0100
+@@ -57,10 +57,11 @@
+ 
+ config RWSEM_GENERIC_SPINLOCK
+ 	bool
++	default y if PREEMPT_RT_FULL
+ 
+ config RWSEM_XCHGADD_ALGORITHM
+ 	bool
+-	default y
++	default y if !PREEMPT_RT_FULL
+ 
+ config GENERIC_LOCKBREAK
+ 	bool
+@@ -140,6 +141,7 @@
+ 	select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
+ 	select GENERIC_STRNCPY_FROM_USER
+ 	select GENERIC_STRNLEN_USER
++	select HAVE_PREEMPT_LAZY
+ 	select HAVE_MOD_ARCH_SPECIFIC
+ 	select MODULES_USE_ELF_RELA
+ 	select CLONE_BACKWARDS
+@@ -326,7 +328,7 @@
+ 
+ config HIGHMEM
+ 	bool "High memory support"
+-	depends on PPC32
++	depends on PPC32 && !PREEMPT_RT_FULL
+ 
+ source kernel/Kconfig.hz
+ source kernel/Kconfig.preempt
+diff -Nur linux-4.8.15.orig/arch/powerpc/kernel/asm-offsets.c linux-4.8.15/arch/powerpc/kernel/asm-offsets.c
+--- linux-4.8.15.orig/arch/powerpc/kernel/asm-offsets.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/powerpc/kernel/asm-offsets.c	2017-01-01 17:07:12.519200744 +0100
+@@ -156,6 +156,7 @@
  	DEFINE(TI_FLAGS, offsetof(struct thread_info, flags));
  	DEFINE(TI_LOCAL_FLAGS, offsetof(struct thread_info, local_flags));
  	DEFINE(TI_PREEMPT, offsetof(struct thread_info, preempt_count));
@@ -1400,11 +1114,10 @@ index b89d14c0352c..81ae8f4c88f6 100644
  	DEFINE(TI_TASK, offsetof(struct thread_info, task));
  	DEFINE(TI_CPU, offsetof(struct thread_info, cpu));
  
-diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S
-index 9899032230b4..f95b93f46c47 100644
---- a/arch/powerpc/kernel/entry_32.S
-+++ b/arch/powerpc/kernel/entry_32.S
-@@ -835,7 +835,14 @@ user_exc_return:		/* r10 contains MSR_KERNEL here */
+diff -Nur linux-4.8.15.orig/arch/powerpc/kernel/entry_32.S linux-4.8.15/arch/powerpc/kernel/entry_32.S
+--- linux-4.8.15.orig/arch/powerpc/kernel/entry_32.S	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/powerpc/kernel/entry_32.S	2017-01-01 17:07:12.531201514 +0100
+@@ -835,7 +835,14 @@
  	cmpwi	0,r0,0		/* if non-zero, just restore regs and return */
  	bne	restore
  	andi.	r8,r8,_TIF_NEED_RESCHED
@@ -1419,7 +1132,7 @@ index 9899032230b4..f95b93f46c47 100644
  	lwz	r3,_MSR(r1)
  	andi.	r0,r3,MSR_EE	/* interrupts off? */
  	beq	restore		/* don't schedule if so */
-@@ -846,11 +853,11 @@ user_exc_return:		/* r10 contains MSR_KERNEL here */
+@@ -846,11 +853,11 @@
  	 */
  	bl	trace_hardirqs_off
  #endif
@@ -1434,7 +1147,7 @@ index 9899032230b4..f95b93f46c47 100644
  #ifdef CONFIG_TRACE_IRQFLAGS
  	/* And now, to properly rebalance the above, we tell lockdep they
  	 * are being turned back on, which will happen when we return
-@@ -1171,7 +1178,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_NEED_PAIRED_STWCX)
+@@ -1171,7 +1178,7 @@
  #endif /* !(CONFIG_4xx || CONFIG_BOOKE) */
  
  do_work:			/* r10 contains MSR_KERNEL here */
@@ -1443,7 +1156,7 @@ index 9899032230b4..f95b93f46c47 100644
  	beq	do_user_signal
  
  do_resched:			/* r10 contains MSR_KERNEL here */
-@@ -1192,7 +1199,7 @@ do_resched:			/* r10 contains MSR_KERNEL here */
+@@ -1192,7 +1199,7 @@
  	MTMSRD(r10)		/* disable interrupts */
  	CURRENT_THREAD_INFO(r9, r1)
  	lwz	r9,TI_FLAGS(r9)
@@ -1452,11 +1165,10 @@ index 9899032230b4..f95b93f46c47 100644
  	bne-	do_resched
  	andi.	r0,r9,_TIF_USER_WORK_MASK
  	beq	restore_user
-diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S
-index 5afd03e5e8b8..f5d4c2a033ef 100644
---- a/arch/powerpc/kernel/entry_64.S
-+++ b/arch/powerpc/kernel/entry_64.S
-@@ -657,7 +657,7 @@ _GLOBAL(ret_from_except_lite)
+diff -Nur linux-4.8.15.orig/arch/powerpc/kernel/entry_64.S linux-4.8.15/arch/powerpc/kernel/entry_64.S
+--- linux-4.8.15.orig/arch/powerpc/kernel/entry_64.S	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/powerpc/kernel/entry_64.S	2017-01-01 17:07:12.535201773 +0100
+@@ -657,7 +657,7 @@
  	bl	restore_math
  	b	restore
  #endif
@@ -1465,29 +1177,27 @@ index 5afd03e5e8b8..f5d4c2a033ef 100644
  	beq	2f
  	bl	restore_interrupts
  	SCHEDULE_USER
-@@ -719,10 +719,18 @@ _GLOBAL(ret_from_except_lite)
+@@ -719,10 +719,18 @@
  
  #ifdef CONFIG_PREEMPT
  	/* Check if we need to preempt */
--	andi.	r0,r4,_TIF_NEED_RESCHED
--	beq+	restore
--	/* Check that preempt_count() == 0 and interrupts are enabled */
- 	lwz	r8,TI_PREEMPT(r9)
++	lwz	r8,TI_PREEMPT(r9)
 +	cmpwi	0,r8,0		/* if non-zero, just restore regs and return */
 +	bne	restore
-+	andi.	r0,r4,_TIF_NEED_RESCHED
+ 	andi.	r0,r4,_TIF_NEED_RESCHED
 +	bne+	check_count
 +
 +	andi.	r0,r4,_TIF_NEED_RESCHED_LAZY
-+	beq+	restore
+ 	beq+	restore
 +	lwz	r8,TI_PREEMPT_LAZY(r9)
 +
-+	/* Check that preempt_count() == 0 and interrupts are enabled */
+ 	/* Check that preempt_count() == 0 and interrupts are enabled */
+-	lwz	r8,TI_PREEMPT(r9)
 +check_count:
  	cmpwi	cr1,r8,0
  	ld	r0,SOFTE(r1)
  	cmpdi	r0,0
-@@ -739,7 +747,7 @@ _GLOBAL(ret_from_except_lite)
+@@ -739,7 +747,7 @@
  	/* Re-test flags and eventually loop */
  	CURRENT_THREAD_INFO(r9, r1)
  	ld	r4,TI_FLAGS(r9)
@@ -1496,11 +1206,10 @@ index 5afd03e5e8b8..f5d4c2a033ef 100644
  	bne	1b
  
  	/*
-diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
-index 08887cf2b20e..f1770ea2d094 100644
---- a/arch/powerpc/kernel/irq.c
-+++ b/arch/powerpc/kernel/irq.c
-@@ -633,6 +633,7 @@ void irq_ctx_init(void)
+diff -Nur linux-4.8.15.orig/arch/powerpc/kernel/irq.c linux-4.8.15/arch/powerpc/kernel/irq.c
+--- linux-4.8.15.orig/arch/powerpc/kernel/irq.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/powerpc/kernel/irq.c	2017-01-01 17:07:12.539202039 +0100
+@@ -633,6 +633,7 @@
  	}
  }
  
@@ -1508,7 +1217,7 @@ index 08887cf2b20e..f1770ea2d094 100644
  void do_softirq_own_stack(void)
  {
  	struct thread_info *curtp, *irqtp;
-@@ -650,6 +651,7 @@ void do_softirq_own_stack(void)
+@@ -650,6 +651,7 @@
  	if (irqtp->flags)
  		set_bits(irqtp->flags, &curtp->flags);
  }
@@ -1516,10 +1225,9 @@ index 08887cf2b20e..f1770ea2d094 100644
  
  irq_hw_number_t virq_to_hw(unsigned int virq)
  {
-diff --git a/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S
-index d9c912b6e632..7b2e997a5083 100644
---- a/arch/powerpc/kernel/misc_32.S
-+++ b/arch/powerpc/kernel/misc_32.S
+diff -Nur linux-4.8.15.orig/arch/powerpc/kernel/misc_32.S linux-4.8.15/arch/powerpc/kernel/misc_32.S
+--- linux-4.8.15.orig/arch/powerpc/kernel/misc_32.S	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/powerpc/kernel/misc_32.S	2017-01-01 17:07:12.543202293 +0100
 @@ -40,6 +40,7 @@
   * We store the saved ksp_limit in the unused part
   * of the STACK_FRAME_OVERHEAD
@@ -1528,7 +1236,7 @@ index d9c912b6e632..7b2e997a5083 100644
  _GLOBAL(call_do_softirq)
  	mflr	r0
  	stw	r0,4(r1)
-@@ -56,6 +57,7 @@ _GLOBAL(call_do_softirq)
+@@ -56,6 +57,7 @@
  	stw	r10,THREAD+KSP_LIMIT(r2)
  	mtlr	r0
  	blr
@@ -1536,10 +1244,9 @@ index d9c912b6e632..7b2e997a5083 100644
  
  /*
   * void call_do_irq(struct pt_regs *regs, struct thread_info *irqtp);
-diff --git a/arch/powerpc/kernel/misc_64.S b/arch/powerpc/kernel/misc_64.S
-index cb195157b318..c919a2bfd0ca 100644
---- a/arch/powerpc/kernel/misc_64.S
-+++ b/arch/powerpc/kernel/misc_64.S
+diff -Nur linux-4.8.15.orig/arch/powerpc/kernel/misc_64.S linux-4.8.15/arch/powerpc/kernel/misc_64.S
+--- linux-4.8.15.orig/arch/powerpc/kernel/misc_64.S	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/powerpc/kernel/misc_64.S	2017-01-01 17:07:12.543202293 +0100
 @@ -30,6 +30,7 @@
  
  	.text
@@ -1548,7 +1255,7 @@ index cb195157b318..c919a2bfd0ca 100644
  _GLOBAL(call_do_softirq)
  	mflr	r0
  	std	r0,16(r1)
-@@ -40,6 +41,7 @@ _GLOBAL(call_do_softirq)
+@@ -40,6 +41,7 @@
  	ld	r0,16(r1)
  	mtlr	r0
  	blr
@@ -1556,11 +1263,10 @@ index cb195157b318..c919a2bfd0ca 100644
  
  _GLOBAL(call_do_irq)
  	mflr	r0
-diff --git a/arch/powerpc/kvm/Kconfig b/arch/powerpc/kvm/Kconfig
-index c2024ac9d4e8..2303788da7e1 100644
---- a/arch/powerpc/kvm/Kconfig
-+++ b/arch/powerpc/kvm/Kconfig
-@@ -172,6 +172,7 @@ config KVM_E500MC
+diff -Nur linux-4.8.15.orig/arch/powerpc/kvm/Kconfig linux-4.8.15/arch/powerpc/kvm/Kconfig
+--- linux-4.8.15.orig/arch/powerpc/kvm/Kconfig	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/powerpc/kvm/Kconfig	2017-01-01 17:07:12.587205132 +0100
+@@ -172,6 +172,7 @@
  config KVM_MPIC
  	bool "KVM in-kernel MPIC emulation"
  	depends on KVM && E500
@@ -1568,11 +1274,10 @@ index c2024ac9d4e8..2303788da7e1 100644
  	select HAVE_KVM_IRQCHIP
  	select HAVE_KVM_IRQFD
  	select HAVE_KVM_IRQ_ROUTING
-diff --git a/arch/powerpc/platforms/ps3/device-init.c b/arch/powerpc/platforms/ps3/device-init.c
-index 57caaf11a83f..030c9bfe52e3 100644
---- a/arch/powerpc/platforms/ps3/device-init.c
-+++ b/arch/powerpc/platforms/ps3/device-init.c
-@@ -752,7 +752,7 @@ static int ps3_notification_read_write(struct ps3_notification_device *dev,
+diff -Nur linux-4.8.15.orig/arch/powerpc/platforms/ps3/device-init.c linux-4.8.15/arch/powerpc/platforms/ps3/device-init.c
+--- linux-4.8.15.orig/arch/powerpc/platforms/ps3/device-init.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/powerpc/platforms/ps3/device-init.c	2017-01-01 17:07:12.623207443 +0100
+@@ -752,7 +752,7 @@
  	}
  	pr_debug("%s:%u: notification %s issued\n", __func__, __LINE__, op);
  
@@ -1581,11 +1286,10 @@ index 57caaf11a83f..030c9bfe52e3 100644
  				       dev->done.done || kthread_should_stop());
  	if (kthread_should_stop())
  		res = -EINTR;
-diff --git a/arch/sh/kernel/irq.c b/arch/sh/kernel/irq.c
-index 6c0378c0b8b5..abd58b4dff97 100644
---- a/arch/sh/kernel/irq.c
-+++ b/arch/sh/kernel/irq.c
-@@ -147,6 +147,7 @@ void irq_ctx_exit(int cpu)
+diff -Nur linux-4.8.15.orig/arch/sh/kernel/irq.c linux-4.8.15/arch/sh/kernel/irq.c
+--- linux-4.8.15.orig/arch/sh/kernel/irq.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/sh/kernel/irq.c	2017-01-01 17:07:12.687211566 +0100
+@@ -147,6 +147,7 @@
  	hardirq_ctx[cpu] = NULL;
  }
  
@@ -1593,7 +1297,7 @@ index 6c0378c0b8b5..abd58b4dff97 100644
  void do_softirq_own_stack(void)
  {
  	struct thread_info *curctx;
-@@ -174,6 +175,7 @@ void do_softirq_own_stack(void)
+@@ -174,6 +175,7 @@
  		  "r5", "r6", "r7", "r8", "r9", "r15", "t", "pr"
  	);
  }
@@ -1601,11 +1305,10 @@ index 6c0378c0b8b5..abd58b4dff97 100644
  #else
  static inline void handle_one_irq(unsigned int irq)
  {
-diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
-index 59b09600dd32..1b073eb3dc2a 100644
---- a/arch/sparc/Kconfig
-+++ b/arch/sparc/Kconfig
-@@ -187,12 +187,10 @@ config NR_CPUS
+diff -Nur linux-4.8.15.orig/arch/sparc/Kconfig linux-4.8.15/arch/sparc/Kconfig
+--- linux-4.8.15.orig/arch/sparc/Kconfig	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/sparc/Kconfig	2017-01-01 17:07:12.723213881 +0100
+@@ -187,12 +187,10 @@
  source kernel/Kconfig.hz
  
  config RWSEM_GENERIC_SPINLOCK
@@ -1620,11 +1323,10 @@ index 59b09600dd32..1b073eb3dc2a 100644
  
  config GENERIC_HWEIGHT
  	bool
-diff --git a/arch/sparc/kernel/irq_64.c b/arch/sparc/kernel/irq_64.c
-index 34a7930b76ef..773740521008 100644
---- a/arch/sparc/kernel/irq_64.c
-+++ b/arch/sparc/kernel/irq_64.c
-@@ -854,6 +854,7 @@ void __irq_entry handler_irq(int pil, struct pt_regs *regs)
+diff -Nur linux-4.8.15.orig/arch/sparc/kernel/irq_64.c linux-4.8.15/arch/sparc/kernel/irq_64.c
+--- linux-4.8.15.orig/arch/sparc/kernel/irq_64.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/sparc/kernel/irq_64.c	2017-01-01 17:07:12.763216468 +0100
+@@ -854,6 +854,7 @@
  	set_irq_regs(old_regs);
  }
  
@@ -1632,7 +1334,7 @@ index 34a7930b76ef..773740521008 100644
  void do_softirq_own_stack(void)
  {
  	void *orig_sp, *sp = softirq_stack[smp_processor_id()];
-@@ -868,6 +869,7 @@ void do_softirq_own_stack(void)
+@@ -868,6 +869,7 @@
  	__asm__ __volatile__("mov %0, %%sp"
  			     : : "r" (orig_sp));
  }
@@ -1640,45 +1342,10 @@ index 34a7930b76ef..773740521008 100644
  
  #ifdef CONFIG_HOTPLUG_CPU
  void fixup_irqs(void)
-diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
-index 2a1f0ce7c59a..bd4ab87efb31 100644
---- a/arch/x86/Kconfig
-+++ b/arch/x86/Kconfig
-@@ -17,6 +17,7 @@ config X86_64
- ### Arch settings
- config X86
- 	def_bool y
-+	select HAVE_PREEMPT_LAZY
- 	select ACPI_LEGACY_TABLES_LOOKUP	if ACPI
- 	select ACPI_SYSTEM_POWER_STATES_SUPPORT	if ACPI
- 	select ANON_INODES
-@@ -231,8 +232,11 @@ config ARCH_MAY_HAVE_PC_FDC
- 	def_bool y
- 	depends on ISA_DMA_API
- 
-+config RWSEM_GENERIC_SPINLOCK
-+	def_bool PREEMPT_RT_FULL
-+
- config RWSEM_XCHGADD_ALGORITHM
--	def_bool y
-+	def_bool !RWSEM_GENERIC_SPINLOCK && !PREEMPT_RT_FULL
- 
- config GENERIC_CALIBRATE_DELAY
- 	def_bool y
-@@ -885,7 +889,7 @@ config IOMMU_HELPER
- config MAXSMP
- 	bool "Enable Maximum number of SMP Processors and NUMA Nodes"
- 	depends on X86_64 && SMP && DEBUG_KERNEL
--	select CPUMASK_OFFSTACK
-+	select CPUMASK_OFFSTACK if !PREEMPT_RT_FULL
- 	---help---
- 	  Enable maximum number of CPUS and NUMA Nodes for this architecture.
- 	  If unsure, say N.
-diff --git a/arch/x86/crypto/aesni-intel_glue.c b/arch/x86/crypto/aesni-intel_glue.c
-index 0ab5ee1c26af..fff8f6f1f90c 100644
---- a/arch/x86/crypto/aesni-intel_glue.c
-+++ b/arch/x86/crypto/aesni-intel_glue.c
-@@ -372,14 +372,14 @@ static int ecb_encrypt(struct blkcipher_desc *desc,
+diff -Nur linux-4.8.15.orig/arch/x86/crypto/aesni-intel_glue.c linux-4.8.15/arch/x86/crypto/aesni-intel_glue.c
+--- linux-4.8.15.orig/arch/x86/crypto/aesni-intel_glue.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/x86/crypto/aesni-intel_glue.c	2017-01-01 17:07:12.971229856 +0100
+@@ -372,14 +372,14 @@
  	err = blkcipher_walk_virt(desc, &walk);
  	desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;
  
@@ -1696,7 +1363,7 @@ index 0ab5ee1c26af..fff8f6f1f90c 100644
  
  	return err;
  }
-@@ -396,14 +396,14 @@ static int ecb_decrypt(struct blkcipher_desc *desc,
+@@ -396,14 +396,14 @@
  	err = blkcipher_walk_virt(desc, &walk);
  	desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;
  
@@ -1713,7 +1380,7 @@ index 0ab5ee1c26af..fff8f6f1f90c 100644
  
  	return err;
  }
-@@ -420,14 +420,14 @@ static int cbc_encrypt(struct blkcipher_desc *desc,
+@@ -420,14 +420,14 @@
  	err = blkcipher_walk_virt(desc, &walk);
  	desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;
  
@@ -1730,7 +1397,7 @@ index 0ab5ee1c26af..fff8f6f1f90c 100644
  
  	return err;
  }
-@@ -444,14 +444,14 @@ static int cbc_decrypt(struct blkcipher_desc *desc,
+@@ -444,14 +444,14 @@
  	err = blkcipher_walk_virt(desc, &walk);
  	desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;
  
@@ -1747,7 +1414,7 @@ index 0ab5ee1c26af..fff8f6f1f90c 100644
  
  	return err;
  }
-@@ -503,18 +503,20 @@ static int ctr_crypt(struct blkcipher_desc *desc,
+@@ -503,18 +503,20 @@
  	err = blkcipher_walk_virt_block(desc, &walk, AES_BLOCK_SIZE);
  	desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;
  
@@ -1770,11 +1437,10 @@ index 0ab5ee1c26af..fff8f6f1f90c 100644
  
  	return err;
  }
-diff --git a/arch/x86/crypto/cast5_avx_glue.c b/arch/x86/crypto/cast5_avx_glue.c
-index 8648158f3916..d7699130ee36 100644
---- a/arch/x86/crypto/cast5_avx_glue.c
-+++ b/arch/x86/crypto/cast5_avx_glue.c
-@@ -59,7 +59,7 @@ static inline void cast5_fpu_end(bool fpu_enabled)
+diff -Nur linux-4.8.15.orig/arch/x86/crypto/cast5_avx_glue.c linux-4.8.15/arch/x86/crypto/cast5_avx_glue.c
+--- linux-4.8.15.orig/arch/x86/crypto/cast5_avx_glue.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/x86/crypto/cast5_avx_glue.c	2017-01-01 17:07:12.979230370 +0100
+@@ -59,7 +59,7 @@
  static int ecb_crypt(struct blkcipher_desc *desc, struct blkcipher_walk *walk,
  		     bool enc)
  {
@@ -1783,7 +1449,7 @@ index 8648158f3916..d7699130ee36 100644
  	struct cast5_ctx *ctx = crypto_blkcipher_ctx(desc->tfm);
  	const unsigned int bsize = CAST5_BLOCK_SIZE;
  	unsigned int nbytes;
-@@ -75,7 +75,7 @@ static int ecb_crypt(struct blkcipher_desc *desc, struct blkcipher_walk *walk,
+@@ -75,7 +75,7 @@
  		u8 *wsrc = walk->src.virt.addr;
  		u8 *wdst = walk->dst.virt.addr;
  
@@ -1792,7 +1458,7 @@ index 8648158f3916..d7699130ee36 100644
  
  		/* Process multi-block batch */
  		if (nbytes >= bsize * CAST5_PARALLEL_BLOCKS) {
-@@ -103,10 +103,9 @@ static int ecb_crypt(struct blkcipher_desc *desc, struct blkcipher_walk *walk,
+@@ -103,10 +103,9 @@
  		} while (nbytes >= bsize);
  
  done:
@@ -1804,7 +1470,7 @@ index 8648158f3916..d7699130ee36 100644
  	return err;
  }
  
-@@ -227,7 +226,7 @@ static unsigned int __cbc_decrypt(struct blkcipher_desc *desc,
+@@ -227,7 +226,7 @@
  static int cbc_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst,
  		       struct scatterlist *src, unsigned int nbytes)
  {
@@ -1813,7 +1479,7 @@ index 8648158f3916..d7699130ee36 100644
  	struct blkcipher_walk walk;
  	int err;
  
-@@ -236,12 +235,11 @@ static int cbc_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst,
+@@ -236,12 +235,11 @@
  	desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;
  
  	while ((nbytes = walk.nbytes)) {
@@ -1828,7 +1494,7 @@ index 8648158f3916..d7699130ee36 100644
  	return err;
  }
  
-@@ -311,7 +309,7 @@ static unsigned int __ctr_crypt(struct blkcipher_desc *desc,
+@@ -311,7 +309,7 @@
  static int ctr_crypt(struct blkcipher_desc *desc, struct scatterlist *dst,
  		     struct scatterlist *src, unsigned int nbytes)
  {
@@ -1837,7 +1503,7 @@ index 8648158f3916..d7699130ee36 100644
  	struct blkcipher_walk walk;
  	int err;
  
-@@ -320,13 +318,12 @@ static int ctr_crypt(struct blkcipher_desc *desc, struct scatterlist *dst,
+@@ -320,13 +318,12 @@
  	desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;
  
  	while ((nbytes = walk.nbytes) >= CAST5_BLOCK_SIZE) {
@@ -1853,11 +1519,10 @@ index 8648158f3916..d7699130ee36 100644
  	if (walk.nbytes) {
  		ctr_crypt_final(desc, &walk);
  		err = blkcipher_walk_done(desc, &walk, 0);
-diff --git a/arch/x86/crypto/glue_helper.c b/arch/x86/crypto/glue_helper.c
-index 6a85598931b5..3a506ce7ed93 100644
---- a/arch/x86/crypto/glue_helper.c
-+++ b/arch/x86/crypto/glue_helper.c
-@@ -39,7 +39,7 @@ static int __glue_ecb_crypt_128bit(const struct common_glue_ctx *gctx,
+diff -Nur linux-4.8.15.orig/arch/x86/crypto/glue_helper.c linux-4.8.15/arch/x86/crypto/glue_helper.c
+--- linux-4.8.15.orig/arch/x86/crypto/glue_helper.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/x86/crypto/glue_helper.c	2017-01-01 17:07:12.983230644 +0100
+@@ -39,7 +39,7 @@
  	void *ctx = crypto_blkcipher_ctx(desc->tfm);
  	const unsigned int bsize = 128 / 8;
  	unsigned int nbytes, i, func_bytes;
@@ -1866,7 +1531,7 @@ index 6a85598931b5..3a506ce7ed93 100644
  	int err;
  
  	err = blkcipher_walk_virt(desc, walk);
-@@ -49,7 +49,7 @@ static int __glue_ecb_crypt_128bit(const struct common_glue_ctx *gctx,
+@@ -49,7 +49,7 @@
  		u8 *wdst = walk->dst.virt.addr;
  
  		fpu_enabled = glue_fpu_begin(bsize, gctx->fpu_blocks_limit,
@@ -1875,7 +1540,7 @@ index 6a85598931b5..3a506ce7ed93 100644
  
  		for (i = 0; i < gctx->num_funcs; i++) {
  			func_bytes = bsize * gctx->funcs[i].num_blocks;
-@@ -71,10 +71,10 @@ static int __glue_ecb_crypt_128bit(const struct common_glue_ctx *gctx,
+@@ -71,10 +71,10 @@
  		}
  
  done:
@@ -1887,7 +1552,7 @@ index 6a85598931b5..3a506ce7ed93 100644
  	return err;
  }
  
-@@ -194,7 +194,7 @@ int glue_cbc_decrypt_128bit(const struct common_glue_ctx *gctx,
+@@ -194,7 +194,7 @@
  			    struct scatterlist *src, unsigned int nbytes)
  {
  	const unsigned int bsize = 128 / 8;
@@ -1896,7 +1561,7 @@ index 6a85598931b5..3a506ce7ed93 100644
  	struct blkcipher_walk walk;
  	int err;
  
-@@ -203,12 +203,12 @@ int glue_cbc_decrypt_128bit(const struct common_glue_ctx *gctx,
+@@ -203,12 +203,12 @@
  
  	while ((nbytes = walk.nbytes)) {
  		fpu_enabled = glue_fpu_begin(bsize, gctx->fpu_blocks_limit,
@@ -1911,7 +1576,7 @@ index 6a85598931b5..3a506ce7ed93 100644
  	return err;
  }
  EXPORT_SYMBOL_GPL(glue_cbc_decrypt_128bit);
-@@ -277,7 +277,7 @@ int glue_ctr_crypt_128bit(const struct common_glue_ctx *gctx,
+@@ -277,7 +277,7 @@
  			  struct scatterlist *src, unsigned int nbytes)
  {
  	const unsigned int bsize = 128 / 8;
@@ -1920,7 +1585,7 @@ index 6a85598931b5..3a506ce7ed93 100644
  	struct blkcipher_walk walk;
  	int err;
  
-@@ -286,13 +286,12 @@ int glue_ctr_crypt_128bit(const struct common_glue_ctx *gctx,
+@@ -286,13 +286,12 @@
  
  	while ((nbytes = walk.nbytes) >= bsize) {
  		fpu_enabled = glue_fpu_begin(bsize, gctx->fpu_blocks_limit,
@@ -1936,7 +1601,7 @@ index 6a85598931b5..3a506ce7ed93 100644
  	if (walk.nbytes) {
  		glue_ctr_crypt_final_128bit(
  			gctx->funcs[gctx->num_funcs - 1].fn_u.ctr, desc, &walk);
-@@ -347,7 +346,7 @@ int glue_xts_crypt_128bit(const struct common_glue_ctx *gctx,
+@@ -347,7 +346,7 @@
  			  void *tweak_ctx, void *crypt_ctx)
  {
  	const unsigned int bsize = 128 / 8;
@@ -1945,7 +1610,7 @@ index 6a85598931b5..3a506ce7ed93 100644
  	struct blkcipher_walk walk;
  	int err;
  
-@@ -360,21 +359,21 @@ int glue_xts_crypt_128bit(const struct common_glue_ctx *gctx,
+@@ -360,21 +359,21 @@
  
  	/* set minimum length to bsize, for tweak_fn */
  	fpu_enabled = glue_fpu_begin(bsize, gctx->fpu_blocks_limit,
@@ -1972,11 +1637,10 @@ index 6a85598931b5..3a506ce7ed93 100644
  	return err;
  }
  EXPORT_SYMBOL_GPL(glue_xts_crypt_128bit);
-diff --git a/arch/x86/entry/common.c b/arch/x86/entry/common.c
-index 1433f6b4607d..f963fde8e4fa 100644
---- a/arch/x86/entry/common.c
-+++ b/arch/x86/entry/common.c
-@@ -136,7 +136,7 @@ static long syscall_trace_enter(struct pt_regs *regs)
+diff -Nur linux-4.8.15.orig/arch/x86/entry/common.c linux-4.8.15/arch/x86/entry/common.c
+--- linux-4.8.15.orig/arch/x86/entry/common.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/x86/entry/common.c	2017-01-01 17:07:13.071236305 +0100
+@@ -136,7 +136,7 @@
  
  #define EXIT_TO_USERMODE_LOOP_FLAGS				\
  	(_TIF_SIGPENDING | _TIF_NOTIFY_RESUME | _TIF_UPROBE |	\
@@ -1985,7 +1649,7 @@ index 1433f6b4607d..f963fde8e4fa 100644
  
  static void exit_to_usermode_loop(struct pt_regs *regs, u32 cached_flags)
  {
-@@ -152,9 +152,16 @@ static void exit_to_usermode_loop(struct pt_regs *regs, u32 cached_flags)
+@@ -152,9 +152,16 @@
  		/* We have work to do. */
  		local_irq_enable();
  
@@ -2003,11 +1667,10 @@ index 1433f6b4607d..f963fde8e4fa 100644
  		if (cached_flags & _TIF_UPROBE)
  			uprobe_notify_resume(regs);
  
-diff --git a/arch/x86/entry/entry_32.S b/arch/x86/entry/entry_32.S
-index 0b56666e6039..1d8ee026c9c5 100644
---- a/arch/x86/entry/entry_32.S
-+++ b/arch/x86/entry/entry_32.S
-@@ -271,8 +271,25 @@ END(ret_from_exception)
+diff -Nur linux-4.8.15.orig/arch/x86/entry/entry_32.S linux-4.8.15/arch/x86/entry/entry_32.S
+--- linux-4.8.15.orig/arch/x86/entry/entry_32.S	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/x86/entry/entry_32.S	2017-01-01 17:07:13.071236305 +0100
+@@ -271,8 +271,25 @@
  ENTRY(resume_kernel)
  	DISABLE_INTERRUPTS(CLBR_ANY)
  need_resched:
@@ -2033,11 +1696,10 @@ index 0b56666e6039..1d8ee026c9c5 100644
  	testl	$X86_EFLAGS_IF, PT_EFLAGS(%esp)	# interrupts off (exception path) ?
  	jz	restore_all
  	call	preempt_schedule_irq
-diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S
-index 02fff3ebfb87..81ec3d016df0 100644
---- a/arch/x86/entry/entry_64.S
-+++ b/arch/x86/entry/entry_64.S
-@@ -512,7 +512,23 @@ GLOBAL(retint_user)
+diff -Nur linux-4.8.15.orig/arch/x86/entry/entry_64.S linux-4.8.15/arch/x86/entry/entry_64.S
+--- linux-4.8.15.orig/arch/x86/entry/entry_64.S	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/x86/entry/entry_64.S	2017-01-01 17:07:13.071236305 +0100
+@@ -512,7 +512,23 @@
  	bt	$9, EFLAGS(%rsp)		/* were interrupts off? */
  	jnc	1f
  0:	cmpl	$0, PER_CPU_VAR(__preempt_count)
@@ -2061,7 +1723,7 @@ index 02fff3ebfb87..81ec3d016df0 100644
  	call	preempt_schedule_irq
  	jmp	0b
  1:
-@@ -817,6 +833,7 @@ END(native_load_gs_index)
+@@ -817,6 +833,7 @@
  	jmp	2b
  	.previous
  
@@ -2069,7 +1731,7 @@ index 02fff3ebfb87..81ec3d016df0 100644
  /* Call softirq on interrupt stack. Interrupts are off. */
  ENTRY(do_softirq_own_stack)
  	pushq	%rbp
-@@ -829,6 +846,7 @@ ENTRY(do_softirq_own_stack)
+@@ -829,6 +846,7 @@
  	decl	PER_CPU_VAR(irq_count)
  	ret
  END(do_softirq_own_stack)
@@ -2077,11 +1739,10 @@ index 02fff3ebfb87..81ec3d016df0 100644
  
  #ifdef CONFIG_XEN
  idtentry xen_hypervisor_callback xen_do_hypervisor_callback has_error_code=0
-diff --git a/arch/x86/include/asm/preempt.h b/arch/x86/include/asm/preempt.h
-index 17f218645701..11bd1b7ee6eb 100644
---- a/arch/x86/include/asm/preempt.h
-+++ b/arch/x86/include/asm/preempt.h
-@@ -79,17 +79,46 @@ static __always_inline void __preempt_count_sub(int val)
+diff -Nur linux-4.8.15.orig/arch/x86/include/asm/preempt.h linux-4.8.15/arch/x86/include/asm/preempt.h
+--- linux-4.8.15.orig/arch/x86/include/asm/preempt.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/x86/include/asm/preempt.h	2017-01-01 17:07:13.123239646 +0100
+@@ -79,17 +79,46 @@
   * a decrement which hits zero means we have no preempt_count and should
   * reschedule.
   */
@@ -2129,11 +1790,10 @@ index 17f218645701..11bd1b7ee6eb 100644
  }
  
  #ifdef CONFIG_PREEMPT
-diff --git a/arch/x86/include/asm/signal.h b/arch/x86/include/asm/signal.h
-index dd1e7d6387ab..d59bedb28bab 100644
---- a/arch/x86/include/asm/signal.h
-+++ b/arch/x86/include/asm/signal.h
-@@ -23,6 +23,19 @@ typedef struct {
+diff -Nur linux-4.8.15.orig/arch/x86/include/asm/signal.h linux-4.8.15/arch/x86/include/asm/signal.h
+--- linux-4.8.15.orig/arch/x86/include/asm/signal.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/x86/include/asm/signal.h	2017-01-01 17:07:13.123239646 +0100
+@@ -23,6 +23,19 @@
  	unsigned long sig[_NSIG_WORDS];
  } sigset_t;
  
@@ -2153,10 +1813,9 @@ index dd1e7d6387ab..d59bedb28bab 100644
  #ifndef CONFIG_COMPAT
  typedef sigset_t compat_sigset_t;
  #endif
-diff --git a/arch/x86/include/asm/stackprotector.h b/arch/x86/include/asm/stackprotector.h
-index 58505f01962f..02fa39652cd6 100644
---- a/arch/x86/include/asm/stackprotector.h
-+++ b/arch/x86/include/asm/stackprotector.h
+diff -Nur linux-4.8.15.orig/arch/x86/include/asm/stackprotector.h linux-4.8.15/arch/x86/include/asm/stackprotector.h
+--- linux-4.8.15.orig/arch/x86/include/asm/stackprotector.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/x86/include/asm/stackprotector.h	2017-01-01 17:07:13.127239912 +0100
 @@ -59,7 +59,7 @@
   */
  static __always_inline void boot_init_stack_canary(void)
@@ -2166,7 +1825,7 @@ index 58505f01962f..02fa39652cd6 100644
  	u64 tsc;
  
  #ifdef CONFIG_X86_64
-@@ -70,8 +70,15 @@ static __always_inline void boot_init_stack_canary(void)
+@@ -70,8 +70,15 @@
  	 * of randomness. The TSC only matters for very early init,
  	 * there it already has some randomness on most systems. Later
  	 * on during the bootup the random pool has true entropy too.
@@ -2182,11 +1841,10 @@ index 58505f01962f..02fa39652cd6 100644
  	tsc = rdtsc();
  	canary += tsc + (tsc << 32UL);
  
-diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
-index 8b7c8d8e0852..631059ef61da 100644
---- a/arch/x86/include/asm/thread_info.h
-+++ b/arch/x86/include/asm/thread_info.h
-@@ -57,6 +57,8 @@ struct thread_info {
+diff -Nur linux-4.8.15.orig/arch/x86/include/asm/thread_info.h linux-4.8.15/arch/x86/include/asm/thread_info.h
+--- linux-4.8.15.orig/arch/x86/include/asm/thread_info.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/x86/include/asm/thread_info.h	2017-01-01 17:07:13.127239912 +0100
+@@ -57,6 +57,8 @@
  	__u32			flags;		/* low level flags */
  	__u32			status;		/* thread synchronous flags */
  	__u32			cpu;		/* current CPU */
@@ -2195,7 +1853,7 @@ index 8b7c8d8e0852..631059ef61da 100644
  };
  
  #define INIT_THREAD_INFO(tsk)			\
-@@ -73,6 +75,10 @@ struct thread_info {
+@@ -73,6 +75,10 @@
  
  #include <asm/asm-offsets.h>
  
@@ -2206,7 +1864,7 @@ index 8b7c8d8e0852..631059ef61da 100644
  #endif
  
  /*
-@@ -91,6 +97,7 @@ struct thread_info {
+@@ -91,6 +97,7 @@
  #define TIF_SYSCALL_EMU		6	/* syscall emulation active */
  #define TIF_SYSCALL_AUDIT	7	/* syscall auditing active */
  #define TIF_SECCOMP		8	/* secure computing */
@@ -2214,7 +1872,7 @@ index 8b7c8d8e0852..631059ef61da 100644
  #define TIF_USER_RETURN_NOTIFY	11	/* notify kernel of userspace return */
  #define TIF_UPROBE		12	/* breakpointed or singlestepping */
  #define TIF_NOTSC		16	/* TSC is not accessible in userland */
-@@ -115,6 +122,7 @@ struct thread_info {
+@@ -115,6 +122,7 @@
  #define _TIF_SYSCALL_EMU	(1 << TIF_SYSCALL_EMU)
  #define _TIF_SYSCALL_AUDIT	(1 << TIF_SYSCALL_AUDIT)
  #define _TIF_SECCOMP		(1 << TIF_SECCOMP)
@@ -2222,7 +1880,7 @@ index 8b7c8d8e0852..631059ef61da 100644
  #define _TIF_USER_RETURN_NOTIFY	(1 << TIF_USER_RETURN_NOTIFY)
  #define _TIF_UPROBE		(1 << TIF_UPROBE)
  #define _TIF_NOTSC		(1 << TIF_NOTSC)
-@@ -151,6 +159,8 @@ struct thread_info {
+@@ -151,6 +159,8 @@
  #define _TIF_WORK_CTXSW_PREV (_TIF_WORK_CTXSW|_TIF_USER_RETURN_NOTIFY)
  #define _TIF_WORK_CTXSW_NEXT (_TIF_WORK_CTXSW)
  
@@ -2231,11 +1889,10 @@ index 8b7c8d8e0852..631059ef61da 100644
  #define STACK_WARN		(THREAD_SIZE/8)
  
  /*
-diff --git a/arch/x86/include/asm/uv/uv_bau.h b/arch/x86/include/asm/uv/uv_bau.h
-index cc44d926c17e..df278aa0f638 100644
---- a/arch/x86/include/asm/uv/uv_bau.h
-+++ b/arch/x86/include/asm/uv/uv_bau.h
-@@ -615,9 +615,9 @@ struct bau_control {
+diff -Nur linux-4.8.15.orig/arch/x86/include/asm/uv/uv_bau.h linux-4.8.15/arch/x86/include/asm/uv/uv_bau.h
+--- linux-4.8.15.orig/arch/x86/include/asm/uv/uv_bau.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/x86/include/asm/uv/uv_bau.h	2017-01-01 17:07:13.127239912 +0100
+@@ -615,9 +615,9 @@
  	cycles_t		send_message;
  	cycles_t		period_end;
  	cycles_t		period_time;
@@ -2248,7 +1905,7 @@ index cc44d926c17e..df278aa0f638 100644
  	/* tunables */
  	int			max_concurr;
  	int			max_concurr_const;
-@@ -776,15 +776,15 @@ static inline int atom_asr(short i, struct atomic_short *v)
+@@ -776,15 +776,15 @@
   * to be lowered below the current 'v'.  atomic_add_unless can only stop
   * on equal.
   */
@@ -2268,11 +1925,43 @@ index cc44d926c17e..df278aa0f638 100644
  	return 1;
  }
  
-diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
-index fbd19444403f..e78f477a4ae3 100644
---- a/arch/x86/kernel/acpi/boot.c
-+++ b/arch/x86/kernel/acpi/boot.c
-@@ -87,7 +87,9 @@ static u64 acpi_lapic_addr __initdata = APIC_DEFAULT_PHYS_BASE;
+diff -Nur linux-4.8.15.orig/arch/x86/Kconfig linux-4.8.15/arch/x86/Kconfig
+--- linux-4.8.15.orig/arch/x86/Kconfig	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/x86/Kconfig	2017-01-01 17:07:12.915226253 +0100
+@@ -17,6 +17,7 @@
+ ### Arch settings
+ config X86
+ 	def_bool y
++	select HAVE_PREEMPT_LAZY
+ 	select ACPI_LEGACY_TABLES_LOOKUP	if ACPI
+ 	select ACPI_SYSTEM_POWER_STATES_SUPPORT	if ACPI
+ 	select ANON_INODES
+@@ -231,8 +232,11 @@
+ 	def_bool y
+ 	depends on ISA_DMA_API
+ 
++config RWSEM_GENERIC_SPINLOCK
++	def_bool PREEMPT_RT_FULL
++
+ config RWSEM_XCHGADD_ALGORITHM
+-	def_bool y
++	def_bool !RWSEM_GENERIC_SPINLOCK && !PREEMPT_RT_FULL
+ 
+ config GENERIC_CALIBRATE_DELAY
+ 	def_bool y
+@@ -885,7 +889,7 @@
+ config MAXSMP
+ 	bool "Enable Maximum number of SMP Processors and NUMA Nodes"
+ 	depends on X86_64 && SMP && DEBUG_KERNEL
+-	select CPUMASK_OFFSTACK
++	select CPUMASK_OFFSTACK if !PREEMPT_RT_FULL
+ 	---help---
+ 	  Enable maximum number of CPUS and NUMA Nodes for this architecture.
+ 	  If unsure, say N.
+diff -Nur linux-4.8.15.orig/arch/x86/kernel/acpi/boot.c linux-4.8.15/arch/x86/kernel/acpi/boot.c
+--- linux-4.8.15.orig/arch/x86/kernel/acpi/boot.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/x86/kernel/acpi/boot.c	2017-01-01 17:07:13.171242740 +0100
+@@ -87,7 +87,9 @@
   *		->ioapic_mutex
   *			->ioapic_lock
   */
@@ -2282,11 +1971,10 @@ index fbd19444403f..e78f477a4ae3 100644
  
  /* --------------------------------------------------------------------------
                                Boot-time Configuration
-diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
-index 48e6d84f173e..0b5a8b994f65 100644
---- a/arch/x86/kernel/apic/io_apic.c
-+++ b/arch/x86/kernel/apic/io_apic.c
-@@ -1712,7 +1712,8 @@ static bool io_apic_level_ack_pending(struct mp_chip_data *data)
+diff -Nur linux-4.8.15.orig/arch/x86/kernel/apic/io_apic.c linux-4.8.15/arch/x86/kernel/apic/io_apic.c
+--- linux-4.8.15.orig/arch/x86/kernel/apic/io_apic.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/x86/kernel/apic/io_apic.c	2017-01-01 17:07:13.263248666 +0100
+@@ -1712,7 +1712,8 @@
  static inline bool ioapic_irqd_mask(struct irq_data *data)
  {
  	/* If we are moving the irq we need to mask it */
@@ -2296,11 +1984,10 @@ index 48e6d84f173e..0b5a8b994f65 100644
  		mask_ioapic_irq(data);
  		return true;
  	}
-diff --git a/arch/x86/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c
-index 2bd5c6ff7ee7..a2c317f5839b 100644
---- a/arch/x86/kernel/asm-offsets.c
-+++ b/arch/x86/kernel/asm-offsets.c
-@@ -31,6 +31,7 @@ void common(void) {
+diff -Nur linux-4.8.15.orig/arch/x86/kernel/asm-offsets.c linux-4.8.15/arch/x86/kernel/asm-offsets.c
+--- linux-4.8.15.orig/arch/x86/kernel/asm-offsets.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/x86/kernel/asm-offsets.c	2017-01-01 17:07:13.279249693 +0100
+@@ -31,6 +31,7 @@
  	BLANK();
  	OFFSET(TI_flags, thread_info, flags);
  	OFFSET(TI_status, thread_info, status);
@@ -2308,16 +1995,15 @@ index 2bd5c6ff7ee7..a2c317f5839b 100644
  
  	BLANK();
  	OFFSET(TASK_addr_limit, task_struct, thread.addr_limit);
-@@ -88,4 +89,5 @@ void common(void) {
+@@ -88,4 +89,5 @@
  
  	BLANK();
  	DEFINE(PTREGS_SIZE, sizeof(struct pt_regs));
 +	DEFINE(_PREEMPT_ENABLED, PREEMPT_ENABLED);
  }
-diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
-index 79d8ec849468..accbf0e806d0 100644
---- a/arch/x86/kernel/cpu/mcheck/mce.c
-+++ b/arch/x86/kernel/cpu/mcheck/mce.c
+diff -Nur linux-4.8.15.orig/arch/x86/kernel/cpu/mcheck/mce.c linux-4.8.15/arch/x86/kernel/cpu/mcheck/mce.c
+--- linux-4.8.15.orig/arch/x86/kernel/cpu/mcheck/mce.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/x86/kernel/cpu/mcheck/mce.c	2017-01-01 17:07:13.335253297 +0100
 @@ -41,6 +41,8 @@
  #include <linux/debugfs.h>
  #include <linux/irq_work.h>
@@ -2327,7 +2013,7 @@ index 79d8ec849468..accbf0e806d0 100644
  
  #include <asm/processor.h>
  #include <asm/traps.h>
-@@ -1291,7 +1293,7 @@ void mce_log_therm_throt_event(__u64 status)
+@@ -1291,7 +1293,7 @@
  static unsigned long check_interval = INITIAL_CHECK_INTERVAL;
  
  static DEFINE_PER_CPU(unsigned long, mce_next_interval); /* in jiffies */
@@ -2336,7 +2022,7 @@ index 79d8ec849468..accbf0e806d0 100644
  
  static unsigned long mce_adjust_timer_default(unsigned long interval)
  {
-@@ -1300,32 +1302,18 @@ static unsigned long mce_adjust_timer_default(unsigned long interval)
+@@ -1300,32 +1302,18 @@
  
  static unsigned long (*mce_adjust_timer)(unsigned long interval) = mce_adjust_timer_default;
  
@@ -2375,7 +2061,7 @@ index 79d8ec849468..accbf0e806d0 100644
  	iv = __this_cpu_read(mce_next_interval);
  
  	if (mce_available(this_cpu_ptr(&cpu_info))) {
-@@ -1348,7 +1336,7 @@ static void mce_timer_fn(unsigned long data)
+@@ -1348,7 +1336,7 @@
  
  done:
  	__this_cpu_write(mce_next_interval, iv);
@@ -2384,7 +2070,7 @@ index 79d8ec849468..accbf0e806d0 100644
  }
  
  /*
-@@ -1356,7 +1344,7 @@ static void mce_timer_fn(unsigned long data)
+@@ -1356,7 +1344,7 @@
   */
  void mce_timer_kick(unsigned long interval)
  {
@@ -2393,7 +2079,7 @@ index 79d8ec849468..accbf0e806d0 100644
  	unsigned long iv = __this_cpu_read(mce_next_interval);
  
  	__restart_timer(t, interval);
-@@ -1371,7 +1359,7 @@ static void mce_timer_delete_all(void)
+@@ -1371,7 +1359,7 @@
  	int cpu;
  
  	for_each_online_cpu(cpu)
@@ -2402,7 +2088,7 @@ index 79d8ec849468..accbf0e806d0 100644
  }
  
  static void mce_do_trigger(struct work_struct *work)
-@@ -1381,6 +1369,56 @@ static void mce_do_trigger(struct work_struct *work)
+@@ -1381,6 +1369,56 @@
  
  static DECLARE_WORK(mce_trigger_work, mce_do_trigger);
  
@@ -2459,7 +2145,7 @@ index 79d8ec849468..accbf0e806d0 100644
  /*
   * Notify the user(s) about new machine check events.
   * Can be called from interrupt context, but not from machine check/NMI
-@@ -1388,19 +1426,8 @@ static DECLARE_WORK(mce_trigger_work, mce_do_trigger);
+@@ -1388,19 +1426,8 @@
   */
  int mce_notify_irq(void)
  {
@@ -2480,7 +2166,7 @@ index 79d8ec849468..accbf0e806d0 100644
  		return 1;
  	}
  	return 0;
-@@ -1717,7 +1744,7 @@ static void __mcheck_cpu_clear_vendor(struct cpuinfo_x86 *c)
+@@ -1717,7 +1744,7 @@
  	}
  }
  
@@ -2489,7 +2175,7 @@ index 79d8ec849468..accbf0e806d0 100644
  {
  	unsigned long iv = check_interval * HZ;
  
-@@ -1726,16 +1753,17 @@ static void mce_start_timer(unsigned int cpu, struct timer_list *t)
+@@ -1726,16 +1753,17 @@
  
  	per_cpu(mce_next_interval, cpu) = iv;
  
@@ -2511,7 +2197,7 @@ index 79d8ec849468..accbf0e806d0 100644
  	mce_start_timer(cpu, t);
  }
  
-@@ -2459,6 +2487,8 @@ static void mce_disable_cpu(void *h)
+@@ -2459,6 +2487,8 @@
  	if (!mce_available(raw_cpu_ptr(&cpu_info)))
  		return;
  
@@ -2520,7 +2206,7 @@ index 79d8ec849468..accbf0e806d0 100644
  	if (!(action & CPU_TASKS_FROZEN))
  		cmci_clear();
  
-@@ -2481,6 +2511,7 @@ static void mce_reenable_cpu(void *h)
+@@ -2481,6 +2511,7 @@
  		if (b->init)
  			wrmsrl(msr_ops.ctl(i), b->ctl);
  	}
@@ -2528,7 +2214,7 @@ index 79d8ec849468..accbf0e806d0 100644
  }
  
  /* Get notified when a cpu comes on/off. Be hotplug friendly. */
-@@ -2488,7 +2519,6 @@ static int
+@@ -2488,7 +2519,6 @@
  mce_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
  {
  	unsigned int cpu = (unsigned long)hcpu;
@@ -2536,7 +2222,7 @@ index 79d8ec849468..accbf0e806d0 100644
  
  	switch (action & ~CPU_TASKS_FROZEN) {
  	case CPU_ONLINE:
-@@ -2508,11 +2538,9 @@ mce_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
+@@ -2508,11 +2538,9 @@
  		break;
  	case CPU_DOWN_PREPARE:
  		smp_call_function_single(cpu, mce_disable_cpu, &action, 1);
@@ -2548,7 +2234,7 @@ index 79d8ec849468..accbf0e806d0 100644
  		break;
  	}
  
-@@ -2551,6 +2579,10 @@ static __init int mcheck_init_device(void)
+@@ -2551,6 +2579,10 @@
  		goto err_out;
  	}
  
@@ -2559,11 +2245,10 @@ index 79d8ec849468..accbf0e806d0 100644
  	if (!zalloc_cpumask_var(&mce_device_initialized, GFP_KERNEL)) {
  		err = -ENOMEM;
  		goto err_out;
-diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c
-index 09675712eba8..eea7557b355d 100644
---- a/arch/x86/kernel/dumpstack_32.c
-+++ b/arch/x86/kernel/dumpstack_32.c
-@@ -42,7 +42,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
+diff -Nur linux-4.8.15.orig/arch/x86/kernel/dumpstack_32.c linux-4.8.15/arch/x86/kernel/dumpstack_32.c
+--- linux-4.8.15.orig/arch/x86/kernel/dumpstack_32.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/x86/kernel/dumpstack_32.c	2017-01-01 17:07:13.351254342 +0100
+@@ -42,7 +42,7 @@
  		unsigned long *stack, unsigned long bp,
  		const struct stacktrace_ops *ops, void *data)
  {
@@ -2572,7 +2257,7 @@ index 09675712eba8..eea7557b355d 100644
  	int graph = 0;
  	u32 *prev_esp;
  
-@@ -84,7 +84,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
+@@ -84,7 +84,7 @@
  			break;
  		touch_nmi_watchdog();
  	}
@@ -2581,11 +2266,10 @@ index 09675712eba8..eea7557b355d 100644
  }
  EXPORT_SYMBOL(dump_trace);
  
-diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c
-index 9ee4520ce83c..2cd610b68868 100644
---- a/arch/x86/kernel/dumpstack_64.c
-+++ b/arch/x86/kernel/dumpstack_64.c
-@@ -152,7 +152,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
+diff -Nur linux-4.8.15.orig/arch/x86/kernel/dumpstack_64.c linux-4.8.15/arch/x86/kernel/dumpstack_64.c
+--- linux-4.8.15.orig/arch/x86/kernel/dumpstack_64.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/x86/kernel/dumpstack_64.c	2017-01-01 17:07:13.351254342 +0100
+@@ -152,7 +152,7 @@
  		unsigned long *stack, unsigned long bp,
  		const struct stacktrace_ops *ops, void *data)
  {
@@ -2594,7 +2278,7 @@ index 9ee4520ce83c..2cd610b68868 100644
  	unsigned long *irq_stack = (unsigned long *)per_cpu(irq_stack_ptr, cpu);
  	unsigned long dummy;
  	unsigned used = 0;
-@@ -239,7 +239,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
+@@ -239,7 +239,7 @@
  	 * This handles the process stack:
  	 */
  	bp = ops->walk_stack(task, stack, bp, ops, data, NULL, &graph);
@@ -2603,7 +2287,7 @@ index 9ee4520ce83c..2cd610b68868 100644
  }
  EXPORT_SYMBOL(dump_trace);
  
-@@ -253,7 +253,7 @@ show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs,
+@@ -253,7 +253,7 @@
  	int cpu;
  	int i;
  
@@ -2612,7 +2296,7 @@ index 9ee4520ce83c..2cd610b68868 100644
  	cpu = smp_processor_id();
  
  	irq_stack_end	= (unsigned long *)(per_cpu(irq_stack_ptr, cpu));
-@@ -299,7 +299,7 @@ show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs,
+@@ -299,7 +299,7 @@
  		stack++;
  		touch_nmi_watchdog();
  	}
@@ -2621,11 +2305,10 @@ index 9ee4520ce83c..2cd610b68868 100644
  
  	pr_cont("\n");
  	show_trace_log_lvl(task, regs, sp, bp, log_lvl);
-diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
-index 1f38d9a4d9de..053bf3b2ef39 100644
---- a/arch/x86/kernel/irq_32.c
-+++ b/arch/x86/kernel/irq_32.c
-@@ -127,6 +127,7 @@ void irq_ctx_init(int cpu)
+diff -Nur linux-4.8.15.orig/arch/x86/kernel/irq_32.c linux-4.8.15/arch/x86/kernel/irq_32.c
+--- linux-4.8.15.orig/arch/x86/kernel/irq_32.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/x86/kernel/irq_32.c	2017-01-01 17:07:13.351254342 +0100
+@@ -127,6 +127,7 @@
  	       cpu, per_cpu(hardirq_stack, cpu),  per_cpu(softirq_stack, cpu));
  }
  
@@ -2633,7 +2316,7 @@ index 1f38d9a4d9de..053bf3b2ef39 100644
  void do_softirq_own_stack(void)
  {
  	struct irq_stack *irqstk;
-@@ -143,6 +144,7 @@ void do_softirq_own_stack(void)
+@@ -143,6 +144,7 @@
  
  	call_on_stack(__do_softirq, isp);
  }
@@ -2641,10 +2324,9 @@ index 1f38d9a4d9de..053bf3b2ef39 100644
  
  bool handle_irq(struct irq_desc *desc, struct pt_regs *regs)
  {
-diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
-index d86be29c38c7..b0e29d1a0571 100644
---- a/arch/x86/kernel/process_32.c
-+++ b/arch/x86/kernel/process_32.c
+diff -Nur linux-4.8.15.orig/arch/x86/kernel/process_32.c linux-4.8.15/arch/x86/kernel/process_32.c
+--- linux-4.8.15.orig/arch/x86/kernel/process_32.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/x86/kernel/process_32.c	2017-01-01 17:07:13.359254847 +0100
 @@ -35,6 +35,7 @@
  #include <linux/uaccess.h>
  #include <linux/io.h>
@@ -2653,7 +2335,7 @@ index d86be29c38c7..b0e29d1a0571 100644
  
  #include <asm/pgtable.h>
  #include <asm/ldt.h>
-@@ -210,6 +211,35 @@ start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp)
+@@ -210,6 +211,35 @@
  }
  EXPORT_SYMBOL_GPL(start_thread);
  
@@ -2689,7 +2371,7 @@ index d86be29c38c7..b0e29d1a0571 100644
  
  /*
   *	switch_to(x,y) should switch tasks from x to y.
-@@ -286,6 +316,8 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
+@@ -286,6 +316,8 @@
  		     task_thread_info(next_p)->flags & _TIF_WORK_CTXSW_NEXT))
  		__switch_to_xtra(prev_p, next_p, tss);
  
@@ -2698,11 +2380,10 @@ index d86be29c38c7..b0e29d1a0571 100644
  	/*
  	 * Leave lazy mode, flushing any hypercalls made here.
  	 * This must be done before restoring TLS segments so
-diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
-index b62c85229711..d907b281a9d6 100644
---- a/arch/x86/kvm/lapic.c
-+++ b/arch/x86/kvm/lapic.c
-@@ -1938,6 +1938,7 @@ int kvm_create_lapic(struct kvm_vcpu *vcpu)
+diff -Nur linux-4.8.15.orig/arch/x86/kvm/lapic.c linux-4.8.15/arch/x86/kvm/lapic.c
+--- linux-4.8.15.orig/arch/x86/kvm/lapic.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/x86/kvm/lapic.c	2017-01-01 17:07:13.379256138 +0100
+@@ -1938,6 +1938,7 @@
  	hrtimer_init(&apic->lapic_timer.timer, CLOCK_MONOTONIC,
  		     HRTIMER_MODE_ABS_PINNED);
  	apic->lapic_timer.timer.function = apic_timer_fn;
@@ -2710,11 +2391,10 @@ index b62c85229711..d907b281a9d6 100644
  
  	/*
  	 * APIC is created enabled. This will prevent kvm_lapic_set_base from
-diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
-index 699f8726539a..24f30c86510c 100644
---- a/arch/x86/kvm/x86.c
-+++ b/arch/x86/kvm/x86.c
-@@ -5865,6 +5865,13 @@ int kvm_arch_init(void *opaque)
+diff -Nur linux-4.8.15.orig/arch/x86/kvm/x86.c linux-4.8.15/arch/x86/kvm/x86.c
+--- linux-4.8.15.orig/arch/x86/kvm/x86.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/x86/kvm/x86.c	2017-01-01 17:07:13.415258465 +0100
+@@ -5877,6 +5877,13 @@
  		goto out;
  	}
  
@@ -2728,11 +2408,10 @@ index 699f8726539a..24f30c86510c 100644
  	r = kvm_mmu_module_init();
  	if (r)
  		goto out_free_percpu;
-diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
-index 6d18b70ed5a9..f752724c22e8 100644
---- a/arch/x86/mm/highmem_32.c
-+++ b/arch/x86/mm/highmem_32.c
-@@ -32,10 +32,11 @@ EXPORT_SYMBOL(kunmap);
+diff -Nur linux-4.8.15.orig/arch/x86/mm/highmem_32.c linux-4.8.15/arch/x86/mm/highmem_32.c
+--- linux-4.8.15.orig/arch/x86/mm/highmem_32.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/x86/mm/highmem_32.c	2017-01-01 17:07:13.443260261 +0100
+@@ -32,10 +32,11 @@
   */
  void *kmap_atomic_prot(struct page *page, pgprot_t prot)
  {
@@ -2745,7 +2424,7 @@ index 6d18b70ed5a9..f752724c22e8 100644
  	pagefault_disable();
  
  	if (!PageHighMem(page))
-@@ -45,7 +46,10 @@ void *kmap_atomic_prot(struct page *page, pgprot_t prot)
+@@ -45,7 +46,10 @@
  	idx = type + KM_TYPE_NR*smp_processor_id();
  	vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
  	BUG_ON(!pte_none(*(kmap_pte-idx)));
@@ -2757,7 +2436,7 @@ index 6d18b70ed5a9..f752724c22e8 100644
  	arch_flush_lazy_mmu_mode();
  
  	return (void *)vaddr;
-@@ -88,6 +92,9 @@ void __kunmap_atomic(void *kvaddr)
+@@ -88,6 +92,9 @@
  		 * is a bad idea also, in case the page changes cacheability
  		 * attributes or becomes a protected page in a hypervisor.
  		 */
@@ -2767,7 +2446,7 @@ index 6d18b70ed5a9..f752724c22e8 100644
  		kpte_clear_flush(kmap_pte-idx, vaddr);
  		kmap_atomic_idx_pop();
  		arch_flush_lazy_mmu_mode();
-@@ -100,7 +107,7 @@ void __kunmap_atomic(void *kvaddr)
+@@ -100,7 +107,7 @@
  #endif
  
  	pagefault_enable();
@@ -2776,11 +2455,10 @@ index 6d18b70ed5a9..f752724c22e8 100644
  }
  EXPORT_SYMBOL(__kunmap_atomic);
  
-diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c
-index ada98b39b8ad..585f6829653b 100644
---- a/arch/x86/mm/iomap_32.c
-+++ b/arch/x86/mm/iomap_32.c
-@@ -56,6 +56,7 @@ EXPORT_SYMBOL_GPL(iomap_free);
+diff -Nur linux-4.8.15.orig/arch/x86/mm/iomap_32.c linux-4.8.15/arch/x86/mm/iomap_32.c
+--- linux-4.8.15.orig/arch/x86/mm/iomap_32.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/x86/mm/iomap_32.c	2017-01-01 17:07:13.471262063 +0100
+@@ -56,6 +56,7 @@
  
  void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot)
  {
@@ -2788,7 +2466,7 @@ index ada98b39b8ad..585f6829653b 100644
  	unsigned long vaddr;
  	int idx, type;
  
-@@ -65,7 +66,12 @@ void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot)
+@@ -65,7 +66,12 @@
  	type = kmap_atomic_idx_push();
  	idx = type + KM_TYPE_NR * smp_processor_id();
  	vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
@@ -2802,7 +2480,7 @@ index ada98b39b8ad..585f6829653b 100644
  	arch_flush_lazy_mmu_mode();
  
  	return (void *)vaddr;
-@@ -113,6 +119,9 @@ iounmap_atomic(void __iomem *kvaddr)
+@@ -113,6 +119,9 @@
  		 * is a bad idea also, in case the page changes cacheability
  		 * attributes or becomes a protected page in a hypervisor.
  		 */
@@ -2812,11 +2490,10 @@ index ada98b39b8ad..585f6829653b 100644
  		kpte_clear_flush(kmap_pte-idx, vaddr);
  		kmap_atomic_idx_pop();
  	}
-diff --git a/arch/x86/platform/uv/tlb_uv.c b/arch/x86/platform/uv/tlb_uv.c
-index fdb4d42b4ce5..8ab90fbecff0 100644
---- a/arch/x86/platform/uv/tlb_uv.c
-+++ b/arch/x86/platform/uv/tlb_uv.c
-@@ -729,9 +729,9 @@ static void destination_plugged(struct bau_desc *bau_desc,
+diff -Nur linux-4.8.15.orig/arch/x86/platform/uv/tlb_uv.c linux-4.8.15/arch/x86/platform/uv/tlb_uv.c
+--- linux-4.8.15.orig/arch/x86/platform/uv/tlb_uv.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/x86/platform/uv/tlb_uv.c	2017-01-01 17:07:13.575268756 +0100
+@@ -729,9 +729,9 @@
  
  		quiesce_local_uvhub(hmaster);
  
@@ -2828,7 +2505,7 @@ index fdb4d42b4ce5..8ab90fbecff0 100644
  
  		end_uvhub_quiesce(hmaster);
  
-@@ -751,9 +751,9 @@ static void destination_timeout(struct bau_desc *bau_desc,
+@@ -751,9 +751,9 @@
  
  		quiesce_local_uvhub(hmaster);
  
@@ -2840,7 +2517,7 @@ index fdb4d42b4ce5..8ab90fbecff0 100644
  
  		end_uvhub_quiesce(hmaster);
  
-@@ -774,7 +774,7 @@ static void disable_for_period(struct bau_control *bcp, struct ptc_stats *stat)
+@@ -774,7 +774,7 @@
  	cycles_t tm1;
  
  	hmaster = bcp->uvhub_master;
@@ -2849,7 +2526,7 @@ index fdb4d42b4ce5..8ab90fbecff0 100644
  	if (!bcp->baudisabled) {
  		stat->s_bau_disabled++;
  		tm1 = get_cycles();
-@@ -787,7 +787,7 @@ static void disable_for_period(struct bau_control *bcp, struct ptc_stats *stat)
+@@ -787,7 +787,7 @@
  			}
  		}
  	}
@@ -2858,7 +2535,7 @@ index fdb4d42b4ce5..8ab90fbecff0 100644
  }
  
  static void count_max_concurr(int stat, struct bau_control *bcp,
-@@ -850,7 +850,7 @@ static void record_send_stats(cycles_t time1, cycles_t time2,
+@@ -850,7 +850,7 @@
   */
  static void uv1_throttle(struct bau_control *hmaster, struct ptc_stats *stat)
  {
@@ -2867,7 +2544,7 @@ index fdb4d42b4ce5..8ab90fbecff0 100644
  	atomic_t *v;
  
  	v = &hmaster->active_descriptor_count;
-@@ -983,7 +983,7 @@ static int check_enable(struct bau_control *bcp, struct ptc_stats *stat)
+@@ -983,7 +983,7 @@
  	struct bau_control *hmaster;
  
  	hmaster = bcp->uvhub_master;
@@ -2876,7 +2553,7 @@ index fdb4d42b4ce5..8ab90fbecff0 100644
  	if (bcp->baudisabled && (get_cycles() >= bcp->set_bau_on_time)) {
  		stat->s_bau_reenabled++;
  		for_each_present_cpu(tcpu) {
-@@ -995,10 +995,10 @@ static int check_enable(struct bau_control *bcp, struct ptc_stats *stat)
+@@ -995,10 +995,10 @@
  				tbcp->period_giveups = 0;
  			}
  		}
@@ -2889,7 +2566,7 @@ index fdb4d42b4ce5..8ab90fbecff0 100644
  	return -1;
  }
  
-@@ -1916,9 +1916,9 @@ static void __init init_per_cpu_tunables(void)
+@@ -1916,9 +1916,9 @@
  		bcp->cong_reps			= congested_reps;
  		bcp->disabled_period =		sec_2_cycles(disabled_period);
  		bcp->giveup_limit =		giveup_limit;
@@ -2902,11 +2579,10 @@ index fdb4d42b4ce5..8ab90fbecff0 100644
  	}
  }
  
-diff --git a/arch/x86/platform/uv/uv_time.c b/arch/x86/platform/uv/uv_time.c
-index b333fc45f9ec..8b85916e6986 100644
---- a/arch/x86/platform/uv/uv_time.c
-+++ b/arch/x86/platform/uv/uv_time.c
-@@ -57,7 +57,7 @@ static DEFINE_PER_CPU(struct clock_event_device, cpu_ced);
+diff -Nur linux-4.8.15.orig/arch/x86/platform/uv/uv_time.c linux-4.8.15/arch/x86/platform/uv/uv_time.c
+--- linux-4.8.15.orig/arch/x86/platform/uv/uv_time.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/arch/x86/platform/uv/uv_time.c	2017-01-01 17:07:13.575268756 +0100
+@@ -57,7 +57,7 @@
  
  /* There is one of these allocated per node */
  struct uv_rtc_timer_head {
@@ -2915,7 +2591,7 @@ index b333fc45f9ec..8b85916e6986 100644
  	/* next cpu waiting for timer, local node relative: */
  	int		next_cpu;
  	/* number of cpus on this node: */
-@@ -177,7 +177,7 @@ static __init int uv_rtc_allocate_timers(void)
+@@ -177,7 +177,7 @@
  				uv_rtc_deallocate_timers();
  				return -ENOMEM;
  			}
@@ -2924,7 +2600,7 @@ index b333fc45f9ec..8b85916e6986 100644
  			head->ncpus = uv_blade_nr_possible_cpus(bid);
  			head->next_cpu = -1;
  			blade_info[bid] = head;
-@@ -231,7 +231,7 @@ static int uv_rtc_set_timer(int cpu, u64 expires)
+@@ -231,7 +231,7 @@
  	unsigned long flags;
  	int next_cpu;
  
@@ -2933,7 +2609,7 @@ index b333fc45f9ec..8b85916e6986 100644
  
  	next_cpu = head->next_cpu;
  	*t = expires;
-@@ -243,12 +243,12 @@ static int uv_rtc_set_timer(int cpu, u64 expires)
+@@ -243,12 +243,12 @@
  		if (uv_setup_intr(cpu, expires)) {
  			*t = ULLONG_MAX;
  			uv_rtc_find_next_timer(head, pnode);
@@ -2948,7 +2624,7 @@ index b333fc45f9ec..8b85916e6986 100644
  	return 0;
  }
  
-@@ -267,7 +267,7 @@ static int uv_rtc_unset_timer(int cpu, int force)
+@@ -267,7 +267,7 @@
  	unsigned long flags;
  	int rc = 0;
  
@@ -2957,7 +2633,7 @@ index b333fc45f9ec..8b85916e6986 100644
  
  	if ((head->next_cpu == bcpu && uv_read_rtc(NULL) >= *t) || force)
  		rc = 1;
-@@ -279,7 +279,7 @@ static int uv_rtc_unset_timer(int cpu, int force)
+@@ -279,7 +279,7 @@
  			uv_rtc_find_next_timer(head, pnode);
  	}
  
@@ -2966,7 +2642,7 @@ index b333fc45f9ec..8b85916e6986 100644
  
  	return rc;
  }
-@@ -299,13 +299,18 @@ static int uv_rtc_unset_timer(int cpu, int force)
+@@ -299,13 +299,18 @@
  static cycle_t uv_read_rtc(struct clocksource *cs)
  {
  	unsigned long offset;
@@ -2986,11 +2662,10 @@ index b333fc45f9ec..8b85916e6986 100644
  }
  
  /*
-diff --git a/block/blk-core.c b/block/blk-core.c
-index 36c7ac328d8c..caa5fc1be2a2 100644
---- a/block/blk-core.c
-+++ b/block/blk-core.c
-@@ -125,6 +125,9 @@ void blk_rq_init(struct request_queue *q, struct request *rq)
+diff -Nur linux-4.8.15.orig/block/blk-core.c linux-4.8.15/block/blk-core.c
+--- linux-4.8.15.orig/block/blk-core.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/block/blk-core.c	2017-01-01 17:07:13.619271599 +0100
+@@ -125,6 +125,9 @@
  
  	INIT_LIST_HEAD(&rq->queuelist);
  	INIT_LIST_HEAD(&rq->timeout_list);
@@ -3000,7 +2675,7 @@ index 36c7ac328d8c..caa5fc1be2a2 100644
  	rq->cpu = -1;
  	rq->q = q;
  	rq->__sector = (sector_t) -1;
-@@ -233,7 +236,7 @@ EXPORT_SYMBOL(blk_start_queue_async);
+@@ -233,7 +236,7 @@
   **/
  void blk_start_queue(struct request_queue *q)
  {
@@ -3009,7 +2684,7 @@ index 36c7ac328d8c..caa5fc1be2a2 100644
  
  	queue_flag_clear(QUEUE_FLAG_STOPPED, q);
  	__blk_run_queue(q);
-@@ -659,7 +662,7 @@ int blk_queue_enter(struct request_queue *q, bool nowait)
+@@ -659,7 +662,7 @@
  		if (nowait)
  			return -EBUSY;
  
@@ -3018,7 +2693,7 @@ index 36c7ac328d8c..caa5fc1be2a2 100644
  				!atomic_read(&q->mq_freeze_depth) ||
  				blk_queue_dying(q));
  		if (blk_queue_dying(q))
-@@ -679,7 +682,7 @@ static void blk_queue_usage_counter_release(struct percpu_ref *ref)
+@@ -679,7 +682,7 @@
  	struct request_queue *q =
  		container_of(ref, struct request_queue, q_usage_counter);
  
@@ -3027,7 +2702,7 @@ index 36c7ac328d8c..caa5fc1be2a2 100644
  }
  
  static void blk_rq_timed_out_timer(unsigned long data)
-@@ -748,7 +751,7 @@ struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id)
+@@ -748,7 +751,7 @@
  	q->bypass_depth = 1;
  	__set_bit(QUEUE_FLAG_BYPASS, &q->queue_flags);
  
@@ -3036,7 +2711,7 @@ index 36c7ac328d8c..caa5fc1be2a2 100644
  
  	/*
  	 * Init percpu_ref in atomic mode so that it's faster to shutdown.
-@@ -3171,7 +3174,7 @@ static void queue_unplugged(struct request_queue *q, unsigned int depth,
+@@ -3171,7 +3174,7 @@
  		blk_run_queue_async(q);
  	else
  		__blk_run_queue(q);
@@ -3045,7 +2720,7 @@ index 36c7ac328d8c..caa5fc1be2a2 100644
  }
  
  static void flush_plug_callbacks(struct blk_plug *plug, bool from_schedule)
-@@ -3219,7 +3222,6 @@ EXPORT_SYMBOL(blk_check_plugged);
+@@ -3219,7 +3222,6 @@
  void blk_flush_plug_list(struct blk_plug *plug, bool from_schedule)
  {
  	struct request_queue *q;
@@ -3053,7 +2728,7 @@ index 36c7ac328d8c..caa5fc1be2a2 100644
  	struct request *rq;
  	LIST_HEAD(list);
  	unsigned int depth;
-@@ -3239,11 +3241,6 @@ void blk_flush_plug_list(struct blk_plug *plug, bool from_schedule)
+@@ -3239,11 +3241,6 @@
  	q = NULL;
  	depth = 0;
  
@@ -3065,7 +2740,7 @@ index 36c7ac328d8c..caa5fc1be2a2 100644
  	while (!list_empty(&list)) {
  		rq = list_entry_rq(list.next);
  		list_del_init(&rq->queuelist);
-@@ -3256,7 +3253,7 @@ void blk_flush_plug_list(struct blk_plug *plug, bool from_schedule)
+@@ -3256,7 +3253,7 @@
  				queue_unplugged(q, depth, from_schedule);
  			q = rq->q;
  			depth = 0;
@@ -3074,7 +2749,7 @@ index 36c7ac328d8c..caa5fc1be2a2 100644
  		}
  
  		/*
-@@ -3283,8 +3280,6 @@ void blk_flush_plug_list(struct blk_plug *plug, bool from_schedule)
+@@ -3283,8 +3280,6 @@
  	 */
  	if (q)
  		queue_unplugged(q, depth, from_schedule);
@@ -3083,10 +2758,9 @@ index 36c7ac328d8c..caa5fc1be2a2 100644
  }
  
  void blk_finish_plug(struct blk_plug *plug)
-diff --git a/block/blk-ioc.c b/block/blk-ioc.c
-index 381cb50a673c..dc8785233d94 100644
---- a/block/blk-ioc.c
-+++ b/block/blk-ioc.c
+diff -Nur linux-4.8.15.orig/block/blk-ioc.c linux-4.8.15/block/blk-ioc.c
+--- linux-4.8.15.orig/block/blk-ioc.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/block/blk-ioc.c	2017-01-01 17:07:13.619271599 +0100
 @@ -7,6 +7,7 @@
  #include <linux/bio.h>
  #include <linux/blkdev.h>
@@ -3095,7 +2769,7 @@ index 381cb50a673c..dc8785233d94 100644
  
  #include "blk.h"
  
-@@ -109,7 +110,7 @@ static void ioc_release_fn(struct work_struct *work)
+@@ -109,7 +110,7 @@
  			spin_unlock(q->queue_lock);
  		} else {
  			spin_unlock_irqrestore(&ioc->lock, flags);
@@ -3104,7 +2778,7 @@ index 381cb50a673c..dc8785233d94 100644
  			spin_lock_irqsave_nested(&ioc->lock, flags, 1);
  		}
  	}
-@@ -187,7 +188,7 @@ void put_io_context_active(struct io_context *ioc)
+@@ -187,7 +188,7 @@
  			spin_unlock(icq->q->queue_lock);
  		} else {
  			spin_unlock_irqrestore(&ioc->lock, flags);
@@ -3113,66 +2787,10 @@ index 381cb50a673c..dc8785233d94 100644
  			goto retry;
  		}
  	}
-diff --git a/block/blk-mq-cpu.c b/block/blk-mq-cpu.c
-index bb3ed488f7b5..628c6c13c482 100644
---- a/block/blk-mq-cpu.c
-+++ b/block/blk-mq-cpu.c
-@@ -16,7 +16,7 @@
- #include "blk-mq.h"
- 
- static LIST_HEAD(blk_mq_cpu_notify_list);
--static DEFINE_RAW_SPINLOCK(blk_mq_cpu_notify_lock);
-+static DEFINE_SPINLOCK(blk_mq_cpu_notify_lock);
- 
- static int blk_mq_main_cpu_notify(struct notifier_block *self,
- 				  unsigned long action, void *hcpu)
-@@ -25,7 +25,10 @@ static int blk_mq_main_cpu_notify(struct notifier_block *self,
- 	struct blk_mq_cpu_notifier *notify;
- 	int ret = NOTIFY_OK;
- 
--	raw_spin_lock(&blk_mq_cpu_notify_lock);
-+	if (action != CPU_POST_DEAD)
-+		return NOTIFY_OK;
-+
-+	spin_lock(&blk_mq_cpu_notify_lock);
- 
- 	list_for_each_entry(notify, &blk_mq_cpu_notify_list, list) {
- 		ret = notify->notify(notify->data, action, cpu);
-@@ -33,7 +36,7 @@ static int blk_mq_main_cpu_notify(struct notifier_block *self,
- 			break;
- 	}
- 
--	raw_spin_unlock(&blk_mq_cpu_notify_lock);
-+	spin_unlock(&blk_mq_cpu_notify_lock);
- 	return ret;
- }
- 
-@@ -41,16 +44,16 @@ void blk_mq_register_cpu_notifier(struct blk_mq_cpu_notifier *notifier)
- {
- 	BUG_ON(!notifier->notify);
- 
--	raw_spin_lock(&blk_mq_cpu_notify_lock);
-+	spin_lock(&blk_mq_cpu_notify_lock);
- 	list_add_tail(&notifier->list, &blk_mq_cpu_notify_list);
--	raw_spin_unlock(&blk_mq_cpu_notify_lock);
-+	spin_unlock(&blk_mq_cpu_notify_lock);
- }
- 
- void blk_mq_unregister_cpu_notifier(struct blk_mq_cpu_notifier *notifier)
- {
--	raw_spin_lock(&blk_mq_cpu_notify_lock);
-+	spin_lock(&blk_mq_cpu_notify_lock);
- 	list_del(&notifier->list);
--	raw_spin_unlock(&blk_mq_cpu_notify_lock);
-+	spin_unlock(&blk_mq_cpu_notify_lock);
- }
- 
- void blk_mq_init_cpu_notifier(struct blk_mq_cpu_notifier *notifier,
-diff --git a/block/blk-mq.c b/block/blk-mq.c
-index c207fa9870eb..ac71b0455e9f 100644
---- a/block/blk-mq.c
-+++ b/block/blk-mq.c
-@@ -92,7 +92,7 @@ EXPORT_SYMBOL_GPL(blk_mq_freeze_queue_start);
+diff -Nur linux-4.8.15.orig/block/blk-mq.c linux-4.8.15/block/blk-mq.c
+--- linux-4.8.15.orig/block/blk-mq.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/block/blk-mq.c	2017-01-01 17:07:13.623271855 +0100
+@@ -92,7 +92,7 @@
  
  static void blk_mq_freeze_queue_wait(struct request_queue *q)
  {
@@ -3181,7 +2799,7 @@ index c207fa9870eb..ac71b0455e9f 100644
  }
  
  /*
-@@ -130,7 +130,7 @@ void blk_mq_unfreeze_queue(struct request_queue *q)
+@@ -130,7 +130,7 @@
  	WARN_ON_ONCE(freeze_depth < 0);
  	if (!freeze_depth) {
  		percpu_ref_reinit(&q->q_usage_counter);
@@ -3190,7 +2808,7 @@ index c207fa9870eb..ac71b0455e9f 100644
  	}
  }
  EXPORT_SYMBOL_GPL(blk_mq_unfreeze_queue);
-@@ -149,7 +149,7 @@ void blk_mq_wake_waiters(struct request_queue *q)
+@@ -149,7 +149,7 @@
  	 * dying, we need to ensure that processes currently waiting on
  	 * the queue are notified as well.
  	 */
@@ -3199,7 +2817,7 @@ index c207fa9870eb..ac71b0455e9f 100644
  }
  
  bool blk_mq_can_queue(struct blk_mq_hw_ctx *hctx)
-@@ -197,6 +197,9 @@ static void blk_mq_rq_ctx_init(struct request_queue *q, struct blk_mq_ctx *ctx,
+@@ -197,6 +197,9 @@
  	rq->resid_len = 0;
  	rq->sense = NULL;
  
@@ -3209,7 +2827,7 @@ index c207fa9870eb..ac71b0455e9f 100644
  	INIT_LIST_HEAD(&rq->timeout_list);
  	rq->timeout = 0;
  
-@@ -379,6 +382,17 @@ void blk_mq_end_request(struct request *rq, int error)
+@@ -379,6 +382,17 @@
  }
  EXPORT_SYMBOL(blk_mq_end_request);
  
@@ -3227,7 +2845,7 @@ index c207fa9870eb..ac71b0455e9f 100644
  static void __blk_mq_complete_request_remote(void *data)
  {
  	struct request *rq = data;
-@@ -386,6 +400,8 @@ static void __blk_mq_complete_request_remote(void *data)
+@@ -386,6 +400,8 @@
  	rq->q->softirq_done_fn(rq);
  }
  
@@ -3236,7 +2854,7 @@ index c207fa9870eb..ac71b0455e9f 100644
  static void blk_mq_ipi_complete_request(struct request *rq)
  {
  	struct blk_mq_ctx *ctx = rq->mq_ctx;
-@@ -397,19 +413,23 @@ static void blk_mq_ipi_complete_request(struct request *rq)
+@@ -397,19 +413,23 @@
  		return;
  	}
  
@@ -3262,7 +2880,7 @@ index c207fa9870eb..ac71b0455e9f 100644
  }
  
  static void __blk_mq_complete_request(struct request *rq)
-@@ -938,14 +958,14 @@ void blk_mq_run_hw_queue(struct blk_mq_hw_ctx *hctx, bool async)
+@@ -938,14 +958,14 @@
  		return;
  
  	if (!async) {
@@ -3280,7 +2898,7 @@ index c207fa9870eb..ac71b0455e9f 100644
  	}
  
  	kblockd_schedule_delayed_work_on(blk_mq_hctx_next_cpu(hctx),
-@@ -1667,7 +1687,7 @@ static int blk_mq_hctx_notify(void *data, unsigned long action,
+@@ -1667,7 +1687,7 @@
  {
  	struct blk_mq_hw_ctx *hctx = data;
  
@@ -3289,11 +2907,64 @@ index c207fa9870eb..ac71b0455e9f 100644
  		return blk_mq_hctx_cpu_offline(hctx, cpu);
  
  	/*
-diff --git a/block/blk-mq.h b/block/blk-mq.h
-index 9087b11037b7..0401d76e827c 100644
---- a/block/blk-mq.h
-+++ b/block/blk-mq.h
-@@ -86,12 +86,12 @@ static inline struct blk_mq_ctx *__blk_mq_get_ctx(struct request_queue *q,
+diff -Nur linux-4.8.15.orig/block/blk-mq-cpu.c linux-4.8.15/block/blk-mq-cpu.c
+--- linux-4.8.15.orig/block/blk-mq-cpu.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/block/blk-mq-cpu.c	2017-01-01 17:07:13.623271855 +0100
+@@ -16,7 +16,7 @@
+ #include "blk-mq.h"
+ 
+ static LIST_HEAD(blk_mq_cpu_notify_list);
+-static DEFINE_RAW_SPINLOCK(blk_mq_cpu_notify_lock);
++static DEFINE_SPINLOCK(blk_mq_cpu_notify_lock);
+ 
+ static int blk_mq_main_cpu_notify(struct notifier_block *self,
+ 				  unsigned long action, void *hcpu)
+@@ -25,7 +25,10 @@
+ 	struct blk_mq_cpu_notifier *notify;
+ 	int ret = NOTIFY_OK;
+ 
+-	raw_spin_lock(&blk_mq_cpu_notify_lock);
++	if (action != CPU_POST_DEAD)
++		return NOTIFY_OK;
++
++	spin_lock(&blk_mq_cpu_notify_lock);
+ 
+ 	list_for_each_entry(notify, &blk_mq_cpu_notify_list, list) {
+ 		ret = notify->notify(notify->data, action, cpu);
+@@ -33,7 +36,7 @@
+ 			break;
+ 	}
+ 
+-	raw_spin_unlock(&blk_mq_cpu_notify_lock);
++	spin_unlock(&blk_mq_cpu_notify_lock);
+ 	return ret;
+ }
+ 
+@@ -41,16 +44,16 @@
+ {
+ 	BUG_ON(!notifier->notify);
+ 
+-	raw_spin_lock(&blk_mq_cpu_notify_lock);
++	spin_lock(&blk_mq_cpu_notify_lock);
+ 	list_add_tail(&notifier->list, &blk_mq_cpu_notify_list);
+-	raw_spin_unlock(&blk_mq_cpu_notify_lock);
++	spin_unlock(&blk_mq_cpu_notify_lock);
+ }
+ 
+ void blk_mq_unregister_cpu_notifier(struct blk_mq_cpu_notifier *notifier)
+ {
+-	raw_spin_lock(&blk_mq_cpu_notify_lock);
++	spin_lock(&blk_mq_cpu_notify_lock);
+ 	list_del(&notifier->list);
+-	raw_spin_unlock(&blk_mq_cpu_notify_lock);
++	spin_unlock(&blk_mq_cpu_notify_lock);
+ }
+ 
+ void blk_mq_init_cpu_notifier(struct blk_mq_cpu_notifier *notifier,
+diff -Nur linux-4.8.15.orig/block/blk-mq.h linux-4.8.15/block/blk-mq.h
+--- linux-4.8.15.orig/block/blk-mq.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/block/blk-mq.h	2017-01-01 17:07:13.627272112 +0100
+@@ -86,12 +86,12 @@
   */
  static inline struct blk_mq_ctx *blk_mq_get_ctx(struct request_queue *q)
  {
@@ -3308,11 +2979,10 @@ index 9087b11037b7..0401d76e827c 100644
  }
  
  struct blk_mq_alloc_data {
-diff --git a/block/blk-softirq.c b/block/blk-softirq.c
-index 53b1737e978d..81c3c0a62edf 100644
---- a/block/blk-softirq.c
-+++ b/block/blk-softirq.c
-@@ -51,6 +51,7 @@ static void trigger_softirq(void *data)
+diff -Nur linux-4.8.15.orig/block/blk-softirq.c linux-4.8.15/block/blk-softirq.c
+--- linux-4.8.15.orig/block/blk-softirq.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/block/blk-softirq.c	2017-01-01 17:07:13.627272112 +0100
+@@ -51,6 +51,7 @@
  		raise_softirq_irqoff(BLOCK_SOFTIRQ);
  
  	local_irq_restore(flags);
@@ -3320,7 +2990,7 @@ index 53b1737e978d..81c3c0a62edf 100644
  }
  
  /*
-@@ -93,6 +94,7 @@ static int blk_cpu_notify(struct notifier_block *self, unsigned long action,
+@@ -93,6 +94,7 @@
  				 this_cpu_ptr(&blk_cpu_done));
  		raise_softirq_irqoff(BLOCK_SOFTIRQ);
  		local_irq_enable();
@@ -3328,7 +2998,7 @@ index 53b1737e978d..81c3c0a62edf 100644
  	}
  
  	return NOTIFY_OK;
-@@ -150,6 +152,7 @@ void __blk_complete_request(struct request *req)
+@@ -150,6 +152,7 @@
  		goto do_local;
  
  	local_irq_restore(flags);
@@ -3336,11 +3006,10 @@ index 53b1737e978d..81c3c0a62edf 100644
  }
  
  /**
-diff --git a/block/bounce.c b/block/bounce.c
-index 1cb5dd3a5da1..2f1ec8a67cbe 100644
---- a/block/bounce.c
-+++ b/block/bounce.c
-@@ -55,11 +55,11 @@ static void bounce_copy_vec(struct bio_vec *to, unsigned char *vfrom)
+diff -Nur linux-4.8.15.orig/block/bounce.c linux-4.8.15/block/bounce.c
+--- linux-4.8.15.orig/block/bounce.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/block/bounce.c	2017-01-01 17:07:13.627272112 +0100
+@@ -55,11 +55,11 @@
  	unsigned long flags;
  	unsigned char *vto;
  
@@ -3354,11 +3023,10 @@ index 1cb5dd3a5da1..2f1ec8a67cbe 100644
  }
  
  #else /* CONFIG_HIGHMEM */
-diff --git a/crypto/algapi.c b/crypto/algapi.c
-index df939b54b09f..efe5e06adcf7 100644
---- a/crypto/algapi.c
-+++ b/crypto/algapi.c
-@@ -718,13 +718,13 @@ EXPORT_SYMBOL_GPL(crypto_spawn_tfm2);
+diff -Nur linux-4.8.15.orig/crypto/algapi.c linux-4.8.15/crypto/algapi.c
+--- linux-4.8.15.orig/crypto/algapi.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/crypto/algapi.c	2017-01-01 17:07:13.671274944 +0100
+@@ -718,13 +718,13 @@
  
  int crypto_register_notifier(struct notifier_block *nb)
  {
@@ -3374,11 +3042,10 @@ index df939b54b09f..efe5e06adcf7 100644
  }
  EXPORT_SYMBOL_GPL(crypto_unregister_notifier);
  
-diff --git a/crypto/api.c b/crypto/api.c
-index bbc147cb5dec..bc1a848f02ec 100644
---- a/crypto/api.c
-+++ b/crypto/api.c
-@@ -31,7 +31,7 @@ EXPORT_SYMBOL_GPL(crypto_alg_list);
+diff -Nur linux-4.8.15.orig/crypto/api.c linux-4.8.15/crypto/api.c
+--- linux-4.8.15.orig/crypto/api.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/crypto/api.c	2017-01-01 17:07:13.671274944 +0100
+@@ -31,7 +31,7 @@
  DECLARE_RWSEM(crypto_alg_sem);
  EXPORT_SYMBOL_GPL(crypto_alg_sem);
  
@@ -3387,7 +3054,7 @@ index bbc147cb5dec..bc1a848f02ec 100644
  EXPORT_SYMBOL_GPL(crypto_chain);
  
  static struct crypto_alg *crypto_larval_wait(struct crypto_alg *alg);
-@@ -236,10 +236,10 @@ int crypto_probing_notify(unsigned long val, void *v)
+@@ -236,10 +236,10 @@
  {
  	int ok;
  
@@ -3400,11 +3067,10 @@ index bbc147cb5dec..bc1a848f02ec 100644
  	}
  
  	return ok;
-diff --git a/crypto/internal.h b/crypto/internal.h
-index 7eefcdb00227..0ecc7f5a2f40 100644
---- a/crypto/internal.h
-+++ b/crypto/internal.h
-@@ -47,7 +47,7 @@ struct crypto_larval {
+diff -Nur linux-4.8.15.orig/crypto/internal.h linux-4.8.15/crypto/internal.h
+--- linux-4.8.15.orig/crypto/internal.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/crypto/internal.h	2017-01-01 17:07:13.675275210 +0100
+@@ -47,7 +47,7 @@
  
  extern struct list_head crypto_alg_list;
  extern struct rw_semaphore crypto_alg_sem;
@@ -3413,7 +3079,7 @@ index 7eefcdb00227..0ecc7f5a2f40 100644
  
  #ifdef CONFIG_PROC_FS
  void __init crypto_init_proc(void);
-@@ -146,7 +146,7 @@ static inline int crypto_is_moribund(struct crypto_alg *alg)
+@@ -146,7 +146,7 @@
  
  static inline void crypto_notify(unsigned long val, void *v)
  {
@@ -3422,11 +3088,291 @@ index 7eefcdb00227..0ecc7f5a2f40 100644
  }
  
  #endif	/* _CRYPTO_INTERNAL_H */
-diff --git a/drivers/acpi/acpica/acglobal.h b/drivers/acpi/acpica/acglobal.h
-index fded776236e2..bda523219d50 100644
---- a/drivers/acpi/acpica/acglobal.h
-+++ b/drivers/acpi/acpica/acglobal.h
-@@ -116,7 +116,7 @@ ACPI_GLOBAL(u8, acpi_gbl_global_lock_pending);
+diff -Nur linux-4.8.15.orig/Documentation/hwlat_detector.txt linux-4.8.15/Documentation/hwlat_detector.txt
+--- linux-4.8.15.orig/Documentation/hwlat_detector.txt	1970-01-01 01:00:00.000000000 +0100
++++ linux-4.8.15/Documentation/hwlat_detector.txt	2017-01-01 17:07:11.319123458 +0100
+@@ -0,0 +1,64 @@
++Introduction:
++-------------
++
++The module hwlat_detector is a special purpose kernel module that is used to
++detect large system latencies induced by the behavior of certain underlying
++hardware or firmware, independent of Linux itself. The code was developed
++originally to detect SMIs (System Management Interrupts) on x86 systems,
++however there is nothing x86 specific about this patchset. It was
++originally written for use by the "RT" patch since the Real Time
++kernel is highly latency sensitive.
++
++SMIs are usually not serviced by the Linux kernel, which typically does not
++even know that they are occuring. SMIs are instead are set up by BIOS code
++and are serviced by BIOS code, usually for "critical" events such as
++management of thermal sensors and fans. Sometimes though, SMIs are used for
++other tasks and those tasks can spend an inordinate amount of time in the
++handler (sometimes measured in milliseconds). Obviously this is a problem if
++you are trying to keep event service latencies down in the microsecond range.
++
++The hardware latency detector works by hogging all of the cpus for configurable
++amounts of time (by calling stop_machine()), polling the CPU Time Stamp Counter
++for some period, then looking for gaps in the TSC data. Any gap indicates a
++time when the polling was interrupted and since the machine is stopped and
++interrupts turned off the only thing that could do that would be an SMI.
++
++Note that the SMI detector should *NEVER* be used in a production environment.
++It is intended to be run manually to determine if the hardware platform has a
++problem with long system firmware service routines.
++
++Usage:
++------
++
++Loading the module hwlat_detector passing the parameter "enabled=1" (or by
++setting the "enable" entry in "hwlat_detector" debugfs toggled on) is the only
++step required to start the hwlat_detector. It is possible to redefine the
++threshold in microseconds (us) above which latency spikes will be taken
++into account (parameter "threshold=").
++
++Example:
++
++	# modprobe hwlat_detector enabled=1 threshold=100
++
++After the module is loaded, it creates a directory named "hwlat_detector" under
++the debugfs mountpoint, "/debug/hwlat_detector" for this text. It is necessary
++to have debugfs mounted, which might be on /sys/debug on your system.
++
++The /debug/hwlat_detector interface contains the following files:
++
++count			- number of latency spikes observed since last reset
++enable			- a global enable/disable toggle (0/1), resets count
++max			- maximum hardware latency actually observed (usecs)
++sample			- a pipe from which to read current raw sample data
++			  in the format <timestamp> <latency observed usecs>
++			  (can be opened O_NONBLOCK for a single sample)
++threshold		- minimum latency value to be considered (usecs)
++width			- time period to sample with CPUs held (usecs)
++			  must be less than the total window size (enforced)
++window			- total period of sampling, width being inside (usecs)
++
++By default we will set width to 500,000 and window to 1,000,000, meaning that
++we will sample every 1,000,000 usecs (1s) for 500,000 usecs (0.5s). If we
++observe any latencies that exceed the threshold (initially 100 usecs),
++then we write to a global sample ring buffer of 8K samples, which is
++consumed by reading from the "sample" (pipe) debugfs file interface.
+diff -Nur linux-4.8.15.orig/Documentation/sysrq.txt linux-4.8.15/Documentation/sysrq.txt
+--- linux-4.8.15.orig/Documentation/sysrq.txt	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/Documentation/sysrq.txt	2017-01-01 17:07:11.331124221 +0100
+@@ -59,10 +59,17 @@
+ On other - If you know of the key combos for other architectures, please
+            let me know so I can add them to this section.
+ 
+-On all -  write a character to /proc/sysrq-trigger.  e.g.:
+-
++On all -  write a character to /proc/sysrq-trigger, e.g.:
+ 		echo t > /proc/sysrq-trigger
+ 
++On all - Enable network SysRq by writing a cookie to icmp_echo_sysrq, e.g.
++		echo 0x01020304 >/proc/sys/net/ipv4/icmp_echo_sysrq
++	 Send an ICMP echo request with this pattern plus the particular
++	 SysRq command key. Example:
++		# ping -c1 -s57 -p0102030468
++	 will trigger the SysRq-H (help) command.
++
++
+ *  What are the 'command' keys?
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ 'b'     - Will immediately reboot the system without syncing or unmounting
+diff -Nur linux-4.8.15.orig/Documentation/trace/histograms.txt linux-4.8.15/Documentation/trace/histograms.txt
+--- linux-4.8.15.orig/Documentation/trace/histograms.txt	1970-01-01 01:00:00.000000000 +0100
++++ linux-4.8.15/Documentation/trace/histograms.txt	2017-01-01 17:07:11.399128611 +0100
+@@ -0,0 +1,186 @@
++		Using the Linux Kernel Latency Histograms
++
++
++This document gives a short explanation how to enable, configure and use
++latency histograms. Latency histograms are primarily relevant in the
++context of real-time enabled kernels (CONFIG_PREEMPT/CONFIG_PREEMPT_RT)
++and are used in the quality management of the Linux real-time
++capabilities.
++
++
++* Purpose of latency histograms
++
++A latency histogram continuously accumulates the frequencies of latency
++data. There are two types of histograms
++- potential sources of latencies
++- effective latencies
++
++
++* Potential sources of latencies
++
++Potential sources of latencies are code segments where interrupts,
++preemption or both are disabled (aka critical sections). To create
++histograms of potential sources of latency, the kernel stores the time
++stamp at the start of a critical section, determines the time elapsed
++when the end of the section is reached, and increments the frequency
++counter of that latency value - irrespective of whether any concurrently
++running process is affected by latency or not.
++- Configuration items (in the Kernel hacking/Tracers submenu)
++  CONFIG_INTERRUPT_OFF_LATENCY
++  CONFIG_PREEMPT_OFF_LATENCY
++
++
++* Effective latencies
++
++Effective latencies are actually occuring during wakeup of a process. To
++determine effective latencies, the kernel stores the time stamp when a
++process is scheduled to be woken up, and determines the duration of the
++wakeup time shortly before control is passed over to this process. Note
++that the apparent latency in user space may be somewhat longer, since the
++process may be interrupted after control is passed over to it but before
++the execution in user space takes place. Simply measuring the interval
++between enqueuing and wakeup may also not appropriate in cases when a
++process is scheduled as a result of a timer expiration. The timer may have
++missed its deadline, e.g. due to disabled interrupts, but this latency
++would not be registered. Therefore, the offsets of missed timers are
++recorded in a separate histogram. If both wakeup latency and missed timer
++offsets are configured and enabled, a third histogram may be enabled that
++records the overall latency as a sum of the timer latency, if any, and the
++wakeup latency. This histogram is called "timerandwakeup".
++- Configuration items (in the Kernel hacking/Tracers submenu)
++  CONFIG_WAKEUP_LATENCY
++  CONFIG_MISSED_TIMER_OFSETS
++
++
++* Usage
++
++The interface to the administration of the latency histograms is located
++in the debugfs file system. To mount it, either enter
++
++mount -t sysfs nodev /sys
++mount -t debugfs nodev /sys/kernel/debug
++
++from shell command line level, or add
++
++nodev	/sys			sysfs	defaults	0 0
++nodev	/sys/kernel/debug	debugfs	defaults	0 0
++
++to the file /etc/fstab. All latency histogram related files are then
++available in the directory /sys/kernel/debug/tracing/latency_hist. A
++particular histogram type is enabled by writing non-zero to the related
++variable in the /sys/kernel/debug/tracing/latency_hist/enable directory.
++Select "preemptirqsoff" for the histograms of potential sources of
++latencies and "wakeup" for histograms of effective latencies etc. The
++histogram data - one per CPU - are available in the files
++
++/sys/kernel/debug/tracing/latency_hist/preemptoff/CPUx
++/sys/kernel/debug/tracing/latency_hist/irqsoff/CPUx
++/sys/kernel/debug/tracing/latency_hist/preemptirqsoff/CPUx
++/sys/kernel/debug/tracing/latency_hist/wakeup/CPUx
++/sys/kernel/debug/tracing/latency_hist/wakeup/sharedprio/CPUx
++/sys/kernel/debug/tracing/latency_hist/missed_timer_offsets/CPUx
++/sys/kernel/debug/tracing/latency_hist/timerandwakeup/CPUx
++
++The histograms are reset by writing non-zero to the file "reset" in a
++particular latency directory. To reset all latency data, use
++
++#!/bin/sh
++
++TRACINGDIR=/sys/kernel/debug/tracing
++HISTDIR=$TRACINGDIR/latency_hist
++
++if test -d $HISTDIR
++then
++  cd $HISTDIR
++  for i in `find . | grep /reset$`
++  do
++    echo 1 >$i
++  done
++fi
++
++
++* Data format
++
++Latency data are stored with a resolution of one microsecond. The
++maximum latency is 10,240 microseconds. The data are only valid, if the
++overflow register is empty. Every output line contains the latency in
++microseconds in the first row and the number of samples in the second
++row. To display only lines with a positive latency count, use, for
++example,
++
++grep -v " 0$" /sys/kernel/debug/tracing/latency_hist/preemptoff/CPU0
++
++#Minimum latency: 0 microseconds.
++#Average latency: 0 microseconds.
++#Maximum latency: 25 microseconds.
++#Total samples: 3104770694
++#There are 0 samples greater or equal than 10240 microseconds
++#usecs	         samples
++    0	      2984486876
++    1	        49843506
++    2	        58219047
++    3	         5348126
++    4	         2187960
++    5	         3388262
++    6	          959289
++    7	          208294
++    8	           40420
++    9	            4485
++   10	           14918
++   11	           18340
++   12	           25052
++   13	           19455
++   14	            5602
++   15	             969
++   16	              47
++   17	              18
++   18	              14
++   19	               1
++   20	               3
++   21	               2
++   22	               5
++   23	               2
++   25	               1
++
++
++* Wakeup latency of a selected process
++
++To only collect wakeup latency data of a particular process, write the
++PID of the requested process to
++
++/sys/kernel/debug/tracing/latency_hist/wakeup/pid
++
++PIDs are not considered, if this variable is set to 0.
++
++
++* Details of the process with the highest wakeup latency so far
++
++Selected data of the process that suffered from the highest wakeup
++latency that occurred in a particular CPU are available in the file
++
++/sys/kernel/debug/tracing/latency_hist/wakeup/max_latency-CPUx.
++
++In addition, other relevant system data at the time when the
++latency occurred are given.
++
++The format of the data is (all in one line):
++<PID> <Priority> <Latency> (<Timeroffset>) <Command> \
++<- <PID> <Priority> <Command> <Timestamp>
++
++The value of <Timeroffset> is only relevant in the combined timer
++and wakeup latency recording. In the wakeup recording, it is
++always 0, in the missed_timer_offsets recording, it is the same
++as <Latency>.
++
++When retrospectively searching for the origin of a latency and
++tracing was not enabled, it may be helpful to know the name and
++some basic data of the task that (finally) was switching to the
++late real-tlme task. In addition to the victim's data, also the
++data of the possible culprit are therefore displayed after the
++"<-" symbol.
++
++Finally, the timestamp of the time when the latency occurred
++in <seconds>.<microseconds> after the most recent system boot
++is provided.
++
++These data are also reset when the wakeup histogram is reset.
+diff -Nur linux-4.8.15.orig/drivers/acpi/acpica/acglobal.h linux-4.8.15/drivers/acpi/acpica/acglobal.h
+--- linux-4.8.15.orig/drivers/acpi/acpica/acglobal.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/acpi/acpica/acglobal.h	2017-01-01 17:07:13.707277269 +0100
+@@ -116,7 +116,7 @@
   * interrupt level
   */
  ACPI_GLOBAL(acpi_spinlock, acpi_gbl_gpe_lock);	/* For GPE data structs and registers */
@@ -3435,11 +3381,10 @@ index fded776236e2..bda523219d50 100644
  ACPI_GLOBAL(acpi_spinlock, acpi_gbl_reference_count_lock);
  
  /* Mutex for _OSI support */
-diff --git a/drivers/acpi/acpica/hwregs.c b/drivers/acpi/acpica/hwregs.c
-index 3b7fb99362b6..696bf8e62afb 100644
---- a/drivers/acpi/acpica/hwregs.c
-+++ b/drivers/acpi/acpica/hwregs.c
-@@ -363,14 +363,14 @@ acpi_status acpi_hw_clear_acpi_status(void)
+diff -Nur linux-4.8.15.orig/drivers/acpi/acpica/hwregs.c linux-4.8.15/drivers/acpi/acpica/hwregs.c
+--- linux-4.8.15.orig/drivers/acpi/acpica/hwregs.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/acpi/acpica/hwregs.c	2017-01-01 17:07:13.719278046 +0100
+@@ -363,14 +363,14 @@
  			  ACPI_BITMASK_ALL_FIXED_STATUS,
  			  ACPI_FORMAT_UINT64(acpi_gbl_xpm1a_status.address)));
  
@@ -3456,11 +3401,10 @@ index 3b7fb99362b6..696bf8e62afb 100644
  
  	if (ACPI_FAILURE(status)) {
  		goto exit;
-diff --git a/drivers/acpi/acpica/hwxface.c b/drivers/acpi/acpica/hwxface.c
-index 98c26ff39409..6e236f2ea791 100644
---- a/drivers/acpi/acpica/hwxface.c
-+++ b/drivers/acpi/acpica/hwxface.c
-@@ -373,7 +373,7 @@ acpi_status acpi_write_bit_register(u32 register_id, u32 value)
+diff -Nur linux-4.8.15.orig/drivers/acpi/acpica/hwxface.c linux-4.8.15/drivers/acpi/acpica/hwxface.c
+--- linux-4.8.15.orig/drivers/acpi/acpica/hwxface.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/acpi/acpica/hwxface.c	2017-01-01 17:07:13.719278046 +0100
+@@ -373,7 +373,7 @@
  		return_ACPI_STATUS(AE_BAD_PARAMETER);
  	}
  
@@ -3469,7 +3413,7 @@ index 98c26ff39409..6e236f2ea791 100644
  
  	/*
  	 * At this point, we know that the parent register is one of the
-@@ -434,7 +434,7 @@ acpi_status acpi_write_bit_register(u32 register_id, u32 value)
+@@ -434,7 +434,7 @@
  
  unlock_and_exit:
  
@@ -3478,11 +3422,10 @@ index 98c26ff39409..6e236f2ea791 100644
  	return_ACPI_STATUS(status);
  }
  
-diff --git a/drivers/acpi/acpica/utmutex.c b/drivers/acpi/acpica/utmutex.c
-index 15073375bd00..357e7ca5a587 100644
---- a/drivers/acpi/acpica/utmutex.c
-+++ b/drivers/acpi/acpica/utmutex.c
-@@ -88,7 +88,7 @@ acpi_status acpi_ut_mutex_initialize(void)
+diff -Nur linux-4.8.15.orig/drivers/acpi/acpica/utmutex.c linux-4.8.15/drivers/acpi/acpica/utmutex.c
+--- linux-4.8.15.orig/drivers/acpi/acpica/utmutex.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/acpi/acpica/utmutex.c	2017-01-01 17:07:13.727278551 +0100
+@@ -88,7 +88,7 @@
  		return_ACPI_STATUS (status);
  	}
  
@@ -3491,7 +3434,7 @@ index 15073375bd00..357e7ca5a587 100644
  	if (ACPI_FAILURE (status)) {
  		return_ACPI_STATUS (status);
  	}
-@@ -145,7 +145,7 @@ void acpi_ut_mutex_terminate(void)
+@@ -145,7 +145,7 @@
  	/* Delete the spinlocks */
  
  	acpi_os_delete_lock(acpi_gbl_gpe_lock);
@@ -3500,11 +3443,10 @@ index 15073375bd00..357e7ca5a587 100644
  	acpi_os_delete_lock(acpi_gbl_reference_count_lock);
  
  	/* Delete the reader/writer lock */
-diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c
-index 051b6158d1b7..7ad293bef6ed 100644
---- a/drivers/ata/libata-sff.c
-+++ b/drivers/ata/libata-sff.c
-@@ -678,9 +678,9 @@ unsigned int ata_sff_data_xfer_noirq(struct ata_device *dev, unsigned char *buf,
+diff -Nur linux-4.8.15.orig/drivers/ata/libata-sff.c linux-4.8.15/drivers/ata/libata-sff.c
+--- linux-4.8.15.orig/drivers/ata/libata-sff.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/ata/libata-sff.c	2017-01-01 17:07:13.759280614 +0100
+@@ -678,9 +678,9 @@
  	unsigned long flags;
  	unsigned int consumed;
  
@@ -3516,7 +3458,7 @@ index 051b6158d1b7..7ad293bef6ed 100644
  
  	return consumed;
  }
-@@ -719,7 +719,7 @@ static void ata_pio_sector(struct ata_queued_cmd *qc)
+@@ -719,7 +719,7 @@
  		unsigned long flags;
  
  		/* FIXME: use a bounce buffer */
@@ -3525,7 +3467,7 @@ index 051b6158d1b7..7ad293bef6ed 100644
  		buf = kmap_atomic(page);
  
  		/* do the actual data transfer */
-@@ -727,7 +727,7 @@ static void ata_pio_sector(struct ata_queued_cmd *qc)
+@@ -727,7 +727,7 @@
  				       do_write);
  
  		kunmap_atomic(buf);
@@ -3534,7 +3476,7 @@ index 051b6158d1b7..7ad293bef6ed 100644
  	} else {
  		buf = page_address(page);
  		ap->ops->sff_data_xfer(qc->dev, buf + offset, qc->sect_size,
-@@ -864,7 +864,7 @@ static int __atapi_pio_bytes(struct ata_queued_cmd *qc, unsigned int bytes)
+@@ -864,7 +864,7 @@
  		unsigned long flags;
  
  		/* FIXME: use bounce buffer */
@@ -3543,7 +3485,7 @@ index 051b6158d1b7..7ad293bef6ed 100644
  		buf = kmap_atomic(page);
  
  		/* do the actual data transfer */
-@@ -872,7 +872,7 @@ static int __atapi_pio_bytes(struct ata_queued_cmd *qc, unsigned int bytes)
+@@ -872,7 +872,7 @@
  								count, rw);
  
  		kunmap_atomic(buf);
@@ -3552,11 +3494,10 @@ index 051b6158d1b7..7ad293bef6ed 100644
  	} else {
  		buf = page_address(page);
  		consumed = ap->ops->sff_data_xfer(dev,  buf + offset,
-diff --git a/drivers/block/zram/zcomp.c b/drivers/block/zram/zcomp.c
-index 4b5cd3a7b2b6..fa8329ad79fd 100644
---- a/drivers/block/zram/zcomp.c
-+++ b/drivers/block/zram/zcomp.c
-@@ -118,12 +118,19 @@ ssize_t zcomp_available_show(const char *comp, char *buf)
+diff -Nur linux-4.8.15.orig/drivers/block/zram/zcomp.c linux-4.8.15/drivers/block/zram/zcomp.c
+--- linux-4.8.15.orig/drivers/block/zram/zcomp.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/block/zram/zcomp.c	2017-01-01 17:07:13.815284222 +0100
+@@ -118,12 +118,19 @@
  
  struct zcomp_strm *zcomp_stream_get(struct zcomp *comp)
  {
@@ -3578,7 +3519,7 @@ index 4b5cd3a7b2b6..fa8329ad79fd 100644
  }
  
  int zcomp_compress(struct zcomp_strm *zstrm,
-@@ -174,6 +181,7 @@ static int __zcomp_cpu_notifier(struct zcomp *comp,
+@@ -174,6 +181,7 @@
  			pr_err("Can't allocate a compression stream\n");
  			return NOTIFY_BAD;
  		}
@@ -3586,11 +3527,10 @@ index 4b5cd3a7b2b6..fa8329ad79fd 100644
  		*per_cpu_ptr(comp->stream, cpu) = zstrm;
  		break;
  	case CPU_DEAD:
-diff --git a/drivers/block/zram/zcomp.h b/drivers/block/zram/zcomp.h
-index 478cac2ed465..f7a6efdc3285 100644
---- a/drivers/block/zram/zcomp.h
-+++ b/drivers/block/zram/zcomp.h
-@@ -14,6 +14,7 @@ struct zcomp_strm {
+diff -Nur linux-4.8.15.orig/drivers/block/zram/zcomp.h linux-4.8.15/drivers/block/zram/zcomp.h
+--- linux-4.8.15.orig/drivers/block/zram/zcomp.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/block/zram/zcomp.h	2017-01-01 17:07:13.823284735 +0100
+@@ -14,6 +14,7 @@
  	/* compression/decompression buffer */
  	void *buffer;
  	struct crypto_comp *tfm;
@@ -3598,11 +3538,10 @@ index 478cac2ed465..f7a6efdc3285 100644
  };
  
  /* dynamic per-device compression frontend */
-diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
-index 04365b17ee67..b4a0577a4dbc 100644
---- a/drivers/block/zram/zram_drv.c
-+++ b/drivers/block/zram/zram_drv.c
-@@ -519,6 +519,8 @@ static struct zram_meta *zram_meta_alloc(char *pool_name, u64 disksize)
+diff -Nur linux-4.8.15.orig/drivers/block/zram/zram_drv.c linux-4.8.15/drivers/block/zram/zram_drv.c
+--- linux-4.8.15.orig/drivers/block/zram/zram_drv.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/block/zram/zram_drv.c	2017-01-01 17:07:13.831285255 +0100
+@@ -519,6 +519,8 @@
  		goto out_error;
  	}
  
@@ -3611,7 +3550,7 @@ index 04365b17ee67..b4a0577a4dbc 100644
  	return meta;
  
  out_error:
-@@ -566,28 +568,28 @@ static int zram_decompress_page(struct zram *zram, char *mem, u32 index)
+@@ -566,28 +568,28 @@
  	struct zram_meta *meta = zram->meta;
  	unsigned long handle;
  	unsigned int size;
@@ -3646,7 +3585,7 @@ index 04365b17ee67..b4a0577a4dbc 100644
  
  	/* Should NEVER happen. Return bio error if it does. */
  	if (unlikely(ret)) {
-@@ -607,14 +609,14 @@ static int zram_bvec_read(struct zram *zram, struct bio_vec *bvec,
+@@ -607,14 +609,14 @@
  	struct zram_meta *meta = zram->meta;
  	page = bvec->bv_page;
  
@@ -3664,7 +3603,7 @@ index 04365b17ee67..b4a0577a4dbc 100644
  
  	if (is_partial_io(bvec))
  		/* Use  a temporary buffer to decompress the page */
-@@ -691,10 +693,10 @@ static int zram_bvec_write(struct zram *zram, struct bio_vec *bvec, u32 index,
+@@ -691,10 +693,10 @@
  		if (user_mem)
  			kunmap_atomic(user_mem);
  		/* Free memory associated with this sector now. */
@@ -3677,7 +3616,7 @@ index 04365b17ee67..b4a0577a4dbc 100644
  
  		atomic64_inc(&zram->stats.zero_pages);
  		ret = 0;
-@@ -785,12 +787,12 @@ static int zram_bvec_write(struct zram *zram, struct bio_vec *bvec, u32 index,
+@@ -785,12 +787,12 @@
  	 * Free memory associated with this sector
  	 * before overwriting unused sectors.
  	 */
@@ -3692,7 +3631,7 @@ index 04365b17ee67..b4a0577a4dbc 100644
  
  	/* Update stats */
  	atomic64_add(clen, &zram->stats.compr_data_size);
-@@ -833,9 +835,9 @@ static void zram_bio_discard(struct zram *zram, u32 index,
+@@ -833,9 +835,9 @@
  	}
  
  	while (n >= PAGE_SIZE) {
@@ -3704,7 +3643,7 @@ index 04365b17ee67..b4a0577a4dbc 100644
  		atomic64_inc(&zram->stats.notify_free);
  		index++;
  		n -= PAGE_SIZE;
-@@ -964,9 +966,9 @@ static void zram_slot_free_notify(struct block_device *bdev,
+@@ -964,9 +966,9 @@
  	zram = bdev->bd_disk->private_data;
  	meta = zram->meta;
  
@@ -3716,11 +3655,10 @@ index 04365b17ee67..b4a0577a4dbc 100644
  	atomic64_inc(&zram->stats.notify_free);
  }
  
-diff --git a/drivers/block/zram/zram_drv.h b/drivers/block/zram/zram_drv.h
-index 74fcf10da374..fd4020c99b9e 100644
---- a/drivers/block/zram/zram_drv.h
-+++ b/drivers/block/zram/zram_drv.h
-@@ -73,6 +73,9 @@ enum zram_pageflags {
+diff -Nur linux-4.8.15.orig/drivers/block/zram/zram_drv.h linux-4.8.15/drivers/block/zram/zram_drv.h
+--- linux-4.8.15.orig/drivers/block/zram/zram_drv.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/block/zram/zram_drv.h	2017-01-01 17:07:13.831285255 +0100
+@@ -73,6 +73,9 @@
  struct zram_table_entry {
  	unsigned long handle;
  	unsigned long value;
@@ -3730,7 +3668,7 @@ index 74fcf10da374..fd4020c99b9e 100644
  };
  
  struct zram_stats {
-@@ -120,4 +123,42 @@ struct zram {
+@@ -120,4 +123,42 @@
  	 */
  	bool claim; /* Protected by bdev->bd_mutex */
  };
@@ -3773,11 +3711,10 @@ index 74fcf10da374..fd4020c99b9e 100644
 +#endif /* CONFIG_PREEMPT_RT_BASE */
 +
  #endif
-diff --git a/drivers/char/random.c b/drivers/char/random.c
-index 3efb3bf0ab83..c894d2e266f3 100644
---- a/drivers/char/random.c
-+++ b/drivers/char/random.c
-@@ -1028,8 +1028,6 @@ static void add_timer_randomness(struct timer_rand_state *state, unsigned num)
+diff -Nur linux-4.8.15.orig/drivers/char/random.c linux-4.8.15/drivers/char/random.c
+--- linux-4.8.15.orig/drivers/char/random.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/char/random.c	2017-01-01 17:07:13.863287315 +0100
+@@ -1028,8 +1028,6 @@
  	} sample;
  	long delta, delta2, delta3;
  
@@ -3786,7 +3723,7 @@ index 3efb3bf0ab83..c894d2e266f3 100644
  	sample.jiffies = jiffies;
  	sample.cycles = random_get_entropy();
  	sample.num = num;
-@@ -1070,7 +1068,6 @@ static void add_timer_randomness(struct timer_rand_state *state, unsigned num)
+@@ -1070,7 +1068,6 @@
  		 */
  		credit_entropy_bits(r, min_t(int, fls(delta>>1), 11));
  	}
@@ -3794,7 +3731,7 @@ index 3efb3bf0ab83..c894d2e266f3 100644
  }
  
  void add_input_randomness(unsigned int type, unsigned int code,
-@@ -1123,28 +1120,27 @@ static __u32 get_reg(struct fast_pool *f, struct pt_regs *regs)
+@@ -1123,28 +1120,27 @@
  	return *(ptr + f->reg_idx++);
  }
  
@@ -3828,10 +3765,9 @@ index 3efb3bf0ab83..c894d2e266f3 100644
  
  	fast_mix(fast_pool);
  	add_interrupt_bench(cycles);
-diff --git a/drivers/clocksource/tcb_clksrc.c b/drivers/clocksource/tcb_clksrc.c
-index 4da2af9694a2..5b6f57f500b8 100644
---- a/drivers/clocksource/tcb_clksrc.c
-+++ b/drivers/clocksource/tcb_clksrc.c
+diff -Nur linux-4.8.15.orig/drivers/clocksource/tcb_clksrc.c linux-4.8.15/drivers/clocksource/tcb_clksrc.c
+--- linux-4.8.15.orig/drivers/clocksource/tcb_clksrc.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/clocksource/tcb_clksrc.c	2017-01-01 17:07:13.903289890 +0100
 @@ -23,8 +23,7 @@
   *     this 32 bit free-running counter. the second channel is not used.
   *
@@ -3842,7 +3778,7 @@ index 4da2af9694a2..5b6f57f500b8 100644
   *
   * A boot clocksource and clockevent source are also currently needed,
   * unless the relevant platforms (ARM/AT91, AVR32/AT32) are changed so
-@@ -74,6 +73,8 @@ static struct clocksource clksrc = {
+@@ -74,6 +73,8 @@
  struct tc_clkevt_device {
  	struct clock_event_device	clkevt;
  	struct clk			*clk;
@@ -3851,7 +3787,7 @@ index 4da2af9694a2..5b6f57f500b8 100644
  	void __iomem			*regs;
  };
  
-@@ -82,15 +83,26 @@ static struct tc_clkevt_device *to_tc_clkevt(struct clock_event_device *clkevt)
+@@ -82,15 +83,26 @@
  	return container_of(clkevt, struct tc_clkevt_device, clkevt);
  }
  
@@ -3885,7 +3821,7 @@ index 4da2af9694a2..5b6f57f500b8 100644
  static int tc_shutdown(struct clock_event_device *d)
  {
  	struct tc_clkevt_device *tcd = to_tc_clkevt(d);
-@@ -98,8 +110,14 @@ static int tc_shutdown(struct clock_event_device *d)
+@@ -98,8 +110,14 @@
  
  	__raw_writel(0xff, regs + ATMEL_TC_REG(2, IDR));
  	__raw_writel(ATMEL_TC_CLKDIS, regs + ATMEL_TC_REG(2, CCR));
@@ -3901,7 +3837,7 @@ index 4da2af9694a2..5b6f57f500b8 100644
  
  	return 0;
  }
-@@ -112,9 +130,9 @@ static int tc_set_oneshot(struct clock_event_device *d)
+@@ -112,9 +130,9 @@
  	if (clockevent_state_oneshot(d) || clockevent_state_periodic(d))
  		tc_shutdown(d);
  
@@ -3913,7 +3849,7 @@ index 4da2af9694a2..5b6f57f500b8 100644
  	__raw_writel(timer_clock | ATMEL_TC_CPCSTOP | ATMEL_TC_WAVE |
  		     ATMEL_TC_WAVESEL_UP_AUTO, regs + ATMEL_TC_REG(2, CMR));
  	__raw_writel(ATMEL_TC_CPCS, regs + ATMEL_TC_REG(2, IER));
-@@ -134,12 +152,12 @@ static int tc_set_periodic(struct clock_event_device *d)
+@@ -134,12 +152,12 @@
  	/* By not making the gentime core emulate periodic mode on top
  	 * of oneshot, we get lower overhead and improved accuracy.
  	 */
@@ -3929,7 +3865,7 @@ index 4da2af9694a2..5b6f57f500b8 100644
  
  	/* Enable clock and interrupts on RC compare */
  	__raw_writel(ATMEL_TC_CPCS, regs + ATMEL_TC_REG(2, IER));
-@@ -166,9 +184,13 @@ static struct tc_clkevt_device clkevt = {
+@@ -166,9 +184,13 @@
  		.features		= CLOCK_EVT_FEAT_PERIODIC |
  					  CLOCK_EVT_FEAT_ONESHOT,
  		/* Should be lower than at91rm9200's system timer */
@@ -3944,7 +3880,7 @@ index 4da2af9694a2..5b6f57f500b8 100644
  		.set_state_periodic	= tc_set_periodic,
  		.set_state_oneshot	= tc_set_oneshot,
  	},
-@@ -188,8 +210,9 @@ static irqreturn_t ch2_irq(int irq, void *handle)
+@@ -188,8 +210,9 @@
  	return IRQ_NONE;
  }
  
@@ -3955,7 +3891,7 @@ index 4da2af9694a2..5b6f57f500b8 100644
  	int ret;
  	struct clk *t2_clk = tc->clk[2];
  	int irq = tc->irq[2];
-@@ -210,7 +233,11 @@ static int __init setup_clkevents(struct atmel_tc *tc, int clk32k_divisor_idx)
+@@ -210,7 +233,11 @@
  	clkevt.regs = tc->regs;
  	clkevt.clk = t2_clk;
  
@@ -3968,7 +3904,7 @@ index 4da2af9694a2..5b6f57f500b8 100644
  
  	clkevt.clkevt.cpumask = cpumask_of(0);
  
-@@ -221,7 +248,7 @@ static int __init setup_clkevents(struct atmel_tc *tc, int clk32k_divisor_idx)
+@@ -221,7 +248,7 @@
  		return ret;
  	}
  
@@ -3977,7 +3913,7 @@ index 4da2af9694a2..5b6f57f500b8 100644
  
  	return ret;
  }
-@@ -358,7 +385,11 @@ static int __init tcb_clksrc_init(void)
+@@ -358,7 +385,11 @@
  		goto err_disable_t1;
  
  	/* channel 2:  periodic and oneshot timer support */
@@ -3989,11 +3925,10 @@ index 4da2af9694a2..5b6f57f500b8 100644
  	if (ret)
  		goto err_unregister_clksrc;
  
-diff --git a/drivers/clocksource/timer-atmel-pit.c b/drivers/clocksource/timer-atmel-pit.c
-index 7f0f5b26d8c5..1553f19e73e7 100644
---- a/drivers/clocksource/timer-atmel-pit.c
-+++ b/drivers/clocksource/timer-atmel-pit.c
-@@ -46,6 +46,7 @@ struct pit_data {
+diff -Nur linux-4.8.15.orig/drivers/clocksource/timer-atmel-pit.c linux-4.8.15/drivers/clocksource/timer-atmel-pit.c
+--- linux-4.8.15.orig/drivers/clocksource/timer-atmel-pit.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/clocksource/timer-atmel-pit.c	2017-01-01 17:07:13.911290405 +0100
+@@ -46,6 +46,7 @@
  	u32		cycle;
  	u32		cnt;
  	unsigned int	irq;
@@ -4001,7 +3936,7 @@ index 7f0f5b26d8c5..1553f19e73e7 100644
  	struct clk	*mck;
  };
  
-@@ -96,15 +97,29 @@ static int pit_clkevt_shutdown(struct clock_event_device *dev)
+@@ -96,15 +97,29 @@
  
  	/* disable irq, leaving the clocksource active */
  	pit_write(data->base, AT91_PIT_MR, (data->cycle - 1) | AT91_PIT_PITEN);
@@ -4031,7 +3966,7 @@ index 7f0f5b26d8c5..1553f19e73e7 100644
  
  	/* update clocksource counter */
  	data->cnt += data->cycle * PIT_PICNT(pit_read(data->base, AT91_PIT_PIVR));
-@@ -211,15 +226,6 @@ static int __init at91sam926x_pit_common_init(struct pit_data *data)
+@@ -211,15 +226,6 @@
  		return ret;
  	}
  
@@ -4047,11 +3982,10 @@ index 7f0f5b26d8c5..1553f19e73e7 100644
  	/* Set up and register clockevents */
  	data->clkevt.name = "pit";
  	data->clkevt.features = CLOCK_EVT_FEAT_PERIODIC;
-diff --git a/drivers/clocksource/timer-atmel-st.c b/drivers/clocksource/timer-atmel-st.c
-index e90ab5b63a90..9e124087c55f 100644
---- a/drivers/clocksource/timer-atmel-st.c
-+++ b/drivers/clocksource/timer-atmel-st.c
-@@ -115,18 +115,29 @@ static void clkdev32k_disable_and_flush_irq(void)
+diff -Nur linux-4.8.15.orig/drivers/clocksource/timer-atmel-st.c linux-4.8.15/drivers/clocksource/timer-atmel-st.c
+--- linux-4.8.15.orig/drivers/clocksource/timer-atmel-st.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/clocksource/timer-atmel-st.c	2017-01-01 17:07:13.911290405 +0100
+@@ -115,18 +115,29 @@
  	last_crtr = read_CRTR();
  }
  
@@ -4081,7 +4015,7 @@ index e90ab5b63a90..9e124087c55f 100644
  	/*
  	 * ALM for oneshot irqs, set by next_event()
  	 * before 32 seconds have passed.
-@@ -139,8 +150,16 @@ static int clkevt32k_set_oneshot(struct clock_event_device *dev)
+@@ -139,8 +150,16 @@
  
  static int clkevt32k_set_periodic(struct clock_event_device *dev)
  {
@@ -4098,7 +4032,7 @@ index e90ab5b63a90..9e124087c55f 100644
  	/* PIT for periodic irqs; fixed rate of 1/HZ */
  	irqmask = AT91_ST_PITS;
  	regmap_write(regmap_st, AT91_ST_PIMR, timer_latch);
-@@ -198,7 +217,7 @@ static int __init atmel_st_timer_init(struct device_node *node)
+@@ -198,7 +217,7 @@
  {
  	struct clk *sclk;
  	unsigned int sclk_rate, val;
@@ -4107,7 +4041,7 @@ index e90ab5b63a90..9e124087c55f 100644
  
  	regmap_st = syscon_node_to_regmap(node);
  	if (IS_ERR(regmap_st)) {
-@@ -212,21 +231,12 @@ static int __init atmel_st_timer_init(struct device_node *node)
+@@ -212,21 +231,12 @@
  	regmap_read(regmap_st, AT91_ST_SR, &val);
  
  	/* Get the interrupts property */
@@ -4131,10 +4065,9 @@ index e90ab5b63a90..9e124087c55f 100644
  	sclk = of_clk_get(node, 0);
  	if (IS_ERR(sclk)) {
  		pr_err("Unable to get slow clock\n");
-diff --git a/drivers/connector/cn_proc.c b/drivers/connector/cn_proc.c
-index a782ce87715c..19d265948526 100644
---- a/drivers/connector/cn_proc.c
-+++ b/drivers/connector/cn_proc.c
+diff -Nur linux-4.8.15.orig/drivers/connector/cn_proc.c linux-4.8.15/drivers/connector/cn_proc.c
+--- linux-4.8.15.orig/drivers/connector/cn_proc.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/connector/cn_proc.c	2017-01-01 17:07:13.951292981 +0100
 @@ -32,6 +32,7 @@
  #include <linux/pid_namespace.h>
  
@@ -4143,7 +4076,7 @@ index a782ce87715c..19d265948526 100644
  
  /*
   * Size of a cn_msg followed by a proc_event structure.  Since the
-@@ -54,10 +55,11 @@ static struct cb_id cn_proc_event_id = { CN_IDX_PROC, CN_VAL_PROC };
+@@ -54,10 +55,11 @@
  
  /* proc_event_counts is used as the sequence number of the netlink message */
  static DEFINE_PER_CPU(__u32, proc_event_counts) = { 0 };
@@ -4156,7 +4089,7 @@ index a782ce87715c..19d265948526 100644
  
  	msg->seq = __this_cpu_inc_return(proc_event_counts) - 1;
  	((struct proc_event *)msg->data)->cpu = smp_processor_id();
-@@ -70,7 +72,7 @@ static inline void send_msg(struct cn_msg *msg)
+@@ -70,7 +72,7 @@
  	 */
  	cn_netlink_send(msg, 0, CN_IDX_PROC, GFP_NOWAIT);
  
@@ -4165,11 +4098,10 @@ index a782ce87715c..19d265948526 100644
  }
  
  void proc_fork_connector(struct task_struct *task)
-diff --git a/drivers/cpufreq/Kconfig.x86 b/drivers/cpufreq/Kconfig.x86
-index adbd1de1cea5..1fac5074f2cf 100644
---- a/drivers/cpufreq/Kconfig.x86
-+++ b/drivers/cpufreq/Kconfig.x86
-@@ -124,7 +124,7 @@ config X86_POWERNOW_K7_ACPI
+diff -Nur linux-4.8.15.orig/drivers/cpufreq/Kconfig.x86 linux-4.8.15/drivers/cpufreq/Kconfig.x86
+--- linux-4.8.15.orig/drivers/cpufreq/Kconfig.x86	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/cpufreq/Kconfig.x86	2017-01-01 17:07:13.951292981 +0100
+@@ -124,7 +124,7 @@
  
  config X86_POWERNOW_K8
  	tristate "AMD Opteron/Athlon64 PowerNow!"
@@ -4178,11 +4110,10 @@ index adbd1de1cea5..1fac5074f2cf 100644
  	help
  	  This adds the CPUFreq driver for K8/early Opteron/Athlon64 processors.
  	  Support for K10 and newer processors is now in acpi-cpufreq.
-diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
-index b35e5b6475b2..ce60807fb1d4 100644
---- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
-+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
-@@ -1302,7 +1302,9 @@ i915_gem_ringbuffer_submission(struct i915_execbuffer_params *params,
+diff -Nur linux-4.8.15.orig/drivers/gpu/drm/i915/i915_gem_execbuffer.c linux-4.8.15/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+--- linux-4.8.15.orig/drivers/gpu/drm/i915/i915_gem_execbuffer.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/gpu/drm/i915/i915_gem_execbuffer.c	2017-01-01 17:07:13.983295041 +0100
+@@ -1302,7 +1302,9 @@
  	if (ret)
  		return ret;
  
@@ -4192,11 +4123,10 @@ index b35e5b6475b2..ce60807fb1d4 100644
  
  	i915_gem_execbuffer_move_to_active(vmas, params->request);
  
-diff --git a/drivers/gpu/drm/i915/i915_gem_shrinker.c b/drivers/gpu/drm/i915/i915_gem_shrinker.c
-index 6f10b421487b..dd3a9a6ace11 100644
---- a/drivers/gpu/drm/i915/i915_gem_shrinker.c
-+++ b/drivers/gpu/drm/i915/i915_gem_shrinker.c
-@@ -40,7 +40,7 @@ static bool mutex_is_locked_by(struct mutex *mutex, struct task_struct *task)
+diff -Nur linux-4.8.15.orig/drivers/gpu/drm/i915/i915_gem_shrinker.c linux-4.8.15/drivers/gpu/drm/i915/i915_gem_shrinker.c
+--- linux-4.8.15.orig/drivers/gpu/drm/i915/i915_gem_shrinker.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/gpu/drm/i915/i915_gem_shrinker.c	2017-01-01 17:07:13.987295307 +0100
+@@ -40,7 +40,7 @@
  	if (!mutex_is_locked(mutex))
  		return false;
  
@@ -4205,11 +4135,10 @@ index 6f10b421487b..dd3a9a6ace11 100644
  	return mutex->owner == task;
  #else
  	/* Since UP may be pre-empted, we cannot assume that we own the lock */
-diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
-index 1c2aec392412..1d85c0c791f1 100644
---- a/drivers/gpu/drm/i915/i915_irq.c
-+++ b/drivers/gpu/drm/i915/i915_irq.c
-@@ -812,6 +812,7 @@ static int i915_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe,
+diff -Nur linux-4.8.15.orig/drivers/gpu/drm/i915/i915_irq.c linux-4.8.15/drivers/gpu/drm/i915/i915_irq.c
+--- linux-4.8.15.orig/drivers/gpu/drm/i915/i915_irq.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/gpu/drm/i915/i915_irq.c	2017-01-01 17:07:14.007296588 +0100
+@@ -812,6 +812,7 @@
  	spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);
  
  	/* preempt_disable_rt() should go right here in PREEMPT_RT patchset. */
@@ -4217,7 +4146,7 @@ index 1c2aec392412..1d85c0c791f1 100644
  
  	/* Get optional system timestamp before query. */
  	if (stime)
-@@ -863,6 +864,7 @@ static int i915_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe,
+@@ -863,6 +864,7 @@
  		*etime = ktime_get();
  
  	/* preempt_enable_rt() should go right here in PREEMPT_RT patchset. */
@@ -4225,11 +4154,10 @@ index 1c2aec392412..1d85c0c791f1 100644
  
  	spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags);
  
-diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
-index e9a64fba6333..2aac27b13d86 100644
---- a/drivers/gpu/drm/i915/intel_display.c
-+++ b/drivers/gpu/drm/i915/intel_display.c
-@@ -11647,7 +11647,7 @@ void intel_check_page_flip(struct drm_i915_private *dev_priv, int pipe)
+diff -Nur linux-4.8.15.orig/drivers/gpu/drm/i915/intel_display.c linux-4.8.15/drivers/gpu/drm/i915/intel_display.c
+--- linux-4.8.15.orig/drivers/gpu/drm/i915/intel_display.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/gpu/drm/i915/intel_display.c	2017-01-01 17:07:14.079301234 +0100
+@@ -11670,7 +11670,7 @@
  	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
  	struct intel_flip_work *work;
  
@@ -4238,10 +4166,9 @@ index e9a64fba6333..2aac27b13d86 100644
  
  	if (crtc == NULL)
  		return;
-diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
-index 4178849631ad..0eb939c92544 100644
---- a/drivers/gpu/drm/i915/intel_sprite.c
-+++ b/drivers/gpu/drm/i915/intel_sprite.c
+diff -Nur linux-4.8.15.orig/drivers/gpu/drm/i915/intel_sprite.c linux-4.8.15/drivers/gpu/drm/i915/intel_sprite.c
+--- linux-4.8.15.orig/drivers/gpu/drm/i915/intel_sprite.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/gpu/drm/i915/intel_sprite.c	2017-01-01 17:07:14.091301999 +0100
 @@ -38,6 +38,7 @@
  #include "intel_drv.h"
  #include <drm/i915_drm.h>
@@ -4250,7 +4177,7 @@ index 4178849631ad..0eb939c92544 100644
  
  static bool
  format_is_yuv(uint32_t format)
-@@ -64,6 +65,8 @@ int intel_usecs_to_scanlines(const struct drm_display_mode *adjusted_mode,
+@@ -64,6 +65,8 @@
  			    1000 * adjusted_mode->crtc_htotal);
  }
  
@@ -4259,7 +4186,7 @@ index 4178849631ad..0eb939c92544 100644
  /**
   * intel_pipe_update_start() - start update of a set of display registers
   * @crtc: the crtc of which the registers are going to be updated
-@@ -94,7 +97,7 @@ void intel_pipe_update_start(struct intel_crtc *crtc)
+@@ -94,7 +97,7 @@
  	min = vblank_start - intel_usecs_to_scanlines(adjusted_mode, 100);
  	max = vblank_start - 1;
  
@@ -4268,7 +4195,7 @@ index 4178849631ad..0eb939c92544 100644
  
  	if (min <= 0 || max <= 0)
  		return;
-@@ -124,11 +127,11 @@ void intel_pipe_update_start(struct intel_crtc *crtc)
+@@ -124,11 +127,11 @@
  			break;
  		}
  
@@ -4282,7 +4209,7 @@ index 4178849631ad..0eb939c92544 100644
  	}
  
  	finish_wait(wq, &wait);
-@@ -180,7 +183,7 @@ void intel_pipe_update_end(struct intel_crtc *crtc, struct intel_flip_work *work
+@@ -180,7 +183,7 @@
  		crtc->base.state->event = NULL;
  	}
  
@@ -4291,11 +4218,10 @@ index 4178849631ad..0eb939c92544 100644
  
  	if (crtc->debug.start_vbl_count &&
  	    crtc->debug.start_vbl_count != end_vbl_count) {
-diff --git a/drivers/gpu/drm/msm/msm_gem_shrinker.c b/drivers/gpu/drm/msm/msm_gem_shrinker.c
-index 283d2841ba58..d01f6ed1977e 100644
---- a/drivers/gpu/drm/msm/msm_gem_shrinker.c
-+++ b/drivers/gpu/drm/msm/msm_gem_shrinker.c
-@@ -23,7 +23,7 @@ static bool mutex_is_locked_by(struct mutex *mutex, struct task_struct *task)
+diff -Nur linux-4.8.15.orig/drivers/gpu/drm/msm/msm_gem_shrinker.c linux-4.8.15/drivers/gpu/drm/msm/msm_gem_shrinker.c
+--- linux-4.8.15.orig/drivers/gpu/drm/msm/msm_gem_shrinker.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/gpu/drm/msm/msm_gem_shrinker.c	2017-01-01 17:07:14.095302264 +0100
+@@ -23,7 +23,7 @@
  	if (!mutex_is_locked(mutex))
  		return false;
  
@@ -4304,11 +4230,10 @@ index 283d2841ba58..d01f6ed1977e 100644
  	return mutex->owner == task;
  #else
  	/* Since UP may be pre-empted, we cannot assume that we own the lock */
-diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
-index c3206fb8f4cf..6e2423186e2a 100644
---- a/drivers/gpu/drm/radeon/radeon_display.c
-+++ b/drivers/gpu/drm/radeon/radeon_display.c
-@@ -1869,6 +1869,7 @@ int radeon_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe,
+diff -Nur linux-4.8.15.orig/drivers/gpu/drm/radeon/radeon_display.c linux-4.8.15/drivers/gpu/drm/radeon/radeon_display.c
+--- linux-4.8.15.orig/drivers/gpu/drm/radeon/radeon_display.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/gpu/drm/radeon/radeon_display.c	2017-01-01 17:07:14.135304831 +0100
+@@ -1869,6 +1869,7 @@
  	struct radeon_device *rdev = dev->dev_private;
  
  	/* preempt_disable_rt() should go right here in PREEMPT_RT patchset. */
@@ -4316,7 +4241,7 @@ index c3206fb8f4cf..6e2423186e2a 100644
  
  	/* Get optional system timestamp before query. */
  	if (stime)
-@@ -1961,6 +1962,7 @@ int radeon_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe,
+@@ -1961,6 +1962,7 @@
  		*etime = ktime_get();
  
  	/* preempt_enable_rt() should go right here in PREEMPT_RT patchset. */
@@ -4324,11 +4249,10 @@ index c3206fb8f4cf..6e2423186e2a 100644
  
  	/* Decode into vertical and horizontal scanout position. */
  	*vpos = position & 0x1fff;
-diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
-index e82f7e1c217c..b57d917b6ab7 100644
---- a/drivers/hv/vmbus_drv.c
-+++ b/drivers/hv/vmbus_drv.c
-@@ -761,6 +761,8 @@ static void vmbus_isr(void)
+diff -Nur linux-4.8.15.orig/drivers/hv/vmbus_drv.c linux-4.8.15/drivers/hv/vmbus_drv.c
+--- linux-4.8.15.orig/drivers/hv/vmbus_drv.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/hv/vmbus_drv.c	2017-01-01 17:07:14.187308183 +0100
+@@ -761,6 +761,8 @@
  	void *page_addr;
  	struct hv_message *msg;
  	union hv_synic_event_flags *event;
@@ -4337,7 +4261,7 @@ index e82f7e1c217c..b57d917b6ab7 100644
  	bool handled = false;
  
  	page_addr = hv_context.synic_event_page[cpu];
-@@ -808,7 +810,7 @@ static void vmbus_isr(void)
+@@ -808,7 +810,7 @@
  			tasklet_schedule(hv_context.msg_dpc[cpu]);
  	}
  
@@ -4346,11 +4270,10 @@ index e82f7e1c217c..b57d917b6ab7 100644
  }
  
  
-diff --git a/drivers/ide/alim15x3.c b/drivers/ide/alim15x3.c
-index 36f76e28a0bf..394f142f90c7 100644
---- a/drivers/ide/alim15x3.c
-+++ b/drivers/ide/alim15x3.c
-@@ -234,7 +234,7 @@ static int init_chipset_ali15x3(struct pci_dev *dev)
+diff -Nur linux-4.8.15.orig/drivers/ide/alim15x3.c linux-4.8.15/drivers/ide/alim15x3.c
+--- linux-4.8.15.orig/drivers/ide/alim15x3.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/ide/alim15x3.c	2017-01-01 17:07:14.227310759 +0100
+@@ -234,7 +234,7 @@
  
  	isa_dev = pci_get_device(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1533, NULL);
  
@@ -4359,7 +4282,7 @@ index 36f76e28a0bf..394f142f90c7 100644
  
  	if (m5229_revision < 0xC2) {
  		/*
-@@ -325,7 +325,7 @@ static int init_chipset_ali15x3(struct pci_dev *dev)
+@@ -325,7 +325,7 @@
  	}
  	pci_dev_put(north);
  	pci_dev_put(isa_dev);
@@ -4368,11 +4291,10 @@ index 36f76e28a0bf..394f142f90c7 100644
  	return 0;
  }
  
-diff --git a/drivers/ide/hpt366.c b/drivers/ide/hpt366.c
-index 0ceae5cbd89a..c212e85d7f3e 100644
---- a/drivers/ide/hpt366.c
-+++ b/drivers/ide/hpt366.c
-@@ -1236,7 +1236,7 @@ static int init_dma_hpt366(ide_hwif_t *hwif,
+diff -Nur linux-4.8.15.orig/drivers/ide/hpt366.c linux-4.8.15/drivers/ide/hpt366.c
+--- linux-4.8.15.orig/drivers/ide/hpt366.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/ide/hpt366.c	2017-01-01 17:07:14.243311792 +0100
+@@ -1236,7 +1236,7 @@
  
  	dma_old = inb(base + 2);
  
@@ -4381,7 +4303,7 @@ index 0ceae5cbd89a..c212e85d7f3e 100644
  
  	dma_new = dma_old;
  	pci_read_config_byte(dev, hwif->channel ? 0x4b : 0x43, &masterdma);
-@@ -1247,7 +1247,7 @@ static int init_dma_hpt366(ide_hwif_t *hwif,
+@@ -1247,7 +1247,7 @@
  	if (dma_new != dma_old)
  		outb(dma_new, base + 2);
  
@@ -4390,11 +4312,40 @@ index 0ceae5cbd89a..c212e85d7f3e 100644
  
  	printk(KERN_INFO "    %s: BM-DMA at 0x%04lx-0x%04lx\n",
  			 hwif->name, base, base + 7);
-diff --git a/drivers/ide/ide-io-std.c b/drivers/ide/ide-io-std.c
-index 19763977568c..4169433faab5 100644
---- a/drivers/ide/ide-io-std.c
-+++ b/drivers/ide/ide-io-std.c
-@@ -175,7 +175,7 @@ void ide_input_data(ide_drive_t *drive, struct ide_cmd *cmd, void *buf,
+diff -Nur linux-4.8.15.orig/drivers/ide/ide-io.c linux-4.8.15/drivers/ide/ide-io.c
+--- linux-4.8.15.orig/drivers/ide/ide-io.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/ide/ide-io.c	2017-01-01 17:07:14.243311792 +0100
+@@ -659,7 +659,7 @@
+ 		/* disable_irq_nosync ?? */
+ 		disable_irq(hwif->irq);
+ 		/* local CPU only, as if we were handling an interrupt */
+-		local_irq_disable();
++		local_irq_disable_nort();
+ 		if (hwif->polling) {
+ 			startstop = handler(drive);
+ 		} else if (drive_is_ready(drive)) {
+diff -Nur linux-4.8.15.orig/drivers/ide/ide-iops.c linux-4.8.15/drivers/ide/ide-iops.c
+--- linux-4.8.15.orig/drivers/ide/ide-iops.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/ide/ide-iops.c	2017-01-01 17:07:14.247312048 +0100
+@@ -129,12 +129,12 @@
+ 				if ((stat & ATA_BUSY) == 0)
+ 					break;
+ 
+-				local_irq_restore(flags);
++				local_irq_restore_nort(flags);
+ 				*rstat = stat;
+ 				return -EBUSY;
+ 			}
+ 		}
+-		local_irq_restore(flags);
++		local_irq_restore_nort(flags);
+ 	}
+ 	/*
+ 	 * Allow status to settle, then read it again.
+diff -Nur linux-4.8.15.orig/drivers/ide/ide-io-std.c linux-4.8.15/drivers/ide/ide-io-std.c
+--- linux-4.8.15.orig/drivers/ide/ide-io-std.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/ide/ide-io-std.c	2017-01-01 17:07:14.243311792 +0100
+@@ -175,7 +175,7 @@
  		unsigned long uninitialized_var(flags);
  
  		if ((io_32bit & 2) && !mmio) {
@@ -4403,7 +4354,7 @@ index 19763977568c..4169433faab5 100644
  			ata_vlb_sync(io_ports->nsect_addr);
  		}
  
-@@ -186,7 +186,7 @@ void ide_input_data(ide_drive_t *drive, struct ide_cmd *cmd, void *buf,
+@@ -186,7 +186,7 @@
  			insl(data_addr, buf, words);
  
  		if ((io_32bit & 2) && !mmio)
@@ -4412,7 +4363,7 @@ index 19763977568c..4169433faab5 100644
  
  		if (((len + 1) & 3) < 2)
  			return;
-@@ -219,7 +219,7 @@ void ide_output_data(ide_drive_t *drive, struct ide_cmd *cmd, void *buf,
+@@ -219,7 +219,7 @@
  		unsigned long uninitialized_var(flags);
  
  		if ((io_32bit & 2) && !mmio) {
@@ -4421,7 +4372,7 @@ index 19763977568c..4169433faab5 100644
  			ata_vlb_sync(io_ports->nsect_addr);
  		}
  
-@@ -230,7 +230,7 @@ void ide_output_data(ide_drive_t *drive, struct ide_cmd *cmd, void *buf,
+@@ -230,7 +230,7 @@
  			outsl(data_addr, buf, words);
  
  		if ((io_32bit & 2) && !mmio)
@@ -4430,43 +4381,10 @@ index 19763977568c..4169433faab5 100644
  
  		if (((len + 1) & 3) < 2)
  			return;
-diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
-index 669ea1e45795..e12e43e62245 100644
---- a/drivers/ide/ide-io.c
-+++ b/drivers/ide/ide-io.c
-@@ -659,7 +659,7 @@ void ide_timer_expiry (unsigned long data)
- 		/* disable_irq_nosync ?? */
- 		disable_irq(hwif->irq);
- 		/* local CPU only, as if we were handling an interrupt */
--		local_irq_disable();
-+		local_irq_disable_nort();
- 		if (hwif->polling) {
- 			startstop = handler(drive);
- 		} else if (drive_is_ready(drive)) {
-diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
-index 376f2dc410c5..f014dd1b73dc 100644
---- a/drivers/ide/ide-iops.c
-+++ b/drivers/ide/ide-iops.c
-@@ -129,12 +129,12 @@ int __ide_wait_stat(ide_drive_t *drive, u8 good, u8 bad,
- 				if ((stat & ATA_BUSY) == 0)
- 					break;
- 
--				local_irq_restore(flags);
-+				local_irq_restore_nort(flags);
- 				*rstat = stat;
- 				return -EBUSY;
- 			}
- 		}
--		local_irq_restore(flags);
-+		local_irq_restore_nort(flags);
- 	}
- 	/*
- 	 * Allow status to settle, then read it again.
-diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
-index 0b63facd1d87..4ceba37afc0c 100644
---- a/drivers/ide/ide-probe.c
-+++ b/drivers/ide/ide-probe.c
-@@ -196,10 +196,10 @@ static void do_identify(ide_drive_t *drive, u8 cmd, u16 *id)
+diff -Nur linux-4.8.15.orig/drivers/ide/ide-probe.c linux-4.8.15/drivers/ide/ide-probe.c
+--- linux-4.8.15.orig/drivers/ide/ide-probe.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/ide/ide-probe.c	2017-01-01 17:07:14.247312048 +0100
+@@ -196,10 +196,10 @@
  	int bswap = 1;
  
  	/* local CPU only; some systems need this */
@@ -4479,11 +4397,10 @@ index 0b63facd1d87..4ceba37afc0c 100644
  
  	drive->dev_flags |= IDE_DFLAG_ID_READ;
  #ifdef DEBUG
-diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
-index a716693417a3..be0568c722d6 100644
---- a/drivers/ide/ide-taskfile.c
-+++ b/drivers/ide/ide-taskfile.c
-@@ -250,7 +250,7 @@ void ide_pio_bytes(ide_drive_t *drive, struct ide_cmd *cmd,
+diff -Nur linux-4.8.15.orig/drivers/ide/ide-taskfile.c linux-4.8.15/drivers/ide/ide-taskfile.c
+--- linux-4.8.15.orig/drivers/ide/ide-taskfile.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/ide/ide-taskfile.c	2017-01-01 17:07:14.255312569 +0100
+@@ -250,7 +250,7 @@
  
  		page_is_high = PageHighMem(page);
  		if (page_is_high)
@@ -4492,7 +4409,7 @@ index a716693417a3..be0568c722d6 100644
  
  		buf = kmap_atomic(page) + offset;
  
-@@ -271,7 +271,7 @@ void ide_pio_bytes(ide_drive_t *drive, struct ide_cmd *cmd,
+@@ -271,7 +271,7 @@
  		kunmap_atomic(buf);
  
  		if (page_is_high)
@@ -4501,7 +4418,7 @@ index a716693417a3..be0568c722d6 100644
  
  		len -= nr_bytes;
  	}
-@@ -414,7 +414,7 @@ static ide_startstop_t pre_task_out_intr(ide_drive_t *drive,
+@@ -414,7 +414,7 @@
  	}
  
  	if ((drive->dev_flags & IDE_DFLAG_UNMASK) == 0)
@@ -4510,11 +4427,10 @@ index a716693417a3..be0568c722d6 100644
  
  	ide_set_handler(drive, &task_pio_intr, WAIT_WORSTCASE);
  
-diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
-index d3394b6add24..506bfba6ec9f 100644
---- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
-+++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
-@@ -897,7 +897,7 @@ void ipoib_mcast_restart_task(struct work_struct *work)
+diff -Nur linux-4.8.15.orig/drivers/infiniband/ulp/ipoib/ipoib_multicast.c linux-4.8.15/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
+--- linux-4.8.15.orig/drivers/infiniband/ulp/ipoib/ipoib_multicast.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/infiniband/ulp/ipoib/ipoib_multicast.c	2017-01-01 17:07:14.299315394 +0100
+@@ -899,7 +899,7 @@
  
  	ipoib_dbg_mcast(priv, "restarting multicast task\n");
  
@@ -4523,7 +4439,7 @@ index d3394b6add24..506bfba6ec9f 100644
  	netif_addr_lock(dev);
  	spin_lock(&priv->lock);
  
-@@ -979,7 +979,7 @@ void ipoib_mcast_restart_task(struct work_struct *work)
+@@ -981,7 +981,7 @@
  
  	spin_unlock(&priv->lock);
  	netif_addr_unlock(dev);
@@ -4532,11 +4448,10 @@ index d3394b6add24..506bfba6ec9f 100644
  
  	/*
  	 * make sure the in-flight joins have finished before we attempt
-diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
-index 4a2a9e370be7..e970d9afd179 100644
---- a/drivers/input/gameport/gameport.c
-+++ b/drivers/input/gameport/gameport.c
-@@ -91,13 +91,13 @@ static int gameport_measure_speed(struct gameport *gameport)
+diff -Nur linux-4.8.15.orig/drivers/input/gameport/gameport.c linux-4.8.15/drivers/input/gameport/gameport.c
+--- linux-4.8.15.orig/drivers/input/gameport/gameport.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/input/gameport/gameport.c	2017-01-01 17:07:14.343318229 +0100
+@@ -91,13 +91,13 @@
  	tx = ~0;
  
  	for (i = 0; i < 50; i++) {
@@ -4552,7 +4467,7 @@ index 4a2a9e370be7..e970d9afd179 100644
  		udelay(i * 10);
  		t = (t2 - t1) - (t3 - t2);
  		if (t < tx)
-@@ -124,12 +124,12 @@ static int old_gameport_measure_speed(struct gameport *gameport)
+@@ -124,12 +124,12 @@
  	tx = 1 << 30;
  
  	for(i = 0; i < 50; i++) {
@@ -4567,7 +4482,7 @@ index 4a2a9e370be7..e970d9afd179 100644
  		udelay(i * 10);
  		if ((t = DELTA(t2,t1) - DELTA(t3,t2)) < tx) tx = t;
  	}
-@@ -148,11 +148,11 @@ static int old_gameport_measure_speed(struct gameport *gameport)
+@@ -148,11 +148,11 @@
  	tx = 1 << 30;
  
  	for(i = 0; i < 50; i++) {
@@ -4581,11 +4496,10 @@ index 4a2a9e370be7..e970d9afd179 100644
  		udelay(i * 10);
  		if (t2 - t1 < tx) tx = t2 - t1;
  	}
-diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
-index 96de97a46079..a6ec875d941b 100644
---- a/drivers/iommu/amd_iommu.c
-+++ b/drivers/iommu/amd_iommu.c
-@@ -1832,10 +1832,10 @@ static int __attach_device(struct iommu_dev_data *dev_data,
+diff -Nur linux-4.8.15.orig/drivers/iommu/amd_iommu.c linux-4.8.15/drivers/iommu/amd_iommu.c
+--- linux-4.8.15.orig/drivers/iommu/amd_iommu.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/iommu/amd_iommu.c	2017-01-01 17:07:14.403322093 +0100
+@@ -1835,10 +1835,10 @@
  	int ret;
  
  	/*
@@ -4599,7 +4513,7 @@ index 96de97a46079..a6ec875d941b 100644
  
  	/* lock domain */
  	spin_lock(&domain->lock);
-@@ -2003,10 +2003,10 @@ static void __detach_device(struct iommu_dev_data *dev_data)
+@@ -2006,10 +2006,10 @@
  	struct protection_domain *domain;
  
  	/*
@@ -4613,11 +4527,10 @@ index 96de97a46079..a6ec875d941b 100644
  
  	if (WARN_ON(!dev_data->domain))
  		return;
-diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
-index ebb5bf3ddbd9..598f5df45f6b 100644
---- a/drivers/iommu/intel-iommu.c
-+++ b/drivers/iommu/intel-iommu.c
-@@ -479,7 +479,7 @@ struct deferred_flush_data {
+diff -Nur linux-4.8.15.orig/drivers/iommu/intel-iommu.c linux-4.8.15/drivers/iommu/intel-iommu.c
+--- linux-4.8.15.orig/drivers/iommu/intel-iommu.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/iommu/intel-iommu.c	2017-01-01 17:07:14.443324672 +0100
+@@ -479,7 +479,7 @@
  	struct deferred_flush_table *tables;
  };
  
@@ -4626,7 +4539,7 @@ index ebb5bf3ddbd9..598f5df45f6b 100644
  
  /* bitmap for indexing intel_iommus */
  static int g_num_of_iommus;
-@@ -3626,10 +3626,8 @@ static void add_unmap(struct dmar_domain *dom, unsigned long iova_pfn,
+@@ -3649,10 +3649,8 @@
  	struct intel_iommu *iommu;
  	struct deferred_flush_entry *entry;
  	struct deferred_flush_data *flush_data;
@@ -4638,7 +4551,7 @@ index ebb5bf3ddbd9..598f5df45f6b 100644
  
  	/* Flush all CPUs' entries to avoid deferring too much.  If
  	 * this becomes a bottleneck, can just flush us, and rely on
-@@ -3662,8 +3660,6 @@ static void add_unmap(struct dmar_domain *dom, unsigned long iova_pfn,
+@@ -3685,8 +3683,6 @@
  	}
  	flush_data->size++;
  	spin_unlock_irqrestore(&flush_data->lock, flags);
@@ -4647,10 +4560,9 @@ index ebb5bf3ddbd9..598f5df45f6b 100644
  }
  
  static void intel_unmap(struct device *dev, dma_addr_t dev_addr, size_t size)
-diff --git a/drivers/iommu/iova.c b/drivers/iommu/iova.c
-index e23001bfcfee..359d5d169ec0 100644
---- a/drivers/iommu/iova.c
-+++ b/drivers/iommu/iova.c
+diff -Nur linux-4.8.15.orig/drivers/iommu/iova.c linux-4.8.15/drivers/iommu/iova.c
+--- linux-4.8.15.orig/drivers/iommu/iova.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/iommu/iova.c	2017-01-01 17:07:14.455325452 +0100
 @@ -22,6 +22,7 @@
  #include <linux/slab.h>
  #include <linux/smp.h>
@@ -4659,7 +4571,7 @@ index e23001bfcfee..359d5d169ec0 100644
  
  static bool iova_rcache_insert(struct iova_domain *iovad,
  			       unsigned long pfn,
-@@ -420,10 +421,8 @@ alloc_iova_fast(struct iova_domain *iovad, unsigned long size,
+@@ -420,10 +421,8 @@
  
  		/* Try replenishing IOVAs by flushing rcache. */
  		flushed_rcache = true;
@@ -4670,7 +4582,7 @@ index e23001bfcfee..359d5d169ec0 100644
  		goto retry;
  	}
  
-@@ -751,7 +750,7 @@ static bool __iova_rcache_insert(struct iova_domain *iovad,
+@@ -751,7 +750,7 @@
  	bool can_insert = false;
  	unsigned long flags;
  
@@ -4679,7 +4591,7 @@ index e23001bfcfee..359d5d169ec0 100644
  	spin_lock_irqsave(&cpu_rcache->lock, flags);
  
  	if (!iova_magazine_full(cpu_rcache->loaded)) {
-@@ -781,7 +780,6 @@ static bool __iova_rcache_insert(struct iova_domain *iovad,
+@@ -781,7 +780,6 @@
  		iova_magazine_push(cpu_rcache->loaded, iova_pfn);
  
  	spin_unlock_irqrestore(&cpu_rcache->lock, flags);
@@ -4687,7 +4599,7 @@ index e23001bfcfee..359d5d169ec0 100644
  
  	if (mag_to_free) {
  		iova_magazine_free_pfns(mag_to_free, iovad);
-@@ -815,7 +813,7 @@ static unsigned long __iova_rcache_get(struct iova_rcache *rcache,
+@@ -815,7 +813,7 @@
  	bool has_pfn = false;
  	unsigned long flags;
  
@@ -4696,7 +4608,7 @@ index e23001bfcfee..359d5d169ec0 100644
  	spin_lock_irqsave(&cpu_rcache->lock, flags);
  
  	if (!iova_magazine_empty(cpu_rcache->loaded)) {
-@@ -837,7 +835,6 @@ static unsigned long __iova_rcache_get(struct iova_rcache *rcache,
+@@ -837,7 +835,6 @@
  		iova_pfn = iova_magazine_pop(cpu_rcache->loaded, limit_pfn);
  
  	spin_unlock_irqrestore(&cpu_rcache->lock, flags);
@@ -4704,11 +4616,10 @@ index e23001bfcfee..359d5d169ec0 100644
  
  	return iova_pfn;
  }
-diff --git a/drivers/leds/trigger/Kconfig b/drivers/leds/trigger/Kconfig
-index 3f9ddb9fafa7..09da5b6b44a1 100644
---- a/drivers/leds/trigger/Kconfig
-+++ b/drivers/leds/trigger/Kconfig
-@@ -69,7 +69,7 @@ config LEDS_TRIGGER_BACKLIGHT
+diff -Nur linux-4.8.15.orig/drivers/leds/trigger/Kconfig linux-4.8.15/drivers/leds/trigger/Kconfig
+--- linux-4.8.15.orig/drivers/leds/trigger/Kconfig	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/leds/trigger/Kconfig	2017-01-01 17:07:14.495328021 +0100
+@@ -69,7 +69,7 @@
  
  config LEDS_TRIGGER_CPU
  	bool "LED CPU Trigger"
@@ -4717,10 +4628,9 @@ index 3f9ddb9fafa7..09da5b6b44a1 100644
  	help
  	  This allows LEDs to be controlled by active CPUs. This shows
  	  the active CPUs across an array of LEDs so you can see which
-diff --git a/drivers/md/bcache/Kconfig b/drivers/md/bcache/Kconfig
-index 4d200883c505..98b64ed5cb81 100644
---- a/drivers/md/bcache/Kconfig
-+++ b/drivers/md/bcache/Kconfig
+diff -Nur linux-4.8.15.orig/drivers/md/bcache/Kconfig linux-4.8.15/drivers/md/bcache/Kconfig
+--- linux-4.8.15.orig/drivers/md/bcache/Kconfig	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/md/bcache/Kconfig	2017-01-01 17:07:14.511329049 +0100
 @@ -1,6 +1,7 @@
  
  config BCACHE
@@ -4729,11 +4639,10 @@ index 4d200883c505..98b64ed5cb81 100644
  	---help---
  	Allows a block device to be used as cache for other devices; uses
  	a btree for indexing and the layout is optimized for SSDs.
-diff --git a/drivers/md/dm-rq.c b/drivers/md/dm-rq.c
-index 5da86c8b6545..2aa092f2977e 100644
---- a/drivers/md/dm-rq.c
-+++ b/drivers/md/dm-rq.c
-@@ -811,7 +811,7 @@ static void dm_old_request_fn(struct request_queue *q)
+diff -Nur linux-4.8.15.orig/drivers/md/dm-rq.c linux-4.8.15/drivers/md/dm-rq.c
+--- linux-4.8.15.orig/drivers/md/dm-rq.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/md/dm-rq.c	2017-01-01 17:07:14.515329315 +0100
+@@ -811,7 +811,7 @@
  		/* Establish tio->ti before queuing work (map_tio_request) */
  		tio->ti = ti;
  		queue_kthread_work(&md->kworker, &tio->work);
@@ -4742,11 +4651,10 @@ index 5da86c8b6545..2aa092f2977e 100644
  	}
  }
  
-diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
-index ee7fc3701700..ae59c9e13911 100644
---- a/drivers/md/raid5.c
-+++ b/drivers/md/raid5.c
-@@ -1928,8 +1928,9 @@ static void raid_run_ops(struct stripe_head *sh, unsigned long ops_request)
+diff -Nur linux-4.8.15.orig/drivers/md/raid5.c linux-4.8.15/drivers/md/raid5.c
+--- linux-4.8.15.orig/drivers/md/raid5.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/md/raid5.c	2017-01-01 17:07:14.555331893 +0100
+@@ -1928,8 +1928,9 @@
  	struct raid5_percpu *percpu;
  	unsigned long cpu;
  
@@ -4757,7 +4665,7 @@ index ee7fc3701700..ae59c9e13911 100644
  	if (test_bit(STRIPE_OP_BIOFILL, &ops_request)) {
  		ops_run_biofill(sh);
  		overlap_clear++;
-@@ -1985,7 +1986,8 @@ static void raid_run_ops(struct stripe_head *sh, unsigned long ops_request)
+@@ -1985,7 +1986,8 @@
  			if (test_and_clear_bit(R5_Overlap, &dev->flags))
  				wake_up(&sh->raid_conf->wait_for_overlap);
  		}
@@ -4767,7 +4675,7 @@ index ee7fc3701700..ae59c9e13911 100644
  }
  
  static struct stripe_head *alloc_stripe(struct kmem_cache *sc, gfp_t gfp,
-@@ -6438,6 +6440,7 @@ static int raid5_alloc_percpu(struct r5conf *conf)
+@@ -6438,6 +6440,7 @@
  			       __func__, cpu);
  			break;
  		}
@@ -4775,11 +4683,10 @@ index ee7fc3701700..ae59c9e13911 100644
  	}
  	put_online_cpus();
  
-diff --git a/drivers/md/raid5.h b/drivers/md/raid5.h
-index 517d4b68a1be..efe91887ecd7 100644
---- a/drivers/md/raid5.h
-+++ b/drivers/md/raid5.h
-@@ -504,6 +504,7 @@ struct r5conf {
+diff -Nur linux-4.8.15.orig/drivers/md/raid5.h linux-4.8.15/drivers/md/raid5.h
+--- linux-4.8.15.orig/drivers/md/raid5.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/md/raid5.h	2017-01-01 17:07:14.571332922 +0100
+@@ -504,6 +504,7 @@
  	int			recovery_disabled;
  	/* per cpu variables */
  	struct raid5_percpu {
@@ -4787,97 +4694,9 @@ index 517d4b68a1be..efe91887ecd7 100644
  		struct page	*spare_page; /* Used when checking P/Q in raid6 */
  		struct flex_array *scribble;   /* space for constructing buffer
  					      * lists and performing address
-diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
-index d00252828966..9faab404faac 100644
---- a/drivers/misc/Kconfig
-+++ b/drivers/misc/Kconfig
-@@ -54,6 +54,7 @@ config AD525X_DPOT_SPI
- config ATMEL_TCLIB
- 	bool "Atmel AT32/AT91 Timer/Counter Library"
- 	depends on (AVR32 || ARCH_AT91)
-+	default y if PREEMPT_RT_FULL
- 	help
- 	  Select this if you want a library to allocate the Timer/Counter
- 	  blocks found on many Atmel processors.  This facilitates using
-@@ -69,8 +70,7 @@ config ATMEL_TCB_CLKSRC
- 	  are combined to make a single 32-bit timer.
- 
- 	  When GENERIC_CLOCKEVENTS is defined, the third timer channel
--	  may be used as a clock event device supporting oneshot mode
--	  (delays of up to two seconds) based on the 32 KiHz clock.
-+	  may be used as a clock event device supporting oneshot mode.
- 
- config ATMEL_TCB_CLKSRC_BLOCK
- 	int
-@@ -84,6 +84,15 @@ config ATMEL_TCB_CLKSRC_BLOCK
- 	  TC can be used for other purposes, such as PWM generation and
- 	  interval timing.
- 
-+config ATMEL_TCB_CLKSRC_USE_SLOW_CLOCK
-+	bool "TC Block use 32 KiHz clock"
-+	depends on ATMEL_TCB_CLKSRC
-+	default y if !PREEMPT_RT_FULL
-+	help
-+	  Select this to use 32 KiHz base clock rate as TC block clock
-+	  source for clock events.
-+
-+
- config DUMMY_IRQ
- 	tristate "Dummy IRQ handler"
- 	default n
-@@ -114,6 +123,35 @@ config IBM_ASM
- 	  for information on the specific driver level and support statement
- 	  for your IBM server.
- 
-+config HWLAT_DETECTOR
-+	tristate "Testing module to detect hardware-induced latencies"
-+	depends on DEBUG_FS
-+	depends on RING_BUFFER
-+	default m
-+	---help---
-+	  A simple hardware latency detector. Use this module to detect
-+	  large latencies introduced by the behavior of the underlying
-+	  system firmware external to Linux. We do this using periodic
-+	  use of stop_machine to grab all available CPUs and measure
-+	  for unexplainable gaps in the CPU timestamp counter(s). By
-+	  default, the module is not enabled until the "enable" file
-+	  within the "hwlat_detector" debugfs directory is toggled.
-+
-+	  This module is often used to detect SMI (System Management
-+	  Interrupts) on x86 systems, though is not x86 specific. To
-+	  this end, we default to using a sample window of 1 second,
-+	  during which we will sample for 0.5 seconds. If an SMI or
-+	  similar event occurs during that time, it is recorded
-+	  into an 8K samples global ring buffer until retreived.
-+
-+	  WARNING: This software should never be enabled (it can be built
-+	  but should not be turned on after it is loaded) in a production
-+	  environment where high latencies are a concern since the
-+	  sampling mechanism actually introduces latencies for
-+	  regular tasks while the CPU(s) are being held.
-+
-+	  If unsure, say N
-+
- config PHANTOM
- 	tristate "Sensable PHANToM (PCI)"
- 	depends on PCI
-diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
-index fb32516ddfe2..8643df9af3c4 100644
---- a/drivers/misc/Makefile
-+++ b/drivers/misc/Makefile
-@@ -38,6 +38,7 @@ obj-$(CONFIG_C2PORT)		+= c2port/
- obj-$(CONFIG_HMC6352)		+= hmc6352.o
- obj-y				+= eeprom/
- obj-y				+= cb710/
-+obj-$(CONFIG_HWLAT_DETECTOR)	+= hwlat_detector.o
- obj-$(CONFIG_SPEAR13XX_PCIE_GADGET)	+= spear13xx_pcie_gadget.o
- obj-$(CONFIG_VMWARE_BALLOON)	+= vmw_balloon.o
- obj-$(CONFIG_ARM_CHARLCD)	+= arm-charlcd.o
-diff --git a/drivers/misc/hwlat_detector.c b/drivers/misc/hwlat_detector.c
-new file mode 100644
-index 000000000000..52f5ad5fd9c0
---- /dev/null
-+++ b/drivers/misc/hwlat_detector.c
+diff -Nur linux-4.8.15.orig/drivers/misc/hwlat_detector.c linux-4.8.15/drivers/misc/hwlat_detector.c
+--- linux-4.8.15.orig/drivers/misc/hwlat_detector.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-4.8.15/drivers/misc/hwlat_detector.c	2017-01-01 17:07:14.579333432 +0100
 @@ -0,0 +1,1240 @@
 +/*
 + * hwlat_detector.c - A simple Hardware Latency detector.
@@ -6119,11 +5938,94 @@ index 000000000000..52f5ad5fd9c0
 +
 +module_init(detector_init);
 +module_exit(detector_exit);
-diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
-index df990bb8c873..1a162709a85e 100644
---- a/drivers/mmc/host/mmci.c
-+++ b/drivers/mmc/host/mmci.c
-@@ -1147,15 +1147,12 @@ static irqreturn_t mmci_pio_irq(int irq, void *dev_id)
+diff -Nur linux-4.8.15.orig/drivers/misc/Kconfig linux-4.8.15/drivers/misc/Kconfig
+--- linux-4.8.15.orig/drivers/misc/Kconfig	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/misc/Kconfig	2017-01-01 17:07:14.579333432 +0100
+@@ -54,6 +54,7 @@
+ config ATMEL_TCLIB
+ 	bool "Atmel AT32/AT91 Timer/Counter Library"
+ 	depends on (AVR32 || ARCH_AT91)
++	default y if PREEMPT_RT_FULL
+ 	help
+ 	  Select this if you want a library to allocate the Timer/Counter
+ 	  blocks found on many Atmel processors.  This facilitates using
+@@ -69,8 +70,7 @@
+ 	  are combined to make a single 32-bit timer.
+ 
+ 	  When GENERIC_CLOCKEVENTS is defined, the third timer channel
+-	  may be used as a clock event device supporting oneshot mode
+-	  (delays of up to two seconds) based on the 32 KiHz clock.
++	  may be used as a clock event device supporting oneshot mode.
+ 
+ config ATMEL_TCB_CLKSRC_BLOCK
+ 	int
+@@ -84,6 +84,15 @@
+ 	  TC can be used for other purposes, such as PWM generation and
+ 	  interval timing.
+ 
++config ATMEL_TCB_CLKSRC_USE_SLOW_CLOCK
++	bool "TC Block use 32 KiHz clock"
++	depends on ATMEL_TCB_CLKSRC
++	default y if !PREEMPT_RT_FULL
++	help
++	  Select this to use 32 KiHz base clock rate as TC block clock
++	  source for clock events.
++
++
+ config DUMMY_IRQ
+ 	tristate "Dummy IRQ handler"
+ 	default n
+@@ -114,6 +123,35 @@
+ 	  for information on the specific driver level and support statement
+ 	  for your IBM server.
+ 
++config HWLAT_DETECTOR
++	tristate "Testing module to detect hardware-induced latencies"
++	depends on DEBUG_FS
++	depends on RING_BUFFER
++	default m
++	---help---
++	  A simple hardware latency detector. Use this module to detect
++	  large latencies introduced by the behavior of the underlying
++	  system firmware external to Linux. We do this using periodic
++	  use of stop_machine to grab all available CPUs and measure
++	  for unexplainable gaps in the CPU timestamp counter(s). By
++	  default, the module is not enabled until the "enable" file
++	  within the "hwlat_detector" debugfs directory is toggled.
++
++	  This module is often used to detect SMI (System Management
++	  Interrupts) on x86 systems, though is not x86 specific. To
++	  this end, we default to using a sample window of 1 second,
++	  during which we will sample for 0.5 seconds. If an SMI or
++	  similar event occurs during that time, it is recorded
++	  into an 8K samples global ring buffer until retreived.
++
++	  WARNING: This software should never be enabled (it can be built
++	  but should not be turned on after it is loaded) in a production
++	  environment where high latencies are a concern since the
++	  sampling mechanism actually introduces latencies for
++	  regular tasks while the CPU(s) are being held.
++
++	  If unsure, say N
++
+ config PHANTOM
+ 	tristate "Sensable PHANToM (PCI)"
+ 	depends on PCI
+diff -Nur linux-4.8.15.orig/drivers/misc/Makefile linux-4.8.15/drivers/misc/Makefile
+--- linux-4.8.15.orig/drivers/misc/Makefile	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/misc/Makefile	2017-01-01 17:07:14.579333432 +0100
+@@ -38,6 +38,7 @@
+ obj-$(CONFIG_HMC6352)		+= hmc6352.o
+ obj-y				+= eeprom/
+ obj-y				+= cb710/
++obj-$(CONFIG_HWLAT_DETECTOR)	+= hwlat_detector.o
+ obj-$(CONFIG_SPEAR13XX_PCIE_GADGET)	+= spear13xx_pcie_gadget.o
+ obj-$(CONFIG_VMWARE_BALLOON)	+= vmw_balloon.o
+ obj-$(CONFIG_ARM_CHARLCD)	+= arm-charlcd.o
+diff -Nur linux-4.8.15.orig/drivers/mmc/host/mmci.c linux-4.8.15/drivers/mmc/host/mmci.c
+--- linux-4.8.15.orig/drivers/mmc/host/mmci.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/mmc/host/mmci.c	2017-01-01 17:07:14.591334201 +0100
+@@ -1147,15 +1147,12 @@
  	struct sg_mapping_iter *sg_miter = &host->sg_miter;
  	struct variant_data *variant = host->variant;
  	void __iomem *base = host->base;
@@ -6139,7 +6041,7 @@ index df990bb8c873..1a162709a85e 100644
  	do {
  		unsigned int remain, len;
  		char *buffer;
-@@ -1195,8 +1192,6 @@ static irqreturn_t mmci_pio_irq(int irq, void *dev_id)
+@@ -1195,8 +1192,6 @@
  
  	sg_miter_stop(sg_miter);
  
@@ -6148,11 +6050,10 @@ index df990bb8c873..1a162709a85e 100644
  	/*
  	 * If we have less than the fifo 'half-full' threshold to transfer,
  	 * trigger a PIO interrupt as soon as any data is available.
-diff --git a/drivers/net/ethernet/3com/3c59x.c b/drivers/net/ethernet/3com/3c59x.c
-index 25c55ab05c7d..5a1d117a8744 100644
---- a/drivers/net/ethernet/3com/3c59x.c
-+++ b/drivers/net/ethernet/3com/3c59x.c
-@@ -842,9 +842,9 @@ static void poll_vortex(struct net_device *dev)
+diff -Nur linux-4.8.15.orig/drivers/net/ethernet/3com/3c59x.c linux-4.8.15/drivers/net/ethernet/3com/3c59x.c
+--- linux-4.8.15.orig/drivers/net/ethernet/3com/3c59x.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/net/ethernet/3com/3c59x.c	2017-01-01 17:07:14.611335500 +0100
+@@ -842,9 +842,9 @@
  {
  	struct vortex_private *vp = netdev_priv(dev);
  	unsigned long flags;
@@ -6164,7 +6065,7 @@ index 25c55ab05c7d..5a1d117a8744 100644
  }
  #endif
  
-@@ -1910,12 +1910,12 @@ static void vortex_tx_timeout(struct net_device *dev)
+@@ -1910,12 +1910,12 @@
  			 * Block interrupts because vortex_interrupt does a bare spin_lock()
  			 */
  			unsigned long flags;
@@ -6179,11 +6080,10 @@ index 25c55ab05c7d..5a1d117a8744 100644
  		}
  	}
  
-diff --git a/drivers/net/ethernet/realtek/8139too.c b/drivers/net/ethernet/realtek/8139too.c
-index da4c2d8a4173..1420dfb56bac 100644
---- a/drivers/net/ethernet/realtek/8139too.c
-+++ b/drivers/net/ethernet/realtek/8139too.c
-@@ -2233,7 +2233,7 @@ static void rtl8139_poll_controller(struct net_device *dev)
+diff -Nur linux-4.8.15.orig/drivers/net/ethernet/realtek/8139too.c linux-4.8.15/drivers/net/ethernet/realtek/8139too.c
+--- linux-4.8.15.orig/drivers/net/ethernet/realtek/8139too.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/net/ethernet/realtek/8139too.c	2017-01-01 17:07:14.639337303 +0100
+@@ -2233,7 +2233,7 @@
  	struct rtl8139_private *tp = netdev_priv(dev);
  	const int irq = tp->pci_dev->irq;
  
@@ -6192,11 +6092,10 @@ index da4c2d8a4173..1420dfb56bac 100644
  	rtl8139_interrupt(irq, dev);
  	enable_irq(irq);
  }
-diff --git a/drivers/net/wireless/intersil/orinoco/orinoco_usb.c b/drivers/net/wireless/intersil/orinoco/orinoco_usb.c
-index 56f109bc8394..02afc796bc71 100644
---- a/drivers/net/wireless/intersil/orinoco/orinoco_usb.c
-+++ b/drivers/net/wireless/intersil/orinoco/orinoco_usb.c
-@@ -697,7 +697,7 @@ static void ezusb_req_ctx_wait(struct ezusb_priv *upriv,
+diff -Nur linux-4.8.15.orig/drivers/net/wireless/intersil/orinoco/orinoco_usb.c linux-4.8.15/drivers/net/wireless/intersil/orinoco/orinoco_usb.c
+--- linux-4.8.15.orig/drivers/net/wireless/intersil/orinoco/orinoco_usb.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/net/wireless/intersil/orinoco/orinoco_usb.c	2017-01-01 17:07:14.687340389 +0100
+@@ -697,7 +697,7 @@
  			while (!ctx->done.done && msecs--)
  				udelay(1000);
  		} else {
@@ -6205,11 +6104,10 @@ index 56f109bc8394..02afc796bc71 100644
  						 ctx->done.done);
  		}
  		break;
-diff --git a/drivers/pci/access.c b/drivers/pci/access.c
-index d11cdbb8fba3..223bbb9acb03 100644
---- a/drivers/pci/access.c
-+++ b/drivers/pci/access.c
-@@ -672,7 +672,7 @@ void pci_cfg_access_unlock(struct pci_dev *dev)
+diff -Nur linux-4.8.15.orig/drivers/pci/access.c linux-4.8.15/drivers/pci/access.c
+--- linux-4.8.15.orig/drivers/pci/access.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/pci/access.c	2017-01-01 17:07:14.699341161 +0100
+@@ -672,7 +672,7 @@
  	WARN_ON(!dev->block_cfg_access);
  
  	dev->block_cfg_access = 0;
@@ -6218,11 +6116,10 @@ index d11cdbb8fba3..223bbb9acb03 100644
  	raw_spin_unlock_irqrestore(&pci_lock, flags);
  }
  EXPORT_SYMBOL_GPL(pci_cfg_access_unlock);
-diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c
-index 9bd41a35a78a..8e2d436c2e3f 100644
---- a/drivers/scsi/fcoe/fcoe.c
-+++ b/drivers/scsi/fcoe/fcoe.c
-@@ -1455,11 +1455,11 @@ static int fcoe_rcv(struct sk_buff *skb, struct net_device *netdev,
+diff -Nur linux-4.8.15.orig/drivers/scsi/fcoe/fcoe.c linux-4.8.15/drivers/scsi/fcoe/fcoe.c
+--- linux-4.8.15.orig/drivers/scsi/fcoe/fcoe.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/scsi/fcoe/fcoe.c	2017-01-01 17:07:14.719342449 +0100
+@@ -1455,11 +1455,11 @@
  static int fcoe_alloc_paged_crc_eof(struct sk_buff *skb, int tlen)
  {
  	struct fcoe_percpu_s *fps;
@@ -6237,7 +6134,7 @@ index 9bd41a35a78a..8e2d436c2e3f 100644
  
  	return rc;
  }
-@@ -1646,11 +1646,11 @@ static inline int fcoe_filter_frames(struct fc_lport *lport,
+@@ -1646,11 +1646,11 @@
  		return 0;
  	}
  
@@ -6251,7 +6148,7 @@ index 9bd41a35a78a..8e2d436c2e3f 100644
  	return -EINVAL;
  }
  
-@@ -1693,7 +1693,7 @@ static void fcoe_recv_frame(struct sk_buff *skb)
+@@ -1693,7 +1693,7 @@
  	 */
  	hp = (struct fcoe_hdr *) skb_network_header(skb);
  
@@ -6260,7 +6157,7 @@ index 9bd41a35a78a..8e2d436c2e3f 100644
  	if (unlikely(FC_FCOE_DECAPS_VER(hp) != FC_FCOE_VER)) {
  		if (stats->ErrorFrames < 5)
  			printk(KERN_WARNING "fcoe: FCoE version "
-@@ -1725,13 +1725,13 @@ static void fcoe_recv_frame(struct sk_buff *skb)
+@@ -1725,13 +1725,13 @@
  		goto drop;
  
  	if (!fcoe_filter_frames(lport, fp)) {
@@ -6276,11 +6173,10 @@ index 9bd41a35a78a..8e2d436c2e3f 100644
  	kfree_skb(skb);
  }
  
-diff --git a/drivers/scsi/fcoe/fcoe_ctlr.c b/drivers/scsi/fcoe/fcoe_ctlr.c
-index dcf36537a767..1a1f2e46452c 100644
---- a/drivers/scsi/fcoe/fcoe_ctlr.c
-+++ b/drivers/scsi/fcoe/fcoe_ctlr.c
-@@ -834,7 +834,7 @@ static unsigned long fcoe_ctlr_age_fcfs(struct fcoe_ctlr *fip)
+diff -Nur linux-4.8.15.orig/drivers/scsi/fcoe/fcoe_ctlr.c linux-4.8.15/drivers/scsi/fcoe/fcoe_ctlr.c
+--- linux-4.8.15.orig/drivers/scsi/fcoe/fcoe_ctlr.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/scsi/fcoe/fcoe_ctlr.c	2017-01-01 17:07:14.727342965 +0100
+@@ -834,7 +834,7 @@
  
  	INIT_LIST_HEAD(&del_list);
  
@@ -6289,7 +6185,7 @@ index dcf36537a767..1a1f2e46452c 100644
  
  	list_for_each_entry_safe(fcf, next, &fip->fcfs, list) {
  		deadline = fcf->time + fcf->fka_period + fcf->fka_period / 2;
-@@ -870,7 +870,7 @@ static unsigned long fcoe_ctlr_age_fcfs(struct fcoe_ctlr *fip)
+@@ -870,7 +870,7 @@
  				sel_time = fcf->time;
  		}
  	}
@@ -6298,11 +6194,10 @@ index dcf36537a767..1a1f2e46452c 100644
  
  	list_for_each_entry_safe(fcf, next, &del_list, list) {
  		/* Removes fcf from current list */
-diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
-index e72673b0a8fb..da598a6caa22 100644
---- a/drivers/scsi/libfc/fc_exch.c
-+++ b/drivers/scsi/libfc/fc_exch.c
-@@ -814,10 +814,10 @@ static struct fc_exch *fc_exch_em_alloc(struct fc_lport *lport,
+diff -Nur linux-4.8.15.orig/drivers/scsi/libfc/fc_exch.c linux-4.8.15/drivers/scsi/libfc/fc_exch.c
+--- linux-4.8.15.orig/drivers/scsi/libfc/fc_exch.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/scsi/libfc/fc_exch.c	2017-01-01 17:07:14.747344253 +0100
+@@ -814,10 +814,10 @@
  	}
  	memset(ep, 0, sizeof(*ep));
  
@@ -6315,11 +6210,10 @@ index e72673b0a8fb..da598a6caa22 100644
  
  	/* peek cache of free slot */
  	if (pool->left != FC_XID_UNKNOWN) {
-diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
-index 763f012fdeca..d0f61b595470 100644
---- a/drivers/scsi/libsas/sas_ata.c
-+++ b/drivers/scsi/libsas/sas_ata.c
-@@ -190,7 +190,7 @@ static unsigned int sas_ata_qc_issue(struct ata_queued_cmd *qc)
+diff -Nur linux-4.8.15.orig/drivers/scsi/libsas/sas_ata.c linux-4.8.15/drivers/scsi/libsas/sas_ata.c
+--- linux-4.8.15.orig/drivers/scsi/libsas/sas_ata.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/scsi/libsas/sas_ata.c	2017-01-01 17:07:14.791347085 +0100
+@@ -190,7 +190,7 @@
  	/* TODO: audit callers to ensure they are ready for qc_issue to
  	 * unconditionally re-enable interrupts
  	 */
@@ -6328,7 +6222,7 @@ index 763f012fdeca..d0f61b595470 100644
  	spin_unlock(ap->lock);
  
  	/* If the device fell off, no sense in issuing commands */
-@@ -252,7 +252,7 @@ static unsigned int sas_ata_qc_issue(struct ata_queued_cmd *qc)
+@@ -252,7 +252,7 @@
  
   out:
  	spin_lock(ap->lock);
@@ -6337,11 +6231,10 @@ index 763f012fdeca..d0f61b595470 100644
  	return ret;
  }
  
-diff --git a/drivers/scsi/qla2xxx/qla_inline.h b/drivers/scsi/qla2xxx/qla_inline.h
-index edc48f3b8230..ee5c6f9dfb6f 100644
---- a/drivers/scsi/qla2xxx/qla_inline.h
-+++ b/drivers/scsi/qla2xxx/qla_inline.h
-@@ -59,12 +59,12 @@ qla2x00_poll(struct rsp_que *rsp)
+diff -Nur linux-4.8.15.orig/drivers/scsi/qla2xxx/qla_inline.h linux-4.8.15/drivers/scsi/qla2xxx/qla_inline.h
+--- linux-4.8.15.orig/drivers/scsi/qla2xxx/qla_inline.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/scsi/qla2xxx/qla_inline.h	2017-01-01 17:07:14.807348125 +0100
+@@ -59,12 +59,12 @@
  {
  	unsigned long flags;
  	struct qla_hw_data *ha = rsp->hw;
@@ -6356,11 +6249,10 @@ index edc48f3b8230..ee5c6f9dfb6f 100644
  }
  
  static inline uint8_t *
-diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
-index 987f1c729e9c..18391e07d70f 100644
---- a/drivers/scsi/qla2xxx/qla_isr.c
-+++ b/drivers/scsi/qla2xxx/qla_isr.c
-@@ -3125,7 +3125,11 @@ qla24xx_enable_msix(struct qla_hw_data *ha, struct rsp_que *rsp)
+diff -Nur linux-4.8.15.orig/drivers/scsi/qla2xxx/qla_isr.c linux-4.8.15/drivers/scsi/qla2xxx/qla_isr.c
+--- linux-4.8.15.orig/drivers/scsi/qla2xxx/qla_isr.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/scsi/qla2xxx/qla_isr.c	2017-01-01 17:07:14.831349662 +0100
+@@ -3125,7 +3125,11 @@
  		* kref_put().
  		*/
  		kref_get(&qentry->irq_notify.kref);
@@ -6372,10 +6264,9 @@ index 987f1c729e9c..18391e07d70f 100644
  	}
  
  	/*
-diff --git a/drivers/thermal/x86_pkg_temp_thermal.c b/drivers/thermal/x86_pkg_temp_thermal.c
-index 97f0a2bd93ed..a4f45aaa9ad4 100644
---- a/drivers/thermal/x86_pkg_temp_thermal.c
-+++ b/drivers/thermal/x86_pkg_temp_thermal.c
+diff -Nur linux-4.8.15.orig/drivers/thermal/x86_pkg_temp_thermal.c linux-4.8.15/drivers/thermal/x86_pkg_temp_thermal.c
+--- linux-4.8.15.orig/drivers/thermal/x86_pkg_temp_thermal.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/thermal/x86_pkg_temp_thermal.c	2017-01-01 17:07:14.843350438 +0100
 @@ -29,6 +29,7 @@
  #include <linux/pm.h>
  #include <linux/thermal.h>
@@ -6384,7 +6275,7 @@ index 97f0a2bd93ed..a4f45aaa9ad4 100644
  #include <asm/cpu_device_id.h>
  #include <asm/mce.h>
  
-@@ -352,7 +353,7 @@ static void pkg_temp_thermal_threshold_work_fn(struct work_struct *work)
+@@ -352,7 +353,7 @@
  	}
  }
  
@@ -6393,7 +6284,7 @@ index 97f0a2bd93ed..a4f45aaa9ad4 100644
  {
  	unsigned long flags;
  	int cpu = smp_processor_id();
-@@ -369,7 +370,7 @@ static int pkg_temp_thermal_platform_thermal_notify(__u64 msr_val)
+@@ -369,7 +370,7 @@
  			pkg_work_scheduled[phy_id]) {
  		disable_pkg_thres_interrupt();
  		spin_unlock_irqrestore(&pkg_work_lock, flags);
@@ -6402,7 +6293,7 @@ index 97f0a2bd93ed..a4f45aaa9ad4 100644
  	}
  	pkg_work_scheduled[phy_id] = 1;
  	spin_unlock_irqrestore(&pkg_work_lock, flags);
-@@ -378,9 +379,48 @@ static int pkg_temp_thermal_platform_thermal_notify(__u64 msr_val)
+@@ -378,9 +379,48 @@
  	schedule_delayed_work_on(cpu,
  				&per_cpu(pkg_temp_thermal_threshold_work, cpu),
  				msecs_to_jiffies(notify_delay_ms));
@@ -6451,7 +6342,7 @@ index 97f0a2bd93ed..a4f45aaa9ad4 100644
  static int find_siblings_cpu(int cpu)
  {
  	int i;
-@@ -584,6 +624,9 @@ static int __init pkg_temp_thermal_init(void)
+@@ -584,6 +624,9 @@
  	if (!x86_match_cpu(pkg_temp_thermal_ids))
  		return -ENODEV;
  
@@ -6461,7 +6352,7 @@ index 97f0a2bd93ed..a4f45aaa9ad4 100644
  	spin_lock_init(&pkg_work_lock);
  	platform_thermal_package_notify =
  			pkg_temp_thermal_platform_thermal_notify;
-@@ -608,7 +651,7 @@ static int __init pkg_temp_thermal_init(void)
+@@ -608,7 +651,7 @@
  	kfree(pkg_work_scheduled);
  	platform_thermal_package_notify = NULL;
  	platform_thermal_package_rate_control = NULL;
@@ -6470,7 +6361,7 @@ index 97f0a2bd93ed..a4f45aaa9ad4 100644
  	return -ENODEV;
  }
  
-@@ -633,6 +676,7 @@ static void __exit pkg_temp_thermal_exit(void)
+@@ -633,6 +676,7 @@
  	mutex_unlock(&phy_dev_list_mutex);
  	platform_thermal_package_notify = NULL;
  	platform_thermal_package_rate_control = NULL;
@@ -6478,11 +6369,10 @@ index 97f0a2bd93ed..a4f45aaa9ad4 100644
  	for_each_online_cpu(i)
  		cancel_delayed_work_sync(
  			&per_cpu(pkg_temp_thermal_threshold_work, i));
-diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c
-index dcf43f66404f..a9ae57122841 100644
---- a/drivers/tty/serial/8250/8250_core.c
-+++ b/drivers/tty/serial/8250/8250_core.c
-@@ -58,7 +58,16 @@ static struct uart_driver serial8250_reg;
+diff -Nur linux-4.8.15.orig/drivers/tty/serial/8250/8250_core.c linux-4.8.15/drivers/tty/serial/8250/8250_core.c
+--- linux-4.8.15.orig/drivers/tty/serial/8250/8250_core.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/tty/serial/8250/8250_core.c	2017-01-01 17:07:14.859351469 +0100
+@@ -58,7 +58,16 @@
  
  static unsigned int skip_txen_test; /* force skip of txen test at init time */
  
@@ -6500,10 +6390,9 @@ index dcf43f66404f..a9ae57122841 100644
  
  #include <asm/serial.h>
  /*
-diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c
-index 858a54633664..fc44fb59aef6 100644
---- a/drivers/tty/serial/8250/8250_port.c
-+++ b/drivers/tty/serial/8250/8250_port.c
+diff -Nur linux-4.8.15.orig/drivers/tty/serial/8250/8250_port.c linux-4.8.15/drivers/tty/serial/8250/8250_port.c
+--- linux-4.8.15.orig/drivers/tty/serial/8250/8250_port.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/tty/serial/8250/8250_port.c	2017-01-01 17:07:14.895353784 +0100
 @@ -35,6 +35,7 @@
  #include <linux/nmi.h>
  #include <linux/mutex.h>
@@ -6512,7 +6401,7 @@ index 858a54633664..fc44fb59aef6 100644
  #include <linux/uaccess.h>
  #include <linux/pm_runtime.h>
  #include <linux/timer.h>
-@@ -3109,9 +3110,9 @@ void serial8250_console_write(struct uart_8250_port *up, const char *s,
+@@ -3109,9 +3110,9 @@
  
  	serial8250_rpm_get(up);
  
@@ -6524,11 +6413,10 @@ index 858a54633664..fc44fb59aef6 100644
  		locked = spin_trylock_irqsave(&port->lock, flags);
  	else
  		spin_lock_irqsave(&port->lock, flags);
-diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
-index 8a9e213387a7..dd1f9a426b74 100644
---- a/drivers/tty/serial/amba-pl011.c
-+++ b/drivers/tty/serial/amba-pl011.c
-@@ -2167,13 +2167,19 @@ pl011_console_write(struct console *co, const char *s, unsigned int count)
+diff -Nur linux-4.8.15.orig/drivers/tty/serial/amba-pl011.c linux-4.8.15/drivers/tty/serial/amba-pl011.c
+--- linux-4.8.15.orig/drivers/tty/serial/amba-pl011.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/tty/serial/amba-pl011.c	2017-01-01 17:07:15.011361259 +0100
+@@ -2167,13 +2167,19 @@
  
  	clk_enable(uap->clk);
  
@@ -6551,7 +6439,7 @@ index 8a9e213387a7..dd1f9a426b74 100644
  
  	/*
  	 *	First save the CR then disable the interrupts
-@@ -2197,8 +2203,7 @@ pl011_console_write(struct console *co, const char *s, unsigned int count)
+@@ -2197,8 +2203,7 @@
  		pl011_write(old_cr, uap, REG_CR);
  
  	if (locked)
@@ -6561,11 +6449,10 @@ index 8a9e213387a7..dd1f9a426b74 100644
  
  	clk_disable(uap->clk);
  }
-diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
-index a2a529994ba5..0ee7c4c518df 100644
---- a/drivers/tty/serial/omap-serial.c
-+++ b/drivers/tty/serial/omap-serial.c
-@@ -1257,13 +1257,10 @@ serial_omap_console_write(struct console *co, const char *s,
+diff -Nur linux-4.8.15.orig/drivers/tty/serial/omap-serial.c linux-4.8.15/drivers/tty/serial/omap-serial.c
+--- linux-4.8.15.orig/drivers/tty/serial/omap-serial.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/tty/serial/omap-serial.c	2017-01-01 17:07:15.019361774 +0100
+@@ -1257,13 +1257,10 @@
  
  	pm_runtime_get_sync(up->dev);
  
@@ -6582,7 +6469,7 @@ index a2a529994ba5..0ee7c4c518df 100644
  
  	/*
  	 * First save the IER then disable the interrupts
-@@ -1292,8 +1289,7 @@ serial_omap_console_write(struct console *co, const char *s,
+@@ -1292,8 +1289,7 @@
  	pm_runtime_mark_last_busy(up->dev);
  	pm_runtime_put_autosuspend(up->dev);
  	if (locked)
@@ -6592,11 +6479,10 @@ index a2a529994ba5..0ee7c4c518df 100644
  }
  
  static int __init
-diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c
-index f36e6df2fa90..e086ea4d2997 100644
---- a/drivers/tty/serial/sc16is7xx.c
-+++ b/drivers/tty/serial/sc16is7xx.c
-@@ -1240,7 +1240,7 @@ static int sc16is7xx_probe(struct device *dev,
+diff -Nur linux-4.8.15.orig/drivers/tty/serial/sc16is7xx.c linux-4.8.15/drivers/tty/serial/sc16is7xx.c
+--- linux-4.8.15.orig/drivers/tty/serial/sc16is7xx.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/tty/serial/sc16is7xx.c	2017-01-01 17:07:15.027362288 +0100
+@@ -1240,7 +1240,7 @@
  
  	/* Setup interrupt */
  	ret = devm_request_irq(dev, irq, sc16is7xx_irq,
@@ -6605,11 +6491,10 @@ index f36e6df2fa90..e086ea4d2997 100644
  	if (!ret)
  		return 0;
  
-diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
-index d2e3f655c26f..fdd027a9bbd7 100644
---- a/drivers/usb/core/hcd.c
-+++ b/drivers/usb/core/hcd.c
-@@ -1760,9 +1760,9 @@ static void __usb_hcd_giveback_urb(struct urb *urb)
+diff -Nur linux-4.8.15.orig/drivers/usb/core/hcd.c linux-4.8.15/drivers/usb/core/hcd.c
+--- linux-4.8.15.orig/drivers/usb/core/hcd.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/usb/core/hcd.c	2017-01-01 17:07:15.051363831 +0100
+@@ -1760,9 +1760,9 @@
  	 * and no one may trigger the above deadlock situation when
  	 * running complete() in tasklet.
  	 */
@@ -6621,11 +6506,10 @@ index d2e3f655c26f..fdd027a9bbd7 100644
  
  	usb_anchor_resume_wakeups(anchor);
  	atomic_dec(&urb->use_count);
-diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c
-index 5c8429f23a89..fa835fb1a186 100644
---- a/drivers/usb/gadget/function/f_fs.c
-+++ b/drivers/usb/gadget/function/f_fs.c
-@@ -1509,7 +1509,7 @@ static void ffs_data_put(struct ffs_data *ffs)
+diff -Nur linux-4.8.15.orig/drivers/usb/gadget/function/f_fs.c linux-4.8.15/drivers/usb/gadget/function/f_fs.c
+--- linux-4.8.15.orig/drivers/usb/gadget/function/f_fs.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/usb/gadget/function/f_fs.c	2017-01-01 17:07:15.079365638 +0100
+@@ -1590,7 +1590,7 @@
  		pr_info("%s(): freeing\n", __func__);
  		ffs_data_clear(ffs);
  		BUG_ON(waitqueue_active(&ffs->ev.waitq) ||
@@ -6634,11 +6518,10 @@ index 5c8429f23a89..fa835fb1a186 100644
  		kfree(ffs->dev_name);
  		kfree(ffs);
  	}
-diff --git a/drivers/usb/gadget/legacy/inode.c b/drivers/usb/gadget/legacy/inode.c
-index 16104b5ebdcb..5c506c2b88ad 100644
---- a/drivers/usb/gadget/legacy/inode.c
-+++ b/drivers/usb/gadget/legacy/inode.c
-@@ -346,7 +346,7 @@ ep_io (struct ep_data *epdata, void *buf, unsigned len)
+diff -Nur linux-4.8.15.orig/drivers/usb/gadget/legacy/inode.c linux-4.8.15/drivers/usb/gadget/legacy/inode.c
+--- linux-4.8.15.orig/drivers/usb/gadget/legacy/inode.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/drivers/usb/gadget/legacy/inode.c	2017-01-01 17:07:15.107367440 +0100
+@@ -346,7 +346,7 @@
  	spin_unlock_irq (&epdata->dev->lock);
  
  	if (likely (value == 0)) {
@@ -6647,7 +6530,7 @@ index 16104b5ebdcb..5c506c2b88ad 100644
  		if (value != 0) {
  			spin_lock_irq (&epdata->dev->lock);
  			if (likely (epdata->ep != NULL)) {
-@@ -355,7 +355,7 @@ ep_io (struct ep_data *epdata, void *buf, unsigned len)
+@@ -355,7 +355,7 @@
  				usb_ep_dequeue (epdata->ep, epdata->req);
  				spin_unlock_irq (&epdata->dev->lock);
  
@@ -6656,10 +6539,9 @@ index 16104b5ebdcb..5c506c2b88ad 100644
  				if (epdata->status == -ECONNRESET)
  					epdata->status = -EINTR;
  			} else {
-diff --git a/fs/aio.c b/fs/aio.c
-index 4fe81d1c60f9..e68c06a4a017 100644
---- a/fs/aio.c
-+++ b/fs/aio.c
+diff -Nur linux-4.8.15.orig/fs/aio.c linux-4.8.15/fs/aio.c
+--- linux-4.8.15.orig/fs/aio.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/fs/aio.c	2017-01-01 17:07:15.119368222 +0100
 @@ -40,6 +40,7 @@
  #include <linux/ramfs.h>
  #include <linux/percpu-refcount.h>
@@ -6668,7 +6550,7 @@ index 4fe81d1c60f9..e68c06a4a017 100644
  
  #include <asm/kmap_types.h>
  #include <asm/uaccess.h>
-@@ -115,7 +116,7 @@ struct kioctx {
+@@ -115,7 +116,7 @@
  	struct page		**ring_pages;
  	long			nr_pages;
  
@@ -6677,7 +6559,7 @@ index 4fe81d1c60f9..e68c06a4a017 100644
  
  	/*
  	 * signals when all in-flight requests are done
-@@ -258,6 +259,7 @@ static int __init aio_setup(void)
+@@ -258,6 +259,7 @@
  		.mount		= aio_mount,
  		.kill_sb	= kill_anon_super,
  	};
@@ -6685,7 +6567,7 @@ index 4fe81d1c60f9..e68c06a4a017 100644
  	aio_mnt = kern_mount(&aio_fs);
  	if (IS_ERR(aio_mnt))
  		panic("Failed to create aio fs mount.");
-@@ -578,9 +580,9 @@ static int kiocb_cancel(struct aio_kiocb *kiocb)
+@@ -578,9 +580,9 @@
  	return cancel(&kiocb->common);
  }
  
@@ -6697,7 +6579,7 @@ index 4fe81d1c60f9..e68c06a4a017 100644
  
  	pr_debug("freeing %p\n", ctx);
  
-@@ -599,8 +601,8 @@ static void free_ioctx_reqs(struct percpu_ref *ref)
+@@ -599,8 +601,8 @@
  	if (ctx->rq_wait && atomic_dec_and_test(&ctx->rq_wait->count))
  		complete(&ctx->rq_wait->comp);
  
@@ -6708,7 +6590,7 @@ index 4fe81d1c60f9..e68c06a4a017 100644
  }
  
  /*
-@@ -608,9 +610,9 @@ static void free_ioctx_reqs(struct percpu_ref *ref)
+@@ -608,9 +610,9 @@
   * and ctx->users has dropped to 0, so we know no more kiocbs can be submitted -
   * now it's safe to cancel any that need to be.
   */
@@ -6720,7 +6602,7 @@ index 4fe81d1c60f9..e68c06a4a017 100644
  	struct aio_kiocb *req;
  
  	spin_lock_irq(&ctx->ctx_lock);
-@@ -629,6 +631,14 @@ static void free_ioctx_users(struct percpu_ref *ref)
+@@ -629,6 +631,14 @@
  	percpu_ref_put(&ctx->reqs);
  }
  
@@ -6735,10 +6617,9 @@ index 4fe81d1c60f9..e68c06a4a017 100644
  static int ioctx_add_table(struct kioctx *ctx, struct mm_struct *mm)
  {
  	unsigned i, new_nr;
-diff --git a/fs/autofs4/autofs_i.h b/fs/autofs4/autofs_i.h
-index a439548de785..7c392647d03b 100644
---- a/fs/autofs4/autofs_i.h
-+++ b/fs/autofs4/autofs_i.h
+diff -Nur linux-4.8.15.orig/fs/autofs4/autofs_i.h linux-4.8.15/fs/autofs4/autofs_i.h
+--- linux-4.8.15.orig/fs/autofs4/autofs_i.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/fs/autofs4/autofs_i.h	2017-01-01 17:07:15.127368729 +0100
 @@ -30,6 +30,7 @@
  #include <linux/sched.h>
  #include <linux/mount.h>
@@ -6747,11 +6628,10 @@ index a439548de785..7c392647d03b 100644
  #include <asm/current.h>
  #include <linux/uaccess.h>
  
-diff --git a/fs/autofs4/expire.c b/fs/autofs4/expire.c
-index d8e6d421c27f..2e689ab1306b 100644
---- a/fs/autofs4/expire.c
-+++ b/fs/autofs4/expire.c
-@@ -148,7 +148,7 @@ static struct dentry *get_next_positive_dentry(struct dentry *prev,
+diff -Nur linux-4.8.15.orig/fs/autofs4/expire.c linux-4.8.15/fs/autofs4/expire.c
+--- linux-4.8.15.orig/fs/autofs4/expire.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/fs/autofs4/expire.c	2017-01-01 17:07:15.143369757 +0100
+@@ -148,7 +148,7 @@
  			parent = p->d_parent;
  			if (!spin_trylock(&parent->d_lock)) {
  				spin_unlock(&p->d_lock);
@@ -6760,11 +6640,10 @@ index d8e6d421c27f..2e689ab1306b 100644
  				goto relock;
  			}
  			spin_unlock(&p->d_lock);
-diff --git a/fs/buffer.c b/fs/buffer.c
-index 9c8eb9b6db6a..d15d77f72cf7 100644
---- a/fs/buffer.c
-+++ b/fs/buffer.c
-@@ -301,8 +301,7 @@ static void end_buffer_async_read(struct buffer_head *bh, int uptodate)
+diff -Nur linux-4.8.15.orig/fs/buffer.c linux-4.8.15/fs/buffer.c
+--- linux-4.8.15.orig/fs/buffer.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/fs/buffer.c	2017-01-01 17:07:15.163371048 +0100
+@@ -301,8 +301,7 @@
  	 * decide that the page is now completely done.
  	 */
  	first = page_buffers(page);
@@ -6774,7 +6653,7 @@ index 9c8eb9b6db6a..d15d77f72cf7 100644
  	clear_buffer_async_read(bh);
  	unlock_buffer(bh);
  	tmp = bh;
-@@ -315,8 +314,7 @@ static void end_buffer_async_read(struct buffer_head *bh, int uptodate)
+@@ -315,8 +314,7 @@
  		}
  		tmp = tmp->b_this_page;
  	} while (tmp != bh);
@@ -6784,7 +6663,7 @@ index 9c8eb9b6db6a..d15d77f72cf7 100644
  
  	/*
  	 * If none of the buffers had errors and they are all
-@@ -328,9 +326,7 @@ static void end_buffer_async_read(struct buffer_head *bh, int uptodate)
+@@ -328,9 +326,7 @@
  	return;
  
  still_busy:
@@ -6795,7 +6674,7 @@ index 9c8eb9b6db6a..d15d77f72cf7 100644
  }
  
  /*
-@@ -358,8 +354,7 @@ void end_buffer_async_write(struct buffer_head *bh, int uptodate)
+@@ -358,8 +354,7 @@
  	}
  
  	first = page_buffers(page);
@@ -6805,7 +6684,7 @@ index 9c8eb9b6db6a..d15d77f72cf7 100644
  
  	clear_buffer_async_write(bh);
  	unlock_buffer(bh);
-@@ -371,15 +366,12 @@ void end_buffer_async_write(struct buffer_head *bh, int uptodate)
+@@ -371,15 +366,12 @@
  		}
  		tmp = tmp->b_this_page;
  	}
@@ -6823,7 +6702,7 @@ index 9c8eb9b6db6a..d15d77f72cf7 100644
  }
  EXPORT_SYMBOL(end_buffer_async_write);
  
-@@ -3384,6 +3376,7 @@ struct buffer_head *alloc_buffer_head(gfp_t gfp_flags)
+@@ -3384,6 +3376,7 @@
  	struct buffer_head *ret = kmem_cache_zalloc(bh_cachep, gfp_flags);
  	if (ret) {
  		INIT_LIST_HEAD(&ret->b_assoc_buffers);
@@ -6831,11 +6710,10 @@ index 9c8eb9b6db6a..d15d77f72cf7 100644
  		preempt_disable();
  		__this_cpu_inc(bh_accounting.nr);
  		recalc_bh_state();
-diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c
-index 8f6a2a5863b9..4217828d0b68 100644
---- a/fs/cifs/readdir.c
-+++ b/fs/cifs/readdir.c
-@@ -80,7 +80,7 @@ cifs_prime_dcache(struct dentry *parent, struct qstr *name,
+diff -Nur linux-4.8.15.orig/fs/cifs/readdir.c linux-4.8.15/fs/cifs/readdir.c
+--- linux-4.8.15.orig/fs/cifs/readdir.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/fs/cifs/readdir.c	2017-01-01 17:07:15.175371817 +0100
+@@ -80,7 +80,7 @@
  	struct inode *inode;
  	struct super_block *sb = parent->d_sb;
  	struct cifs_sb_info *cifs_sb = CIFS_SB(sb);
@@ -6844,10 +6722,9 @@ index 8f6a2a5863b9..4217828d0b68 100644
  
  	cifs_dbg(FYI, "%s: for %s\n", __func__, name->name);
  
-diff --git a/fs/dcache.c b/fs/dcache.c
-index 5c7cc953ac81..a9bb31f1c1af 100644
---- a/fs/dcache.c
-+++ b/fs/dcache.c
+diff -Nur linux-4.8.15.orig/fs/dcache.c linux-4.8.15/fs/dcache.c
+--- linux-4.8.15.orig/fs/dcache.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/fs/dcache.c	2017-01-01 17:07:15.191372851 +0100
 @@ -19,6 +19,7 @@
  #include <linux/mm.h>
  #include <linux/fs.h>
@@ -6856,7 +6733,7 @@ index 5c7cc953ac81..a9bb31f1c1af 100644
  #include <linux/slab.h>
  #include <linux/init.h>
  #include <linux/hash.h>
-@@ -750,6 +751,8 @@ static inline bool fast_dput(struct dentry *dentry)
+@@ -750,6 +751,8 @@
   */
  void dput(struct dentry *dentry)
  {
@@ -6865,7 +6742,7 @@ index 5c7cc953ac81..a9bb31f1c1af 100644
  	if (unlikely(!dentry))
  		return;
  
-@@ -788,9 +791,18 @@ void dput(struct dentry *dentry)
+@@ -788,9 +791,18 @@
  	return;
  
  kill_it:
@@ -6887,7 +6764,7 @@ index 5c7cc953ac81..a9bb31f1c1af 100644
  		goto repeat;
  	}
  }
-@@ -2321,7 +2333,7 @@ void d_delete(struct dentry * dentry)
+@@ -2321,7 +2333,7 @@
  	if (dentry->d_lockref.count == 1) {
  		if (!spin_trylock(&inode->i_lock)) {
  			spin_unlock(&dentry->d_lock);
@@ -6896,7 +6773,7 @@ index 5c7cc953ac81..a9bb31f1c1af 100644
  			goto again;
  		}
  		dentry->d_flags &= ~DCACHE_CANT_MOUNT;
-@@ -2381,21 +2393,24 @@ static inline void end_dir_add(struct inode *dir, unsigned n)
+@@ -2381,21 +2393,24 @@
  
  static void d_wait_lookup(struct dentry *dentry)
  {
@@ -6932,7 +6809,7 @@ index 5c7cc953ac81..a9bb31f1c1af 100644
  {
  	unsigned int hash = name->hash;
  	struct hlist_bl_head *b = in_lookup_hash(parent, hash);
-@@ -2504,7 +2519,7 @@ void __d_lookup_done(struct dentry *dentry)
+@@ -2504,7 +2519,7 @@
  	hlist_bl_lock(b);
  	dentry->d_flags &= ~DCACHE_PAR_LOOKUP;
  	__hlist_bl_del(&dentry->d_u.d_in_lookup_hash);
@@ -6941,7 +6818,7 @@ index 5c7cc953ac81..a9bb31f1c1af 100644
  	dentry->d_wait = NULL;
  	hlist_bl_unlock(b);
  	INIT_HLIST_NODE(&dentry->d_u.d_alias);
-@@ -3601,6 +3616,11 @@ EXPORT_SYMBOL(d_genocide);
+@@ -3601,6 +3616,11 @@
  
  void __init vfs_caches_init_early(void)
  {
@@ -6953,11 +6830,10 @@ index 5c7cc953ac81..a9bb31f1c1af 100644
  	dcache_init_early();
  	inode_init_early();
  }
-diff --git a/fs/eventpoll.c b/fs/eventpoll.c
-index 10db91218933..42af0a06f657 100644
---- a/fs/eventpoll.c
-+++ b/fs/eventpoll.c
-@@ -510,12 +510,12 @@ static int ep_poll_wakeup_proc(void *priv, void *cookie, int call_nests)
+diff -Nur linux-4.8.15.orig/fs/eventpoll.c linux-4.8.15/fs/eventpoll.c
+--- linux-4.8.15.orig/fs/eventpoll.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/fs/eventpoll.c	2017-01-01 17:07:15.235375683 +0100
+@@ -510,12 +510,12 @@
   */
  static void ep_poll_safewake(wait_queue_head_t *wq)
  {
@@ -6972,11 +6848,10 @@ index 10db91218933..42af0a06f657 100644
  }
  
  static void ep_remove_wait_queue(struct eppoll_entry *pwq)
-diff --git a/fs/exec.c b/fs/exec.c
-index 6fcfb3f7b137..751370a71ec5 100644
---- a/fs/exec.c
-+++ b/fs/exec.c
-@@ -1012,12 +1012,14 @@ static int exec_mmap(struct mm_struct *mm)
+diff -Nur linux-4.8.15.orig/fs/exec.c linux-4.8.15/fs/exec.c
+--- linux-4.8.15.orig/fs/exec.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/fs/exec.c	2017-01-01 17:07:15.275378262 +0100
+@@ -1012,12 +1012,14 @@
  		}
  	}
  	task_lock(tsk);
@@ -6991,11 +6866,10 @@ index 6fcfb3f7b137..751370a71ec5 100644
  	task_unlock(tsk);
  	if (old_mm) {
  		up_read(&old_mm->mmap_sem);
-diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
-index 4ff9251e9d3a..8fe489ec2ef1 100644
---- a/fs/fuse/dir.c
-+++ b/fs/fuse/dir.c
-@@ -1174,7 +1174,7 @@ static int fuse_direntplus_link(struct file *file,
+diff -Nur linux-4.8.15.orig/fs/fuse/dir.c linux-4.8.15/fs/fuse/dir.c
+--- linux-4.8.15.orig/fs/fuse/dir.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/fs/fuse/dir.c	2017-01-01 17:07:15.315380835 +0100
+@@ -1174,7 +1174,7 @@
  	struct inode *dir = d_inode(parent);
  	struct fuse_conn *fc;
  	struct inode *inode;
@@ -7004,11 +6878,10 @@ index 4ff9251e9d3a..8fe489ec2ef1 100644
  
  	if (!o->nodeid) {
  		/*
-diff --git a/fs/jbd2/checkpoint.c b/fs/jbd2/checkpoint.c
-index 684996c8a3a4..6e18a06aaabe 100644
---- a/fs/jbd2/checkpoint.c
-+++ b/fs/jbd2/checkpoint.c
-@@ -116,6 +116,8 @@ void __jbd2_log_wait_for_space(journal_t *journal)
+diff -Nur linux-4.8.15.orig/fs/jbd2/checkpoint.c linux-4.8.15/fs/jbd2/checkpoint.c
+--- linux-4.8.15.orig/fs/jbd2/checkpoint.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/fs/jbd2/checkpoint.c	2017-01-01 17:07:15.403386504 +0100
+@@ -116,6 +116,8 @@
  	nblocks = jbd2_space_needed(journal);
  	while (jbd2_log_space_left(journal) < nblocks) {
  		write_unlock(&journal->j_state_lock);
@@ -7017,11 +6890,10 @@ index 684996c8a3a4..6e18a06aaabe 100644
  		mutex_lock(&journal->j_checkpoint_mutex);
  
  		/*
-diff --git a/fs/namei.c b/fs/namei.c
-index adb04146df09..a89dfaf9f209 100644
---- a/fs/namei.c
-+++ b/fs/namei.c
-@@ -1629,7 +1629,7 @@ static struct dentry *lookup_slow(const struct qstr *name,
+diff -Nur linux-4.8.15.orig/fs/namei.c linux-4.8.15/fs/namei.c
+--- linux-4.8.15.orig/fs/namei.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/fs/namei.c	2017-01-01 17:07:15.435388569 +0100
+@@ -1629,7 +1629,7 @@
  {
  	struct dentry *dentry = ERR_PTR(-ENOENT), *old;
  	struct inode *inode = dir->d_inode;
@@ -7030,7 +6902,7 @@ index adb04146df09..a89dfaf9f209 100644
  
  	inode_lock_shared(inode);
  	/* Don't go there if it's already dead */
-@@ -3086,7 +3086,7 @@ static int lookup_open(struct nameidata *nd, struct path *path,
+@@ -3086,7 +3086,7 @@
  	struct dentry *dentry;
  	int error, create_error = 0;
  	umode_t mode = op->mode;
@@ -7039,10 +6911,9 @@ index adb04146df09..a89dfaf9f209 100644
  
  	if (unlikely(IS_DEADDIR(dir_inode)))
  		return -ENOENT;
-diff --git a/fs/namespace.c b/fs/namespace.c
-index 7bb2cda3bfef..cf79b18e7b58 100644
---- a/fs/namespace.c
-+++ b/fs/namespace.c
+diff -Nur linux-4.8.15.orig/fs/namespace.c linux-4.8.15/fs/namespace.c
+--- linux-4.8.15.orig/fs/namespace.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/fs/namespace.c	2017-01-01 17:07:15.447389339 +0100
 @@ -14,6 +14,7 @@
  #include <linux/mnt_namespace.h>
  #include <linux/user_namespace.h>
@@ -7051,7 +6922,7 @@ index 7bb2cda3bfef..cf79b18e7b58 100644
  #include <linux/security.h>
  #include <linux/idr.h>
  #include <linux/init.h>		/* init_rootfs */
-@@ -353,8 +354,11 @@ int __mnt_want_write(struct vfsmount *m)
+@@ -353,8 +354,11 @@
  	 * incremented count after it has set MNT_WRITE_HOLD.
  	 */
  	smp_mb();
@@ -7065,11 +6936,10 @@ index 7bb2cda3bfef..cf79b18e7b58 100644
  	/*
  	 * After the slowpath clears MNT_WRITE_HOLD, mnt_is_readonly will
  	 * be set to match its requirements. So we must not load that until
-diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c
-index b9c65421ed81..03ffe8af8785 100644
---- a/fs/nfs/delegation.c
-+++ b/fs/nfs/delegation.c
-@@ -150,11 +150,11 @@ static int nfs_delegation_claim_opens(struct inode *inode,
+diff -Nur linux-4.8.15.orig/fs/nfs/delegation.c linux-4.8.15/fs/nfs/delegation.c
+--- linux-4.8.15.orig/fs/nfs/delegation.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/fs/nfs/delegation.c	2017-01-01 17:07:15.451389604 +0100
+@@ -150,11 +150,11 @@
  		sp = state->owner;
  		/* Block nfs4_proc_unlck */
  		mutex_lock(&sp->so_delegreturn_mutex);
@@ -7083,11 +6953,10 @@ index b9c65421ed81..03ffe8af8785 100644
  			err = -EAGAIN;
  		mutex_unlock(&sp->so_delegreturn_mutex);
  		put_nfs_open_context(ctx);
-diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
-index 6bc5a68e39f1..ce6488e07a13 100644
---- a/fs/nfs/dir.c
-+++ b/fs/nfs/dir.c
-@@ -485,7 +485,7 @@ static
+diff -Nur linux-4.8.15.orig/fs/nfs/dir.c linux-4.8.15/fs/nfs/dir.c
+--- linux-4.8.15.orig/fs/nfs/dir.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/fs/nfs/dir.c	2017-01-01 17:07:15.455389855 +0100
+@@ -485,7 +485,7 @@
  void nfs_prime_dcache(struct dentry *parent, struct nfs_entry *entry)
  {
  	struct qstr filename = QSTR_INIT(entry->name, entry->len);
@@ -7096,7 +6965,7 @@ index 6bc5a68e39f1..ce6488e07a13 100644
  	struct dentry *dentry;
  	struct dentry *alias;
  	struct inode *dir = d_inode(parent);
-@@ -1490,7 +1490,7 @@ int nfs_atomic_open(struct inode *dir, struct dentry *dentry,
+@@ -1490,7 +1490,7 @@
  		    struct file *file, unsigned open_flags,
  		    umode_t mode, int *opened)
  {
@@ -7105,7 +6974,7 @@ index 6bc5a68e39f1..ce6488e07a13 100644
  	struct nfs_open_context *ctx;
  	struct dentry *res;
  	struct iattr attr = { .ia_valid = ATTR_OPEN };
-@@ -1805,7 +1805,11 @@ int nfs_rmdir(struct inode *dir, struct dentry *dentry)
+@@ -1805,7 +1805,11 @@
  
  	trace_nfs_rmdir_enter(dir, dentry);
  	if (d_really_is_positive(dentry)) {
@@ -7117,7 +6986,7 @@ index 6bc5a68e39f1..ce6488e07a13 100644
  		error = NFS_PROTO(dir)->rmdir(dir, &dentry->d_name);
  		/* Ensure the VFS deletes this inode */
  		switch (error) {
-@@ -1815,7 +1819,11 @@ int nfs_rmdir(struct inode *dir, struct dentry *dentry)
+@@ -1815,7 +1819,11 @@
  		case -ENOENT:
  			nfs_dentry_handle_enoent(dentry);
  		}
@@ -7129,11 +6998,10 @@ index 6bc5a68e39f1..ce6488e07a13 100644
  	} else
  		error = NFS_PROTO(dir)->rmdir(dir, &dentry->d_name);
  	trace_nfs_rmdir_exit(dir, dentry, error);
-diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
-index bf4ec5ecc97e..36cd5fc9192c 100644
---- a/fs/nfs/inode.c
-+++ b/fs/nfs/inode.c
-@@ -1957,7 +1957,11 @@ static void init_once(void *foo)
+diff -Nur linux-4.8.15.orig/fs/nfs/inode.c linux-4.8.15/fs/nfs/inode.c
+--- linux-4.8.15.orig/fs/nfs/inode.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/fs/nfs/inode.c	2017-01-01 17:07:15.463390369 +0100
+@@ -1957,7 +1957,11 @@
  	nfsi->nrequests = 0;
  	nfsi->commit_info.ncommit = 0;
  	atomic_set(&nfsi->commit_info.rpcs_out, 0);
@@ -7145,11 +7013,10 @@ index bf4ec5ecc97e..36cd5fc9192c 100644
  	nfs4_init_once(nfsi);
  }
  
-diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h
-index 9bf64eacba5b..041da5cb80f5 100644
---- a/fs/nfs/nfs4_fs.h
-+++ b/fs/nfs/nfs4_fs.h
-@@ -107,7 +107,7 @@ struct nfs4_state_owner {
+diff -Nur linux-4.8.15.orig/fs/nfs/nfs4_fs.h linux-4.8.15/fs/nfs/nfs4_fs.h
+--- linux-4.8.15.orig/fs/nfs/nfs4_fs.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/fs/nfs/nfs4_fs.h	2017-01-01 17:07:15.467390636 +0100
+@@ -107,7 +107,7 @@
  	unsigned long	     so_flags;
  	struct list_head     so_states;
  	struct nfs_seqid_counter so_seqid;
@@ -7158,11 +7025,10 @@ index 9bf64eacba5b..041da5cb80f5 100644
  	struct mutex	     so_delegreturn_mutex;
  };
  
-diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
-index a9dec32ba9ba..49b64dfb307c 100644
---- a/fs/nfs/nfs4proc.c
-+++ b/fs/nfs/nfs4proc.c
-@@ -2525,7 +2525,7 @@ static int _nfs4_open_and_get_state(struct nfs4_opendata *opendata,
+diff -Nur linux-4.8.15.orig/fs/nfs/nfs4proc.c linux-4.8.15/fs/nfs/nfs4proc.c
+--- linux-4.8.15.orig/fs/nfs/nfs4proc.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/fs/nfs/nfs4proc.c	2017-01-01 17:07:15.491392171 +0100
+@@ -2525,7 +2525,7 @@
  	unsigned int seq;
  	int ret;
  
@@ -7171,7 +7037,7 @@ index a9dec32ba9ba..49b64dfb307c 100644
  
  	ret = _nfs4_proc_open(opendata);
  	if (ret != 0)
-@@ -2561,7 +2561,7 @@ static int _nfs4_open_and_get_state(struct nfs4_opendata *opendata,
+@@ -2561,7 +2561,7 @@
  	ctx->state = state;
  	if (d_inode(dentry) == state->inode) {
  		nfs_inode_attach_open_context(ctx);
@@ -7180,11 +7046,10 @@ index a9dec32ba9ba..49b64dfb307c 100644
  			nfs4_schedule_stateid_recovery(server, state);
  	}
  out:
-diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
-index 8353f33f0466..657e13ed4b5d 100644
---- a/fs/nfs/nfs4state.c
-+++ b/fs/nfs/nfs4state.c
-@@ -488,7 +488,7 @@ nfs4_alloc_state_owner(struct nfs_server *server,
+diff -Nur linux-4.8.15.orig/fs/nfs/nfs4state.c linux-4.8.15/fs/nfs/nfs4state.c
+--- linux-4.8.15.orig/fs/nfs/nfs4state.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/fs/nfs/nfs4state.c	2017-01-01 17:07:15.527394493 +0100
+@@ -488,7 +488,7 @@
  	nfs4_init_seqid_counter(&sp->so_seqid);
  	atomic_set(&sp->so_count, 1);
  	INIT_LIST_HEAD(&sp->so_lru);
@@ -7193,7 +7058,7 @@ index 8353f33f0466..657e13ed4b5d 100644
  	mutex_init(&sp->so_delegreturn_mutex);
  	return sp;
  }
-@@ -1459,8 +1459,12 @@ static int nfs4_reclaim_open_state(struct nfs4_state_owner *sp, const struct nfs
+@@ -1459,8 +1459,12 @@
  	 * recovering after a network partition or a reboot from a
  	 * server that doesn't support a grace period.
  	 */
@@ -7207,7 +7072,7 @@ index 8353f33f0466..657e13ed4b5d 100644
  restart:
  	list_for_each_entry(state, &sp->so_states, open_states) {
  		if (!test_and_clear_bit(ops->state_flag_bit, &state->flags))
-@@ -1528,14 +1532,20 @@ static int nfs4_reclaim_open_state(struct nfs4_state_owner *sp, const struct nfs
+@@ -1528,14 +1532,20 @@
  		spin_lock(&sp->so_lock);
  		goto restart;
  	}
@@ -7232,10 +7097,9 @@ index 8353f33f0466..657e13ed4b5d 100644
  	return status;
  }
  
-diff --git a/fs/nfs/unlink.c b/fs/nfs/unlink.c
-index 191aa577dd1f..58990c8f52e0 100644
---- a/fs/nfs/unlink.c
-+++ b/fs/nfs/unlink.c
+diff -Nur linux-4.8.15.orig/fs/nfs/unlink.c linux-4.8.15/fs/nfs/unlink.c
+--- linux-4.8.15.orig/fs/nfs/unlink.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/fs/nfs/unlink.c	2017-01-01 17:07:15.531394748 +0100
 @@ -12,7 +12,7 @@
  #include <linux/sunrpc/clnt.h>
  #include <linux/nfs_fs.h>
@@ -7245,7 +7109,7 @@ index 191aa577dd1f..58990c8f52e0 100644
  #include <linux/namei.h>
  #include <linux/fsnotify.h>
  
-@@ -51,6 +51,29 @@ static void nfs_async_unlink_done(struct rpc_task *task, void *calldata)
+@@ -51,6 +51,29 @@
  		rpc_restart_call_prepare(task);
  }
  
@@ -7275,7 +7139,7 @@ index 191aa577dd1f..58990c8f52e0 100644
  /**
   * nfs_async_unlink_release - Release the sillydelete data.
   * @task: rpc_task of the sillydelete
-@@ -64,7 +87,7 @@ static void nfs_async_unlink_release(void *calldata)
+@@ -64,7 +87,7 @@
  	struct dentry *dentry = data->dentry;
  	struct super_block *sb = dentry->d_sb;
  
@@ -7284,7 +7148,7 @@ index 191aa577dd1f..58990c8f52e0 100644
  	d_lookup_done(dentry);
  	nfs_free_unlinkdata(data);
  	dput(dentry);
-@@ -117,10 +140,10 @@ static int nfs_call_unlink(struct dentry *dentry, struct nfs_unlinkdata *data)
+@@ -117,10 +140,10 @@
  	struct inode *dir = d_inode(dentry->d_parent);
  	struct dentry *alias;
  
@@ -7297,7 +7161,7 @@ index 191aa577dd1f..58990c8f52e0 100644
  		return 0;
  	}
  	if (!d_in_lookup(alias)) {
-@@ -142,7 +165,7 @@ static int nfs_call_unlink(struct dentry *dentry, struct nfs_unlinkdata *data)
+@@ -142,7 +165,7 @@
  			ret = 0;
  		spin_unlock(&alias->d_lock);
  		dput(alias);
@@ -7306,7 +7170,7 @@ index 191aa577dd1f..58990c8f52e0 100644
  		/*
  		 * If we'd displaced old cached devname, free it.  At that
  		 * point dentry is definitely not a root, so we won't need
-@@ -182,7 +205,7 @@ nfs_async_unlink(struct dentry *dentry, const struct qstr *name)
+@@ -182,7 +205,7 @@
  		goto out_free_name;
  	}
  	data->res.dir_attr = &data->dir_attr;
@@ -7315,11 +7179,10 @@ index 191aa577dd1f..58990c8f52e0 100644
  
  	status = -EBUSY;
  	spin_lock(&dentry->d_lock);
-diff --git a/fs/ntfs/aops.c b/fs/ntfs/aops.c
-index fe251f187ff8..e89da4fb14c2 100644
---- a/fs/ntfs/aops.c
-+++ b/fs/ntfs/aops.c
-@@ -92,13 +92,13 @@ static void ntfs_end_buffer_async_read(struct buffer_head *bh, int uptodate)
+diff -Nur linux-4.8.15.orig/fs/ntfs/aops.c linux-4.8.15/fs/ntfs/aops.c
+--- linux-4.8.15.orig/fs/ntfs/aops.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/fs/ntfs/aops.c	2017-01-01 17:07:15.547395781 +0100
+@@ -92,13 +92,13 @@
  			ofs = 0;
  			if (file_ofs < init_size)
  				ofs = init_size - file_ofs;
@@ -7335,7 +7198,7 @@ index fe251f187ff8..e89da4fb14c2 100644
  		}
  	} else {
  		clear_buffer_uptodate(bh);
-@@ -107,8 +107,7 @@ static void ntfs_end_buffer_async_read(struct buffer_head *bh, int uptodate)
+@@ -107,8 +107,7 @@
  				"0x%llx.", (unsigned long long)bh->b_blocknr);
  	}
  	first = page_buffers(page);
@@ -7345,7 +7208,7 @@ index fe251f187ff8..e89da4fb14c2 100644
  	clear_buffer_async_read(bh);
  	unlock_buffer(bh);
  	tmp = bh;
-@@ -123,8 +122,7 @@ static void ntfs_end_buffer_async_read(struct buffer_head *bh, int uptodate)
+@@ -123,8 +122,7 @@
  		}
  		tmp = tmp->b_this_page;
  	} while (tmp != bh);
@@ -7355,7 +7218,7 @@ index fe251f187ff8..e89da4fb14c2 100644
  	/*
  	 * If none of the buffers had errors then we can set the page uptodate,
  	 * but we first have to perform the post read mst fixups, if the
-@@ -145,13 +143,13 @@ static void ntfs_end_buffer_async_read(struct buffer_head *bh, int uptodate)
+@@ -145,13 +143,13 @@
  		recs = PAGE_SIZE / rec_size;
  		/* Should have been verified before we got here... */
  		BUG_ON(!recs);
@@ -7371,7 +7234,7 @@ index fe251f187ff8..e89da4fb14c2 100644
  		flush_dcache_page(page);
  		if (likely(page_uptodate && !PageError(page)))
  			SetPageUptodate(page);
-@@ -159,9 +157,7 @@ static void ntfs_end_buffer_async_read(struct buffer_head *bh, int uptodate)
+@@ -159,9 +157,7 @@
  	unlock_page(page);
  	return;
  still_busy:
@@ -7382,11 +7245,10 @@ index fe251f187ff8..e89da4fb14c2 100644
  }
  
  /**
-diff --git a/fs/proc/base.c b/fs/proc/base.c
-index ac0df4dde823..ad1a4723ffdd 100644
---- a/fs/proc/base.c
-+++ b/fs/proc/base.c
-@@ -1819,7 +1819,7 @@ bool proc_fill_cache(struct file *file, struct dir_context *ctx,
+diff -Nur linux-4.8.15.orig/fs/proc/base.c linux-4.8.15/fs/proc/base.c
+--- linux-4.8.15.orig/fs/proc/base.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/fs/proc/base.c	2017-01-01 17:07:15.571397336 +0100
+@@ -1819,7 +1819,7 @@
  
  	child = d_hash_and_lookup(dir, &qname);
  	if (!child) {
@@ -7395,11 +7257,10 @@ index ac0df4dde823..ad1a4723ffdd 100644
  		child = d_alloc_parallel(dir, &qname, &wq);
  		if (IS_ERR(child))
  			goto end_instantiate;
-diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
-index 1b93650dda2f..c553bf3ea541 100644
---- a/fs/proc/proc_sysctl.c
-+++ b/fs/proc/proc_sysctl.c
-@@ -627,7 +627,7 @@ static bool proc_sys_fill_cache(struct file *file,
+diff -Nur linux-4.8.15.orig/fs/proc/proc_sysctl.c linux-4.8.15/fs/proc/proc_sysctl.c
+--- linux-4.8.15.orig/fs/proc/proc_sysctl.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/fs/proc/proc_sysctl.c	2017-01-01 17:07:15.575397587 +0100
+@@ -627,7 +627,7 @@
  
  	child = d_lookup(dir, &qname);
  	if (!child) {
@@ -7408,11 +7269,10 @@ index 1b93650dda2f..c553bf3ea541 100644
  		child = d_alloc_parallel(dir, &qname, &wq);
  		if (IS_ERR(child))
  			return false;
-diff --git a/fs/timerfd.c b/fs/timerfd.c
-index 9ae4abb4110b..8644b67c48fd 100644
---- a/fs/timerfd.c
-+++ b/fs/timerfd.c
-@@ -460,7 +460,10 @@ static int do_timerfd_settime(int ufd, int flags,
+diff -Nur linux-4.8.15.orig/fs/timerfd.c linux-4.8.15/fs/timerfd.c
+--- linux-4.8.15.orig/fs/timerfd.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/fs/timerfd.c	2017-01-01 17:07:15.587398365 +0100
+@@ -460,7 +460,10 @@
  				break;
  		}
  		spin_unlock_irq(&ctx->wqh.lock);
@@ -7424,10 +7284,9 @@ index 9ae4abb4110b..8644b67c48fd 100644
  	}
  
  	/*
-diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h
-index 93b61b1f2beb..58270adb46ce 100644
---- a/include/acpi/platform/aclinux.h
-+++ b/include/acpi/platform/aclinux.h
+diff -Nur linux-4.8.15.orig/include/acpi/platform/aclinux.h linux-4.8.15/include/acpi/platform/aclinux.h
+--- linux-4.8.15.orig/include/acpi/platform/aclinux.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/acpi/platform/aclinux.h	2017-01-01 17:07:15.591398616 +0100
 @@ -131,6 +131,7 @@
  
  #define acpi_cache_t                        struct kmem_cache
@@ -7457,11 +7316,10 @@ index 93b61b1f2beb..58270adb46ce 100644
  /*
   * OSL interfaces used by debugger/disassembler
   */
-diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h
-index 6f96247226a4..fa53a21263c2 100644
---- a/include/asm-generic/bug.h
-+++ b/include/asm-generic/bug.h
-@@ -215,6 +215,20 @@ void __warn(const char *file, int line, void *caller, unsigned taint,
+diff -Nur linux-4.8.15.orig/include/asm-generic/bug.h linux-4.8.15/include/asm-generic/bug.h
+--- linux-4.8.15.orig/include/asm-generic/bug.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/asm-generic/bug.h	2017-01-01 17:07:15.591398616 +0100
+@@ -215,6 +215,20 @@
  # define WARN_ON_SMP(x)			({0;})
  #endif
  
@@ -7482,23 +7340,10 @@ index 6f96247226a4..fa53a21263c2 100644
  #endif /* __ASSEMBLY__ */
  
  #endif
-diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h
-index e43bbffb5b7a..c23892264109 100644
---- a/include/linux/blk-mq.h
-+++ b/include/linux/blk-mq.h
-@@ -222,6 +222,7 @@ static inline u16 blk_mq_unique_tag_to_tag(u32 unique_tag)
- 
- struct blk_mq_hw_ctx *blk_mq_map_queue(struct request_queue *, const int ctx_index);
- struct blk_mq_hw_ctx *blk_mq_alloc_single_hw_queue(struct blk_mq_tag_set *, unsigned int, int);
-+void __blk_mq_complete_request_remote_work(struct work_struct *work);
- 
- int blk_mq_request_started(struct request *rq);
- void blk_mq_start_request(struct request *rq);
-diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
-index e79055c8b577..8583c1af14ad 100644
---- a/include/linux/blkdev.h
-+++ b/include/linux/blkdev.h
-@@ -89,6 +89,7 @@ struct request {
+diff -Nur linux-4.8.15.orig/include/linux/blkdev.h linux-4.8.15/include/linux/blkdev.h
+--- linux-4.8.15.orig/include/linux/blkdev.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/blkdev.h	2017-01-01 17:07:15.623400677 +0100
+@@ -89,6 +89,7 @@
  	struct list_head queuelist;
  	union {
  		struct call_single_data csd;
@@ -7506,7 +7351,7 @@ index e79055c8b577..8583c1af14ad 100644
  		u64 fifo_time;
  	};
  
-@@ -467,7 +468,7 @@ struct request_queue {
+@@ -467,7 +468,7 @@
  	struct throtl_data *td;
  #endif
  	struct rcu_head		rcu_head;
@@ -7515,10 +7360,20 @@ index e79055c8b577..8583c1af14ad 100644
  	struct percpu_ref	q_usage_counter;
  	struct list_head	all_q_node;
  
-diff --git a/include/linux/bottom_half.h b/include/linux/bottom_half.h
-index 8fdcb783197d..d07dbeec7bc1 100644
---- a/include/linux/bottom_half.h
-+++ b/include/linux/bottom_half.h
+diff -Nur linux-4.8.15.orig/include/linux/blk-mq.h linux-4.8.15/include/linux/blk-mq.h
+--- linux-4.8.15.orig/include/linux/blk-mq.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/blk-mq.h	2017-01-01 17:07:15.599399127 +0100
+@@ -222,6 +222,7 @@
+ 
+ struct blk_mq_hw_ctx *blk_mq_map_queue(struct request_queue *, const int ctx_index);
+ struct blk_mq_hw_ctx *blk_mq_alloc_single_hw_queue(struct blk_mq_tag_set *, unsigned int, int);
++void __blk_mq_complete_request_remote_work(struct work_struct *work);
+ 
+ int blk_mq_request_started(struct request *rq);
+ void blk_mq_start_request(struct request *rq);
+diff -Nur linux-4.8.15.orig/include/linux/bottom_half.h linux-4.8.15/include/linux/bottom_half.h
+--- linux-4.8.15.orig/include/linux/bottom_half.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/bottom_half.h	2017-01-01 17:07:15.623400677 +0100
 @@ -3,6 +3,39 @@
  
  #include <linux/preempt.h>
@@ -7559,18 +7414,17 @@ index 8fdcb783197d..d07dbeec7bc1 100644
  #ifdef CONFIG_TRACE_IRQFLAGS
  extern void __local_bh_disable_ip(unsigned long ip, unsigned int cnt);
  #else
-@@ -30,5 +63,6 @@ static inline void local_bh_enable(void)
+@@ -30,5 +63,6 @@
  {
  	__local_bh_enable_ip(_THIS_IP_, SOFTIRQ_DISABLE_OFFSET);
  }
 +#endif
  
  #endif /* _LINUX_BH_H */
-diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h
-index ebbacd14d450..be5e87f6360a 100644
---- a/include/linux/buffer_head.h
-+++ b/include/linux/buffer_head.h
-@@ -75,8 +75,50 @@ struct buffer_head {
+diff -Nur linux-4.8.15.orig/include/linux/buffer_head.h linux-4.8.15/include/linux/buffer_head.h
+--- linux-4.8.15.orig/include/linux/buffer_head.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/buffer_head.h	2017-01-01 17:07:15.623400677 +0100
+@@ -75,8 +75,50 @@
  	struct address_space *b_assoc_map;	/* mapping this buffer is
  						   associated with */
  	atomic_t b_count;		/* users using this buffer_head */
@@ -7621,10 +7475,9 @@ index ebbacd14d450..be5e87f6360a 100644
  /*
   * macro tricks to expand the set_buffer_foo(), clear_buffer_foo()
   * and buffer_foo() functions.
-diff --git a/include/linux/cgroup-defs.h b/include/linux/cgroup-defs.h
-index 5b17de62c962..56027cc01a56 100644
---- a/include/linux/cgroup-defs.h
-+++ b/include/linux/cgroup-defs.h
+diff -Nur linux-4.8.15.orig/include/linux/cgroup-defs.h linux-4.8.15/include/linux/cgroup-defs.h
+--- linux-4.8.15.orig/include/linux/cgroup-defs.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/cgroup-defs.h	2017-01-01 17:07:15.631401192 +0100
 @@ -16,6 +16,7 @@
  #include <linux/percpu-refcount.h>
  #include <linux/percpu-rwsem.h>
@@ -7633,7 +7486,7 @@ index 5b17de62c962..56027cc01a56 100644
  
  #ifdef CONFIG_CGROUPS
  
-@@ -137,6 +138,7 @@ struct cgroup_subsys_state {
+@@ -137,6 +138,7 @@
  	/* percpu_ref killing and RCU release */
  	struct rcu_head rcu_head;
  	struct work_struct destroy_work;
@@ -7641,10 +7494,9 @@ index 5b17de62c962..56027cc01a56 100644
  };
  
  /*
-diff --git a/include/linux/completion.h b/include/linux/completion.h
-index 5d5aaae3af43..3bca1590e29f 100644
---- a/include/linux/completion.h
-+++ b/include/linux/completion.h
+diff -Nur linux-4.8.15.orig/include/linux/completion.h linux-4.8.15/include/linux/completion.h
+--- linux-4.8.15.orig/include/linux/completion.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/completion.h	2017-01-01 17:07:15.659402994 +0100
 @@ -7,8 +7,7 @@
   * Atomic wait-for-completion handler data structures.
   * See kernel/sched/completion.c for details.
@@ -7669,7 +7521,7 @@ index 5d5aaae3af43..3bca1590e29f 100644
  
  #define COMPLETION_INITIALIZER_ONSTACK(work) \
  	({ init_completion(&work); work; })
-@@ -73,7 +72,7 @@ struct completion {
+@@ -73,7 +72,7 @@
  static inline void init_completion(struct completion *x)
  {
  	x->done = 0;
@@ -7678,11 +7530,10 @@ index 5d5aaae3af43..3bca1590e29f 100644
  }
  
  /**
-diff --git a/include/linux/cpu.h b/include/linux/cpu.h
-index 797d9c8e9a1b..6eabd9e8a98b 100644
---- a/include/linux/cpu.h
-+++ b/include/linux/cpu.h
-@@ -201,6 +201,8 @@ extern void get_online_cpus(void);
+diff -Nur linux-4.8.15.orig/include/linux/cpu.h linux-4.8.15/include/linux/cpu.h
+--- linux-4.8.15.orig/include/linux/cpu.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/cpu.h	2017-01-01 17:07:15.703405827 +0100
+@@ -194,6 +194,8 @@
  extern void put_online_cpus(void);
  extern void cpu_hotplug_disable(void);
  extern void cpu_hotplug_enable(void);
@@ -7691,7 +7542,7 @@ index 797d9c8e9a1b..6eabd9e8a98b 100644
  #define hotcpu_notifier(fn, pri)	cpu_notifier(fn, pri)
  #define __hotcpu_notifier(fn, pri)	__cpu_notifier(fn, pri)
  #define register_hotcpu_notifier(nb)	register_cpu_notifier(nb)
-@@ -218,6 +220,8 @@ static inline void cpu_hotplug_done(void) {}
+@@ -211,6 +213,8 @@
  #define put_online_cpus()	do { } while (0)
  #define cpu_hotplug_disable()	do { } while (0)
  #define cpu_hotplug_enable()	do { } while (0)
@@ -7700,10 +7551,9 @@ index 797d9c8e9a1b..6eabd9e8a98b 100644
  #define hotcpu_notifier(fn, pri)	do { (void)(fn); } while (0)
  #define __hotcpu_notifier(fn, pri)	do { (void)(fn); } while (0)
  /* These aren't inline functions due to a GCC bug. */
-diff --git a/include/linux/dcache.h b/include/linux/dcache.h
-index 5ff3e9a4fe5f..ed0431599fd7 100644
---- a/include/linux/dcache.h
-+++ b/include/linux/dcache.h
+diff -Nur linux-4.8.15.orig/include/linux/dcache.h linux-4.8.15/include/linux/dcache.h
+--- linux-4.8.15.orig/include/linux/dcache.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/dcache.h	2017-01-01 17:07:15.719406860 +0100
 @@ -11,6 +11,7 @@
  #include <linux/rcupdate.h>
  #include <linux/lockref.h>
@@ -7712,7 +7562,7 @@ index 5ff3e9a4fe5f..ed0431599fd7 100644
  
  struct path;
  struct vfsmount;
-@@ -100,7 +101,7 @@ struct dentry {
+@@ -100,7 +101,7 @@
  
  	union {
  		struct list_head d_lru;		/* LRU list */
@@ -7721,7 +7571,7 @@ index 5ff3e9a4fe5f..ed0431599fd7 100644
  	};
  	struct list_head d_child;	/* child of parent list */
  	struct list_head d_subdirs;	/* our children */
-@@ -230,7 +231,7 @@ extern void d_set_d_op(struct dentry *dentry, const struct dentry_operations *op
+@@ -230,7 +231,7 @@
  extern struct dentry * d_alloc(struct dentry *, const struct qstr *);
  extern struct dentry * d_alloc_pseudo(struct super_block *, const struct qstr *);
  extern struct dentry * d_alloc_parallel(struct dentry *, const struct qstr *,
@@ -7730,11 +7580,10 @@ index 5ff3e9a4fe5f..ed0431599fd7 100644
  extern struct dentry * d_splice_alias(struct inode *, struct dentry *);
  extern struct dentry * d_add_ci(struct dentry *, struct inode *, struct qstr *);
  extern struct dentry * d_exact_alias(struct dentry *, struct inode *);
-diff --git a/include/linux/delay.h b/include/linux/delay.h
-index a6ecb34cf547..37caab306336 100644
---- a/include/linux/delay.h
-+++ b/include/linux/delay.h
-@@ -52,4 +52,10 @@ static inline void ssleep(unsigned int seconds)
+diff -Nur linux-4.8.15.orig/include/linux/delay.h linux-4.8.15/include/linux/delay.h
+--- linux-4.8.15.orig/include/linux/delay.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/delay.h	2017-01-01 17:07:15.719406860 +0100
+@@ -52,4 +52,10 @@
  	msleep(seconds * 1000);
  }
  
@@ -7745,11 +7594,10 @@ index a6ecb34cf547..37caab306336 100644
 +#endif
 +
  #endif /* defined(_LINUX_DELAY_H) */
-diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
-index 7d565afe35d2..8e31b4d245d2 100644
---- a/include/linux/ftrace.h
-+++ b/include/linux/ftrace.h
-@@ -714,6 +714,7 @@ static inline void __ftrace_enabled_restore(int enabled)
+diff -Nur linux-4.8.15.orig/include/linux/ftrace.h linux-4.8.15/include/linux/ftrace.h
+--- linux-4.8.15.orig/include/linux/ftrace.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/ftrace.h	2017-01-01 17:07:15.743408406 +0100
+@@ -714,6 +714,7 @@
  #define CALLER_ADDR5 ((unsigned long)ftrace_return_address(5))
  #define CALLER_ADDR6 ((unsigned long)ftrace_return_address(6))
  
@@ -7757,7 +7605,7 @@ index 7d565afe35d2..8e31b4d245d2 100644
  static inline unsigned long get_lock_parent_ip(void)
  {
  	unsigned long addr = CALLER_ADDR0;
-@@ -725,6 +726,7 @@ static inline unsigned long get_lock_parent_ip(void)
+@@ -725,6 +726,7 @@
  		return addr;
  	return CALLER_ADDR2;
  }
@@ -7765,10 +7613,9 @@ index 7d565afe35d2..8e31b4d245d2 100644
  
  #ifdef CONFIG_IRQSOFF_TRACER
    extern void time_hardirqs_on(unsigned long a0, unsigned long a1);
-diff --git a/include/linux/highmem.h b/include/linux/highmem.h
-index bb3f3297062a..a117a33ef72c 100644
---- a/include/linux/highmem.h
-+++ b/include/linux/highmem.h
+diff -Nur linux-4.8.15.orig/include/linux/highmem.h linux-4.8.15/include/linux/highmem.h
+--- linux-4.8.15.orig/include/linux/highmem.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/highmem.h	2017-01-01 17:07:15.743408406 +0100
 @@ -7,6 +7,7 @@
  #include <linux/mm.h>
  #include <linux/uaccess.h>
@@ -7777,7 +7624,7 @@ index bb3f3297062a..a117a33ef72c 100644
  
  #include <asm/cacheflush.h>
  
-@@ -65,7 +66,7 @@ static inline void kunmap(struct page *page)
+@@ -65,7 +66,7 @@
  
  static inline void *kmap_atomic(struct page *page)
  {
@@ -7786,7 +7633,7 @@ index bb3f3297062a..a117a33ef72c 100644
  	pagefault_disable();
  	return page_address(page);
  }
-@@ -74,7 +75,7 @@ static inline void *kmap_atomic(struct page *page)
+@@ -74,7 +75,7 @@
  static inline void __kunmap_atomic(void *addr)
  {
  	pagefault_enable();
@@ -7795,7 +7642,7 @@ index bb3f3297062a..a117a33ef72c 100644
  }
  
  #define kmap_atomic_pfn(pfn)	kmap_atomic(pfn_to_page(pfn))
-@@ -86,32 +87,51 @@ static inline void __kunmap_atomic(void *addr)
+@@ -86,32 +87,51 @@
  
  #if defined(CONFIG_HIGHMEM) || defined(CONFIG_X86_32)
  
@@ -7851,11 +7698,10 @@ index bb3f3297062a..a117a33ef72c 100644
  #endif
  }
  
-diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h
-index 5e00f80b1535..65d0671f20b4 100644
---- a/include/linux/hrtimer.h
-+++ b/include/linux/hrtimer.h
-@@ -87,6 +87,9 @@ enum hrtimer_restart {
+diff -Nur linux-4.8.15.orig/include/linux/hrtimer.h linux-4.8.15/include/linux/hrtimer.h
+--- linux-4.8.15.orig/include/linux/hrtimer.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/hrtimer.h	2017-01-01 17:07:15.751408919 +0100
+@@ -87,6 +87,9 @@
   * @function:	timer expiry callback function
   * @base:	pointer to the timer base (per cpu and per clock)
   * @state:	state information (See bit values above)
@@ -7865,7 +7711,7 @@ index 5e00f80b1535..65d0671f20b4 100644
   * @is_rel:	Set if the timer was armed relative
   * @start_pid:  timer statistics field to store the pid of the task which
   *		started the timer
-@@ -103,6 +106,11 @@ struct hrtimer {
+@@ -103,6 +106,11 @@
  	enum hrtimer_restart		(*function)(struct hrtimer *);
  	struct hrtimer_clock_base	*base;
  	u8				state;
@@ -7877,7 +7723,7 @@ index 5e00f80b1535..65d0671f20b4 100644
  	u8				is_rel;
  #ifdef CONFIG_TIMER_STATS
  	int				start_pid;
-@@ -123,11 +131,7 @@ struct hrtimer_sleeper {
+@@ -123,11 +131,7 @@
  	struct task_struct *task;
  };
  
@@ -7889,7 +7735,7 @@ index 5e00f80b1535..65d0671f20b4 100644
  
  /**
   * struct hrtimer_clock_base - the timer base for a specific clock
-@@ -136,6 +140,7 @@ struct hrtimer_sleeper {
+@@ -136,6 +140,7 @@
   *			timer to a base on another cpu.
   * @clockid:		clock id for per_cpu support
   * @active:		red black tree root node for the active timers
@@ -7897,7 +7743,7 @@ index 5e00f80b1535..65d0671f20b4 100644
   * @get_time:		function to retrieve the current time of the clock
   * @offset:		offset of this clock to the monotonic base
   */
-@@ -144,6 +149,7 @@ struct hrtimer_clock_base {
+@@ -144,6 +149,7 @@
  	int			index;
  	clockid_t		clockid;
  	struct timerqueue_head	active;
@@ -7905,7 +7751,7 @@ index 5e00f80b1535..65d0671f20b4 100644
  	ktime_t			(*get_time)(void);
  	ktime_t			offset;
  } __attribute__((__aligned__(HRTIMER_CLOCK_BASE_ALIGN)));
-@@ -187,6 +193,7 @@ struct hrtimer_cpu_base {
+@@ -187,6 +193,7 @@
  	raw_spinlock_t			lock;
  	seqcount_t			seq;
  	struct hrtimer			*running;
@@ -7913,7 +7759,7 @@ index 5e00f80b1535..65d0671f20b4 100644
  	unsigned int			cpu;
  	unsigned int			active_bases;
  	unsigned int			clock_was_set_seq;
-@@ -203,6 +210,9 @@ struct hrtimer_cpu_base {
+@@ -203,6 +210,9 @@
  	unsigned int			nr_hangs;
  	unsigned int			max_hang_time;
  #endif
@@ -7923,7 +7769,7 @@ index 5e00f80b1535..65d0671f20b4 100644
  	struct hrtimer_clock_base	clock_base[HRTIMER_MAX_CLOCK_BASES];
  } ____cacheline_aligned;
  
-@@ -412,6 +422,13 @@ static inline void hrtimer_restart(struct hrtimer *timer)
+@@ -412,6 +422,13 @@
  	hrtimer_start_expires(timer, HRTIMER_MODE_ABS);
  }
  
@@ -7937,7 +7783,7 @@ index 5e00f80b1535..65d0671f20b4 100644
  /* Query timers: */
  extern ktime_t __hrtimer_get_remaining(const struct hrtimer *timer, bool adjust);
  
-@@ -436,7 +453,7 @@ static inline int hrtimer_is_queued(struct hrtimer *timer)
+@@ -436,7 +453,7 @@
   * Helper function to check, whether the timer is running the callback
   * function
   */
@@ -7946,11 +7792,10 @@ index 5e00f80b1535..65d0671f20b4 100644
  {
  	return timer->base->cpu_base->running == timer;
  }
-diff --git a/include/linux/idr.h b/include/linux/idr.h
-index 083d61e92706..5899796f50cb 100644
---- a/include/linux/idr.h
-+++ b/include/linux/idr.h
-@@ -95,10 +95,14 @@ bool idr_is_empty(struct idr *idp);
+diff -Nur linux-4.8.15.orig/include/linux/idr.h linux-4.8.15/include/linux/idr.h
+--- linux-4.8.15.orig/include/linux/idr.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/idr.h	2017-01-01 17:07:15.751408919 +0100
+@@ -95,10 +95,14 @@
   * Each idr_preload() should be matched with an invocation of this
   * function.  See idr_preload() for details.
   */
@@ -7965,11 +7810,10 @@ index 083d61e92706..5899796f50cb 100644
  
  /**
   * idr_find - return pointer for given id
-diff --git a/include/linux/init_task.h b/include/linux/init_task.h
-index f8834f820ec2..a688d5e19578 100644
---- a/include/linux/init_task.h
-+++ b/include/linux/init_task.h
-@@ -148,6 +148,12 @@ extern struct task_group root_task_group;
+diff -Nur linux-4.8.15.orig/include/linux/init_task.h linux-4.8.15/include/linux/init_task.h
+--- linux-4.8.15.orig/include/linux/init_task.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/init_task.h	2017-01-01 17:07:15.751408919 +0100
+@@ -148,6 +148,12 @@
  # define INIT_PERF_EVENTS(tsk)
  #endif
  
@@ -7982,7 +7826,7 @@ index f8834f820ec2..a688d5e19578 100644
  #ifdef CONFIG_VIRT_CPU_ACCOUNTING_GEN
  # define INIT_VTIME(tsk)						\
  	.vtime_seqcount = SEQCNT_ZERO(tsk.vtime_seqcount),	\
-@@ -239,6 +245,7 @@ extern struct task_group root_task_group;
+@@ -239,6 +245,7 @@
  	.cpu_timers	= INIT_CPU_TIMERS(tsk.cpu_timers),		\
  	.pi_lock	= __RAW_SPIN_LOCK_UNLOCKED(tsk.pi_lock),	\
  	.timer_slack_ns = 50000, /* 50 usec default slack */		\
@@ -7990,10 +7834,9 @@ index f8834f820ec2..a688d5e19578 100644
  	.pids = {							\
  		[PIDTYPE_PID]  = INIT_PID_LINK(PIDTYPE_PID),		\
  		[PIDTYPE_PGID] = INIT_PID_LINK(PIDTYPE_PGID),		\
-diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
-index b6683f0ffc9f..c0a351daf736 100644
---- a/include/linux/interrupt.h
-+++ b/include/linux/interrupt.h
+diff -Nur linux-4.8.15.orig/include/linux/interrupt.h linux-4.8.15/include/linux/interrupt.h
+--- linux-4.8.15.orig/include/linux/interrupt.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/interrupt.h	2017-01-01 17:07:15.759409443 +0100
 @@ -14,6 +14,7 @@
  #include <linux/hrtimer.h>
  #include <linux/kref.h>
@@ -8018,7 +7861,7 @@ index b6683f0ffc9f..c0a351daf736 100644
  
  #define IRQF_TIMER		(__IRQF_TIMER | IRQF_NO_SUSPEND | IRQF_NO_THREAD)
  
-@@ -196,7 +199,7 @@ extern void devm_free_irq(struct device *dev, unsigned int irq, void *dev_id);
+@@ -196,7 +199,7 @@
  #ifdef CONFIG_LOCKDEP
  # define local_irq_enable_in_hardirq()	do { } while (0)
  #else
@@ -8027,7 +7870,7 @@ index b6683f0ffc9f..c0a351daf736 100644
  #endif
  
  extern void disable_irq_nosync(unsigned int irq);
-@@ -216,6 +219,7 @@ extern void resume_device_irqs(void);
+@@ -216,6 +219,7 @@
   * struct irq_affinity_notify - context for notification of IRQ affinity changes
   * @irq:		Interrupt to which notification applies
   * @kref:		Reference count, for internal use
@@ -8035,7 +7878,7 @@ index b6683f0ffc9f..c0a351daf736 100644
   * @work:		Work item, for internal use
   * @notify:		Function to be called on change.  This will be
   *			called in process context.
-@@ -227,7 +231,11 @@ extern void resume_device_irqs(void);
+@@ -227,7 +231,11 @@
  struct irq_affinity_notify {
  	unsigned int irq;
  	struct kref kref;
@@ -8047,7 +7890,7 @@ index b6683f0ffc9f..c0a351daf736 100644
  	void (*notify)(struct irq_affinity_notify *, const cpumask_t *mask);
  	void (*release)(struct kref *ref);
  };
-@@ -398,9 +406,13 @@ extern int irq_set_irqchip_state(unsigned int irq, enum irqchip_irq_state which,
+@@ -398,9 +406,13 @@
  				 bool state);
  
  #ifdef CONFIG_IRQ_FORCED_THREADING
@@ -8062,7 +7905,7 @@ index b6683f0ffc9f..c0a351daf736 100644
  #endif
  
  #ifndef __ARCH_SET_SOFTIRQ_PENDING
-@@ -457,9 +469,10 @@ struct softirq_action
+@@ -457,9 +469,10 @@
  	void	(*action)(struct softirq_action *);
  };
  
@@ -8074,7 +7917,7 @@ index b6683f0ffc9f..c0a351daf736 100644
  #ifdef __ARCH_HAS_DO_SOFTIRQ
  void do_softirq_own_stack(void);
  #else
-@@ -468,13 +481,25 @@ static inline void do_softirq_own_stack(void)
+@@ -468,13 +481,25 @@
  	__do_softirq();
  }
  #endif
@@ -8100,7 +7943,7 @@ index b6683f0ffc9f..c0a351daf736 100644
  
  DECLARE_PER_CPU(struct task_struct *, ksoftirqd);
  
-@@ -496,8 +521,9 @@ static inline struct task_struct *this_cpu_ksoftirqd(void)
+@@ -496,8 +521,9 @@
       to be executed on some cpu at least once after this.
     * If the tasklet is already scheduled, but its execution is still not
       started, it will be executed only once.
@@ -8112,7 +7955,7 @@ index b6683f0ffc9f..c0a351daf736 100644
     * Tasklet is strictly serialized wrt itself, but not
       wrt another tasklets. If client needs some intertask synchronization,
       he makes it with spinlocks.
-@@ -522,27 +548,36 @@ struct tasklet_struct name = { NULL, 0, ATOMIC_INIT(1), func, data }
+@@ -522,27 +548,36 @@
  enum
  {
  	TASKLET_STATE_SCHED,	/* Tasklet is scheduled for execution */
@@ -8155,7 +7998,7 @@ index b6683f0ffc9f..c0a351daf736 100644
  #define tasklet_unlock_wait(t) do { } while (0)
  #define tasklet_unlock(t) do { } while (0)
  #endif
-@@ -591,12 +626,7 @@ static inline void tasklet_disable(struct tasklet_struct *t)
+@@ -591,12 +626,7 @@
  	smp_mb();
  }
  
@@ -8169,7 +8012,7 @@ index b6683f0ffc9f..c0a351daf736 100644
  extern void tasklet_kill(struct tasklet_struct *t);
  extern void tasklet_kill_immediate(struct tasklet_struct *t, unsigned int cpu);
  extern void tasklet_init(struct tasklet_struct *t,
-@@ -627,6 +657,12 @@ void tasklet_hrtimer_cancel(struct tasklet_hrtimer *ttimer)
+@@ -627,6 +657,12 @@
  	tasklet_kill(&ttimer->tasklet);
  }
  
@@ -8182,62 +8025,10 @@ index b6683f0ffc9f..c0a351daf736 100644
  /*
   * Autoprobing for irqs:
   *
-diff --git a/include/linux/irq.h b/include/linux/irq.h
-index 0ac26c892fe2..ede85f106aef 100644
---- a/include/linux/irq.h
-+++ b/include/linux/irq.h
-@@ -72,6 +72,7 @@ enum irqchip_irq_state;
-  * IRQ_IS_POLLED		- Always polled by another interrupt. Exclude
-  *				  it from the spurious interrupt detection
-  *				  mechanism and from core side polling.
-+ * IRQ_NO_SOFTIRQ_CALL		- No softirq processing in the irq thread context (RT)
-  * IRQ_DISABLE_UNLAZY		- Disable lazy irq disable
-  */
- enum {
-@@ -99,13 +100,14 @@ enum {
- 	IRQ_PER_CPU_DEVID	= (1 << 17),
- 	IRQ_IS_POLLED		= (1 << 18),
- 	IRQ_DISABLE_UNLAZY	= (1 << 19),
-+	IRQ_NO_SOFTIRQ_CALL	= (1 << 20),
- };
- 
- #define IRQF_MODIFY_MASK	\
- 	(IRQ_TYPE_SENSE_MASK | IRQ_NOPROBE | IRQ_NOREQUEST | \
- 	 IRQ_NOAUTOEN | IRQ_MOVE_PCNTXT | IRQ_LEVEL | IRQ_NO_BALANCING | \
- 	 IRQ_PER_CPU | IRQ_NESTED_THREAD | IRQ_NOTHREAD | IRQ_PER_CPU_DEVID | \
--	 IRQ_IS_POLLED | IRQ_DISABLE_UNLAZY)
-+	 IRQ_IS_POLLED | IRQ_DISABLE_UNLAZY | IRQ_NO_SOFTIRQ_CALL)
- 
- #define IRQ_NO_BALANCING_MASK	(IRQ_PER_CPU | IRQ_NO_BALANCING)
- 
-diff --git a/include/linux/irq_work.h b/include/linux/irq_work.h
-index 47b9ebd4a74f..2543aab05daa 100644
---- a/include/linux/irq_work.h
-+++ b/include/linux/irq_work.h
-@@ -16,6 +16,7 @@
- #define IRQ_WORK_BUSY		2UL
- #define IRQ_WORK_FLAGS		3UL
- #define IRQ_WORK_LAZY		4UL /* Doesn't want IPI, wait for tick */
-+#define IRQ_WORK_HARD_IRQ	8UL /* Run hard IRQ context, even on RT */
- 
- struct irq_work {
- 	unsigned long flags;
-@@ -51,4 +52,10 @@ static inline bool irq_work_needs_cpu(void) { return false; }
- static inline void irq_work_run(void) { }
- #endif
- 
-+#if defined(CONFIG_IRQ_WORK) && defined(CONFIG_PREEMPT_RT_FULL)
-+void irq_work_tick_soft(void);
-+#else
-+static inline void irq_work_tick_soft(void) { }
-+#endif
-+
- #endif /* _LINUX_IRQ_WORK_H */
-diff --git a/include/linux/irqdesc.h b/include/linux/irqdesc.h
-index b51beebf9804..219d9824f762 100644
---- a/include/linux/irqdesc.h
-+++ b/include/linux/irqdesc.h
-@@ -64,6 +64,7 @@ struct irq_desc {
+diff -Nur linux-4.8.15.orig/include/linux/irqdesc.h linux-4.8.15/include/linux/irqdesc.h
+--- linux-4.8.15.orig/include/linux/irqdesc.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/irqdesc.h	2017-01-01 17:07:15.771410216 +0100
+@@ -64,6 +64,7 @@
  	unsigned int		irqs_unhandled;
  	atomic_t		threads_handled;
  	int			threads_handled_last;
@@ -8245,10 +8036,9 @@ index b51beebf9804..219d9824f762 100644
  	raw_spinlock_t		lock;
  	struct cpumask		*percpu_enabled;
  	const struct cpumask	*percpu_affinity;
-diff --git a/include/linux/irqflags.h b/include/linux/irqflags.h
-index 5dd1272d1ab2..9b77034f7c5e 100644
---- a/include/linux/irqflags.h
-+++ b/include/linux/irqflags.h
+diff -Nur linux-4.8.15.orig/include/linux/irqflags.h linux-4.8.15/include/linux/irqflags.h
+--- linux-4.8.15.orig/include/linux/irqflags.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/irqflags.h	2017-01-01 17:07:15.771410216 +0100
 @@ -25,8 +25,6 @@
  # define trace_softirqs_enabled(p)	((p)->softirqs_enabled)
  # define trace_hardirq_enter()	do { current->hardirq_context++; } while (0)
@@ -8299,11 +8089,59 @@ index 5dd1272d1ab2..9b77034f7c5e 100644
 +#endif
 +
  #endif
-diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h
-index dfaa1f4dcb0c..d57dd06544a1 100644
---- a/include/linux/jbd2.h
-+++ b/include/linux/jbd2.h
-@@ -347,32 +347,56 @@ static inline struct journal_head *bh2jh(struct buffer_head *bh)
+diff -Nur linux-4.8.15.orig/include/linux/irq.h linux-4.8.15/include/linux/irq.h
+--- linux-4.8.15.orig/include/linux/irq.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/irq.h	2017-01-01 17:07:15.767409952 +0100
+@@ -72,6 +72,7 @@
+  * IRQ_IS_POLLED		- Always polled by another interrupt. Exclude
+  *				  it from the spurious interrupt detection
+  *				  mechanism and from core side polling.
++ * IRQ_NO_SOFTIRQ_CALL		- No softirq processing in the irq thread context (RT)
+  * IRQ_DISABLE_UNLAZY		- Disable lazy irq disable
+  */
+ enum {
+@@ -99,13 +100,14 @@
+ 	IRQ_PER_CPU_DEVID	= (1 << 17),
+ 	IRQ_IS_POLLED		= (1 << 18),
+ 	IRQ_DISABLE_UNLAZY	= (1 << 19),
++	IRQ_NO_SOFTIRQ_CALL	= (1 << 20),
+ };
+ 
+ #define IRQF_MODIFY_MASK	\
+ 	(IRQ_TYPE_SENSE_MASK | IRQ_NOPROBE | IRQ_NOREQUEST | \
+ 	 IRQ_NOAUTOEN | IRQ_MOVE_PCNTXT | IRQ_LEVEL | IRQ_NO_BALANCING | \
+ 	 IRQ_PER_CPU | IRQ_NESTED_THREAD | IRQ_NOTHREAD | IRQ_PER_CPU_DEVID | \
+-	 IRQ_IS_POLLED | IRQ_DISABLE_UNLAZY)
++	 IRQ_IS_POLLED | IRQ_DISABLE_UNLAZY | IRQ_NO_SOFTIRQ_CALL)
+ 
+ #define IRQ_NO_BALANCING_MASK	(IRQ_PER_CPU | IRQ_NO_BALANCING)
+ 
+diff -Nur linux-4.8.15.orig/include/linux/irq_work.h linux-4.8.15/include/linux/irq_work.h
+--- linux-4.8.15.orig/include/linux/irq_work.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/irq_work.h	2017-01-01 17:07:15.767409952 +0100
+@@ -16,6 +16,7 @@
+ #define IRQ_WORK_BUSY		2UL
+ #define IRQ_WORK_FLAGS		3UL
+ #define IRQ_WORK_LAZY		4UL /* Doesn't want IPI, wait for tick */
++#define IRQ_WORK_HARD_IRQ	8UL /* Run hard IRQ context, even on RT */
+ 
+ struct irq_work {
+ 	unsigned long flags;
+@@ -51,4 +52,10 @@
+ static inline void irq_work_run(void) { }
+ #endif
+ 
++#if defined(CONFIG_IRQ_WORK) && defined(CONFIG_PREEMPT_RT_FULL)
++void irq_work_tick_soft(void);
++#else
++static inline void irq_work_tick_soft(void) { }
++#endif
++
+ #endif /* _LINUX_IRQ_WORK_H */
+diff -Nur linux-4.8.15.orig/include/linux/jbd2.h linux-4.8.15/include/linux/jbd2.h
+--- linux-4.8.15.orig/include/linux/jbd2.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/jbd2.h	2017-01-01 17:07:15.775410464 +0100
+@@ -347,32 +347,56 @@
  
  static inline void jbd_lock_bh_state(struct buffer_head *bh)
  {
@@ -8360,11 +8198,10 @@ index dfaa1f4dcb0c..d57dd06544a1 100644
  }
  
  #define J_ASSERT(assert)	BUG_ON(!(assert))
-diff --git a/include/linux/kdb.h b/include/linux/kdb.h
-index 410decacff8f..0861bebfc188 100644
---- a/include/linux/kdb.h
-+++ b/include/linux/kdb.h
-@@ -167,6 +167,7 @@ extern __printf(2, 0) int vkdb_printf(enum kdb_msgsrc src, const char *fmt,
+diff -Nur linux-4.8.15.orig/include/linux/kdb.h linux-4.8.15/include/linux/kdb.h
+--- linux-4.8.15.orig/include/linux/kdb.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/kdb.h	2017-01-01 17:07:15.775410464 +0100
+@@ -167,6 +167,7 @@
  extern __printf(1, 2) int kdb_printf(const char *, ...);
  typedef __printf(1, 2) int (*kdb_printf_t)(const char *, ...);
  
@@ -8372,7 +8209,7 @@ index 410decacff8f..0861bebfc188 100644
  extern void kdb_init(int level);
  
  /* Access to kdb specific polling devices */
-@@ -201,6 +202,7 @@ extern int kdb_register_flags(char *, kdb_func_t, char *, char *,
+@@ -201,6 +202,7 @@
  extern int kdb_unregister(char *);
  #else /* ! CONFIG_KGDB_KDB */
  static inline __printf(1, 2) int kdb_printf(const char *fmt, ...) { return 0; }
@@ -8380,11 +8217,10 @@ index 410decacff8f..0861bebfc188 100644
  static inline void kdb_init(int level) {}
  static inline int kdb_register(char *cmd, kdb_func_t func, char *usage,
  			       char *help, short minlen) { return 0; }
-diff --git a/include/linux/kernel.h b/include/linux/kernel.h
-index d96a6118d26a..37de2ce2d290 100644
---- a/include/linux/kernel.h
-+++ b/include/linux/kernel.h
-@@ -194,6 +194,9 @@ extern int _cond_resched(void);
+diff -Nur linux-4.8.15.orig/include/linux/kernel.h linux-4.8.15/include/linux/kernel.h
+--- linux-4.8.15.orig/include/linux/kernel.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/kernel.h	2017-01-01 17:07:15.775410464 +0100
+@@ -194,6 +194,9 @@
   */
  # define might_sleep() \
  	do { __might_sleep(__FILE__, __LINE__, 0); might_resched(); } while (0)
@@ -8394,7 +8230,7 @@ index d96a6118d26a..37de2ce2d290 100644
  # define sched_annotate_sleep()	(current->task_state_change = 0)
  #else
    static inline void ___might_sleep(const char *file, int line,
-@@ -201,6 +204,7 @@ extern int _cond_resched(void);
+@@ -201,6 +204,7 @@
    static inline void __might_sleep(const char *file, int line,
  				   int preempt_offset) { }
  # define might_sleep() do { might_resched(); } while (0)
@@ -8402,7 +8238,7 @@ index d96a6118d26a..37de2ce2d290 100644
  # define sched_annotate_sleep() do { } while (0)
  #endif
  
-@@ -491,6 +495,7 @@ extern enum system_states {
+@@ -491,6 +495,7 @@
  	SYSTEM_HALT,
  	SYSTEM_POWER_OFF,
  	SYSTEM_RESTART,
@@ -8410,10 +8246,9 @@ index d96a6118d26a..37de2ce2d290 100644
  } system_state;
  
  #define TAINT_PROPRIETARY_MODULE	0
-diff --git a/include/linux/lglock.h b/include/linux/lglock.h
-index c92ebd100d9b..6f035f635d0e 100644
---- a/include/linux/lglock.h
-+++ b/include/linux/lglock.h
+diff -Nur linux-4.8.15.orig/include/linux/lglock.h linux-4.8.15/include/linux/lglock.h
+--- linux-4.8.15.orig/include/linux/lglock.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/lglock.h	2017-01-01 17:07:15.779410723 +0100
 @@ -34,13 +34,30 @@
  #endif
  
@@ -8445,7 +8280,7 @@ index c92ebd100d9b..6f035f635d0e 100644
  #define DEFINE_LGLOCK(name)						\
  	static DEFINE_PER_CPU(arch_spinlock_t, name ## _lock)		\
  	= __ARCH_SPIN_LOCK_UNLOCKED;					\
-@@ -50,6 +67,7 @@ struct lglock {
+@@ -50,6 +67,7 @@
  	static DEFINE_PER_CPU(arch_spinlock_t, name ## _lock)		\
  	= __ARCH_SPIN_LOCK_UNLOCKED;					\
  	static struct lglock name = { .lock = &name ## _lock }
@@ -8453,7 +8288,7 @@ index c92ebd100d9b..6f035f635d0e 100644
  
  void lg_lock_init(struct lglock *lg, char *name);
  
-@@ -64,6 +82,12 @@ void lg_double_unlock(struct lglock *lg, int cpu1, int cpu2);
+@@ -64,6 +82,12 @@
  void lg_global_lock(struct lglock *lg);
  void lg_global_unlock(struct lglock *lg);
  
@@ -8466,10 +8301,9 @@ index c92ebd100d9b..6f035f635d0e 100644
  #else
  /* When !CONFIG_SMP, map lglock to spinlock */
  #define lglock spinlock
-diff --git a/include/linux/list_bl.h b/include/linux/list_bl.h
-index cb483305e1f5..4e5062316bb6 100644
---- a/include/linux/list_bl.h
-+++ b/include/linux/list_bl.h
+diff -Nur linux-4.8.15.orig/include/linux/list_bl.h linux-4.8.15/include/linux/list_bl.h
+--- linux-4.8.15.orig/include/linux/list_bl.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/list_bl.h	2017-01-01 17:07:15.779410723 +0100
 @@ -2,6 +2,7 @@
  #define _LINUX_LIST_BL_H
  
@@ -8505,7 +8339,7 @@ index cb483305e1f5..4e5062316bb6 100644
  
  static inline void INIT_HLIST_BL_NODE(struct hlist_bl_node *h)
  {
-@@ -118,12 +130,26 @@ static inline void hlist_bl_del_init(struct hlist_bl_node *n)
+@@ -118,12 +130,26 @@
  
  static inline void hlist_bl_lock(struct hlist_bl_head *b)
  {
@@ -8532,11 +8366,9 @@ index cb483305e1f5..4e5062316bb6 100644
  }
  
  static inline bool hlist_bl_is_locked(struct hlist_bl_head *b)
-diff --git a/include/linux/locallock.h b/include/linux/locallock.h
-new file mode 100644
-index 000000000000..845c77f1a5ca
---- /dev/null
-+++ b/include/linux/locallock.h
+diff -Nur linux-4.8.15.orig/include/linux/locallock.h linux-4.8.15/include/linux/locallock.h
+--- linux-4.8.15.orig/include/linux/locallock.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-4.8.15/include/linux/locallock.h	2017-01-01 17:07:15.779410723 +0100
 @@ -0,0 +1,278 @@
 +#ifndef _LINUX_LOCALLOCK_H
 +#define _LINUX_LOCALLOCK_H
@@ -8816,10 +8648,9 @@ index 000000000000..845c77f1a5ca
 +#endif
 +
 +#endif
-diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
-index 903200f4ec41..df670d441fc9 100644
---- a/include/linux/mm_types.h
-+++ b/include/linux/mm_types.h
+diff -Nur linux-4.8.15.orig/include/linux/mm_types.h linux-4.8.15/include/linux/mm_types.h
+--- linux-4.8.15.orig/include/linux/mm_types.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/mm_types.h	2017-01-01 17:07:15.791411498 +0100
 @@ -11,6 +11,7 @@
  #include <linux/completion.h>
  #include <linux/cpumask.h>
@@ -8828,7 +8659,7 @@ index 903200f4ec41..df670d441fc9 100644
  #include <linux/page-flags-layout.h>
  #include <linux/workqueue.h>
  #include <asm/page.h>
-@@ -508,6 +509,9 @@ struct mm_struct {
+@@ -508,6 +509,9 @@
  	bool tlb_flush_pending;
  #endif
  	struct uprobes_state uprobes_state;
@@ -8838,10 +8669,9 @@ index 903200f4ec41..df670d441fc9 100644
  #ifdef CONFIG_X86_INTEL_MPX
  	/* address of the bounds directory */
  	void __user *bd_addr;
-diff --git a/include/linux/mutex.h b/include/linux/mutex.h
-index 2cb7531e7d7a..b3fdfc820216 100644
---- a/include/linux/mutex.h
-+++ b/include/linux/mutex.h
+diff -Nur linux-4.8.15.orig/include/linux/mutex.h linux-4.8.15/include/linux/mutex.h
+--- linux-4.8.15.orig/include/linux/mutex.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/mutex.h	2017-01-01 17:07:15.791411498 +0100
 @@ -19,6 +19,17 @@
  #include <asm/processor.h>
  #include <linux/osq_lock.h>
@@ -8860,7 +8690,7 @@ index 2cb7531e7d7a..b3fdfc820216 100644
  /*
   * Simple, straightforward mutexes with strict semantics:
   *
-@@ -99,13 +110,6 @@ do {							\
+@@ -99,13 +110,6 @@
  static inline void mutex_destroy(struct mutex *lock) {}
  #endif
  
@@ -8874,7 +8704,7 @@ index 2cb7531e7d7a..b3fdfc820216 100644
  #define __MUTEX_INITIALIZER(lockname) \
  		{ .count = ATOMIC_INIT(1) \
  		, .wait_lock = __SPIN_LOCK_UNLOCKED(lockname.wait_lock) \
-@@ -173,6 +177,8 @@ extern int __must_check mutex_lock_killable(struct mutex *lock);
+@@ -173,6 +177,8 @@
  extern int mutex_trylock(struct mutex *lock);
  extern void mutex_unlock(struct mutex *lock);
  
@@ -8883,11 +8713,9 @@ index 2cb7531e7d7a..b3fdfc820216 100644
  extern int atomic_dec_and_mutex_lock(atomic_t *cnt, struct mutex *lock);
  
  #endif /* __LINUX_MUTEX_H */
-diff --git a/include/linux/mutex_rt.h b/include/linux/mutex_rt.h
-new file mode 100644
-index 000000000000..c38a44b14da5
---- /dev/null
-+++ b/include/linux/mutex_rt.h
+diff -Nur linux-4.8.15.orig/include/linux/mutex_rt.h linux-4.8.15/include/linux/mutex_rt.h
+--- linux-4.8.15.orig/include/linux/mutex_rt.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-4.8.15/include/linux/mutex_rt.h	2017-01-01 17:07:15.791411498 +0100
 @@ -0,0 +1,84 @@
 +#ifndef __LINUX_MUTEX_RT_H
 +#define __LINUX_MUTEX_RT_H
@@ -8973,11 +8801,30 @@ index 000000000000..c38a44b14da5
 +} while (0)
 +
 +#endif
-diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
-index e8d79d4ebcfe..2ae8fa187016 100644
---- a/include/linux/netdevice.h
-+++ b/include/linux/netdevice.h
-@@ -2409,14 +2409,53 @@ void netdev_freemem(struct net_device *dev);
+diff -Nur linux-4.8.15.orig/include/linux/netdevice.h linux-4.8.15/include/linux/netdevice.h
+--- linux-4.8.15.orig/include/linux/netdevice.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/netdevice.h	2017-01-01 17:07:15.807412535 +0100
+@@ -395,7 +395,19 @@
+ typedef rx_handler_result_t rx_handler_func_t(struct sk_buff **pskb);
+ 
+ void __napi_schedule(struct napi_struct *n);
++
++/*
++ * When PREEMPT_RT_FULL is defined, all device interrupt handlers
++ * run as threads, and they can also be preempted (without PREEMPT_RT
++ * interrupt threads can not be preempted). Which means that calling
++ * __napi_schedule_irqoff() from an interrupt handler can be preempted
++ * and can corrupt the napi->poll_list.
++ */
++#ifdef CONFIG_PREEMPT_RT_FULL
++#define __napi_schedule_irqoff(n) __napi_schedule(n)
++#else
+ void __napi_schedule_irqoff(struct napi_struct *n);
++#endif
+ 
+ static inline bool napi_disable_pending(struct napi_struct *n)
+ {
+@@ -2446,14 +2458,53 @@
  void synchronize_net(void);
  int init_dummy_netdev(struct net_device *dev);
  
@@ -9032,7 +8879,7 @@ index e8d79d4ebcfe..2ae8fa187016 100644
  struct net_device *dev_get_by_index(struct net *net, int ifindex);
  struct net_device *__dev_get_by_index(struct net *net, int ifindex);
  struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex);
-@@ -2794,6 +2833,7 @@ struct softnet_data {
+@@ -2831,6 +2882,7 @@
  	unsigned int		dropped;
  	struct sk_buff_head	input_pkt_queue;
  	struct napi_struct	backlog;
@@ -9040,10 +8887,9 @@ index e8d79d4ebcfe..2ae8fa187016 100644
  
  };
  
-diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h
-index 2ad1a2b289b5..b4d10155af54 100644
---- a/include/linux/netfilter/x_tables.h
-+++ b/include/linux/netfilter/x_tables.h
+diff -Nur linux-4.8.15.orig/include/linux/netfilter/x_tables.h linux-4.8.15/include/linux/netfilter/x_tables.h
+--- linux-4.8.15.orig/include/linux/netfilter/x_tables.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/netfilter/x_tables.h	2017-01-01 17:07:15.815413044 +0100
 @@ -4,6 +4,7 @@
  
  #include <linux/netdevice.h>
@@ -9052,7 +8898,7 @@ index 2ad1a2b289b5..b4d10155af54 100644
  #include <uapi/linux/netfilter/x_tables.h>
  
  /* Test a struct->invflags and a boolean for inequality */
-@@ -300,6 +301,8 @@ void xt_free_table_info(struct xt_table_info *info);
+@@ -300,6 +301,8 @@
   */
  DECLARE_PER_CPU(seqcount_t, xt_recseq);
  
@@ -9061,7 +8907,7 @@ index 2ad1a2b289b5..b4d10155af54 100644
  /* xt_tee_enabled - true if x_tables needs to handle reentrancy
   *
   * Enabled if current ip(6)tables ruleset has at least one -j TEE rule.
-@@ -320,6 +323,9 @@ static inline unsigned int xt_write_recseq_begin(void)
+@@ -320,6 +323,9 @@
  {
  	unsigned int addend;
  
@@ -9071,7 +8917,7 @@ index 2ad1a2b289b5..b4d10155af54 100644
  	/*
  	 * Low order bit of sequence is set if we already
  	 * called xt_write_recseq_begin().
-@@ -350,6 +356,7 @@ static inline void xt_write_recseq_end(unsigned int addend)
+@@ -350,6 +356,7 @@
  	/* this is kind of a write_seqcount_end(), but addend is 0 or 1 */
  	smp_wmb();
  	__this_cpu_add(xt_recseq.sequence, addend);
@@ -9079,11 +8925,10 @@ index 2ad1a2b289b5..b4d10155af54 100644
  }
  
  /*
-diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
-index 810124b33327..d54ca43d571f 100644
---- a/include/linux/nfs_fs.h
-+++ b/include/linux/nfs_fs.h
-@@ -165,7 +165,11 @@ struct nfs_inode {
+diff -Nur linux-4.8.15.orig/include/linux/nfs_fs.h linux-4.8.15/include/linux/nfs_fs.h
+--- linux-4.8.15.orig/include/linux/nfs_fs.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/nfs_fs.h	2017-01-01 17:07:15.815413044 +0100
+@@ -165,7 +165,11 @@
  
  	/* Readers: in-flight sillydelete RPC calls */
  	/* Writers: rmdir */
@@ -9095,11 +8940,10 @@ index 810124b33327..d54ca43d571f 100644
  
  #if IS_ENABLED(CONFIG_NFS_V4)
  	struct nfs4_cached_acl	*nfs4_acl;
-diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
-index 7cc0deee5bde..a20f49ee69ee 100644
---- a/include/linux/nfs_xdr.h
-+++ b/include/linux/nfs_xdr.h
-@@ -1484,7 +1484,7 @@ struct nfs_unlinkdata {
+diff -Nur linux-4.8.15.orig/include/linux/nfs_xdr.h linux-4.8.15/include/linux/nfs_xdr.h
+--- linux-4.8.15.orig/include/linux/nfs_xdr.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/nfs_xdr.h	2017-01-01 17:07:15.831414081 +0100
+@@ -1484,7 +1484,7 @@
  	struct nfs_removeargs args;
  	struct nfs_removeres res;
  	struct dentry *dentry;
@@ -9108,10 +8952,9 @@ index 7cc0deee5bde..a20f49ee69ee 100644
  	struct rpc_cred	*cred;
  	struct nfs_fattr dir_attr;
  	long timeout;
-diff --git a/include/linux/notifier.h b/include/linux/notifier.h
-index 4149868de4e6..babe5b9bcb91 100644
---- a/include/linux/notifier.h
-+++ b/include/linux/notifier.h
+diff -Nur linux-4.8.15.orig/include/linux/notifier.h linux-4.8.15/include/linux/notifier.h
+--- linux-4.8.15.orig/include/linux/notifier.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/notifier.h	2017-01-01 17:07:15.831414081 +0100
 @@ -6,7 +6,7 @@
   *
   *				Alan Cox <Alan.Cox@linux.org>
@@ -9132,7 +8975,7 @@ index 4149868de4e6..babe5b9bcb91 100644
   */
  
  struct notifier_block;
-@@ -90,7 +88,7 @@ struct srcu_notifier_head {
+@@ -90,7 +88,7 @@
  		(name)->head = NULL;		\
  	} while (0)
  
@@ -9141,7 +8984,7 @@ index 4149868de4e6..babe5b9bcb91 100644
  extern void srcu_init_notifier_head(struct srcu_notifier_head *nh);
  #define srcu_cleanup_notifier_head(name)	\
  		cleanup_srcu_struct(&(name)->srcu);
-@@ -103,7 +101,13 @@ extern void srcu_init_notifier_head(struct srcu_notifier_head *nh);
+@@ -103,7 +101,13 @@
  		.head = NULL }
  #define RAW_NOTIFIER_INIT(name)	{				\
  		.head = NULL }
@@ -9156,7 +8999,7 @@ index 4149868de4e6..babe5b9bcb91 100644
  
  #define ATOMIC_NOTIFIER_HEAD(name)				\
  	struct atomic_notifier_head name =			\
-@@ -115,6 +119,18 @@ extern void srcu_init_notifier_head(struct srcu_notifier_head *nh);
+@@ -115,6 +119,18 @@
  	struct raw_notifier_head name =				\
  		RAW_NOTIFIER_INIT(name)
  
@@ -9175,7 +9018,7 @@ index 4149868de4e6..babe5b9bcb91 100644
  #ifdef __KERNEL__
  
  extern int atomic_notifier_chain_register(struct atomic_notifier_head *nh,
-@@ -184,12 +200,12 @@ static inline int notifier_to_errno(int ret)
+@@ -184,12 +200,12 @@
  
  /*
   *	Declared notifiers so far. I can imagine quite a few more chains
@@ -9191,10 +9034,9 @@ index 4149868de4e6..babe5b9bcb91 100644
  /* CPU notfiers are defined in include/linux/cpu.h. */
  
  /* netdevice notifiers are defined in include/linux/netdevice.h */
-diff --git a/include/linux/percpu.h b/include/linux/percpu.h
-index 56939d3f6e53..1c7e33fc83e4 100644
---- a/include/linux/percpu.h
-+++ b/include/linux/percpu.h
+diff -Nur linux-4.8.15.orig/include/linux/percpu.h linux-4.8.15/include/linux/percpu.h
+--- linux-4.8.15.orig/include/linux/percpu.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/percpu.h	2017-01-01 17:07:15.843414849 +0100
 @@ -18,6 +18,35 @@
  #define PERCPU_MODULE_RESERVE		0
  #endif
@@ -9231,10 +9073,9 @@ index 56939d3f6e53..1c7e33fc83e4 100644
  /* minimum unit size, also is the maximum supported allocation size */
  #define PCPU_MIN_UNIT_SIZE		PFN_ALIGN(32 << 10)
  
-diff --git a/include/linux/pid.h b/include/linux/pid.h
-index 23705a53abba..2cc64b779f03 100644
---- a/include/linux/pid.h
-+++ b/include/linux/pid.h
+diff -Nur linux-4.8.15.orig/include/linux/pid.h linux-4.8.15/include/linux/pid.h
+--- linux-4.8.15.orig/include/linux/pid.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/pid.h	2017-01-01 17:07:15.843414849 +0100
 @@ -2,6 +2,7 @@
  #define _LINUX_PID_H
  
@@ -9243,10 +9084,9 @@ index 23705a53abba..2cc64b779f03 100644
  
  enum pid_type
  {
-diff --git a/include/linux/preempt.h b/include/linux/preempt.h
-index 75e4e30677f1..1cfb1cb72354 100644
---- a/include/linux/preempt.h
-+++ b/include/linux/preempt.h
+diff -Nur linux-4.8.15.orig/include/linux/preempt.h linux-4.8.15/include/linux/preempt.h
+--- linux-4.8.15.orig/include/linux/preempt.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/preempt.h	2017-01-01 17:07:15.851415364 +0100
 @@ -50,7 +50,11 @@
  #define HARDIRQ_OFFSET	(1UL << HARDIRQ_SHIFT)
  #define NMI_OFFSET	(1UL << NMI_SHIFT)
@@ -9297,7 +9137,7 @@ index 75e4e30677f1..1cfb1cb72354 100644
  
  /*
   * The preempt_count offset needed for things like:
-@@ -140,6 +153,20 @@ extern void preempt_count_sub(int val);
+@@ -140,6 +153,20 @@
  #define preempt_count_inc() preempt_count_add(1)
  #define preempt_count_dec() preempt_count_sub(1)
  
@@ -9318,7 +9158,7 @@ index 75e4e30677f1..1cfb1cb72354 100644
  #ifdef CONFIG_PREEMPT_COUNT
  
  #define preempt_disable() \
-@@ -148,13 +175,25 @@ do { \
+@@ -148,13 +175,25 @@
  	barrier(); \
  } while (0)
  
@@ -9345,7 +9185,7 @@ index 75e4e30677f1..1cfb1cb72354 100644
  
  #define preemptible()	(preempt_count() == 0 && !irqs_disabled())
  
-@@ -179,6 +218,13 @@ do { \
+@@ -179,6 +218,13 @@
  		__preempt_schedule(); \
  } while (0)
  
@@ -9359,7 +9199,7 @@ index 75e4e30677f1..1cfb1cb72354 100644
  #else /* !CONFIG_PREEMPT */
  #define preempt_enable() \
  do { \
-@@ -224,6 +270,7 @@ do { \
+@@ -224,6 +270,7 @@
  #define preempt_disable_notrace()		barrier()
  #define preempt_enable_no_resched_notrace()	barrier()
  #define preempt_enable_notrace()		barrier()
@@ -9367,7 +9207,7 @@ index 75e4e30677f1..1cfb1cb72354 100644
  #define preemptible()				0
  
  #endif /* CONFIG_PREEMPT_COUNT */
-@@ -244,10 +291,31 @@ do { \
+@@ -244,10 +291,31 @@
  } while (0)
  #define preempt_fold_need_resched() \
  do { \
@@ -9400,11 +9240,10 @@ index 75e4e30677f1..1cfb1cb72354 100644
  #ifdef CONFIG_PREEMPT_NOTIFIERS
  
  struct preempt_notifier;
-diff --git a/include/linux/printk.h b/include/linux/printk.h
-index 696a56be7d3e..310aa321ef0c 100644
---- a/include/linux/printk.h
-+++ b/include/linux/printk.h
-@@ -125,9 +125,11 @@ struct va_format {
+diff -Nur linux-4.8.15.orig/include/linux/printk.h linux-4.8.15/include/linux/printk.h
+--- linux-4.8.15.orig/include/linux/printk.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/printk.h	2017-01-01 17:07:15.855415618 +0100
+@@ -125,9 +125,11 @@
  #ifdef CONFIG_EARLY_PRINTK
  extern asmlinkage __printf(1, 2)
  void early_printk(const char *fmt, ...);
@@ -9416,11 +9255,10 @@ index 696a56be7d3e..310aa321ef0c 100644
  #endif
  
  #ifdef CONFIG_PRINTK_NMI
-diff --git a/include/linux/radix-tree.h b/include/linux/radix-tree.h
-index 52b97db93830..fd9ea1c68db6 100644
---- a/include/linux/radix-tree.h
-+++ b/include/linux/radix-tree.h
-@@ -289,9 +289,19 @@ unsigned int radix_tree_gang_lookup(struct radix_tree_root *root,
+diff -Nur linux-4.8.15.orig/include/linux/radix-tree.h linux-4.8.15/include/linux/radix-tree.h
+--- linux-4.8.15.orig/include/linux/radix-tree.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/radix-tree.h	2017-01-01 17:07:15.859415876 +0100
+@@ -289,9 +289,19 @@
  unsigned int radix_tree_gang_lookup_slot(struct radix_tree_root *root,
  			void ***results, unsigned long *indices,
  			unsigned long first_index, unsigned int max_items);
@@ -9440,7 +9278,7 @@ index 52b97db93830..fd9ea1c68db6 100644
  void radix_tree_init(void);
  void *radix_tree_tag_set(struct radix_tree_root *root,
  			unsigned long index, unsigned int tag);
-@@ -316,7 +326,7 @@ unsigned long radix_tree_locate_item(struct radix_tree_root *root, void *item);
+@@ -316,7 +326,7 @@
  
  static inline void radix_tree_preload_end(void)
  {
@@ -9449,11 +9287,10 @@ index 52b97db93830..fd9ea1c68db6 100644
  }
  
  /**
-diff --git a/include/linux/random.h b/include/linux/random.h
-index 3d6e9815cd85..f6e8860b6494 100644
---- a/include/linux/random.h
-+++ b/include/linux/random.h
-@@ -20,7 +20,7 @@ struct random_ready_callback {
+diff -Nur linux-4.8.15.orig/include/linux/random.h linux-4.8.15/include/linux/random.h
+--- linux-4.8.15.orig/include/linux/random.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/random.h	2017-01-01 17:07:15.859415876 +0100
+@@ -20,7 +20,7 @@
  extern void add_device_randomness(const void *, unsigned int);
  extern void add_input_randomness(unsigned int type, unsigned int code,
  				 unsigned int value);
@@ -9462,10 +9299,20 @@ index 3d6e9815cd85..f6e8860b6494 100644
  
  extern void get_random_bytes(void *buf, int nbytes);
  extern int add_random_ready_callback(struct random_ready_callback *rdy);
-diff --git a/include/linux/rbtree.h b/include/linux/rbtree.h
-index e585018498d5..25c64474fc27 100644
---- a/include/linux/rbtree.h
-+++ b/include/linux/rbtree.h
+diff -Nur linux-4.8.15.orig/include/linux/rbtree_augmented.h linux-4.8.15/include/linux/rbtree_augmented.h
+--- linux-4.8.15.orig/include/linux/rbtree_augmented.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/rbtree_augmented.h	2017-01-01 17:07:15.859415876 +0100
+@@ -26,6 +26,7 @@
+ 
+ #include <linux/compiler.h>
+ #include <linux/rbtree.h>
++#include <linux/rcupdate.h>
+ 
+ /*
+  * Please note - only struct rb_augment_callbacks and the prototypes for
+diff -Nur linux-4.8.15.orig/include/linux/rbtree.h linux-4.8.15/include/linux/rbtree.h
+--- linux-4.8.15.orig/include/linux/rbtree.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/rbtree.h	2017-01-01 17:07:15.859415876 +0100
 @@ -31,7 +31,7 @@
  
  #include <linux/kernel.h>
@@ -9475,23 +9322,9 @@ index e585018498d5..25c64474fc27 100644
  
  struct rb_node {
  	unsigned long  __rb_parent_color;
-diff --git a/include/linux/rbtree_augmented.h b/include/linux/rbtree_augmented.h
-index d076183e49be..36bfb4dd57ae 100644
---- a/include/linux/rbtree_augmented.h
-+++ b/include/linux/rbtree_augmented.h
-@@ -26,6 +26,7 @@
- 
- #include <linux/compiler.h>
- #include <linux/rbtree.h>
-+#include <linux/rcupdate.h>
- 
- /*
-  * Please note - only struct rb_augment_callbacks and the prototypes for
-diff --git a/include/linux/rcu_assign_pointer.h b/include/linux/rcu_assign_pointer.h
-new file mode 100644
-index 000000000000..7066962a4379
---- /dev/null
-+++ b/include/linux/rcu_assign_pointer.h
+diff -Nur linux-4.8.15.orig/include/linux/rcu_assign_pointer.h linux-4.8.15/include/linux/rcu_assign_pointer.h
+--- linux-4.8.15.orig/include/linux/rcu_assign_pointer.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-4.8.15/include/linux/rcu_assign_pointer.h	2017-01-01 17:07:15.859415876 +0100
 @@ -0,0 +1,54 @@
 +#ifndef __LINUX_RCU_ASSIGN_POINTER_H__
 +#define __LINUX_RCU_ASSIGN_POINTER_H__
@@ -9547,10 +9380,9 @@ index 000000000000..7066962a4379
 +})
 +
 +#endif
-diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
-index 1aa62e1a761b..2a614acb433e 100644
---- a/include/linux/rcupdate.h
-+++ b/include/linux/rcupdate.h
+diff -Nur linux-4.8.15.orig/include/linux/rcupdate.h linux-4.8.15/include/linux/rcupdate.h
+--- linux-4.8.15.orig/include/linux/rcupdate.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/rcupdate.h	2017-01-01 17:07:15.867416395 +0100
 @@ -46,6 +46,7 @@
  #include <linux/compiler.h>
  #include <linux/ktime.h>
@@ -9559,7 +9391,7 @@ index 1aa62e1a761b..2a614acb433e 100644
  
  #include <asm/barrier.h>
  
-@@ -178,6 +179,9 @@ void call_rcu(struct rcu_head *head,
+@@ -178,6 +179,9 @@
  
  #endif /* #else #ifdef CONFIG_PREEMPT_RCU */
  
@@ -9569,7 +9401,7 @@ index 1aa62e1a761b..2a614acb433e 100644
  /**
   * call_rcu_bh() - Queue an RCU for invocation after a quicker grace period.
   * @head: structure to be used for queueing the RCU updates.
-@@ -201,6 +205,7 @@ void call_rcu(struct rcu_head *head,
+@@ -201,6 +205,7 @@
   */
  void call_rcu_bh(struct rcu_head *head,
  		 rcu_callback_t func);
@@ -9577,7 +9409,7 @@ index 1aa62e1a761b..2a614acb433e 100644
  
  /**
   * call_rcu_sched() - Queue an RCU for invocation after sched grace period.
-@@ -301,6 +306,11 @@ void synchronize_rcu(void);
+@@ -301,6 +306,11 @@
   * types of kernel builds, the rcu_read_lock() nesting depth is unknowable.
   */
  #define rcu_preempt_depth() (current->rcu_read_lock_nesting)
@@ -9589,7 +9421,7 @@ index 1aa62e1a761b..2a614acb433e 100644
  
  #else /* #ifdef CONFIG_PREEMPT_RCU */
  
-@@ -326,6 +336,8 @@ static inline int rcu_preempt_depth(void)
+@@ -326,6 +336,8 @@
  	return 0;
  }
  
@@ -9598,7 +9430,7 @@ index 1aa62e1a761b..2a614acb433e 100644
  #endif /* #else #ifdef CONFIG_PREEMPT_RCU */
  
  /* Internal to kernel */
-@@ -500,7 +512,14 @@ extern struct lockdep_map rcu_callback_map;
+@@ -500,7 +512,14 @@
  int debug_lockdep_rcu_enabled(void);
  
  int rcu_read_lock_held(void);
@@ -9613,7 +9445,7 @@ index 1aa62e1a761b..2a614acb433e 100644
  
  /**
   * rcu_read_lock_sched_held() - might we be in RCU-sched read-side critical section?
-@@ -621,54 +640,6 @@ static inline void rcu_preempt_sleep_check(void)
+@@ -621,54 +640,6 @@
  })
  
  /**
@@ -9668,7 +9500,7 @@ index 1aa62e1a761b..2a614acb433e 100644
   * rcu_access_pointer() - fetch RCU pointer with no dereferencing
   * @p: The pointer to read
   *
-@@ -946,10 +917,14 @@ static inline void rcu_read_unlock(void)
+@@ -946,10 +917,14 @@
  static inline void rcu_read_lock_bh(void)
  {
  	local_bh_disable();
@@ -9683,7 +9515,7 @@ index 1aa62e1a761b..2a614acb433e 100644
  }
  
  /*
-@@ -959,10 +934,14 @@ static inline void rcu_read_lock_bh(void)
+@@ -959,10 +934,14 @@
   */
  static inline void rcu_read_unlock_bh(void)
  {
@@ -9698,11 +9530,10 @@ index 1aa62e1a761b..2a614acb433e 100644
  	local_bh_enable();
  }
  
-diff --git a/include/linux/rcutree.h b/include/linux/rcutree.h
-index 63a4e4cf40a5..08ab12df2863 100644
---- a/include/linux/rcutree.h
-+++ b/include/linux/rcutree.h
-@@ -44,7 +44,11 @@ static inline void rcu_virt_note_context_switch(int cpu)
+diff -Nur linux-4.8.15.orig/include/linux/rcutree.h linux-4.8.15/include/linux/rcutree.h
+--- linux-4.8.15.orig/include/linux/rcutree.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/rcutree.h	2017-01-01 17:07:15.867416395 +0100
+@@ -44,7 +44,11 @@
  	rcu_note_context_switch();
  }
  
@@ -9714,7 +9545,7 @@ index 63a4e4cf40a5..08ab12df2863 100644
  void synchronize_sched_expedited(void);
  void synchronize_rcu_expedited(void);
  
-@@ -72,7 +76,11 @@ static inline void synchronize_rcu_bh_expedited(void)
+@@ -72,7 +76,11 @@
  }
  
  void rcu_barrier(void);
@@ -9726,7 +9557,7 @@ index 63a4e4cf40a5..08ab12df2863 100644
  void rcu_barrier_sched(void);
  unsigned long get_state_synchronize_rcu(void);
  void cond_synchronize_rcu(unsigned long oldstate);
-@@ -82,17 +90,14 @@ void cond_synchronize_sched(unsigned long oldstate);
+@@ -82,17 +90,14 @@
  extern unsigned long rcutorture_testseq;
  extern unsigned long rcutorture_vernum;
  unsigned long rcu_batches_started(void);
@@ -9744,7 +9575,7 @@ index 63a4e4cf40a5..08ab12df2863 100644
  void rcu_sched_force_quiescent_state(void);
  
  void rcu_idle_enter(void);
-@@ -109,6 +114,16 @@ extern int rcu_scheduler_active __read_mostly;
+@@ -109,6 +114,16 @@
  
  bool rcu_is_watching(void);
  
@@ -9761,10 +9592,9 @@ index 63a4e4cf40a5..08ab12df2863 100644
  void rcu_all_qs(void);
  
  /* RCUtree hotplug events */
-diff --git a/include/linux/rtmutex.h b/include/linux/rtmutex.h
-index 1abba5ce2a2f..30211c627511 100644
---- a/include/linux/rtmutex.h
-+++ b/include/linux/rtmutex.h
+diff -Nur linux-4.8.15.orig/include/linux/rtmutex.h linux-4.8.15/include/linux/rtmutex.h
+--- linux-4.8.15.orig/include/linux/rtmutex.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/rtmutex.h	2017-01-01 17:07:15.875416916 +0100
 @@ -13,11 +13,15 @@
  #define __LINUX_RT_MUTEX_H
  
@@ -9782,7 +9612,7 @@ index 1abba5ce2a2f..30211c627511 100644
  /**
   * The rt_mutex structure
   *
-@@ -31,8 +35,8 @@ struct rt_mutex {
+@@ -31,8 +35,8 @@
  	struct rb_root          waiters;
  	struct rb_node          *waiters_leftmost;
  	struct task_struct	*owner;
@@ -9792,7 +9622,7 @@ index 1abba5ce2a2f..30211c627511 100644
  	const char 		*name, *file;
  	int			line;
  	void			*magic;
-@@ -55,22 +59,33 @@ struct hrtimer_sleeper;
+@@ -55,22 +59,33 @@
  # define rt_mutex_debug_check_no_locks_held(task)	do { } while (0)
  #endif
  
@@ -9831,7 +9661,7 @@ index 1abba5ce2a2f..30211c627511 100644
  
  #define DEFINE_RT_MUTEX(mutexname) \
  	struct rt_mutex mutexname = __RT_MUTEX_INITIALIZER(mutexname)
-@@ -91,6 +106,7 @@ extern void rt_mutex_destroy(struct rt_mutex *lock);
+@@ -91,6 +106,7 @@
  
  extern void rt_mutex_lock(struct rt_mutex *lock);
  extern int rt_mutex_lock_interruptible(struct rt_mutex *lock);
@@ -9839,11 +9669,9 @@ index 1abba5ce2a2f..30211c627511 100644
  extern int rt_mutex_timed_lock(struct rt_mutex *lock,
  			       struct hrtimer_sleeper *timeout);
  
-diff --git a/include/linux/rwlock_rt.h b/include/linux/rwlock_rt.h
-new file mode 100644
-index 000000000000..49ed2d45d3be
---- /dev/null
-+++ b/include/linux/rwlock_rt.h
+diff -Nur linux-4.8.15.orig/include/linux/rwlock_rt.h linux-4.8.15/include/linux/rwlock_rt.h
+--- linux-4.8.15.orig/include/linux/rwlock_rt.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-4.8.15/include/linux/rwlock_rt.h	2017-01-01 17:07:15.875416916 +0100
 @@ -0,0 +1,99 @@
 +#ifndef __LINUX_RWLOCK_RT_H
 +#define __LINUX_RWLOCK_RT_H
@@ -9944,10 +9772,9 @@ index 000000000000..49ed2d45d3be
 +	} while (0)
 +
 +#endif
-diff --git a/include/linux/rwlock_types.h b/include/linux/rwlock_types.h
-index cc0072e93e36..5317cd957292 100644
---- a/include/linux/rwlock_types.h
-+++ b/include/linux/rwlock_types.h
+diff -Nur linux-4.8.15.orig/include/linux/rwlock_types.h linux-4.8.15/include/linux/rwlock_types.h
+--- linux-4.8.15.orig/include/linux/rwlock_types.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/rwlock_types.h	2017-01-01 17:07:15.875416916 +0100
 @@ -1,6 +1,10 @@
  #ifndef __LINUX_RWLOCK_TYPES_H
  #define __LINUX_RWLOCK_TYPES_H
@@ -9959,11 +9786,9 @@ index cc0072e93e36..5317cd957292 100644
  /*
   * include/linux/rwlock_types.h - generic rwlock type definitions
   *				  and initializers
-diff --git a/include/linux/rwlock_types_rt.h b/include/linux/rwlock_types_rt.h
-new file mode 100644
-index 000000000000..51b28d775fe1
---- /dev/null
-+++ b/include/linux/rwlock_types_rt.h
+diff -Nur linux-4.8.15.orig/include/linux/rwlock_types_rt.h linux-4.8.15/include/linux/rwlock_types_rt.h
+--- linux-4.8.15.orig/include/linux/rwlock_types_rt.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-4.8.15/include/linux/rwlock_types_rt.h	2017-01-01 17:07:15.875416916 +0100
 @@ -0,0 +1,33 @@
 +#ifndef __LINUX_RWLOCK_TYPES_RT_H
 +#define __LINUX_RWLOCK_TYPES_RT_H
@@ -9998,10 +9823,9 @@ index 000000000000..51b28d775fe1
 +	rwlock_t name = __RW_LOCK_UNLOCKED(name)
 +
 +#endif
-diff --git a/include/linux/rwsem.h b/include/linux/rwsem.h
-index dd1d14250340..8e1f44ff1f2f 100644
---- a/include/linux/rwsem.h
-+++ b/include/linux/rwsem.h
+diff -Nur linux-4.8.15.orig/include/linux/rwsem.h linux-4.8.15/include/linux/rwsem.h
+--- linux-4.8.15.orig/include/linux/rwsem.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/rwsem.h	2017-01-01 17:07:15.875416916 +0100
 @@ -19,6 +19,10 @@
  #include <linux/osq_lock.h>
  #endif
@@ -10013,18 +9837,16 @@ index dd1d14250340..8e1f44ff1f2f 100644
  struct rw_semaphore;
  
  #ifdef CONFIG_RWSEM_GENERIC_SPINLOCK
-@@ -184,4 +188,6 @@ extern void up_read_non_owner(struct rw_semaphore *sem);
+@@ -184,4 +188,6 @@
  # define up_read_non_owner(sem)			up_read(sem)
  #endif
  
 +#endif /* !PREEMPT_RT_FULL */
 +
  #endif /* _LINUX_RWSEM_H */
-diff --git a/include/linux/rwsem_rt.h b/include/linux/rwsem_rt.h
-new file mode 100644
-index 000000000000..e26bd95a57c3
---- /dev/null
-+++ b/include/linux/rwsem_rt.h
+diff -Nur linux-4.8.15.orig/include/linux/rwsem_rt.h linux-4.8.15/include/linux/rwsem_rt.h
+--- linux-4.8.15.orig/include/linux/rwsem_rt.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-4.8.15/include/linux/rwsem_rt.h	2017-01-01 17:07:15.875416916 +0100
 @@ -0,0 +1,167 @@
 +#ifndef _LINUX_RWSEM_RT_H
 +#define _LINUX_RWSEM_RT_H
@@ -10193,11 +10015,10 @@ index 000000000000..e26bd95a57c3
 +}
 +#endif
 +#endif
-diff --git a/include/linux/sched.h b/include/linux/sched.h
-index 62c68e513e39..c873ce0183ab 100644
---- a/include/linux/sched.h
-+++ b/include/linux/sched.h
-@@ -26,6 +26,7 @@ struct sched_param {
+diff -Nur linux-4.8.15.orig/include/linux/sched.h linux-4.8.15/include/linux/sched.h
+--- linux-4.8.15.orig/include/linux/sched.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/sched.h	2017-01-01 17:07:15.887417685 +0100
+@@ -26,6 +26,7 @@
  #include <linux/nodemask.h>
  #include <linux/mm_types.h>
  #include <linux/preempt.h>
@@ -10205,7 +10026,7 @@ index 62c68e513e39..c873ce0183ab 100644
  
  #include <asm/page.h>
  #include <asm/ptrace.h>
-@@ -243,10 +244,7 @@ extern char ___assert_task_state[1 - 2*!!(
+@@ -243,10 +244,7 @@
  				 TASK_UNINTERRUPTIBLE | __TASK_STOPPED | \
  				 __TASK_TRACED | EXIT_ZOMBIE | EXIT_DEAD)
  
@@ -10216,7 +10037,7 @@ index 62c68e513e39..c873ce0183ab 100644
  #define task_contributes_to_load(task)	\
  				((task->state & TASK_UNINTERRUPTIBLE) != 0 && \
  				 (task->flags & PF_FROZEN) == 0 && \
-@@ -312,6 +310,11 @@ extern char ___assert_task_state[1 - 2*!!(
+@@ -312,6 +310,11 @@
  
  #endif
  
@@ -10228,7 +10049,7 @@ index 62c68e513e39..c873ce0183ab 100644
  /* Task command name length */
  #define TASK_COMM_LEN 16
  
-@@ -1009,8 +1012,18 @@ struct wake_q_head {
+@@ -1009,8 +1012,18 @@
  	struct wake_q_head name = { WAKE_Q_TAIL, &name.first }
  
  extern void wake_q_add(struct wake_q_head *head,
@@ -10249,7 +10070,7 @@ index 62c68e513e39..c873ce0183ab 100644
  
  /*
   * sched-domains (multiprocessor balancing) declarations:
-@@ -1459,6 +1472,7 @@ struct tlbflush_unmap_batch {
+@@ -1459,6 +1472,7 @@
  
  struct task_struct {
  	volatile long state;	/* -1 unrunnable, 0 runnable, >0 stopped */
@@ -10257,7 +10078,7 @@ index 62c68e513e39..c873ce0183ab 100644
  	void *stack;
  	atomic_t usage;
  	unsigned int flags;	/* per process flags, defined below */
-@@ -1495,6 +1509,12 @@ struct task_struct {
+@@ -1495,6 +1509,12 @@
  #endif
  
  	unsigned int policy;
@@ -10270,7 +10091,7 @@ index 62c68e513e39..c873ce0183ab 100644
  	int nr_cpus_allowed;
  	cpumask_t cpus_allowed;
  
-@@ -1629,6 +1649,9 @@ struct task_struct {
+@@ -1629,6 +1649,9 @@
  
  	struct task_cputime cputime_expires;
  	struct list_head cpu_timers[3];
@@ -10280,7 +10101,7 @@ index 62c68e513e39..c873ce0183ab 100644
  
  /* process credentials */
  	const struct cred __rcu *real_cred; /* objective and real subjective task
-@@ -1659,10 +1682,15 @@ struct task_struct {
+@@ -1659,10 +1682,15 @@
  /* signal handlers */
  	struct signal_struct *signal;
  	struct sighand_struct *sighand;
@@ -10296,7 +10117,7 @@ index 62c68e513e39..c873ce0183ab 100644
  
  	unsigned long sas_ss_sp;
  	size_t sas_ss_size;
-@@ -1891,6 +1919,12 @@ struct task_struct {
+@@ -1891,6 +1919,12 @@
  	/* bitmask and counter of trace recursion */
  	unsigned long trace_recursion;
  #endif /* CONFIG_TRACING */
@@ -10309,7 +10130,7 @@ index 62c68e513e39..c873ce0183ab 100644
  #ifdef CONFIG_KCOV
  	/* Coverage collection mode enabled for this task (0 if disabled). */
  	enum kcov_mode kcov_mode;
-@@ -1916,9 +1950,23 @@ struct task_struct {
+@@ -1916,9 +1950,23 @@
  	unsigned int	sequential_io;
  	unsigned int	sequential_io_avg;
  #endif
@@ -10333,7 +10154,7 @@ index 62c68e513e39..c873ce0183ab 100644
  	int pagefault_disabled;
  #ifdef CONFIG_MMU
  	struct task_struct *oom_reaper_list;
-@@ -1939,14 +1987,6 @@ extern int arch_task_struct_size __read_mostly;
+@@ -1939,14 +1987,6 @@
  # define arch_task_struct_size (sizeof(struct task_struct))
  #endif
  
@@ -10348,7 +10169,7 @@ index 62c68e513e39..c873ce0183ab 100644
  #define TNF_MIGRATED	0x01
  #define TNF_NO_GROUP	0x02
  #define TNF_SHARED	0x04
-@@ -2162,6 +2202,15 @@ extern struct pid *cad_pid;
+@@ -2162,6 +2202,15 @@
  extern void free_task(struct task_struct *tsk);
  #define get_task_struct(tsk) do { atomic_inc(&(tsk)->usage); } while(0)
  
@@ -10364,7 +10185,7 @@ index 62c68e513e39..c873ce0183ab 100644
  extern void __put_task_struct(struct task_struct *t);
  
  static inline void put_task_struct(struct task_struct *t)
-@@ -2169,6 +2218,7 @@ static inline void put_task_struct(struct task_struct *t)
+@@ -2169,6 +2218,7 @@
  	if (atomic_dec_and_test(&t->usage))
  		__put_task_struct(t);
  }
@@ -10372,7 +10193,7 @@ index 62c68e513e39..c873ce0183ab 100644
  
  struct task_struct *task_rcu_dereference(struct task_struct **ptask);
  struct task_struct *try_get_task_struct(struct task_struct **ptask);
-@@ -2210,6 +2260,7 @@ extern void thread_group_cputime_adjusted(struct task_struct *p, cputime_t *ut,
+@@ -2210,6 +2260,7 @@
  /*
   * Per process flags
   */
@@ -10380,7 +10201,7 @@ index 62c68e513e39..c873ce0183ab 100644
  #define PF_EXITING	0x00000004	/* getting shut down */
  #define PF_EXITPIDONE	0x00000008	/* pi exit done on shut down */
  #define PF_VCPU		0x00000010	/* I'm a virtual CPU */
-@@ -2378,6 +2429,10 @@ extern void do_set_cpus_allowed(struct task_struct *p,
+@@ -2378,6 +2429,10 @@
  
  extern int set_cpus_allowed_ptr(struct task_struct *p,
  				const struct cpumask *new_mask);
@@ -10391,7 +10212,7 @@ index 62c68e513e39..c873ce0183ab 100644
  #else
  static inline void do_set_cpus_allowed(struct task_struct *p,
  				      const struct cpumask *new_mask)
-@@ -2390,6 +2445,9 @@ static inline int set_cpus_allowed_ptr(struct task_struct *p,
+@@ -2390,6 +2445,9 @@
  		return -EINVAL;
  	return 0;
  }
@@ -10401,7 +10222,7 @@ index 62c68e513e39..c873ce0183ab 100644
  #endif
  
  #ifdef CONFIG_NO_HZ_COMMON
-@@ -2624,6 +2682,7 @@ extern void xtime_update(unsigned long ticks);
+@@ -2624,6 +2682,7 @@
  
  extern int wake_up_state(struct task_struct *tsk, unsigned int state);
  extern int wake_up_process(struct task_struct *tsk);
@@ -10409,7 +10230,7 @@ index 62c68e513e39..c873ce0183ab 100644
  extern void wake_up_new_task(struct task_struct *tsk);
  #ifdef CONFIG_SMP
   extern void kick_process(struct task_struct *tsk);
-@@ -2832,6 +2891,17 @@ static inline void mmdrop(struct mm_struct *mm)
+@@ -2832,6 +2891,17 @@
  		__mmdrop(mm);
  }
  
@@ -10427,7 +10248,7 @@ index 62c68e513e39..c873ce0183ab 100644
  static inline bool mmget_not_zero(struct mm_struct *mm)
  {
  	return atomic_inc_not_zero(&mm->mm_users);
-@@ -3168,6 +3238,43 @@ static inline int test_tsk_need_resched(struct task_struct *tsk)
+@@ -3168,6 +3238,43 @@
  	return unlikely(test_tsk_thread_flag(tsk,TIF_NEED_RESCHED));
  }
  
@@ -10471,7 +10292,7 @@ index 62c68e513e39..c873ce0183ab 100644
  static inline int restart_syscall(void)
  {
  	set_tsk_thread_flag(current, TIF_SIGPENDING);
-@@ -3199,6 +3306,51 @@ static inline int signal_pending_state(long state, struct task_struct *p)
+@@ -3199,6 +3306,51 @@
  	return (state & TASK_INTERRUPTIBLE) || __fatal_signal_pending(p);
  }
  
@@ -10523,7 +10344,7 @@ index 62c68e513e39..c873ce0183ab 100644
  /*
   * cond_resched() and cond_resched_lock(): latency reduction via
   * explicit rescheduling in places that are safe. The return
-@@ -3220,12 +3372,16 @@ extern int __cond_resched_lock(spinlock_t *lock);
+@@ -3220,12 +3372,16 @@
  	__cond_resched_lock(lock);				\
  })
  
@@ -10540,7 +10361,7 @@ index 62c68e513e39..c873ce0183ab 100644
  
  static inline void cond_resched_rcu(void)
  {
-@@ -3387,6 +3543,31 @@ static inline void set_task_cpu(struct task_struct *p, unsigned int cpu)
+@@ -3387,6 +3543,31 @@
  
  #endif /* CONFIG_SMP */
  
@@ -10572,11 +10393,10 @@ index 62c68e513e39..c873ce0183ab 100644
  extern long sched_setaffinity(pid_t pid, const struct cpumask *new_mask);
  extern long sched_getaffinity(pid_t pid, struct cpumask *mask);
  
-diff --git a/include/linux/seqlock.h b/include/linux/seqlock.h
-index ead97654c4e9..3d7223ffdd3b 100644
---- a/include/linux/seqlock.h
-+++ b/include/linux/seqlock.h
-@@ -220,20 +220,30 @@ static inline int read_seqcount_retry(const seqcount_t *s, unsigned start)
+diff -Nur linux-4.8.15.orig/include/linux/seqlock.h linux-4.8.15/include/linux/seqlock.h
+--- linux-4.8.15.orig/include/linux/seqlock.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/seqlock.h	2017-01-01 17:07:15.899418461 +0100
+@@ -220,20 +220,30 @@
  	return __read_seqcount_retry(s, start);
  }
  
@@ -10611,7 +10431,7 @@ index ead97654c4e9..3d7223ffdd3b 100644
  /**
   * raw_write_seqcount_barrier - do a seq write barrier
   * @s: pointer to seqcount_t
-@@ -428,10 +438,32 @@ typedef struct {
+@@ -428,10 +438,32 @@
  /*
   * Read side functions for starting and finalizing a read side section.
   */
@@ -10644,7 +10464,7 @@ index ead97654c4e9..3d7223ffdd3b 100644
  
  static inline unsigned read_seqretry(const seqlock_t *sl, unsigned start)
  {
-@@ -446,36 +478,45 @@ static inline unsigned read_seqretry(const seqlock_t *sl, unsigned start)
+@@ -446,36 +478,45 @@
  static inline void write_seqlock(seqlock_t *sl)
  {
  	spin_lock(&sl->lock);
@@ -10696,7 +10516,7 @@ index ead97654c4e9..3d7223ffdd3b 100644
  	spin_unlock_irq(&sl->lock);
  }
  
-@@ -484,7 +525,7 @@ static inline unsigned long __write_seqlock_irqsave(seqlock_t *sl)
+@@ -484,7 +525,7 @@
  	unsigned long flags;
  
  	spin_lock_irqsave(&sl->lock, flags);
@@ -10705,7 +10525,7 @@ index ead97654c4e9..3d7223ffdd3b 100644
  	return flags;
  }
  
-@@ -494,7 +535,7 @@ static inline unsigned long __write_seqlock_irqsave(seqlock_t *sl)
+@@ -494,7 +535,7 @@
  static inline void
  write_sequnlock_irqrestore(seqlock_t *sl, unsigned long flags)
  {
@@ -10714,11 +10534,10 @@ index ead97654c4e9..3d7223ffdd3b 100644
  	spin_unlock_irqrestore(&sl->lock, flags);
  }
  
-diff --git a/include/linux/signal.h b/include/linux/signal.h
-index b63f63eaa39c..295540fdfc72 100644
---- a/include/linux/signal.h
-+++ b/include/linux/signal.h
-@@ -233,6 +233,7 @@ static inline void init_sigpending(struct sigpending *sig)
+diff -Nur linux-4.8.15.orig/include/linux/signal.h linux-4.8.15/include/linux/signal.h
+--- linux-4.8.15.orig/include/linux/signal.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/signal.h	2017-01-01 17:07:15.899418461 +0100
+@@ -233,6 +233,7 @@
  }
  
  extern void flush_sigqueue(struct sigpending *queue);
@@ -10726,11 +10545,10 @@ index b63f63eaa39c..295540fdfc72 100644
  
  /* Test if 'sig' is valid signal. Use this instead of testing _NSIG directly */
  static inline int valid_signal(unsigned long sig)
-diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
-index 0f665cb26b50..59c38d1635c8 100644
---- a/include/linux/skbuff.h
-+++ b/include/linux/skbuff.h
-@@ -284,6 +284,7 @@ struct sk_buff_head {
+diff -Nur linux-4.8.15.orig/include/linux/skbuff.h linux-4.8.15/include/linux/skbuff.h
+--- linux-4.8.15.orig/include/linux/skbuff.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/skbuff.h	2017-01-01 17:07:15.915419486 +0100
+@@ -284,6 +284,7 @@
  
  	__u32		qlen;
  	spinlock_t	lock;
@@ -10738,7 +10556,7 @@ index 0f665cb26b50..59c38d1635c8 100644
  };
  
  struct sk_buff;
-@@ -1565,6 +1566,12 @@ static inline void skb_queue_head_init(struct sk_buff_head *list)
+@@ -1565,6 +1566,12 @@
  	__skb_queue_head_init(list);
  }
  
@@ -10751,11 +10569,10 @@ index 0f665cb26b50..59c38d1635c8 100644
  static inline void skb_queue_head_init_class(struct sk_buff_head *list,
  		struct lock_class_key *class)
  {
-diff --git a/include/linux/smp.h b/include/linux/smp.h
-index eccae4690f41..64ec52d951c3 100644
---- a/include/linux/smp.h
-+++ b/include/linux/smp.h
-@@ -185,6 +185,9 @@ static inline void smp_init(void) { }
+diff -Nur linux-4.8.15.orig/include/linux/smp.h linux-4.8.15/include/linux/smp.h
+--- linux-4.8.15.orig/include/linux/smp.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/smp.h	2017-01-01 17:07:15.915419486 +0100
+@@ -185,6 +185,9 @@
  #define get_cpu()		({ preempt_disable(); smp_processor_id(); })
  #define put_cpu()		preempt_enable()
  
@@ -10765,11 +10582,23 @@ index eccae4690f41..64ec52d951c3 100644
  /*
   * Callback to arch code if there's nosmp or maxcpus=0 on the
   * boot command line:
-diff --git a/include/linux/spinlock.h b/include/linux/spinlock.h
-index 47dd0cebd204..02928fa5499d 100644
---- a/include/linux/spinlock.h
-+++ b/include/linux/spinlock.h
-@@ -271,7 +271,11 @@ static inline void do_raw_spin_unlock(raw_spinlock_t *lock) __releases(lock)
+diff -Nur linux-4.8.15.orig/include/linux/spinlock_api_smp.h linux-4.8.15/include/linux/spinlock_api_smp.h
+--- linux-4.8.15.orig/include/linux/spinlock_api_smp.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/spinlock_api_smp.h	2017-01-01 17:07:15.919419743 +0100
+@@ -189,6 +189,8 @@
+ 	return 0;
+ }
+ 
+-#include <linux/rwlock_api_smp.h>
++#ifndef CONFIG_PREEMPT_RT_FULL
++# include <linux/rwlock_api_smp.h>
++#endif
+ 
+ #endif /* __LINUX_SPINLOCK_API_SMP_H */
+diff -Nur linux-4.8.15.orig/include/linux/spinlock.h linux-4.8.15/include/linux/spinlock.h
+--- linux-4.8.15.orig/include/linux/spinlock.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/spinlock.h	2017-01-01 17:07:15.919419743 +0100
+@@ -271,7 +271,11 @@
  #define raw_spin_can_lock(lock)	(!raw_spin_is_locked(lock))
  
  /* Include rwlock functions */
@@ -10782,7 +10611,7 @@ index 47dd0cebd204..02928fa5499d 100644
  
  /*
   * Pull the _spin_*()/_read_*()/_write_*() functions/declarations:
-@@ -282,6 +286,10 @@ static inline void do_raw_spin_unlock(raw_spinlock_t *lock) __releases(lock)
+@@ -282,6 +286,10 @@
  # include <linux/spinlock_api_up.h>
  #endif
  
@@ -10793,7 +10622,7 @@ index 47dd0cebd204..02928fa5499d 100644
  /*
   * Map the spin_lock functions to the raw variants for PREEMPT_RT=n
   */
-@@ -347,6 +355,12 @@ static __always_inline void spin_unlock(spinlock_t *lock)
+@@ -347,6 +355,12 @@
  	raw_spin_unlock(&lock->rlock);
  }
  
@@ -10806,32 +10635,16 @@ index 47dd0cebd204..02928fa5499d 100644
  static __always_inline void spin_unlock_bh(spinlock_t *lock)
  {
  	raw_spin_unlock_bh(&lock->rlock);
-@@ -416,4 +430,6 @@ extern int _atomic_dec_and_lock(atomic_t *atomic, spinlock_t *lock);
+@@ -416,4 +430,6 @@
  #define atomic_dec_and_lock(atomic, lock) \
  		__cond_lock(lock, _atomic_dec_and_lock(atomic, lock))
  
 +#endif /* !PREEMPT_RT_FULL */
 +
  #endif /* __LINUX_SPINLOCK_H */
-diff --git a/include/linux/spinlock_api_smp.h b/include/linux/spinlock_api_smp.h
-index 5344268e6e62..043263f30e81 100644
---- a/include/linux/spinlock_api_smp.h
-+++ b/include/linux/spinlock_api_smp.h
-@@ -189,6 +189,8 @@ static inline int __raw_spin_trylock_bh(raw_spinlock_t *lock)
- 	return 0;
- }
- 
--#include <linux/rwlock_api_smp.h>
-+#ifndef CONFIG_PREEMPT_RT_FULL
-+# include <linux/rwlock_api_smp.h>
-+#endif
- 
- #endif /* __LINUX_SPINLOCK_API_SMP_H */
-diff --git a/include/linux/spinlock_rt.h b/include/linux/spinlock_rt.h
-new file mode 100644
-index 000000000000..7eb87584e843
---- /dev/null
-+++ b/include/linux/spinlock_rt.h
+diff -Nur linux-4.8.15.orig/include/linux/spinlock_rt.h linux-4.8.15/include/linux/spinlock_rt.h
+--- linux-4.8.15.orig/include/linux/spinlock_rt.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-4.8.15/include/linux/spinlock_rt.h	2017-01-01 17:07:15.923420007 +0100
 @@ -0,0 +1,165 @@
 +#ifndef __LINUX_SPINLOCK_RT_H
 +#define __LINUX_SPINLOCK_RT_H
@@ -10998,28 +10811,19 @@ index 000000000000..7eb87584e843
 +	atomic_dec_and_spin_lock(atomic, lock)
 +
 +#endif
-diff --git a/include/linux/spinlock_types.h b/include/linux/spinlock_types.h
-index 73548eb13a5d..10bac715ea96 100644
---- a/include/linux/spinlock_types.h
-+++ b/include/linux/spinlock_types.h
+diff -Nur linux-4.8.15.orig/include/linux/spinlock_types.h linux-4.8.15/include/linux/spinlock_types.h
+--- linux-4.8.15.orig/include/linux/spinlock_types.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/spinlock_types.h	2017-01-01 17:07:15.923420007 +0100
 @@ -9,80 +9,15 @@
   * Released under the General Public License (GPL).
   */
  
 -#if defined(CONFIG_SMP)
 -# include <asm/spinlock_types.h>
-+#include <linux/spinlock_types_raw.h>
-+
-+#ifndef CONFIG_PREEMPT_RT_FULL
-+# include <linux/spinlock_types_nort.h>
-+# include <linux/rwlock_types.h>
- #else
+-#else
 -# include <linux/spinlock_types_up.h>
-+# include <linux/rtmutex.h>
-+# include <linux/spinlock_types_rt.h>
-+# include <linux/rwlock_types_rt.h>
- #endif
- 
+-#endif
+-
 -#include <linux/lockdep.h>
 -
 -typedef struct raw_spinlock {
@@ -11045,16 +10849,23 @@ index 73548eb13a5d..10bac715ea96 100644
 -#else
 -# define SPIN_DEP_MAP_INIT(lockname)
 -#endif
--
++#include <linux/spinlock_types_raw.h>
+ 
 -#ifdef CONFIG_DEBUG_SPINLOCK
 -# define SPIN_DEBUG_INIT(lockname)		\
 -	.magic = SPINLOCK_MAGIC,		\
 -	.owner_cpu = -1,			\
 -	.owner = SPINLOCK_OWNER_INIT,
--#else
++#ifndef CONFIG_PREEMPT_RT_FULL
++# include <linux/spinlock_types_nort.h>
++# include <linux/rwlock_types.h>
+ #else
 -# define SPIN_DEBUG_INIT(lockname)
--#endif
--
++# include <linux/rtmutex.h>
++# include <linux/spinlock_types_rt.h>
++# include <linux/rwlock_types_rt.h>
+ #endif
+ 
 -#define __RAW_SPIN_LOCK_INITIALIZER(lockname)	\
 -	{					\
 -	.raw_lock = __ARCH_SPIN_LOCK_UNLOCKED,	\
@@ -11091,11 +10902,9 @@ index 73548eb13a5d..10bac715ea96 100644
 -#include <linux/rwlock_types.h>
 -
  #endif /* __LINUX_SPINLOCK_TYPES_H */
-diff --git a/include/linux/spinlock_types_nort.h b/include/linux/spinlock_types_nort.h
-new file mode 100644
-index 000000000000..f1dac1fb1d6a
---- /dev/null
-+++ b/include/linux/spinlock_types_nort.h
+diff -Nur linux-4.8.15.orig/include/linux/spinlock_types_nort.h linux-4.8.15/include/linux/spinlock_types_nort.h
+--- linux-4.8.15.orig/include/linux/spinlock_types_nort.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-4.8.15/include/linux/spinlock_types_nort.h	2017-01-01 17:07:15.923420007 +0100
 @@ -0,0 +1,33 @@
 +#ifndef __LINUX_SPINLOCK_TYPES_NORT_H
 +#define __LINUX_SPINLOCK_TYPES_NORT_H
@@ -11130,11 +10939,9 @@ index 000000000000..f1dac1fb1d6a
 +#define DEFINE_SPINLOCK(x)	spinlock_t x = __SPIN_LOCK_UNLOCKED(x)
 +
 +#endif
-diff --git a/include/linux/spinlock_types_raw.h b/include/linux/spinlock_types_raw.h
-new file mode 100644
-index 000000000000..edffc4d53fc9
---- /dev/null
-+++ b/include/linux/spinlock_types_raw.h
+diff -Nur linux-4.8.15.orig/include/linux/spinlock_types_raw.h linux-4.8.15/include/linux/spinlock_types_raw.h
+--- linux-4.8.15.orig/include/linux/spinlock_types_raw.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-4.8.15/include/linux/spinlock_types_raw.h	2017-01-01 17:07:15.923420007 +0100
 @@ -0,0 +1,56 @@
 +#ifndef __LINUX_SPINLOCK_TYPES_RAW_H
 +#define __LINUX_SPINLOCK_TYPES_RAW_H
@@ -11192,11 +10999,9 @@ index 000000000000..edffc4d53fc9
 +#define DEFINE_RAW_SPINLOCK(x)	raw_spinlock_t x = __RAW_SPIN_LOCK_UNLOCKED(x)
 +
 +#endif
-diff --git a/include/linux/spinlock_types_rt.h b/include/linux/spinlock_types_rt.h
-new file mode 100644
-index 000000000000..3e3d8c5f7a9a
---- /dev/null
-+++ b/include/linux/spinlock_types_rt.h
+diff -Nur linux-4.8.15.orig/include/linux/spinlock_types_rt.h linux-4.8.15/include/linux/spinlock_types_rt.h
+--- linux-4.8.15.orig/include/linux/spinlock_types_rt.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-4.8.15/include/linux/spinlock_types_rt.h	2017-01-01 17:07:15.923420007 +0100
 @@ -0,0 +1,48 @@
 +#ifndef __LINUX_SPINLOCK_TYPES_RT_H
 +#define __LINUX_SPINLOCK_TYPES_RT_H
@@ -11246,11 +11051,10 @@ index 000000000000..3e3d8c5f7a9a
 +	spinlock_t name = __SPIN_LOCK_UNLOCKED(name)
 +
 +#endif
-diff --git a/include/linux/srcu.h b/include/linux/srcu.h
-index dc8eb63c6568..e793d3a257da 100644
---- a/include/linux/srcu.h
-+++ b/include/linux/srcu.h
-@@ -84,10 +84,10 @@ int init_srcu_struct(struct srcu_struct *sp);
+diff -Nur linux-4.8.15.orig/include/linux/srcu.h linux-4.8.15/include/linux/srcu.h
+--- linux-4.8.15.orig/include/linux/srcu.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/srcu.h	2017-01-01 17:07:15.923420007 +0100
+@@ -84,10 +84,10 @@
  
  void process_srcu(struct work_struct *work);
  
@@ -11263,7 +11067,7 @@ index dc8eb63c6568..e793d3a257da 100644
  		.queue_lock = __SPIN_LOCK_UNLOCKED(name.queue_lock),	\
  		.running = false,					\
  		.batch_queue = RCU_BATCH_INIT(name.batch_queue),	\
-@@ -119,7 +119,7 @@ void process_srcu(struct work_struct *work);
+@@ -119,7 +119,7 @@
   */
  #define __DEFINE_SRCU(name, is_static)					\
  	static DEFINE_PER_CPU(struct srcu_struct_array, name##_srcu_array);\
@@ -11272,11 +11076,10 @@ index dc8eb63c6568..e793d3a257da 100644
  #define DEFINE_SRCU(name)		__DEFINE_SRCU(name, /* not static */)
  #define DEFINE_STATIC_SRCU(name)	__DEFINE_SRCU(name, static)
  
-diff --git a/include/linux/suspend.h b/include/linux/suspend.h
-index 7693e39b14fe..b36eedeb28d1 100644
---- a/include/linux/suspend.h
-+++ b/include/linux/suspend.h
-@@ -193,6 +193,12 @@ struct platform_freeze_ops {
+diff -Nur linux-4.8.15.orig/include/linux/suspend.h linux-4.8.15/include/linux/suspend.h
+--- linux-4.8.15.orig/include/linux/suspend.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/suspend.h	2017-01-01 17:07:15.927420258 +0100
+@@ -193,6 +193,12 @@
  	void (*end)(void);
  };
  
@@ -11289,11 +11092,10 @@ index 7693e39b14fe..b36eedeb28d1 100644
  #ifdef CONFIG_SUSPEND
  /**
   * suspend_set_ops - set platform dependent suspend operations
-diff --git a/include/linux/swait.h b/include/linux/swait.h
-index c1f9c62a8a50..83f004a72320 100644
---- a/include/linux/swait.h
-+++ b/include/linux/swait.h
-@@ -87,6 +87,7 @@ static inline int swait_active(struct swait_queue_head *q)
+diff -Nur linux-4.8.15.orig/include/linux/swait.h linux-4.8.15/include/linux/swait.h
+--- linux-4.8.15.orig/include/linux/swait.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/swait.h	2017-01-01 17:07:15.931420510 +0100
+@@ -87,6 +87,7 @@
  extern void swake_up(struct swait_queue_head *q);
  extern void swake_up_all(struct swait_queue_head *q);
  extern void swake_up_locked(struct swait_queue_head *q);
@@ -11301,10 +11103,9 @@ index c1f9c62a8a50..83f004a72320 100644
  
  extern void __prepare_to_swait(struct swait_queue_head *q, struct swait_queue *wait);
  extern void prepare_to_swait(struct swait_queue_head *q, struct swait_queue *wait, int state);
-diff --git a/include/linux/swap.h b/include/linux/swap.h
-index e1d761463243..4ae9a4434ad3 100644
---- a/include/linux/swap.h
-+++ b/include/linux/swap.h
+diff -Nur linux-4.8.15.orig/include/linux/swap.h linux-4.8.15/include/linux/swap.h
+--- linux-4.8.15.orig/include/linux/swap.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/swap.h	2017-01-01 17:07:15.931420510 +0100
 @@ -11,6 +11,7 @@
  #include <linux/fs.h>
  #include <linux/atomic.h>
@@ -11313,7 +11114,7 @@ index e1d761463243..4ae9a4434ad3 100644
  #include <asm/page.h>
  
  struct notifier_block;
-@@ -243,7 +244,8 @@ struct swap_info_struct {
+@@ -243,7 +244,8 @@
  void *workingset_eviction(struct address_space *mapping, struct page *page);
  bool workingset_refault(void *shadow);
  void workingset_activation(struct page *page);
@@ -11323,7 +11124,7 @@ index e1d761463243..4ae9a4434ad3 100644
  
  static inline unsigned int workingset_node_pages(struct radix_tree_node *node)
  {
-@@ -288,6 +290,7 @@ extern unsigned long nr_free_pagecache_pages(void);
+@@ -288,6 +290,7 @@
  
  
  /* linux/mm/swap.c */
@@ -11331,11 +11132,9 @@ index e1d761463243..4ae9a4434ad3 100644
  extern void lru_cache_add(struct page *);
  extern void lru_cache_add_anon(struct page *page);
  extern void lru_cache_add_file(struct page *page);
-diff --git a/include/linux/swork.h b/include/linux/swork.h
-new file mode 100644
-index 000000000000..f175fa9a6016
---- /dev/null
-+++ b/include/linux/swork.h
+diff -Nur linux-4.8.15.orig/include/linux/swork.h linux-4.8.15/include/linux/swork.h
+--- linux-4.8.15.orig/include/linux/swork.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-4.8.15/include/linux/swork.h	2017-01-01 17:07:15.931420510 +0100
 @@ -0,0 +1,24 @@
 +#ifndef _LINUX_SWORK_H
 +#define _LINUX_SWORK_H
@@ -11361,11 +11160,10 @@ index 000000000000..f175fa9a6016
 +void swork_put(void);
 +
 +#endif /* _LINUX_SWORK_H */
-diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h
-index 2b5b10eed74f..8bf15b1858f5 100644
---- a/include/linux/thread_info.h
-+++ b/include/linux/thread_info.h
-@@ -103,7 +103,17 @@ static inline int test_ti_thread_flag(struct thread_info *ti, int flag)
+diff -Nur linux-4.8.15.orig/include/linux/thread_info.h linux-4.8.15/include/linux/thread_info.h
+--- linux-4.8.15.orig/include/linux/thread_info.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/thread_info.h	2017-01-01 17:07:15.931420510 +0100
+@@ -103,7 +103,17 @@
  #define test_thread_flag(flag) \
  	test_ti_thread_flag(current_thread_info(), flag)
  
@@ -11384,11 +11182,10 @@ index 2b5b10eed74f..8bf15b1858f5 100644
  
  #ifndef CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES
  static inline int arch_within_stack_frames(const void * const stack,
-diff --git a/include/linux/timer.h b/include/linux/timer.h
-index 51d601f192d4..83cea629efe1 100644
---- a/include/linux/timer.h
-+++ b/include/linux/timer.h
-@@ -241,7 +241,7 @@ extern void add_timer(struct timer_list *timer);
+diff -Nur linux-4.8.15.orig/include/linux/timer.h linux-4.8.15/include/linux/timer.h
+--- linux-4.8.15.orig/include/linux/timer.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/timer.h	2017-01-01 17:07:15.935420777 +0100
+@@ -241,7 +241,7 @@
  
  extern int try_to_del_timer_sync(struct timer_list *timer);
  
@@ -11397,11 +11194,10 @@ index 51d601f192d4..83cea629efe1 100644
    extern int del_timer_sync(struct timer_list *timer);
  #else
  # define del_timer_sync(t)		del_timer(t)
-diff --git a/include/linux/trace_events.h b/include/linux/trace_events.h
-index be007610ceb0..15154b13a53b 100644
---- a/include/linux/trace_events.h
-+++ b/include/linux/trace_events.h
-@@ -56,6 +56,9 @@ struct trace_entry {
+diff -Nur linux-4.8.15.orig/include/linux/trace_events.h linux-4.8.15/include/linux/trace_events.h
+--- linux-4.8.15.orig/include/linux/trace_events.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/trace_events.h	2017-01-01 17:07:15.935420777 +0100
+@@ -56,6 +56,9 @@
  	unsigned char		flags;
  	unsigned char		preempt_count;
  	int			pid;
@@ -11411,11 +11207,10 @@ index be007610ceb0..15154b13a53b 100644
  };
  
  #define TRACE_EVENT_TYPE_MAX						\
-diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h
-index f30c187ed785..83bf0f798426 100644
---- a/include/linux/uaccess.h
-+++ b/include/linux/uaccess.h
-@@ -24,6 +24,7 @@ static __always_inline void pagefault_disabled_dec(void)
+diff -Nur linux-4.8.15.orig/include/linux/uaccess.h linux-4.8.15/include/linux/uaccess.h
+--- linux-4.8.15.orig/include/linux/uaccess.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/uaccess.h	2017-01-01 17:07:15.935420777 +0100
+@@ -24,6 +24,7 @@
   */
  static inline void pagefault_disable(void)
  {
@@ -11423,7 +11218,7 @@ index f30c187ed785..83bf0f798426 100644
  	pagefault_disabled_inc();
  	/*
  	 * make sure to have issued the store before a pagefault
-@@ -40,6 +41,7 @@ static inline void pagefault_enable(void)
+@@ -40,6 +41,7 @@
  	 */
  	barrier();
  	pagefault_disabled_dec();
@@ -11431,10 +11226,9 @@ index f30c187ed785..83bf0f798426 100644
  }
  
  /*
-diff --git a/include/linux/uprobes.h b/include/linux/uprobes.h
-index 4a29c75b146e..0a294e950df8 100644
---- a/include/linux/uprobes.h
-+++ b/include/linux/uprobes.h
+diff -Nur linux-4.8.15.orig/include/linux/uprobes.h linux-4.8.15/include/linux/uprobes.h
+--- linux-4.8.15.orig/include/linux/uprobes.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/uprobes.h	2017-01-01 17:07:15.939421032 +0100
 @@ -27,6 +27,7 @@
  #include <linux/errno.h>
  #include <linux/rbtree.h>
@@ -11443,11 +11237,10 @@ index 4a29c75b146e..0a294e950df8 100644
  
  struct vm_area_struct;
  struct mm_struct;
-diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
-index 613771909b6e..e28c5a43229d 100644
---- a/include/linux/vmstat.h
-+++ b/include/linux/vmstat.h
-@@ -33,7 +33,9 @@ DECLARE_PER_CPU(struct vm_event_state, vm_event_states);
+diff -Nur linux-4.8.15.orig/include/linux/vmstat.h linux-4.8.15/include/linux/vmstat.h
+--- linux-4.8.15.orig/include/linux/vmstat.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/vmstat.h	2017-01-01 17:07:15.951421804 +0100
+@@ -33,7 +33,9 @@
   */
  static inline void __count_vm_event(enum vm_event_item item)
  {
@@ -11457,7 +11250,7 @@ index 613771909b6e..e28c5a43229d 100644
  }
  
  static inline void count_vm_event(enum vm_event_item item)
-@@ -43,7 +45,9 @@ static inline void count_vm_event(enum vm_event_item item)
+@@ -43,7 +45,9 @@
  
  static inline void __count_vm_events(enum vm_event_item item, long delta)
  {
@@ -11467,10 +11260,9 @@ index 613771909b6e..e28c5a43229d 100644
  }
  
  static inline void count_vm_events(enum vm_event_item item, long delta)
-diff --git a/include/linux/wait.h b/include/linux/wait.h
-index c3ff74d764fa..60222150a409 100644
---- a/include/linux/wait.h
-+++ b/include/linux/wait.h
+diff -Nur linux-4.8.15.orig/include/linux/wait.h linux-4.8.15/include/linux/wait.h
+--- linux-4.8.15.orig/include/linux/wait.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/linux/wait.h	2017-01-01 17:07:15.955422055 +0100
 @@ -8,6 +8,7 @@
  #include <linux/spinlock.h>
  #include <asm/current.h>
@@ -11479,11 +11271,10 @@ index c3ff74d764fa..60222150a409 100644
  
  typedef struct __wait_queue wait_queue_t;
  typedef int (*wait_queue_func_t)(wait_queue_t *wait, unsigned mode, int flags, void *key);
-diff --git a/include/net/dst.h b/include/net/dst.h
-index 6835d224d47b..55a5a9698f14 100644
---- a/include/net/dst.h
-+++ b/include/net/dst.h
-@@ -446,7 +446,7 @@ static inline void dst_confirm(struct dst_entry *dst)
+diff -Nur linux-4.8.15.orig/include/net/dst.h linux-4.8.15/include/net/dst.h
+--- linux-4.8.15.orig/include/net/dst.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/net/dst.h	2017-01-01 17:07:15.963422578 +0100
+@@ -446,7 +446,7 @@
  static inline int dst_neigh_output(struct dst_entry *dst, struct neighbour *n,
  				   struct sk_buff *skb)
  {
@@ -11492,10 +11283,9 @@ index 6835d224d47b..55a5a9698f14 100644
  
  	if (dst->pending_confirm) {
  		unsigned long now = jiffies;
-diff --git a/include/net/gen_stats.h b/include/net/gen_stats.h
-index 231e121cc7d9..d125222b979d 100644
---- a/include/net/gen_stats.h
-+++ b/include/net/gen_stats.h
+diff -Nur linux-4.8.15.orig/include/net/gen_stats.h linux-4.8.15/include/net/gen_stats.h
+--- linux-4.8.15.orig/include/net/gen_stats.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/net/gen_stats.h	2017-01-01 17:07:15.963422578 +0100
 @@ -5,6 +5,7 @@
  #include <linux/socket.h>
  #include <linux/rtnetlink.h>
@@ -11504,7 +11294,7 @@ index 231e121cc7d9..d125222b979d 100644
  
  struct gnet_stats_basic_cpu {
  	struct gnet_stats_basic_packed bstats;
-@@ -33,11 +34,11 @@ int gnet_stats_start_copy_compat(struct sk_buff *skb, int type,
+@@ -33,11 +34,11 @@
  				 spinlock_t *lock, struct gnet_dump *d,
  				 int padattr);
  
@@ -11518,7 +11308,7 @@ index 231e121cc7d9..d125222b979d 100644
  			     struct gnet_stats_basic_packed *bstats,
  			     struct gnet_stats_basic_cpu __percpu *cpu,
  			     struct gnet_stats_basic_packed *b);
-@@ -55,14 +56,14 @@ int gen_new_estimator(struct gnet_stats_basic_packed *bstats,
+@@ -55,14 +56,14 @@
  		      struct gnet_stats_basic_cpu __percpu *cpu_bstats,
  		      struct gnet_stats_rate_est64 *rate_est,
  		      spinlock_t *stats_lock,
@@ -11535,11 +11325,10 @@ index 231e121cc7d9..d125222b979d 100644
  bool gen_estimator_active(const struct gnet_stats_basic_packed *bstats,
  			  const struct gnet_stats_rate_est64 *rate_est);
  #endif
-diff --git a/include/net/neighbour.h b/include/net/neighbour.h
-index 8b683841e574..bf656008f6e7 100644
---- a/include/net/neighbour.h
-+++ b/include/net/neighbour.h
-@@ -446,7 +446,7 @@ static inline int neigh_hh_bridge(struct hh_cache *hh, struct sk_buff *skb)
+diff -Nur linux-4.8.15.orig/include/net/neighbour.h linux-4.8.15/include/net/neighbour.h
+--- linux-4.8.15.orig/include/net/neighbour.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/net/neighbour.h	2017-01-01 17:07:15.971423099 +0100
+@@ -446,7 +446,7 @@
  }
  #endif
  
@@ -11548,7 +11337,7 @@ index 8b683841e574..bf656008f6e7 100644
  {
  	unsigned int seq;
  	int hh_len;
-@@ -501,7 +501,7 @@ struct neighbour_cb {
+@@ -501,7 +501,7 @@
  
  #define NEIGH_CB(skb)	((struct neighbour_cb *)(skb)->cb)
  
@@ -11557,11 +11346,20 @@ index 8b683841e574..bf656008f6e7 100644
  				     const struct net_device *dev)
  {
  	unsigned int seq;
-diff --git a/include/net/net_seq_lock.h b/include/net/net_seq_lock.h
-new file mode 100644
-index 000000000000..a7034298a82a
---- /dev/null
-+++ b/include/net/net_seq_lock.h
+diff -Nur linux-4.8.15.orig/include/net/netns/ipv4.h linux-4.8.15/include/net/netns/ipv4.h
+--- linux-4.8.15.orig/include/net/netns/ipv4.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/net/netns/ipv4.h	2017-01-01 17:07:15.975423350 +0100
+@@ -70,6 +70,7 @@
+ 
+ 	int sysctl_icmp_echo_ignore_all;
+ 	int sysctl_icmp_echo_ignore_broadcasts;
++	int sysctl_icmp_echo_sysrq;
+ 	int sysctl_icmp_ignore_bogus_error_responses;
+ 	int sysctl_icmp_ratelimit;
+ 	int sysctl_icmp_ratemask;
+diff -Nur linux-4.8.15.orig/include/net/net_seq_lock.h linux-4.8.15/include/net/net_seq_lock.h
+--- linux-4.8.15.orig/include/net/net_seq_lock.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-4.8.15/include/net/net_seq_lock.h	2017-01-01 17:07:15.971423099 +0100
 @@ -0,0 +1,15 @@
 +#ifndef __NET_NET_SEQ_LOCK_H__
 +#define __NET_NET_SEQ_LOCK_H__
@@ -11578,22 +11376,9 @@ index 000000000000..a7034298a82a
 +#endif
 +
 +#endif
-diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
-index d061ffeb1e71..12ef433dc3b8 100644
---- a/include/net/netns/ipv4.h
-+++ b/include/net/netns/ipv4.h
-@@ -70,6 +70,7 @@ struct netns_ipv4 {
- 
- 	int sysctl_icmp_echo_ignore_all;
- 	int sysctl_icmp_echo_ignore_broadcasts;
-+	int sysctl_icmp_echo_sysrq;
- 	int sysctl_icmp_ignore_bogus_error_responses;
- 	int sysctl_icmp_ratelimit;
- 	int sysctl_icmp_ratemask;
-diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
-index 909aff2db2b3..c47219d6e4bc 100644
---- a/include/net/sch_generic.h
-+++ b/include/net/sch_generic.h
+diff -Nur linux-4.8.15.orig/include/net/sch_generic.h linux-4.8.15/include/net/sch_generic.h
+--- linux-4.8.15.orig/include/net/sch_generic.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/include/net/sch_generic.h	2017-01-01 17:07:15.987424124 +0100
 @@ -10,6 +10,7 @@
  #include <linux/dynamic_queue_limits.h>
  #include <net/gen_stats.h>
@@ -11602,7 +11387,7 @@ index 909aff2db2b3..c47219d6e4bc 100644
  
  struct Qdisc_ops;
  struct qdisc_walker;
-@@ -78,7 +79,7 @@ struct Qdisc {
+@@ -78,7 +79,7 @@
  	struct sk_buff		*gso_skb ____cacheline_aligned_in_smp;
  	struct sk_buff_head	q;
  	struct gnet_stats_basic_packed bstats;
@@ -11611,7 +11396,7 @@ index 909aff2db2b3..c47219d6e4bc 100644
  	struct gnet_stats_queue	qstats;
  	unsigned long		state;
  	struct Qdisc            *next_sched;
-@@ -90,13 +91,22 @@ struct Qdisc {
+@@ -90,13 +91,22 @@
  	spinlock_t		busylock ____cacheline_aligned_in_smp;
  };
  
@@ -11635,7 +11420,7 @@ index 909aff2db2b3..c47219d6e4bc 100644
  	if (qdisc_is_running(qdisc))
  		return false;
  	/* Variant of write_seqcount_begin() telling lockdep a trylock
-@@ -105,11 +115,16 @@ static inline bool qdisc_run_begin(struct Qdisc *qdisc)
+@@ -105,11 +115,16 @@
  	raw_write_seqcount_begin(&qdisc->running);
  	seqcount_acquire(&qdisc->running.dep_map, 0, 1, _RET_IP_);
  	return true;
@@ -11652,7 +11437,7 @@ index 909aff2db2b3..c47219d6e4bc 100644
  }
  
  static inline bool qdisc_may_bulk(const struct Qdisc *qdisc)
-@@ -300,7 +315,7 @@ static inline spinlock_t *qdisc_root_sleeping_lock(const struct Qdisc *qdisc)
+@@ -300,7 +315,7 @@
  	return qdisc_lock(root);
  }
  
@@ -11661,11 +11446,9 @@ index 909aff2db2b3..c47219d6e4bc 100644
  {
  	struct Qdisc *root = qdisc_root_sleeping(qdisc);
  
-diff --git a/include/trace/events/hist.h b/include/trace/events/hist.h
-new file mode 100644
-index 000000000000..f7710de1b1f3
---- /dev/null
-+++ b/include/trace/events/hist.h
+diff -Nur linux-4.8.15.orig/include/trace/events/hist.h linux-4.8.15/include/trace/events/hist.h
+--- linux-4.8.15.orig/include/trace/events/hist.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-4.8.15/include/trace/events/hist.h	2017-01-01 17:07:15.987424124 +0100
 @@ -0,0 +1,73 @@
 +#undef TRACE_SYSTEM
 +#define TRACE_SYSTEM hist
@@ -11740,11 +11523,9 @@ index 000000000000..f7710de1b1f3
 +
 +/* This part must be outside protection */
 +#include <trace/define_trace.h>
-diff --git a/include/trace/events/latency_hist.h b/include/trace/events/latency_hist.h
-new file mode 100644
-index 000000000000..d3f2fbd560b1
---- /dev/null
-+++ b/include/trace/events/latency_hist.h
+diff -Nur linux-4.8.15.orig/include/trace/events/latency_hist.h linux-4.8.15/include/trace/events/latency_hist.h
+--- linux-4.8.15.orig/include/trace/events/latency_hist.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-4.8.15/include/trace/events/latency_hist.h	2017-01-01 17:07:15.987424124 +0100
 @@ -0,0 +1,29 @@
 +#ifndef _LATENCY_HIST_H
 +#define _LATENCY_HIST_H
@@ -11775,11 +11556,10 @@ index 000000000000..d3f2fbd560b1
 +}
 +
 +#endif /* _LATENCY_HIST_H */
-diff --git a/init/Kconfig b/init/Kconfig
-index cac3f096050d..b6c9166d878a 100644
---- a/init/Kconfig
-+++ b/init/Kconfig
-@@ -496,7 +496,7 @@ config TINY_RCU
+diff -Nur linux-4.8.15.orig/init/Kconfig linux-4.8.15/init/Kconfig
+--- linux-4.8.15.orig/init/Kconfig	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/init/Kconfig	2017-01-01 17:07:15.987424124 +0100
+@@ -496,7 +496,7 @@
  
  config RCU_EXPERT
  	bool "Make expert-level adjustments to RCU configuration"
@@ -11788,7 +11568,7 @@ index cac3f096050d..b6c9166d878a 100644
  	help
  	  This option needs to be enabled if you wish to make
  	  expert-level adjustments to RCU configuration.  By default,
-@@ -613,7 +613,7 @@ config RCU_FANOUT_LEAF
+@@ -613,7 +613,7 @@
  
  config RCU_FAST_NO_HZ
  	bool "Accelerate last non-dyntick-idle CPU's grace periods"
@@ -11797,7 +11577,7 @@ index cac3f096050d..b6c9166d878a 100644
  	default n
  	help
  	  This option permits CPUs to enter dynticks-idle state even if
-@@ -640,7 +640,7 @@ config TREE_RCU_TRACE
+@@ -640,7 +640,7 @@
  config RCU_BOOST
  	bool "Enable RCU priority boosting"
  	depends on RT_MUTEXES && PREEMPT_RCU && RCU_EXPERT
@@ -11806,7 +11586,27 @@ index cac3f096050d..b6c9166d878a 100644
  	help
  	  This option boosts the priority of preempted RCU readers that
  	  block the current preemptible RCU grace period for too long.
-@@ -1054,6 +1054,7 @@ config CFS_BANDWIDTH
+@@ -771,19 +771,6 @@
+ 
+ endchoice
+ 
+-config RCU_EXPEDITE_BOOT
+-	bool
+-	default n
+-	help
+-	  This option enables expedited grace periods at boot time,
+-	  as if rcu_expedite_gp() had been invoked early in boot.
+-	  The corresponding rcu_unexpedite_gp() is invoked from
+-	  rcu_end_inkernel_boot(), which is intended to be invoked
+-	  at the end of the kernel-only boot sequence, just before
+-	  init is exec'ed.
+-
+-	  Accept the default if unsure.
+-
+ endmenu # "RCU Subsystem"
+ 
+ config BUILD_BIN2C
+@@ -1054,6 +1041,7 @@
  config RT_GROUP_SCHED
  	bool "Group scheduling for SCHED_RR/FIFO"
  	depends on CGROUP_SCHED
@@ -11814,7 +11614,7 @@ index cac3f096050d..b6c9166d878a 100644
  	default n
  	help
  	  This feature lets you explicitly allocate real CPU bandwidth
-@@ -1761,6 +1762,7 @@ choice
+@@ -1761,6 +1749,7 @@
  
  config SLAB
  	bool "SLAB"
@@ -11822,7 +11622,7 @@ index cac3f096050d..b6c9166d878a 100644
  	select HAVE_HARDENED_USERCOPY_ALLOCATOR
  	help
  	  The regular slab allocator that is established and known to work
-@@ -1781,6 +1783,7 @@ config SLUB
+@@ -1781,6 +1770,7 @@
  config SLOB
  	depends on EXPERT
  	bool "SLOB (Simple Allocator)"
@@ -11830,7 +11630,7 @@ index cac3f096050d..b6c9166d878a 100644
  	help
  	   SLOB replaces the stock allocator with a drastically simpler
  	   allocator. SLOB is generally more space efficient but
-@@ -1799,7 +1802,7 @@ config SLAB_FREELIST_RANDOM
+@@ -1799,7 +1789,7 @@
  
  config SLUB_CPU_PARTIAL
  	default y
@@ -11839,21 +11639,10 @@ index cac3f096050d..b6c9166d878a 100644
  	bool "SLUB per cpu partial cache"
  	help
  	  Per cpu partial caches accellerate objects allocation and freeing
-diff --git a/init/Makefile b/init/Makefile
-index 7bc47ee31c36..88cf473554e0 100644
---- a/init/Makefile
-+++ b/init/Makefile
-@@ -33,4 +33,4 @@ $(obj)/version.o: include/generated/compile.h
- include/generated/compile.h: FORCE
- 	@$($(quiet)chk_compile.h)
- 	$(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkcompile_h $@ \
--	"$(UTS_MACHINE)" "$(CONFIG_SMP)" "$(CONFIG_PREEMPT)" "$(CC) $(KBUILD_CFLAGS)"
-+	"$(UTS_MACHINE)" "$(CONFIG_SMP)" "$(CONFIG_PREEMPT)" "$(CONFIG_PREEMPT_RT_FULL)" "$(CC) $(KBUILD_CFLAGS)"
-diff --git a/init/main.c b/init/main.c
-index a8a58e2794a5..e4c979e37a91 100644
---- a/init/main.c
-+++ b/init/main.c
-@@ -507,6 +507,7 @@ asmlinkage __visible void __init start_kernel(void)
+diff -Nur linux-4.8.15.orig/init/main.c linux-4.8.15/init/main.c
+--- linux-4.8.15.orig/init/main.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/init/main.c	2017-01-01 17:07:15.991424381 +0100
+@@ -507,6 +507,7 @@
  	setup_command_line(command_line);
  	setup_nr_cpu_ids();
  	setup_per_cpu_areas();
@@ -11861,11 +11650,19 @@ index a8a58e2794a5..e4c979e37a91 100644
  	boot_cpu_state_init();
  	smp_prepare_boot_cpu();	/* arch-specific boot-cpu hooks */
  
-diff --git a/ipc/msg.c b/ipc/msg.c
-index c6521c205cb4..996d89023552 100644
---- a/ipc/msg.c
-+++ b/ipc/msg.c
-@@ -183,20 +183,14 @@ static void ss_wakeup(struct list_head *h, int kill)
+diff -Nur linux-4.8.15.orig/init/Makefile linux-4.8.15/init/Makefile
+--- linux-4.8.15.orig/init/Makefile	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/init/Makefile	2017-01-01 17:07:15.991424381 +0100
+@@ -33,4 +33,4 @@
+ include/generated/compile.h: FORCE
+ 	@$($(quiet)chk_compile.h)
+ 	$(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkcompile_h $@ \
+-	"$(UTS_MACHINE)" "$(CONFIG_SMP)" "$(CONFIG_PREEMPT)" "$(CC) $(KBUILD_CFLAGS)"
++	"$(UTS_MACHINE)" "$(CONFIG_SMP)" "$(CONFIG_PREEMPT)" "$(CONFIG_PREEMPT_RT_FULL)" "$(CC) $(KBUILD_CFLAGS)"
+diff -Nur linux-4.8.15.orig/ipc/msg.c linux-4.8.15/ipc/msg.c
+--- linux-4.8.15.orig/ipc/msg.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/ipc/msg.c	2017-01-01 17:07:15.991424381 +0100
+@@ -183,20 +183,14 @@
  	}
  }
  
@@ -11890,7 +11687,7 @@ index c6521c205cb4..996d89023552 100644
  		msr->r_msg = ERR_PTR(res);
  	}
  }
-@@ -213,11 +207,13 @@ static void freeque(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp)
+@@ -213,11 +207,13 @@
  {
  	struct msg_msg *msg, *t;
  	struct msg_queue *msq = container_of(ipcp, struct msg_queue, q_perm);
@@ -11905,7 +11702,7 @@ index c6521c205cb4..996d89023552 100644
  	rcu_read_unlock();
  
  	list_for_each_entry_safe(msg, t, &msq->q_messages, m_list) {
-@@ -342,6 +338,7 @@ static int msgctl_down(struct ipc_namespace *ns, int msqid, int cmd,
+@@ -342,6 +338,7 @@
  	struct kern_ipc_perm *ipcp;
  	struct msqid64_ds uninitialized_var(msqid64);
  	struct msg_queue *msq;
@@ -11913,7 +11710,7 @@ index c6521c205cb4..996d89023552 100644
  	int err;
  
  	if (cmd == IPC_SET) {
-@@ -389,7 +386,7 @@ static int msgctl_down(struct ipc_namespace *ns, int msqid, int cmd,
+@@ -389,7 +386,7 @@
  		/* sleeping receivers might be excluded by
  		 * stricter permissions.
  		 */
@@ -11922,7 +11719,7 @@ index c6521c205cb4..996d89023552 100644
  		/* sleeping senders might be able to send
  		 * due to a larger queue size.
  		 */
-@@ -402,6 +399,7 @@ static int msgctl_down(struct ipc_namespace *ns, int msqid, int cmd,
+@@ -402,6 +399,7 @@
  
  out_unlock0:
  	ipc_unlock_object(&msq->q_perm);
@@ -11930,7 +11727,7 @@ index c6521c205cb4..996d89023552 100644
  out_unlock1:
  	rcu_read_unlock();
  out_up:
-@@ -566,7 +564,8 @@ static int testmsg(struct msg_msg *msg, long type, int mode)
+@@ -566,7 +564,8 @@
  	return 0;
  }
  
@@ -11940,7 +11737,7 @@ index c6521c205cb4..996d89023552 100644
  {
  	struct msg_receiver *msr, *t;
  
-@@ -577,27 +576,13 @@ static inline int pipelined_send(struct msg_queue *msq, struct msg_msg *msg)
+@@ -577,27 +576,13 @@
  
  			list_del(&msr->r_list);
  			if (msr->r_maxsize < msg->m_ts) {
@@ -11970,7 +11767,7 @@ index c6521c205cb4..996d89023552 100644
  				return 1;
  			}
  		}
-@@ -613,6 +598,7 @@ long do_msgsnd(int msqid, long mtype, void __user *mtext,
+@@ -613,6 +598,7 @@
  	struct msg_msg *msg;
  	int err;
  	struct ipc_namespace *ns;
@@ -11978,7 +11775,7 @@ index c6521c205cb4..996d89023552 100644
  
  	ns = current->nsproxy->ipc_ns;
  
-@@ -698,7 +684,7 @@ long do_msgsnd(int msqid, long mtype, void __user *mtext,
+@@ -698,7 +684,7 @@
  	msq->q_lspid = task_tgid_vnr(current);
  	msq->q_stime = get_seconds();
  
@@ -11987,7 +11784,7 @@ index c6521c205cb4..996d89023552 100644
  		/* no one is waiting for this message, enqueue it */
  		list_add_tail(&msg->m_list, &msq->q_messages);
  		msq->q_cbytes += msgsz;
-@@ -712,6 +698,7 @@ long do_msgsnd(int msqid, long mtype, void __user *mtext,
+@@ -712,6 +698,7 @@
  
  out_unlock0:
  	ipc_unlock_object(&msq->q_perm);
@@ -11995,7 +11792,7 @@ index c6521c205cb4..996d89023552 100644
  out_unlock1:
  	rcu_read_unlock();
  	if (msg != NULL)
-@@ -932,57 +919,25 @@ long do_msgrcv(int msqid, void __user *buf, size_t bufsz, long msgtyp, int msgfl
+@@ -932,57 +919,25 @@
  		rcu_read_lock();
  
  		/* Lockless receive, part 2:
@@ -12064,11 +11861,10 @@ index c6521c205cb4..996d89023552 100644
  		msg = (struct msg_msg *)msr_d.r_msg;
  		if (msg != ERR_PTR(-EAGAIN))
  			goto out_unlock0;
-diff --git a/ipc/sem.c b/ipc/sem.c
-index 5e318c5f749d..ec9203971539 100644
---- a/ipc/sem.c
-+++ b/ipc/sem.c
-@@ -712,6 +712,13 @@ static int perform_atomic_semop(struct sem_array *sma, struct sem_queue *q)
+diff -Nur linux-4.8.15.orig/ipc/sem.c linux-4.8.15/ipc/sem.c
+--- linux-4.8.15.orig/ipc/sem.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/ipc/sem.c	2017-01-01 17:07:15.991424381 +0100
+@@ -712,6 +712,13 @@
  static void wake_up_sem_queue_prepare(struct list_head *pt,
  				struct sem_queue *q, int error)
  {
@@ -12082,7 +11878,7 @@ index 5e318c5f749d..ec9203971539 100644
  	if (list_empty(pt)) {
  		/*
  		 * Hold preempt off so that we don't get preempted and have the
-@@ -723,6 +730,7 @@ static void wake_up_sem_queue_prepare(struct list_head *pt,
+@@ -723,6 +730,7 @@
  	q->pid = error;
  
  	list_add_tail(&q->list, pt);
@@ -12090,7 +11886,7 @@ index 5e318c5f749d..ec9203971539 100644
  }
  
  /**
-@@ -736,6 +744,7 @@ static void wake_up_sem_queue_prepare(struct list_head *pt,
+@@ -736,6 +744,7 @@
   */
  static void wake_up_sem_queue_do(struct list_head *pt)
  {
@@ -12098,7 +11894,7 @@ index 5e318c5f749d..ec9203971539 100644
  	struct sem_queue *q, *t;
  	int did_something;
  
-@@ -748,6 +757,7 @@ static void wake_up_sem_queue_do(struct list_head *pt)
+@@ -748,6 +757,7 @@
  	}
  	if (did_something)
  		preempt_enable();
@@ -12106,103 +11902,10 @@ index 5e318c5f749d..ec9203971539 100644
  }
  
  static void unlink_queue(struct sem_array *sma, struct sem_queue *q)
-diff --git a/kernel/Kconfig.locks b/kernel/Kconfig.locks
-index ebdb0043203a..b9e6aa7e5aa6 100644
---- a/kernel/Kconfig.locks
-+++ b/kernel/Kconfig.locks
-@@ -225,11 +225,11 @@ config ARCH_SUPPORTS_ATOMIC_RMW
- 
- config MUTEX_SPIN_ON_OWNER
- 	def_bool y
--	depends on SMP && !DEBUG_MUTEXES && ARCH_SUPPORTS_ATOMIC_RMW
-+	depends on SMP && !DEBUG_MUTEXES && ARCH_SUPPORTS_ATOMIC_RMW && !PREEMPT_RT_FULL
- 
- config RWSEM_SPIN_ON_OWNER
-        def_bool y
--       depends on SMP && RWSEM_XCHGADD_ALGORITHM && ARCH_SUPPORTS_ATOMIC_RMW
-+       depends on SMP && RWSEM_XCHGADD_ALGORITHM && ARCH_SUPPORTS_ATOMIC_RMW && !PREEMPT_RT_FULL
- 
- config LOCK_SPIN_ON_OWNER
-        def_bool y
-diff --git a/kernel/Kconfig.preempt b/kernel/Kconfig.preempt
-index 3f9c97419f02..11dbe26a8279 100644
---- a/kernel/Kconfig.preempt
-+++ b/kernel/Kconfig.preempt
-@@ -1,3 +1,16 @@
-+config PREEMPT
-+	bool
-+	select PREEMPT_COUNT
-+
-+config PREEMPT_RT_BASE
-+	bool
-+	select PREEMPT
-+
-+config HAVE_PREEMPT_LAZY
-+	bool
-+
-+config PREEMPT_LAZY
-+	def_bool y if HAVE_PREEMPT_LAZY && PREEMPT_RT_FULL
- 
- choice
- 	prompt "Preemption Model"
-@@ -33,9 +46,9 @@ config PREEMPT_VOLUNTARY
- 
- 	  Select this if you are building a kernel for a desktop system.
- 
--config PREEMPT
-+config PREEMPT__LL
- 	bool "Preemptible Kernel (Low-Latency Desktop)"
--	select PREEMPT_COUNT
-+	select PREEMPT
- 	select UNINLINE_SPIN_UNLOCK if !ARCH_INLINE_SPIN_UNLOCK
- 	help
- 	  This option reduces the latency of the kernel by making
-@@ -52,6 +65,22 @@ config PREEMPT
- 	  embedded system with latency requirements in the milliseconds
- 	  range.
- 
-+config PREEMPT_RTB
-+	bool "Preemptible Kernel (Basic RT)"
-+	select PREEMPT_RT_BASE
-+	help
-+	  This option is basically the same as (Low-Latency Desktop) but
-+	  enables changes which are preliminary for the full preemptible
-+	  RT kernel.
-+
-+config PREEMPT_RT_FULL
-+	bool "Fully Preemptible Kernel (RT)"
-+	depends on IRQ_FORCED_THREADING
-+	select PREEMPT_RT_BASE
-+	select PREEMPT_RCU
-+	help
-+	  All and everything
-+
- endchoice
- 
- config PREEMPT_COUNT
-diff --git a/kernel/Makefile b/kernel/Makefile
-index e2ec54e2b952..bff8214bf5f6 100644
---- a/kernel/Makefile
-+++ b/kernel/Makefile
-@@ -11,6 +11,13 @@ obj-y     = fork.o exec_domain.o panic.o \
- 	    notifier.o ksysfs.o cred.o reboot.o \
- 	    async.o range.o smpboot.o
- 
-+# Tracing may do some dangerous __builtin_return_address() operations
-+# We know they are dangerous, we don't need gcc telling us that.
-+ifdef CONFIG_USING_GET_LOCK_PARENT_IP
-+FRAME_CFLAGS := $(call cc-disable-warning,frame-address)
-+KBUILD_CFLAGS += $(FRAME_CFLAGS)
-+endif
-+
- obj-$(CONFIG_MULTIUSER) += groups.o
- 
- ifdef CONFIG_FUNCTION_TRACER
-diff --git a/kernel/cgroup.c b/kernel/cgroup.c
-index d6b729beba49..11d61b2ca938 100644
---- a/kernel/cgroup.c
-+++ b/kernel/cgroup.c
-@@ -5027,10 +5027,10 @@ static void css_free_rcu_fn(struct rcu_head *rcu_head)
+diff -Nur linux-4.8.15.orig/kernel/cgroup.c linux-4.8.15/kernel/cgroup.c
+--- linux-4.8.15.orig/kernel/cgroup.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/cgroup.c	2017-01-01 17:07:15.999424895 +0100
+@@ -5027,10 +5027,10 @@
  	queue_work(cgroup_destroy_wq, &css->destroy_work);
  }
  
@@ -12215,7 +11918,7 @@ index d6b729beba49..11d61b2ca938 100644
  	struct cgroup_subsys *ss = css->ss;
  	struct cgroup *cgrp = css->cgroup;
  
-@@ -5071,8 +5071,8 @@ static void css_release(struct percpu_ref *ref)
+@@ -5071,8 +5071,8 @@
  	struct cgroup_subsys_state *css =
  		container_of(ref, struct cgroup_subsys_state, refcnt);
  
@@ -12226,7 +11929,7 @@ index d6b729beba49..11d61b2ca938 100644
  }
  
  static void init_and_link_css(struct cgroup_subsys_state *css,
-@@ -5716,6 +5716,7 @@ static int __init cgroup_wq_init(void)
+@@ -5716,6 +5716,7 @@
  	 */
  	cgroup_destroy_wq = alloc_workqueue("cgroup_destroy", 0, 1);
  	BUG_ON(!cgroup_destroy_wq);
@@ -12234,11 +11937,10 @@ index d6b729beba49..11d61b2ca938 100644
  
  	/*
  	 * Used to destroy pidlists and separate to serve as flush domain.
-diff --git a/kernel/cpu.c b/kernel/cpu.c
-index 341bf80f80bd..b575429a8a00 100644
---- a/kernel/cpu.c
-+++ b/kernel/cpu.c
-@@ -152,8 +152,8 @@ static struct {
+diff -Nur linux-4.8.15.orig/kernel/cpu.c linux-4.8.15/kernel/cpu.c
+--- linux-4.8.15.orig/kernel/cpu.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/cpu.c	2017-01-01 17:07:15.999424895 +0100
+@@ -152,8 +152,8 @@
  #endif
  } cpu_hotplug = {
  	.active_writer = NULL,
@@ -12248,7 +11950,7 @@ index 341bf80f80bd..b575429a8a00 100644
  #ifdef CONFIG_DEBUG_LOCK_ALLOC
  	.dep_map = {.name = "cpu_hotplug.lock" },
  #endif
-@@ -166,6 +166,289 @@ static struct {
+@@ -166,6 +166,289 @@
  #define cpuhp_lock_acquire()      lock_map_acquire(&cpu_hotplug.dep_map)
  #define cpuhp_lock_release()      lock_map_release(&cpu_hotplug.dep_map)
  
@@ -12538,7 +12240,7 @@ index 341bf80f80bd..b575429a8a00 100644
  
  void get_online_cpus(void)
  {
-@@ -710,10 +993,14 @@ static int takedown_cpu(unsigned int cpu)
+@@ -710,10 +993,14 @@
  	struct cpuhp_cpu_state *st = per_cpu_ptr(&cpuhp_state, cpu);
  	int err;
  
@@ -12553,7 +12255,7 @@ index 341bf80f80bd..b575429a8a00 100644
  	/*
  	 * Prevent irq alloc/free while the dying cpu reorganizes the
  	 * interrupt affinities.
-@@ -799,6 +1086,9 @@ static int __ref _cpu_down(unsigned int cpu, int tasks_frozen,
+@@ -799,6 +1086,9 @@
  	struct cpuhp_cpu_state *st = per_cpu_ptr(&cpuhp_state, cpu);
  	int prev_state, ret = 0;
  	bool hasdied = false;
@@ -12563,7 +12265,7 @@ index 341bf80f80bd..b575429a8a00 100644
  
  	if (num_online_cpus() == 1)
  		return -EBUSY;
-@@ -806,7 +1096,34 @@ static int __ref _cpu_down(unsigned int cpu, int tasks_frozen,
+@@ -806,7 +1096,34 @@
  	if (!cpu_present(cpu))
  		return -EINVAL;
  
@@ -12598,7 +12300,7 @@ index 341bf80f80bd..b575429a8a00 100644
  
  	cpuhp_tasks_frozen = tasks_frozen;
  
-@@ -845,10 +1162,15 @@ static int __ref _cpu_down(unsigned int cpu, int tasks_frozen,
+@@ -845,10 +1162,15 @@
  
  	hasdied = prev_state != st->state && st->state == CPUHP_OFFLINE;
  out:
@@ -12614,11 +12316,10 @@ index 341bf80f80bd..b575429a8a00 100644
  	return ret;
  }
  
-diff --git a/kernel/debug/kdb/kdb_io.c b/kernel/debug/kdb/kdb_io.c
-index fc1ef736253c..83c666537a7a 100644
---- a/kernel/debug/kdb/kdb_io.c
-+++ b/kernel/debug/kdb/kdb_io.c
-@@ -554,7 +554,6 @@ int vkdb_printf(enum kdb_msgsrc src, const char *fmt, va_list ap)
+diff -Nur linux-4.8.15.orig/kernel/debug/kdb/kdb_io.c linux-4.8.15/kernel/debug/kdb/kdb_io.c
+--- linux-4.8.15.orig/kernel/debug/kdb/kdb_io.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/debug/kdb/kdb_io.c	2017-01-01 17:07:16.003425149 +0100
+@@ -554,7 +554,6 @@
  	int linecount;
  	int colcount;
  	int logging, saved_loglevel = 0;
@@ -12626,7 +12327,7 @@ index fc1ef736253c..83c666537a7a 100644
  	int got_printf_lock = 0;
  	int retlen = 0;
  	int fnd, len;
-@@ -565,8 +564,6 @@ int vkdb_printf(enum kdb_msgsrc src, const char *fmt, va_list ap)
+@@ -565,8 +564,6 @@
  	unsigned long uninitialized_var(flags);
  
  	preempt_disable();
@@ -12635,7 +12336,7 @@ index fc1ef736253c..83c666537a7a 100644
  
  	/* Serialize kdb_printf if multiple cpus try to write at once.
  	 * But if any cpu goes recursive in kdb, just print the output,
-@@ -855,7 +852,6 @@ int vkdb_printf(enum kdb_msgsrc src, const char *fmt, va_list ap)
+@@ -855,7 +852,6 @@
  	} else {
  		__release(kdb_printf_lock);
  	}
@@ -12643,7 +12344,7 @@ index fc1ef736253c..83c666537a7a 100644
  	preempt_enable();
  	return retlen;
  }
-@@ -865,9 +861,11 @@ int kdb_printf(const char *fmt, ...)
+@@ -865,9 +861,11 @@
  	va_list ap;
  	int r;
  
@@ -12655,11 +12356,10 @@ index fc1ef736253c..83c666537a7a 100644
  
  	return r;
  }
-diff --git a/kernel/events/core.c b/kernel/events/core.c
-index fc9bb2225291..bc2db7e1ae04 100644
---- a/kernel/events/core.c
-+++ b/kernel/events/core.c
-@@ -1042,6 +1042,7 @@ static void __perf_mux_hrtimer_init(struct perf_cpu_context *cpuctx, int cpu)
+diff -Nur linux-4.8.15.orig/kernel/events/core.c linux-4.8.15/kernel/events/core.c
+--- linux-4.8.15.orig/kernel/events/core.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/events/core.c	2017-01-01 17:07:16.007425407 +0100
+@@ -1042,6 +1042,7 @@
  	raw_spin_lock_init(&cpuctx->hrtimer_lock);
  	hrtimer_init(timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS_PINNED);
  	timer->function = perf_mux_hrtimer_handler;
@@ -12667,7 +12367,7 @@ index fc9bb2225291..bc2db7e1ae04 100644
  }
  
  static int perf_mux_hrtimer_restart(struct perf_cpu_context *cpuctx)
-@@ -8215,6 +8216,7 @@ static void perf_swevent_init_hrtimer(struct perf_event *event)
+@@ -8217,6 +8218,7 @@
  
  	hrtimer_init(&hwc->hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
  	hwc->hrtimer.function = perf_swevent_hrtimer;
@@ -12675,11 +12375,10 @@ index fc9bb2225291..bc2db7e1ae04 100644
  
  	/*
  	 * Since hrtimers have a fixed rate, we can do a static freq->period
-diff --git a/kernel/exit.c b/kernel/exit.c
-index 091a78be3b09..170b672bbb38 100644
---- a/kernel/exit.c
-+++ b/kernel/exit.c
-@@ -143,7 +143,7 @@ static void __exit_signal(struct task_struct *tsk)
+diff -Nur linux-4.8.15.orig/kernel/exit.c linux-4.8.15/kernel/exit.c
+--- linux-4.8.15.orig/kernel/exit.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/exit.c	2017-01-01 17:07:16.011425679 +0100
+@@ -143,7 +143,7 @@
  	 * Do this under ->siglock, we can race with another thread
  	 * doing sigqueue_free() if we have SIGQUEUE_PREALLOC signals.
  	 */
@@ -12688,11 +12387,10 @@ index 091a78be3b09..170b672bbb38 100644
  	tsk->sighand = NULL;
  	spin_unlock(&sighand->siglock);
  
-diff --git a/kernel/fork.c b/kernel/fork.c
-index beb31725f7e2..e398cb9e62fa 100644
---- a/kernel/fork.c
-+++ b/kernel/fork.c
-@@ -251,7 +251,9 @@ static inline void put_signal_struct(struct signal_struct *sig)
+diff -Nur linux-4.8.15.orig/kernel/fork.c linux-4.8.15/kernel/fork.c
+--- linux-4.8.15.orig/kernel/fork.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/fork.c	2017-01-01 17:07:16.011425679 +0100
+@@ -251,7 +251,9 @@
  	if (atomic_dec_and_test(&sig->sigcnt))
  		free_signal_struct(sig);
  }
@@ -12703,7 +12401,7 @@ index beb31725f7e2..e398cb9e62fa 100644
  void __put_task_struct(struct task_struct *tsk)
  {
  	WARN_ON(!tsk->exit_state);
-@@ -268,7 +270,18 @@ void __put_task_struct(struct task_struct *tsk)
+@@ -268,7 +270,18 @@
  	if (!profile_handoff_task(tsk))
  		free_task(tsk);
  }
@@ -12722,7 +12420,7 @@ index beb31725f7e2..e398cb9e62fa 100644
  
  void __init __weak arch_task_cache_init(void) { }
  
-@@ -702,6 +715,19 @@ void __mmdrop(struct mm_struct *mm)
+@@ -702,6 +715,19 @@
  }
  EXPORT_SYMBOL_GPL(__mmdrop);
  
@@ -12742,7 +12440,7 @@ index beb31725f7e2..e398cb9e62fa 100644
  static inline void __mmput(struct mm_struct *mm)
  {
  	VM_BUG_ON(atomic_read(&mm->mm_users));
-@@ -1274,6 +1300,9 @@ static void rt_mutex_init_task(struct task_struct *p)
+@@ -1274,6 +1300,9 @@
   */
  static void posix_cpu_timers_init(struct task_struct *tsk)
  {
@@ -12752,7 +12450,7 @@ index beb31725f7e2..e398cb9e62fa 100644
  	tsk->cputime_expires.prof_exp = 0;
  	tsk->cputime_expires.virt_exp = 0;
  	tsk->cputime_expires.sched_exp = 0;
-@@ -1399,6 +1428,7 @@ static struct task_struct *copy_process(unsigned long clone_flags,
+@@ -1399,6 +1428,7 @@
  	spin_lock_init(&p->alloc_lock);
  
  	init_sigpending(&p->pending);
@@ -12760,11 +12458,10 @@ index beb31725f7e2..e398cb9e62fa 100644
  
  	p->utime = p->stime = p->gtime = 0;
  	p->utimescaled = p->stimescaled = 0;
-diff --git a/kernel/futex.c b/kernel/futex.c
-index 46cb3a301bc1..6de82b959729 100644
---- a/kernel/futex.c
-+++ b/kernel/futex.c
-@@ -895,7 +895,9 @@ void exit_pi_state_list(struct task_struct *curr)
+diff -Nur linux-4.8.15.orig/kernel/futex.c linux-4.8.15/kernel/futex.c
+--- linux-4.8.15.orig/kernel/futex.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/futex.c	2017-01-01 17:07:16.015425924 +0100
+@@ -895,7 +895,9 @@
  		 * task still owns the PI-state:
  		 */
  		if (head->next != next) {
@@ -12774,7 +12471,7 @@ index 46cb3a301bc1..6de82b959729 100644
  			continue;
  		}
  
-@@ -1290,6 +1292,7 @@ static int wake_futex_pi(u32 __user *uaddr, u32 uval, struct futex_q *this,
+@@ -1290,6 +1292,7 @@
  	struct futex_pi_state *pi_state = this->pi_state;
  	u32 uninitialized_var(curval), newval;
  	WAKE_Q(wake_q);
@@ -12782,7 +12479,7 @@ index 46cb3a301bc1..6de82b959729 100644
  	bool deboost;
  	int ret = 0;
  
-@@ -1356,7 +1359,8 @@ static int wake_futex_pi(u32 __user *uaddr, u32 uval, struct futex_q *this,
+@@ -1356,7 +1359,8 @@
  
  	raw_spin_unlock_irq(&pi_state->pi_mutex.wait_lock);
  
@@ -12792,7 +12489,7 @@ index 46cb3a301bc1..6de82b959729 100644
  
  	/*
  	 * First unlock HB so the waiter does not spin on it once he got woken
-@@ -1364,8 +1368,9 @@ static int wake_futex_pi(u32 __user *uaddr, u32 uval, struct futex_q *this,
+@@ -1364,8 +1368,9 @@
  	 * deboost first (and lose our higher priority), then the task might get
  	 * scheduled away before the wake up can take place.
  	 */
@@ -12803,7 +12500,7 @@ index 46cb3a301bc1..6de82b959729 100644
  	if (deboost)
  		rt_mutex_adjust_prio(current);
  
-@@ -1915,6 +1920,16 @@ static int futex_requeue(u32 __user *uaddr1, unsigned int flags,
+@@ -1915,6 +1920,16 @@
  				requeue_pi_wake_futex(this, &key2, hb2);
  				drop_count++;
  				continue;
@@ -12820,7 +12517,7 @@ index 46cb3a301bc1..6de82b959729 100644
  			} else if (ret) {
  				/*
  				 * rt_mutex_start_proxy_lock() detected a
-@@ -2805,7 +2820,7 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags,
+@@ -2805,7 +2820,7 @@
  	struct hrtimer_sleeper timeout, *to = NULL;
  	struct rt_mutex_waiter rt_waiter;
  	struct rt_mutex *pi_mutex = NULL;
@@ -12829,7 +12526,7 @@ index 46cb3a301bc1..6de82b959729 100644
  	union futex_key key2 = FUTEX_KEY_INIT;
  	struct futex_q q = futex_q_init;
  	int res, ret;
-@@ -2830,10 +2845,7 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags,
+@@ -2830,10 +2845,7 @@
  	 * The waiter is allocated on our stack, manipulated by the requeue
  	 * code while we sleep on uaddr.
  	 */
@@ -12841,7 +12538,7 @@ index 46cb3a301bc1..6de82b959729 100644
  
  	ret = get_futex_key(uaddr2, flags & FLAGS_SHARED, &key2, VERIFY_WRITE);
  	if (unlikely(ret != 0))
-@@ -2864,20 +2876,55 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags,
+@@ -2864,20 +2876,55 @@
  	/* Queue the futex_q, drop the hb lock, wait for wakeup. */
  	futex_wait_queue_me(hb, &q, to);
  
@@ -12908,7 +12605,7 @@ index 46cb3a301bc1..6de82b959729 100644
  
  	/* Check if the requeue code acquired the second futex for us. */
  	if (!q.rt_waiter) {
-@@ -2886,14 +2933,15 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags,
+@@ -2886,14 +2933,15 @@
  		 * did a lock-steal - fix up the PI-state in that case.
  		 */
  		if (q.pi_state && (q.pi_state->owner != current)) {
@@ -12926,7 +12623,7 @@ index 46cb3a301bc1..6de82b959729 100644
  		}
  	} else {
  		/*
-@@ -2906,7 +2954,8 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags,
+@@ -2906,7 +2954,8 @@
  		ret = rt_mutex_finish_proxy_lock(pi_mutex, to, &rt_waiter);
  		debug_rt_mutex_free_waiter(&rt_waiter);
  
@@ -12936,11 +12633,10 @@ index 46cb3a301bc1..6de82b959729 100644
  		/*
  		 * Fixup the pi_state owner and possibly acquire the lock if we
  		 * haven't already.
-diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c
-index d3f24905852c..f87aa8fdcc51 100644
---- a/kernel/irq/handle.c
-+++ b/kernel/irq/handle.c
-@@ -181,10 +181,16 @@ irqreturn_t handle_irq_event_percpu(struct irq_desc *desc)
+diff -Nur linux-4.8.15.orig/kernel/irq/handle.c linux-4.8.15/kernel/irq/handle.c
+--- linux-4.8.15.orig/kernel/irq/handle.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/irq/handle.c	2017-01-01 17:07:16.015425924 +0100
+@@ -181,10 +181,16 @@
  {
  	irqreturn_t retval;
  	unsigned int flags = 0;
@@ -12958,10 +12654,9 @@ index d3f24905852c..f87aa8fdcc51 100644
  
  	if (!noirqdebug)
  		note_interrupt(desc, retval);
-diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
-index 9530fcd27704..fadf8f848299 100644
---- a/kernel/irq/manage.c
-+++ b/kernel/irq/manage.c
+diff -Nur linux-4.8.15.orig/kernel/irq/manage.c linux-4.8.15/kernel/irq/manage.c
+--- linux-4.8.15.orig/kernel/irq/manage.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/irq/manage.c	2017-01-01 17:07:16.015425924 +0100
 @@ -22,6 +22,7 @@
  #include "internals.h"
  
@@ -12970,7 +12665,7 @@ index 9530fcd27704..fadf8f848299 100644
  __read_mostly bool force_irqthreads;
  
  static int __init setup_forced_irqthreads(char *arg)
-@@ -30,6 +31,7 @@ static int __init setup_forced_irqthreads(char *arg)
+@@ -30,6 +31,7 @@
  	return 0;
  }
  early_param("threadirqs", setup_forced_irqthreads);
@@ -12978,7 +12673,7 @@ index 9530fcd27704..fadf8f848299 100644
  #endif
  
  static void __synchronize_hardirq(struct irq_desc *desc)
-@@ -233,7 +235,12 @@ int irq_set_affinity_locked(struct irq_data *data, const struct cpumask *mask,
+@@ -233,7 +235,12 @@
  
  	if (desc->affinity_notify) {
  		kref_get(&desc->affinity_notify->kref);
@@ -12991,7 +12686,7 @@ index 9530fcd27704..fadf8f848299 100644
  	}
  	irqd_set(data, IRQD_AFFINITY_SET);
  
-@@ -271,10 +278,8 @@ int irq_set_affinity_hint(unsigned int irq, const struct cpumask *m)
+@@ -271,10 +278,8 @@
  }
  EXPORT_SYMBOL_GPL(irq_set_affinity_hint);
  
@@ -13003,7 +12698,7 @@ index 9530fcd27704..fadf8f848299 100644
  	struct irq_desc *desc = irq_to_desc(notify->irq);
  	cpumask_var_t cpumask;
  	unsigned long flags;
-@@ -296,6 +301,35 @@ static void irq_affinity_notify(struct work_struct *work)
+@@ -296,6 +301,35 @@
  	kref_put(&notify->kref, notify->release);
  }
  
@@ -13039,7 +12734,7 @@ index 9530fcd27704..fadf8f848299 100644
  /**
   *	irq_set_affinity_notifier - control notification of IRQ affinity changes
   *	@irq:		Interrupt for which to enable/disable notification
-@@ -324,7 +358,12 @@ irq_set_affinity_notifier(unsigned int irq, struct irq_affinity_notify *notify)
+@@ -324,7 +358,12 @@
  	if (notify) {
  		notify->irq = irq;
  		kref_init(&notify->kref);
@@ -13052,7 +12747,7 @@ index 9530fcd27704..fadf8f848299 100644
  	}
  
  	raw_spin_lock_irqsave(&desc->lock, flags);
-@@ -879,7 +918,15 @@ irq_forced_thread_fn(struct irq_desc *desc, struct irqaction *action)
+@@ -879,7 +918,15 @@
  	local_bh_disable();
  	ret = action->thread_fn(action->irq, action->dev_id);
  	irq_finalize_oneshot(desc, action);
@@ -13069,7 +12764,7 @@ index 9530fcd27704..fadf8f848299 100644
  	return ret;
  }
  
-@@ -976,6 +1023,12 @@ static int irq_thread(void *data)
+@@ -976,6 +1023,12 @@
  		if (action_ret == IRQ_WAKE_THREAD)
  			irq_wake_secondary(desc, action);
  
@@ -13082,7 +12777,7 @@ index 9530fcd27704..fadf8f848299 100644
  		wake_threads_waitq(desc);
  	}
  
-@@ -1336,6 +1389,9 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new)
+@@ -1336,6 +1389,9 @@
  			irqd_set(&desc->irq_data, IRQD_NO_BALANCING);
  		}
  
@@ -13092,7 +12787,7 @@ index 9530fcd27704..fadf8f848299 100644
  		/* Set default affinity mask once everything is setup */
  		setup_affinity(desc, mask);
  
-@@ -2061,7 +2117,7 @@ EXPORT_SYMBOL_GPL(irq_get_irqchip_state);
+@@ -2061,7 +2117,7 @@
   *	This call sets the internal irqchip state of an interrupt,
   *	depending on the value of @which.
   *
@@ -13101,11 +12796,10 @@ index 9530fcd27704..fadf8f848299 100644
   *	interrupt controller has per-cpu registers.
   */
  int irq_set_irqchip_state(unsigned int irq, enum irqchip_irq_state which,
-diff --git a/kernel/irq/settings.h b/kernel/irq/settings.h
-index 320579d89091..2df2d4445b1e 100644
---- a/kernel/irq/settings.h
-+++ b/kernel/irq/settings.h
-@@ -16,6 +16,7 @@ enum {
+diff -Nur linux-4.8.15.orig/kernel/irq/settings.h linux-4.8.15/kernel/irq/settings.h
+--- linux-4.8.15.orig/kernel/irq/settings.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/irq/settings.h	2017-01-01 17:07:16.015425924 +0100
+@@ -16,6 +16,7 @@
  	_IRQ_PER_CPU_DEVID	= IRQ_PER_CPU_DEVID,
  	_IRQ_IS_POLLED		= IRQ_IS_POLLED,
  	_IRQ_DISABLE_UNLAZY	= IRQ_DISABLE_UNLAZY,
@@ -13113,7 +12807,7 @@ index 320579d89091..2df2d4445b1e 100644
  	_IRQF_MODIFY_MASK	= IRQF_MODIFY_MASK,
  };
  
-@@ -30,6 +31,7 @@ enum {
+@@ -30,6 +31,7 @@
  #define IRQ_PER_CPU_DEVID	GOT_YOU_MORON
  #define IRQ_IS_POLLED		GOT_YOU_MORON
  #define IRQ_DISABLE_UNLAZY	GOT_YOU_MORON
@@ -13121,7 +12815,7 @@ index 320579d89091..2df2d4445b1e 100644
  #undef IRQF_MODIFY_MASK
  #define IRQF_MODIFY_MASK	GOT_YOU_MORON
  
-@@ -40,6 +42,16 @@ irq_settings_clr_and_set(struct irq_desc *desc, u32 clr, u32 set)
+@@ -40,6 +42,16 @@
  	desc->status_use_accessors |= (set & _IRQF_MODIFY_MASK);
  }
  
@@ -13138,11 +12832,10 @@ index 320579d89091..2df2d4445b1e 100644
  static inline bool irq_settings_is_per_cpu(struct irq_desc *desc)
  {
  	return desc->status_use_accessors & _IRQ_PER_CPU;
-diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c
-index 5707f97a3e6a..73f38dc7a7fb 100644
---- a/kernel/irq/spurious.c
-+++ b/kernel/irq/spurious.c
-@@ -442,6 +442,10 @@ MODULE_PARM_DESC(noirqdebug, "Disable irq lockup detection when true");
+diff -Nur linux-4.8.15.orig/kernel/irq/spurious.c linux-4.8.15/kernel/irq/spurious.c
+--- linux-4.8.15.orig/kernel/irq/spurious.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/irq/spurious.c	2017-01-01 17:07:16.015425924 +0100
+@@ -442,6 +442,10 @@
  
  static int __init irqfixup_setup(char *str)
  {
@@ -13153,7 +12846,7 @@ index 5707f97a3e6a..73f38dc7a7fb 100644
  	irqfixup = 1;
  	printk(KERN_WARNING "Misrouted IRQ fixup support enabled.\n");
  	printk(KERN_WARNING "This may impact system performance.\n");
-@@ -454,6 +458,10 @@ module_param(irqfixup, int, 0644);
+@@ -454,6 +458,10 @@
  
  static int __init irqpoll_setup(char *str)
  {
@@ -13164,10 +12857,9 @@ index 5707f97a3e6a..73f38dc7a7fb 100644
  	irqfixup = 2;
  	printk(KERN_WARNING "Misrouted IRQ fixup and polling support "
  				"enabled\n");
-diff --git a/kernel/irq_work.c b/kernel/irq_work.c
-index bcf107ce0854..2899ba0d23d1 100644
---- a/kernel/irq_work.c
-+++ b/kernel/irq_work.c
+diff -Nur linux-4.8.15.orig/kernel/irq_work.c linux-4.8.15/kernel/irq_work.c
+--- linux-4.8.15.orig/kernel/irq_work.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/irq_work.c	2017-01-01 17:07:16.019426176 +0100
 @@ -17,6 +17,7 @@
  #include <linux/cpu.h>
  #include <linux/notifier.h>
@@ -13176,7 +12868,7 @@ index bcf107ce0854..2899ba0d23d1 100644
  #include <asm/processor.h>
  
  
-@@ -65,6 +66,8 @@ void __weak arch_irq_work_raise(void)
+@@ -65,6 +66,8 @@
   */
  bool irq_work_queue_on(struct irq_work *work, int cpu)
  {
@@ -13185,7 +12877,7 @@ index bcf107ce0854..2899ba0d23d1 100644
  	/* All work should have been flushed before going offline */
  	WARN_ON_ONCE(cpu_is_offline(cpu));
  
-@@ -75,7 +78,12 @@ bool irq_work_queue_on(struct irq_work *work, int cpu)
+@@ -75,7 +78,12 @@
  	if (!irq_work_claim(work))
  		return false;
  
@@ -13199,7 +12891,7 @@ index bcf107ce0854..2899ba0d23d1 100644
  		arch_send_call_function_single_ipi(cpu);
  
  	return true;
-@@ -86,6 +94,9 @@ EXPORT_SYMBOL_GPL(irq_work_queue_on);
+@@ -86,6 +94,9 @@
  /* Enqueue the irq work @work on the current CPU */
  bool irq_work_queue(struct irq_work *work)
  {
@@ -13209,7 +12901,7 @@ index bcf107ce0854..2899ba0d23d1 100644
  	/* Only queue if not already pending */
  	if (!irq_work_claim(work))
  		return false;
-@@ -93,13 +104,15 @@ bool irq_work_queue(struct irq_work *work)
+@@ -93,13 +104,15 @@
  	/* Queue the entry and raise the IPI if needed. */
  	preempt_disable();
  
@@ -13232,7 +12924,7 @@ index bcf107ce0854..2899ba0d23d1 100644
  			arch_irq_work_raise();
  	}
  
-@@ -116,9 +129,8 @@ bool irq_work_needs_cpu(void)
+@@ -116,9 +129,8 @@
  	raised = this_cpu_ptr(&raised_list);
  	lazy = this_cpu_ptr(&lazy_list);
  
@@ -13244,7 +12936,7 @@ index bcf107ce0854..2899ba0d23d1 100644
  
  	/* All work should have been flushed before going offline */
  	WARN_ON_ONCE(cpu_is_offline(smp_processor_id()));
-@@ -132,7 +144,7 @@ static void irq_work_run_list(struct llist_head *list)
+@@ -132,7 +144,7 @@
  	struct irq_work *work;
  	struct llist_node *llnode;
  
@@ -13253,7 +12945,7 @@ index bcf107ce0854..2899ba0d23d1 100644
  
  	if (llist_empty(list))
  		return;
-@@ -169,7 +181,16 @@ static void irq_work_run_list(struct llist_head *list)
+@@ -169,7 +181,16 @@
  void irq_work_run(void)
  {
  	irq_work_run_list(this_cpu_ptr(&raised_list));
@@ -13271,7 +12963,7 @@ index bcf107ce0854..2899ba0d23d1 100644
  }
  EXPORT_SYMBOL_GPL(irq_work_run);
  
-@@ -179,8 +200,17 @@ void irq_work_tick(void)
+@@ -179,8 +200,17 @@
  
  	if (!llist_empty(raised) && !arch_irq_work_has_interrupt())
  		irq_work_run_list(raised);
@@ -13289,11 +12981,82 @@ index bcf107ce0854..2899ba0d23d1 100644
  
  /*
   * Synchronize against the irq_work @entry, ensures the entry is not
-diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c
-index ee1bc1bb8feb..ddef07958840 100644
---- a/kernel/ksysfs.c
-+++ b/kernel/ksysfs.c
-@@ -136,6 +136,15 @@ KERNEL_ATTR_RO(vmcoreinfo);
+diff -Nur linux-4.8.15.orig/kernel/Kconfig.locks linux-4.8.15/kernel/Kconfig.locks
+--- linux-4.8.15.orig/kernel/Kconfig.locks	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/Kconfig.locks	2017-01-01 17:07:15.995424645 +0100
+@@ -225,11 +225,11 @@
+ 
+ config MUTEX_SPIN_ON_OWNER
+ 	def_bool y
+-	depends on SMP && !DEBUG_MUTEXES && ARCH_SUPPORTS_ATOMIC_RMW
++	depends on SMP && !DEBUG_MUTEXES && ARCH_SUPPORTS_ATOMIC_RMW && !PREEMPT_RT_FULL
+ 
+ config RWSEM_SPIN_ON_OWNER
+        def_bool y
+-       depends on SMP && RWSEM_XCHGADD_ALGORITHM && ARCH_SUPPORTS_ATOMIC_RMW
++       depends on SMP && RWSEM_XCHGADD_ALGORITHM && ARCH_SUPPORTS_ATOMIC_RMW && !PREEMPT_RT_FULL
+ 
+ config LOCK_SPIN_ON_OWNER
+        def_bool y
+diff -Nur linux-4.8.15.orig/kernel/Kconfig.preempt linux-4.8.15/kernel/Kconfig.preempt
+--- linux-4.8.15.orig/kernel/Kconfig.preempt	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/Kconfig.preempt	2017-01-01 17:07:15.995424645 +0100
+@@ -1,3 +1,16 @@
++config PREEMPT
++	bool
++	select PREEMPT_COUNT
++
++config PREEMPT_RT_BASE
++	bool
++	select PREEMPT
++
++config HAVE_PREEMPT_LAZY
++	bool
++
++config PREEMPT_LAZY
++	def_bool y if HAVE_PREEMPT_LAZY && PREEMPT_RT_FULL
+ 
+ choice
+ 	prompt "Preemption Model"
+@@ -33,9 +46,9 @@
+ 
+ 	  Select this if you are building a kernel for a desktop system.
+ 
+-config PREEMPT
++config PREEMPT__LL
+ 	bool "Preemptible Kernel (Low-Latency Desktop)"
+-	select PREEMPT_COUNT
++	select PREEMPT
+ 	select UNINLINE_SPIN_UNLOCK if !ARCH_INLINE_SPIN_UNLOCK
+ 	help
+ 	  This option reduces the latency of the kernel by making
+@@ -52,6 +65,22 @@
+ 	  embedded system with latency requirements in the milliseconds
+ 	  range.
+ 
++config PREEMPT_RTB
++	bool "Preemptible Kernel (Basic RT)"
++	select PREEMPT_RT_BASE
++	help
++	  This option is basically the same as (Low-Latency Desktop) but
++	  enables changes which are preliminary for the full preemptible
++	  RT kernel.
++
++config PREEMPT_RT_FULL
++	bool "Fully Preemptible Kernel (RT)"
++	depends on IRQ_FORCED_THREADING
++	select PREEMPT_RT_BASE
++	select PREEMPT_RCU
++	help
++	  All and everything
++
+ endchoice
+ 
+ config PREEMPT_COUNT
+diff -Nur linux-4.8.15.orig/kernel/ksysfs.c linux-4.8.15/kernel/ksysfs.c
+--- linux-4.8.15.orig/kernel/ksysfs.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/ksysfs.c	2017-01-01 17:07:16.019426176 +0100
+@@ -136,6 +136,15 @@
  
  #endif /* CONFIG_KEXEC_CORE */
  
@@ -13309,7 +13072,7 @@ index ee1bc1bb8feb..ddef07958840 100644
  /* whether file capabilities are enabled */
  static ssize_t fscaps_show(struct kobject *kobj,
  				  struct kobj_attribute *attr, char *buf)
-@@ -225,6 +234,9 @@ static struct attribute * kernel_attrs[] = {
+@@ -225,6 +234,9 @@
  	&rcu_expedited_attr.attr,
  	&rcu_normal_attr.attr,
  #endif
@@ -13319,46 +13082,9 @@ index ee1bc1bb8feb..ddef07958840 100644
  	NULL
  };
  
-diff --git a/kernel/locking/Makefile b/kernel/locking/Makefile
-index 31322a4275cd..c6bba9299d8b 100644
---- a/kernel/locking/Makefile
-+++ b/kernel/locking/Makefile
-@@ -2,7 +2,7 @@
- # and is generally not a function of system call inputs.
- KCOV_INSTRUMENT		:= n
- 
--obj-y += mutex.o semaphore.o rwsem.o percpu-rwsem.o
-+obj-y += semaphore.o percpu-rwsem.o
- 
- ifdef CONFIG_FUNCTION_TRACER
- CFLAGS_REMOVE_lockdep.o = $(CC_FLAGS_FTRACE)
-@@ -11,7 +11,11 @@ CFLAGS_REMOVE_mutex-debug.o = $(CC_FLAGS_FTRACE)
- CFLAGS_REMOVE_rtmutex-debug.o = $(CC_FLAGS_FTRACE)
- endif
- 
-+ifneq ($(CONFIG_PREEMPT_RT_FULL),y)
-+obj-y += mutex.o
- obj-$(CONFIG_DEBUG_MUTEXES) += mutex-debug.o
-+obj-y += rwsem.o
-+endif
- obj-$(CONFIG_LOCKDEP) += lockdep.o
- ifeq ($(CONFIG_PROC_FS),y)
- obj-$(CONFIG_LOCKDEP) += lockdep_proc.o
-@@ -25,7 +29,10 @@ obj-$(CONFIG_RT_MUTEXES) += rtmutex.o
- obj-$(CONFIG_DEBUG_RT_MUTEXES) += rtmutex-debug.o
- obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock.o
- obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock_debug.o
-+ifneq ($(CONFIG_PREEMPT_RT_FULL),y)
- obj-$(CONFIG_RWSEM_GENERIC_SPINLOCK) += rwsem-spinlock.o
- obj-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += rwsem-xadd.o
-+endif
-+obj-$(CONFIG_PREEMPT_RT_FULL) += rt.o
- obj-$(CONFIG_QUEUED_RWLOCKS) += qrwlock.o
- obj-$(CONFIG_LOCK_TORTURE_TEST) += locktorture.o
-diff --git a/kernel/locking/lglock.c b/kernel/locking/lglock.c
-index 951cfcd10b4a..57e0ea72c28a 100644
---- a/kernel/locking/lglock.c
-+++ b/kernel/locking/lglock.c
+diff -Nur linux-4.8.15.orig/kernel/locking/lglock.c linux-4.8.15/kernel/locking/lglock.c
+--- linux-4.8.15.orig/kernel/locking/lglock.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/locking/lglock.c	2017-01-01 17:07:16.019426176 +0100
 @@ -4,6 +4,15 @@
  #include <linux/cpu.h>
  #include <linux/string.h>
@@ -13448,7 +13174,7 @@ index 951cfcd10b4a..57e0ea72c28a 100644
  }
  EXPORT_SYMBOL(lg_local_unlock_cpu);
  
-@@ -68,30 +86,30 @@ void lg_double_lock(struct lglock *lg, int cpu1, int cpu2)
+@@ -68,30 +86,30 @@
  	if (cpu2 < cpu1)
  		swap(cpu1, cpu2);
  
@@ -13488,7 +13214,7 @@ index 951cfcd10b4a..57e0ea72c28a 100644
  	}
  }
  EXPORT_SYMBOL(lg_global_lock);
-@@ -102,10 +120,35 @@ void lg_global_unlock(struct lglock *lg)
+@@ -102,10 +120,35 @@
  
  	lock_release(&lg->lock_dep_map, 1, _RET_IP_);
  	for_each_possible_cpu(i) {
@@ -13527,11 +13253,10 @@ index 951cfcd10b4a..57e0ea72c28a 100644
 +	}
 +}
 +#endif
-diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
-index 589d763a49b3..4b48c4bfb60c 100644
---- a/kernel/locking/lockdep.c
-+++ b/kernel/locking/lockdep.c
-@@ -3686,6 +3686,7 @@ static void check_flags(unsigned long flags)
+diff -Nur linux-4.8.15.orig/kernel/locking/lockdep.c linux-4.8.15/kernel/locking/lockdep.c
+--- linux-4.8.15.orig/kernel/locking/lockdep.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/locking/lockdep.c	2017-01-01 17:07:16.019426176 +0100
+@@ -3686,6 +3686,7 @@
  		}
  	}
  
@@ -13539,7 +13264,7 @@ index 589d763a49b3..4b48c4bfb60c 100644
  	/*
  	 * We dont accurately track softirq state in e.g.
  	 * hardirq contexts (such as on 4KSTACKS), so only
-@@ -3700,6 +3701,7 @@ static void check_flags(unsigned long flags)
+@@ -3700,6 +3701,7 @@
  			DEBUG_LOCKS_WARN_ON(!current->softirqs_enabled);
  		}
  	}
@@ -13547,10 +13272,9 @@ index 589d763a49b3..4b48c4bfb60c 100644
  
  	if (!debug_locks)
  		print_irqtrace_events(current);
-diff --git a/kernel/locking/locktorture.c b/kernel/locking/locktorture.c
-index f8c5af52a131..788068773e61 100644
---- a/kernel/locking/locktorture.c
-+++ b/kernel/locking/locktorture.c
+diff -Nur linux-4.8.15.orig/kernel/locking/locktorture.c linux-4.8.15/kernel/locking/locktorture.c
+--- linux-4.8.15.orig/kernel/locking/locktorture.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/locking/locktorture.c	2017-01-01 17:07:16.019426176 +0100
 @@ -26,7 +26,6 @@
  #include <linux/kthread.h>
  #include <linux/sched/rt.h>
@@ -13559,11 +13283,44 @@ index f8c5af52a131..788068773e61 100644
  #include <linux/mutex.h>
  #include <linux/rwsem.h>
  #include <linux/smp.h>
-diff --git a/kernel/locking/rt.c b/kernel/locking/rt.c
-new file mode 100644
-index 000000000000..665754c00e1e
---- /dev/null
-+++ b/kernel/locking/rt.c
+diff -Nur linux-4.8.15.orig/kernel/locking/Makefile linux-4.8.15/kernel/locking/Makefile
+--- linux-4.8.15.orig/kernel/locking/Makefile	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/locking/Makefile	2017-01-01 17:07:16.019426176 +0100
+@@ -2,7 +2,7 @@
+ # and is generally not a function of system call inputs.
+ KCOV_INSTRUMENT		:= n
+ 
+-obj-y += mutex.o semaphore.o rwsem.o percpu-rwsem.o
++obj-y += semaphore.o percpu-rwsem.o
+ 
+ ifdef CONFIG_FUNCTION_TRACER
+ CFLAGS_REMOVE_lockdep.o = $(CC_FLAGS_FTRACE)
+@@ -11,7 +11,11 @@
+ CFLAGS_REMOVE_rtmutex-debug.o = $(CC_FLAGS_FTRACE)
+ endif
+ 
++ifneq ($(CONFIG_PREEMPT_RT_FULL),y)
++obj-y += mutex.o
+ obj-$(CONFIG_DEBUG_MUTEXES) += mutex-debug.o
++obj-y += rwsem.o
++endif
+ obj-$(CONFIG_LOCKDEP) += lockdep.o
+ ifeq ($(CONFIG_PROC_FS),y)
+ obj-$(CONFIG_LOCKDEP) += lockdep_proc.o
+@@ -25,7 +29,10 @@
+ obj-$(CONFIG_DEBUG_RT_MUTEXES) += rtmutex-debug.o
+ obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock.o
+ obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock_debug.o
++ifneq ($(CONFIG_PREEMPT_RT_FULL),y)
+ obj-$(CONFIG_RWSEM_GENERIC_SPINLOCK) += rwsem-spinlock.o
+ obj-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += rwsem-xadd.o
++endif
++obj-$(CONFIG_PREEMPT_RT_FULL) += rt.o
+ obj-$(CONFIG_QUEUED_RWLOCKS) += qrwlock.o
+ obj-$(CONFIG_LOCK_TORTURE_TEST) += locktorture.o
+diff -Nur linux-4.8.15.orig/kernel/locking/rt.c linux-4.8.15/kernel/locking/rt.c
+--- linux-4.8.15.orig/kernel/locking/rt.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-4.8.15/kernel/locking/rt.c	2017-01-01 17:07:16.019426176 +0100
 @@ -0,0 +1,498 @@
 +/*
 + * kernel/rt.c
@@ -14063,10 +13820,9 @@ index 000000000000..665754c00e1e
 +	return 1;
 +}
 +EXPORT_SYMBOL(atomic_dec_and_mutex_lock);
-diff --git a/kernel/locking/rtmutex.c b/kernel/locking/rtmutex.c
-index 1ec0f48962b3..2576f7ccf8e2 100644
---- a/kernel/locking/rtmutex.c
-+++ b/kernel/locking/rtmutex.c
+diff -Nur linux-4.8.15.orig/kernel/locking/rtmutex.c linux-4.8.15/kernel/locking/rtmutex.c
+--- linux-4.8.15.orig/kernel/locking/rtmutex.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/locking/rtmutex.c	2017-01-01 17:07:16.023426438 +0100
 @@ -7,6 +7,11 @@
   *  Copyright (C) 2005-2006 Timesys Corp., Thomas Gleixner <tglx@timesys.com>
   *  Copyright (C) 2005 Kihon Technologies Inc., Steven Rostedt
@@ -14087,8 +13843,8 @@ index 1ec0f48962b3..2576f7ccf8e2 100644
  
  #include "rtmutex_common.h"
  
-@@ -69,6 +75,12 @@ static void fixup_rt_mutex_waiters(struct rt_mutex *lock)
- 		clear_rt_mutex_waiters(lock);
+@@ -133,6 +139,12 @@
+ 		WRITE_ONCE(*p, owner & ~RT_MUTEX_HAS_WAITERS);
  }
  
 +static int rt_mutex_real_waiter(struct rt_mutex_waiter *waiter)
@@ -14100,7 +13856,7 @@ index 1ec0f48962b3..2576f7ccf8e2 100644
  /*
   * We can speed up the acquire/release, if there's no debugging state to be
   * set up.
-@@ -350,6 +362,14 @@ static bool rt_mutex_cond_detect_deadlock(struct rt_mutex_waiter *waiter,
+@@ -414,6 +426,14 @@
  	return debug_rt_mutex_detect_deadlock(waiter, chwalk);
  }
  
@@ -14115,7 +13871,7 @@ index 1ec0f48962b3..2576f7ccf8e2 100644
  /*
   * Max number of times we'll walk the boosting chain:
   */
-@@ -357,7 +377,8 @@ int max_lock_depth = 1024;
+@@ -421,7 +441,8 @@
  
  static inline struct rt_mutex *task_blocked_on_lock(struct task_struct *p)
  {
@@ -14125,7 +13881,7 @@ index 1ec0f48962b3..2576f7ccf8e2 100644
  }
  
  /*
-@@ -493,7 +514,7 @@ static int rt_mutex_adjust_prio_chain(struct task_struct *task,
+@@ -557,7 +578,7 @@
  	 * reached or the state of the chain has changed while we
  	 * dropped the locks.
  	 */
@@ -14134,7 +13890,7 @@ index 1ec0f48962b3..2576f7ccf8e2 100644
  		goto out_unlock_pi;
  
  	/*
-@@ -655,13 +676,16 @@ static int rt_mutex_adjust_prio_chain(struct task_struct *task,
+@@ -719,13 +740,16 @@
  	 * follow here. This is the end of the chain we are walking.
  	 */
  	if (!rt_mutex_owner(lock)) {
@@ -14153,7 +13909,7 @@ index 1ec0f48962b3..2576f7ccf8e2 100644
  		raw_spin_unlock_irq(&lock->wait_lock);
  		return 0;
  	}
-@@ -754,6 +778,25 @@ static int rt_mutex_adjust_prio_chain(struct task_struct *task,
+@@ -818,6 +842,25 @@
  	return ret;
  }
  
@@ -14179,7 +13935,7 @@ index 1ec0f48962b3..2576f7ccf8e2 100644
  /*
   * Try to take an rt-mutex
   *
-@@ -764,8 +807,9 @@ static int rt_mutex_adjust_prio_chain(struct task_struct *task,
+@@ -828,8 +871,9 @@
   * @waiter: The waiter that is queued to the lock's wait tree if the
   *	    callsite called task_blocked_on_lock(), otherwise NULL
   */
@@ -14191,7 +13947,7 @@ index 1ec0f48962b3..2576f7ccf8e2 100644
  {
  	/*
  	 * Before testing whether we can acquire @lock, we set the
-@@ -802,8 +846,10 @@ static int try_to_take_rt_mutex(struct rt_mutex *lock, struct task_struct *task,
+@@ -866,8 +910,10 @@
  		 * If waiter is not the highest priority waiter of
  		 * @lock, give up.
  		 */
@@ -14203,7 +13959,7 @@ index 1ec0f48962b3..2576f7ccf8e2 100644
  
  		/*
  		 * We can acquire the lock. Remove the waiter from the
-@@ -821,14 +867,10 @@ static int try_to_take_rt_mutex(struct rt_mutex *lock, struct task_struct *task,
+@@ -885,14 +931,10 @@
  		 * not need to be dequeued.
  		 */
  		if (rt_mutex_has_waiters(lock)) {
@@ -14221,7 +13977,7 @@ index 1ec0f48962b3..2576f7ccf8e2 100644
  			/*
  			 * The current top waiter stays enqueued. We
  			 * don't have to change anything in the lock
-@@ -877,6 +919,438 @@ static int try_to_take_rt_mutex(struct rt_mutex *lock, struct task_struct *task,
+@@ -941,6 +983,438 @@
  	return 1;
  }
  
@@ -14660,7 +14416,7 @@ index 1ec0f48962b3..2576f7ccf8e2 100644
  /*
   * Task blocks on lock.
   *
-@@ -907,6 +1381,23 @@ static int task_blocks_on_rt_mutex(struct rt_mutex *lock,
+@@ -971,6 +1445,23 @@
  		return -EDEADLK;
  
  	raw_spin_lock(&task->pi_lock);
@@ -14684,7 +14440,7 @@ index 1ec0f48962b3..2576f7ccf8e2 100644
  	__rt_mutex_adjust_prio(task);
  	waiter->task = task;
  	waiter->lock = lock;
-@@ -930,7 +1421,7 @@ static int task_blocks_on_rt_mutex(struct rt_mutex *lock,
+@@ -994,7 +1485,7 @@
  		rt_mutex_enqueue_pi(owner, waiter);
  
  		__rt_mutex_adjust_prio(owner);
@@ -14693,7 +14449,7 @@ index 1ec0f48962b3..2576f7ccf8e2 100644
  			chain_walk = 1;
  	} else if (rt_mutex_cond_detect_deadlock(waiter, chwalk)) {
  		chain_walk = 1;
-@@ -972,6 +1463,7 @@ static int task_blocks_on_rt_mutex(struct rt_mutex *lock,
+@@ -1036,6 +1527,7 @@
   * Called with lock->wait_lock held and interrupts disabled.
   */
  static void mark_wakeup_next_waiter(struct wake_q_head *wake_q,
@@ -14701,7 +14457,7 @@ index 1ec0f48962b3..2576f7ccf8e2 100644
  				    struct rt_mutex *lock)
  {
  	struct rt_mutex_waiter *waiter;
-@@ -1000,7 +1492,10 @@ static void mark_wakeup_next_waiter(struct wake_q_head *wake_q,
+@@ -1064,7 +1556,10 @@
  
  	raw_spin_unlock(&current->pi_lock);
  
@@ -14713,7 +14469,7 @@ index 1ec0f48962b3..2576f7ccf8e2 100644
  }
  
  /*
-@@ -1014,7 +1509,7 @@ static void remove_waiter(struct rt_mutex *lock,
+@@ -1078,7 +1573,7 @@
  {
  	bool is_top_waiter = (waiter == rt_mutex_top_waiter(lock));
  	struct task_struct *owner = rt_mutex_owner(lock);
@@ -14722,7 +14478,7 @@ index 1ec0f48962b3..2576f7ccf8e2 100644
  
  	raw_spin_lock(&current->pi_lock);
  	rt_mutex_dequeue(lock, waiter);
-@@ -1038,7 +1533,8 @@ static void remove_waiter(struct rt_mutex *lock,
+@@ -1102,7 +1597,8 @@
  	__rt_mutex_adjust_prio(owner);
  
  	/* Store the lock on which owner is blocked or NULL */
@@ -14732,7 +14488,7 @@ index 1ec0f48962b3..2576f7ccf8e2 100644
  
  	raw_spin_unlock(&owner->pi_lock);
  
-@@ -1074,17 +1570,17 @@ void rt_mutex_adjust_pi(struct task_struct *task)
+@@ -1138,17 +1634,17 @@
  	raw_spin_lock_irqsave(&task->pi_lock, flags);
  
  	waiter = task->pi_blocked_on;
@@ -14752,7 +14508,7 @@ index 1ec0f48962b3..2576f7ccf8e2 100644
  	rt_mutex_adjust_prio_chain(task, RT_MUTEX_MIN_CHAINWALK, NULL,
  				   next_lock, NULL, task);
  }
-@@ -1102,7 +1598,8 @@ void rt_mutex_adjust_pi(struct task_struct *task)
+@@ -1166,7 +1662,8 @@
  static int __sched
  __rt_mutex_slowlock(struct rt_mutex *lock, int state,
  		    struct hrtimer_sleeper *timeout,
@@ -14762,7 +14518,7 @@ index 1ec0f48962b3..2576f7ccf8e2 100644
  {
  	int ret = 0;
  
-@@ -1125,6 +1622,12 @@ __rt_mutex_slowlock(struct rt_mutex *lock, int state,
+@@ -1189,6 +1686,12 @@
  				break;
  		}
  
@@ -14775,7 +14531,7 @@ index 1ec0f48962b3..2576f7ccf8e2 100644
  		raw_spin_unlock_irq(&lock->wait_lock);
  
  		debug_rt_mutex_print_deadlock(waiter);
-@@ -1159,21 +1662,96 @@ static void rt_mutex_handle_deadlock(int res, int detect_deadlock,
+@@ -1223,21 +1726,96 @@
  	}
  }
  
@@ -14876,7 +14632,7 @@ index 1ec0f48962b3..2576f7ccf8e2 100644
  
  	/*
  	 * Technically we could use raw_spin_[un]lock_irq() here, but this can
-@@ -1187,6 +1765,8 @@ rt_mutex_slowlock(struct rt_mutex *lock, int state,
+@@ -1251,6 +1829,8 @@
  
  	/* Try to acquire the lock again: */
  	if (try_to_take_rt_mutex(lock, current, NULL)) {
@@ -14885,7 +14641,7 @@ index 1ec0f48962b3..2576f7ccf8e2 100644
  		raw_spin_unlock_irqrestore(&lock->wait_lock, flags);
  		return 0;
  	}
-@@ -1201,13 +1781,23 @@ rt_mutex_slowlock(struct rt_mutex *lock, int state,
+@@ -1265,13 +1845,23 @@
  
  	if (likely(!ret))
  		/* sleep on the mutex */
@@ -14911,7 +14667,7 @@ index 1ec0f48962b3..2576f7ccf8e2 100644
  	}
  
  	/*
-@@ -1267,7 +1857,8 @@ static inline int rt_mutex_slowtrylock(struct rt_mutex *lock)
+@@ -1331,7 +1921,8 @@
   * Return whether the current task needs to undo a potential priority boosting.
   */
  static bool __sched rt_mutex_slowunlock(struct rt_mutex *lock,
@@ -14921,7 +14677,7 @@ index 1ec0f48962b3..2576f7ccf8e2 100644
  {
  	unsigned long flags;
  
-@@ -1323,7 +1914,7 @@ static bool __sched rt_mutex_slowunlock(struct rt_mutex *lock,
+@@ -1387,7 +1978,7 @@
  	 *
  	 * Queue the next waiter for wakeup once we release the wait_lock.
  	 */
@@ -14930,7 +14686,7 @@ index 1ec0f48962b3..2576f7ccf8e2 100644
  
  	raw_spin_unlock_irqrestore(&lock->wait_lock, flags);
  
-@@ -1339,31 +1930,36 @@ static bool __sched rt_mutex_slowunlock(struct rt_mutex *lock,
+@@ -1403,31 +1994,36 @@
   */
  static inline int
  rt_mutex_fastlock(struct rt_mutex *lock, int state,
@@ -14971,7 +14727,7 @@ index 1ec0f48962b3..2576f7ccf8e2 100644
  }
  
  static inline int
-@@ -1380,17 +1976,20 @@ rt_mutex_fasttrylock(struct rt_mutex *lock,
+@@ -1444,17 +2040,20 @@
  static inline void
  rt_mutex_fastunlock(struct rt_mutex *lock,
  		    bool (*slowfn)(struct rt_mutex *lock,
@@ -14994,7 +14750,7 @@ index 1ec0f48962b3..2576f7ccf8e2 100644
  
  		/* Undo pi boosting if necessary: */
  		if (deboost)
-@@ -1407,7 +2006,7 @@ void __sched rt_mutex_lock(struct rt_mutex *lock)
+@@ -1471,7 +2070,7 @@
  {
  	might_sleep();
  
@@ -15003,7 +14759,7 @@ index 1ec0f48962b3..2576f7ccf8e2 100644
  }
  EXPORT_SYMBOL_GPL(rt_mutex_lock);
  
-@@ -1424,7 +2023,7 @@ int __sched rt_mutex_lock_interruptible(struct rt_mutex *lock)
+@@ -1488,7 +2087,7 @@
  {
  	might_sleep();
  
@@ -15012,7 +14768,7 @@ index 1ec0f48962b3..2576f7ccf8e2 100644
  }
  EXPORT_SYMBOL_GPL(rt_mutex_lock_interruptible);
  
-@@ -1437,11 +2036,30 @@ int rt_mutex_timed_futex_lock(struct rt_mutex *lock,
+@@ -1501,11 +2100,30 @@
  	might_sleep();
  
  	return rt_mutex_timed_fastlock(lock, TASK_INTERRUPTIBLE, timeout,
@@ -15044,7 +14800,7 @@ index 1ec0f48962b3..2576f7ccf8e2 100644
   * rt_mutex_timed_lock - lock a rt_mutex interruptible
   *			the timeout structure is provided
   *			by the caller
-@@ -1461,6 +2079,7 @@ rt_mutex_timed_lock(struct rt_mutex *lock, struct hrtimer_sleeper *timeout)
+@@ -1525,6 +2143,7 @@
  
  	return rt_mutex_timed_fastlock(lock, TASK_INTERRUPTIBLE, timeout,
  				       RT_MUTEX_MIN_CHAINWALK,
@@ -15052,7 +14808,7 @@ index 1ec0f48962b3..2576f7ccf8e2 100644
  				       rt_mutex_slowlock);
  }
  EXPORT_SYMBOL_GPL(rt_mutex_timed_lock);
-@@ -1478,7 +2097,11 @@ EXPORT_SYMBOL_GPL(rt_mutex_timed_lock);
+@@ -1542,7 +2161,11 @@
   */
  int __sched rt_mutex_trylock(struct rt_mutex *lock)
  {
@@ -15064,7 +14820,7 @@ index 1ec0f48962b3..2576f7ccf8e2 100644
  		return 0;
  
  	return rt_mutex_fasttrylock(lock, rt_mutex_slowtrylock);
-@@ -1504,13 +2127,14 @@ EXPORT_SYMBOL_GPL(rt_mutex_unlock);
+@@ -1568,13 +2191,14 @@
   * required or not.
   */
  bool __sched rt_mutex_futex_unlock(struct rt_mutex *lock,
@@ -15081,7 +14837,7 @@ index 1ec0f48962b3..2576f7ccf8e2 100644
  }
  
  /**
-@@ -1543,13 +2167,12 @@ EXPORT_SYMBOL_GPL(rt_mutex_destroy);
+@@ -1607,13 +2231,12 @@
  void __rt_mutex_init(struct rt_mutex *lock, const char *name)
  {
  	lock->owner = NULL;
@@ -15096,7 +14852,7 @@ index 1ec0f48962b3..2576f7ccf8e2 100644
  
  /**
   * rt_mutex_init_proxy_locked - initialize and lock a rt_mutex on behalf of a
-@@ -1564,7 +2187,7 @@ EXPORT_SYMBOL_GPL(__rt_mutex_init);
+@@ -1628,7 +2251,7 @@
  void rt_mutex_init_proxy_locked(struct rt_mutex *lock,
  				struct task_struct *proxy_owner)
  {
@@ -15105,7 +14861,7 @@ index 1ec0f48962b3..2576f7ccf8e2 100644
  	debug_rt_mutex_proxy_lock(lock, proxy_owner);
  	rt_mutex_set_owner(lock, proxy_owner);
  	rt_mutex_deadlock_account_lock(lock, proxy_owner);
-@@ -1612,6 +2235,35 @@ int rt_mutex_start_proxy_lock(struct rt_mutex *lock,
+@@ -1676,6 +2299,35 @@
  		return 1;
  	}
  
@@ -15141,7 +14897,7 @@ index 1ec0f48962b3..2576f7ccf8e2 100644
  	/* We enforce deadlock detection for futexes */
  	ret = task_blocks_on_rt_mutex(lock, waiter, task,
  				      RT_MUTEX_FULL_CHAINWALK);
-@@ -1626,7 +2278,7 @@ int rt_mutex_start_proxy_lock(struct rt_mutex *lock,
+@@ -1690,7 +2342,7 @@
  		ret = 0;
  	}
  
@@ -15150,7 +14906,7 @@ index 1ec0f48962b3..2576f7ccf8e2 100644
  		remove_waiter(lock, waiter);
  
  	raw_spin_unlock_irq(&lock->wait_lock);
-@@ -1682,7 +2334,7 @@ int rt_mutex_finish_proxy_lock(struct rt_mutex *lock,
+@@ -1746,7 +2398,7 @@
  	set_current_state(TASK_INTERRUPTIBLE);
  
  	/* sleep on the mutex */
@@ -15159,7 +14915,7 @@ index 1ec0f48962b3..2576f7ccf8e2 100644
  
  	if (unlikely(ret))
  		remove_waiter(lock, waiter);
-@@ -1697,3 +2349,89 @@ int rt_mutex_finish_proxy_lock(struct rt_mutex *lock,
+@@ -1761,3 +2413,89 @@
  
  	return ret;
  }
@@ -15249,11 +15005,10 @@ index 1ec0f48962b3..2576f7ccf8e2 100644
 +}
 +EXPORT_SYMBOL(ww_mutex_unlock);
 +#endif
-diff --git a/kernel/locking/rtmutex_common.h b/kernel/locking/rtmutex_common.h
-index 4f5f83c7d2d3..289f062f26cd 100644
---- a/kernel/locking/rtmutex_common.h
-+++ b/kernel/locking/rtmutex_common.h
-@@ -27,6 +27,7 @@ struct rt_mutex_waiter {
+diff -Nur linux-4.8.15.orig/kernel/locking/rtmutex_common.h linux-4.8.15/kernel/locking/rtmutex_common.h
+--- linux-4.8.15.orig/kernel/locking/rtmutex_common.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/locking/rtmutex_common.h	2017-01-01 17:07:16.023426438 +0100
+@@ -27,6 +27,7 @@
  	struct rb_node          pi_tree_entry;
  	struct task_struct	*task;
  	struct rt_mutex		*lock;
@@ -15261,7 +15016,7 @@ index 4f5f83c7d2d3..289f062f26cd 100644
  #ifdef CONFIG_DEBUG_RT_MUTEXES
  	unsigned long		ip;
  	struct pid		*deadlock_task_pid;
-@@ -97,6 +98,9 @@ enum rtmutex_chainwalk {
+@@ -98,6 +99,9 @@
  /*
   * PI-futex support (proxy locking functions, etc.):
   */
@@ -15271,7 +15026,7 @@ index 4f5f83c7d2d3..289f062f26cd 100644
  extern struct task_struct *rt_mutex_next_owner(struct rt_mutex *lock);
  extern void rt_mutex_init_proxy_locked(struct rt_mutex *lock,
  				       struct task_struct *proxy_owner);
-@@ -110,7 +114,8 @@ extern int rt_mutex_finish_proxy_lock(struct rt_mutex *lock,
+@@ -111,7 +115,8 @@
  				      struct rt_mutex_waiter *waiter);
  extern int rt_mutex_timed_futex_lock(struct rt_mutex *l, struct hrtimer_sleeper *to);
  extern bool rt_mutex_futex_unlock(struct rt_mutex *lock,
@@ -15281,7 +15036,7 @@ index 4f5f83c7d2d3..289f062f26cd 100644
  extern void rt_mutex_adjust_prio(struct task_struct *task);
  
  #ifdef CONFIG_DEBUG_RT_MUTEXES
-@@ -119,4 +124,14 @@ extern void rt_mutex_adjust_prio(struct task_struct *task);
+@@ -120,4 +125,14 @@
  # include "rtmutex.h"
  #endif
  
@@ -15296,11 +15051,10 @@ index 4f5f83c7d2d3..289f062f26cd 100644
 +}
 +
  #endif
-diff --git a/kernel/locking/spinlock.c b/kernel/locking/spinlock.c
-index db3ccb1dd614..909779647bd1 100644
---- a/kernel/locking/spinlock.c
-+++ b/kernel/locking/spinlock.c
-@@ -124,8 +124,11 @@ void __lockfunc __raw_##op##_lock_bh(locktype##_t *lock)		\
+diff -Nur linux-4.8.15.orig/kernel/locking/spinlock.c linux-4.8.15/kernel/locking/spinlock.c
+--- linux-4.8.15.orig/kernel/locking/spinlock.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/locking/spinlock.c	2017-01-01 17:07:16.023426438 +0100
+@@ -124,8 +124,11 @@
   *         __[spin|read|write]_lock_bh()
   */
  BUILD_LOCK_OPS(spin, raw_spinlock);
@@ -15312,7 +15066,7 @@ index db3ccb1dd614..909779647bd1 100644
  
  #endif
  
-@@ -209,6 +212,8 @@ void __lockfunc _raw_spin_unlock_bh(raw_spinlock_t *lock)
+@@ -209,6 +212,8 @@
  EXPORT_SYMBOL(_raw_spin_unlock_bh);
  #endif
  
@@ -15321,7 +15075,7 @@ index db3ccb1dd614..909779647bd1 100644
  #ifndef CONFIG_INLINE_READ_TRYLOCK
  int __lockfunc _raw_read_trylock(rwlock_t *lock)
  {
-@@ -353,6 +358,8 @@ void __lockfunc _raw_write_unlock_bh(rwlock_t *lock)
+@@ -353,6 +358,8 @@
  EXPORT_SYMBOL(_raw_write_unlock_bh);
  #endif
  
@@ -15330,11 +15084,10 @@ index db3ccb1dd614..909779647bd1 100644
  #ifdef CONFIG_DEBUG_LOCK_ALLOC
  
  void __lockfunc _raw_spin_lock_nested(raw_spinlock_t *lock, int subclass)
-diff --git a/kernel/locking/spinlock_debug.c b/kernel/locking/spinlock_debug.c
-index 0374a596cffa..94970338d518 100644
---- a/kernel/locking/spinlock_debug.c
-+++ b/kernel/locking/spinlock_debug.c
-@@ -31,6 +31,7 @@ void __raw_spin_lock_init(raw_spinlock_t *lock, const char *name,
+diff -Nur linux-4.8.15.orig/kernel/locking/spinlock_debug.c linux-4.8.15/kernel/locking/spinlock_debug.c
+--- linux-4.8.15.orig/kernel/locking/spinlock_debug.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/locking/spinlock_debug.c	2017-01-01 17:07:16.023426438 +0100
+@@ -31,6 +31,7 @@
  
  EXPORT_SYMBOL(__raw_spin_lock_init);
  
@@ -15342,7 +15095,7 @@ index 0374a596cffa..94970338d518 100644
  void __rwlock_init(rwlock_t *lock, const char *name,
  		   struct lock_class_key *key)
  {
-@@ -48,6 +49,7 @@ void __rwlock_init(rwlock_t *lock, const char *name,
+@@ -48,6 +49,7 @@
  }
  
  EXPORT_SYMBOL(__rwlock_init);
@@ -15350,7 +15103,7 @@ index 0374a596cffa..94970338d518 100644
  
  static void spin_dump(raw_spinlock_t *lock, const char *msg)
  {
-@@ -159,6 +161,7 @@ void do_raw_spin_unlock(raw_spinlock_t *lock)
+@@ -159,6 +161,7 @@
  	arch_spin_unlock(&lock->raw_lock);
  }
  
@@ -15358,17 +15111,33 @@ index 0374a596cffa..94970338d518 100644
  static void rwlock_bug(rwlock_t *lock, const char *msg)
  {
  	if (!debug_locks_off())
-@@ -300,3 +303,5 @@ void do_raw_write_unlock(rwlock_t *lock)
+@@ -300,3 +303,5 @@
  	debug_write_unlock(lock);
  	arch_write_unlock(&lock->raw_lock);
  }
 +
 +#endif
-diff --git a/kernel/panic.c b/kernel/panic.c
-index ca8cea1ef673..6b698115f003 100644
---- a/kernel/panic.c
-+++ b/kernel/panic.c
-@@ -449,9 +449,11 @@ static u64 oops_id;
+diff -Nur linux-4.8.15.orig/kernel/Makefile linux-4.8.15/kernel/Makefile
+--- linux-4.8.15.orig/kernel/Makefile	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/Makefile	2017-01-01 17:07:15.995424645 +0100
+@@ -11,6 +11,13 @@
+ 	    notifier.o ksysfs.o cred.o reboot.o \
+ 	    async.o range.o smpboot.o
+ 
++# Tracing may do some dangerous __builtin_return_address() operations
++# We know they are dangerous, we don't need gcc telling us that.
++ifdef CONFIG_USING_GET_LOCK_PARENT_IP
++FRAME_CFLAGS := $(call cc-disable-warning,frame-address)
++KBUILD_CFLAGS += $(FRAME_CFLAGS)
++endif
++
+ obj-$(CONFIG_MULTIUSER) += groups.o
+ 
+ ifdef CONFIG_FUNCTION_TRACER
+diff -Nur linux-4.8.15.orig/kernel/panic.c linux-4.8.15/kernel/panic.c
+--- linux-4.8.15.orig/kernel/panic.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/panic.c	2017-01-01 17:07:16.023426438 +0100
+@@ -449,9 +449,11 @@
  
  static int init_oops_id(void)
  {
@@ -15380,11 +15149,10 @@ index ca8cea1ef673..6b698115f003 100644
  		oops_id++;
  
  	return 0;
-diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
-index 33c79b6105c5..f53375bc77df 100644
---- a/kernel/power/hibernate.c
-+++ b/kernel/power/hibernate.c
-@@ -286,6 +286,8 @@ static int create_image(int platform_mode)
+diff -Nur linux-4.8.15.orig/kernel/power/hibernate.c linux-4.8.15/kernel/power/hibernate.c
+--- linux-4.8.15.orig/kernel/power/hibernate.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/power/hibernate.c	2017-01-01 17:07:16.023426438 +0100
+@@ -286,6 +286,8 @@
  
  	local_irq_disable();
  
@@ -15393,7 +15161,7 @@ index 33c79b6105c5..f53375bc77df 100644
  	error = syscore_suspend();
  	if (error) {
  		printk(KERN_ERR "PM: Some system devices failed to power down, "
-@@ -315,6 +317,7 @@ static int create_image(int platform_mode)
+@@ -315,6 +317,7 @@
  	syscore_resume();
  
   Enable_irqs:
@@ -15401,7 +15169,7 @@ index 33c79b6105c5..f53375bc77df 100644
  	local_irq_enable();
  
   Enable_cpus:
-@@ -444,6 +447,7 @@ static int resume_target_kernel(bool platform_mode)
+@@ -444,6 +447,7 @@
  		goto Enable_cpus;
  
  	local_irq_disable();
@@ -15409,7 +15177,7 @@ index 33c79b6105c5..f53375bc77df 100644
  
  	error = syscore_suspend();
  	if (error)
-@@ -477,6 +481,7 @@ static int resume_target_kernel(bool platform_mode)
+@@ -477,6 +481,7 @@
  	syscore_resume();
  
   Enable_irqs:
@@ -15417,7 +15185,7 @@ index 33c79b6105c5..f53375bc77df 100644
  	local_irq_enable();
  
   Enable_cpus:
-@@ -562,6 +567,7 @@ int hibernation_platform_enter(void)
+@@ -562,6 +567,7 @@
  		goto Enable_cpus;
  
  	local_irq_disable();
@@ -15425,7 +15193,7 @@ index 33c79b6105c5..f53375bc77df 100644
  	syscore_suspend();
  	if (pm_wakeup_pending()) {
  		error = -EAGAIN;
-@@ -574,6 +580,7 @@ int hibernation_platform_enter(void)
+@@ -574,6 +580,7 @@
  
   Power_up:
  	syscore_resume();
@@ -15433,7 +15201,7 @@ index 33c79b6105c5..f53375bc77df 100644
  	local_irq_enable();
  
   Enable_cpus:
-@@ -674,6 +681,10 @@ static int load_image_and_restore(void)
+@@ -674,6 +681,10 @@
  	return error;
  }
  
@@ -15444,7 +15212,7 @@ index 33c79b6105c5..f53375bc77df 100644
  /**
   * hibernate - Carry out system hibernation, including saving the image.
   */
-@@ -687,6 +698,8 @@ int hibernate(void)
+@@ -687,6 +698,8 @@
  		return -EPERM;
  	}
  
@@ -15453,7 +15221,7 @@ index 33c79b6105c5..f53375bc77df 100644
  	lock_system_sleep();
  	/* The snapshot device should not be opened while we're running */
  	if (!atomic_add_unless(&snapshot_device_available, -1, 0)) {
-@@ -764,6 +777,7 @@ int hibernate(void)
+@@ -764,6 +777,7 @@
  	atomic_inc(&snapshot_device_available);
   Unlock:
  	unlock_system_sleep();
@@ -15461,11 +15229,10 @@ index 33c79b6105c5..f53375bc77df 100644
  	return error;
  }
  
-diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
-index 0acab9d7f96f..aac06aad757c 100644
---- a/kernel/power/suspend.c
-+++ b/kernel/power/suspend.c
-@@ -361,6 +361,8 @@ static int suspend_enter(suspend_state_t state, bool *wakeup)
+diff -Nur linux-4.8.15.orig/kernel/power/suspend.c linux-4.8.15/kernel/power/suspend.c
+--- linux-4.8.15.orig/kernel/power/suspend.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/power/suspend.c	2017-01-01 17:07:16.023426438 +0100
+@@ -361,6 +361,8 @@
  	arch_suspend_disable_irqs();
  	BUG_ON(!irqs_disabled());
  
@@ -15474,7 +15241,7 @@ index 0acab9d7f96f..aac06aad757c 100644
  	error = syscore_suspend();
  	if (!error) {
  		*wakeup = pm_wakeup_pending();
-@@ -377,6 +379,8 @@ static int suspend_enter(suspend_state_t state, bool *wakeup)
+@@ -377,6 +379,8 @@
  		syscore_resume();
  	}
  
@@ -15483,7 +15250,7 @@ index 0acab9d7f96f..aac06aad757c 100644
  	arch_suspend_enable_irqs();
  	BUG_ON(irqs_disabled());
  
-@@ -519,6 +523,8 @@ static int enter_state(suspend_state_t state)
+@@ -519,6 +523,8 @@
  	return error;
  }
  
@@ -15492,7 +15259,7 @@ index 0acab9d7f96f..aac06aad757c 100644
  /**
   * pm_suspend - Externally visible function for suspending the system.
   * @state: System sleep state to enter.
-@@ -533,6 +539,8 @@ int pm_suspend(suspend_state_t state)
+@@ -533,6 +539,8 @@
  	if (state <= PM_SUSPEND_ON || state >= PM_SUSPEND_MAX)
  		return -EINVAL;
  
@@ -15501,7 +15268,7 @@ index 0acab9d7f96f..aac06aad757c 100644
  	error = enter_state(state);
  	if (error) {
  		suspend_stats.fail++;
-@@ -540,6 +548,7 @@ int pm_suspend(suspend_state_t state)
+@@ -540,6 +548,7 @@
  	} else {
  		suspend_stats.success++;
  	}
@@ -15509,11 +15276,10 @@ index 0acab9d7f96f..aac06aad757c 100644
  	return error;
  }
  EXPORT_SYMBOL(pm_suspend);
-diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
-index eea6dbc2d8cf..6f01c7ecb45e 100644
---- a/kernel/printk/printk.c
-+++ b/kernel/printk/printk.c
-@@ -351,6 +351,65 @@ __packed __aligned(4)
+diff -Nur linux-4.8.15.orig/kernel/printk/printk.c linux-4.8.15/kernel/printk/printk.c
+--- linux-4.8.15.orig/kernel/printk/printk.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/printk/printk.c	2017-01-01 17:07:16.027426711 +0100
+@@ -351,6 +351,65 @@
   */
  DEFINE_RAW_SPINLOCK(logbuf_lock);
  
@@ -15579,7 +15345,7 @@ index eea6dbc2d8cf..6f01c7ecb45e 100644
  #ifdef CONFIG_PRINTK
  DECLARE_WAIT_QUEUE_HEAD(log_wait);
  /* the next printk record to read by syslog(READ) or /proc/kmsg */
-@@ -1340,6 +1399,7 @@ static int syslog_print_all(char __user *buf, int size, bool clear)
+@@ -1340,6 +1399,7 @@
  {
  	char *text;
  	int len = 0;
@@ -15587,7 +15353,7 @@ index eea6dbc2d8cf..6f01c7ecb45e 100644
  
  	text = kmalloc(LOG_LINE_MAX + PREFIX_MAX, GFP_KERNEL);
  	if (!text)
-@@ -1351,6 +1411,14 @@ static int syslog_print_all(char __user *buf, int size, bool clear)
+@@ -1351,6 +1411,14 @@
  		u64 seq;
  		u32 idx;
  		enum log_flags prev;
@@ -15602,7 +15368,7 @@ index eea6dbc2d8cf..6f01c7ecb45e 100644
  
  		/*
  		 * Find first record that fits, including all following records,
-@@ -1366,6 +1434,14 @@ static int syslog_print_all(char __user *buf, int size, bool clear)
+@@ -1366,6 +1434,14 @@
  			prev = msg->flags;
  			idx = log_next(idx);
  			seq++;
@@ -15617,7 +15383,7 @@ index eea6dbc2d8cf..6f01c7ecb45e 100644
  		}
  
  		/* move first record forward until length fits into the buffer */
-@@ -1379,6 +1455,14 @@ static int syslog_print_all(char __user *buf, int size, bool clear)
+@@ -1379,6 +1455,14 @@
  			prev = msg->flags;
  			idx = log_next(idx);
  			seq++;
@@ -15632,7 +15398,7 @@ index eea6dbc2d8cf..6f01c7ecb45e 100644
  		}
  
  		/* last message fitting into this dump */
-@@ -1419,6 +1503,7 @@ static int syslog_print_all(char __user *buf, int size, bool clear)
+@@ -1419,6 +1503,7 @@
  		clear_seq = log_next_seq;
  		clear_idx = log_next_idx;
  	}
@@ -15640,7 +15406,7 @@ index eea6dbc2d8cf..6f01c7ecb45e 100644
  	raw_spin_unlock_irq(&logbuf_lock);
  
  	kfree(text);
-@@ -1572,6 +1657,12 @@ static void call_console_drivers(int level,
+@@ -1572,6 +1657,12 @@
  	if (!console_drivers)
  		return;
  
@@ -15653,7 +15419,7 @@ index eea6dbc2d8cf..6f01c7ecb45e 100644
  	for_each_console(con) {
  		if (exclusive_console && con != exclusive_console)
  			continue;
-@@ -1587,6 +1678,7 @@ static void call_console_drivers(int level,
+@@ -1587,6 +1678,7 @@
  		else
  			con->write(con, text, len);
  	}
@@ -15661,7 +15427,7 @@ index eea6dbc2d8cf..6f01c7ecb45e 100644
  }
  
  /*
-@@ -1750,6 +1842,13 @@ asmlinkage int vprintk_emit(int facility, int level,
+@@ -1750,6 +1842,13 @@
  	/* cpu currently holding logbuf_lock in this function */
  	static unsigned int logbuf_cpu = UINT_MAX;
  
@@ -15675,7 +15441,7 @@ index eea6dbc2d8cf..6f01c7ecb45e 100644
  	if (level == LOGLEVEL_SCHED) {
  		level = LOGLEVEL_DEFAULT;
  		in_sched = true;
-@@ -1894,13 +1993,23 @@ asmlinkage int vprintk_emit(int facility, int level,
+@@ -1894,13 +1993,23 @@
  
  	/* If called from the scheduler, we can not call up(). */
  	if (!in_sched) {
@@ -15700,7 +15466,7 @@ index eea6dbc2d8cf..6f01c7ecb45e 100644
  			console_unlock();
  		lockdep_on();
  	}
-@@ -2023,26 +2132,6 @@ DEFINE_PER_CPU(printk_func_t, printk_func);
+@@ -2023,26 +2132,6 @@
  
  #endif /* CONFIG_PRINTK */
  
@@ -15727,7 +15493,7 @@ index eea6dbc2d8cf..6f01c7ecb45e 100644
  static int __add_preferred_console(char *name, int idx, char *options,
  				   char *brl_options)
  {
-@@ -2312,11 +2401,16 @@ static void console_cont_flush(char *text, size_t size)
+@@ -2312,11 +2401,16 @@
  		goto out;
  
  	len = cont_print_text(text, size);
@@ -15744,7 +15510,7 @@ index eea6dbc2d8cf..6f01c7ecb45e 100644
  	return;
  out:
  	raw_spin_unlock_irqrestore(&logbuf_lock, flags);
-@@ -2440,13 +2534,17 @@ void console_unlock(void)
+@@ -2440,13 +2534,17 @@
  		console_idx = log_next(console_idx);
  		console_seq++;
  		console_prev = msg->flags;
@@ -15763,7 +15529,7 @@ index eea6dbc2d8cf..6f01c7ecb45e 100644
  		if (do_cond_resched)
  			cond_resched();
  	}
-@@ -2498,6 +2596,11 @@ void console_unblank(void)
+@@ -2498,6 +2596,11 @@
  {
  	struct console *c;
  
@@ -15775,11 +15541,10 @@ index eea6dbc2d8cf..6f01c7ecb45e 100644
  	/*
  	 * console_unblank can no longer be called in interrupt context unless
  	 * oops_in_progress is set to 1..
-diff --git a/kernel/ptrace.c b/kernel/ptrace.c
-index 1d3b7665d0be..ce666639789d 100644
---- a/kernel/ptrace.c
-+++ b/kernel/ptrace.c
-@@ -128,7 +128,14 @@ static bool ptrace_freeze_traced(struct task_struct *task)
+diff -Nur linux-4.8.15.orig/kernel/ptrace.c linux-4.8.15/kernel/ptrace.c
+--- linux-4.8.15.orig/kernel/ptrace.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/ptrace.c	2017-01-01 17:07:16.027426711 +0100
+@@ -128,7 +128,14 @@
  
  	spin_lock_irq(&task->sighand->siglock);
  	if (task_is_traced(task) && !__fatal_signal_pending(task)) {
@@ -15795,11 +15560,10 @@ index 1d3b7665d0be..ce666639789d 100644
  		ret = true;
  	}
  	spin_unlock_irq(&task->sighand->siglock);
-diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c
-index 971e2b138063..a304670fb917 100644
---- a/kernel/rcu/rcutorture.c
-+++ b/kernel/rcu/rcutorture.c
-@@ -404,6 +404,7 @@ static struct rcu_torture_ops rcu_ops = {
+diff -Nur linux-4.8.15.orig/kernel/rcu/rcutorture.c linux-4.8.15/kernel/rcu/rcutorture.c
+--- linux-4.8.15.orig/kernel/rcu/rcutorture.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/rcu/rcutorture.c	2017-01-01 17:07:16.027426711 +0100
+@@ -404,6 +404,7 @@
  	.name		= "rcu"
  };
  
@@ -15807,7 +15571,7 @@ index 971e2b138063..a304670fb917 100644
  /*
   * Definitions for rcu_bh torture testing.
   */
-@@ -443,6 +444,12 @@ static struct rcu_torture_ops rcu_bh_ops = {
+@@ -443,6 +444,12 @@
  	.name		= "rcu_bh"
  };
  
@@ -15820,10 +15584,9 @@ index 971e2b138063..a304670fb917 100644
  /*
   * Don't even think about trying any of these in real life!!!
   * The names includes "busted", and they really means it!
-diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
-index 5d80925e7fc8..2b4bc2b2c25a 100644
---- a/kernel/rcu/tree.c
-+++ b/kernel/rcu/tree.c
+diff -Nur linux-4.8.15.orig/kernel/rcu/tree.c linux-4.8.15/kernel/rcu/tree.c
+--- linux-4.8.15.orig/kernel/rcu/tree.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/rcu/tree.c	2017-01-01 17:07:16.027426711 +0100
 @@ -56,6 +56,11 @@
  #include <linux/random.h>
  #include <linux/trace_events.h>
@@ -15836,7 +15599,7 @@ index 5d80925e7fc8..2b4bc2b2c25a 100644
  
  #include "tree.h"
  #include "rcu.h"
-@@ -259,6 +264,19 @@ void rcu_sched_qs(void)
+@@ -259,6 +264,19 @@
  			   this_cpu_ptr(&rcu_sched_data), true);
  }
  
@@ -15856,7 +15619,7 @@ index 5d80925e7fc8..2b4bc2b2c25a 100644
  void rcu_bh_qs(void)
  {
  	if (__this_cpu_read(rcu_bh_data.cpu_no_qs.s)) {
-@@ -268,6 +286,7 @@ void rcu_bh_qs(void)
+@@ -268,6 +286,7 @@
  		__this_cpu_write(rcu_bh_data.cpu_no_qs.b.norm, false);
  	}
  }
@@ -15864,7 +15627,7 @@ index 5d80925e7fc8..2b4bc2b2c25a 100644
  
  static DEFINE_PER_CPU(int, rcu_sched_qs_mask);
  
-@@ -448,11 +467,13 @@ EXPORT_SYMBOL_GPL(rcu_batches_started_sched);
+@@ -448,11 +467,13 @@
  /*
   * Return the number of RCU BH batches started thus far for debug & stats.
   */
@@ -15878,7 +15641,7 @@ index 5d80925e7fc8..2b4bc2b2c25a 100644
  
  /*
   * Return the number of RCU batches completed thus far for debug & stats.
-@@ -472,6 +493,7 @@ unsigned long rcu_batches_completed_sched(void)
+@@ -472,6 +493,7 @@
  }
  EXPORT_SYMBOL_GPL(rcu_batches_completed_sched);
  
@@ -15886,7 +15649,7 @@ index 5d80925e7fc8..2b4bc2b2c25a 100644
  /*
   * Return the number of RCU BH batches completed thus far for debug & stats.
   */
-@@ -480,6 +502,7 @@ unsigned long rcu_batches_completed_bh(void)
+@@ -480,6 +502,7 @@
  	return rcu_bh_state.completed;
  }
  EXPORT_SYMBOL_GPL(rcu_batches_completed_bh);
@@ -15894,7 +15657,7 @@ index 5d80925e7fc8..2b4bc2b2c25a 100644
  
  /*
   * Return the number of RCU expedited batches completed thus far for
-@@ -503,6 +526,7 @@ unsigned long rcu_exp_batches_completed_sched(void)
+@@ -503,6 +526,7 @@
  }
  EXPORT_SYMBOL_GPL(rcu_exp_batches_completed_sched);
  
@@ -15902,7 +15665,7 @@ index 5d80925e7fc8..2b4bc2b2c25a 100644
  /*
   * Force a quiescent state.
   */
-@@ -521,6 +545,13 @@ void rcu_bh_force_quiescent_state(void)
+@@ -521,6 +545,13 @@
  }
  EXPORT_SYMBOL_GPL(rcu_bh_force_quiescent_state);
  
@@ -15916,7 +15679,7 @@ index 5d80925e7fc8..2b4bc2b2c25a 100644
  /*
   * Force a quiescent state for RCU-sched.
   */
-@@ -571,9 +602,11 @@ void rcutorture_get_gp_data(enum rcutorture_type test_type, int *flags,
+@@ -571,9 +602,11 @@
  	case RCU_FLAVOR:
  		rsp = rcu_state_p;
  		break;
@@ -15928,7 +15691,7 @@ index 5d80925e7fc8..2b4bc2b2c25a 100644
  	case RCU_SCHED_FLAVOR:
  		rsp = &rcu_sched_state;
  		break;
-@@ -3013,18 +3046,17 @@ __rcu_process_callbacks(struct rcu_state *rsp)
+@@ -3013,18 +3046,17 @@
  /*
   * Do RCU core processing for the current CPU.
   */
@@ -15949,18 +15712,15 @@ index 5d80925e7fc8..2b4bc2b2c25a 100644
  /*
   * Schedule RCU callback invocation.  If the specified type of RCU
   * does not support RCU priority boosting, just do a direct call,
-@@ -3036,19 +3068,106 @@ static void invoke_rcu_callbacks(struct rcu_state *rsp, struct rcu_data *rdp)
+@@ -3036,18 +3068,105 @@
  {
  	if (unlikely(!READ_ONCE(rcu_scheduler_fully_active)))
  		return;
 -	if (likely(!rsp->boost)) {
 -		rcu_do_batch(rsp, rdp);
--		return;
--	}
--	invoke_rcu_callbacks_kthread();
 +	rcu_do_batch(rsp, rdp);
- }
- 
++}
++
 +static void rcu_wake_cond(struct task_struct *t, int status)
 +{
 +	/*
@@ -15974,23 +15734,21 @@ index 5d80925e7fc8..2b4bc2b2c25a 100644
 +/*
 + * Wake up this CPU's rcuc kthread to do RCU core processing.
 + */
- static void invoke_rcu_core(void)
- {
--	if (cpu_online(smp_processor_id()))
--		raise_softirq(RCU_SOFTIRQ);
++static void invoke_rcu_core(void)
++{
 +	unsigned long flags;
 +	struct task_struct *t;
 +
 +	if (!cpu_online(smp_processor_id()))
-+		return;
+ 		return;
 +	local_irq_save(flags);
 +	__this_cpu_write(rcu_cpu_has_work, 1);
 +	t = __this_cpu_read(rcu_cpu_kthread_task);
 +	if (t != NULL && current != t)
 +		rcu_wake_cond(t, __this_cpu_read(rcu_cpu_kthread_status));
 +	local_irq_restore(flags);
- }
- 
++}
++
 +static void rcu_cpu_kthread_park(unsigned int cpu)
 +{
 +	per_cpu(rcu_cpu_kthread_status, cpu) = RCU_KTHREAD_OFFCPU;
@@ -16029,14 +15787,16 @@ index 5d80925e7fc8..2b4bc2b2c25a 100644
 +			*statusp = RCU_KTHREAD_WAITING;
 +			return;
 +		}
-+	}
+ 	}
+-	invoke_rcu_callbacks_kthread();
 +	*statusp = RCU_KTHREAD_YIELDING;
 +	trace_rcu_utilization(TPS("Start CPU kthread@rcu_yield"));
 +	schedule_timeout_interruptible(2);
 +	trace_rcu_utilization(TPS("End CPU kthread@rcu_yield"));
 +	*statusp = RCU_KTHREAD_WAITING;
-+}
-+
+ }
+ 
+-static void invoke_rcu_core(void)
 +static struct smp_hotplug_thread rcu_cpu_thread_spec = {
 +	.store			= &rcu_cpu_kthread_task,
 +	.thread_should_run	= rcu_cpu_kthread_should_run,
@@ -16050,20 +15810,21 @@ index 5d80925e7fc8..2b4bc2b2c25a 100644
 + * Spawn per-CPU RCU core processing kthreads.
 + */
 +static int __init rcu_spawn_core_kthreads(void)
-+{
+ {
+-	if (cpu_online(smp_processor_id()))
+-		raise_softirq(RCU_SOFTIRQ);
 +	int cpu;
 +
 +	for_each_possible_cpu(cpu)
 +		per_cpu(rcu_cpu_has_work, cpu) = 0;
 +	BUG_ON(smpboot_register_percpu_thread(&rcu_cpu_thread_spec));
 +	return 0;
-+}
+ }
 +early_initcall(rcu_spawn_core_kthreads);
-+
+ 
  /*
   * Handle any core-RCU processing required by a call_rcu() invocation.
-  */
-@@ -3192,6 +3311,7 @@ void call_rcu_sched(struct rcu_head *head, rcu_callback_t func)
+@@ -3192,6 +3311,7 @@
  }
  EXPORT_SYMBOL_GPL(call_rcu_sched);
  
@@ -16071,7 +15832,7 @@ index 5d80925e7fc8..2b4bc2b2c25a 100644
  /*
   * Queue an RCU callback for invocation after a quicker grace period.
   */
-@@ -3200,6 +3320,7 @@ void call_rcu_bh(struct rcu_head *head, rcu_callback_t func)
+@@ -3200,6 +3320,7 @@
  	__call_rcu(head, func, &rcu_bh_state, -1, 0);
  }
  EXPORT_SYMBOL_GPL(call_rcu_bh);
@@ -16079,7 +15840,7 @@ index 5d80925e7fc8..2b4bc2b2c25a 100644
  
  /*
   * Queue an RCU callback for lazy invocation after a grace period.
-@@ -3291,6 +3412,7 @@ void synchronize_sched(void)
+@@ -3291,6 +3412,7 @@
  }
  EXPORT_SYMBOL_GPL(synchronize_sched);
  
@@ -16087,7 +15848,7 @@ index 5d80925e7fc8..2b4bc2b2c25a 100644
  /**
   * synchronize_rcu_bh - wait until an rcu_bh grace period has elapsed.
   *
-@@ -3317,6 +3439,7 @@ void synchronize_rcu_bh(void)
+@@ -3317,6 +3439,7 @@
  		wait_rcu_gp(call_rcu_bh);
  }
  EXPORT_SYMBOL_GPL(synchronize_rcu_bh);
@@ -16095,7 +15856,7 @@ index 5d80925e7fc8..2b4bc2b2c25a 100644
  
  /**
   * get_state_synchronize_rcu - Snapshot current RCU state
-@@ -3695,6 +3818,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
+@@ -3695,6 +3818,7 @@
  	mutex_unlock(&rsp->barrier_mutex);
  }
  
@@ -16103,7 +15864,7 @@ index 5d80925e7fc8..2b4bc2b2c25a 100644
  /**
   * rcu_barrier_bh - Wait until all in-flight call_rcu_bh() callbacks complete.
   */
-@@ -3703,6 +3827,7 @@ void rcu_barrier_bh(void)
+@@ -3703,6 +3827,7 @@
  	_rcu_barrier(&rcu_bh_state);
  }
  EXPORT_SYMBOL_GPL(rcu_barrier_bh);
@@ -16111,7 +15872,7 @@ index 5d80925e7fc8..2b4bc2b2c25a 100644
  
  /**
   * rcu_barrier_sched - Wait for in-flight call_rcu_sched() callbacks.
-@@ -4196,12 +4321,13 @@ void __init rcu_init(void)
+@@ -4196,12 +4321,13 @@
  
  	rcu_bootup_announce();
  	rcu_init_geometry();
@@ -16126,11 +15887,10 @@ index 5d80925e7fc8..2b4bc2b2c25a 100644
  
  	/*
  	 * We don't need protection against CPU-hotplug here because
-diff --git a/kernel/rcu/tree.h b/kernel/rcu/tree.h
-index f714f873bf9d..71631196e66e 100644
---- a/kernel/rcu/tree.h
-+++ b/kernel/rcu/tree.h
-@@ -587,18 +587,18 @@ extern struct list_head rcu_struct_flavors;
+diff -Nur linux-4.8.15.orig/kernel/rcu/tree.h linux-4.8.15/kernel/rcu/tree.h
+--- linux-4.8.15.orig/kernel/rcu/tree.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/rcu/tree.h	2017-01-01 17:07:16.027426711 +0100
+@@ -587,18 +587,18 @@
   */
  extern struct rcu_state rcu_sched_state;
  
@@ -16151,7 +15911,7 @@ index f714f873bf9d..71631196e66e 100644
  
  #ifndef RCU_TREE_NONCORE
  
-@@ -618,10 +618,9 @@ void call_rcu(struct rcu_head *head, rcu_callback_t func);
+@@ -618,10 +618,9 @@
  static void __init __rcu_init_preempt(void);
  static void rcu_initiate_boost(struct rcu_node *rnp, unsigned long flags);
  static void rcu_preempt_boost_start_gp(struct rcu_node *rnp);
@@ -16163,10 +15923,9 @@ index f714f873bf9d..71631196e66e 100644
  static int rcu_spawn_one_boost_kthread(struct rcu_state *rsp,
  						 struct rcu_node *rnp);
  #endif /* #ifdef CONFIG_RCU_BOOST */
-diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h
-index 0082fce402a0..e08cddadd9c7 100644
---- a/kernel/rcu/tree_plugin.h
-+++ b/kernel/rcu/tree_plugin.h
+diff -Nur linux-4.8.15.orig/kernel/rcu/tree_plugin.h linux-4.8.15/kernel/rcu/tree_plugin.h
+--- linux-4.8.15.orig/kernel/rcu/tree_plugin.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/rcu/tree_plugin.h	2017-01-01 17:07:16.031426957 +0100
 @@ -24,25 +24,10 @@
   *	   Paul E. McKenney <paulmck@linux.vnet.ibm.com>
   */
@@ -16193,7 +15952,7 @@ index 0082fce402a0..e08cddadd9c7 100644
  #else /* #ifdef CONFIG_RCU_BOOST */
  
  /*
-@@ -55,6 +40,14 @@ DEFINE_PER_CPU(char, rcu_cpu_has_work);
+@@ -55,6 +40,14 @@
  
  #endif /* #else #ifdef CONFIG_RCU_BOOST */
  
@@ -16208,7 +15967,7 @@ index 0082fce402a0..e08cddadd9c7 100644
  #ifdef CONFIG_RCU_NOCB_CPU
  static cpumask_var_t rcu_nocb_mask; /* CPUs to have callbacks offloaded. */
  static bool have_rcu_nocb_mask;	    /* Was rcu_nocb_mask allocated? */
-@@ -426,7 +419,7 @@ void rcu_read_unlock_special(struct task_struct *t)
+@@ -426,7 +419,7 @@
  	}
  
  	/* Hardware IRQ handlers cannot block, complain if they get here. */
@@ -16217,7 +15976,7 @@ index 0082fce402a0..e08cddadd9c7 100644
  		lockdep_rcu_suspicious(__FILE__, __LINE__,
  				       "rcu_read_unlock() from irq or softirq with blocking in critical section!!!\n");
  		pr_alert("->rcu_read_unlock_special: %#x (b: %d, enq: %d nq: %d)\n",
-@@ -632,15 +625,6 @@ static void rcu_preempt_check_callbacks(void)
+@@ -632,15 +625,6 @@
  		t->rcu_read_unlock_special.b.need_qs = true;
  }
  
@@ -16233,7 +15992,7 @@ index 0082fce402a0..e08cddadd9c7 100644
  /*
   * Queue a preemptible-RCU callback for invocation after a grace period.
   */
-@@ -829,6 +813,19 @@ void exit_rcu(void)
+@@ -829,6 +813,19 @@
  
  #endif /* #else #ifdef CONFIG_PREEMPT_RCU */
  
@@ -16253,7 +16012,7 @@ index 0082fce402a0..e08cddadd9c7 100644
  #ifdef CONFIG_RCU_BOOST
  
  #include "../locking/rtmutex_common.h"
-@@ -860,16 +857,6 @@ static void rcu_initiate_boost_trace(struct rcu_node *rnp)
+@@ -860,16 +857,6 @@
  
  #endif /* #else #ifdef CONFIG_RCU_TRACE */
  
@@ -16270,7 +16029,7 @@ index 0082fce402a0..e08cddadd9c7 100644
  /*
   * Carry out RCU priority boosting on the task indicated by ->exp_tasks
   * or ->boost_tasks, advancing the pointer to the next task in the
-@@ -1013,23 +1000,6 @@ static void rcu_initiate_boost(struct rcu_node *rnp, unsigned long flags)
+@@ -1013,23 +1000,6 @@
  }
  
  /*
@@ -16294,7 +16053,7 @@ index 0082fce402a0..e08cddadd9c7 100644
   * Is the current CPU running the RCU-callbacks kthread?
   * Caller must have preemption disabled.
   */
-@@ -1083,67 +1053,6 @@ static int rcu_spawn_one_boost_kthread(struct rcu_state *rsp,
+@@ -1083,67 +1053,6 @@
  	return 0;
  }
  
@@ -16362,7 +16121,7 @@ index 0082fce402a0..e08cddadd9c7 100644
  /*
   * Set the per-rcu_node kthread's affinity to cover all CPUs that are
   * served by the rcu_node in question.  The CPU hotplug lock is still
-@@ -1174,26 +1083,12 @@ static void rcu_boost_kthread_setaffinity(struct rcu_node *rnp, int outgoingcpu)
+@@ -1174,26 +1083,12 @@
  	free_cpumask_var(cm);
  }
  
@@ -16389,7 +16148,7 @@ index 0082fce402a0..e08cddadd9c7 100644
  	rcu_for_each_leaf_node(rcu_state_p, rnp)
  		(void)rcu_spawn_one_boost_kthread(rcu_state_p, rnp);
  }
-@@ -1216,11 +1111,6 @@ static void rcu_initiate_boost(struct rcu_node *rnp, unsigned long flags)
+@@ -1216,11 +1111,6 @@
  	raw_spin_unlock_irqrestore_rcu_node(rnp, flags);
  }
  
@@ -16401,7 +16160,7 @@ index 0082fce402a0..e08cddadd9c7 100644
  static bool rcu_is_callbacks_kthread(void)
  {
  	return false;
-@@ -1244,7 +1134,7 @@ static void rcu_prepare_kthreads(int cpu)
+@@ -1244,7 +1134,7 @@
  
  #endif /* #else #ifdef CONFIG_RCU_BOOST */
  
@@ -16410,7 +16169,7 @@ index 0082fce402a0..e08cddadd9c7 100644
  
  /*
   * Check to see if any future RCU-related work will need to be done
-@@ -1261,7 +1151,9 @@ int rcu_needs_cpu(u64 basemono, u64 *nextevt)
+@@ -1261,7 +1151,9 @@
  	return IS_ENABLED(CONFIG_RCU_NOCB_CPU_ALL)
  	       ? 0 : rcu_cpu_has_callbacks(NULL);
  }
@@ -16420,7 +16179,7 @@ index 0082fce402a0..e08cddadd9c7 100644
  /*
   * Because we do not have RCU_FAST_NO_HZ, don't bother cleaning up
   * after it.
-@@ -1357,6 +1249,8 @@ static bool __maybe_unused rcu_try_advance_all_cbs(void)
+@@ -1357,6 +1249,8 @@
  	return cbs_ready;
  }
  
@@ -16429,7 +16188,7 @@ index 0082fce402a0..e08cddadd9c7 100644
  /*
   * Allow the CPU to enter dyntick-idle mode unless it has callbacks ready
   * to invoke.  If the CPU has callbacks, try to advance them.  Tell the
-@@ -1402,6 +1296,7 @@ int rcu_needs_cpu(u64 basemono, u64 *nextevt)
+@@ -1402,6 +1296,7 @@
  	*nextevt = basemono + dj * TICK_NSEC;
  	return 0;
  }
@@ -16437,11 +16196,39 @@ index 0082fce402a0..e08cddadd9c7 100644
  
  /*
   * Prepare a CPU for idle from an RCU perspective.  The first major task
-diff --git a/kernel/rcu/update.c b/kernel/rcu/update.c
-index f0d8322bc3ec..b40d3468ba4e 100644
---- a/kernel/rcu/update.c
-+++ b/kernel/rcu/update.c
-@@ -295,6 +295,7 @@ int rcu_read_lock_held(void)
+diff -Nur linux-4.8.15.orig/kernel/rcu/update.c linux-4.8.15/kernel/rcu/update.c
+--- linux-4.8.15.orig/kernel/rcu/update.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/rcu/update.c	2017-01-01 17:07:16.031426957 +0100
+@@ -63,7 +63,7 @@
+ #ifndef CONFIG_TINY_RCU
+ module_param(rcu_expedited, int, 0);
+ module_param(rcu_normal, int, 0);
+-static int rcu_normal_after_boot;
++static int rcu_normal_after_boot = IS_ENABLED(CONFIG_PREEMPT_RT_FULL);
+ module_param(rcu_normal_after_boot, int, 0);
+ #endif /* #ifndef CONFIG_TINY_RCU */
+ 
+@@ -130,8 +130,7 @@
+ }
+ EXPORT_SYMBOL_GPL(rcu_gp_is_normal);
+ 
+-static atomic_t rcu_expedited_nesting =
+-	ATOMIC_INIT(IS_ENABLED(CONFIG_RCU_EXPEDITE_BOOT) ? 1 : 0);
++static atomic_t rcu_expedited_nesting =	ATOMIC_INIT(1);
+ 
+ /*
+  * Should normal grace-period primitives be expedited?  Intended for
+@@ -179,8 +178,7 @@
+  */
+ void rcu_end_inkernel_boot(void)
+ {
+-	if (IS_ENABLED(CONFIG_RCU_EXPEDITE_BOOT))
+-		rcu_unexpedite_gp();
++	rcu_unexpedite_gp();
+ 	if (rcu_normal_after_boot)
+ 		WRITE_ONCE(rcu_normal, 1);
+ }
+@@ -295,6 +293,7 @@
  }
  EXPORT_SYMBOL_GPL(rcu_read_lock_held);
  
@@ -16449,7 +16236,7 @@ index f0d8322bc3ec..b40d3468ba4e 100644
  /**
   * rcu_read_lock_bh_held() - might we be in RCU-bh read-side critical section?
   *
-@@ -321,6 +322,7 @@ int rcu_read_lock_bh_held(void)
+@@ -321,6 +320,7 @@
  	return in_softirq() || irqs_disabled();
  }
  EXPORT_SYMBOL_GPL(rcu_read_lock_bh_held);
@@ -16457,11 +16244,10 @@ index f0d8322bc3ec..b40d3468ba4e 100644
  
  #endif /* #ifdef CONFIG_DEBUG_LOCK_ALLOC */
  
-diff --git a/kernel/relay.c b/kernel/relay.c
-index d797502140b9..cf05c17ddbed 100644
---- a/kernel/relay.c
-+++ b/kernel/relay.c
-@@ -336,6 +336,10 @@ static void wakeup_readers(unsigned long data)
+diff -Nur linux-4.8.15.orig/kernel/relay.c linux-4.8.15/kernel/relay.c
+--- linux-4.8.15.orig/kernel/relay.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/relay.c	2017-01-01 17:07:16.031426957 +0100
+@@ -336,6 +336,10 @@
  {
  	struct rchan_buf *buf = (struct rchan_buf *)data;
  	wake_up_interruptible(&buf->read_wait);
@@ -16472,7 +16258,7 @@ index d797502140b9..cf05c17ddbed 100644
  }
  
  /**
-@@ -353,6 +357,7 @@ static void __relay_reset(struct rchan_buf *buf, unsigned int init)
+@@ -353,6 +357,7 @@
  		init_waitqueue_head(&buf->read_wait);
  		kref_init(&buf->kref);
  		setup_timer(&buf->timer, wakeup_readers, (unsigned long)buf);
@@ -16480,7 +16266,7 @@ index d797502140b9..cf05c17ddbed 100644
  	} else
  		del_timer_sync(&buf->timer);
  
-@@ -767,15 +772,6 @@ size_t relay_switch_subbuf(struct rchan_buf *buf, size_t length)
+@@ -767,15 +772,6 @@
  		else
  			buf->early_bytes += buf->chan->subbuf_size -
  					    buf->padding[old_subbuf];
@@ -16496,24 +16282,10 @@ index d797502140b9..cf05c17ddbed 100644
  	}
  
  	old = buf->data;
-diff --git a/kernel/sched/Makefile b/kernel/sched/Makefile
-index 5e59b832ae2b..7337a7f60e3f 100644
---- a/kernel/sched/Makefile
-+++ b/kernel/sched/Makefile
-@@ -17,7 +17,7 @@ endif
- 
- obj-y += core.o loadavg.o clock.o cputime.o
- obj-y += idle_task.o fair.o rt.o deadline.o stop_task.o
--obj-y += wait.o swait.o completion.o idle.o
-+obj-y += wait.o swait.o swork.o completion.o idle.o
- obj-$(CONFIG_SMP) += cpupri.o cpudeadline.o
- obj-$(CONFIG_SCHED_AUTOGROUP) += auto_group.o
- obj-$(CONFIG_SCHEDSTATS) += stats.o
-diff --git a/kernel/sched/completion.c b/kernel/sched/completion.c
-index 8d0f35debf35..b62cf6400fe0 100644
---- a/kernel/sched/completion.c
-+++ b/kernel/sched/completion.c
-@@ -30,10 +30,10 @@ void complete(struct completion *x)
+diff -Nur linux-4.8.15.orig/kernel/sched/completion.c linux-4.8.15/kernel/sched/completion.c
+--- linux-4.8.15.orig/kernel/sched/completion.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/sched/completion.c	2017-01-01 17:07:16.031426957 +0100
+@@ -30,10 +30,10 @@
  {
  	unsigned long flags;
  
@@ -16527,7 +16299,7 @@ index 8d0f35debf35..b62cf6400fe0 100644
  }
  EXPORT_SYMBOL(complete);
  
-@@ -50,10 +50,10 @@ void complete_all(struct completion *x)
+@@ -50,10 +50,10 @@
  {
  	unsigned long flags;
  
@@ -16541,7 +16313,7 @@ index 8d0f35debf35..b62cf6400fe0 100644
  }
  EXPORT_SYMBOL(complete_all);
  
-@@ -62,20 +62,20 @@ do_wait_for_common(struct completion *x,
+@@ -62,20 +62,20 @@
  		   long (*action)(long), long timeout, int state)
  {
  	if (!x->done) {
@@ -16567,7 +16339,7 @@ index 8d0f35debf35..b62cf6400fe0 100644
  		if (!x->done)
  			return timeout;
  	}
-@@ -89,9 +89,9 @@ __wait_for_common(struct completion *x,
+@@ -89,9 +89,9 @@
  {
  	might_sleep();
  
@@ -16579,7 +16351,7 @@ index 8d0f35debf35..b62cf6400fe0 100644
  	return timeout;
  }
  
-@@ -277,12 +277,12 @@ bool try_wait_for_completion(struct completion *x)
+@@ -277,12 +277,12 @@
  	if (!READ_ONCE(x->done))
  		return 0;
  
@@ -16594,7 +16366,7 @@ index 8d0f35debf35..b62cf6400fe0 100644
  	return ret;
  }
  EXPORT_SYMBOL(try_wait_for_completion);
-@@ -311,7 +311,7 @@ bool completion_done(struct completion *x)
+@@ -311,7 +311,7 @@
  	 * after it's acquired the lock.
  	 */
  	smp_rmb();
@@ -16603,11 +16375,10 @@ index 8d0f35debf35..b62cf6400fe0 100644
  	return true;
  }
  EXPORT_SYMBOL(completion_done);
-diff --git a/kernel/sched/core.c b/kernel/sched/core.c
-index 44817c640e99..55aafcff5810 100644
---- a/kernel/sched/core.c
-+++ b/kernel/sched/core.c
-@@ -129,7 +129,11 @@ const_debug unsigned int sysctl_sched_features =
+diff -Nur linux-4.8.15.orig/kernel/sched/core.c linux-4.8.15/kernel/sched/core.c
+--- linux-4.8.15.orig/kernel/sched/core.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/sched/core.c	2017-01-01 17:07:16.035427212 +0100
+@@ -129,7 +129,11 @@
   * Number of tasks to iterate in a single balance run.
   * Limited because this is done with IRQs disabled.
   */
@@ -16619,7 +16390,7 @@ index 44817c640e99..55aafcff5810 100644
  
  /*
   * period over which we average the RT time consumption, measured
-@@ -345,6 +349,7 @@ static void init_rq_hrtick(struct rq *rq)
+@@ -345,6 +349,7 @@
  
  	hrtimer_init(&rq->hrtick_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
  	rq->hrtick_timer.function = hrtick;
@@ -16627,7 +16398,7 @@ index 44817c640e99..55aafcff5810 100644
  }
  #else	/* CONFIG_SCHED_HRTICK */
  static inline void hrtick_clear(struct rq *rq)
-@@ -449,7 +454,7 @@ void wake_q_add(struct wake_q_head *head, struct task_struct *task)
+@@ -449,7 +454,7 @@
  	head->lastp = &node->next;
  }
  
@@ -16636,7 +16407,7 @@ index 44817c640e99..55aafcff5810 100644
  {
  	struct wake_q_node *node = head->first;
  
-@@ -466,7 +471,10 @@ void wake_up_q(struct wake_q_head *head)
+@@ -466,7 +471,10 @@
  		 * wake_up_process() implies a wmb() to pair with the queueing
  		 * in wake_q_add() so as not to miss wakeups.
  		 */
@@ -16648,7 +16419,7 @@ index 44817c640e99..55aafcff5810 100644
  		put_task_struct(task);
  	}
  }
-@@ -502,6 +510,38 @@ void resched_curr(struct rq *rq)
+@@ -502,6 +510,38 @@
  		trace_sched_wake_idle_without_ipi(cpu);
  }
  
@@ -16687,7 +16458,7 @@ index 44817c640e99..55aafcff5810 100644
  void resched_cpu(int cpu)
  {
  	struct rq *rq = cpu_rq(cpu);
-@@ -525,11 +565,14 @@ void resched_cpu(int cpu)
+@@ -525,11 +565,14 @@
   */
  int get_nohz_timer_target(void)
  {
@@ -16704,7 +16475,7 @@ index 44817c640e99..55aafcff5810 100644
  
  	rcu_read_lock();
  	for_each_domain(cpu, sd) {
-@@ -548,6 +591,8 @@ int get_nohz_timer_target(void)
+@@ -548,6 +591,8 @@
  		cpu = housekeeping_any_cpu();
  unlock:
  	rcu_read_unlock();
@@ -16713,7 +16484,7 @@ index 44817c640e99..55aafcff5810 100644
  	return cpu;
  }
  /*
-@@ -1089,6 +1134,11 @@ void do_set_cpus_allowed(struct task_struct *p, const struct cpumask *new_mask)
+@@ -1089,6 +1134,11 @@
  
  	lockdep_assert_held(&p->pi_lock);
  
@@ -16725,7 +16496,7 @@ index 44817c640e99..55aafcff5810 100644
  	queued = task_on_rq_queued(p);
  	running = task_current(rq, p);
  
-@@ -1111,6 +1161,84 @@ void do_set_cpus_allowed(struct task_struct *p, const struct cpumask *new_mask)
+@@ -1111,6 +1161,84 @@
  		enqueue_task(rq, p, ENQUEUE_RESTORE);
  }
  
@@ -16810,7 +16581,7 @@ index 44817c640e99..55aafcff5810 100644
  /*
   * Change a given task's CPU affinity. Migrate the thread to a
   * proper CPU and schedule it away if the CPU it's executing on
-@@ -1168,7 +1296,7 @@ static int __set_cpus_allowed_ptr(struct task_struct *p,
+@@ -1168,7 +1296,7 @@
  	}
  
  	/* Can the task run on the task's current CPU? If so, we're done */
@@ -16819,7 +16590,7 @@ index 44817c640e99..55aafcff5810 100644
  		goto out;
  
  	dest_cpu = cpumask_any_and(cpu_valid_mask, new_mask);
-@@ -1355,6 +1483,18 @@ int migrate_swap(struct task_struct *cur, struct task_struct *p)
+@@ -1355,6 +1483,18 @@
  	return ret;
  }
  
@@ -16838,7 +16609,7 @@ index 44817c640e99..55aafcff5810 100644
  /*
   * wait_task_inactive - wait for a thread to unschedule.
   *
-@@ -1399,7 +1539,7 @@ unsigned long wait_task_inactive(struct task_struct *p, long match_state)
+@@ -1399,7 +1539,7 @@
  		 * is actually now running somewhere else!
  		 */
  		while (task_running(rq, p)) {
@@ -16847,7 +16618,7 @@ index 44817c640e99..55aafcff5810 100644
  				return 0;
  			cpu_relax();
  		}
-@@ -1414,7 +1554,8 @@ unsigned long wait_task_inactive(struct task_struct *p, long match_state)
+@@ -1414,7 +1554,8 @@
  		running = task_running(rq, p);
  		queued = task_on_rq_queued(p);
  		ncsw = 0;
@@ -16857,7 +16628,7 @@ index 44817c640e99..55aafcff5810 100644
  			ncsw = p->nvcsw | LONG_MIN; /* sets MSB */
  		task_rq_unlock(rq, p, &rf);
  
-@@ -1670,10 +1811,6 @@ static inline void ttwu_activate(struct rq *rq, struct task_struct *p, int en_fl
+@@ -1670,10 +1811,6 @@
  {
  	activate_task(rq, p, en_flags);
  	p->on_rq = TASK_ON_RQ_QUEUED;
@@ -16868,7 +16639,7 @@ index 44817c640e99..55aafcff5810 100644
  }
  
  /*
-@@ -2008,8 +2145,27 @@ try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags)
+@@ -2008,8 +2145,27 @@
  	 */
  	smp_mb__before_spinlock();
  	raw_spin_lock_irqsave(&p->pi_lock, flags);
@@ -16897,7 +16668,7 @@ index 44817c640e99..55aafcff5810 100644
  
  	trace_sched_waking(p);
  
-@@ -2093,53 +2249,6 @@ try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags)
+@@ -2093,53 +2249,6 @@
  }
  
  /**
@@ -16951,7 +16722,7 @@ index 44817c640e99..55aafcff5810 100644
   * wake_up_process - Wake up a specific process
   * @p: The process to be woken up.
   *
-@@ -2157,6 +2266,18 @@ int wake_up_process(struct task_struct *p)
+@@ -2157,6 +2266,18 @@
  }
  EXPORT_SYMBOL(wake_up_process);
  
@@ -16970,7 +16741,7 @@ index 44817c640e99..55aafcff5810 100644
  int wake_up_state(struct task_struct *p, unsigned int state)
  {
  	return try_to_wake_up(p, state, 0);
-@@ -2433,6 +2554,9 @@ int sched_fork(unsigned long clone_flags, struct task_struct *p)
+@@ -2433,6 +2554,9 @@
  	p->on_cpu = 0;
  #endif
  	init_task_preempt_count(p);
@@ -16980,7 +16751,7 @@ index 44817c640e99..55aafcff5810 100644
  #ifdef CONFIG_SMP
  	plist_node_init(&p->pushable_tasks, MAX_PRIO);
  	RB_CLEAR_NODE(&p->pushable_dl_tasks);
-@@ -2761,8 +2885,12 @@ static struct rq *finish_task_switch(struct task_struct *prev)
+@@ -2761,8 +2885,12 @@
  	finish_arch_post_lock_switch();
  
  	fire_sched_in_preempt_notifiers(current);
@@ -16994,7 +16765,7 @@ index 44817c640e99..55aafcff5810 100644
  	if (unlikely(prev_state == TASK_DEAD)) {
  		if (prev->sched_class->task_dead)
  			prev->sched_class->task_dead(prev);
-@@ -3237,6 +3365,77 @@ static inline void schedule_debug(struct task_struct *prev)
+@@ -3237,6 +3365,77 @@
  	schedstat_inc(this_rq(), sched_count);
  }
  
@@ -17072,7 +16843,7 @@ index 44817c640e99..55aafcff5810 100644
  /*
   * Pick up the highest-prio task:
   */
-@@ -3364,19 +3563,6 @@ static void __sched notrace __schedule(bool preempt)
+@@ -3364,19 +3563,6 @@
  		} else {
  			deactivate_task(rq, prev, DEQUEUE_SLEEP);
  			prev->on_rq = 0;
@@ -17092,7 +16863,7 @@ index 44817c640e99..55aafcff5810 100644
  		}
  		switch_count = &prev->nvcsw;
  	}
-@@ -3386,6 +3572,7 @@ static void __sched notrace __schedule(bool preempt)
+@@ -3386,6 +3572,7 @@
  
  	next = pick_next_task(rq, prev, cookie);
  	clear_tsk_need_resched(prev);
@@ -17100,7 +16871,7 @@ index 44817c640e99..55aafcff5810 100644
  	clear_preempt_need_resched();
  	rq->clock_skip_update = 0;
  
-@@ -3407,9 +3594,20 @@ STACK_FRAME_NON_STANDARD(__schedule); /* switch_to() */
+@@ -3407,9 +3594,20 @@
  
  static inline void sched_submit_work(struct task_struct *tsk)
  {
@@ -17122,7 +16893,7 @@ index 44817c640e99..55aafcff5810 100644
  	 * If we are going to sleep and we have plugged IO queued,
  	 * make sure to submit it to avoid deadlocks.
  	 */
-@@ -3417,6 +3615,12 @@ static inline void sched_submit_work(struct task_struct *tsk)
+@@ -3417,6 +3615,12 @@
  		blk_schedule_flush_plug(tsk);
  }
  
@@ -17135,7 +16906,7 @@ index 44817c640e99..55aafcff5810 100644
  asmlinkage __visible void __sched schedule(void)
  {
  	struct task_struct *tsk = current;
-@@ -3427,6 +3631,7 @@ asmlinkage __visible void __sched schedule(void)
+@@ -3427,6 +3631,7 @@
  		__schedule(false);
  		sched_preempt_enable_no_resched();
  	} while (need_resched());
@@ -17143,7 +16914,7 @@ index 44817c640e99..55aafcff5810 100644
  }
  EXPORT_SYMBOL(schedule);
  
-@@ -3490,6 +3695,30 @@ static void __sched notrace preempt_schedule_common(void)
+@@ -3490,6 +3695,30 @@
  	} while (need_resched());
  }
  
@@ -17174,7 +16945,7 @@ index 44817c640e99..55aafcff5810 100644
  #ifdef CONFIG_PREEMPT
  /*
   * this is the entry point to schedule() from in-kernel preemption
-@@ -3504,7 +3733,8 @@ asmlinkage __visible void __sched notrace preempt_schedule(void)
+@@ -3504,7 +3733,8 @@
  	 */
  	if (likely(!preemptible()))
  		return;
@@ -17184,7 +16955,7 @@ index 44817c640e99..55aafcff5810 100644
  	preempt_schedule_common();
  }
  NOKPROBE_SYMBOL(preempt_schedule);
-@@ -3531,6 +3761,9 @@ asmlinkage __visible void __sched notrace preempt_schedule_notrace(void)
+@@ -3531,6 +3761,9 @@
  	if (likely(!preemptible()))
  		return;
  
@@ -17194,7 +16965,7 @@ index 44817c640e99..55aafcff5810 100644
  	do {
  		/*
  		 * Because the function tracer can trace preempt_count_sub()
-@@ -3553,7 +3786,16 @@ asmlinkage __visible void __sched notrace preempt_schedule_notrace(void)
+@@ -3553,7 +3786,16 @@
  		 * an infinite recursion.
  		 */
  		prev_ctx = exception_enter();
@@ -17211,7 +16982,7 @@ index 44817c640e99..55aafcff5810 100644
  		exception_exit(prev_ctx);
  
  		preempt_latency_stop(1);
-@@ -4901,6 +5143,7 @@ int __cond_resched_lock(spinlock_t *lock)
+@@ -4901,6 +5143,7 @@
  }
  EXPORT_SYMBOL(__cond_resched_lock);
  
@@ -17219,7 +16990,7 @@ index 44817c640e99..55aafcff5810 100644
  int __sched __cond_resched_softirq(void)
  {
  	BUG_ON(!in_softirq());
-@@ -4914,6 +5157,7 @@ int __sched __cond_resched_softirq(void)
+@@ -4914,6 +5157,7 @@
  	return 0;
  }
  EXPORT_SYMBOL(__cond_resched_softirq);
@@ -17227,7 +16998,7 @@ index 44817c640e99..55aafcff5810 100644
  
  /**
   * yield - yield the current processor to other threads.
-@@ -5283,7 +5527,9 @@ void init_idle(struct task_struct *idle, int cpu)
+@@ -5283,7 +5527,9 @@
  
  	/* Set the preempt count _outside_ the spinlocks! */
  	init_idle_preempt_count(idle, cpu);
@@ -17238,7 +17009,7 @@ index 44817c640e99..55aafcff5810 100644
  	/*
  	 * The idle tasks have their own, simple scheduling class:
  	 */
-@@ -5426,6 +5672,8 @@ void sched_setnuma(struct task_struct *p, int nid)
+@@ -5426,6 +5672,8 @@
  #endif /* CONFIG_NUMA_BALANCING */
  
  #ifdef CONFIG_HOTPLUG_CPU
@@ -17247,7 +17018,7 @@ index 44817c640e99..55aafcff5810 100644
  /*
   * Ensures that the idle task is using init_mm right before its cpu goes
   * offline.
-@@ -5440,7 +5688,12 @@ void idle_task_exit(void)
+@@ -5440,7 +5688,12 @@
  		switch_mm_irqs_off(mm, &init_mm, current);
  		finish_arch_post_lock_switch();
  	}
@@ -17261,7 +17032,7 @@ index 44817c640e99..55aafcff5810 100644
  }
  
  /*
-@@ -7315,6 +7568,10 @@ int sched_cpu_dying(unsigned int cpu)
+@@ -7315,6 +7568,10 @@
  	update_max_interval();
  	nohz_balance_exit_idle(cpu);
  	hrtick_clear(rq);
@@ -17272,7 +17043,7 @@ index 44817c640e99..55aafcff5810 100644
  	return 0;
  }
  #endif
-@@ -7566,7 +7823,7 @@ void __init sched_init(void)
+@@ -7566,7 +7823,7 @@
  #ifdef CONFIG_DEBUG_ATOMIC_SLEEP
  static inline int preempt_count_equals(int preempt_offset)
  {
@@ -17281,11 +17052,10 @@ index 44817c640e99..55aafcff5810 100644
  
  	return (nested == preempt_offset);
  }
-diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c
-index 1ce8867283dc..766da04b06a0 100644
---- a/kernel/sched/deadline.c
-+++ b/kernel/sched/deadline.c
-@@ -697,6 +697,7 @@ void init_dl_task_timer(struct sched_dl_entity *dl_se)
+diff -Nur linux-4.8.15.orig/kernel/sched/deadline.c linux-4.8.15/kernel/sched/deadline.c
+--- linux-4.8.15.orig/kernel/sched/deadline.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/sched/deadline.c	2017-01-01 17:07:16.035427212 +0100
+@@ -697,6 +697,7 @@
  
  	hrtimer_init(timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
  	timer->function = dl_task_timer;
@@ -17293,11 +17063,10 @@ index 1ce8867283dc..766da04b06a0 100644
  }
  
  static
-diff --git a/kernel/sched/debug.c b/kernel/sched/debug.c
-index 2a0a9995256d..48a9b6f57249 100644
---- a/kernel/sched/debug.c
-+++ b/kernel/sched/debug.c
-@@ -552,6 +552,9 @@ void print_rt_rq(struct seq_file *m, int cpu, struct rt_rq *rt_rq)
+diff -Nur linux-4.8.15.orig/kernel/sched/debug.c linux-4.8.15/kernel/sched/debug.c
+--- linux-4.8.15.orig/kernel/sched/debug.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/sched/debug.c	2017-01-01 17:07:16.035427212 +0100
+@@ -552,6 +552,9 @@
  	P(rt_throttled);
  	PN(rt_time);
  	PN(rt_runtime);
@@ -17307,7 +17076,7 @@ index 2a0a9995256d..48a9b6f57249 100644
  
  #undef PN
  #undef P
-@@ -947,6 +950,10 @@ void proc_sched_show_task(struct task_struct *p, struct seq_file *m)
+@@ -947,6 +950,10 @@
  #endif
  	P(policy);
  	P(prio);
@@ -17318,11 +17087,10 @@ index 2a0a9995256d..48a9b6f57249 100644
  #undef PN
  #undef __PN
  #undef P
-diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
-index 8b3610c871f2..1145079af264 100644
---- a/kernel/sched/fair.c
-+++ b/kernel/sched/fair.c
-@@ -3508,7 +3508,7 @@ check_preempt_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr)
+diff -Nur linux-4.8.15.orig/kernel/sched/fair.c linux-4.8.15/kernel/sched/fair.c
+--- linux-4.8.15.orig/kernel/sched/fair.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/sched/fair.c	2017-01-01 17:07:16.039427472 +0100
+@@ -3508,7 +3508,7 @@
  	ideal_runtime = sched_slice(cfs_rq, curr);
  	delta_exec = curr->sum_exec_runtime - curr->prev_sum_exec_runtime;
  	if (delta_exec > ideal_runtime) {
@@ -17331,7 +17099,7 @@ index 8b3610c871f2..1145079af264 100644
  		/*
  		 * The current task ran long enough, ensure it doesn't get
  		 * re-elected due to buddy favours.
-@@ -3532,7 +3532,7 @@ check_preempt_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr)
+@@ -3532,7 +3532,7 @@
  		return;
  
  	if (delta > ideal_runtime)
@@ -17340,7 +17108,7 @@ index 8b3610c871f2..1145079af264 100644
  }
  
  static void
-@@ -3677,7 +3677,7 @@ entity_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr, int queued)
+@@ -3677,7 +3677,7 @@
  	 * validating it and just reschedule.
  	 */
  	if (queued) {
@@ -17349,7 +17117,7 @@ index 8b3610c871f2..1145079af264 100644
  		return;
  	}
  	/*
-@@ -3859,7 +3859,7 @@ static void __account_cfs_rq_runtime(struct cfs_rq *cfs_rq, u64 delta_exec)
+@@ -3859,7 +3859,7 @@
  	 * hierarchy can be throttled
  	 */
  	if (!assign_cfs_rq_runtime(cfs_rq) && likely(cfs_rq->curr))
@@ -17358,7 +17126,7 @@ index 8b3610c871f2..1145079af264 100644
  }
  
  static __always_inline
-@@ -4487,7 +4487,7 @@ static void hrtick_start_fair(struct rq *rq, struct task_struct *p)
+@@ -4487,7 +4487,7 @@
  
  		if (delta < 0) {
  			if (rq->curr == p)
@@ -17367,7 +17135,7 @@ index 8b3610c871f2..1145079af264 100644
  			return;
  		}
  		hrtick_start(rq, delta);
-@@ -5676,7 +5676,7 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_
+@@ -5676,7 +5676,7 @@
  	return;
  
  preempt:
@@ -17376,7 +17144,7 @@ index 8b3610c871f2..1145079af264 100644
  	/*
  	 * Only set the backward buddy when the current task is still
  	 * on the rq. This can happen when a wakeup gets interleaved
-@@ -8402,7 +8402,7 @@ static void task_fork_fair(struct task_struct *p)
+@@ -8402,7 +8402,7 @@
  		 * 'current' within the tree based on its new key value.
  		 */
  		swap(curr->vruntime, se->vruntime);
@@ -17385,7 +17153,7 @@ index 8b3610c871f2..1145079af264 100644
  	}
  
  	se->vruntime -= cfs_rq->min_vruntime;
-@@ -8426,7 +8426,7 @@ prio_changed_fair(struct rq *rq, struct task_struct *p, int oldprio)
+@@ -8426,7 +8426,7 @@
  	 */
  	if (rq->curr == p) {
  		if (p->prio > oldprio)
@@ -17394,11 +17162,10 @@ index 8b3610c871f2..1145079af264 100644
  	} else
  		check_preempt_curr(rq, p, 0);
  }
-diff --git a/kernel/sched/features.h b/kernel/sched/features.h
-index 69631fa46c2f..6d28fcd08872 100644
---- a/kernel/sched/features.h
-+++ b/kernel/sched/features.h
-@@ -45,11 +45,19 @@ SCHED_FEAT(LB_BIAS, true)
+diff -Nur linux-4.8.15.orig/kernel/sched/features.h linux-4.8.15/kernel/sched/features.h
+--- linux-4.8.15.orig/kernel/sched/features.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/sched/features.h	2017-01-01 17:07:16.039427472 +0100
+@@ -45,11 +45,19 @@
   */
  SCHED_FEAT(NONTASK_CAPACITY, true)
  
@@ -17418,11 +17185,22 @@ index 69631fa46c2f..6d28fcd08872 100644
  
  #ifdef HAVE_RT_PUSH_IPI
  /*
-diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c
-index d5690b722691..731cd0e98c15 100644
---- a/kernel/sched/rt.c
-+++ b/kernel/sched/rt.c
-@@ -47,6 +47,7 @@ void init_rt_bandwidth(struct rt_bandwidth *rt_b, u64 period, u64 runtime)
+diff -Nur linux-4.8.15.orig/kernel/sched/Makefile linux-4.8.15/kernel/sched/Makefile
+--- linux-4.8.15.orig/kernel/sched/Makefile	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/sched/Makefile	2017-01-01 17:07:16.031426957 +0100
+@@ -17,7 +17,7 @@
+ 
+ obj-y += core.o loadavg.o clock.o cputime.o
+ obj-y += idle_task.o fair.o rt.o deadline.o stop_task.o
+-obj-y += wait.o swait.o completion.o idle.o
++obj-y += wait.o swait.o swork.o completion.o idle.o
+ obj-$(CONFIG_SMP) += cpupri.o cpudeadline.o
+ obj-$(CONFIG_SCHED_AUTOGROUP) += auto_group.o
+ obj-$(CONFIG_SCHEDSTATS) += stats.o
+diff -Nur linux-4.8.15.orig/kernel/sched/rt.c linux-4.8.15/kernel/sched/rt.c
+--- linux-4.8.15.orig/kernel/sched/rt.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/sched/rt.c	2017-01-01 17:07:16.039427472 +0100
+@@ -47,6 +47,7 @@
  
  	hrtimer_init(&rt_b->rt_period_timer,
  			CLOCK_MONOTONIC, HRTIMER_MODE_REL);
@@ -17430,7 +17208,7 @@ index d5690b722691..731cd0e98c15 100644
  	rt_b->rt_period_timer.function = sched_rt_period_timer;
  }
  
-@@ -101,6 +102,7 @@ void init_rt_rq(struct rt_rq *rt_rq)
+@@ -101,6 +102,7 @@
  	rt_rq->push_cpu = nr_cpu_ids;
  	raw_spin_lock_init(&rt_rq->push_lock);
  	init_irq_work(&rt_rq->push_work, push_irq_work_func);
@@ -17438,11 +17216,10 @@ index d5690b722691..731cd0e98c15 100644
  #endif
  #endif /* CONFIG_SMP */
  	/* We start is dequeued state, because no RT tasks are queued */
-diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
-index c64fc5114004..af58f9b3ece4 100644
---- a/kernel/sched/sched.h
-+++ b/kernel/sched/sched.h
-@@ -1138,6 +1138,7 @@ static inline void finish_lock_switch(struct rq *rq, struct task_struct *prev)
+diff -Nur linux-4.8.15.orig/kernel/sched/sched.h linux-4.8.15/kernel/sched/sched.h
+--- linux-4.8.15.orig/kernel/sched/sched.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/sched/sched.h	2017-01-01 17:07:16.039427472 +0100
+@@ -1138,6 +1138,7 @@
  #define WF_SYNC		0x01		/* waker goes to sleep after wakeup */
  #define WF_FORK		0x02		/* child wakeup after fork */
  #define WF_MIGRATED	0x4		/* internal use, task got migrated */
@@ -17450,7 +17227,7 @@ index c64fc5114004..af58f9b3ece4 100644
  
  /*
   * To aid in avoiding the subversion of "niceness" due to uneven distribution
-@@ -1316,6 +1317,15 @@ extern void init_sched_fair_class(void);
+@@ -1316,6 +1317,15 @@
  extern void resched_curr(struct rq *rq);
  extern void resched_cpu(int cpu);
  
@@ -17466,10 +17243,9 @@ index c64fc5114004..af58f9b3ece4 100644
  extern struct rt_bandwidth def_rt_bandwidth;
  extern void init_rt_bandwidth(struct rt_bandwidth *rt_b, u64 period, u64 runtime);
  
-diff --git a/kernel/sched/swait.c b/kernel/sched/swait.c
-index 82f0dff90030..ef027ff3250a 100644
---- a/kernel/sched/swait.c
-+++ b/kernel/sched/swait.c
+diff -Nur linux-4.8.15.orig/kernel/sched/swait.c linux-4.8.15/kernel/sched/swait.c
+--- linux-4.8.15.orig/kernel/sched/swait.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/sched/swait.c	2017-01-01 17:07:16.039427472 +0100
 @@ -1,5 +1,6 @@
  #include <linux/sched.h>
  #include <linux/swait.h>
@@ -17477,7 +17253,7 @@ index 82f0dff90030..ef027ff3250a 100644
  
  void __init_swait_queue_head(struct swait_queue_head *q, const char *name,
  			     struct lock_class_key *key)
-@@ -29,6 +30,25 @@ void swake_up_locked(struct swait_queue_head *q)
+@@ -29,6 +30,25 @@
  }
  EXPORT_SYMBOL(swake_up_locked);
  
@@ -17503,7 +17279,7 @@ index 82f0dff90030..ef027ff3250a 100644
  void swake_up(struct swait_queue_head *q)
  {
  	unsigned long flags;
-@@ -54,6 +74,7 @@ void swake_up_all(struct swait_queue_head *q)
+@@ -54,6 +74,7 @@
  	if (!swait_active(q))
  		return;
  
@@ -17511,11 +17287,9 @@ index 82f0dff90030..ef027ff3250a 100644
  	raw_spin_lock_irq(&q->lock);
  	list_splice_init(&q->task_list, &tmp);
  	while (!list_empty(&tmp)) {
-diff --git a/kernel/sched/swork.c b/kernel/sched/swork.c
-new file mode 100644
-index 000000000000..1950f40ca725
---- /dev/null
-+++ b/kernel/sched/swork.c
+diff -Nur linux-4.8.15.orig/kernel/sched/swork.c linux-4.8.15/kernel/sched/swork.c
+--- linux-4.8.15.orig/kernel/sched/swork.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-4.8.15/kernel/sched/swork.c	2017-01-01 17:07:16.039427472 +0100
 @@ -0,0 +1,173 @@
 +/*
 + * Copyright (C) 2014 BMW Car IT GmbH, Daniel Wagner daniel.wagner@bmw-carit.de
@@ -17690,10 +17464,9 @@ index 000000000000..1950f40ca725
 +	mutex_unlock(&worker_mutex);
 +}
 +EXPORT_SYMBOL_GPL(swork_put);
-diff --git a/kernel/signal.c b/kernel/signal.c
-index af21afc00d08..7ead97a43298 100644
---- a/kernel/signal.c
-+++ b/kernel/signal.c
+diff -Nur linux-4.8.15.orig/kernel/signal.c linux-4.8.15/kernel/signal.c
+--- linux-4.8.15.orig/kernel/signal.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/signal.c	2017-01-01 17:07:16.043427737 +0100
 @@ -14,6 +14,7 @@
  #include <linux/export.h>
  #include <linux/init.h>
@@ -17702,7 +17475,7 @@ index af21afc00d08..7ead97a43298 100644
  #include <linux/fs.h>
  #include <linux/tty.h>
  #include <linux/binfmts.h>
-@@ -352,13 +353,30 @@ static bool task_participate_group_stop(struct task_struct *task)
+@@ -352,13 +353,30 @@
  	return false;
  }
  
@@ -17734,7 +17507,7 @@ index af21afc00d08..7ead97a43298 100644
  {
  	struct sigqueue *q = NULL;
  	struct user_struct *user;
-@@ -375,7 +393,10 @@ __sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimi
+@@ -375,7 +393,10 @@
  	if (override_rlimit ||
  	    atomic_read(&user->sigpending) <=
  			task_rlimit(t, RLIMIT_SIGPENDING)) {
@@ -17746,7 +17519,7 @@ index af21afc00d08..7ead97a43298 100644
  	} else {
  		print_dropped_signal(sig);
  	}
-@@ -392,6 +413,13 @@ __sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimi
+@@ -392,6 +413,13 @@
  	return q;
  }
  
@@ -17760,7 +17533,7 @@ index af21afc00d08..7ead97a43298 100644
  static void __sigqueue_free(struct sigqueue *q)
  {
  	if (q->flags & SIGQUEUE_PREALLOC)
-@@ -401,6 +429,21 @@ static void __sigqueue_free(struct sigqueue *q)
+@@ -401,6 +429,21 @@
  	kmem_cache_free(sigqueue_cachep, q);
  }
  
@@ -17782,7 +17555,7 @@ index af21afc00d08..7ead97a43298 100644
  void flush_sigqueue(struct sigpending *queue)
  {
  	struct sigqueue *q;
-@@ -414,6 +457,21 @@ void flush_sigqueue(struct sigpending *queue)
+@@ -414,6 +457,21 @@
  }
  
  /*
@@ -17804,7 +17577,7 @@ index af21afc00d08..7ead97a43298 100644
   * Flush all pending signals for this kthread.
   */
  void flush_signals(struct task_struct *t)
-@@ -525,7 +583,7 @@ static void collect_signal(int sig, struct sigpending *list, siginfo_t *info)
+@@ -525,7 +583,7 @@
  still_pending:
  		list_del_init(&first->list);
  		copy_siginfo(info, &first->info);
@@ -17813,7 +17586,7 @@ index af21afc00d08..7ead97a43298 100644
  	} else {
  		/*
  		 * Ok, it wasn't in the queue.  This must be
-@@ -560,6 +618,8 @@ int dequeue_signal(struct task_struct *tsk, sigset_t *mask, siginfo_t *info)
+@@ -560,6 +618,8 @@
  {
  	int signr;
  
@@ -17822,7 +17595,7 @@ index af21afc00d08..7ead97a43298 100644
  	/* We only dequeue private signals from ourselves, we don't let
  	 * signalfd steal them
  	 */
-@@ -1156,8 +1216,8 @@ int do_send_sig_info(int sig, struct siginfo *info, struct task_struct *p,
+@@ -1156,8 +1216,8 @@
   * We don't want to have recursive SIGSEGV's etc, for example,
   * that is why we also clear SIGNAL_UNKILLABLE.
   */
@@ -17833,7 +17606,7 @@ index af21afc00d08..7ead97a43298 100644
  {
  	unsigned long int flags;
  	int ret, blocked, ignored;
-@@ -1182,6 +1242,39 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
+@@ -1182,6 +1242,39 @@
  	return ret;
  }
  
@@ -17873,7 +17646,7 @@ index af21afc00d08..7ead97a43298 100644
  /*
   * Nuke all other threads in the group.
   */
-@@ -1216,12 +1309,12 @@ struct sighand_struct *__lock_task_sighand(struct task_struct *tsk,
+@@ -1216,12 +1309,12 @@
  		 * Disable interrupts early to avoid deadlocks.
  		 * See rcu_read_unlock() comment header for details.
  		 */
@@ -17888,7 +17661,7 @@ index af21afc00d08..7ead97a43298 100644
  			break;
  		}
  		/*
-@@ -1242,7 +1335,7 @@ struct sighand_struct *__lock_task_sighand(struct task_struct *tsk,
+@@ -1242,7 +1335,7 @@
  		}
  		spin_unlock(&sighand->siglock);
  		rcu_read_unlock();
@@ -17897,7 +17670,7 @@ index af21afc00d08..7ead97a43298 100644
  	}
  
  	return sighand;
-@@ -1485,7 +1578,8 @@ EXPORT_SYMBOL(kill_pid);
+@@ -1485,7 +1578,8 @@
   */
  struct sigqueue *sigqueue_alloc(void)
  {
@@ -17907,7 +17680,7 @@ index af21afc00d08..7ead97a43298 100644
  
  	if (q)
  		q->flags |= SIGQUEUE_PREALLOC;
-@@ -1846,15 +1940,7 @@ static void ptrace_stop(int exit_code, int why, int clear_code, siginfo_t *info)
+@@ -1846,15 +1940,7 @@
  		if (gstop_done && ptrace_reparented(current))
  			do_notify_parent_cldstop(current, false, why);
  
@@ -17923,10 +17696,9 @@ index af21afc00d08..7ead97a43298 100644
  		freezable_schedule();
  	} else {
  		/*
-diff --git a/kernel/softirq.c b/kernel/softirq.c
-index 17caf4b63342..a602b7152de7 100644
---- a/kernel/softirq.c
-+++ b/kernel/softirq.c
+diff -Nur linux-4.8.15.orig/kernel/softirq.c linux-4.8.15/kernel/softirq.c
+--- linux-4.8.15.orig/kernel/softirq.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/softirq.c	2017-01-01 17:07:16.043427737 +0100
 @@ -21,10 +21,12 @@
  #include <linux/freezer.h>
  #include <linux/kthread.h>
@@ -17940,7 +17712,7 @@ index 17caf4b63342..a602b7152de7 100644
  #include <linux/irq.h>
  
  #define CREATE_TRACE_POINTS
-@@ -56,12 +58,108 @@ EXPORT_SYMBOL(irq_stat);
+@@ -56,12 +58,108 @@
  static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp;
  
  DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
@@ -18049,7 +17821,7 @@ index 17caf4b63342..a602b7152de7 100644
  /*
   * we cannot loop indefinitely here to avoid userspace starvation,
   * but we also don't want to introduce a worst case 1/HZ latency
-@@ -77,6 +175,79 @@ static void wakeup_softirqd(void)
+@@ -77,6 +175,79 @@
  		wake_up_process(tsk);
  }
  
@@ -18129,7 +17901,7 @@ index 17caf4b63342..a602b7152de7 100644
  /*
   * preempt_count and SOFTIRQ_OFFSET usage:
   * - preempt_count is changed by SOFTIRQ_OFFSET on entering or leaving
-@@ -232,10 +403,8 @@ asmlinkage __visible void __softirq_entry __do_softirq(void)
+@@ -232,10 +403,8 @@
  	unsigned long end = jiffies + MAX_SOFTIRQ_TIME;
  	unsigned long old_flags = current->flags;
  	int max_restart = MAX_SOFTIRQ_RESTART;
@@ -18140,7 +17912,7 @@ index 17caf4b63342..a602b7152de7 100644
  
  	/*
  	 * Mask out PF_MEMALLOC s current task context is borrowed for the
-@@ -254,36 +423,7 @@ asmlinkage __visible void __softirq_entry __do_softirq(void)
+@@ -254,36 +423,7 @@
  	/* Reset the pending bitmask before enabling irqs */
  	set_softirq_pending(0);
  
@@ -18178,7 +17950,7 @@ index 17caf4b63342..a602b7152de7 100644
  
  	pending = local_softirq_pending();
  	if (pending) {
-@@ -320,6 +460,310 @@ asmlinkage __visible void do_softirq(void)
+@@ -320,6 +460,310 @@
  }
  
  /*
@@ -18489,7 +18261,7 @@ index 17caf4b63342..a602b7152de7 100644
   * Enter an interrupt context.
   */
  void irq_enter(void)
-@@ -330,9 +774,9 @@ void irq_enter(void)
+@@ -330,9 +774,9 @@
  		 * Prevent raise_softirq from needlessly waking up ksoftirqd
  		 * here, as softirq will be serviced on return from interrupt.
  		 */
@@ -18501,7 +18273,7 @@ index 17caf4b63342..a602b7152de7 100644
  	}
  
  	__irq_enter();
-@@ -340,6 +784,7 @@ void irq_enter(void)
+@@ -340,6 +784,7 @@
  
  static inline void invoke_softirq(void)
  {
@@ -18509,7 +18281,7 @@ index 17caf4b63342..a602b7152de7 100644
  	if (!force_irqthreads) {
  #ifdef CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK
  		/*
-@@ -359,6 +804,18 @@ static inline void invoke_softirq(void)
+@@ -359,6 +804,18 @@
  	} else {
  		wakeup_softirqd();
  	}
@@ -18528,7 +18300,7 @@ index 17caf4b63342..a602b7152de7 100644
  }
  
  static inline void tick_irq_exit(void)
-@@ -395,26 +852,6 @@ void irq_exit(void)
+@@ -395,26 +852,6 @@
  	trace_hardirq_exit(); /* must be last! */
  }
  
@@ -18555,7 +18327,7 @@ index 17caf4b63342..a602b7152de7 100644
  void raise_softirq(unsigned int nr)
  {
  	unsigned long flags;
-@@ -424,12 +861,6 @@ void raise_softirq(unsigned int nr)
+@@ -424,12 +861,6 @@
  	local_irq_restore(flags);
  }
  
@@ -18568,7 +18340,7 @@ index 17caf4b63342..a602b7152de7 100644
  void open_softirq(int nr, void (*action)(struct softirq_action *))
  {
  	softirq_vec[nr].action = action;
-@@ -446,15 +877,45 @@ struct tasklet_head {
+@@ -446,15 +877,45 @@
  static DEFINE_PER_CPU(struct tasklet_head, tasklet_vec);
  static DEFINE_PER_CPU(struct tasklet_head, tasklet_hi_vec);
  
@@ -18618,7 +18390,7 @@ index 17caf4b63342..a602b7152de7 100644
  	local_irq_restore(flags);
  }
  EXPORT_SYMBOL(__tasklet_schedule);
-@@ -464,10 +925,7 @@ void __tasklet_hi_schedule(struct tasklet_struct *t)
+@@ -464,10 +925,7 @@
  	unsigned long flags;
  
  	local_irq_save(flags);
@@ -18630,7 +18402,7 @@ index 17caf4b63342..a602b7152de7 100644
  	local_irq_restore(flags);
  }
  EXPORT_SYMBOL(__tasklet_hi_schedule);
-@@ -476,82 +934,122 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t)
+@@ -476,82 +934,122 @@
  {
  	BUG_ON(!irqs_disabled());
  
@@ -18771,8 +18543,7 @@ index 17caf4b63342..a602b7152de7 100644
  	list = __this_cpu_read(tasklet_hi_vec.head);
  	__this_cpu_write(tasklet_hi_vec.head, NULL);
  	__this_cpu_write(tasklet_hi_vec.tail, this_cpu_ptr(&tasklet_hi_vec.head));
-+
- 	local_irq_enable();
+-	local_irq_enable();
  
 -	while (list) {
 -		struct tasklet_struct *t = list;
@@ -18790,7 +18561,8 @@ index 17caf4b63342..a602b7152de7 100644
 -			}
 -			tasklet_unlock(t);
 -		}
--
++	local_irq_enable();
+ 
 -		local_irq_disable();
 -		t->next = NULL;
 -		*__this_cpu_read(tasklet_hi_vec.tail) = t;
@@ -18802,7 +18574,7 @@ index 17caf4b63342..a602b7152de7 100644
  }
  
  void tasklet_init(struct tasklet_struct *t,
-@@ -572,7 +1070,7 @@ void tasklet_kill(struct tasklet_struct *t)
+@@ -572,7 +1070,7 @@
  
  	while (test_and_set_bit(TASKLET_STATE_SCHED, &t->state)) {
  		do {
@@ -18811,51 +18583,49 @@ index 17caf4b63342..a602b7152de7 100644
  		} while (test_bit(TASKLET_STATE_SCHED, &t->state));
  	}
  	tasklet_unlock_wait(t);
-@@ -646,25 +1144,26 @@ void __init softirq_init(void)
+@@ -646,25 +1144,26 @@
  	open_softirq(HI_SOFTIRQ, tasklet_hi_action);
  }
  
-+#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT_RT_FULL)
-+void tasklet_unlock_wait(struct tasklet_struct *t)
-+{
-+	while (test_bit(TASKLET_STATE_RUN, &(t)->state)) {
-+		/*
-+		 * Hack for now to avoid this busy-loop:
-+		 */
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+		msleep(1);
-+#else
-+		barrier();
-+#endif
-+	}
-+}
-+EXPORT_SYMBOL(tasklet_unlock_wait);
-+#endif
-+
- static int ksoftirqd_should_run(unsigned int cpu)
- {
+-static int ksoftirqd_should_run(unsigned int cpu)
+-{
 -	return local_softirq_pending();
 -}
 -
 -static void run_ksoftirqd(unsigned int cpu)
--{
++#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT_RT_FULL)
++void tasklet_unlock_wait(struct tasklet_struct *t)
+ {
 -	local_irq_disable();
 -	if (local_softirq_pending()) {
--		/*
++	while (test_bit(TASKLET_STATE_RUN, &(t)->state)) {
+ 		/*
 -		 * We can safely run softirq on inline stack, as we are not deep
 -		 * in the task stack here.
--		 */
++		 * Hack for now to avoid this busy-loop:
+ 		 */
 -		__do_softirq();
 -		local_irq_enable();
 -		cond_resched_rcu_qs();
 -		return;
--	}
++#ifdef CONFIG_PREEMPT_RT_FULL
++		msleep(1);
++#else
++		barrier();
++#endif
+ 	}
 -	local_irq_enable();
++}
++EXPORT_SYMBOL(tasklet_unlock_wait);
++#endif
++
++static int ksoftirqd_should_run(unsigned int cpu)
++{
 +	return ksoftirqd_softirq_pending();
  }
  
  #ifdef CONFIG_HOTPLUG_CPU
-@@ -746,16 +1245,31 @@ static struct notifier_block cpu_nfb = {
+@@ -746,16 +1245,31 @@
  
  static struct smp_hotplug_thread softirq_threads = {
  	.store			= &ksoftirqd,
@@ -18887,11 +18657,10 @@ index 17caf4b63342..a602b7152de7 100644
  
  	return 0;
  }
-diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c
-index 4a1ca5f6da7e..3226e22b9e42 100644
---- a/kernel/stop_machine.c
-+++ b/kernel/stop_machine.c
-@@ -37,7 +37,7 @@ struct cpu_stop_done {
+diff -Nur linux-4.8.15.orig/kernel/stop_machine.c linux-4.8.15/kernel/stop_machine.c
+--- linux-4.8.15.orig/kernel/stop_machine.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/stop_machine.c	2017-01-01 17:07:16.043427737 +0100
+@@ -37,7 +37,7 @@
  struct cpu_stopper {
  	struct task_struct	*thread;
  
@@ -18900,7 +18669,7 @@ index 4a1ca5f6da7e..3226e22b9e42 100644
  	bool			enabled;	/* is this stopper enabled? */
  	struct list_head	works;		/* list of pending works */
  
-@@ -83,14 +83,14 @@ static bool cpu_stop_queue_work(unsigned int cpu, struct cpu_stop_work *work)
+@@ -83,14 +83,14 @@
  	unsigned long flags;
  	bool enabled;
  
@@ -18917,7 +18686,7 @@ index 4a1ca5f6da7e..3226e22b9e42 100644
  	return enabled;
  }
  
-@@ -232,8 +232,8 @@ static int cpu_stop_queue_two_works(int cpu1, struct cpu_stop_work *work1,
+@@ -232,8 +232,8 @@
  	int err;
  
  	lg_double_lock(&stop_cpus_lock, cpu1, cpu2);
@@ -18928,7 +18697,7 @@ index 4a1ca5f6da7e..3226e22b9e42 100644
  
  	err = -ENOENT;
  	if (!stopper1->enabled || !stopper2->enabled)
-@@ -243,8 +243,8 @@ static int cpu_stop_queue_two_works(int cpu1, struct cpu_stop_work *work1,
+@@ -243,8 +243,8 @@
  	__cpu_stop_queue_work(stopper1, work1);
  	__cpu_stop_queue_work(stopper2, work2);
  unlock:
@@ -18939,7 +18708,7 @@ index 4a1ca5f6da7e..3226e22b9e42 100644
  	lg_double_unlock(&stop_cpus_lock, cpu1, cpu2);
  
  	return err;
-@@ -321,18 +321,21 @@ static DEFINE_MUTEX(stop_cpus_mutex);
+@@ -321,18 +321,21 @@
  
  static bool queue_stop_cpus_work(const struct cpumask *cpumask,
  				 cpu_stop_fn_t fn, void *arg,
@@ -18966,7 +18735,7 @@ index 4a1ca5f6da7e..3226e22b9e42 100644
  	for_each_cpu(cpu, cpumask) {
  		work = &per_cpu(cpu_stopper.stop_work, cpu);
  		work->fn = fn;
-@@ -352,7 +355,7 @@ static int __stop_cpus(const struct cpumask *cpumask,
+@@ -352,7 +355,7 @@
  	struct cpu_stop_done done;
  
  	cpu_stop_init_done(&done, cpumask_weight(cpumask));
@@ -18975,7 +18744,7 @@ index 4a1ca5f6da7e..3226e22b9e42 100644
  		return -ENOENT;
  	wait_for_completion(&done.completion);
  	return done.ret;
-@@ -433,9 +436,9 @@ static int cpu_stop_should_run(unsigned int cpu)
+@@ -433,9 +436,9 @@
  	unsigned long flags;
  	int run;
  
@@ -18987,7 +18756,7 @@ index 4a1ca5f6da7e..3226e22b9e42 100644
  	return run;
  }
  
-@@ -446,13 +449,13 @@ static void cpu_stopper_thread(unsigned int cpu)
+@@ -446,13 +449,13 @@
  
  repeat:
  	work = NULL;
@@ -19003,7 +18772,7 @@ index 4a1ca5f6da7e..3226e22b9e42 100644
  
  	if (work) {
  		cpu_stop_fn_t fn = work->fn;
-@@ -460,6 +463,16 @@ static void cpu_stopper_thread(unsigned int cpu)
+@@ -460,6 +463,16 @@
  		struct cpu_stop_done *done = work->done;
  		int ret;
  
@@ -19020,7 +18789,7 @@ index 4a1ca5f6da7e..3226e22b9e42 100644
  		/* cpu stop callbacks must not sleep, make in_atomic() == T */
  		preempt_count_inc();
  		ret = fn(arg);
-@@ -526,10 +539,12 @@ static int __init cpu_stop_init(void)
+@@ -526,10 +539,12 @@
  	for_each_possible_cpu(cpu) {
  		struct cpu_stopper *stopper = &per_cpu(cpu_stopper, cpu);
  
@@ -19034,7 +18803,7 @@ index 4a1ca5f6da7e..3226e22b9e42 100644
  	BUG_ON(smpboot_register_percpu_thread(&cpu_stop_threads));
  	stop_machine_unpark(raw_smp_processor_id());
  	stop_machine_initialized = true;
-@@ -624,7 +639,7 @@ int stop_machine_from_inactive_cpu(cpu_stop_fn_t fn, void *data,
+@@ -624,7 +639,7 @@
  	set_state(&msdata, MULTI_STOP_PREPARE);
  	cpu_stop_init_done(&done, num_active_cpus());
  	queue_stop_cpus_work(cpu_active_mask, multi_cpu_stop, &msdata,
@@ -19043,10 +18812,9 @@ index 4a1ca5f6da7e..3226e22b9e42 100644
  	ret = multi_cpu_stop(&msdata);
  
  	/* Busy wait for completion. */
-diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
-index 9ba7c820fc23..d85f638fd99e 100644
---- a/kernel/time/hrtimer.c
-+++ b/kernel/time/hrtimer.c
+diff -Nur linux-4.8.15.orig/kernel/time/hrtimer.c linux-4.8.15/kernel/time/hrtimer.c
+--- linux-4.8.15.orig/kernel/time/hrtimer.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/time/hrtimer.c	2017-01-01 17:07:16.047427991 +0100
 @@ -53,6 +53,7 @@
  #include <asm/uaccess.h>
  
@@ -19055,7 +18823,7 @@ index 9ba7c820fc23..d85f638fd99e 100644
  
  #include "tick-internal.h"
  
-@@ -695,6 +696,29 @@ static void hrtimer_switch_to_hres(void)
+@@ -695,6 +696,29 @@
  	retrigger_next_event(NULL);
  }
  
@@ -19085,7 +18853,7 @@ index 9ba7c820fc23..d85f638fd99e 100644
  static void clock_was_set_work(struct work_struct *work)
  {
  	clock_was_set();
-@@ -710,6 +734,7 @@ void clock_was_set_delayed(void)
+@@ -710,6 +734,7 @@
  {
  	schedule_work(&hrtimer_work);
  }
@@ -19093,7 +18861,7 @@ index 9ba7c820fc23..d85f638fd99e 100644
  
  #else
  
-@@ -719,11 +744,8 @@ static inline int hrtimer_is_hres_enabled(void) { return 0; }
+@@ -719,11 +744,8 @@
  static inline void hrtimer_switch_to_hres(void) { }
  static inline void
  hrtimer_force_reprogram(struct hrtimer_cpu_base *base, int skip_equal) { }
@@ -19107,7 +18875,7 @@ index 9ba7c820fc23..d85f638fd99e 100644
  static inline void hrtimer_init_hres(struct hrtimer_cpu_base *base) { }
  static inline void retrigger_next_event(void *arg) { }
  
-@@ -855,6 +877,32 @@ u64 hrtimer_forward(struct hrtimer *timer, ktime_t now, ktime_t interval)
+@@ -855,6 +877,32 @@
  }
  EXPORT_SYMBOL_GPL(hrtimer_forward);
  
@@ -19140,7 +18908,7 @@ index 9ba7c820fc23..d85f638fd99e 100644
  /*
   * enqueue_hrtimer - internal function to (re)start a timer
   *
-@@ -896,6 +944,11 @@ static void __remove_hrtimer(struct hrtimer *timer,
+@@ -896,6 +944,11 @@
  	if (!(state & HRTIMER_STATE_ENQUEUED))
  		return;
  
@@ -19152,7 +18920,7 @@ index 9ba7c820fc23..d85f638fd99e 100644
  	if (!timerqueue_del(&base->active, &timer->node))
  		cpu_base->active_bases &= ~(1 << base->index);
  
-@@ -991,7 +1044,16 @@ void hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim,
+@@ -991,7 +1044,16 @@
  	new_base = switch_hrtimer_base(timer, base, mode & HRTIMER_MODE_PINNED);
  
  	timer_stats_hrtimer_set_start_info(timer);
@@ -19169,7 +18937,7 @@ index 9ba7c820fc23..d85f638fd99e 100644
  	leftmost = enqueue_hrtimer(timer, new_base);
  	if (!leftmost)
  		goto unlock;
-@@ -1063,7 +1125,7 @@ int hrtimer_cancel(struct hrtimer *timer)
+@@ -1063,7 +1125,7 @@
  
  		if (ret >= 0)
  			return ret;
@@ -19178,7 +18946,7 @@ index 9ba7c820fc23..d85f638fd99e 100644
  	}
  }
  EXPORT_SYMBOL_GPL(hrtimer_cancel);
-@@ -1127,6 +1189,7 @@ static void __hrtimer_init(struct hrtimer *timer, clockid_t clock_id,
+@@ -1127,6 +1189,7 @@
  
  	base = hrtimer_clockid_to_base(clock_id);
  	timer->base = &cpu_base->clock_base[base];
@@ -19186,7 +18954,7 @@ index 9ba7c820fc23..d85f638fd99e 100644
  	timerqueue_init(&timer->node);
  
  #ifdef CONFIG_TIMER_STATS
-@@ -1167,6 +1230,7 @@ bool hrtimer_active(const struct hrtimer *timer)
+@@ -1167,6 +1230,7 @@
  		seq = raw_read_seqcount_begin(&cpu_base->seq);
  
  		if (timer->state != HRTIMER_STATE_INACTIVE ||
@@ -19194,7 +18962,7 @@ index 9ba7c820fc23..d85f638fd99e 100644
  		    cpu_base->running == timer)
  			return true;
  
-@@ -1265,10 +1329,112 @@ static void __run_hrtimer(struct hrtimer_cpu_base *cpu_base,
+@@ -1265,10 +1329,112 @@
  	cpu_base->running = NULL;
  }
  
@@ -19307,7 +19075,7 @@ index 9ba7c820fc23..d85f638fd99e 100644
  
  	for (; active; base++, active >>= 1) {
  		struct timerqueue_node *node;
-@@ -1284,6 +1450,15 @@ static void __hrtimer_run_queues(struct hrtimer_cpu_base *cpu_base, ktime_t now)
+@@ -1284,6 +1450,15 @@
  
  			timer = container_of(node, struct hrtimer, node);
  
@@ -19323,7 +19091,7 @@ index 9ba7c820fc23..d85f638fd99e 100644
  			/*
  			 * The immediate goal for using the softexpires is
  			 * minimizing wakeups, not running timers at the
-@@ -1299,9 +1474,14 @@ static void __hrtimer_run_queues(struct hrtimer_cpu_base *cpu_base, ktime_t now)
+@@ -1299,9 +1474,14 @@
  			if (basenow.tv64 < hrtimer_get_softexpires_tv64(timer))
  				break;
  
@@ -19339,7 +19107,7 @@ index 9ba7c820fc23..d85f638fd99e 100644
  }
  
  #ifdef CONFIG_HIGH_RES_TIMERS
-@@ -1464,16 +1644,18 @@ static enum hrtimer_restart hrtimer_wakeup(struct hrtimer *timer)
+@@ -1464,16 +1644,18 @@
  void hrtimer_init_sleeper(struct hrtimer_sleeper *sl, struct task_struct *task)
  {
  	sl->timer.function = hrtimer_wakeup;
@@ -19360,7 +19128,7 @@ index 9ba7c820fc23..d85f638fd99e 100644
  		hrtimer_start_expires(&t->timer, mode);
  
  		if (likely(t->task))
-@@ -1515,7 +1697,8 @@ long __sched hrtimer_nanosleep_restart(struct restart_block *restart)
+@@ -1515,7 +1697,8 @@
  				HRTIMER_MODE_ABS);
  	hrtimer_set_expires_tv64(&t.timer, restart->nanosleep.expires);
  
@@ -19370,7 +19138,7 @@ index 9ba7c820fc23..d85f638fd99e 100644
  		goto out;
  
  	rmtp = restart->nanosleep.rmtp;
-@@ -1532,8 +1715,10 @@ long __sched hrtimer_nanosleep_restart(struct restart_block *restart)
+@@ -1532,8 +1715,10 @@
  	return ret;
  }
  
@@ -19383,7 +19151,7 @@ index 9ba7c820fc23..d85f638fd99e 100644
  {
  	struct restart_block *restart;
  	struct hrtimer_sleeper t;
-@@ -1546,7 +1731,7 @@ long hrtimer_nanosleep(struct timespec *rqtp, struct timespec __user *rmtp,
+@@ -1546,7 +1731,7 @@
  
  	hrtimer_init_on_stack(&t.timer, clockid, mode);
  	hrtimer_set_expires_range_ns(&t.timer, timespec_to_ktime(*rqtp), slack);
@@ -19392,7 +19160,7 @@ index 9ba7c820fc23..d85f638fd99e 100644
  		goto out;
  
  	/* Absolute timers do not update the rmtp value and restart: */
-@@ -1573,6 +1758,12 @@ long hrtimer_nanosleep(struct timespec *rqtp, struct timespec __user *rmtp,
+@@ -1573,6 +1758,12 @@
  	return ret;
  }
  
@@ -19405,7 +19173,7 @@ index 9ba7c820fc23..d85f638fd99e 100644
  SYSCALL_DEFINE2(nanosleep, struct timespec __user *, rqtp,
  		struct timespec __user *, rmtp)
  {
-@@ -1587,6 +1778,26 @@ SYSCALL_DEFINE2(nanosleep, struct timespec __user *, rqtp,
+@@ -1587,6 +1778,26 @@
  	return hrtimer_nanosleep(&tu, rmtp, HRTIMER_MODE_REL, CLOCK_MONOTONIC);
  }
  
@@ -19432,7 +19200,7 @@ index 9ba7c820fc23..d85f638fd99e 100644
  /*
   * Functions related to boot-time initialization:
   */
-@@ -1598,10 +1809,14 @@ int hrtimers_prepare_cpu(unsigned int cpu)
+@@ -1598,10 +1809,14 @@
  	for (i = 0; i < HRTIMER_MAX_CLOCK_BASES; i++) {
  		cpu_base->clock_base[i].cpu_base = cpu_base;
  		timerqueue_init_head(&cpu_base->clock_base[i].active);
@@ -19447,7 +19215,7 @@ index 9ba7c820fc23..d85f638fd99e 100644
  	return 0;
  }
  
-@@ -1671,9 +1886,26 @@ int hrtimers_dead_cpu(unsigned int scpu)
+@@ -1671,9 +1886,26 @@
  
  #endif /* CONFIG_HOTPLUG_CPU */
  
@@ -19474,11 +19242,10 @@ index 9ba7c820fc23..d85f638fd99e 100644
  }
  
  /**
-diff --git a/kernel/time/itimer.c b/kernel/time/itimer.c
-index 1d5c7204ddc9..184de6751180 100644
---- a/kernel/time/itimer.c
-+++ b/kernel/time/itimer.c
-@@ -213,6 +213,7 @@ int do_setitimer(int which, struct itimerval *value, struct itimerval *ovalue)
+diff -Nur linux-4.8.15.orig/kernel/time/itimer.c linux-4.8.15/kernel/time/itimer.c
+--- linux-4.8.15.orig/kernel/time/itimer.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/time/itimer.c	2017-01-01 17:07:16.047427991 +0100
+@@ -213,6 +213,7 @@
  		/* We are sharing ->siglock with it_real_fn() */
  		if (hrtimer_try_to_cancel(timer) < 0) {
  			spin_unlock_irq(&tsk->sighand->siglock);
@@ -19486,11 +19253,10 @@ index 1d5c7204ddc9..184de6751180 100644
  			goto again;
  		}
  		expires = timeval_to_ktime(value->it_value);
-diff --git a/kernel/time/jiffies.c b/kernel/time/jiffies.c
-index 555e21f7b966..a5d6435fabbb 100644
---- a/kernel/time/jiffies.c
-+++ b/kernel/time/jiffies.c
-@@ -74,7 +74,8 @@ static struct clocksource clocksource_jiffies = {
+diff -Nur linux-4.8.15.orig/kernel/time/jiffies.c linux-4.8.15/kernel/time/jiffies.c
+--- linux-4.8.15.orig/kernel/time/jiffies.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/time/jiffies.c	2017-01-01 17:07:16.047427991 +0100
+@@ -74,7 +74,8 @@
  	.max_cycles	= 10,
  };
  
@@ -19500,7 +19266,7 @@ index 555e21f7b966..a5d6435fabbb 100644
  
  #if (BITS_PER_LONG < 64)
  u64 get_jiffies_64(void)
-@@ -83,9 +84,9 @@ u64 get_jiffies_64(void)
+@@ -83,9 +84,9 @@
  	u64 ret;
  
  	do {
@@ -19512,10 +19278,9 @@ index 555e21f7b966..a5d6435fabbb 100644
  	return ret;
  }
  EXPORT_SYMBOL(get_jiffies_64);
-diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
-index 6df8927c58a5..05b7391bf9bd 100644
---- a/kernel/time/ntp.c
-+++ b/kernel/time/ntp.c
+diff -Nur linux-4.8.15.orig/kernel/time/ntp.c linux-4.8.15/kernel/time/ntp.c
+--- linux-4.8.15.orig/kernel/time/ntp.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/time/ntp.c	2017-01-01 17:07:16.047427991 +0100
 @@ -17,6 +17,7 @@
  #include <linux/module.h>
  #include <linux/rtc.h>
@@ -19524,7 +19289,7 @@ index 6df8927c58a5..05b7391bf9bd 100644
  
  #include "ntp_internal.h"
  #include "timekeeping_internal.h"
-@@ -568,10 +569,35 @@ static void sync_cmos_clock(struct work_struct *work)
+@@ -568,10 +569,35 @@
  			   &sync_cmos_work, timespec64_to_jiffies(&next));
  }
  
@@ -19560,10 +19325,9 @@ index 6df8927c58a5..05b7391bf9bd 100644
  
  #else
  void ntp_notify_cmos_timer(void) { }
-diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
-index 39008d78927a..633f4eaca9e7 100644
---- a/kernel/time/posix-cpu-timers.c
-+++ b/kernel/time/posix-cpu-timers.c
+diff -Nur linux-4.8.15.orig/kernel/time/posix-cpu-timers.c linux-4.8.15/kernel/time/posix-cpu-timers.c
+--- linux-4.8.15.orig/kernel/time/posix-cpu-timers.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/time/posix-cpu-timers.c	2017-01-01 17:07:16.047427991 +0100
 @@ -3,6 +3,7 @@
   */
  
@@ -19572,7 +19336,7 @@ index 39008d78927a..633f4eaca9e7 100644
  #include <linux/posix-timers.h>
  #include <linux/errno.h>
  #include <linux/math64.h>
-@@ -620,7 +621,7 @@ static int posix_cpu_timer_set(struct k_itimer *timer, int timer_flags,
+@@ -620,7 +621,7 @@
  	/*
  	 * Disarm any old timer after extracting its expiry time.
  	 */
@@ -19581,7 +19345,7 @@ index 39008d78927a..633f4eaca9e7 100644
  
  	ret = 0;
  	old_incr = timer->it.cpu.incr;
-@@ -1064,7 +1065,7 @@ void posix_cpu_timer_schedule(struct k_itimer *timer)
+@@ -1064,7 +1065,7 @@
  	/*
  	 * Now re-arm for the new expiry time.
  	 */
@@ -19590,7 +19354,7 @@ index 39008d78927a..633f4eaca9e7 100644
  	arm_timer(timer);
  	unlock_task_sighand(p, &flags);
  
-@@ -1153,13 +1154,13 @@ static inline int fastpath_timer_check(struct task_struct *tsk)
+@@ -1153,13 +1154,13 @@
   * already updated our counts.  We need to check if any timers fire now.
   * Interrupts are disabled.
   */
@@ -19606,7 +19370,7 @@ index 39008d78927a..633f4eaca9e7 100644
  
  	/*
  	 * The fast path checks that there are no expired thread or thread
-@@ -1213,6 +1214,190 @@ void run_posix_cpu_timers(struct task_struct *tsk)
+@@ -1213,6 +1214,190 @@
  	}
  }
  
@@ -19797,11 +19561,10 @@ index 39008d78927a..633f4eaca9e7 100644
  /*
   * Set one of the process-wide special case CPU timers or RLIMIT_CPU.
   * The tsk->sighand->siglock must be held by the caller.
-diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c
-index f2826c35e918..464a98155a0e 100644
---- a/kernel/time/posix-timers.c
-+++ b/kernel/time/posix-timers.c
-@@ -506,6 +506,7 @@ static enum hrtimer_restart posix_timer_fn(struct hrtimer *timer)
+diff -Nur linux-4.8.15.orig/kernel/time/posix-timers.c linux-4.8.15/kernel/time/posix-timers.c
+--- linux-4.8.15.orig/kernel/time/posix-timers.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/time/posix-timers.c	2017-01-01 17:07:16.047427991 +0100
+@@ -506,6 +506,7 @@
  static struct pid *good_sigevent(sigevent_t * event)
  {
  	struct task_struct *rtn = current->group_leader;
@@ -19809,7 +19572,7 @@ index f2826c35e918..464a98155a0e 100644
  
  	if ((event->sigev_notify & SIGEV_THREAD_ID ) &&
  		(!(rtn = find_task_by_vpid(event->sigev_notify_thread_id)) ||
-@@ -514,7 +515,8 @@ static struct pid *good_sigevent(sigevent_t * event)
+@@ -514,7 +515,8 @@
  		return NULL;
  
  	if (((event->sigev_notify & ~SIGEV_THREAD_ID) != SIGEV_NONE) &&
@@ -19819,7 +19582,7 @@ index f2826c35e918..464a98155a0e 100644
  		return NULL;
  
  	return task_pid(rtn);
-@@ -826,6 +828,20 @@ SYSCALL_DEFINE1(timer_getoverrun, timer_t, timer_id)
+@@ -826,6 +828,20 @@
  	return overrun;
  }
  
@@ -19840,7 +19603,7 @@ index f2826c35e918..464a98155a0e 100644
  /* Set a POSIX.1b interval timer. */
  /* timr->it_lock is taken. */
  static int
-@@ -903,6 +919,7 @@ SYSCALL_DEFINE4(timer_settime, timer_t, timer_id, int, flags,
+@@ -903,6 +919,7 @@
  	if (!timr)
  		return -EINVAL;
  
@@ -19848,7 +19611,7 @@ index f2826c35e918..464a98155a0e 100644
  	kc = clockid_to_kclock(timr->it_clock);
  	if (WARN_ON_ONCE(!kc || !kc->timer_set))
  		error = -EINVAL;
-@@ -911,9 +928,12 @@ SYSCALL_DEFINE4(timer_settime, timer_t, timer_id, int, flags,
+@@ -911,9 +928,12 @@
  
  	unlock_timer(timr, flag);
  	if (error == TIMER_RETRY) {
@@ -19861,7 +19624,7 @@ index f2826c35e918..464a98155a0e 100644
  
  	if (old_setting && !error &&
  	    copy_to_user(old_setting, &old_spec, sizeof (old_spec)))
-@@ -951,10 +971,15 @@ SYSCALL_DEFINE1(timer_delete, timer_t, timer_id)
+@@ -951,10 +971,15 @@
  	if (!timer)
  		return -EINVAL;
  
@@ -19877,42 +19640,39 @@ index f2826c35e918..464a98155a0e 100644
  
  	spin_lock(&current->sighand->siglock);
  	list_del(&timer->list);
-@@ -980,8 +1005,18 @@ static void itimer_delete(struct k_itimer *timer)
+@@ -980,8 +1005,18 @@
  retry_delete:
  	spin_lock_irqsave(&timer->it_lock, flags);
  
--	if (timer_delete_hook(timer) == TIMER_RETRY) {
 +	/* On RT we can race with a deletion */
 +	if (!timer->it_signal) {
- 		unlock_timer(timer, flags);
++		unlock_timer(timer, flags);
 +		return;
 +	}
 +
-+	if (timer_delete_hook(timer) == TIMER_RETRY) {
+ 	if (timer_delete_hook(timer) == TIMER_RETRY) {
 +		rcu_read_lock();
-+		unlock_timer(timer, flags);
+ 		unlock_timer(timer, flags);
 +		timer_wait_for_callback(clockid_to_kclock(timer->it_clock),
 +					timer);
 +		rcu_read_unlock();
  		goto retry_delete;
  	}
  	list_del(&timer->list);
-diff --git a/kernel/time/tick-broadcast-hrtimer.c b/kernel/time/tick-broadcast-hrtimer.c
-index 690b797f522e..fe8ba1619879 100644
---- a/kernel/time/tick-broadcast-hrtimer.c
-+++ b/kernel/time/tick-broadcast-hrtimer.c
-@@ -107,5 +107,6 @@ void tick_setup_hrtimer_broadcast(void)
+diff -Nur linux-4.8.15.orig/kernel/time/tick-broadcast-hrtimer.c linux-4.8.15/kernel/time/tick-broadcast-hrtimer.c
+--- linux-4.8.15.orig/kernel/time/tick-broadcast-hrtimer.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/time/tick-broadcast-hrtimer.c	2017-01-01 17:07:16.047427991 +0100
+@@ -107,5 +107,6 @@
  {
  	hrtimer_init(&bctimer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
  	bctimer.function = bc_handler;
 +	bctimer.irqsafe = true;
  	clockevents_register_device(&ce_broadcast_hrtimer);
  }
-diff --git a/kernel/time/tick-common.c b/kernel/time/tick-common.c
-index 4fcd99e12aa0..5a47f2e98faf 100644
---- a/kernel/time/tick-common.c
-+++ b/kernel/time/tick-common.c
-@@ -79,13 +79,15 @@ int tick_is_oneshot_available(void)
+diff -Nur linux-4.8.15.orig/kernel/time/tick-common.c linux-4.8.15/kernel/time/tick-common.c
+--- linux-4.8.15.orig/kernel/time/tick-common.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/time/tick-common.c	2017-01-01 17:07:16.047427991 +0100
+@@ -79,13 +79,15 @@
  static void tick_periodic(int cpu)
  {
  	if (tick_do_timer_cpu == cpu) {
@@ -19930,7 +19690,7 @@ index 4fcd99e12aa0..5a47f2e98faf 100644
  		update_wall_time();
  	}
  
-@@ -157,9 +159,9 @@ void tick_setup_periodic(struct clock_event_device *dev, int broadcast)
+@@ -157,9 +159,9 @@
  		ktime_t next;
  
  		do {
@@ -19942,11 +19702,10 @@ index 4fcd99e12aa0..5a47f2e98faf 100644
  
  		clockevents_switch_state(dev, CLOCK_EVT_STATE_ONESHOT);
  
-diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c
-index 2ec7c00228f3..c1b30b8c671a 100644
---- a/kernel/time/tick-sched.c
-+++ b/kernel/time/tick-sched.c
-@@ -62,7 +62,8 @@ static void tick_do_update_jiffies64(ktime_t now)
+diff -Nur linux-4.8.15.orig/kernel/time/tick-sched.c linux-4.8.15/kernel/time/tick-sched.c
+--- linux-4.8.15.orig/kernel/time/tick-sched.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/time/tick-sched.c	2017-01-01 17:07:16.047427991 +0100
+@@ -62,7 +62,8 @@
  		return;
  
  	/* Reevaluate with jiffies_lock held */
@@ -19956,7 +19715,7 @@ index 2ec7c00228f3..c1b30b8c671a 100644
  
  	delta = ktime_sub(now, last_jiffies_update);
  	if (delta.tv64 >= tick_period.tv64) {
-@@ -85,10 +86,12 @@ static void tick_do_update_jiffies64(ktime_t now)
+@@ -85,10 +86,12 @@
  		/* Keep the tick_next_period variable up to date */
  		tick_next_period = ktime_add(last_jiffies_update, tick_period);
  	} else {
@@ -19971,7 +19730,7 @@ index 2ec7c00228f3..c1b30b8c671a 100644
  	update_wall_time();
  }
  
-@@ -99,12 +102,14 @@ static ktime_t tick_init_jiffy_update(void)
+@@ -99,12 +102,14 @@
  {
  	ktime_t period;
  
@@ -19988,7 +19747,7 @@ index 2ec7c00228f3..c1b30b8c671a 100644
  	return period;
  }
  
-@@ -212,6 +217,7 @@ static void nohz_full_kick_func(struct irq_work *work)
+@@ -212,6 +217,7 @@
  
  static DEFINE_PER_CPU(struct irq_work, nohz_full_kick_work) = {
  	.func = nohz_full_kick_func,
@@ -19996,7 +19755,7 @@ index 2ec7c00228f3..c1b30b8c671a 100644
  };
  
  /*
-@@ -670,10 +676,10 @@ static ktime_t tick_nohz_stop_sched_tick(struct tick_sched *ts,
+@@ -670,10 +676,10 @@
  
  	/* Read jiffies and the time when jiffies were updated last */
  	do {
@@ -20009,7 +19768,7 @@ index 2ec7c00228f3..c1b30b8c671a 100644
  	ts->last_jiffies = basejiff;
  
  	if (rcu_needs_cpu(basemono, &next_rcu) ||
-@@ -874,14 +880,7 @@ static bool can_stop_idle_tick(int cpu, struct tick_sched *ts)
+@@ -874,14 +880,7 @@
  		return false;
  
  	if (unlikely(local_softirq_pending() && cpu_online(cpu))) {
@@ -20025,7 +19784,7 @@ index 2ec7c00228f3..c1b30b8c671a 100644
  		return false;
  	}
  
-@@ -1190,6 +1189,7 @@ void tick_setup_sched_timer(void)
+@@ -1190,6 +1189,7 @@
  	 * Emulate tick processing via per-CPU hrtimers:
  	 */
  	hrtimer_init(&ts->sched_timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
@@ -20033,11 +19792,10 @@ index 2ec7c00228f3..c1b30b8c671a 100644
  	ts->sched_timer.function = tick_sched_timer;
  
  	/* Get the next period (per-CPU) */
-diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
-index 37dec7e3db43..fa8d90d2acc3 100644
---- a/kernel/time/timekeeping.c
-+++ b/kernel/time/timekeeping.c
-@@ -2328,8 +2328,10 @@ EXPORT_SYMBOL(hardpps);
+diff -Nur linux-4.8.15.orig/kernel/time/timekeeping.c linux-4.8.15/kernel/time/timekeeping.c
+--- linux-4.8.15.orig/kernel/time/timekeeping.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/time/timekeeping.c	2017-01-01 17:07:16.051428246 +0100
+@@ -2328,8 +2328,10 @@
   */
  void xtime_update(unsigned long ticks)
  {
@@ -20050,11 +19808,10 @@ index 37dec7e3db43..fa8d90d2acc3 100644
 +	raw_spin_unlock(&jiffies_lock);
  	update_wall_time();
  }
-diff --git a/kernel/time/timekeeping.h b/kernel/time/timekeeping.h
-index 704f595ce83f..763a3e5121ff 100644
---- a/kernel/time/timekeeping.h
-+++ b/kernel/time/timekeeping.h
-@@ -19,7 +19,8 @@ extern void timekeeping_resume(void);
+diff -Nur linux-4.8.15.orig/kernel/time/timekeeping.h linux-4.8.15/kernel/time/timekeeping.h
+--- linux-4.8.15.orig/kernel/time/timekeeping.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/time/timekeeping.h	2017-01-01 17:07:16.051428246 +0100
+@@ -19,7 +19,8 @@
  extern void do_timer(unsigned long ticks);
  extern void update_wall_time(void);
  
@@ -20064,11 +19821,10 @@ index 704f595ce83f..763a3e5121ff 100644
  
  #define CS_NAME_LEN	32
  
-diff --git a/kernel/time/timer.c b/kernel/time/timer.c
-index 32bf6f75a8fe..ba53447a03f5 100644
---- a/kernel/time/timer.c
-+++ b/kernel/time/timer.c
-@@ -193,8 +193,11 @@ EXPORT_SYMBOL(jiffies_64);
+diff -Nur linux-4.8.15.orig/kernel/time/timer.c linux-4.8.15/kernel/time/timer.c
+--- linux-4.8.15.orig/kernel/time/timer.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/time/timer.c	2017-01-01 17:07:16.051428246 +0100
+@@ -193,8 +193,11 @@
  #endif
  
  struct timer_base {
@@ -20081,7 +19837,7 @@ index 32bf6f75a8fe..ba53447a03f5 100644
  	unsigned long		clk;
  	unsigned long		next_expiry;
  	unsigned int		cpu;
-@@ -947,10 +950,10 @@ static struct timer_base *lock_timer_base(struct timer_list *timer,
+@@ -948,10 +951,10 @@
  
  		if (!(tf & TIMER_MIGRATING)) {
  			base = get_timer_base(tf);
@@ -20094,7 +19850,7 @@ index 32bf6f75a8fe..ba53447a03f5 100644
  		}
  		cpu_relax();
  	}
-@@ -1017,9 +1020,9 @@ __mod_timer(struct timer_list *timer, unsigned long expires, bool pending_only)
+@@ -1023,9 +1026,9 @@
  			/* See the comment in lock_timer_base() */
  			timer->flags |= TIMER_MIGRATING;
  
@@ -20106,7 +19862,7 @@ index 32bf6f75a8fe..ba53447a03f5 100644
  			WRITE_ONCE(timer->flags,
  				   (timer->flags & ~TIMER_BASEMASK) | base->cpu);
  		}
-@@ -1040,7 +1043,7 @@ __mod_timer(struct timer_list *timer, unsigned long expires, bool pending_only)
+@@ -1050,7 +1053,7 @@
  	}
  
  out_unlock:
@@ -20115,7 +19871,7 @@ index 32bf6f75a8fe..ba53447a03f5 100644
  
  	return ret;
  }
-@@ -1134,19 +1137,46 @@ void add_timer_on(struct timer_list *timer, int cpu)
+@@ -1144,19 +1147,46 @@
  	if (base != new_base) {
  		timer->flags |= TIMER_MIGRATING;
  
@@ -20165,7 +19921,7 @@ index 32bf6f75a8fe..ba53447a03f5 100644
  /**
   * del_timer - deactive a timer.
   * @timer: the timer to be deactivated
-@@ -1170,7 +1200,7 @@ int del_timer(struct timer_list *timer)
+@@ -1180,7 +1210,7 @@
  	if (timer_pending(timer)) {
  		base = lock_timer_base(timer, &flags);
  		ret = detach_if_pending(timer, base, true);
@@ -20174,7 +19930,7 @@ index 32bf6f75a8fe..ba53447a03f5 100644
  	}
  
  	return ret;
-@@ -1198,13 +1228,13 @@ int try_to_del_timer_sync(struct timer_list *timer)
+@@ -1208,13 +1238,13 @@
  		timer_stats_timer_clear_start_info(timer);
  		ret = detach_if_pending(timer, base, true);
  	}
@@ -20190,7 +19946,7 @@ index 32bf6f75a8fe..ba53447a03f5 100644
  /**
   * del_timer_sync - deactivate a timer and wait for the handler to finish.
   * @timer: the timer to be deactivated
-@@ -1264,7 +1294,7 @@ int del_timer_sync(struct timer_list *timer)
+@@ -1274,7 +1304,7 @@
  		int ret = try_to_del_timer_sync(timer);
  		if (ret >= 0)
  			return ret;
@@ -20199,7 +19955,7 @@ index 32bf6f75a8fe..ba53447a03f5 100644
  	}
  }
  EXPORT_SYMBOL(del_timer_sync);
-@@ -1329,14 +1359,17 @@ static void expire_timers(struct timer_base *base, struct hlist_head *head)
+@@ -1339,14 +1369,17 @@
  		fn = timer->function;
  		data = timer->data;
  
@@ -20222,7 +19978,7 @@ index 32bf6f75a8fe..ba53447a03f5 100644
  		}
  	}
  }
-@@ -1505,7 +1538,7 @@ u64 get_next_timer_interrupt(unsigned long basej, u64 basem)
+@@ -1515,7 +1548,7 @@
  	if (cpu_is_offline(smp_processor_id()))
  		return expires;
  
@@ -20231,7 +19987,7 @@ index 32bf6f75a8fe..ba53447a03f5 100644
  	nextevt = __next_timer_interrupt(base);
  	is_max_delta = (nextevt == base->clk + NEXT_TIMER_MAX_DELTA);
  	base->next_expiry = nextevt;
-@@ -1529,7 +1562,7 @@ u64 get_next_timer_interrupt(unsigned long basej, u64 basem)
+@@ -1543,7 +1576,7 @@
  		if ((expires - basem) > TICK_NSEC)
  			base->is_idle = true;
  	}
@@ -20240,7 +19996,7 @@ index 32bf6f75a8fe..ba53447a03f5 100644
  
  	return cmp_next_hrtimer_event(basem, expires);
  }
-@@ -1594,13 +1627,13 @@ void update_process_times(int user_tick)
+@@ -1608,13 +1641,13 @@
  
  	/* Note: this timer irq context must be accounted for as well. */
  	account_process_tick(p, user_tick);
@@ -20256,7 +20012,7 @@ index 32bf6f75a8fe..ba53447a03f5 100644
  	run_posix_cpu_timers(p);
  }
  
-@@ -1616,7 +1649,7 @@ static inline void __run_timers(struct timer_base *base)
+@@ -1630,7 +1663,7 @@
  	if (!time_after_eq(jiffies, base->clk))
  		return;
  
@@ -20265,7 +20021,7 @@ index 32bf6f75a8fe..ba53447a03f5 100644
  
  	while (time_after_eq(jiffies, base->clk)) {
  
-@@ -1626,8 +1659,8 @@ static inline void __run_timers(struct timer_base *base)
+@@ -1640,8 +1673,8 @@
  		while (levels--)
  			expire_timers(base, heads + levels);
  	}
@@ -20276,7 +20032,7 @@ index 32bf6f75a8fe..ba53447a03f5 100644
  }
  
  /*
-@@ -1637,6 +1670,8 @@ static void run_timer_softirq(struct softirq_action *h)
+@@ -1651,6 +1684,8 @@
  {
  	struct timer_base *base = this_cpu_ptr(&timer_bases[BASE_STD]);
  
@@ -20285,7 +20041,7 @@ index 32bf6f75a8fe..ba53447a03f5 100644
  	__run_timers(base);
  	if (IS_ENABLED(CONFIG_NO_HZ_COMMON) && base->nohz_active)
  		__run_timers(this_cpu_ptr(&timer_bases[BASE_DEF]));
-@@ -1822,16 +1857,16 @@ int timers_dead_cpu(unsigned int cpu)
+@@ -1836,16 +1871,16 @@
  		 * The caller is globally serialized and nobody else
  		 * takes two locks at once, deadlock is not possible.
  		 */
@@ -20306,7 +20062,7 @@ index 32bf6f75a8fe..ba53447a03f5 100644
  		put_cpu_ptr(&timer_bases);
  	}
  	return 0;
-@@ -1847,8 +1882,11 @@ static void __init init_timer_cpu(int cpu)
+@@ -1861,8 +1896,11 @@
  	for (i = 0; i < NR_BASES; i++) {
  		base = per_cpu_ptr(&timer_bases[i], cpu);
  		base->cpu = cpu;
@@ -20319,11 +20075,10 @@ index 32bf6f75a8fe..ba53447a03f5 100644
  	}
  }
  
-diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
-index f4b86e8ca1e7..340f14eef24a 100644
---- a/kernel/trace/Kconfig
-+++ b/kernel/trace/Kconfig
-@@ -187,6 +187,24 @@ config IRQSOFF_TRACER
+diff -Nur linux-4.8.15.orig/kernel/trace/Kconfig linux-4.8.15/kernel/trace/Kconfig
+--- linux-4.8.15.orig/kernel/trace/Kconfig	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/trace/Kconfig	2017-01-01 17:07:16.051428246 +0100
+@@ -187,6 +187,24 @@
  	  enabled. This option and the preempt-off timing option can be
  	  used together or separately.)
  
@@ -20348,7 +20103,7 @@ index f4b86e8ca1e7..340f14eef24a 100644
  config PREEMPT_TRACER
  	bool "Preemption-off Latency Tracer"
  	default n
-@@ -197,6 +215,7 @@ config PREEMPT_TRACER
+@@ -197,6 +215,7 @@
  	select RING_BUFFER_ALLOW_SWAP
  	select TRACER_SNAPSHOT
  	select TRACER_SNAPSHOT_PER_CPU_SWAP
@@ -20356,7 +20111,7 @@ index f4b86e8ca1e7..340f14eef24a 100644
  	help
  	  This option measures the time spent in preemption-off critical
  	  sections, with microsecond accuracy.
-@@ -211,6 +230,24 @@ config PREEMPT_TRACER
+@@ -211,6 +230,24 @@
  	  enabled. This option and the irqs-off timing option can be
  	  used together or separately.)
  
@@ -20381,7 +20136,7 @@ index f4b86e8ca1e7..340f14eef24a 100644
  config SCHED_TRACER
  	bool "Scheduling Latency Tracer"
  	select GENERIC_TRACER
-@@ -221,6 +258,74 @@ config SCHED_TRACER
+@@ -221,6 +258,74 @@
  	  This tracer tracks the latency of the highest priority task
  	  to be scheduled in, starting from the point it has woken up.
  
@@ -20456,26 +20211,9 @@ index f4b86e8ca1e7..340f14eef24a 100644
  config ENABLE_DEFAULT_TRACERS
  	bool "Trace process context switches and events"
  	depends on !GENERIC_TRACER
-diff --git a/kernel/trace/Makefile b/kernel/trace/Makefile
-index d0a1617b52b4..6bf9e9ff1fa5 100644
---- a/kernel/trace/Makefile
-+++ b/kernel/trace/Makefile
-@@ -41,6 +41,10 @@ obj-$(CONFIG_FUNCTION_TRACER) += trace_functions.o
- obj-$(CONFIG_IRQSOFF_TRACER) += trace_irqsoff.o
- obj-$(CONFIG_PREEMPT_TRACER) += trace_irqsoff.o
- obj-$(CONFIG_SCHED_TRACER) += trace_sched_wakeup.o
-+obj-$(CONFIG_INTERRUPT_OFF_HIST) += latency_hist.o
-+obj-$(CONFIG_PREEMPT_OFF_HIST) += latency_hist.o
-+obj-$(CONFIG_WAKEUP_LATENCY_HIST) += latency_hist.o
-+obj-$(CONFIG_MISSED_TIMER_OFFSETS_HIST) += latency_hist.o
- obj-$(CONFIG_NOP_TRACER) += trace_nop.o
- obj-$(CONFIG_STACK_TRACER) += trace_stack.o
- obj-$(CONFIG_MMIOTRACE) += trace_mmiotrace.o
-diff --git a/kernel/trace/latency_hist.c b/kernel/trace/latency_hist.c
-new file mode 100644
-index 000000000000..7f6ee70dea41
---- /dev/null
-+++ b/kernel/trace/latency_hist.c
+diff -Nur linux-4.8.15.orig/kernel/trace/latency_hist.c linux-4.8.15/kernel/trace/latency_hist.c
+--- linux-4.8.15.orig/kernel/trace/latency_hist.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-4.8.15/kernel/trace/latency_hist.c	2017-01-01 17:07:16.051428246 +0100
 @@ -0,0 +1,1178 @@
 +/*
 + * kernel/trace/latency_hist.c
@@ -21655,11 +21393,24 @@ index 000000000000..7f6ee70dea41
 +}
 +
 +device_initcall(latency_hist_init);
-diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
-index 7bc56762ca35..84ffcb813263 100644
---- a/kernel/trace/trace.c
-+++ b/kernel/trace/trace.c
-@@ -1897,6 +1897,7 @@ tracing_generic_entry_update(struct trace_entry *entry, unsigned long flags,
+diff -Nur linux-4.8.15.orig/kernel/trace/Makefile linux-4.8.15/kernel/trace/Makefile
+--- linux-4.8.15.orig/kernel/trace/Makefile	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/trace/Makefile	2017-01-01 17:07:16.051428246 +0100
+@@ -37,6 +37,10 @@
+ obj-$(CONFIG_IRQSOFF_TRACER) += trace_irqsoff.o
+ obj-$(CONFIG_PREEMPT_TRACER) += trace_irqsoff.o
+ obj-$(CONFIG_SCHED_TRACER) += trace_sched_wakeup.o
++obj-$(CONFIG_INTERRUPT_OFF_HIST) += latency_hist.o
++obj-$(CONFIG_PREEMPT_OFF_HIST) += latency_hist.o
++obj-$(CONFIG_WAKEUP_LATENCY_HIST) += latency_hist.o
++obj-$(CONFIG_MISSED_TIMER_OFFSETS_HIST) += latency_hist.o
+ obj-$(CONFIG_NOP_TRACER) += trace_nop.o
+ obj-$(CONFIG_STACK_TRACER) += trace_stack.o
+ obj-$(CONFIG_MMIOTRACE) += trace_mmiotrace.o
+diff -Nur linux-4.8.15.orig/kernel/trace/trace.c linux-4.8.15/kernel/trace/trace.c
+--- linux-4.8.15.orig/kernel/trace/trace.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/trace/trace.c	2017-01-01 17:07:16.055428503 +0100
+@@ -1897,6 +1897,7 @@
  	struct task_struct *tsk = current;
  
  	entry->preempt_count		= pc & 0xff;
@@ -21667,7 +21418,7 @@ index 7bc56762ca35..84ffcb813263 100644
  	entry->pid			= (tsk) ? tsk->pid : 0;
  	entry->flags =
  #ifdef CONFIG_TRACE_IRQFLAGS_SUPPORT
-@@ -1907,8 +1908,11 @@ tracing_generic_entry_update(struct trace_entry *entry, unsigned long flags,
+@@ -1907,8 +1908,11 @@
  		((pc & NMI_MASK    ) ? TRACE_FLAG_NMI     : 0) |
  		((pc & HARDIRQ_MASK) ? TRACE_FLAG_HARDIRQ : 0) |
  		((pc & SOFTIRQ_MASK) ? TRACE_FLAG_SOFTIRQ : 0) |
@@ -21680,7 +21431,7 @@ index 7bc56762ca35..84ffcb813263 100644
  }
  EXPORT_SYMBOL_GPL(tracing_generic_entry_update);
  
-@@ -2892,14 +2896,17 @@ get_total_entries(struct trace_buffer *buf,
+@@ -2892,14 +2896,17 @@
  
  static void print_lat_help_header(struct seq_file *m)
  {
@@ -21706,7 +21457,7 @@ index 7bc56762ca35..84ffcb813263 100644
  }
  
  static void print_event_info(struct trace_buffer *buf, struct seq_file *m)
-@@ -2925,11 +2932,14 @@ static void print_func_help_header_irq(struct trace_buffer *buf, struct seq_file
+@@ -2925,11 +2932,14 @@
  	print_event_info(buf, m);
  	seq_puts(m, "#                              _-----=> irqs-off\n"
  		    "#                             / _----=> need-resched\n"
@@ -21726,11 +21477,22 @@ index 7bc56762ca35..84ffcb813263 100644
  }
  
  void
-diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
-index f783df416726..6f2d0fa4fbf1 100644
---- a/kernel/trace/trace.h
-+++ b/kernel/trace/trace.h
-@@ -123,6 +123,7 @@ struct kretprobe_trace_entry_head {
+diff -Nur linux-4.8.15.orig/kernel/trace/trace_events.c linux-4.8.15/kernel/trace/trace_events.c
+--- linux-4.8.15.orig/kernel/trace/trace_events.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/trace/trace_events.c	2017-01-01 17:07:16.059428767 +0100
+@@ -187,6 +187,8 @@
+ 	__common_field(unsigned char, flags);
+ 	__common_field(unsigned char, preempt_count);
+ 	__common_field(int, pid);
++	__common_field(unsigned short, migrate_disable);
++	__common_field(unsigned short, padding);
+ 
+ 	return ret;
+ }
+diff -Nur linux-4.8.15.orig/kernel/trace/trace.h linux-4.8.15/kernel/trace/trace.h
+--- linux-4.8.15.orig/kernel/trace/trace.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/trace/trace.h	2017-01-01 17:07:16.055428503 +0100
+@@ -123,6 +123,7 @@
   *  NEED_RESCHED	- reschedule is requested
   *  HARDIRQ		- inside an interrupt handler
   *  SOFTIRQ		- inside a softirq handler
@@ -21738,7 +21500,7 @@ index f783df416726..6f2d0fa4fbf1 100644
   */
  enum trace_flag_type {
  	TRACE_FLAG_IRQS_OFF		= 0x01,
-@@ -132,6 +133,7 @@ enum trace_flag_type {
+@@ -132,6 +133,7 @@
  	TRACE_FLAG_SOFTIRQ		= 0x10,
  	TRACE_FLAG_PREEMPT_RESCHED	= 0x20,
  	TRACE_FLAG_NMI			= 0x40,
@@ -21746,23 +21508,9 @@ index f783df416726..6f2d0fa4fbf1 100644
  };
  
  #define TRACE_BUF_SIZE		1024
-diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
-index 03c0a48c3ac4..0b85d516b491 100644
---- a/kernel/trace/trace_events.c
-+++ b/kernel/trace/trace_events.c
-@@ -187,6 +187,8 @@ static int trace_define_common_fields(void)
- 	__common_field(unsigned char, flags);
- 	__common_field(unsigned char, preempt_count);
- 	__common_field(int, pid);
-+	__common_field(unsigned short, migrate_disable);
-+	__common_field(unsigned short, padding);
- 
- 	return ret;
- }
-diff --git a/kernel/trace/trace_irqsoff.c b/kernel/trace/trace_irqsoff.c
-index 03cdff84d026..940bd10b4406 100644
---- a/kernel/trace/trace_irqsoff.c
-+++ b/kernel/trace/trace_irqsoff.c
+diff -Nur linux-4.8.15.orig/kernel/trace/trace_irqsoff.c linux-4.8.15/kernel/trace/trace_irqsoff.c
+--- linux-4.8.15.orig/kernel/trace/trace_irqsoff.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/trace/trace_irqsoff.c	2017-01-01 17:07:16.059428767 +0100
 @@ -13,6 +13,7 @@
  #include <linux/uaccess.h>
  #include <linux/module.h>
@@ -21771,7 +21519,7 @@ index 03cdff84d026..940bd10b4406 100644
  
  #include "trace.h"
  
-@@ -424,11 +425,13 @@ void start_critical_timings(void)
+@@ -424,11 +425,13 @@
  {
  	if (preempt_trace() || irq_trace())
  		start_critical_timing(CALLER_ADDR0, CALLER_ADDR1);
@@ -21785,7 +21533,7 @@ index 03cdff84d026..940bd10b4406 100644
  	if (preempt_trace() || irq_trace())
  		stop_critical_timing(CALLER_ADDR0, CALLER_ADDR1);
  }
-@@ -438,6 +441,7 @@ EXPORT_SYMBOL_GPL(stop_critical_timings);
+@@ -438,6 +441,7 @@
  #ifdef CONFIG_PROVE_LOCKING
  void time_hardirqs_on(unsigned long a0, unsigned long a1)
  {
@@ -21793,7 +21541,7 @@ index 03cdff84d026..940bd10b4406 100644
  	if (!preempt_trace() && irq_trace())
  		stop_critical_timing(a0, a1);
  }
-@@ -446,6 +450,7 @@ void time_hardirqs_off(unsigned long a0, unsigned long a1)
+@@ -446,6 +450,7 @@
  {
  	if (!preempt_trace() && irq_trace())
  		start_critical_timing(a0, a1);
@@ -21801,7 +21549,7 @@ index 03cdff84d026..940bd10b4406 100644
  }
  
  #else /* !CONFIG_PROVE_LOCKING */
-@@ -471,6 +476,7 @@ inline void print_irqtrace_events(struct task_struct *curr)
+@@ -471,6 +476,7 @@
   */
  void trace_hardirqs_on(void)
  {
@@ -21809,7 +21557,7 @@ index 03cdff84d026..940bd10b4406 100644
  	if (!preempt_trace() && irq_trace())
  		stop_critical_timing(CALLER_ADDR0, CALLER_ADDR1);
  }
-@@ -480,11 +486,13 @@ void trace_hardirqs_off(void)
+@@ -480,11 +486,13 @@
  {
  	if (!preempt_trace() && irq_trace())
  		start_critical_timing(CALLER_ADDR0, CALLER_ADDR1);
@@ -21823,7 +21571,7 @@ index 03cdff84d026..940bd10b4406 100644
  	if (!preempt_trace() && irq_trace())
  		stop_critical_timing(CALLER_ADDR0, caller_addr);
  }
-@@ -494,6 +502,7 @@ __visible void trace_hardirqs_off_caller(unsigned long caller_addr)
+@@ -494,6 +502,7 @@
  {
  	if (!preempt_trace() && irq_trace())
  		start_critical_timing(CALLER_ADDR0, caller_addr);
@@ -21831,7 +21579,7 @@ index 03cdff84d026..940bd10b4406 100644
  }
  EXPORT_SYMBOL(trace_hardirqs_off_caller);
  
-@@ -503,12 +512,14 @@ EXPORT_SYMBOL(trace_hardirqs_off_caller);
+@@ -503,12 +512,14 @@
  #ifdef CONFIG_PREEMPT_TRACER
  void trace_preempt_on(unsigned long a0, unsigned long a1)
  {
@@ -21846,11 +21594,10 @@ index 03cdff84d026..940bd10b4406 100644
  	if (preempt_trace() && !irq_trace())
  		start_critical_timing(a0, a1);
  }
-diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
-index 0bb9cf2d53e6..455a7464772f 100644
---- a/kernel/trace/trace_output.c
-+++ b/kernel/trace/trace_output.c
-@@ -386,6 +386,7 @@ int trace_print_lat_fmt(struct trace_seq *s, struct trace_entry *entry)
+diff -Nur linux-4.8.15.orig/kernel/trace/trace_output.c linux-4.8.15/kernel/trace/trace_output.c
+--- linux-4.8.15.orig/kernel/trace/trace_output.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/trace/trace_output.c	2017-01-01 17:07:16.059428767 +0100
+@@ -386,6 +386,7 @@
  {
  	char hardsoft_irq;
  	char need_resched;
@@ -21858,7 +21605,7 @@ index 0bb9cf2d53e6..455a7464772f 100644
  	char irqs_off;
  	int hardirq;
  	int softirq;
-@@ -416,6 +417,9 @@ int trace_print_lat_fmt(struct trace_seq *s, struct trace_entry *entry)
+@@ -416,6 +417,9 @@
  		break;
  	}
  
@@ -21868,7 +21615,7 @@ index 0bb9cf2d53e6..455a7464772f 100644
  	hardsoft_irq =
  		(nmi && hardirq)     ? 'Z' :
  		nmi                  ? 'z' :
-@@ -424,14 +428,25 @@ int trace_print_lat_fmt(struct trace_seq *s, struct trace_entry *entry)
+@@ -424,14 +428,25 @@
  		softirq              ? 's' :
  		                       '.' ;
  
@@ -21896,11 +21643,10 @@ index 0bb9cf2d53e6..455a7464772f 100644
  	return !trace_seq_has_overflowed(s);
  }
  
-diff --git a/kernel/user.c b/kernel/user.c
-index b069ccbfb0b0..1a2e88e98b5e 100644
---- a/kernel/user.c
-+++ b/kernel/user.c
-@@ -161,11 +161,11 @@ void free_uid(struct user_struct *up)
+diff -Nur linux-4.8.15.orig/kernel/user.c linux-4.8.15/kernel/user.c
+--- linux-4.8.15.orig/kernel/user.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/user.c	2017-01-01 17:07:16.059428767 +0100
+@@ -161,11 +161,11 @@
  	if (!up)
  		return;
  
@@ -21914,11 +21660,10 @@ index b069ccbfb0b0..1a2e88e98b5e 100644
  }
  
  struct user_struct *alloc_uid(kuid_t uid)
-diff --git a/kernel/watchdog.c b/kernel/watchdog.c
-index 9acb29f280ec..caba62080411 100644
---- a/kernel/watchdog.c
-+++ b/kernel/watchdog.c
-@@ -315,6 +315,8 @@ static int is_softlockup(unsigned long touch_ts)
+diff -Nur linux-4.8.15.orig/kernel/watchdog.c linux-4.8.15/kernel/watchdog.c
+--- linux-4.8.15.orig/kernel/watchdog.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/watchdog.c	2017-01-01 17:07:16.059428767 +0100
+@@ -315,6 +315,8 @@
  
  #ifdef CONFIG_HARDLOCKUP_DETECTOR
  
@@ -21927,7 +21672,7 @@ index 9acb29f280ec..caba62080411 100644
  static struct perf_event_attr wd_hw_attr = {
  	.type		= PERF_TYPE_HARDWARE,
  	.config		= PERF_COUNT_HW_CPU_CYCLES,
-@@ -349,6 +351,13 @@ static void watchdog_overflow_callback(struct perf_event *event,
+@@ -349,6 +351,13 @@
  		/* only print hardlockups once */
  		if (__this_cpu_read(hard_watchdog_warn) == true)
  			return;
@@ -21941,7 +21686,7 @@ index 9acb29f280ec..caba62080411 100644
  
  		pr_emerg("Watchdog detected hard LOCKUP on cpu %d", this_cpu);
  		print_modules();
-@@ -366,6 +375,7 @@ static void watchdog_overflow_callback(struct perf_event *event,
+@@ -366,6 +375,7 @@
  				!test_and_set_bit(0, &hardlockup_allcpu_dumped))
  			trigger_allbutself_cpu_backtrace();
  
@@ -21949,7 +21694,7 @@ index 9acb29f280ec..caba62080411 100644
  		if (hardlockup_panic)
  			nmi_panic(regs, "Hard LOCKUP");
  
-@@ -513,6 +523,7 @@ static void watchdog_enable(unsigned int cpu)
+@@ -513,6 +523,7 @@
  	/* kick off the timer for the hardlockup detector */
  	hrtimer_init(hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
  	hrtimer->function = watchdog_timer_fn;
@@ -21957,10 +21702,9 @@ index 9acb29f280ec..caba62080411 100644
  
  	/* Enable the perf event */
  	watchdog_nmi_enable(cpu);
-diff --git a/kernel/workqueue.c b/kernel/workqueue.c
-index ef071ca73fc3..c7a62d6adb00 100644
---- a/kernel/workqueue.c
-+++ b/kernel/workqueue.c
+diff -Nur linux-4.8.15.orig/kernel/workqueue.c linux-4.8.15/kernel/workqueue.c
+--- linux-4.8.15.orig/kernel/workqueue.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/workqueue.c	2017-01-01 17:07:16.063429015 +0100
 @@ -48,6 +48,8 @@
  #include <linux/nodemask.h>
  #include <linux/moduleparam.h>
@@ -21970,7 +21714,7 @@ index ef071ca73fc3..c7a62d6adb00 100644
  
  #include "workqueue_internal.h"
  
-@@ -121,11 +123,16 @@ enum {
+@@ -121,11 +123,16 @@
   *    cpu or grabbing pool->lock is enough for read access.  If
   *    POOL_DISASSOCIATED is set, it's identical to L.
   *
@@ -21988,7 +21732,7 @@ index ef071ca73fc3..c7a62d6adb00 100644
   *
   * PW: wq_pool_mutex and wq->mutex protected for writes.  Either for reads.
   *
-@@ -134,7 +141,7 @@ enum {
+@@ -134,7 +141,7 @@
   *
   * WQ: wq->mutex protected.
   *
@@ -21997,7 +21741,7 @@ index ef071ca73fc3..c7a62d6adb00 100644
   *
   * MD: wq_mayday_lock protected.
   */
-@@ -185,7 +192,7 @@ struct worker_pool {
+@@ -185,7 +192,7 @@
  	atomic_t		nr_running ____cacheline_aligned_in_smp;
  
  	/*
@@ -22006,7 +21750,7 @@ index ef071ca73fc3..c7a62d6adb00 100644
  	 * from get_work_pool().
  	 */
  	struct rcu_head		rcu;
-@@ -214,7 +221,7 @@ struct pool_workqueue {
+@@ -214,7 +221,7 @@
  	/*
  	 * Release of unbound pwq is punted to system_wq.  See put_pwq()
  	 * and pwq_unbound_release_workfn() for details.  pool_workqueue
@@ -22015,7 +21759,7 @@ index ef071ca73fc3..c7a62d6adb00 100644
  	 * determined without grabbing wq->mutex.
  	 */
  	struct work_struct	unbound_release_work;
-@@ -348,6 +355,8 @@ EXPORT_SYMBOL_GPL(system_power_efficient_wq);
+@@ -348,6 +355,8 @@
  struct workqueue_struct *system_freezable_power_efficient_wq __read_mostly;
  EXPORT_SYMBOL_GPL(system_freezable_power_efficient_wq);
  
@@ -22024,7 +21768,7 @@ index ef071ca73fc3..c7a62d6adb00 100644
  static int worker_thread(void *__worker);
  static void workqueue_sysfs_unregister(struct workqueue_struct *wq);
  
-@@ -355,20 +364,20 @@ static void workqueue_sysfs_unregister(struct workqueue_struct *wq);
+@@ -355,20 +364,20 @@
  #include <trace/events/workqueue.h>
  
  #define assert_rcu_or_pool_mutex()					\
@@ -22051,7 +21795,7 @@ index ef071ca73fc3..c7a62d6adb00 100644
  
  #define for_each_cpu_worker_pool(pool, cpu)				\
  	for ((pool) = &per_cpu(cpu_worker_pools, cpu)[0];		\
-@@ -380,7 +389,7 @@ static void workqueue_sysfs_unregister(struct workqueue_struct *wq);
+@@ -380,7 +389,7 @@
   * @pool: iteration cursor
   * @pi: integer used for iteration
   *
@@ -22060,7 +21804,7 @@ index ef071ca73fc3..c7a62d6adb00 100644
   * locked.  If the pool needs to be used beyond the locking in effect, the
   * caller is responsible for guaranteeing that the pool stays online.
   *
-@@ -412,7 +421,7 @@ static void workqueue_sysfs_unregister(struct workqueue_struct *wq);
+@@ -412,7 +421,7 @@
   * @pwq: iteration cursor
   * @wq: the target workqueue
   *
@@ -22069,7 +21813,7 @@ index ef071ca73fc3..c7a62d6adb00 100644
   * If the pwq needs to be used beyond the locking in effect, the caller is
   * responsible for guaranteeing that the pwq stays online.
   *
-@@ -424,6 +433,31 @@ static void workqueue_sysfs_unregister(struct workqueue_struct *wq);
+@@ -424,6 +433,31 @@
  		if (({ assert_rcu_or_wq_mutex(wq); false; })) { }	\
  		else
  
@@ -22101,7 +21845,7 @@ index ef071ca73fc3..c7a62d6adb00 100644
  #ifdef CONFIG_DEBUG_OBJECTS_WORK
  
  static struct debug_obj_descr work_debug_descr;
-@@ -548,7 +582,7 @@ static int worker_pool_assign_id(struct worker_pool *pool)
+@@ -548,7 +582,7 @@
   * @wq: the target workqueue
   * @node: the node ID
   *
@@ -22110,7 +21854,7 @@ index ef071ca73fc3..c7a62d6adb00 100644
   * read locked.
   * If the pwq needs to be used beyond the locking in effect, the caller is
   * responsible for guaranteeing that the pwq stays online.
-@@ -692,8 +726,8 @@ static struct pool_workqueue *get_work_pwq(struct work_struct *work)
+@@ -692,8 +726,8 @@
   * @work: the work item of interest
   *
   * Pools are created and destroyed under wq_pool_mutex, and allows read
@@ -22121,7 +21865,7 @@ index ef071ca73fc3..c7a62d6adb00 100644
   *
   * All fields of the returned pool are accessible as long as the above
   * mentioned locking is in effect.  If the returned pool needs to be used
-@@ -830,50 +864,45 @@ static struct worker *first_idle_worker(struct worker_pool *pool)
+@@ -830,50 +864,45 @@
   */
  static void wake_up_worker(struct worker_pool *pool)
  {
@@ -22143,10 +21887,10 @@ index ef071ca73fc3..c7a62d6adb00 100644
 + * wq_worker_running - a worker is running again
   * @task: task waking up
 - * @cpu: CPU @task is waking up to
-  *
+- *
 - * This function is called during try_to_wake_up() when a worker is
 - * being awoken.
-- *
+  *
 - * CONTEXT:
 - * spin_lock_irq(rq->lock)
 + * This function is called when a worker returns from schedule()
@@ -22190,7 +21934,7 @@ index ef071ca73fc3..c7a62d6adb00 100644
  	struct worker_pool *pool;
  
  	/*
-@@ -882,29 +911,26 @@ struct task_struct *wq_worker_sleeping(struct task_struct *task)
+@@ -882,29 +911,26 @@
  	 * checking NOT_RUNNING.
  	 */
  	if (worker->flags & WORKER_NOT_RUNNING)
@@ -22230,7 +21974,7 @@ index ef071ca73fc3..c7a62d6adb00 100644
  }
  
  /**
-@@ -1098,12 +1124,12 @@ static void put_pwq_unlocked(struct pool_workqueue *pwq)
+@@ -1098,12 +1124,14 @@
  {
  	if (pwq) {
  		/*
@@ -22239,14 +21983,16 @@ index ef071ca73fc3..c7a62d6adb00 100644
  		 * following lock operations are safe.
  		 */
 -		spin_lock_irq(&pwq->pool->lock);
++		rcu_read_lock();
 +		local_spin_lock_irq(pendingb_lock, &pwq->pool->lock);
  		put_pwq(pwq);
 -		spin_unlock_irq(&pwq->pool->lock);
 +		local_spin_unlock_irq(pendingb_lock, &pwq->pool->lock);
++		rcu_read_unlock();
  	}
  }
  
-@@ -1207,7 +1233,7 @@ static int try_to_grab_pending(struct work_struct *work, bool is_dwork,
+@@ -1207,7 +1235,7 @@
  	struct worker_pool *pool;
  	struct pool_workqueue *pwq;
  
@@ -22255,7 +22001,7 @@ index ef071ca73fc3..c7a62d6adb00 100644
  
  	/* try to steal the timer if it exists */
  	if (is_dwork) {
-@@ -1226,6 +1252,7 @@ static int try_to_grab_pending(struct work_struct *work, bool is_dwork,
+@@ -1226,6 +1254,7 @@
  	if (!test_and_set_bit(WORK_STRUCT_PENDING_BIT, work_data_bits(work)))
  		return 0;
  
@@ -22263,7 +22009,7 @@ index ef071ca73fc3..c7a62d6adb00 100644
  	/*
  	 * The queueing is in progress, or it is already queued. Try to
  	 * steal it from ->worklist without clearing WORK_STRUCT_PENDING.
-@@ -1264,14 +1291,16 @@ static int try_to_grab_pending(struct work_struct *work, bool is_dwork,
+@@ -1264,14 +1293,16 @@
  		set_work_pool_and_keep_pending(work, pool->id);
  
  		spin_unlock(&pool->lock);
@@ -22282,7 +22028,7 @@ index ef071ca73fc3..c7a62d6adb00 100644
  	return -EAGAIN;
  }
  
-@@ -1373,7 +1402,7 @@ static void __queue_work(int cpu, struct workqueue_struct *wq,
+@@ -1373,7 +1404,7 @@
  	 * queued or lose PENDING.  Grabbing PENDING and queueing should
  	 * happen with IRQ disabled.
  	 */
@@ -22291,7 +22037,7 @@ index ef071ca73fc3..c7a62d6adb00 100644
  
  	debug_work_activate(work);
  
-@@ -1381,6 +1410,7 @@ static void __queue_work(int cpu, struct workqueue_struct *wq,
+@@ -1381,6 +1412,7 @@
  	if (unlikely(wq->flags & __WQ_DRAINING) &&
  	    WARN_ON_ONCE(!is_chained_work(wq)))
  		return;
@@ -22299,7 +22045,7 @@ index ef071ca73fc3..c7a62d6adb00 100644
  retry:
  	if (req_cpu == WORK_CPU_UNBOUND)
  		cpu = wq_select_unbound_cpu(raw_smp_processor_id());
-@@ -1437,10 +1467,8 @@ static void __queue_work(int cpu, struct workqueue_struct *wq,
+@@ -1437,10 +1469,8 @@
  	/* pwq determined, queue */
  	trace_workqueue_queue_work(req_cpu, pwq, work);
  
@@ -22312,7 +22058,7 @@ index ef071ca73fc3..c7a62d6adb00 100644
  
  	pwq->nr_in_flight[pwq->work_color]++;
  	work_flags = work_color_to_flags(pwq->work_color);
-@@ -1458,7 +1486,9 @@ static void __queue_work(int cpu, struct workqueue_struct *wq,
+@@ -1458,7 +1488,9 @@
  
  	insert_work(pwq, work, worklist, work_flags);
  
@@ -22322,7 +22068,7 @@ index ef071ca73fc3..c7a62d6adb00 100644
  }
  
  /**
-@@ -1478,14 +1508,14 @@ bool queue_work_on(int cpu, struct workqueue_struct *wq,
+@@ -1478,14 +1510,14 @@
  	bool ret = false;
  	unsigned long flags;
  
@@ -22339,7 +22085,7 @@ index ef071ca73fc3..c7a62d6adb00 100644
  	return ret;
  }
  EXPORT_SYMBOL(queue_work_on);
-@@ -1552,14 +1582,14 @@ bool queue_delayed_work_on(int cpu, struct workqueue_struct *wq,
+@@ -1552,14 +1584,14 @@
  	unsigned long flags;
  
  	/* read the comment in __queue_work() */
@@ -22356,7 +22102,7 @@ index ef071ca73fc3..c7a62d6adb00 100644
  	return ret;
  }
  EXPORT_SYMBOL(queue_delayed_work_on);
-@@ -1594,7 +1624,7 @@ bool mod_delayed_work_on(int cpu, struct workqueue_struct *wq,
+@@ -1594,7 +1626,7 @@
  
  	if (likely(ret >= 0)) {
  		__queue_delayed_work(cpu, wq, dwork, delay);
@@ -22365,7 +22111,7 @@ index ef071ca73fc3..c7a62d6adb00 100644
  	}
  
  	/* -ENOENT from try_to_grab_pending() becomes %true */
-@@ -1627,7 +1657,9 @@ static void worker_enter_idle(struct worker *worker)
+@@ -1627,7 +1659,9 @@
  	worker->last_active = jiffies;
  
  	/* idle_list is LIFO */
@@ -22375,7 +22121,7 @@ index ef071ca73fc3..c7a62d6adb00 100644
  
  	if (too_many_workers(pool) && !timer_pending(&pool->idle_timer))
  		mod_timer(&pool->idle_timer, jiffies + IDLE_WORKER_TIMEOUT);
-@@ -1660,7 +1692,9 @@ static void worker_leave_idle(struct worker *worker)
+@@ -1660,7 +1694,9 @@
  		return;
  	worker_clr_flags(worker, WORKER_IDLE);
  	pool->nr_idle--;
@@ -22385,7 +22131,7 @@ index ef071ca73fc3..c7a62d6adb00 100644
  }
  
  static struct worker *alloc_worker(int node)
-@@ -1826,7 +1860,9 @@ static void destroy_worker(struct worker *worker)
+@@ -1826,7 +1862,9 @@
  	pool->nr_workers--;
  	pool->nr_idle--;
  
@@ -22395,7 +22141,7 @@ index ef071ca73fc3..c7a62d6adb00 100644
  	worker->flags |= WORKER_DIE;
  	wake_up_process(worker->task);
  }
-@@ -2785,14 +2821,14 @@ static bool start_flush_work(struct work_struct *work, struct wq_barrier *barr)
+@@ -2785,14 +2823,14 @@
  
  	might_sleep();
  
@@ -22413,7 +22159,7 @@ index ef071ca73fc3..c7a62d6adb00 100644
  	/* see the comment in try_to_grab_pending() with the same code */
  	pwq = get_work_pwq(work);
  	if (pwq) {
-@@ -2821,10 +2857,11 @@ static bool start_flush_work(struct work_struct *work, struct wq_barrier *barr)
+@@ -2821,10 +2859,11 @@
  	else
  		lock_map_acquire_read(&pwq->wq->lockdep_map);
  	lock_map_release(&pwq->wq->lockdep_map);
@@ -22426,7 +22172,7 @@ index ef071ca73fc3..c7a62d6adb00 100644
  	return false;
  }
  
-@@ -2911,7 +2948,7 @@ static bool __cancel_work_timer(struct work_struct *work, bool is_dwork)
+@@ -2911,7 +2950,7 @@
  
  	/* tell other tasks trying to grab @work to back off */
  	mark_work_canceling(work);
@@ -22435,7 +22181,7 @@ index ef071ca73fc3..c7a62d6adb00 100644
  
  	flush_work(work);
  	clear_work_data(work);
-@@ -2966,10 +3003,10 @@ EXPORT_SYMBOL_GPL(cancel_work_sync);
+@@ -2966,10 +3005,10 @@
   */
  bool flush_delayed_work(struct delayed_work *dwork)
  {
@@ -22448,7 +22194,7 @@ index ef071ca73fc3..c7a62d6adb00 100644
  	return flush_work(&dwork->work);
  }
  EXPORT_SYMBOL(flush_delayed_work);
-@@ -3004,7 +3041,7 @@ bool cancel_delayed_work(struct delayed_work *dwork)
+@@ -3004,7 +3043,7 @@
  
  	set_work_pool_and_clear_pending(&dwork->work,
  					get_work_pool_id(&dwork->work));
@@ -22457,7 +22203,7 @@ index ef071ca73fc3..c7a62d6adb00 100644
  	return ret;
  }
  EXPORT_SYMBOL(cancel_delayed_work);
-@@ -3233,7 +3270,7 @@ static void rcu_free_pool(struct rcu_head *rcu)
+@@ -3233,7 +3272,7 @@
   * put_unbound_pool - put a worker_pool
   * @pool: worker_pool to put
   *
@@ -22466,7 +22212,7 @@ index ef071ca73fc3..c7a62d6adb00 100644
   * safe manner.  get_unbound_pool() calls this function on its failure path
   * and this function should be able to release pools which went through,
   * successfully or not, init_worker_pool().
-@@ -3287,8 +3324,8 @@ static void put_unbound_pool(struct worker_pool *pool)
+@@ -3287,8 +3326,8 @@
  	del_timer_sync(&pool->idle_timer);
  	del_timer_sync(&pool->mayday_timer);
  
@@ -22477,7 +22223,7 @@ index ef071ca73fc3..c7a62d6adb00 100644
  }
  
  /**
-@@ -3395,14 +3432,14 @@ static void pwq_unbound_release_workfn(struct work_struct *work)
+@@ -3395,14 +3434,14 @@
  	put_unbound_pool(pool);
  	mutex_unlock(&wq_pool_mutex);
  
@@ -22494,7 +22240,7 @@ index ef071ca73fc3..c7a62d6adb00 100644
  }
  
  /**
-@@ -4052,7 +4089,7 @@ void destroy_workqueue(struct workqueue_struct *wq)
+@@ -4052,7 +4091,7 @@
  		 * The base ref is never dropped on per-cpu pwqs.  Directly
  		 * schedule RCU free.
  		 */
@@ -22503,7 +22249,7 @@ index ef071ca73fc3..c7a62d6adb00 100644
  	} else {
  		/*
  		 * We're the sole accessor of @wq at this point.  Directly
-@@ -4145,7 +4182,8 @@ bool workqueue_congested(int cpu, struct workqueue_struct *wq)
+@@ -4145,7 +4184,8 @@
  	struct pool_workqueue *pwq;
  	bool ret;
  
@@ -22513,7 +22259,7 @@ index ef071ca73fc3..c7a62d6adb00 100644
  
  	if (cpu == WORK_CPU_UNBOUND)
  		cpu = smp_processor_id();
-@@ -4156,7 +4194,8 @@ bool workqueue_congested(int cpu, struct workqueue_struct *wq)
+@@ -4156,7 +4196,8 @@
  		pwq = unbound_pwq_by_node(wq, cpu_to_node(cpu));
  
  	ret = !list_empty(&pwq->delayed_works);
@@ -22523,7 +22269,7 @@ index ef071ca73fc3..c7a62d6adb00 100644
  
  	return ret;
  }
-@@ -4182,15 +4221,15 @@ unsigned int work_busy(struct work_struct *work)
+@@ -4182,15 +4223,15 @@
  	if (work_pending(work))
  		ret |= WORK_BUSY_PENDING;
  
@@ -22543,7 +22289,7 @@ index ef071ca73fc3..c7a62d6adb00 100644
  
  	return ret;
  }
-@@ -4379,7 +4418,7 @@ void show_workqueue_state(void)
+@@ -4379,7 +4420,7 @@
  	unsigned long flags;
  	int pi;
  
@@ -22552,7 +22298,7 @@ index ef071ca73fc3..c7a62d6adb00 100644
  
  	pr_info("Showing busy workqueues and worker pools:\n");
  
-@@ -4432,7 +4471,7 @@ void show_workqueue_state(void)
+@@ -4432,7 +4473,7 @@
  		spin_unlock_irqrestore(&pool->lock, flags);
  	}
  
@@ -22561,7 +22307,7 @@ index ef071ca73fc3..c7a62d6adb00 100644
  }
  
  /*
-@@ -4770,16 +4809,16 @@ bool freeze_workqueues_busy(void)
+@@ -4770,16 +4811,16 @@
  		 * nr_active is monotonically decreasing.  It's safe
  		 * to peek without lock.
  		 */
@@ -22581,7 +22327,7 @@ index ef071ca73fc3..c7a62d6adb00 100644
  	}
  out_unlock:
  	mutex_unlock(&wq_pool_mutex);
-@@ -4969,7 +5008,8 @@ static ssize_t wq_pool_ids_show(struct device *dev,
+@@ -4969,7 +5010,8 @@
  	const char *delim = "";
  	int node, written = 0;
  
@@ -22591,7 +22337,7 @@ index ef071ca73fc3..c7a62d6adb00 100644
  	for_each_node(node) {
  		written += scnprintf(buf + written, PAGE_SIZE - written,
  				     "%s%d:%d", delim, node,
-@@ -4977,7 +5017,8 @@ static ssize_t wq_pool_ids_show(struct device *dev,
+@@ -4977,7 +5019,8 @@
  		delim = " ";
  	}
  	written += scnprintf(buf + written, PAGE_SIZE - written, "\n");
@@ -22601,11 +22347,10 @@ index ef071ca73fc3..c7a62d6adb00 100644
  
  	return written;
  }
-diff --git a/kernel/workqueue_internal.h b/kernel/workqueue_internal.h
-index 8635417c587b..f000c4d6917e 100644
---- a/kernel/workqueue_internal.h
-+++ b/kernel/workqueue_internal.h
-@@ -43,6 +43,7 @@ struct worker {
+diff -Nur linux-4.8.15.orig/kernel/workqueue_internal.h linux-4.8.15/kernel/workqueue_internal.h
+--- linux-4.8.15.orig/kernel/workqueue_internal.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/kernel/workqueue_internal.h	2017-01-01 17:07:16.063429015 +0100
+@@ -43,6 +43,7 @@
  	unsigned long		last_active;	/* L: last active timestamp */
  	unsigned int		flags;		/* X: flags */
  	int			id;		/* I: worker id */
@@ -22613,7 +22358,7 @@ index 8635417c587b..f000c4d6917e 100644
  
  	/*
  	 * Opaque string set with work_set_desc().  Printed out with task
-@@ -68,7 +69,7 @@ static inline struct worker *current_wq_worker(void)
+@@ -68,7 +69,7 @@
   * Scheduler hooks for concurrency managed workqueue.  Only to be used from
   * sched/core.c and workqueue.c.
   */
@@ -22623,53 +22368,10 @@ index 8635417c587b..f000c4d6917e 100644
 +void wq_worker_sleeping(struct task_struct *task);
  
  #endif /* _KERNEL_WORKQUEUE_INTERNAL_H */
-diff --git a/lib/Kconfig b/lib/Kconfig
-index d79909dc01ec..fd2accb2f2bb 100644
---- a/lib/Kconfig
-+++ b/lib/Kconfig
-@@ -400,6 +400,7 @@ config CHECK_SIGNATURE
- 
- config CPUMASK_OFFSTACK
- 	bool "Force CPU masks off stack" if DEBUG_PER_CPU_MAPS
-+	depends on !PREEMPT_RT_FULL
- 	help
- 	  Use dynamic allocation for cpumask_var_t, instead of putting
- 	  them on the stack.  This is a bit more expensive, but avoids
-diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
-index cab7405f48d2..dbc49c48ff53 100644
---- a/lib/Kconfig.debug
-+++ b/lib/Kconfig.debug
-@@ -977,6 +977,7 @@ config TIMER_STATS
- config DEBUG_PREEMPT
- 	bool "Debug preemptible kernel"
- 	depends on DEBUG_KERNEL && PREEMPT && TRACE_IRQFLAGS_SUPPORT
-+	select USING_GET_LOCK_PARENT_IP
- 	default y
- 	help
- 	  If you say Y here then the kernel will use a debug variant of the
-@@ -1159,8 +1160,17 @@ config LOCK_TORTURE_TEST
- 
- endmenu # lock debugging
- 
-+config USING_GET_LOCK_PARENT_IP
-+        bool
-+	help
-+	  Enables the use of the function get_lock_parent_ip() that
-+	  will use __builtin_return_address(n) with n > 0 causing
-+	  some gcc warnings. When this is selected, those warnings
-+	  will be suppressed.
-+
- config TRACE_IRQFLAGS
- 	bool
-+	select USING_GET_LOCK_PARENT_IP
- 	help
- 	  Enables hooks to interrupt enabling and disabling for
- 	  either tracing or lock debugging.
-diff --git a/lib/debugobjects.c b/lib/debugobjects.c
-index a8e12601eb37..c76d5f0beafe 100644
---- a/lib/debugobjects.c
-+++ b/lib/debugobjects.c
-@@ -308,7 +308,10 @@ __debug_object_init(void *addr, struct debug_obj_descr *descr, int onstack)
+diff -Nur linux-4.8.15.orig/lib/debugobjects.c linux-4.8.15/lib/debugobjects.c
+--- linux-4.8.15.orig/lib/debugobjects.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/lib/debugobjects.c	2017-01-01 17:07:16.063429015 +0100
+@@ -308,7 +308,10 @@
  	struct debug_obj *obj;
  	unsigned long flags;
  
@@ -22681,10 +22383,9 @@ index a8e12601eb37..c76d5f0beafe 100644
  
  	db = get_bucket((unsigned long) addr);
  
-diff --git a/lib/idr.c b/lib/idr.c
-index 6098336df267..9decbe914595 100644
---- a/lib/idr.c
-+++ b/lib/idr.c
+diff -Nur linux-4.8.15.orig/lib/idr.c linux-4.8.15/lib/idr.c
+--- linux-4.8.15.orig/lib/idr.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/lib/idr.c	2017-01-01 17:07:16.067429274 +0100
 @@ -30,6 +30,7 @@
  #include <linux/idr.h>
  #include <linux/spinlock.h>
@@ -22693,7 +22394,7 @@ index 6098336df267..9decbe914595 100644
  
  #define MAX_IDR_SHIFT		(sizeof(int) * 8 - 1)
  #define MAX_IDR_BIT		(1U << MAX_IDR_SHIFT)
-@@ -45,6 +46,37 @@ static DEFINE_PER_CPU(struct idr_layer *, idr_preload_head);
+@@ -45,6 +46,37 @@
  static DEFINE_PER_CPU(int, idr_preload_cnt);
  static DEFINE_SPINLOCK(simple_ida_lock);
  
@@ -22731,7 +22432,7 @@ index 6098336df267..9decbe914595 100644
  /* the maximum ID which can be allocated given idr->layers */
  static int idr_max(int layers)
  {
-@@ -115,14 +147,14 @@ static struct idr_layer *idr_layer_alloc(gfp_t gfp_mask, struct idr *layer_idr)
+@@ -115,14 +147,14 @@
  	 * context.  See idr_preload() for details.
  	 */
  	if (!in_interrupt()) {
@@ -22748,7 +22449,7 @@ index 6098336df267..9decbe914595 100644
  		if (new)
  			return new;
  	}
-@@ -366,7 +398,6 @@ static void idr_fill_slot(struct idr *idr, void *ptr, int id,
+@@ -366,7 +398,6 @@
  	idr_mark_full(pa, id);
  }
  
@@ -22756,7 +22457,7 @@ index 6098336df267..9decbe914595 100644
  /**
   * idr_preload - preload for idr_alloc()
   * @gfp_mask: allocation mask to use for preloading
-@@ -401,7 +432,7 @@ void idr_preload(gfp_t gfp_mask)
+@@ -401,7 +432,7 @@
  	WARN_ON_ONCE(in_interrupt());
  	might_sleep_if(gfpflags_allow_blocking(gfp_mask));
  
@@ -22765,7 +22466,7 @@ index 6098336df267..9decbe914595 100644
  
  	/*
  	 * idr_alloc() is likely to succeed w/o full idr_layer buffer and
-@@ -413,9 +444,9 @@ void idr_preload(gfp_t gfp_mask)
+@@ -413,9 +444,9 @@
  	while (__this_cpu_read(idr_preload_cnt) < MAX_IDR_FREE) {
  		struct idr_layer *new;
  
@@ -22777,11 +22478,10 @@ index 6098336df267..9decbe914595 100644
  		if (!new)
  			break;
  
-diff --git a/lib/irq_poll.c b/lib/irq_poll.c
-index 836f7db4e548..709d4eed1df9 100644
---- a/lib/irq_poll.c
-+++ b/lib/irq_poll.c
-@@ -36,6 +36,7 @@ void irq_poll_sched(struct irq_poll *iop)
+diff -Nur linux-4.8.15.orig/lib/irq_poll.c linux-4.8.15/lib/irq_poll.c
+--- linux-4.8.15.orig/lib/irq_poll.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/lib/irq_poll.c	2017-01-01 17:07:16.067429274 +0100
+@@ -36,6 +36,7 @@
  	list_add_tail(&iop->list, this_cpu_ptr(&blk_cpu_iopoll));
  	__raise_softirq_irqoff(IRQ_POLL_SOFTIRQ);
  	local_irq_restore(flags);
@@ -22789,7 +22489,7 @@ index 836f7db4e548..709d4eed1df9 100644
  }
  EXPORT_SYMBOL(irq_poll_sched);
  
-@@ -71,6 +72,7 @@ void irq_poll_complete(struct irq_poll *iop)
+@@ -71,6 +72,7 @@
  	local_irq_save(flags);
  	__irq_poll_complete(iop);
  	local_irq_restore(flags);
@@ -22797,7 +22497,7 @@ index 836f7db4e548..709d4eed1df9 100644
  }
  EXPORT_SYMBOL(irq_poll_complete);
  
-@@ -95,6 +97,7 @@ static void irq_poll_softirq(struct softirq_action *h)
+@@ -95,6 +97,7 @@
  		}
  
  		local_irq_enable();
@@ -22805,7 +22505,7 @@ index 836f7db4e548..709d4eed1df9 100644
  
  		/* Even though interrupts have been re-enabled, this
  		 * access is safe because interrupts can only add new
-@@ -132,6 +135,7 @@ static void irq_poll_softirq(struct softirq_action *h)
+@@ -132,6 +135,7 @@
  		__raise_softirq_irqoff(IRQ_POLL_SOFTIRQ);
  
  	local_irq_enable();
@@ -22813,7 +22513,7 @@ index 836f7db4e548..709d4eed1df9 100644
  }
  
  /**
-@@ -199,6 +203,7 @@ static int irq_poll_cpu_notify(struct notifier_block *self,
+@@ -199,6 +203,7 @@
  				 this_cpu_ptr(&blk_cpu_iopoll));
  		__raise_softirq_irqoff(IRQ_POLL_SOFTIRQ);
  		local_irq_enable();
@@ -22821,11 +22521,50 @@ index 836f7db4e548..709d4eed1df9 100644
  	}
  
  	return NOTIFY_OK;
-diff --git a/lib/locking-selftest.c b/lib/locking-selftest.c
-index 872a15a2a637..b93a6103fa4d 100644
---- a/lib/locking-selftest.c
-+++ b/lib/locking-selftest.c
-@@ -590,6 +590,8 @@ GENERATE_TESTCASE(init_held_rsem)
+diff -Nur linux-4.8.15.orig/lib/Kconfig linux-4.8.15/lib/Kconfig
+--- linux-4.8.15.orig/lib/Kconfig	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/lib/Kconfig	2017-01-01 17:07:16.063429015 +0100
+@@ -400,6 +400,7 @@
+ 
+ config CPUMASK_OFFSTACK
+ 	bool "Force CPU masks off stack" if DEBUG_PER_CPU_MAPS
++	depends on !PREEMPT_RT_FULL
+ 	help
+ 	  Use dynamic allocation for cpumask_var_t, instead of putting
+ 	  them on the stack.  This is a bit more expensive, but avoids
+diff -Nur linux-4.8.15.orig/lib/Kconfig.debug linux-4.8.15/lib/Kconfig.debug
+--- linux-4.8.15.orig/lib/Kconfig.debug	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/lib/Kconfig.debug	2017-01-01 17:07:16.063429015 +0100
+@@ -977,6 +977,7 @@
+ config DEBUG_PREEMPT
+ 	bool "Debug preemptible kernel"
+ 	depends on DEBUG_KERNEL && PREEMPT && TRACE_IRQFLAGS_SUPPORT
++	select USING_GET_LOCK_PARENT_IP
+ 	default y
+ 	help
+ 	  If you say Y here then the kernel will use a debug variant of the
+@@ -1159,8 +1160,17 @@
+ 
+ endmenu # lock debugging
+ 
++config USING_GET_LOCK_PARENT_IP
++        bool
++	help
++	  Enables the use of the function get_lock_parent_ip() that
++	  will use __builtin_return_address(n) with n > 0 causing
++	  some gcc warnings. When this is selected, those warnings
++	  will be suppressed.
++
+ config TRACE_IRQFLAGS
+ 	bool
++	select USING_GET_LOCK_PARENT_IP
+ 	help
+ 	  Enables hooks to interrupt enabling and disabling for
+ 	  either tracing or lock debugging.
+diff -Nur linux-4.8.15.orig/lib/locking-selftest.c linux-4.8.15/lib/locking-selftest.c
+--- linux-4.8.15.orig/lib/locking-selftest.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/lib/locking-selftest.c	2017-01-01 17:07:16.067429274 +0100
+@@ -590,6 +590,8 @@
  #include "locking-selftest-spin-hardirq.h"
  GENERATE_PERMUTATIONS_2_EVENTS(irqsafe1_hard_spin)
  
@@ -22834,7 +22573,7 @@ index 872a15a2a637..b93a6103fa4d 100644
  #include "locking-selftest-rlock-hardirq.h"
  GENERATE_PERMUTATIONS_2_EVENTS(irqsafe1_hard_rlock)
  
-@@ -605,9 +607,12 @@ GENERATE_PERMUTATIONS_2_EVENTS(irqsafe1_soft_rlock)
+@@ -605,9 +607,12 @@
  #include "locking-selftest-wlock-softirq.h"
  GENERATE_PERMUTATIONS_2_EVENTS(irqsafe1_soft_wlock)
  
@@ -22847,7 +22586,7 @@ index 872a15a2a637..b93a6103fa4d 100644
  /*
   * Enabling hardirqs with a softirq-safe lock held:
   */
-@@ -640,6 +645,8 @@ GENERATE_PERMUTATIONS_2_EVENTS(irqsafe2A_rlock)
+@@ -640,6 +645,8 @@
  #undef E1
  #undef E2
  
@@ -22856,7 +22595,7 @@ index 872a15a2a637..b93a6103fa4d 100644
  /*
   * Enabling irqs with an irq-safe lock held:
   */
-@@ -663,6 +670,8 @@ GENERATE_PERMUTATIONS_2_EVENTS(irqsafe2A_rlock)
+@@ -663,6 +670,8 @@
  #include "locking-selftest-spin-hardirq.h"
  GENERATE_PERMUTATIONS_2_EVENTS(irqsafe2B_hard_spin)
  
@@ -22865,7 +22604,7 @@ index 872a15a2a637..b93a6103fa4d 100644
  #include "locking-selftest-rlock-hardirq.h"
  GENERATE_PERMUTATIONS_2_EVENTS(irqsafe2B_hard_rlock)
  
-@@ -678,6 +687,8 @@ GENERATE_PERMUTATIONS_2_EVENTS(irqsafe2B_soft_rlock)
+@@ -678,6 +687,8 @@
  #include "locking-selftest-wlock-softirq.h"
  GENERATE_PERMUTATIONS_2_EVENTS(irqsafe2B_soft_wlock)
  
@@ -22874,7 +22613,7 @@ index 872a15a2a637..b93a6103fa4d 100644
  #undef E1
  #undef E2
  
-@@ -709,6 +720,8 @@ GENERATE_PERMUTATIONS_2_EVENTS(irqsafe2B_soft_wlock)
+@@ -709,6 +720,8 @@
  #include "locking-selftest-spin-hardirq.h"
  GENERATE_PERMUTATIONS_3_EVENTS(irqsafe3_hard_spin)
  
@@ -22883,7 +22622,7 @@ index 872a15a2a637..b93a6103fa4d 100644
  #include "locking-selftest-rlock-hardirq.h"
  GENERATE_PERMUTATIONS_3_EVENTS(irqsafe3_hard_rlock)
  
-@@ -724,6 +737,8 @@ GENERATE_PERMUTATIONS_3_EVENTS(irqsafe3_soft_rlock)
+@@ -724,6 +737,8 @@
  #include "locking-selftest-wlock-softirq.h"
  GENERATE_PERMUTATIONS_3_EVENTS(irqsafe3_soft_wlock)
  
@@ -22892,7 +22631,7 @@ index 872a15a2a637..b93a6103fa4d 100644
  #undef E1
  #undef E2
  #undef E3
-@@ -757,6 +772,8 @@ GENERATE_PERMUTATIONS_3_EVENTS(irqsafe3_soft_wlock)
+@@ -757,6 +772,8 @@
  #include "locking-selftest-spin-hardirq.h"
  GENERATE_PERMUTATIONS_3_EVENTS(irqsafe4_hard_spin)
  
@@ -22901,7 +22640,7 @@ index 872a15a2a637..b93a6103fa4d 100644
  #include "locking-selftest-rlock-hardirq.h"
  GENERATE_PERMUTATIONS_3_EVENTS(irqsafe4_hard_rlock)
  
-@@ -772,10 +789,14 @@ GENERATE_PERMUTATIONS_3_EVENTS(irqsafe4_soft_rlock)
+@@ -772,10 +789,14 @@
  #include "locking-selftest-wlock-softirq.h"
  GENERATE_PERMUTATIONS_3_EVENTS(irqsafe4_soft_wlock)
  
@@ -22916,7 +22655,7 @@ index 872a15a2a637..b93a6103fa4d 100644
  /*
   * read-lock / write-lock irq inversion.
   *
-@@ -838,6 +859,10 @@ GENERATE_PERMUTATIONS_3_EVENTS(irq_inversion_soft_wlock)
+@@ -838,6 +859,10 @@
  #undef E2
  #undef E3
  
@@ -22927,7 +22666,7 @@ index 872a15a2a637..b93a6103fa4d 100644
  /*
   * read-lock / write-lock recursion that is actually safe.
   */
-@@ -876,6 +901,8 @@ GENERATE_PERMUTATIONS_3_EVENTS(irq_read_recursion_soft)
+@@ -876,6 +901,8 @@
  #undef E2
  #undef E3
  
@@ -22936,7 +22675,7 @@ index 872a15a2a637..b93a6103fa4d 100644
  /*
   * read-lock / write-lock recursion that is unsafe.
   */
-@@ -1858,6 +1885,7 @@ void locking_selftest(void)
+@@ -1858,6 +1885,7 @@
  
  	printk("  --------------------------------------------------------------------------\n");
  
@@ -22944,7 +22683,7 @@ index 872a15a2a637..b93a6103fa4d 100644
  	/*
  	 * irq-context testcases:
  	 */
-@@ -1870,6 +1898,28 @@ void locking_selftest(void)
+@@ -1870,6 +1898,28 @@
  
  	DO_TESTCASE_6x2("irq read-recursion", irq_read_recursion);
  //	DO_TESTCASE_6x2B("irq read-recursion #2", irq_read_recursion2);
@@ -22973,10 +22712,9 @@ index 872a15a2a637..b93a6103fa4d 100644
  
  	ww_tests();
  
-diff --git a/lib/percpu_ida.c b/lib/percpu_ida.c
-index 6d40944960de..822a2c027e72 100644
---- a/lib/percpu_ida.c
-+++ b/lib/percpu_ida.c
+diff -Nur linux-4.8.15.orig/lib/percpu_ida.c linux-4.8.15/lib/percpu_ida.c
+--- linux-4.8.15.orig/lib/percpu_ida.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/lib/percpu_ida.c	2017-01-01 17:07:16.067429274 +0100
 @@ -26,6 +26,9 @@
  #include <linux/string.h>
  #include <linux/spinlock.h>
@@ -22987,7 +22725,7 @@ index 6d40944960de..822a2c027e72 100644
  
  struct percpu_ida_cpu {
  	/*
-@@ -148,13 +151,13 @@ int percpu_ida_alloc(struct percpu_ida *pool, int state)
+@@ -148,13 +151,13 @@
  	unsigned long flags;
  	int tag;
  
@@ -23003,7 +22741,7 @@ index 6d40944960de..822a2c027e72 100644
  		return tag;
  	}
  
-@@ -173,6 +176,7 @@ int percpu_ida_alloc(struct percpu_ida *pool, int state)
+@@ -173,6 +176,7 @@
  
  		if (!tags->nr_free)
  			alloc_global_tags(pool, tags);
@@ -23011,7 +22749,7 @@ index 6d40944960de..822a2c027e72 100644
  		if (!tags->nr_free)
  			steal_tags(pool, tags);
  
-@@ -184,7 +188,7 @@ int percpu_ida_alloc(struct percpu_ida *pool, int state)
+@@ -184,7 +188,7 @@
  		}
  
  		spin_unlock(&pool->lock);
@@ -23020,7 +22758,7 @@ index 6d40944960de..822a2c027e72 100644
  
  		if (tag >= 0 || state == TASK_RUNNING)
  			break;
-@@ -196,7 +200,7 @@ int percpu_ida_alloc(struct percpu_ida *pool, int state)
+@@ -196,7 +200,7 @@
  
  		schedule();
  
@@ -23029,7 +22767,7 @@ index 6d40944960de..822a2c027e72 100644
  		tags = this_cpu_ptr(pool->tag_cpu);
  	}
  	if (state != TASK_RUNNING)
-@@ -221,7 +225,7 @@ void percpu_ida_free(struct percpu_ida *pool, unsigned tag)
+@@ -221,7 +225,7 @@
  
  	BUG_ON(tag >= pool->nr_tags);
  
@@ -23038,7 +22776,7 @@ index 6d40944960de..822a2c027e72 100644
  	tags = this_cpu_ptr(pool->tag_cpu);
  
  	spin_lock(&tags->lock);
-@@ -253,7 +257,7 @@ void percpu_ida_free(struct percpu_ida *pool, unsigned tag)
+@@ -253,7 +257,7 @@
  		spin_unlock(&pool->lock);
  	}
  
@@ -23047,7 +22785,7 @@ index 6d40944960de..822a2c027e72 100644
  }
  EXPORT_SYMBOL_GPL(percpu_ida_free);
  
-@@ -345,7 +349,7 @@ int percpu_ida_for_each_free(struct percpu_ida *pool, percpu_ida_cb fn,
+@@ -345,7 +349,7 @@
  	struct percpu_ida_cpu *remote;
  	unsigned cpu, i, err = 0;
  
@@ -23056,7 +22794,7 @@ index 6d40944960de..822a2c027e72 100644
  	for_each_possible_cpu(cpu) {
  		remote = per_cpu_ptr(pool->tag_cpu, cpu);
  		spin_lock(&remote->lock);
-@@ -367,7 +371,7 @@ int percpu_ida_for_each_free(struct percpu_ida *pool, percpu_ida_cb fn,
+@@ -367,7 +371,7 @@
  	}
  	spin_unlock(&pool->lock);
  out:
@@ -23065,11 +22803,10 @@ index 6d40944960de..822a2c027e72 100644
  	return err;
  }
  EXPORT_SYMBOL_GPL(percpu_ida_for_each_free);
-diff --git a/lib/radix-tree.c b/lib/radix-tree.c
-index 8e6d552c40dd..881cc195d85f 100644
---- a/lib/radix-tree.c
-+++ b/lib/radix-tree.c
-@@ -290,13 +290,14 @@ radix_tree_node_alloc(struct radix_tree_root *root)
+diff -Nur linux-4.8.15.orig/lib/radix-tree.c linux-4.8.15/lib/radix-tree.c
+--- linux-4.8.15.orig/lib/radix-tree.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/lib/radix-tree.c	2017-01-01 17:07:16.067429274 +0100
+@@ -290,13 +290,14 @@
  		 * succeed in getting a node here (and never reach
  		 * kmem_cache_alloc)
  		 */
@@ -23085,7 +22822,7 @@ index 8e6d552c40dd..881cc195d85f 100644
  		/*
  		 * Update the allocation stack trace as this is more useful
  		 * for debugging.
-@@ -336,6 +337,7 @@ radix_tree_node_free(struct radix_tree_node *node)
+@@ -336,6 +337,7 @@
  	call_rcu(&node->rcu_head, radix_tree_node_rcu_free);
  }
  
@@ -23093,7 +22830,7 @@ index 8e6d552c40dd..881cc195d85f 100644
  /*
   * Load up this CPU's radix_tree_node buffer with sufficient objects to
   * ensure that the addition of a single element in the tree cannot fail.  On
-@@ -455,6 +457,7 @@ int radix_tree_maybe_preload_order(gfp_t gfp_mask, int order)
+@@ -455,6 +457,7 @@
  
  	return __radix_tree_preload(gfp_mask, nr_nodes);
  }
@@ -23101,11 +22838,10 @@ index 8e6d552c40dd..881cc195d85f 100644
  
  /*
   * The maximum index which can be stored in a radix tree
-diff --git a/lib/scatterlist.c b/lib/scatterlist.c
-index 004fc70fc56a..ccc46992a517 100644
---- a/lib/scatterlist.c
-+++ b/lib/scatterlist.c
-@@ -620,7 +620,7 @@ void sg_miter_stop(struct sg_mapping_iter *miter)
+diff -Nur linux-4.8.15.orig/lib/scatterlist.c linux-4.8.15/lib/scatterlist.c
+--- linux-4.8.15.orig/lib/scatterlist.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/lib/scatterlist.c	2017-01-01 17:07:16.067429274 +0100
+@@ -620,7 +620,7 @@
  			flush_kernel_dcache_page(miter->page);
  
  		if (miter->__flags & SG_MITER_ATOMIC) {
@@ -23114,7 +22850,7 @@ index 004fc70fc56a..ccc46992a517 100644
  			kunmap_atomic(miter->addr);
  		} else
  			kunmap(miter->page);
-@@ -664,7 +664,7 @@ size_t sg_copy_buffer(struct scatterlist *sgl, unsigned int nents, void *buf,
+@@ -664,7 +664,7 @@
  	if (!sg_miter_skip(&miter, skip))
  		return false;
  
@@ -23123,7 +22859,7 @@ index 004fc70fc56a..ccc46992a517 100644
  
  	while (sg_miter_next(&miter) && offset < buflen) {
  		unsigned int len;
-@@ -681,7 +681,7 @@ size_t sg_copy_buffer(struct scatterlist *sgl, unsigned int nents, void *buf,
+@@ -681,7 +681,7 @@
  
  	sg_miter_stop(&miter);
  
@@ -23132,11 +22868,10 @@ index 004fc70fc56a..ccc46992a517 100644
  	return offset;
  }
  EXPORT_SYMBOL(sg_copy_buffer);
-diff --git a/lib/smp_processor_id.c b/lib/smp_processor_id.c
-index 1afec32de6f2..11fa431046a8 100644
---- a/lib/smp_processor_id.c
-+++ b/lib/smp_processor_id.c
-@@ -39,8 +39,9 @@ notrace static unsigned int check_preemption_disabled(const char *what1,
+diff -Nur linux-4.8.15.orig/lib/smp_processor_id.c linux-4.8.15/lib/smp_processor_id.c
+--- linux-4.8.15.orig/lib/smp_processor_id.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/lib/smp_processor_id.c	2017-01-01 17:07:16.067429274 +0100
+@@ -39,8 +39,9 @@
  	if (!printk_ratelimit())
  		goto out_enable;
  
@@ -23148,24 +22883,10 @@ index 1afec32de6f2..11fa431046a8 100644
  
  	print_symbol("caller is %s\n", (long)__builtin_return_address(0));
  	dump_stack();
-diff --git a/mm/Kconfig b/mm/Kconfig
-index be0ee11fa0d9..fe2857d67973 100644
---- a/mm/Kconfig
-+++ b/mm/Kconfig
-@@ -410,7 +410,7 @@ config NOMMU_INITIAL_TRIM_EXCESS
- 
- config TRANSPARENT_HUGEPAGE
- 	bool "Transparent Hugepage Support"
--	depends on HAVE_ARCH_TRANSPARENT_HUGEPAGE
-+	depends on HAVE_ARCH_TRANSPARENT_HUGEPAGE && !PREEMPT_RT_FULL
- 	select COMPACTION
- 	select RADIX_TREE_MULTIORDER
- 	help
-diff --git a/mm/backing-dev.c b/mm/backing-dev.c
-index 8fde443f36d7..d7a863b0ec20 100644
---- a/mm/backing-dev.c
-+++ b/mm/backing-dev.c
-@@ -457,9 +457,9 @@ void wb_congested_put(struct bdi_writeback_congested *congested)
+diff -Nur linux-4.8.15.orig/mm/backing-dev.c linux-4.8.15/mm/backing-dev.c
+--- linux-4.8.15.orig/mm/backing-dev.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/mm/backing-dev.c	2017-01-01 17:07:16.103431597 +0100
+@@ -457,9 +457,9 @@
  {
  	unsigned long flags;
  
@@ -23177,11 +22898,10 @@ index 8fde443f36d7..d7a863b0ec20 100644
  		return;
  	}
  
-diff --git a/mm/compaction.c b/mm/compaction.c
-index 9affb2908304..d5eb0e52e96f 100644
---- a/mm/compaction.c
-+++ b/mm/compaction.c
-@@ -1585,10 +1585,12 @@ static enum compact_result compact_zone(struct zone *zone, struct compact_contro
+diff -Nur linux-4.8.15.orig/mm/compaction.c linux-4.8.15/mm/compaction.c
+--- linux-4.8.15.orig/mm/compaction.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/mm/compaction.c	2017-01-01 17:07:16.103431597 +0100
+@@ -1585,10 +1585,12 @@
  				block_start_pfn(cc->migrate_pfn, cc->order);
  
  			if (cc->last_migrated_pfn < current_block_start) {
@@ -23196,11 +22916,10 @@ index 9affb2908304..d5eb0e52e96f 100644
  				/* No more flushing until we migrate again */
  				cc->last_migrated_pfn = 0;
  			}
-diff --git a/mm/filemap.c b/mm/filemap.c
-index ced9ef6c06b0..19f6f0d77604 100644
---- a/mm/filemap.c
-+++ b/mm/filemap.c
-@@ -159,9 +159,12 @@ static int page_cache_tree_insert(struct address_space *mapping,
+diff -Nur linux-4.8.15.orig/mm/filemap.c linux-4.8.15/mm/filemap.c
+--- linux-4.8.15.orig/mm/filemap.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/mm/filemap.c	2017-01-01 17:07:16.103431597 +0100
+@@ -159,9 +159,12 @@
  		 * node->private_list is protected by
  		 * mapping->tree_lock.
  		 */
@@ -23215,7 +22934,7 @@ index ced9ef6c06b0..19f6f0d77604 100644
  	}
  	return 0;
  }
-@@ -217,8 +220,10 @@ static void page_cache_tree_delete(struct address_space *mapping,
+@@ -217,8 +220,10 @@
  		if (!dax_mapping(mapping) && !workingset_node_pages(node) &&
  				list_empty(&node->private_list)) {
  			node->private_data = mapping;
@@ -23228,10 +22947,9 @@ index ced9ef6c06b0..19f6f0d77604 100644
  		}
  	}
  
-diff --git a/mm/highmem.c b/mm/highmem.c
-index 50b4ca6787f0..77518a3b35a1 100644
---- a/mm/highmem.c
-+++ b/mm/highmem.c
+diff -Nur linux-4.8.15.orig/mm/highmem.c linux-4.8.15/mm/highmem.c
+--- linux-4.8.15.orig/mm/highmem.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/mm/highmem.c	2017-01-01 17:07:16.103431597 +0100
 @@ -29,10 +29,11 @@
  #include <linux/kgdb.h>
  #include <asm/tlbflush.h>
@@ -23245,7 +22963,7 @@ index 50b4ca6787f0..77518a3b35a1 100644
  
  /*
   * Virtual_count is not a pure "count".
-@@ -107,8 +108,9 @@ static inline wait_queue_head_t *get_pkmap_wait_queue_head(unsigned int color)
+@@ -107,8 +108,9 @@
  unsigned long totalhigh_pages __read_mostly;
  EXPORT_SYMBOL(totalhigh_pages);
  
@@ -23256,10 +22974,21 @@ index 50b4ca6787f0..77518a3b35a1 100644
  
  unsigned int nr_free_highpages (void)
  {
-diff --git a/mm/memcontrol.c b/mm/memcontrol.c
-index 4be518d4e68a..724240ca2f35 100644
---- a/mm/memcontrol.c
-+++ b/mm/memcontrol.c
+diff -Nur linux-4.8.15.orig/mm/Kconfig linux-4.8.15/mm/Kconfig
+--- linux-4.8.15.orig/mm/Kconfig	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/mm/Kconfig	2017-01-01 17:07:16.103431597 +0100
+@@ -410,7 +410,7 @@
+ 
+ config TRANSPARENT_HUGEPAGE
+ 	bool "Transparent Hugepage Support"
+-	depends on HAVE_ARCH_TRANSPARENT_HUGEPAGE
++	depends on HAVE_ARCH_TRANSPARENT_HUGEPAGE && !PREEMPT_RT_FULL
+ 	select COMPACTION
+ 	select RADIX_TREE_MULTIORDER
+ 	help
+diff -Nur linux-4.8.15.orig/mm/memcontrol.c linux-4.8.15/mm/memcontrol.c
+--- linux-4.8.15.orig/mm/memcontrol.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/mm/memcontrol.c	2017-01-01 17:07:16.107431847 +0100
 @@ -67,6 +67,7 @@
  #include <net/sock.h>
  #include <net/ip.h>
@@ -23268,7 +22997,7 @@ index 4be518d4e68a..724240ca2f35 100644
  
  #include <asm/uaccess.h>
  
-@@ -92,6 +93,8 @@ int do_swap_account __read_mostly;
+@@ -92,6 +93,8 @@
  #define do_swap_account		0
  #endif
  
@@ -23277,7 +23006,7 @@ index 4be518d4e68a..724240ca2f35 100644
  /* Whether legacy memory+swap accounting is active */
  static bool do_memsw_account(void)
  {
-@@ -1724,6 +1727,7 @@ struct memcg_stock_pcp {
+@@ -1724,6 +1727,7 @@
  #define FLUSHING_CACHED_CHARGE	0
  };
  static DEFINE_PER_CPU(struct memcg_stock_pcp, memcg_stock);
@@ -23285,7 +23014,7 @@ index 4be518d4e68a..724240ca2f35 100644
  static DEFINE_MUTEX(percpu_charge_mutex);
  
  /**
-@@ -1746,7 +1750,7 @@ static bool consume_stock(struct mem_cgroup *memcg, unsigned int nr_pages)
+@@ -1746,7 +1750,7 @@
  	if (nr_pages > CHARGE_BATCH)
  		return ret;
  
@@ -23294,7 +23023,7 @@ index 4be518d4e68a..724240ca2f35 100644
  
  	stock = this_cpu_ptr(&memcg_stock);
  	if (memcg == stock->cached && stock->nr_pages >= nr_pages) {
-@@ -1754,7 +1758,7 @@ static bool consume_stock(struct mem_cgroup *memcg, unsigned int nr_pages)
+@@ -1754,7 +1758,7 @@
  		ret = true;
  	}
  
@@ -23303,7 +23032,7 @@ index 4be518d4e68a..724240ca2f35 100644
  
  	return ret;
  }
-@@ -1781,13 +1785,13 @@ static void drain_local_stock(struct work_struct *dummy)
+@@ -1781,13 +1785,13 @@
  	struct memcg_stock_pcp *stock;
  	unsigned long flags;
  
@@ -23319,7 +23048,7 @@ index 4be518d4e68a..724240ca2f35 100644
  }
  
  /*
-@@ -1799,7 +1803,7 @@ static void refill_stock(struct mem_cgroup *memcg, unsigned int nr_pages)
+@@ -1799,7 +1803,7 @@
  	struct memcg_stock_pcp *stock;
  	unsigned long flags;
  
@@ -23328,7 +23057,7 @@ index 4be518d4e68a..724240ca2f35 100644
  
  	stock = this_cpu_ptr(&memcg_stock);
  	if (stock->cached != memcg) { /* reset if necessary */
-@@ -1808,7 +1812,7 @@ static void refill_stock(struct mem_cgroup *memcg, unsigned int nr_pages)
+@@ -1808,7 +1812,7 @@
  	}
  	stock->nr_pages += nr_pages;
  
@@ -23337,7 +23066,7 @@ index 4be518d4e68a..724240ca2f35 100644
  }
  
  /*
-@@ -1824,7 +1828,7 @@ static void drain_all_stock(struct mem_cgroup *root_memcg)
+@@ -1824,7 +1828,7 @@
  		return;
  	/* Notify other cpus that system-wide "drain" is running */
  	get_online_cpus();
@@ -23346,7 +23075,7 @@ index 4be518d4e68a..724240ca2f35 100644
  	for_each_online_cpu(cpu) {
  		struct memcg_stock_pcp *stock = &per_cpu(memcg_stock, cpu);
  		struct mem_cgroup *memcg;
-@@ -1841,7 +1845,7 @@ static void drain_all_stock(struct mem_cgroup *root_memcg)
+@@ -1841,7 +1845,7 @@
  				schedule_work_on(cpu, &stock->work);
  		}
  	}
@@ -23355,7 +23084,7 @@ index 4be518d4e68a..724240ca2f35 100644
  	put_online_cpus();
  	mutex_unlock(&percpu_charge_mutex);
  }
-@@ -4566,12 +4570,12 @@ static int mem_cgroup_move_account(struct page *page,
+@@ -4575,12 +4579,12 @@
  
  	ret = 0;
  
@@ -23370,7 +23099,7 @@ index 4be518d4e68a..724240ca2f35 100644
  out_unlock:
  	unlock_page(page);
  out:
-@@ -5444,10 +5448,10 @@ void mem_cgroup_commit_charge(struct page *page, struct mem_cgroup *memcg,
+@@ -5453,10 +5457,10 @@
  
  	commit_charge(page, memcg, lrucare);
  
@@ -23383,7 +23112,7 @@ index 4be518d4e68a..724240ca2f35 100644
  
  	if (do_memsw_account() && PageSwapCache(page)) {
  		swp_entry_t entry = { .val = page_private(page) };
-@@ -5503,14 +5507,14 @@ static void uncharge_batch(struct mem_cgroup *memcg, unsigned long pgpgout,
+@@ -5512,14 +5516,14 @@
  		memcg_oom_recover(memcg);
  	}
  
@@ -23400,7 +23129,7 @@ index 4be518d4e68a..724240ca2f35 100644
  
  	if (!mem_cgroup_is_root(memcg))
  		css_put_many(&memcg->css, nr_pages);
-@@ -5665,10 +5669,10 @@ void mem_cgroup_migrate(struct page *oldpage, struct page *newpage)
+@@ -5674,10 +5678,10 @@
  
  	commit_charge(newpage, memcg, false);
  
@@ -23413,7 +23142,7 @@ index 4be518d4e68a..724240ca2f35 100644
  }
  
  DEFINE_STATIC_KEY_FALSE(memcg_sockets_enabled_key);
-@@ -5845,6 +5849,7 @@ void mem_cgroup_swapout(struct page *page, swp_entry_t entry)
+@@ -5854,6 +5858,7 @@
  {
  	struct mem_cgroup *memcg, *swap_memcg;
  	unsigned short oldid;
@@ -23421,7 +23150,7 @@ index 4be518d4e68a..724240ca2f35 100644
  
  	VM_BUG_ON_PAGE(PageLRU(page), page);
  	VM_BUG_ON_PAGE(page_count(page), page);
-@@ -5885,12 +5890,16 @@ void mem_cgroup_swapout(struct page *page, swp_entry_t entry)
+@@ -5894,12 +5899,16 @@
  	 * important here to have the interrupts disabled because it is the
  	 * only synchronisation we have for udpating the per-CPU variables.
  	 */
@@ -23438,11 +23167,10 @@ index 4be518d4e68a..724240ca2f35 100644
  }
  
  /*
-diff --git a/mm/mmu_context.c b/mm/mmu_context.c
-index 6f4d27c5bb32..5cd25c745a8f 100644
---- a/mm/mmu_context.c
-+++ b/mm/mmu_context.c
-@@ -23,6 +23,7 @@ void use_mm(struct mm_struct *mm)
+diff -Nur linux-4.8.15.orig/mm/mmu_context.c linux-4.8.15/mm/mmu_context.c
+--- linux-4.8.15.orig/mm/mmu_context.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/mm/mmu_context.c	2017-01-01 17:07:16.107431847 +0100
+@@ -23,6 +23,7 @@
  	struct task_struct *tsk = current;
  
  	task_lock(tsk);
@@ -23450,7 +23178,7 @@ index 6f4d27c5bb32..5cd25c745a8f 100644
  	active_mm = tsk->active_mm;
  	if (active_mm != mm) {
  		atomic_inc(&mm->mm_count);
-@@ -30,6 +31,7 @@ void use_mm(struct mm_struct *mm)
+@@ -30,6 +31,7 @@
  	}
  	tsk->mm = mm;
  	switch_mm(active_mm, mm, tsk);
@@ -23458,10 +23186,9 @@ index 6f4d27c5bb32..5cd25c745a8f 100644
  	task_unlock(tsk);
  #ifdef finish_arch_post_lock_switch
  	finish_arch_post_lock_switch();
-diff --git a/mm/page_alloc.c b/mm/page_alloc.c
-index a2214c64ed3c..4be4d5d66f73 100644
---- a/mm/page_alloc.c
-+++ b/mm/page_alloc.c
+diff -Nur linux-4.8.15.orig/mm/page_alloc.c linux-4.8.15/mm/page_alloc.c
+--- linux-4.8.15.orig/mm/page_alloc.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/mm/page_alloc.c	2017-01-01 17:07:16.111432108 +0100
 @@ -61,6 +61,7 @@
  #include <linux/page_ext.h>
  #include <linux/hugetlb.h>
@@ -23470,7 +23197,7 @@ index a2214c64ed3c..4be4d5d66f73 100644
  #include <linux/page_owner.h>
  #include <linux/kthread.h>
  #include <linux/memcontrol.h>
-@@ -276,6 +277,18 @@ EXPORT_SYMBOL(nr_node_ids);
+@@ -276,6 +277,18 @@
  EXPORT_SYMBOL(nr_online_nodes);
  #endif
  
@@ -23489,7 +23216,7 @@ index a2214c64ed3c..4be4d5d66f73 100644
  int page_group_by_mobility_disabled __read_mostly;
  
  #ifdef CONFIG_DEFERRED_STRUCT_PAGE_INIT
-@@ -1056,7 +1069,7 @@ static bool bulkfree_pcp_prepare(struct page *page)
+@@ -1056,7 +1069,7 @@
  #endif /* CONFIG_DEBUG_VM */
  
  /*
@@ -23498,7 +23225,7 @@ index a2214c64ed3c..4be4d5d66f73 100644
   * Assumes all pages on list are in same zone, and of same order.
   * count is the number of pages to free.
   *
-@@ -1067,19 +1080,58 @@ static bool bulkfree_pcp_prepare(struct page *page)
+@@ -1067,19 +1080,58 @@
   * pinned" detection logic.
   */
  static void free_pcppages_bulk(struct zone *zone, int count,
@@ -23561,7 +23288,7 @@ index a2214c64ed3c..4be4d5d66f73 100644
  	while (count) {
  		struct page *page;
  		struct list_head *list;
-@@ -1095,7 +1147,7 @@ static void free_pcppages_bulk(struct zone *zone, int count,
+@@ -1095,7 +1147,7 @@
  			batch_free++;
  			if (++migratetype == MIGRATE_PCPTYPES)
  				migratetype = 0;
@@ -23570,7 +23297,7 @@ index a2214c64ed3c..4be4d5d66f73 100644
  		} while (list_empty(list));
  
  		/* This is the only non-empty list. Free them all. */
-@@ -1103,27 +1155,12 @@ static void free_pcppages_bulk(struct zone *zone, int count,
+@@ -1103,27 +1155,12 @@
  			batch_free = count;
  
  		do {
@@ -23599,7 +23326,7 @@ index a2214c64ed3c..4be4d5d66f73 100644
  }
  
  static void free_one_page(struct zone *zone,
-@@ -1132,7 +1169,9 @@ static void free_one_page(struct zone *zone,
+@@ -1132,7 +1169,9 @@
  				int migratetype)
  {
  	unsigned long nr_scanned;
@@ -23610,7 +23337,7 @@ index a2214c64ed3c..4be4d5d66f73 100644
  	nr_scanned = node_page_state(zone->zone_pgdat, NR_PAGES_SCANNED);
  	if (nr_scanned)
  		__mod_node_page_state(zone->zone_pgdat, NR_PAGES_SCANNED, -nr_scanned);
-@@ -1142,7 +1181,7 @@ static void free_one_page(struct zone *zone,
+@@ -1142,7 +1181,7 @@
  		migratetype = get_pfnblock_migratetype(page, pfn);
  	}
  	__free_one_page(page, pfn, zone, order, migratetype);
@@ -23619,7 +23346,7 @@ index a2214c64ed3c..4be4d5d66f73 100644
  }
  
  static void __meminit __init_single_page(struct page *page, unsigned long pfn,
-@@ -1228,10 +1267,10 @@ static void __free_pages_ok(struct page *page, unsigned int order)
+@@ -1228,10 +1267,10 @@
  		return;
  
  	migratetype = get_pfnblock_migratetype(page, pfn);
@@ -23632,7 +23359,7 @@ index a2214c64ed3c..4be4d5d66f73 100644
  }
  
  static void __init __free_pages_boot_core(struct page *page, unsigned int order)
-@@ -2219,16 +2258,18 @@ static int rmqueue_bulk(struct zone *zone, unsigned int order,
+@@ -2219,16 +2258,18 @@
  void drain_zone_pages(struct zone *zone, struct per_cpu_pages *pcp)
  {
  	unsigned long flags;
@@ -23654,7 +23381,7 @@ index a2214c64ed3c..4be4d5d66f73 100644
  }
  #endif
  
-@@ -2244,16 +2285,21 @@ static void drain_pages_zone(unsigned int cpu, struct zone *zone)
+@@ -2244,16 +2285,21 @@
  	unsigned long flags;
  	struct per_cpu_pageset *pset;
  	struct per_cpu_pages *pcp;
@@ -23680,7 +23407,7 @@ index a2214c64ed3c..4be4d5d66f73 100644
  }
  
  /*
-@@ -2339,8 +2385,17 @@ void drain_all_pages(struct zone *zone)
+@@ -2339,8 +2385,17 @@
  		else
  			cpumask_clear_cpu(cpu, &cpus_with_pcps);
  	}
@@ -23698,7 +23425,7 @@ index a2214c64ed3c..4be4d5d66f73 100644
  }
  
  #ifdef CONFIG_HIBERNATION
-@@ -2400,7 +2455,7 @@ void free_hot_cold_page(struct page *page, bool cold)
+@@ -2400,7 +2455,7 @@
  
  	migratetype = get_pfnblock_migratetype(page, pfn);
  	set_pcppage_migratetype(page, migratetype);
@@ -23707,7 +23434,7 @@ index a2214c64ed3c..4be4d5d66f73 100644
  	__count_vm_event(PGFREE);
  
  	/*
-@@ -2426,12 +2481,17 @@ void free_hot_cold_page(struct page *page, bool cold)
+@@ -2426,12 +2481,17 @@
  	pcp->count++;
  	if (pcp->count >= pcp->high) {
  		unsigned long batch = READ_ONCE(pcp->batch);
@@ -23727,7 +23454,7 @@ index a2214c64ed3c..4be4d5d66f73 100644
  }
  
  /*
-@@ -2568,7 +2628,7 @@ struct page *buffered_rmqueue(struct zone *preferred_zone,
+@@ -2568,7 +2628,7 @@
  		struct per_cpu_pages *pcp;
  		struct list_head *list;
  
@@ -23736,7 +23463,7 @@ index a2214c64ed3c..4be4d5d66f73 100644
  		do {
  			pcp = &this_cpu_ptr(zone->pageset)->pcp;
  			list = &pcp->lists[migratetype];
-@@ -2595,7 +2655,7 @@ struct page *buffered_rmqueue(struct zone *preferred_zone,
+@@ -2595,7 +2655,7 @@
  		 * allocate greater than order-1 page units with __GFP_NOFAIL.
  		 */
  		WARN_ON_ONCE((gfp_flags & __GFP_NOFAIL) && (order > 1));
@@ -23745,7 +23472,7 @@ index a2214c64ed3c..4be4d5d66f73 100644
  
  		do {
  			page = NULL;
-@@ -2607,22 +2667,24 @@ struct page *buffered_rmqueue(struct zone *preferred_zone,
+@@ -2607,22 +2667,24 @@
  			if (!page)
  				page = __rmqueue(zone, order, migratetype);
  		} while (page && check_new_pages(page, order));
@@ -23774,7 +23501,7 @@ index a2214c64ed3c..4be4d5d66f73 100644
  	return NULL;
  }
  
-@@ -6528,7 +6590,9 @@ static int page_alloc_cpu_notify(struct notifier_block *self,
+@@ -6538,7 +6600,9 @@
  	int cpu = (unsigned long)hcpu;
  
  	if (action == CPU_DEAD || action == CPU_DEAD_FROZEN) {
@@ -23784,7 +23511,7 @@ index a2214c64ed3c..4be4d5d66f73 100644
  		drain_pages(cpu);
  
  		/*
-@@ -6554,6 +6618,7 @@ static int page_alloc_cpu_notify(struct notifier_block *self,
+@@ -6564,6 +6628,7 @@
  void __init page_alloc_init(void)
  {
  	hotcpu_notifier(page_alloc_cpu_notify, 0);
@@ -23792,7 +23519,7 @@ index a2214c64ed3c..4be4d5d66f73 100644
  }
  
  /*
-@@ -7370,7 +7435,7 @@ void zone_pcp_reset(struct zone *zone)
+@@ -7380,7 +7445,7 @@
  	struct per_cpu_pageset *pset;
  
  	/* avoid races with drain_pages()  */
@@ -23801,7 +23528,7 @@ index a2214c64ed3c..4be4d5d66f73 100644
  	if (zone->pageset != &boot_pageset) {
  		for_each_online_cpu(cpu) {
  			pset = per_cpu_ptr(zone->pageset, cpu);
-@@ -7379,7 +7444,7 @@ void zone_pcp_reset(struct zone *zone)
+@@ -7389,7 +7454,7 @@
  		free_percpu(zone->pageset);
  		zone->pageset = &boot_pageset;
  	}
@@ -23810,11 +23537,10 @@ index a2214c64ed3c..4be4d5d66f73 100644
  }
  
  #ifdef CONFIG_MEMORY_HOTREMOVE
-diff --git a/mm/slab.h b/mm/slab.h
-index 9653f2e2591a..b7371e026627 100644
---- a/mm/slab.h
-+++ b/mm/slab.h
-@@ -426,7 +426,11 @@ static inline void slab_post_alloc_hook(struct kmem_cache *s, gfp_t flags,
+diff -Nur linux-4.8.15.orig/mm/slab.h linux-4.8.15/mm/slab.h
+--- linux-4.8.15.orig/mm/slab.h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/mm/slab.h	2017-01-01 17:07:16.111432108 +0100
+@@ -426,7 +426,11 @@
   * The slab lists for all objects.
   */
  struct kmem_cache_node {
@@ -23826,11 +23552,10 @@ index 9653f2e2591a..b7371e026627 100644
  
  #ifdef CONFIG_SLAB
  	struct list_head slabs_partial;	/* partial list first, better asm code */
-diff --git a/mm/slub.c b/mm/slub.c
-index 9adae58462f8..4b386747f050 100644
---- a/mm/slub.c
-+++ b/mm/slub.c
-@@ -1145,7 +1145,7 @@ static noinline int free_debug_processing(
+diff -Nur linux-4.8.15.orig/mm/slub.c linux-4.8.15/mm/slub.c
+--- linux-4.8.15.orig/mm/slub.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/mm/slub.c	2017-01-01 17:07:16.111432108 +0100
+@@ -1145,7 +1145,7 @@
  	unsigned long uninitialized_var(flags);
  	int ret = 0;
  
@@ -23839,7 +23564,7 @@ index 9adae58462f8..4b386747f050 100644
  	slab_lock(page);
  
  	if (s->flags & SLAB_CONSISTENCY_CHECKS) {
-@@ -1180,7 +1180,7 @@ static noinline int free_debug_processing(
+@@ -1180,7 +1180,7 @@
  			 bulk_cnt, cnt);
  
  	slab_unlock(page);
@@ -23848,7 +23573,7 @@ index 9adae58462f8..4b386747f050 100644
  	if (!ret)
  		slab_fix(s, "Object at 0x%p not freed", object);
  	return ret;
-@@ -1308,6 +1308,12 @@ static inline void dec_slabs_node(struct kmem_cache *s, int node,
+@@ -1308,6 +1308,12 @@
  
  #endif /* CONFIG_SLUB_DEBUG */
  
@@ -23861,7 +23586,7 @@ index 9adae58462f8..4b386747f050 100644
  /*
   * Hooks for other subsystems that check memory allocations. In a typical
   * production configuration these hooks all should produce no code at all.
-@@ -1527,10 +1533,17 @@ static struct page *allocate_slab(struct kmem_cache *s, gfp_t flags, int node)
+@@ -1527,10 +1533,17 @@
  	void *start, *p;
  	int idx, order;
  	bool shuffle;
@@ -23879,7 +23604,7 @@ index 9adae58462f8..4b386747f050 100644
  		local_irq_enable();
  
  	flags |= s->allocflags;
-@@ -1605,7 +1618,7 @@ static struct page *allocate_slab(struct kmem_cache *s, gfp_t flags, int node)
+@@ -1605,7 +1618,7 @@
  	page->frozen = 1;
  
  out:
@@ -23888,7 +23613,7 @@ index 9adae58462f8..4b386747f050 100644
  		local_irq_disable();
  	if (!page)
  		return NULL;
-@@ -1664,6 +1677,16 @@ static void __free_slab(struct kmem_cache *s, struct page *page)
+@@ -1664,6 +1677,16 @@
  	__free_pages(page, order);
  }
  
@@ -23905,7 +23630,7 @@ index 9adae58462f8..4b386747f050 100644
  #define need_reserve_slab_rcu						\
  	(sizeof(((struct page *)NULL)->lru) < sizeof(struct rcu_head))
  
-@@ -1695,6 +1718,12 @@ static void free_slab(struct kmem_cache *s, struct page *page)
+@@ -1695,6 +1718,12 @@
  		}
  
  		call_rcu(head, rcu_free_slab);
@@ -23918,7 +23643,7 @@ index 9adae58462f8..4b386747f050 100644
  	} else
  		__free_slab(s, page);
  }
-@@ -1802,7 +1831,7 @@ static void *get_partial_node(struct kmem_cache *s, struct kmem_cache_node *n,
+@@ -1802,7 +1831,7 @@
  	if (!n || !n->nr_partial)
  		return NULL;
  
@@ -23927,7 +23652,7 @@ index 9adae58462f8..4b386747f050 100644
  	list_for_each_entry_safe(page, page2, &n->partial, lru) {
  		void *t;
  
-@@ -1827,7 +1856,7 @@ static void *get_partial_node(struct kmem_cache *s, struct kmem_cache_node *n,
+@@ -1827,7 +1856,7 @@
  			break;
  
  	}
@@ -23936,7 +23661,7 @@ index 9adae58462f8..4b386747f050 100644
  	return object;
  }
  
-@@ -2073,7 +2102,7 @@ static void deactivate_slab(struct kmem_cache *s, struct page *page,
+@@ -2073,7 +2102,7 @@
  			 * that acquire_slab() will see a slab page that
  			 * is frozen
  			 */
@@ -23945,7 +23670,7 @@ index 9adae58462f8..4b386747f050 100644
  		}
  	} else {
  		m = M_FULL;
-@@ -2084,7 +2113,7 @@ static void deactivate_slab(struct kmem_cache *s, struct page *page,
+@@ -2084,7 +2113,7 @@
  			 * slabs from diagnostic functions will not see
  			 * any frozen slabs.
  			 */
@@ -23954,7 +23679,7 @@ index 9adae58462f8..4b386747f050 100644
  		}
  	}
  
-@@ -2119,7 +2148,7 @@ static void deactivate_slab(struct kmem_cache *s, struct page *page,
+@@ -2119,7 +2148,7 @@
  		goto redo;
  
  	if (lock)
@@ -23963,7 +23688,7 @@ index 9adae58462f8..4b386747f050 100644
  
  	if (m == M_FREE) {
  		stat(s, DEACTIVATE_EMPTY);
-@@ -2151,10 +2180,10 @@ static void unfreeze_partials(struct kmem_cache *s,
+@@ -2151,10 +2180,10 @@
  		n2 = get_node(s, page_to_nid(page));
  		if (n != n2) {
  			if (n)
@@ -23976,7 +23701,7 @@ index 9adae58462f8..4b386747f050 100644
  		}
  
  		do {
-@@ -2183,7 +2212,7 @@ static void unfreeze_partials(struct kmem_cache *s,
+@@ -2183,7 +2212,7 @@
  	}
  
  	if (n)
@@ -23985,7 +23710,7 @@ index 9adae58462f8..4b386747f050 100644
  
  	while (discard_page) {
  		page = discard_page;
-@@ -2222,14 +2251,21 @@ static void put_cpu_partial(struct kmem_cache *s, struct page *page, int drain)
+@@ -2222,14 +2251,21 @@
  			pobjects = oldpage->pobjects;
  			pages = oldpage->pages;
  			if (drain && pobjects > s->cpu_partial) {
@@ -24007,7 +23732,7 @@ index 9adae58462f8..4b386747f050 100644
  				oldpage = NULL;
  				pobjects = 0;
  				pages = 0;
-@@ -2301,7 +2337,22 @@ static bool has_cpu_slab(int cpu, void *info)
+@@ -2301,7 +2337,22 @@
  
  static void flush_all(struct kmem_cache *s)
  {
@@ -24030,7 +23755,7 @@ index 9adae58462f8..4b386747f050 100644
  }
  
  /*
-@@ -2337,10 +2388,10 @@ static unsigned long count_partial(struct kmem_cache_node *n,
+@@ -2337,10 +2388,10 @@
  	unsigned long x = 0;
  	struct page *page;
  
@@ -24043,7 +23768,7 @@ index 9adae58462f8..4b386747f050 100644
  	return x;
  }
  #endif /* CONFIG_SLUB_DEBUG || CONFIG_SYSFS */
-@@ -2478,8 +2529,10 @@ static inline void *get_freelist(struct kmem_cache *s, struct page *page)
+@@ -2478,8 +2529,10 @@
   * already disabled (which is the case for bulk allocation).
   */
  static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,
@@ -24055,7 +23780,7 @@ index 9adae58462f8..4b386747f050 100644
  	void *freelist;
  	struct page *page;
  
-@@ -2539,6 +2592,13 @@ static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,
+@@ -2539,6 +2592,13 @@
  	VM_BUG_ON(!c->page->frozen);
  	c->freelist = get_freepointer(s, freelist);
  	c->tid = next_tid(c->tid);
@@ -24069,7 +23794,7 @@ index 9adae58462f8..4b386747f050 100644
  	return freelist;
  
  new_slab:
-@@ -2570,7 +2630,7 @@ static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,
+@@ -2570,7 +2630,7 @@
  	deactivate_slab(s, page, get_freepointer(s, freelist));
  	c->page = NULL;
  	c->freelist = NULL;
@@ -24078,7 +23803,7 @@ index 9adae58462f8..4b386747f050 100644
  }
  
  /*
-@@ -2582,6 +2642,7 @@ static void *__slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,
+@@ -2582,6 +2642,7 @@
  {
  	void *p;
  	unsigned long flags;
@@ -24086,7 +23811,7 @@ index 9adae58462f8..4b386747f050 100644
  
  	local_irq_save(flags);
  #ifdef CONFIG_PREEMPT
-@@ -2593,8 +2654,9 @@ static void *__slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,
+@@ -2593,8 +2654,9 @@
  	c = this_cpu_ptr(s->cpu_slab);
  #endif
  
@@ -24097,7 +23822,7 @@ index 9adae58462f8..4b386747f050 100644
  	return p;
  }
  
-@@ -2780,7 +2842,7 @@ static void __slab_free(struct kmem_cache *s, struct page *page,
+@@ -2780,7 +2842,7 @@
  
  	do {
  		if (unlikely(n)) {
@@ -24106,7 +23831,7 @@ index 9adae58462f8..4b386747f050 100644
  			n = NULL;
  		}
  		prior = page->freelist;
-@@ -2812,7 +2874,7 @@ static void __slab_free(struct kmem_cache *s, struct page *page,
+@@ -2812,7 +2874,7 @@
  				 * Otherwise the list_lock will synchronize with
  				 * other processors updating the list of slabs.
  				 */
@@ -24115,7 +23840,7 @@ index 9adae58462f8..4b386747f050 100644
  
  			}
  		}
-@@ -2854,7 +2916,7 @@ static void __slab_free(struct kmem_cache *s, struct page *page,
+@@ -2854,7 +2916,7 @@
  		add_partial(n, page, DEACTIVATE_TO_TAIL);
  		stat(s, FREE_ADD_PARTIAL);
  	}
@@ -24124,7 +23849,7 @@ index 9adae58462f8..4b386747f050 100644
  	return;
  
  slab_empty:
-@@ -2869,7 +2931,7 @@ static void __slab_free(struct kmem_cache *s, struct page *page,
+@@ -2869,7 +2931,7 @@
  		remove_full(s, n, page);
  	}
  
@@ -24133,7 +23858,7 @@ index 9adae58462f8..4b386747f050 100644
  	stat(s, FREE_SLAB);
  	discard_slab(s, page);
  }
-@@ -3074,6 +3136,7 @@ int kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size,
+@@ -3074,6 +3136,7 @@
  			  void **p)
  {
  	struct kmem_cache_cpu *c;
@@ -24141,7 +23866,7 @@ index 9adae58462f8..4b386747f050 100644
  	int i;
  
  	/* memcg and kmem_cache debug support */
-@@ -3097,7 +3160,7 @@ int kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size,
+@@ -3097,7 +3160,7 @@
  			 * of re-populating per CPU c->freelist
  			 */
  			p[i] = ___slab_alloc(s, flags, NUMA_NO_NODE,
@@ -24150,7 +23875,7 @@ index 9adae58462f8..4b386747f050 100644
  			if (unlikely(!p[i]))
  				goto error;
  
-@@ -3109,6 +3172,7 @@ int kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size,
+@@ -3109,6 +3172,7 @@
  	}
  	c->tid = next_tid(c->tid);
  	local_irq_enable();
@@ -24158,7 +23883,7 @@ index 9adae58462f8..4b386747f050 100644
  
  	/* Clear memory outside IRQ disabled fastpath loop */
  	if (unlikely(flags & __GFP_ZERO)) {
-@@ -3256,7 +3320,7 @@ static void
+@@ -3256,7 +3320,7 @@
  init_kmem_cache_node(struct kmem_cache_node *n)
  {
  	n->nr_partial = 0;
@@ -24167,7 +23892,7 @@ index 9adae58462f8..4b386747f050 100644
  	INIT_LIST_HEAD(&n->partial);
  #ifdef CONFIG_SLUB_DEBUG
  	atomic_long_set(&n->nr_slabs, 0);
-@@ -3600,6 +3664,10 @@ static void list_slab_objects(struct kmem_cache *s, struct page *page,
+@@ -3600,6 +3664,10 @@
  							const char *text)
  {
  #ifdef CONFIG_SLUB_DEBUG
@@ -24178,7 +23903,7 @@ index 9adae58462f8..4b386747f050 100644
  	void *addr = page_address(page);
  	void *p;
  	unsigned long *map = kzalloc(BITS_TO_LONGS(page->objects) *
-@@ -3620,6 +3688,7 @@ static void list_slab_objects(struct kmem_cache *s, struct page *page,
+@@ -3620,6 +3688,7 @@
  	slab_unlock(page);
  	kfree(map);
  #endif
@@ -24186,7 +23911,7 @@ index 9adae58462f8..4b386747f050 100644
  }
  
  /*
-@@ -3633,7 +3702,7 @@ static void free_partial(struct kmem_cache *s, struct kmem_cache_node *n)
+@@ -3633,7 +3702,7 @@
  	struct page *page, *h;
  
  	BUG_ON(irqs_disabled());
@@ -24195,7 +23920,7 @@ index 9adae58462f8..4b386747f050 100644
  	list_for_each_entry_safe(page, h, &n->partial, lru) {
  		if (!page->inuse) {
  			remove_partial(n, page);
-@@ -3643,7 +3712,7 @@ static void free_partial(struct kmem_cache *s, struct kmem_cache_node *n)
+@@ -3643,7 +3712,7 @@
  			"Objects remaining in %s on __kmem_cache_shutdown()");
  		}
  	}
@@ -24204,7 +23929,7 @@ index 9adae58462f8..4b386747f050 100644
  
  	list_for_each_entry_safe(page, h, &discard, lru)
  		discard_slab(s, page);
-@@ -3901,7 +3970,7 @@ int __kmem_cache_shrink(struct kmem_cache *s, bool deactivate)
+@@ -3901,7 +3970,7 @@
  		for (i = 0; i < SHRINK_PROMOTE_MAX; i++)
  			INIT_LIST_HEAD(promote + i);
  
@@ -24213,7 +23938,7 @@ index 9adae58462f8..4b386747f050 100644
  
  		/*
  		 * Build lists of slabs to discard or promote.
-@@ -3932,7 +4001,7 @@ int __kmem_cache_shrink(struct kmem_cache *s, bool deactivate)
+@@ -3932,7 +4001,7 @@
  		for (i = SHRINK_PROMOTE_MAX - 1; i >= 0; i--)
  			list_splice(promote + i, &n->partial);
  
@@ -24222,7 +23947,7 @@ index 9adae58462f8..4b386747f050 100644
  
  		/* Release empty slabs */
  		list_for_each_entry_safe(page, t, &discard, lru)
-@@ -4108,6 +4177,12 @@ void __init kmem_cache_init(void)
+@@ -4108,6 +4177,12 @@
  {
  	static __initdata struct kmem_cache boot_kmem_cache,
  		boot_kmem_cache_node;
@@ -24235,7 +23960,7 @@ index 9adae58462f8..4b386747f050 100644
  
  	if (debug_guardpage_minorder())
  		slub_max_order = 0;
-@@ -4354,7 +4429,7 @@ static int validate_slab_node(struct kmem_cache *s,
+@@ -4354,7 +4429,7 @@
  	struct page *page;
  	unsigned long flags;
  
@@ -24244,7 +23969,7 @@ index 9adae58462f8..4b386747f050 100644
  
  	list_for_each_entry(page, &n->partial, lru) {
  		validate_slab_slab(s, page, map);
-@@ -4376,7 +4451,7 @@ static int validate_slab_node(struct kmem_cache *s,
+@@ -4376,7 +4451,7 @@
  		       s->name, count, atomic_long_read(&n->nr_slabs));
  
  out:
@@ -24253,7 +23978,7 @@ index 9adae58462f8..4b386747f050 100644
  	return count;
  }
  
-@@ -4564,12 +4639,12 @@ static int list_locations(struct kmem_cache *s, char *buf,
+@@ -4564,12 +4639,12 @@
  		if (!atomic_long_read(&n->nr_slabs))
  			continue;
  
@@ -24268,10 +23993,9 @@ index 9adae58462f8..4b386747f050 100644
  	}
  
  	for (i = 0; i < t.count; i++) {
-diff --git a/mm/swap.c b/mm/swap.c
-index 75c63bb2a1da..93fe549eb11e 100644
---- a/mm/swap.c
-+++ b/mm/swap.c
+diff -Nur linux-4.8.15.orig/mm/swap.c linux-4.8.15/mm/swap.c
+--- linux-4.8.15.orig/mm/swap.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/mm/swap.c	2017-01-01 17:07:16.111432108 +0100
 @@ -32,6 +32,7 @@
  #include <linux/memcontrol.h>
  #include <linux/gfp.h>
@@ -24280,7 +24004,7 @@ index 75c63bb2a1da..93fe549eb11e 100644
  #include <linux/hugetlb.h>
  #include <linux/page_idle.h>
  
-@@ -50,6 +51,8 @@ static DEFINE_PER_CPU(struct pagevec, lru_deactivate_pvecs);
+@@ -50,6 +51,8 @@
  #ifdef CONFIG_SMP
  static DEFINE_PER_CPU(struct pagevec, activate_page_pvecs);
  #endif
@@ -24289,7 +24013,7 @@ index 75c63bb2a1da..93fe549eb11e 100644
  
  /*
   * This path almost never happens for VM activity - pages are normally
-@@ -240,11 +243,11 @@ void rotate_reclaimable_page(struct page *page)
+@@ -240,11 +243,11 @@
  		unsigned long flags;
  
  		get_page(page);
@@ -24303,7 +24027,7 @@ index 75c63bb2a1da..93fe549eb11e 100644
  	}
  }
  
-@@ -294,12 +297,13 @@ void activate_page(struct page *page)
+@@ -294,12 +297,13 @@
  {
  	page = compound_head(page);
  	if (PageLRU(page) && !PageActive(page) && !PageUnevictable(page)) {
@@ -24319,7 +24043,7 @@ index 75c63bb2a1da..93fe549eb11e 100644
  	}
  }
  
-@@ -326,7 +330,7 @@ void activate_page(struct page *page)
+@@ -326,7 +330,7 @@
  
  static void __lru_cache_activate_page(struct page *page)
  {
@@ -24328,7 +24052,7 @@ index 75c63bb2a1da..93fe549eb11e 100644
  	int i;
  
  	/*
-@@ -348,7 +352,7 @@ static void __lru_cache_activate_page(struct page *page)
+@@ -348,7 +352,7 @@
  		}
  	}
  
@@ -24337,7 +24061,7 @@ index 75c63bb2a1da..93fe549eb11e 100644
  }
  
  /*
-@@ -390,12 +394,12 @@ EXPORT_SYMBOL(mark_page_accessed);
+@@ -390,12 +394,12 @@
  
  static void __lru_cache_add(struct page *page)
  {
@@ -24352,7 +24076,7 @@ index 75c63bb2a1da..93fe549eb11e 100644
  }
  
  /**
-@@ -593,9 +597,15 @@ void lru_add_drain_cpu(int cpu)
+@@ -593,9 +597,15 @@
  		unsigned long flags;
  
  		/* No harm done if a racing interrupt already did this */
@@ -24370,7 +24094,7 @@ index 75c63bb2a1da..93fe549eb11e 100644
  	}
  
  	pvec = &per_cpu(lru_deactivate_file_pvecs, cpu);
-@@ -627,11 +637,12 @@ void deactivate_file_page(struct page *page)
+@@ -627,11 +637,12 @@
  		return;
  
  	if (likely(get_page_unless_zero(page))) {
@@ -24385,7 +24109,7 @@ index 75c63bb2a1da..93fe549eb11e 100644
  	}
  }
  
-@@ -646,27 +657,31 @@ void deactivate_file_page(struct page *page)
+@@ -646,27 +657,31 @@
  void deactivate_page(struct page *page)
  {
  	if (PageLRU(page) && PageActive(page) && !PageUnevictable(page)) {
@@ -24424,7 +24148,7 @@ index 75c63bb2a1da..93fe549eb11e 100644
  
  /*
   * lru_add_drain_wq is used to do lru_add_drain_all() from a WQ_MEM_RECLAIM
-@@ -686,6 +701,22 @@ static int __init lru_init(void)
+@@ -686,6 +701,22 @@
  }
  early_initcall(lru_init);
  
@@ -24447,7 +24171,7 @@ index 75c63bb2a1da..93fe549eb11e 100644
  void lru_add_drain_all(void)
  {
  	static DEFINE_MUTEX(lock);
-@@ -697,21 +728,18 @@ void lru_add_drain_all(void)
+@@ -697,21 +728,18 @@
  	cpumask_clear(&has_work);
  
  	for_each_online_cpu(cpu) {
@@ -24473,11 +24197,10 @@ index 75c63bb2a1da..93fe549eb11e 100644
  
  	put_online_cpus();
  	mutex_unlock(&lock);
-diff --git a/mm/truncate.c b/mm/truncate.c
-index a01cce450a26..4bda37604f99 100644
---- a/mm/truncate.c
-+++ b/mm/truncate.c
-@@ -62,9 +62,12 @@ static void clear_exceptional_entry(struct address_space *mapping,
+diff -Nur linux-4.8.15.orig/mm/truncate.c linux-4.8.15/mm/truncate.c
+--- linux-4.8.15.orig/mm/truncate.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/mm/truncate.c	2017-01-01 17:07:16.115432374 +0100
+@@ -62,9 +62,12 @@
  	 * protected by mapping->tree_lock.
  	 */
  	if (!workingset_node_shadows(node) &&
@@ -24492,11 +24215,10 @@ index a01cce450a26..4bda37604f99 100644
  	__radix_tree_delete_node(&mapping->page_tree, node);
  unlock:
  	spin_unlock_irq(&mapping->tree_lock);
-diff --git a/mm/vmalloc.c b/mm/vmalloc.c
-index 91f44e78c516..06ec393bb97d 100644
---- a/mm/vmalloc.c
-+++ b/mm/vmalloc.c
-@@ -845,7 +845,7 @@ static void *new_vmap_block(unsigned int order, gfp_t gfp_mask)
+diff -Nur linux-4.8.15.orig/mm/vmalloc.c linux-4.8.15/mm/vmalloc.c
+--- linux-4.8.15.orig/mm/vmalloc.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/mm/vmalloc.c	2017-01-01 17:07:16.115432374 +0100
+@@ -845,7 +845,7 @@
  	struct vmap_block *vb;
  	struct vmap_area *va;
  	unsigned long vb_idx;
@@ -24505,7 +24227,7 @@ index 91f44e78c516..06ec393bb97d 100644
  	void *vaddr;
  
  	node = numa_node_id();
-@@ -888,11 +888,12 @@ static void *new_vmap_block(unsigned int order, gfp_t gfp_mask)
+@@ -888,11 +888,12 @@
  	BUG_ON(err);
  	radix_tree_preload_end();
  
@@ -24520,7 +24242,7 @@ index 91f44e78c516..06ec393bb97d 100644
  
  	return vaddr;
  }
-@@ -961,6 +962,7 @@ static void *vb_alloc(unsigned long size, gfp_t gfp_mask)
+@@ -961,6 +962,7 @@
  	struct vmap_block *vb;
  	void *vaddr = NULL;
  	unsigned int order;
@@ -24528,7 +24250,7 @@ index 91f44e78c516..06ec393bb97d 100644
  
  	BUG_ON(offset_in_page(size));
  	BUG_ON(size > PAGE_SIZE*VMAP_MAX_ALLOC);
-@@ -975,7 +977,8 @@ static void *vb_alloc(unsigned long size, gfp_t gfp_mask)
+@@ -975,7 +977,8 @@
  	order = get_order(size);
  
  	rcu_read_lock();
@@ -24538,7 +24260,7 @@ index 91f44e78c516..06ec393bb97d 100644
  	list_for_each_entry_rcu(vb, &vbq->free, free_list) {
  		unsigned long pages_off;
  
-@@ -998,7 +1001,7 @@ static void *vb_alloc(unsigned long size, gfp_t gfp_mask)
+@@ -998,7 +1001,7 @@
  		break;
  	}
  
@@ -24547,11 +24269,10 @@ index 91f44e78c516..06ec393bb97d 100644
  	rcu_read_unlock();
  
  	/* Allocate new block if nothing was found */
-diff --git a/mm/vmstat.c b/mm/vmstat.c
-index 89cec42d19ff..fb73631fb90b 100644
---- a/mm/vmstat.c
-+++ b/mm/vmstat.c
-@@ -245,6 +245,7 @@ void __mod_zone_page_state(struct zone *zone, enum zone_stat_item item,
+diff -Nur linux-4.8.15.orig/mm/vmstat.c linux-4.8.15/mm/vmstat.c
+--- linux-4.8.15.orig/mm/vmstat.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/mm/vmstat.c	2017-01-01 17:07:16.115432374 +0100
+@@ -245,6 +245,7 @@
  	long x;
  	long t;
  
@@ -24559,7 +24280,7 @@ index 89cec42d19ff..fb73631fb90b 100644
  	x = delta + __this_cpu_read(*p);
  
  	t = __this_cpu_read(pcp->stat_threshold);
-@@ -254,6 +255,7 @@ void __mod_zone_page_state(struct zone *zone, enum zone_stat_item item,
+@@ -254,6 +255,7 @@
  		x = 0;
  	}
  	__this_cpu_write(*p, x);
@@ -24567,7 +24288,7 @@ index 89cec42d19ff..fb73631fb90b 100644
  }
  EXPORT_SYMBOL(__mod_zone_page_state);
  
-@@ -265,6 +267,7 @@ void __mod_node_page_state(struct pglist_data *pgdat, enum node_stat_item item,
+@@ -265,6 +267,7 @@
  	long x;
  	long t;
  
@@ -24575,7 +24296,7 @@ index 89cec42d19ff..fb73631fb90b 100644
  	x = delta + __this_cpu_read(*p);
  
  	t = __this_cpu_read(pcp->stat_threshold);
-@@ -274,6 +277,7 @@ void __mod_node_page_state(struct pglist_data *pgdat, enum node_stat_item item,
+@@ -274,6 +277,7 @@
  		x = 0;
  	}
  	__this_cpu_write(*p, x);
@@ -24583,7 +24304,7 @@ index 89cec42d19ff..fb73631fb90b 100644
  }
  EXPORT_SYMBOL(__mod_node_page_state);
  
-@@ -306,6 +310,7 @@ void __inc_zone_state(struct zone *zone, enum zone_stat_item item)
+@@ -306,6 +310,7 @@
  	s8 __percpu *p = pcp->vm_stat_diff + item;
  	s8 v, t;
  
@@ -24591,7 +24312,7 @@ index 89cec42d19ff..fb73631fb90b 100644
  	v = __this_cpu_inc_return(*p);
  	t = __this_cpu_read(pcp->stat_threshold);
  	if (unlikely(v > t)) {
-@@ -314,6 +319,7 @@ void __inc_zone_state(struct zone *zone, enum zone_stat_item item)
+@@ -314,6 +319,7 @@
  		zone_page_state_add(v + overstep, zone, item);
  		__this_cpu_write(*p, -overstep);
  	}
@@ -24599,7 +24320,7 @@ index 89cec42d19ff..fb73631fb90b 100644
  }
  
  void __inc_node_state(struct pglist_data *pgdat, enum node_stat_item item)
-@@ -322,6 +328,7 @@ void __inc_node_state(struct pglist_data *pgdat, enum node_stat_item item)
+@@ -322,6 +328,7 @@
  	s8 __percpu *p = pcp->vm_node_stat_diff + item;
  	s8 v, t;
  
@@ -24607,7 +24328,7 @@ index 89cec42d19ff..fb73631fb90b 100644
  	v = __this_cpu_inc_return(*p);
  	t = __this_cpu_read(pcp->stat_threshold);
  	if (unlikely(v > t)) {
-@@ -330,6 +337,7 @@ void __inc_node_state(struct pglist_data *pgdat, enum node_stat_item item)
+@@ -330,6 +337,7 @@
  		node_page_state_add(v + overstep, pgdat, item);
  		__this_cpu_write(*p, -overstep);
  	}
@@ -24615,7 +24336,7 @@ index 89cec42d19ff..fb73631fb90b 100644
  }
  
  void __inc_zone_page_state(struct page *page, enum zone_stat_item item)
-@@ -350,6 +358,7 @@ void __dec_zone_state(struct zone *zone, enum zone_stat_item item)
+@@ -350,6 +358,7 @@
  	s8 __percpu *p = pcp->vm_stat_diff + item;
  	s8 v, t;
  
@@ -24623,7 +24344,7 @@ index 89cec42d19ff..fb73631fb90b 100644
  	v = __this_cpu_dec_return(*p);
  	t = __this_cpu_read(pcp->stat_threshold);
  	if (unlikely(v < - t)) {
-@@ -358,6 +367,7 @@ void __dec_zone_state(struct zone *zone, enum zone_stat_item item)
+@@ -358,6 +367,7 @@
  		zone_page_state_add(v - overstep, zone, item);
  		__this_cpu_write(*p, overstep);
  	}
@@ -24631,7 +24352,7 @@ index 89cec42d19ff..fb73631fb90b 100644
  }
  
  void __dec_node_state(struct pglist_data *pgdat, enum node_stat_item item)
-@@ -366,6 +376,7 @@ void __dec_node_state(struct pglist_data *pgdat, enum node_stat_item item)
+@@ -366,6 +376,7 @@
  	s8 __percpu *p = pcp->vm_node_stat_diff + item;
  	s8 v, t;
  
@@ -24639,7 +24360,7 @@ index 89cec42d19ff..fb73631fb90b 100644
  	v = __this_cpu_dec_return(*p);
  	t = __this_cpu_read(pcp->stat_threshold);
  	if (unlikely(v < - t)) {
-@@ -374,6 +385,7 @@ void __dec_node_state(struct pglist_data *pgdat, enum node_stat_item item)
+@@ -374,6 +385,7 @@
  		node_page_state_add(v - overstep, pgdat, item);
  		__this_cpu_write(*p, overstep);
  	}
@@ -24647,11 +24368,10 @@ index 89cec42d19ff..fb73631fb90b 100644
  }
  
  void __dec_zone_page_state(struct page *page, enum zone_stat_item item)
-diff --git a/mm/workingset.c b/mm/workingset.c
-index 617475f529f4..48674bf36fb1 100644
---- a/mm/workingset.c
-+++ b/mm/workingset.c
-@@ -334,7 +334,8 @@ void workingset_activation(struct page *page)
+diff -Nur linux-4.8.15.orig/mm/workingset.c linux-4.8.15/mm/workingset.c
+--- linux-4.8.15.orig/mm/workingset.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/mm/workingset.c	2017-01-01 17:07:16.115432374 +0100
+@@ -334,7 +334,8 @@
   * point where they would still be useful.
   */
  
@@ -24661,7 +24381,7 @@ index 617475f529f4..48674bf36fb1 100644
  
  static unsigned long count_shadow_nodes(struct shrinker *shrinker,
  					struct shrink_control *sc)
-@@ -344,9 +345,9 @@ static unsigned long count_shadow_nodes(struct shrinker *shrinker,
+@@ -344,9 +345,9 @@
  	unsigned long pages;
  
  	/* list_lru lock nests inside IRQ-safe mapping->tree_lock */
@@ -24672,9 +24392,9 @@ index 617475f529f4..48674bf36fb1 100644
 +	shadow_nodes = list_lru_shrink_count(&__workingset_shadow_nodes, sc);
 +	local_unlock_irq(workingset_shadow_lock);
  
- 	if (memcg_kmem_enabled()) {
+ 	if (sc->memcg) {
  		pages = mem_cgroup_node_nr_lru_pages(sc->memcg, sc->nid,
-@@ -438,9 +439,9 @@ static enum lru_status shadow_lru_isolate(struct list_head *item,
+@@ -438,9 +439,9 @@
  	spin_unlock(&mapping->tree_lock);
  	ret = LRU_REMOVED_RETRY;
  out:
@@ -24686,7 +24406,7 @@ index 617475f529f4..48674bf36fb1 100644
  	spin_lock(lru_lock);
  	return ret;
  }
-@@ -451,10 +452,10 @@ static unsigned long scan_shadow_nodes(struct shrinker *shrinker,
+@@ -451,10 +452,10 @@
  	unsigned long ret;
  
  	/* list_lru lock nests inside IRQ-safe mapping->tree_lock */
@@ -24700,7 +24420,7 @@ index 617475f529f4..48674bf36fb1 100644
  	return ret;
  }
  
-@@ -492,7 +493,7 @@ static int __init workingset_init(void)
+@@ -492,7 +493,7 @@
  	pr_info("workingset: timestamp_bits=%d max_order=%d bucket_order=%u\n",
  	       timestamp_bits, max_order, bucket_order);
  
@@ -24709,7 +24429,7 @@ index 617475f529f4..48674bf36fb1 100644
  	if (ret)
  		goto err;
  	ret = register_shrinker(&workingset_shadow_shrinker);
-@@ -500,7 +501,7 @@ static int __init workingset_init(void)
+@@ -500,7 +501,7 @@
  		goto err_list_lru;
  	return 0;
  err_list_lru:
@@ -24718,10 +24438,9 @@ index 617475f529f4..48674bf36fb1 100644
  err:
  	return ret;
  }
-diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c
-index b0bc023d25c5..5af6426fbcbe 100644
---- a/mm/zsmalloc.c
-+++ b/mm/zsmalloc.c
+diff -Nur linux-4.8.15.orig/mm/zsmalloc.c linux-4.8.15/mm/zsmalloc.c
+--- linux-4.8.15.orig/mm/zsmalloc.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/mm/zsmalloc.c	2017-01-01 17:07:16.115432374 +0100
 @@ -53,6 +53,7 @@
  #include <linux/mount.h>
  #include <linux/migrate.h>
@@ -24754,7 +24473,7 @@ index b0bc023d25c5..5af6426fbcbe 100644
  /*
   * Object location (<PFN>, <obj_idx>) is encoded as
   * as single (unsigned long) handle value.
-@@ -327,7 +341,7 @@ static void SetZsPageMovable(struct zs_pool *pool, struct zspage *zspage) {}
+@@ -327,7 +341,7 @@
  
  static int create_cache(struct zs_pool *pool)
  {
@@ -24763,7 +24482,7 @@ index b0bc023d25c5..5af6426fbcbe 100644
  					0, 0, NULL);
  	if (!pool->handle_cachep)
  		return 1;
-@@ -351,10 +365,27 @@ static void destroy_cache(struct zs_pool *pool)
+@@ -351,10 +365,27 @@
  
  static unsigned long cache_alloc_handle(struct zs_pool *pool, gfp_t gfp)
  {
@@ -24793,7 +24512,7 @@ index b0bc023d25c5..5af6426fbcbe 100644
  static void cache_free_handle(struct zs_pool *pool, unsigned long handle)
  {
  	kmem_cache_free(pool->handle_cachep, (void *)handle);
-@@ -373,12 +404,18 @@ static void cache_free_zspage(struct zs_pool *pool, struct zspage *zspage)
+@@ -373,12 +404,18 @@
  
  static void record_obj(unsigned long handle, unsigned long obj)
  {
@@ -24812,7 +24531,7 @@ index b0bc023d25c5..5af6426fbcbe 100644
  }
  
  /* zpool driver */
-@@ -467,6 +504,7 @@ MODULE_ALIAS("zpool-zsmalloc");
+@@ -467,6 +504,7 @@
  
  /* per-cpu VM mapping areas for zspage accesses that cross page boundaries */
  static DEFINE_PER_CPU(struct mapping_area, zs_map_area);
@@ -24820,7 +24539,7 @@ index b0bc023d25c5..5af6426fbcbe 100644
  
  static bool is_zspage_isolated(struct zspage *zspage)
  {
-@@ -902,7 +940,13 @@ static unsigned long location_to_obj(struct page *page, unsigned int obj_idx)
+@@ -902,7 +940,13 @@
  
  static unsigned long handle_to_obj(unsigned long handle)
  {
@@ -24834,7 +24553,7 @@ index b0bc023d25c5..5af6426fbcbe 100644
  }
  
  static unsigned long obj_to_head(struct page *page, void *obj)
-@@ -916,22 +960,46 @@ static unsigned long obj_to_head(struct page *page, void *obj)
+@@ -916,22 +960,46 @@
  
  static inline int testpin_tag(unsigned long handle)
  {
@@ -24881,7 +24600,7 @@ index b0bc023d25c5..5af6426fbcbe 100644
  }
  
  static void reset_page(struct page *page)
-@@ -1423,7 +1491,7 @@ void *zs_map_object(struct zs_pool *pool, unsigned long handle,
+@@ -1423,7 +1491,7 @@
  	class = pool->size_class[class_idx];
  	off = (class->size * obj_idx) & ~PAGE_MASK;
  
@@ -24890,7 +24609,7 @@ index b0bc023d25c5..5af6426fbcbe 100644
  	area->vm_mm = mm;
  	if (off + class->size <= PAGE_SIZE) {
  		/* this object is contained entirely within a page */
-@@ -1477,7 +1545,7 @@ void zs_unmap_object(struct zs_pool *pool, unsigned long handle)
+@@ -1477,7 +1545,7 @@
  
  		__zs_unmap_object(area, pages, off, class->size);
  	}
@@ -24899,11 +24618,10 @@ index b0bc023d25c5..5af6426fbcbe 100644
  
  	migrate_read_unlock(zspage);
  	unpin_tag(handle);
-diff --git a/net/core/dev.c b/net/core/dev.c
-index ea6312057a71..d114a4692cde 100644
---- a/net/core/dev.c
-+++ b/net/core/dev.c
-@@ -190,6 +190,7 @@ static unsigned int napi_gen_id = NR_CPUS;
+diff -Nur linux-4.8.15.orig/net/core/dev.c linux-4.8.15/net/core/dev.c
+--- linux-4.8.15.orig/net/core/dev.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/net/core/dev.c	2017-01-01 17:07:16.119432629 +0100
+@@ -190,6 +190,7 @@
  static DEFINE_READ_MOSTLY_HASHTABLE(napi_hash, 8);
  
  static seqcount_t devnet_rename_seq;
@@ -24911,7 +24629,7 @@ index ea6312057a71..d114a4692cde 100644
  
  static inline void dev_base_seq_inc(struct net *net)
  {
-@@ -211,14 +212,14 @@ static inline struct hlist_head *dev_index_hash(struct net *net, int ifindex)
+@@ -211,14 +212,14 @@
  static inline void rps_lock(struct softnet_data *sd)
  {
  #ifdef CONFIG_RPS
@@ -24928,7 +24646,7 @@ index ea6312057a71..d114a4692cde 100644
  #endif
  }
  
-@@ -888,7 +889,8 @@ int netdev_get_name(struct net *net, char *name, int ifindex)
+@@ -888,7 +889,8 @@
  	strcpy(name, dev->name);
  	rcu_read_unlock();
  	if (read_seqcount_retry(&devnet_rename_seq, seq)) {
@@ -24938,7 +24656,7 @@ index ea6312057a71..d114a4692cde 100644
  		goto retry;
  	}
  
-@@ -1157,20 +1159,17 @@ int dev_change_name(struct net_device *dev, const char *newname)
+@@ -1157,20 +1159,17 @@
  	if (dev->flags & IFF_UP)
  		return -EBUSY;
  
@@ -24965,7 +24683,7 @@ index ea6312057a71..d114a4692cde 100644
  
  	if (oldname[0] && !strchr(oldname, '%'))
  		netdev_info(dev, "renamed from %s\n", oldname);
-@@ -1183,11 +1182,12 @@ int dev_change_name(struct net_device *dev, const char *newname)
+@@ -1183,11 +1182,12 @@
  	if (ret) {
  		memcpy(dev->name, oldname, IFNAMSIZ);
  		dev->name_assign_type = old_assign_type;
@@ -24981,7 +24699,7 @@ index ea6312057a71..d114a4692cde 100644
  
  	netdev_adjacent_rename_links(dev, oldname);
  
-@@ -1208,7 +1208,8 @@ int dev_change_name(struct net_device *dev, const char *newname)
+@@ -1208,7 +1208,8 @@
  		/* err >= 0 after dev_alloc_name() or stores the first errno */
  		if (err >= 0) {
  			err = ret;
@@ -24991,7 +24709,7 @@ index ea6312057a71..d114a4692cde 100644
  			memcpy(dev->name, oldname, IFNAMSIZ);
  			memcpy(oldname, newname, IFNAMSIZ);
  			dev->name_assign_type = old_assign_type;
-@@ -1221,6 +1222,11 @@ int dev_change_name(struct net_device *dev, const char *newname)
+@@ -1221,6 +1222,11 @@
  	}
  
  	return err;
@@ -25003,7 +24721,7 @@ index ea6312057a71..d114a4692cde 100644
  }
  
  /**
-@@ -2268,6 +2274,7 @@ static void __netif_reschedule(struct Qdisc *q)
+@@ -2268,6 +2274,7 @@
  	sd->output_queue_tailp = &q->next_sched;
  	raise_softirq_irqoff(NET_TX_SOFTIRQ);
  	local_irq_restore(flags);
@@ -25011,7 +24729,7 @@ index ea6312057a71..d114a4692cde 100644
  }
  
  void __netif_schedule(struct Qdisc *q)
-@@ -2349,6 +2356,7 @@ void __dev_kfree_skb_irq(struct sk_buff *skb, enum skb_free_reason reason)
+@@ -2349,6 +2356,7 @@
  	__this_cpu_write(softnet_data.completion_queue, skb);
  	raise_softirq_irqoff(NET_TX_SOFTIRQ);
  	local_irq_restore(flags);
@@ -25019,7 +24737,7 @@ index ea6312057a71..d114a4692cde 100644
  }
  EXPORT_SYMBOL(__dev_kfree_skb_irq);
  
-@@ -3082,7 +3090,11 @@ static inline int __dev_xmit_skb(struct sk_buff *skb, struct Qdisc *q,
+@@ -3083,7 +3091,11 @@
  	 * This permits qdisc->running owner to get the lock more
  	 * often and dequeue packets faster.
  	 */
@@ -25031,7 +24749,7 @@ index ea6312057a71..d114a4692cde 100644
  	if (unlikely(contended))
  		spin_lock(&q->busylock);
  
-@@ -3145,8 +3157,10 @@ static void skb_update_prio(struct sk_buff *skb)
+@@ -3146,8 +3158,10 @@
  #define skb_update_prio(skb)
  #endif
  
@@ -25042,7 +24760,7 @@ index ea6312057a71..d114a4692cde 100644
  
  /**
   *	dev_loopback_xmit - loop back @skb
-@@ -3390,8 +3404,7 @@ static int __dev_queue_xmit(struct sk_buff *skb, void *accel_priv)
+@@ -3391,8 +3405,7 @@
  		int cpu = smp_processor_id(); /* ok because BHs are off */
  
  		if (txq->xmit_lock_owner != cpu) {
@@ -25052,7 +24770,7 @@ index ea6312057a71..d114a4692cde 100644
  				goto recursion_alert;
  
  			skb = validate_xmit_skb(skb, dev);
-@@ -3401,9 +3414,9 @@ static int __dev_queue_xmit(struct sk_buff *skb, void *accel_priv)
+@@ -3402,9 +3415,9 @@
  			HARD_TX_LOCK(dev, txq, cpu);
  
  			if (!netif_xmit_stopped(txq)) {
@@ -25064,7 +24782,7 @@ index ea6312057a71..d114a4692cde 100644
  				if (dev_xmit_complete(rc)) {
  					HARD_TX_UNLOCK(dev, txq);
  					goto out;
-@@ -3777,6 +3790,7 @@ static int enqueue_to_backlog(struct sk_buff *skb, int cpu,
+@@ -3778,6 +3791,7 @@
  	rps_unlock(sd);
  
  	local_irq_restore(flags);
@@ -25072,7 +24790,7 @@ index ea6312057a71..d114a4692cde 100644
  
  	atomic_long_inc(&skb->dev->rx_dropped);
  	kfree_skb(skb);
-@@ -3795,7 +3809,7 @@ static int netif_rx_internal(struct sk_buff *skb)
+@@ -3796,7 +3810,7 @@
  		struct rps_dev_flow voidflow, *rflow = &voidflow;
  		int cpu;
  
@@ -25081,7 +24799,7 @@ index ea6312057a71..d114a4692cde 100644
  		rcu_read_lock();
  
  		cpu = get_rps_cpu(skb->dev, skb, &rflow);
-@@ -3805,13 +3819,13 @@ static int netif_rx_internal(struct sk_buff *skb)
+@@ -3806,13 +3820,13 @@
  		ret = enqueue_to_backlog(skb, cpu, &rflow->last_qtail);
  
  		rcu_read_unlock();
@@ -25098,7 +24816,7 @@ index ea6312057a71..d114a4692cde 100644
  	}
  	return ret;
  }
-@@ -3845,11 +3859,9 @@ int netif_rx_ni(struct sk_buff *skb)
+@@ -3846,11 +3860,9 @@
  
  	trace_netif_rx_ni_entry(skb);
  
@@ -25112,7 +24830,7 @@ index ea6312057a71..d114a4692cde 100644
  
  	return err;
  }
-@@ -4321,7 +4333,7 @@ static void flush_backlog(void *arg)
+@@ -4322,7 +4334,7 @@
  	skb_queue_walk_safe(&sd->input_pkt_queue, skb, tmp) {
  		if (skb->dev == dev) {
  			__skb_unlink(skb, &sd->input_pkt_queue);
@@ -25121,7 +24839,7 @@ index ea6312057a71..d114a4692cde 100644
  			input_queue_head_incr(sd);
  		}
  	}
-@@ -4330,10 +4342,13 @@ static void flush_backlog(void *arg)
+@@ -4331,10 +4343,13 @@
  	skb_queue_walk_safe(&sd->process_queue, skb, tmp) {
  		if (skb->dev == dev) {
  			__skb_unlink(skb, &sd->process_queue);
@@ -25136,7 +24854,7 @@ index ea6312057a71..d114a4692cde 100644
  }
  
  static int napi_gro_complete(struct sk_buff *skb)
-@@ -4795,6 +4810,7 @@ static void net_rps_action_and_irq_enable(struct softnet_data *sd)
+@@ -4797,6 +4812,7 @@
  		sd->rps_ipi_list = NULL;
  
  		local_irq_enable();
@@ -25144,7 +24862,7 @@ index ea6312057a71..d114a4692cde 100644
  
  		/* Send pending IPI's to kick RPS processing on remote cpus. */
  		while (remsd) {
-@@ -4808,6 +4824,7 @@ static void net_rps_action_and_irq_enable(struct softnet_data *sd)
+@@ -4810,6 +4826,7 @@
  	} else
  #endif
  		local_irq_enable();
@@ -25152,7 +24870,7 @@ index ea6312057a71..d114a4692cde 100644
  }
  
  static bool sd_has_rps_ipi_waiting(struct softnet_data *sd)
-@@ -4889,6 +4906,7 @@ void __napi_schedule(struct napi_struct *n)
+@@ -4891,9 +4908,11 @@
  	local_irq_save(flags);
  	____napi_schedule(this_cpu_ptr(&softnet_data), n);
  	local_irq_restore(flags);
@@ -25160,7 +24878,41 @@ index ea6312057a71..d114a4692cde 100644
  }
  EXPORT_SYMBOL(__napi_schedule);
  
-@@ -5229,7 +5247,7 @@ static void net_rx_action(struct softirq_action *h)
++#ifndef CONFIG_PREEMPT_RT_FULL
+ /**
+  * __napi_schedule_irqoff - schedule for receive
+  * @n: entry to schedule
+@@ -4905,6 +4924,7 @@
+ 	____napi_schedule(this_cpu_ptr(&softnet_data), n);
+ }
+ EXPORT_SYMBOL(__napi_schedule_irqoff);
++#endif
+ 
+ void __napi_complete(struct napi_struct *n)
+ {
+@@ -5194,13 +5214,21 @@
+ 	struct softnet_data *sd = this_cpu_ptr(&softnet_data);
+ 	unsigned long time_limit = jiffies + 2;
+ 	int budget = netdev_budget;
++	struct sk_buff_head tofree_q;
++	struct sk_buff *skb;
+ 	LIST_HEAD(list);
+ 	LIST_HEAD(repoll);
+ 
++	__skb_queue_head_init(&tofree_q);
++
+ 	local_irq_disable();
++	skb_queue_splice_init(&sd->tofree_queue, &tofree_q);
+ 	list_splice_init(&sd->poll_list, &list);
+ 	local_irq_enable();
+ 
++	while ((skb = __skb_dequeue(&tofree_q)))
++		kfree_skb(skb);
++
+ 	for (;;) {
+ 		struct napi_struct *n;
+ 
+@@ -5231,7 +5259,7 @@
  	list_splice_tail(&repoll, &list);
  	list_splice(&list, &sd->poll_list);
  	if (!list_empty(&sd->poll_list))
@@ -25169,16 +24921,7 @@ index ea6312057a71..d114a4692cde 100644
  
  	net_rps_action_and_irq_enable(sd);
  }
-@@ -7736,7 +7754,7 @@ EXPORT_SYMBOL(free_netdev);
- void synchronize_net(void)
- {
- 	might_sleep();
--	if (rtnl_is_locked())
-+	if (rtnl_is_locked() && !IS_ENABLED(CONFIG_PREEMPT_RT_FULL))
- 		synchronize_rcu_expedited();
- 	else
- 		synchronize_rcu();
-@@ -7977,16 +7995,20 @@ static int dev_cpu_callback(struct notifier_block *nfb,
+@@ -7989,16 +8017,20 @@
  
  	raise_softirq_irqoff(NET_TX_SOFTIRQ);
  	local_irq_enable();
@@ -25200,7 +24943,7 @@ index ea6312057a71..d114a4692cde 100644
  
  	return NOTIFY_OK;
  }
-@@ -8288,8 +8310,9 @@ static int __init net_dev_init(void)
+@@ -8300,8 +8332,9 @@
  	for_each_possible_cpu(i) {
  		struct softnet_data *sd = &per_cpu(softnet_data, i);
  
@@ -25212,11 +24955,10 @@ index ea6312057a71..d114a4692cde 100644
  		INIT_LIST_HEAD(&sd->poll_list);
  		sd->output_queue_tailp = &sd->output_queue;
  #ifdef CONFIG_RPS
-diff --git a/net/core/filter.c b/net/core/filter.c
-index cb06aceb512a..3585a8982287 100644
---- a/net/core/filter.c
-+++ b/net/core/filter.c
-@@ -1592,7 +1592,7 @@ static inline int __bpf_tx_skb(struct net_device *dev, struct sk_buff *skb)
+diff -Nur linux-4.8.15.orig/net/core/filter.c linux-4.8.15/net/core/filter.c
+--- linux-4.8.15.orig/net/core/filter.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/net/core/filter.c	2017-01-01 17:07:16.119432629 +0100
+@@ -1592,7 +1592,7 @@
  {
  	int ret;
  
@@ -25225,7 +24967,7 @@ index cb06aceb512a..3585a8982287 100644
  		net_crit_ratelimited("bpf: recursion limit reached on datapath, buggy bpf program?\n");
  		kfree_skb(skb);
  		return -ENETDOWN;
-@@ -1600,9 +1600,9 @@ static inline int __bpf_tx_skb(struct net_device *dev, struct sk_buff *skb)
+@@ -1600,9 +1600,9 @@
  
  	skb->dev = dev;
  
@@ -25237,11 +24979,10 @@ index cb06aceb512a..3585a8982287 100644
  
  	return ret;
  }
-diff --git a/net/core/gen_estimator.c b/net/core/gen_estimator.c
-index cad8e791f28e..2a9364fe62a5 100644
---- a/net/core/gen_estimator.c
-+++ b/net/core/gen_estimator.c
-@@ -84,7 +84,7 @@ struct gen_estimator
+diff -Nur linux-4.8.15.orig/net/core/gen_estimator.c linux-4.8.15/net/core/gen_estimator.c
+--- linux-4.8.15.orig/net/core/gen_estimator.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/net/core/gen_estimator.c	2017-01-01 17:07:16.119432629 +0100
+@@ -84,7 +84,7 @@
  	struct gnet_stats_basic_packed	*bstats;
  	struct gnet_stats_rate_est64	*rate_est;
  	spinlock_t		*stats_lock;
@@ -25250,7 +24991,7 @@ index cad8e791f28e..2a9364fe62a5 100644
  	int			ewma_log;
  	u32			last_packets;
  	unsigned long		avpps;
-@@ -213,7 +213,7 @@ int gen_new_estimator(struct gnet_stats_basic_packed *bstats,
+@@ -213,7 +213,7 @@
  		      struct gnet_stats_basic_cpu __percpu *cpu_bstats,
  		      struct gnet_stats_rate_est64 *rate_est,
  		      spinlock_t *stats_lock,
@@ -25259,7 +25000,7 @@ index cad8e791f28e..2a9364fe62a5 100644
  		      struct nlattr *opt)
  {
  	struct gen_estimator *est;
-@@ -309,7 +309,7 @@ int gen_replace_estimator(struct gnet_stats_basic_packed *bstats,
+@@ -309,7 +309,7 @@
  			  struct gnet_stats_basic_cpu __percpu *cpu_bstats,
  			  struct gnet_stats_rate_est64 *rate_est,
  			  spinlock_t *stats_lock,
@@ -25268,11 +25009,10 @@ index cad8e791f28e..2a9364fe62a5 100644
  {
  	gen_kill_estimator(bstats, rate_est);
  	return gen_new_estimator(bstats, cpu_bstats, rate_est, stats_lock, running, opt);
-diff --git a/net/core/gen_stats.c b/net/core/gen_stats.c
-index 508e051304fb..bc3b17b78c94 100644
---- a/net/core/gen_stats.c
-+++ b/net/core/gen_stats.c
-@@ -130,7 +130,7 @@ __gnet_stats_copy_basic_cpu(struct gnet_stats_basic_packed *bstats,
+diff -Nur linux-4.8.15.orig/net/core/gen_stats.c linux-4.8.15/net/core/gen_stats.c
+--- linux-4.8.15.orig/net/core/gen_stats.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/net/core/gen_stats.c	2017-01-01 17:07:16.119432629 +0100
+@@ -130,7 +130,7 @@
  }
  
  void
@@ -25281,7 +25021,7 @@ index 508e051304fb..bc3b17b78c94 100644
  			struct gnet_stats_basic_packed *bstats,
  			struct gnet_stats_basic_cpu __percpu *cpu,
  			struct gnet_stats_basic_packed *b)
-@@ -143,10 +143,10 @@ __gnet_stats_copy_basic(const seqcount_t *running,
+@@ -143,10 +143,10 @@
  	}
  	do {
  		if (running)
@@ -25294,7 +25034,7 @@ index 508e051304fb..bc3b17b78c94 100644
  }
  EXPORT_SYMBOL(__gnet_stats_copy_basic);
  
-@@ -164,7 +164,7 @@ EXPORT_SYMBOL(__gnet_stats_copy_basic);
+@@ -164,7 +164,7 @@
   * if the room in the socket buffer was not sufficient.
   */
  int
@@ -25303,10 +25043,9 @@ index 508e051304fb..bc3b17b78c94 100644
  		      struct gnet_dump *d,
  		      struct gnet_stats_basic_cpu __percpu *cpu,
  		      struct gnet_stats_basic_packed *b)
-diff --git a/net/core/skbuff.c b/net/core/skbuff.c
-index 3864b4b68fa1..55c73ade9faa 100644
---- a/net/core/skbuff.c
-+++ b/net/core/skbuff.c
+diff -Nur linux-4.8.15.orig/net/core/skbuff.c linux-4.8.15/net/core/skbuff.c
+--- linux-4.8.15.orig/net/core/skbuff.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/net/core/skbuff.c	2017-01-01 17:07:16.123432884 +0100
 @@ -64,6 +64,7 @@
  #include <linux/errqueue.h>
  #include <linux/prefetch.h>
@@ -25315,7 +25054,7 @@ index 3864b4b68fa1..55c73ade9faa 100644
  
  #include <net/protocol.h>
  #include <net/dst.h>
-@@ -360,6 +361,8 @@ struct napi_alloc_cache {
+@@ -360,6 +361,8 @@
  
  static DEFINE_PER_CPU(struct page_frag_cache, netdev_alloc_cache);
  static DEFINE_PER_CPU(struct napi_alloc_cache, napi_alloc_cache);
@@ -25324,7 +25063,7 @@ index 3864b4b68fa1..55c73ade9faa 100644
  
  static void *__netdev_alloc_frag(unsigned int fragsz, gfp_t gfp_mask)
  {
-@@ -367,10 +370,10 @@ static void *__netdev_alloc_frag(unsigned int fragsz, gfp_t gfp_mask)
+@@ -367,10 +370,10 @@
  	unsigned long flags;
  	void *data;
  
@@ -25337,7 +25076,7 @@ index 3864b4b68fa1..55c73ade9faa 100644
  	return data;
  }
  
-@@ -389,9 +392,13 @@ EXPORT_SYMBOL(netdev_alloc_frag);
+@@ -389,9 +392,13 @@
  
  static void *__napi_alloc_frag(unsigned int fragsz, gfp_t gfp_mask)
  {
@@ -25353,7 +25092,7 @@ index 3864b4b68fa1..55c73ade9faa 100644
  }
  
  void *napi_alloc_frag(unsigned int fragsz)
-@@ -438,13 +445,13 @@ struct sk_buff *__netdev_alloc_skb(struct net_device *dev, unsigned int len,
+@@ -438,13 +445,13 @@
  	if (sk_memalloc_socks())
  		gfp_mask |= __GFP_MEMALLOC;
  
@@ -25369,7 +25108,7 @@ index 3864b4b68fa1..55c73ade9faa 100644
  
  	if (unlikely(!data))
  		return NULL;
-@@ -485,9 +492,10 @@ EXPORT_SYMBOL(__netdev_alloc_skb);
+@@ -485,9 +492,10 @@
  struct sk_buff *__napi_alloc_skb(struct napi_struct *napi, unsigned int len,
  				 gfp_t gfp_mask)
  {
@@ -25381,7 +25120,7 @@ index 3864b4b68fa1..55c73ade9faa 100644
  
  	len += NET_SKB_PAD + NET_IP_ALIGN;
  
-@@ -505,7 +513,10 @@ struct sk_buff *__napi_alloc_skb(struct napi_struct *napi, unsigned int len,
+@@ -505,7 +513,10 @@
  	if (sk_memalloc_socks())
  		gfp_mask |= __GFP_MEMALLOC;
  
@@ -25392,7 +25131,7 @@ index 3864b4b68fa1..55c73ade9faa 100644
  	if (unlikely(!data))
  		return NULL;
  
-@@ -516,7 +527,7 @@ struct sk_buff *__napi_alloc_skb(struct napi_struct *napi, unsigned int len,
+@@ -516,7 +527,7 @@
  	}
  
  	/* use OR instead of assignment to avoid clearing of bits in mask */
@@ -25401,7 +25140,7 @@ index 3864b4b68fa1..55c73ade9faa 100644
  		skb->pfmemalloc = 1;
  	skb->head_frag = 1;
  
-@@ -760,23 +771,26 @@ EXPORT_SYMBOL(consume_skb);
+@@ -760,23 +771,26 @@
  
  void __kfree_skb_flush(void)
  {
@@ -25430,7 +25169,7 @@ index 3864b4b68fa1..55c73ade9faa 100644
  	/* record skb to CPU local list */
  	nc->skb_cache[nc->skb_count++] = skb;
  
-@@ -791,6 +805,7 @@ static inline void _kfree_skb_defer(struct sk_buff *skb)
+@@ -791,6 +805,7 @@
  				     nc->skb_cache);
  		nc->skb_count = 0;
  	}
@@ -25438,11 +25177,10 @@ index 3864b4b68fa1..55c73ade9faa 100644
  }
  void __kfree_skb_defer(struct sk_buff *skb)
  {
-diff --git a/net/core/sock.c b/net/core/sock.c
-index fd7b41edf1ce..e425d259a9f0 100644
---- a/net/core/sock.c
-+++ b/net/core/sock.c
-@@ -2508,12 +2508,11 @@ void lock_sock_nested(struct sock *sk, int subclass)
+diff -Nur linux-4.8.15.orig/net/core/sock.c linux-4.8.15/net/core/sock.c
+--- linux-4.8.15.orig/net/core/sock.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/net/core/sock.c	2017-01-01 17:07:16.123432884 +0100
+@@ -2510,12 +2510,11 @@
  	if (sk->sk_lock.owned)
  		__lock_sock(sk);
  	sk->sk_lock.owned = 1;
@@ -25456,10 +25194,9 @@ index fd7b41edf1ce..e425d259a9f0 100644
  }
  EXPORT_SYMBOL(lock_sock_nested);
  
-diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
-index 38abe70e595f..443259a04862 100644
---- a/net/ipv4/icmp.c
-+++ b/net/ipv4/icmp.c
+diff -Nur linux-4.8.15.orig/net/ipv4/icmp.c linux-4.8.15/net/ipv4/icmp.c
+--- linux-4.8.15.orig/net/ipv4/icmp.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/net/ipv4/icmp.c	2017-01-01 17:07:16.123432884 +0100
 @@ -69,6 +69,7 @@
  #include <linux/jiffies.h>
  #include <linux/kernel.h>
@@ -25476,7 +25213,7 @@ index 38abe70e595f..443259a04862 100644
  #include <net/snmp.h>
  #include <net/ip.h>
  #include <net/route.h>
-@@ -204,6 +206,8 @@ static const struct icmp_control icmp_pointers[NR_ICMP_TYPES+1];
+@@ -204,6 +206,8 @@
   *
   *	On SMP we have one ICMP socket per-cpu.
   */
@@ -25485,7 +25222,7 @@ index 38abe70e595f..443259a04862 100644
  static struct sock *icmp_sk(struct net *net)
  {
  	return *this_cpu_ptr(net->ipv4.icmp_sk);
-@@ -215,12 +219,14 @@ static inline struct sock *icmp_xmit_lock(struct net *net)
+@@ -215,12 +219,14 @@
  
  	local_bh_disable();
  
@@ -25500,7 +25237,7 @@ index 38abe70e595f..443259a04862 100644
  		local_bh_enable();
  		return NULL;
  	}
-@@ -230,6 +236,7 @@ static inline struct sock *icmp_xmit_lock(struct net *net)
+@@ -230,6 +236,7 @@
  static inline void icmp_xmit_unlock(struct sock *sk)
  {
  	spin_unlock_bh(&sk->sk_lock.slock);
@@ -25508,7 +25245,7 @@ index 38abe70e595f..443259a04862 100644
  }
  
  int sysctl_icmp_msgs_per_sec __read_mostly = 1000;
-@@ -358,6 +365,7 @@ static void icmp_push_reply(struct icmp_bxm *icmp_param,
+@@ -358,6 +365,7 @@
  	struct sock *sk;
  	struct sk_buff *skb;
  
@@ -25516,7 +25253,7 @@ index 38abe70e595f..443259a04862 100644
  	sk = icmp_sk(dev_net((*rt)->dst.dev));
  	if (ip_append_data(sk, fl4, icmp_glue_bits, icmp_param,
  			   icmp_param->data_len+icmp_param->head_len,
-@@ -380,6 +388,7 @@ static void icmp_push_reply(struct icmp_bxm *icmp_param,
+@@ -380,6 +388,7 @@
  		skb->ip_summed = CHECKSUM_NONE;
  		ip_push_pending_frames(sk, fl4);
  	}
@@ -25524,7 +25261,7 @@ index 38abe70e595f..443259a04862 100644
  }
  
  /*
-@@ -891,6 +900,30 @@ static bool icmp_redirect(struct sk_buff *skb)
+@@ -891,6 +900,30 @@
  }
  
  /*
@@ -25555,7 +25292,7 @@ index 38abe70e595f..443259a04862 100644
   *	Handle ICMP_ECHO ("ping") requests.
   *
   *	RFC 1122: 3.2.2.6 MUST have an echo server that answers ICMP echo
-@@ -917,6 +950,11 @@ static bool icmp_echo(struct sk_buff *skb)
+@@ -917,6 +950,11 @@
  		icmp_param.data_len	   = skb->len;
  		icmp_param.head_len	   = sizeof(struct icmphdr);
  		icmp_reply(&icmp_param, skb);
@@ -25567,11 +25304,10 @@ index 38abe70e595f..443259a04862 100644
  	}
  	/* should there be an ICMP stat for ignored echos? */
  	return true;
-diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
-index 1cb67de106fe..332a485323f0 100644
---- a/net/ipv4/sysctl_net_ipv4.c
-+++ b/net/ipv4/sysctl_net_ipv4.c
-@@ -681,6 +681,13 @@ static struct ctl_table ipv4_net_table[] = {
+diff -Nur linux-4.8.15.orig/net/ipv4/sysctl_net_ipv4.c linux-4.8.15/net/ipv4/sysctl_net_ipv4.c
+--- linux-4.8.15.orig/net/ipv4/sysctl_net_ipv4.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/net/ipv4/sysctl_net_ipv4.c	2017-01-01 17:07:16.123432884 +0100
+@@ -681,6 +681,13 @@
  		.proc_handler	= proc_dointvec
  	},
  	{
@@ -25585,10 +25321,9 @@ index 1cb67de106fe..332a485323f0 100644
  		.procname	= "icmp_ignore_bogus_error_responses",
  		.data		= &init_net.ipv4.sysctl_icmp_ignore_bogus_error_responses,
  		.maxlen		= sizeof(int),
-diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
-index 7158d4f8dae4..0dc007fc6704 100644
---- a/net/ipv4/tcp_ipv4.c
-+++ b/net/ipv4/tcp_ipv4.c
+diff -Nur linux-4.8.15.orig/net/ipv4/tcp_ipv4.c linux-4.8.15/net/ipv4/tcp_ipv4.c
+--- linux-4.8.15.orig/net/ipv4/tcp_ipv4.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/net/ipv4/tcp_ipv4.c	2017-01-01 17:07:16.127433142 +0100
 @@ -62,6 +62,7 @@
  #include <linux/init.h>
  #include <linux/times.h>
@@ -25597,7 +25332,7 @@ index 7158d4f8dae4..0dc007fc6704 100644
  
  #include <net/net_namespace.h>
  #include <net/icmp.h>
-@@ -565,6 +566,7 @@ void tcp_v4_send_check(struct sock *sk, struct sk_buff *skb)
+@@ -565,6 +566,7 @@
  }
  EXPORT_SYMBOL(tcp_v4_send_check);
  
@@ -25605,7 +25340,7 @@ index 7158d4f8dae4..0dc007fc6704 100644
  /*
   *	This routine will send an RST to the other tcp.
   *
-@@ -692,6 +694,8 @@ static void tcp_v4_send_reset(const struct sock *sk, struct sk_buff *skb)
+@@ -692,6 +694,8 @@
  		     offsetof(struct inet_timewait_sock, tw_bound_dev_if));
  
  	arg.tos = ip_hdr(skb)->tos;
@@ -25614,7 +25349,7 @@ index 7158d4f8dae4..0dc007fc6704 100644
  	local_bh_disable();
  	ip_send_unicast_reply(*this_cpu_ptr(net->ipv4.tcp_sk),
  			      skb, &TCP_SKB_CB(skb)->header.h4.opt,
-@@ -701,6 +705,7 @@ static void tcp_v4_send_reset(const struct sock *sk, struct sk_buff *skb)
+@@ -701,6 +705,7 @@
  	__TCP_INC_STATS(net, TCP_MIB_OUTSEGS);
  	__TCP_INC_STATS(net, TCP_MIB_OUTRSTS);
  	local_bh_enable();
@@ -25622,7 +25357,7 @@ index 7158d4f8dae4..0dc007fc6704 100644
  
  #ifdef CONFIG_TCP_MD5SIG
  out:
-@@ -776,6 +781,7 @@ static void tcp_v4_send_ack(struct net *net,
+@@ -776,6 +781,7 @@
  	if (oif)
  		arg.bound_dev_if = oif;
  	arg.tos = tos;
@@ -25630,7 +25365,7 @@ index 7158d4f8dae4..0dc007fc6704 100644
  	local_bh_disable();
  	ip_send_unicast_reply(*this_cpu_ptr(net->ipv4.tcp_sk),
  			      skb, &TCP_SKB_CB(skb)->header.h4.opt,
-@@ -784,6 +790,7 @@ static void tcp_v4_send_ack(struct net *net,
+@@ -784,6 +790,7 @@
  
  	__TCP_INC_STATS(net, TCP_MIB_OUTSEGS);
  	local_bh_enable();
@@ -25638,11 +25373,10 @@ index 7158d4f8dae4..0dc007fc6704 100644
  }
  
  static void tcp_v4_timewait_ack(struct sock *sk, struct sk_buff *skb)
-diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
-index 9dce3b157908..525efa5309ac 100644
---- a/net/mac80211/rx.c
-+++ b/net/mac80211/rx.c
-@@ -4064,7 +4064,7 @@ void ieee80211_rx_napi(struct ieee80211_hw *hw, struct ieee80211_sta *pubsta,
+diff -Nur linux-4.8.15.orig/net/mac80211/rx.c linux-4.8.15/net/mac80211/rx.c
+--- linux-4.8.15.orig/net/mac80211/rx.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/net/mac80211/rx.c	2017-01-01 17:07:16.127433142 +0100
+@@ -4070,7 +4070,7 @@
  	struct ieee80211_supported_band *sband;
  	struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);
  
@@ -25651,10 +25385,9 @@ index 9dce3b157908..525efa5309ac 100644
  
  	if (WARN_ON(status->band >= NUM_NL80211_BANDS))
  		goto drop;
-diff --git a/net/netfilter/core.c b/net/netfilter/core.c
-index f39276d1c2d7..10880c89d62f 100644
---- a/net/netfilter/core.c
-+++ b/net/netfilter/core.c
+diff -Nur linux-4.8.15.orig/net/netfilter/core.c linux-4.8.15/net/netfilter/core.c
+--- linux-4.8.15.orig/net/netfilter/core.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/net/netfilter/core.c	2017-01-01 17:07:16.127433142 +0100
 @@ -22,11 +22,17 @@
  #include <linux/proc_fs.h>
  #include <linux/mutex.h>
@@ -25673,10 +25406,9 @@ index f39276d1c2d7..10880c89d62f 100644
  static DEFINE_MUTEX(afinfo_mutex);
  
  const struct nf_afinfo __rcu *nf_afinfo[NFPROTO_NUMPROTO] __read_mostly;
-diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
-index 33a4697d5539..475cb74bf825 100644
---- a/net/packet/af_packet.c
-+++ b/net/packet/af_packet.c
+diff -Nur linux-4.8.15.orig/net/packet/af_packet.c linux-4.8.15/net/packet/af_packet.c
+--- linux-4.8.15.orig/net/packet/af_packet.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/net/packet/af_packet.c	2017-01-01 17:07:16.131433400 +0100
 @@ -63,6 +63,7 @@
  #include <linux/if_packet.h>
  #include <linux/wireless.h>
@@ -25685,7 +25417,7 @@ index 33a4697d5539..475cb74bf825 100644
  #include <linux/kmod.h>
  #include <linux/slab.h>
  #include <linux/vmalloc.h>
-@@ -695,7 +696,7 @@ static void prb_retire_rx_blk_timer_expired(unsigned long data)
+@@ -694,7 +695,7 @@
  	if (BLOCK_NUM_PKTS(pbd)) {
  		while (atomic_read(&pkc->blk_fill_in_prog)) {
  			/* Waiting for skb_copy_bits to finish... */
@@ -25694,7 +25426,7 @@ index 33a4697d5539..475cb74bf825 100644
  		}
  	}
  
-@@ -957,7 +958,7 @@ static void prb_retire_current_block(struct tpacket_kbdq_core *pkc,
+@@ -956,7 +957,7 @@
  		if (!(status & TP_STATUS_BLK_TMO)) {
  			while (atomic_read(&pkc->blk_fill_in_prog)) {
  				/* Waiting for skb_copy_bits to finish... */
@@ -25703,10 +25435,9 @@ index 33a4697d5539..475cb74bf825 100644
  			}
  		}
  		prb_close_block(pkc, pbd, po, status);
-diff --git a/net/rds/ib_rdma.c b/net/rds/ib_rdma.c
-index 977f69886c00..f3e7a36b0396 100644
---- a/net/rds/ib_rdma.c
-+++ b/net/rds/ib_rdma.c
+diff -Nur linux-4.8.15.orig/net/rds/ib_rdma.c linux-4.8.15/net/rds/ib_rdma.c
+--- linux-4.8.15.orig/net/rds/ib_rdma.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/net/rds/ib_rdma.c	2017-01-01 17:07:16.131433400 +0100
 @@ -34,6 +34,7 @@
  #include <linux/slab.h>
  #include <linux/rculist.h>
@@ -25715,7 +25446,7 @@ index 977f69886c00..f3e7a36b0396 100644
  
  #include "rds_single_path.h"
  #include "ib_mr.h"
-@@ -210,7 +211,7 @@ static inline void wait_clean_list_grace(void)
+@@ -210,7 +211,7 @@
  	for_each_online_cpu(cpu) {
  		flag = &per_cpu(clean_list_grace, cpu);
  		while (test_bit(CLEAN_LIST_BUSY_BIT, flag))
@@ -25724,10 +25455,9 @@ index 977f69886c00..f3e7a36b0396 100644
  	}
  }
  
-diff --git a/net/rxrpc/security.c b/net/rxrpc/security.c
-index 814d285ff802..d4d088e9be85 100644
---- a/net/rxrpc/security.c
-+++ b/net/rxrpc/security.c
+diff -Nur linux-4.8.15.orig/net/rxrpc/security.c linux-4.8.15/net/rxrpc/security.c
+--- linux-4.8.15.orig/net/rxrpc/security.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/net/rxrpc/security.c	2017-01-01 17:07:16.131433400 +0100
 @@ -19,9 +19,6 @@
  #include <keys/rxrpc-type.h>
  #include "ar-internal.h"
@@ -25738,11 +25468,10 @@ index 814d285ff802..d4d088e9be85 100644
  static const struct rxrpc_security *rxrpc_security_types[] = {
  	[RXRPC_SECURITY_NONE]	= &rxrpc_no_security,
  #ifdef CONFIG_RXKAD
-diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
-index 12ebde845523..99f3ce50c6c4 100644
---- a/net/sched/sch_api.c
-+++ b/net/sched/sch_api.c
-@@ -975,7 +975,7 @@ qdisc_create(struct net_device *dev, struct netdev_queue *dev_queue,
+diff -Nur linux-4.8.15.orig/net/sched/sch_api.c linux-4.8.15/net/sched/sch_api.c
+--- linux-4.8.15.orig/net/sched/sch_api.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/net/sched/sch_api.c	2017-01-01 17:07:16.131433400 +0100
+@@ -975,7 +975,7 @@
  			rcu_assign_pointer(sch->stab, stab);
  		}
  		if (tca[TCA_RATE]) {
@@ -25751,11 +25480,10 @@ index 12ebde845523..99f3ce50c6c4 100644
  
  			err = -EOPNOTSUPP;
  			if (sch->flags & TCQ_F_MQROOT)
-diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
-index 657c13362b19..cbab8d4d5864 100644
---- a/net/sched/sch_generic.c
-+++ b/net/sched/sch_generic.c
-@@ -426,7 +426,11 @@ struct Qdisc noop_qdisc = {
+diff -Nur linux-4.8.15.orig/net/sched/sch_generic.c linux-4.8.15/net/sched/sch_generic.c
+--- linux-4.8.15.orig/net/sched/sch_generic.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/net/sched/sch_generic.c	2017-01-01 17:07:16.131433400 +0100
+@@ -426,7 +426,11 @@
  	.list		=	LIST_HEAD_INIT(noop_qdisc.list),
  	.q.lock		=	__SPIN_LOCK_UNLOCKED(noop_qdisc.q.lock),
  	.dev_queue	=	&noop_netdev_queue,
@@ -25767,7 +25495,7 @@ index 657c13362b19..cbab8d4d5864 100644
  	.busylock	=	__SPIN_LOCK_UNLOCKED(noop_qdisc.busylock),
  };
  EXPORT_SYMBOL(noop_qdisc);
-@@ -620,9 +624,17 @@ struct Qdisc *qdisc_alloc(struct netdev_queue *dev_queue,
+@@ -620,9 +624,17 @@
  	lockdep_set_class(&sch->busylock,
  			  dev->qdisc_tx_busylock ?: &qdisc_tx_busylock);
  
@@ -25785,7 +25513,7 @@ index 657c13362b19..cbab8d4d5864 100644
  
  	sch->ops = ops;
  	sch->enqueue = ops->enqueue;
-@@ -917,7 +929,7 @@ void dev_deactivate_many(struct list_head *head)
+@@ -917,7 +929,7 @@
  	/* Wait for outstanding qdisc_run calls. */
  	list_for_each_entry(dev, head, close_list)
  		while (some_qdisc_is_busy(dev))
@@ -25794,11 +25522,10 @@ index 657c13362b19..cbab8d4d5864 100644
  }
  
  void dev_deactivate(struct net_device *dev)
-diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c
-index c3f652395a80..2dd84493528e 100644
---- a/net/sunrpc/svc_xprt.c
-+++ b/net/sunrpc/svc_xprt.c
-@@ -396,7 +396,7 @@ void svc_xprt_do_enqueue(struct svc_xprt *xprt)
+diff -Nur linux-4.8.15.orig/net/sunrpc/svc_xprt.c linux-4.8.15/net/sunrpc/svc_xprt.c
+--- linux-4.8.15.orig/net/sunrpc/svc_xprt.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/net/sunrpc/svc_xprt.c	2017-01-01 17:07:16.131433400 +0100
+@@ -396,7 +396,7 @@
  		goto out;
  	}
  
@@ -25807,7 +25534,7 @@ index c3f652395a80..2dd84493528e 100644
  	pool = svc_pool_for_cpu(xprt->xpt_server, cpu);
  
  	atomic_long_inc(&pool->sp_stats.packets);
-@@ -432,7 +432,7 @@ void svc_xprt_do_enqueue(struct svc_xprt *xprt)
+@@ -432,7 +432,7 @@
  
  		atomic_long_inc(&pool->sp_stats.threads_woken);
  		wake_up_process(rqstp->rq_task);
@@ -25816,7 +25543,7 @@ index c3f652395a80..2dd84493528e 100644
  		goto out;
  	}
  	rcu_read_unlock();
-@@ -453,7 +453,7 @@ void svc_xprt_do_enqueue(struct svc_xprt *xprt)
+@@ -453,7 +453,7 @@
  		goto redo_search;
  	}
  	rqstp = NULL;
@@ -25825,11 +25552,10 @@ index c3f652395a80..2dd84493528e 100644
  out:
  	trace_svc_xprt_do_enqueue(xprt, rqstp);
  }
-diff --git a/scripts/mkcompile_h b/scripts/mkcompile_h
-index 6fdc97ef6023..523e0420d7f0 100755
---- a/scripts/mkcompile_h
-+++ b/scripts/mkcompile_h
-@@ -4,7 +4,8 @@ TARGET=$1
+diff -Nur linux-4.8.15.orig/scripts/mkcompile_h linux-4.8.15/scripts/mkcompile_h
+--- linux-4.8.15.orig/scripts/mkcompile_h	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/scripts/mkcompile_h	2017-01-01 17:07:16.131433400 +0100
+@@ -4,7 +4,8 @@
  ARCH=$2
  SMP=$3
  PREEMPT=$4
@@ -25839,7 +25565,7 @@ index 6fdc97ef6023..523e0420d7f0 100755
  
  vecho() { [ "${quiet}" = "silent_" ] || echo "$@" ; }
  
-@@ -57,6 +58,7 @@ UTS_VERSION="#$VERSION"
+@@ -57,6 +58,7 @@
  CONFIG_FLAGS=""
  if [ -n "$SMP" ] ; then CONFIG_FLAGS="SMP"; fi
  if [ -n "$PREEMPT" ] ; then CONFIG_FLAGS="$CONFIG_FLAGS PREEMPT"; fi
@@ -25847,11 +25573,10 @@ index 6fdc97ef6023..523e0420d7f0 100755
  UTS_VERSION="$UTS_VERSION $CONFIG_FLAGS $TIMESTAMP"
  
  # Truncate to maximum length
-diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
-index c61fd50f771f..1583de410f62 100644
---- a/sound/core/pcm_native.c
-+++ b/sound/core/pcm_native.c
-@@ -135,7 +135,7 @@ EXPORT_SYMBOL_GPL(snd_pcm_stream_unlock);
+diff -Nur linux-4.8.15.orig/sound/core/pcm_native.c linux-4.8.15/sound/core/pcm_native.c
+--- linux-4.8.15.orig/sound/core/pcm_native.c	2016-12-15 17:50:48.000000000 +0100
++++ linux-4.8.15/sound/core/pcm_native.c	2017-01-01 17:07:16.135433664 +0100
+@@ -135,7 +135,7 @@
  void snd_pcm_stream_lock_irq(struct snd_pcm_substream *substream)
  {
  	if (!substream->pcm->nonatomic)
@@ -25860,7 +25585,7 @@ index c61fd50f771f..1583de410f62 100644
  	snd_pcm_stream_lock(substream);
  }
  EXPORT_SYMBOL_GPL(snd_pcm_stream_lock_irq);
-@@ -150,7 +150,7 @@ void snd_pcm_stream_unlock_irq(struct snd_pcm_substream *substream)
+@@ -150,7 +150,7 @@
  {
  	snd_pcm_stream_unlock(substream);
  	if (!substream->pcm->nonatomic)
@@ -25869,7 +25594,7 @@ index c61fd50f771f..1583de410f62 100644
  }
  EXPORT_SYMBOL_GPL(snd_pcm_stream_unlock_irq);
  
-@@ -158,7 +158,7 @@ unsigned long _snd_pcm_stream_lock_irqsave(struct snd_pcm_substream *substream)
+@@ -158,7 +158,7 @@
  {
  	unsigned long flags = 0;
  	if (!substream->pcm->nonatomic)
@@ -25878,7 +25603,7 @@ index c61fd50f771f..1583de410f62 100644
  	snd_pcm_stream_lock(substream);
  	return flags;
  }
-@@ -176,7 +176,7 @@ void snd_pcm_stream_unlock_irqrestore(struct snd_pcm_substream *substream,
+@@ -176,7 +176,7 @@
  {
  	snd_pcm_stream_unlock(substream);
  	if (!substream->pcm->nonatomic)
diff --git a/target/linux/patches/4.8.11/sh2.patch b/target/linux/patches/4.8.15/sh2.patch
index 9debe80ad..9debe80ad 100644
--- a/target/linux/patches/4.8.11/sh2.patch
+++ b/target/linux/patches/4.8.15/sh2.patch
diff --git a/target/linux/patches/4.8.11/startup.patch b/target/linux/patches/4.8.15/startup.patch
index e54ac19a6..e54ac19a6 100644
--- a/target/linux/patches/4.8.11/startup.patch
+++ b/target/linux/patches/4.8.15/startup.patch
diff --git a/target/linux/patches/4.8.11/vdso2.patch b/target/linux/patches/4.8.15/vdso2.patch
index 35df488a8..35df488a8 100644
--- a/target/linux/patches/4.8.11/vdso2.patch
+++ b/target/linux/patches/4.8.15/vdso2.patch