summaryrefslogtreecommitdiff
path: root/target/linux/patches
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@uclibc-ng.org>2016-08-23 03:54:53 +0200
committerWaldemar Brodkorb <wbx@uclibc-ng.org>2016-08-23 03:55:16 +0200
commite056728304ad49df776219a6d87d4143ddae58b3 (patch)
tree97fb1dcba4315d18144027f7e346a8d646b34336 /target/linux/patches
parent0f6cdb4c29d61abdeda8c51691483c4e35b3e5f2 (diff)
linux: refresh realtime patch
Diffstat (limited to 'target/linux/patches')
-rw-r--r--target/linux/patches/4.6.6/patch-realtime7152
1 files changed, 3372 insertions, 3780 deletions
diff --git a/target/linux/patches/4.6.6/patch-realtime b/target/linux/patches/4.6.6/patch-realtime
index 6fb397726..dbaa94b0a 100644
--- a/target/linux/patches/4.6.6/patch-realtime
+++ b/target/linux/patches/4.6.6/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 13f5619b2203..f64d075ba647 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 81869a5e7e17..54cfbcbdaa02 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 cdfa6c2b7626..fa885f5eb8c9 100644
---- a/arch/arm/Kconfig
-+++ b/arch/arm/Kconfig
-@@ -35,7 +35,7 @@ config ARM
- select HARDIRQS_SW_RESEND
- select HAVE_ARCH_AUDITSYSCALL if (AEABI && !OABI_COMPAT)
- select HAVE_ARCH_BITREVERSE if (CPU_32v7M || CPU_32v7) && !CPU_32v6
-- 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)
-@@ -71,6 +71,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.6.6.orig/arch/arm/include/asm/switch_to.h linux-4.6.6/arch/arm/include/asm/switch_to.h
+--- linux-4.6.6.orig/arch/arm/include/asm/switch_to.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/arm/include/asm/switch_to.h 2016-08-22 21:27:46.269819745 +0200
@@ -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.6.6.orig/arch/arm/include/asm/thread_info.h linux-4.6.6/arch/arm/include/asm/thread_info.h
+--- linux-4.6.6.orig/arch/arm/include/asm/thread_info.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/arm/include/asm/thread_info.h 2016-08-22 21:27:46.269819745 +0200
+@@ -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 27d05813ff09..5a3742215cde 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.6.6.orig/arch/arm/Kconfig linux-4.6.6/arch/arm/Kconfig
+--- linux-4.6.6.orig/arch/arm/Kconfig 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/arm/Kconfig 2016-08-22 21:27:46.261819236 +0200
+@@ -35,7 +35,7 @@
+ select HARDIRQS_SW_RESEND
+ select HAVE_ARCH_AUDITSYSCALL if (AEABI && !OABI_COMPAT)
+ select HAVE_ARCH_BITREVERSE if (CPU_32v7M || CPU_32v7) && !CPU_32v6
+- 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)
+@@ -71,6 +71,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.6.6.orig/arch/arm/kernel/asm-offsets.c linux-4.6.6/arch/arm/kernel/asm-offsets.c
+--- linux-4.6.6.orig/arch/arm/kernel/asm-offsets.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/arm/kernel/asm-offsets.c 2016-08-22 21:27:46.293821284 +0200
+@@ -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 27d05813ff09..5a3742215cde 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 e2550500486d..3125de9e9783 100644
---- a/arch/arm/kernel/entry-armv.S
-+++ b/arch/arm/kernel/entry-armv.S
-@@ -215,11 +215,18 @@ ENDPROC(__dabt_svc)
+diff -Nur linux-4.6.6.orig/arch/arm/kernel/entry-armv.S linux-4.6.6/arch/arm/kernel/entry-armv.S
+--- linux-4.6.6.orig/arch/arm/kernel/entry-armv.S 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/arm/kernel/entry-armv.S 2016-08-22 21:27:46.305822058 +0200
+@@ -215,11 +215,18 @@
#ifdef CONFIG_PREEMPT
get_thread_info tsk
ldr r8, [tsk, #TI_PREEMPT] @ get preempt count
@@ -428,7 +117,7 @@ index e2550500486d..3125de9e9783 100644
#endif
svc_exit r5, irq = 1 @ return from exception
-@@ -234,8 +241,14 @@ ENDPROC(__irq_svc)
+@@ -234,8 +241,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 e2550500486d..3125de9e9783 100644
#endif
__und_fault:
-diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
-index 30a7228eaceb..c3bd6cbfce4b 100644
---- a/arch/arm/kernel/entry-common.S
-+++ b/arch/arm/kernel/entry-common.S
+diff -Nur linux-4.6.6.orig/arch/arm/kernel/entry-common.S linux-4.6.6/arch/arm/kernel/entry-common.S
+--- linux-4.6.6.orig/arch/arm/kernel/entry-common.S 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/arm/kernel/entry-common.S 2016-08-22 21:27:46.305822058 +0200
@@ -36,7 +36,9 @@
UNWIND(.cantunwind )
disable_irq_notrace @ disable interrupts
@@ -459,7 +147,7 @@ index 30a7228eaceb..c3bd6cbfce4b 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,10 @@ index 30a7228eaceb..c3bd6cbfce4b 100644
UNWIND(.fnend )
ENDPROC(ret_fast_syscall)
-diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
-index 4adfb46e3ee9..15f1d94b47c5 100644
---- a/arch/arm/kernel/process.c
-+++ b/arch/arm/kernel/process.c
-@@ -319,6 +319,30 @@ unsigned long arch_randomize_brk(struct mm_struct *mm)
+diff -Nur linux-4.6.6.orig/arch/arm/kernel/process.c linux-4.6.6/arch/arm/kernel/process.c
+--- linux-4.6.6.orig/arch/arm/kernel/process.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/arm/kernel/process.c 2016-08-22 21:27:46.313822571 +0200
+@@ -319,6 +319,30 @@
}
#ifdef CONFIG_MMU
@@ -507,11 +194,10 @@ index 4adfb46e3ee9..15f1d94b47c5 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.6.6.orig/arch/arm/kernel/signal.c linux-4.6.6/arch/arm/kernel/signal.c
+--- linux-4.6.6.orig/arch/arm/kernel/signal.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/arm/kernel/signal.c 2016-08-22 21:27:46.313822571 +0200
+@@ -572,7 +572,8 @@
*/
trace_hardirqs_off();
do {
@@ -521,11 +207,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 baee70267f29..ad157ec494f9 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.6.6.orig/arch/arm/kernel/smp.c linux-4.6.6/arch/arm/kernel/smp.c
+--- linux-4.6.6.orig/arch/arm/kernel/smp.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/arm/kernel/smp.c 2016-08-22 21:27:46.313822571 +0200
+@@ -234,8 +234,6 @@
flush_cache_louis();
local_flush_tlb_all();
@@ -534,7 +219,7 @@ index baee70267f29..ad157ec494f9 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 +229,10 @@ index baee70267f29..ad157ec494f9 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.6.6.orig/arch/arm/kernel/unwind.c linux-4.6.6/arch/arm/kernel/unwind.c
+--- linux-4.6.6.orig/arch/arm/kernel/unwind.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/arm/kernel/unwind.c 2016-08-22 21:27:46.317822824 +0200
+@@ -93,7 +93,7 @@
static const struct unwind_idx *__origin_unwind_idx;
extern const struct unwind_idx __stop_unwind_idx[];
@@ -557,7 +241,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 +250,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 +259,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 +271,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 +283,10 @@ index 0bee233fef9a..314cfb232a63 100644
kfree(tab);
}
-diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
-index 72b11d91ede2..34068c59d0c5 100644
---- a/arch/arm/kvm/arm.c
-+++ b/arch/arm/kvm/arm.c
-@@ -582,7 +582,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)
+diff -Nur linux-4.6.6.orig/arch/arm/kvm/arm.c linux-4.6.6/arch/arm/kvm/arm.c
+--- linux-4.6.6.orig/arch/arm/kvm/arm.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/arm/kvm/arm.c 2016-08-22 21:27:46.321823084 +0200
+@@ -582,7 +582,7 @@
* involves poking the GIC, which must be done in a
* non-preemptible context.
*/
@@ -612,7 +295,7 @@ index 72b11d91ede2..34068c59d0c5 100644
kvm_pmu_flush_hwstate(vcpu);
kvm_timer_flush_hwstate(vcpu);
kvm_vgic_flush_hwstate(vcpu);
-@@ -603,7 +603,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)
+@@ -603,7 +603,7 @@
kvm_pmu_sync_hwstate(vcpu);
kvm_timer_sync_hwstate(vcpu);
kvm_vgic_sync_hwstate(vcpu);
@@ -621,7 +304,7 @@ index 72b11d91ede2..34068c59d0c5 100644
continue;
}
-@@ -659,7 +659,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)
+@@ -659,7 +659,7 @@
kvm_vgic_sync_hwstate(vcpu);
@@ -630,11 +313,10 @@ index 72b11d91ede2..34068c59d0c5 100644
ret = handle_exit(vcpu, run, ret);
}
-diff --git a/arch/arm/mach-exynos/platsmp.c b/arch/arm/mach-exynos/platsmp.c
-index 85c3be63d644..8a950aec7834 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.6.6.orig/arch/arm/mach-exynos/platsmp.c linux-4.6.6/arch/arm/mach-exynos/platsmp.c
+--- linux-4.6.6.orig/arch/arm/mach-exynos/platsmp.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/arm/mach-exynos/platsmp.c 2016-08-22 21:27:46.329823597 +0200
+@@ -229,7 +229,7 @@
return (void __iomem *)(S5P_VA_SCU);
}
@@ -643,7 +325,7 @@ index 85c3be63d644..8a950aec7834 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 +336,7 @@ index 85c3be63d644..8a950aec7834 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 +345,7 @@ index 85c3be63d644..8a950aec7834 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 +354,7 @@ index 85c3be63d644..8a950aec7834 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 +363,9 @@ index 85c3be63d644..8a950aec7834 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.6.6.orig/arch/arm/mach-hisi/platmcpm.c linux-4.6.6/arch/arm/mach-hisi/platmcpm.c
+--- linux-4.6.6.orig/arch/arm/mach-hisi/platmcpm.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/arm/mach-hisi/platmcpm.c 2016-08-22 21:27:46.337824110 +0200
@@ -61,7 +61,7 @@
static void __iomem *sysctrl, *fabric;
@@ -694,7 +375,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 +384,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 +393,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 +407,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 +416,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 +425,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 +438,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 +451,10 @@ index 4b653a8cb75c..b03d5a922cb1 100644
return 0;
}
#endif
-diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
-index 8973fae25436..dd905b9602a0 100644
---- a/arch/arm/mach-imx/Kconfig
-+++ b/arch/arm/mach-imx/Kconfig
-@@ -526,7 +526,7 @@ config SOC_IMX6Q
+diff -Nur linux-4.6.6.orig/arch/arm/mach-imx/Kconfig linux-4.6.6/arch/arm/mach-imx/Kconfig
+--- linux-4.6.6.orig/arch/arm/mach-imx/Kconfig 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/arm/mach-imx/Kconfig 2016-08-22 21:27:46.337824110 +0200
+@@ -526,7 +526,7 @@
bool "i.MX6 Quad/DualLite support"
select ARM_ERRATA_764369 if SMP
select HAVE_ARM_SCU if SMP
@@ -783,10 +463,9 @@ index 8973fae25436..dd905b9602a0 100644
select PCI_DOMAINS if PCI
select PINCTRL_IMX6Q
select SOC_IMX6
-diff --git a/arch/arm/mach-omap2/omap-smp.c b/arch/arm/mach-omap2/omap-smp.c
-index c625cc10d9f9..6cbad704cc3d 100644
---- a/arch/arm/mach-omap2/omap-smp.c
-+++ b/arch/arm/mach-omap2/omap-smp.c
+diff -Nur linux-4.6.6.orig/arch/arm/mach-omap2/omap-smp.c linux-4.6.6/arch/arm/mach-omap2/omap-smp.c
+--- linux-4.6.6.orig/arch/arm/mach-omap2/omap-smp.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/arm/mach-omap2/omap-smp.c 2016-08-22 21:27:46.345824623 +0200
@@ -43,7 +43,7 @@
/* SCU base address */
static void __iomem *scu_base;
@@ -796,7 +475,7 @@ index c625cc10d9f9..6cbad704cc3d 100644
void __iomem *omap4_get_scu_base(void)
{
-@@ -74,8 +74,8 @@ static void omap4_secondary_init(unsigned int cpu)
+@@ -74,8 +74,8 @@
/*
* Synchronise with the boot thread.
*/
@@ -807,7 +486,7 @@ index c625cc10d9f9..6cbad704cc3d 100644
}
static int omap4_boot_secondary(unsigned int cpu, struct task_struct *idle)
-@@ -89,7 +89,7 @@ static int omap4_boot_secondary(unsigned int cpu, struct task_struct *idle)
+@@ -89,7 +89,7 @@
* Set synchronisation state between this boot processor
* and the secondary one
*/
@@ -816,7 +495,7 @@ index c625cc10d9f9..6cbad704cc3d 100644
/*
* Update the AuxCoreBoot0 with boot state for secondary core.
-@@ -166,7 +166,7 @@ static int omap4_boot_secondary(unsigned int cpu, struct task_struct *idle)
+@@ -166,7 +166,7 @@
* Now the secondary core is starting up let it run its
* calibrations, then wait for it to finish
*/
@@ -825,10 +504,9 @@ index c625cc10d9f9..6cbad704cc3d 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.6.6.orig/arch/arm/mach-prima2/platsmp.c linux-4.6.6/arch/arm/mach-prima2/platsmp.c
+--- linux-4.6.6.orig/arch/arm/mach-prima2/platsmp.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/arm/mach-prima2/platsmp.c 2016-08-22 21:27:46.353825136 +0200
@@ -22,7 +22,7 @@
static void __iomem *clk_base;
@@ -838,7 +516,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.
*/
@@ -849,7 +527,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();
@@ -858,7 +536,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
*/
@@ -867,10 +545,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.6.6.orig/arch/arm/mach-qcom/platsmp.c linux-4.6.6/arch/arm/mach-qcom/platsmp.c
+--- linux-4.6.6.orig/arch/arm/mach-qcom/platsmp.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/arm/mach-qcom/platsmp.c 2016-08-22 21:27:46.361825650 +0200
@@ -46,7 +46,7 @@
extern void secondary_startup_arm(void);
@@ -880,7 +557,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.
*/
@@ -891,7 +568,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
*/
@@ -900,7 +577,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
*/
@@ -909,11 +586,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.6.6.orig/arch/arm/mach-spear/platsmp.c linux-4.6.6/arch/arm/mach-spear/platsmp.c
+--- linux-4.6.6.orig/arch/arm/mach-spear/platsmp.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/arm/mach-spear/platsmp.c 2016-08-22 21:27:46.365825902 +0200
+@@ -32,7 +32,7 @@
sync_cache_w(&pen_release);
}
@@ -922,7 +598,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.
*/
@@ -933,7 +609,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
*/
@@ -942,7 +618,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
*/
@@ -951,11 +627,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.6.6.orig/arch/arm/mach-sti/platsmp.c linux-4.6.6/arch/arm/mach-sti/platsmp.c
+--- linux-4.6.6.orig/arch/arm/mach-sti/platsmp.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/arm/mach-sti/platsmp.c 2016-08-22 21:27:46.369826163 +0200
+@@ -35,7 +35,7 @@
sync_cache_w(&pen_release);
}
@@ -964,7 +639,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.
*/
@@ -975,7 +650,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
*/
@@ -984,7 +659,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
*/
@@ -993,11 +668,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 ad5841856007..7678f0616a0a 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.6.6.orig/arch/arm/mm/fault.c linux-4.6.6/arch/arm/mm/fault.c
+--- linux-4.6.6.orig/arch/arm/mm/fault.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/arm/mm/fault.c 2016-08-22 21:27:46.369826163 +0200
+@@ -430,6 +430,9 @@
if (addr < TASK_SIZE)
return do_page_fault(addr, fsr, regs);
@@ -1007,7 +681,7 @@ index ad5841856007..7678f0616a0a 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)
{
@@ -1017,11 +691,10 @@ index ad5841856007..7678f0616a0a 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.6.6.orig/arch/arm/mm/highmem.c linux-4.6.6/arch/arm/mm/highmem.c
+--- linux-4.6.6.orig/arch/arm/mm/highmem.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/arm/mm/highmem.c 2016-08-22 21:27:46.369826163 +0200
+@@ -34,6 +34,11 @@
return *ptep;
}
@@ -1033,7 +706,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)
{
@@ -1048,7 +721,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();
@@ -1057,7 +730,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.
*/
@@ -1069,7 +742,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();
@@ -1151,11 +824,10 @@ index d02f8187b1cc..542692dbd40a 100644
+ }
+}
+#endif
-diff --git a/arch/arm/plat-versatile/platsmp.c b/arch/arm/plat-versatile/platsmp.c
-index 53feb90c840c..b4a8d54fc3f3 100644
---- a/arch/arm/plat-versatile/platsmp.c
-+++ b/arch/arm/plat-versatile/platsmp.c
-@@ -30,7 +30,7 @@ static void write_pen_release(int val)
+diff -Nur linux-4.6.6.orig/arch/arm/plat-versatile/platsmp.c linux-4.6.6/arch/arm/plat-versatile/platsmp.c
+--- linux-4.6.6.orig/arch/arm/plat-versatile/platsmp.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/arm/plat-versatile/platsmp.c 2016-08-22 21:27:46.381826929 +0200
+@@ -30,7 +30,7 @@
sync_cache_w(&pen_release);
}
@@ -1164,7 +836,7 @@ index 53feb90c840c..b4a8d54fc3f3 100644
void versatile_secondary_init(unsigned int cpu)
{
-@@ -43,8 +43,8 @@ void versatile_secondary_init(unsigned int cpu)
+@@ -43,8 +43,8 @@
/*
* Synchronise with the boot thread.
*/
@@ -1175,7 +847,7 @@ index 53feb90c840c..b4a8d54fc3f3 100644
}
int versatile_boot_secondary(unsigned int cpu, struct task_struct *idle)
-@@ -55,7 +55,7 @@ int versatile_boot_secondary(unsigned int cpu, struct task_struct *idle)
+@@ -55,7 +55,7 @@
* Set synchronisation state between this boot processor
* and the secondary one
*/
@@ -1184,7 +856,7 @@ index 53feb90c840c..b4a8d54fc3f3 100644
/*
* This is really belt and braces; we hold unintended secondary
-@@ -85,7 +85,7 @@ int versatile_boot_secondary(unsigned int cpu, struct task_struct *idle)
+@@ -85,7 +85,7 @@
* now the secondary core is starting up let it run its
* calibrations, then wait for it to finish
*/
@@ -1193,32 +865,10 @@ index 53feb90c840c..b4a8d54fc3f3 100644
return pen_release != -1 ? -ENOSYS : 0;
}
-diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
-index 4f436220384f..0d7f54cebae3 100644
---- a/arch/arm64/Kconfig
-+++ b/arch/arm64/Kconfig
-@@ -81,6 +81,7 @@ config ARM64
- select HAVE_PERF_REGS
- select HAVE_PERF_USER_STACK_DUMP
- select HAVE_RCU_TABLE_FREE
-+ select HAVE_PREEMPT_LAZY
- select HAVE_SYSCALL_TRACEPOINTS
- select IOMMU_DMA if IOMMU_SUPPORT
- select IRQ_DOMAIN
-@@ -624,7 +625,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.6.6.orig/arch/arm64/include/asm/thread_info.h linux-4.6.6/arch/arm64/include/asm/thread_info.h
+--- linux-4.6.6.orig/arch/arm64/include/asm/thread_info.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/arm64/include/asm/thread_info.h 2016-08-22 21:27:46.393827702 +0200
+@@ -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 */
@@ -1226,7 +876,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 */
@@ -1234,7 +884,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)
@@ -1242,7 +892,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 | \
@@ -1252,11 +902,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 1abcd8829f3b..8290a50d6dd3 100644
---- a/arch/arm64/kernel/asm-offsets.c
-+++ b/arch/arm64/kernel/asm-offsets.c
-@@ -36,6 +36,7 @@ int main(void)
+diff -Nur linux-4.6.6.orig/arch/arm64/Kconfig linux-4.6.6/arch/arm64/Kconfig
+--- linux-4.6.6.orig/arch/arm64/Kconfig 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/arm64/Kconfig 2016-08-22 21:27:46.389827442 +0200
+@@ -81,6 +81,7 @@
+ select HAVE_PERF_REGS
+ select HAVE_PERF_USER_STACK_DUMP
+ select HAVE_RCU_TABLE_FREE
++ select HAVE_PREEMPT_LAZY
+ select HAVE_SYSCALL_TRACEPOINTS
+ select IOMMU_DMA if IOMMU_SUPPORT
+ select IRQ_DOMAIN
+@@ -624,7 +625,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.6.6.orig/arch/arm64/kernel/asm-offsets.c linux-4.6.6/arch/arm64/kernel/asm-offsets.c
+--- linux-4.6.6.orig/arch/arm64/kernel/asm-offsets.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/arm64/kernel/asm-offsets.c 2016-08-22 21:27:46.401828215 +0200
+@@ -36,6 +36,7 @@
BLANK();
DEFINE(TI_FLAGS, offsetof(struct thread_info, flags));
DEFINE(TI_PREEMPT, offsetof(struct thread_info, preempt_count));
@@ -1264,11 +933,10 @@ index 1abcd8829f3b..8290a50d6dd3 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 6c3b7345a6c4..d4ec679f7e1f 100644
---- a/arch/arm64/kernel/entry.S
-+++ b/arch/arm64/kernel/entry.S
-@@ -426,11 +426,16 @@ ENDPROC(el1_sync)
+diff -Nur linux-4.6.6.orig/arch/arm64/kernel/entry.S linux-4.6.6/arch/arm64/kernel/entry.S
+--- linux-4.6.6.orig/arch/arm64/kernel/entry.S 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/arm64/kernel/entry.S 2016-08-22 21:27:46.405828468 +0200
+@@ -426,11 +426,16 @@
#ifdef CONFIG_PREEMPT
ldr w24, [tsk, #TI_PREEMPT] // get preempt count
@@ -1288,7 +956,7 @@ index 6c3b7345a6c4..d4ec679f7e1f 100644
#endif
#ifdef CONFIG_TRACE_IRQFLAGS
bl trace_hardirqs_on
-@@ -444,6 +449,7 @@ ENDPROC(el1_irq)
+@@ -444,6 +449,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?
@@ -1296,7 +964,7 @@ index 6c3b7345a6c4..d4ec679f7e1f 100644
ret x24
#endif
-@@ -690,6 +696,7 @@ ENDPROC(cpu_switch_to)
+@@ -690,6 +696,7 @@
*/
work_pending:
tbnz x1, #TIF_NEED_RESCHED, work_resched
@@ -1304,11 +972,29 @@ index 6c3b7345a6c4..d4ec679f7e1f 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 2018c2b0e078..3f3820fdb80e 100644
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -2416,7 +2416,7 @@ config CPU_R4400_WORKAROUNDS
+diff -Nur linux-4.6.6.orig/arch/Kconfig linux-4.6.6/arch/Kconfig
+--- linux-4.6.6.orig/arch/Kconfig 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/Kconfig 2016-08-22 21:27:46.245818207 +0200
+@@ -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.6.6.orig/arch/mips/Kconfig linux-4.6.6/arch/mips/Kconfig
+--- linux-4.6.6.orig/arch/mips/Kconfig 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/mips/Kconfig 2016-08-22 21:27:46.417829241 +0200
+@@ -2416,7 +2416,7 @@
#
config HIGHMEM
bool "High Memory Support"
@@ -1317,45 +1003,10 @@ index 2018c2b0e078..3f3820fdb80e 100644
config CPU_SUPPORTS_HIGHMEM
bool
-diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
-index 7cd32c038286..69c3f4db485b 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
-@@ -138,6 +139,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
-@@ -319,7 +321,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 7efee4a3240b..40e6fa1b85b2 100644
---- a/arch/powerpc/include/asm/thread_info.h
-+++ b/arch/powerpc/include/asm/thread_info.h
-@@ -42,6 +42,8 @@ struct thread_info {
+diff -Nur linux-4.6.6.orig/arch/powerpc/include/asm/thread_info.h linux-4.6.6/arch/powerpc/include/asm/thread_info.h
+--- linux-4.6.6.orig/arch/powerpc/include/asm/thread_info.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/powerpc/include/asm/thread_info.h 2016-08-22 21:27:46.433830268 +0200
+@@ -42,6 +42,8 @@
int cpu; /* cpu we're on */
int preempt_count; /* 0 => preemptable,
<0 => BUG */
@@ -1364,7 +1015,7 @@ index 7efee4a3240b..40e6fa1b85b2 100644
unsigned long local_flags; /* private flags for thread */
/* low level flags - has atomic operations done on it */
-@@ -82,8 +84,7 @@ static inline struct thread_info *current_thread_info(void)
+@@ -82,8 +84,7 @@
#define TIF_SYSCALL_TRACE 0 /* syscall trace active */
#define TIF_SIGPENDING 1 /* signal pending */
#define TIF_NEED_RESCHED 2 /* rescheduling necessary */
@@ -1374,7 +1025,7 @@ index 7efee4a3240b..40e6fa1b85b2 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 */
-@@ -101,6 +102,8 @@ static inline struct thread_info *current_thread_info(void)
+@@ -101,6 +102,8 @@
#if defined(CONFIG_PPC64)
#define TIF_ELF2ABI 18 /* function descriptors must die! */
#endif
@@ -1383,7 +1034,7 @@ index 7efee4a3240b..40e6fa1b85b2 100644
/* as above, but as bit values */
#define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE)
-@@ -119,14 +122,16 @@ static inline struct thread_info *current_thread_info(void)
+@@ -119,14 +122,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)
@@ -1401,11 +1052,43 @@ index 7efee4a3240b..40e6fa1b85b2 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 0d0183d3180a..476cf176816b 100644
---- a/arch/powerpc/kernel/asm-offsets.c
-+++ b/arch/powerpc/kernel/asm-offsets.c
-@@ -162,6 +162,7 @@ int main(void)
+diff -Nur linux-4.6.6.orig/arch/powerpc/Kconfig linux-4.6.6/arch/powerpc/Kconfig
+--- linux-4.6.6.orig/arch/powerpc/Kconfig 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/powerpc/Kconfig 2016-08-22 21:27:46.425829754 +0200
+@@ -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
+@@ -138,6 +139,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
+@@ -319,7 +321,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.6.6.orig/arch/powerpc/kernel/asm-offsets.c linux-4.6.6/arch/powerpc/kernel/asm-offsets.c
+--- linux-4.6.6.orig/arch/powerpc/kernel/asm-offsets.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/powerpc/kernel/asm-offsets.c 2016-08-22 21:27:46.441830777 +0200
+@@ -162,6 +162,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));
@@ -1413,11 +1096,10 @@ index 0d0183d3180a..476cf176816b 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 2405631e91a2..c21b4b42eaa0 100644
---- a/arch/powerpc/kernel/entry_32.S
-+++ b/arch/powerpc/kernel/entry_32.S
-@@ -818,7 +818,14 @@ user_exc_return: /* r10 contains MSR_KERNEL here */
+diff -Nur linux-4.6.6.orig/arch/powerpc/kernel/entry_32.S linux-4.6.6/arch/powerpc/kernel/entry_32.S
+--- linux-4.6.6.orig/arch/powerpc/kernel/entry_32.S 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/powerpc/kernel/entry_32.S 2016-08-22 21:27:46.481833341 +0200
+@@ -818,7 +818,14 @@
cmpwi 0,r0,0 /* if non-zero, just restore regs and return */
bne restore
andi. r8,r8,_TIF_NEED_RESCHED
@@ -1432,7 +1114,7 @@ index 2405631e91a2..c21b4b42eaa0 100644
lwz r3,_MSR(r1)
andi. r0,r3,MSR_EE /* interrupts off? */
beq restore /* don't schedule if so */
-@@ -829,11 +836,11 @@ user_exc_return: /* r10 contains MSR_KERNEL here */
+@@ -829,11 +836,11 @@
*/
bl trace_hardirqs_off
#endif
@@ -1447,7 +1129,7 @@ index 2405631e91a2..c21b4b42eaa0 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
-@@ -1154,7 +1161,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_NEED_PAIRED_STWCX)
+@@ -1154,7 +1161,7 @@
#endif /* !(CONFIG_4xx || CONFIG_BOOKE) */
do_work: /* r10 contains MSR_KERNEL here */
@@ -1456,7 +1138,7 @@ index 2405631e91a2..c21b4b42eaa0 100644
beq do_user_signal
do_resched: /* r10 contains MSR_KERNEL here */
-@@ -1175,7 +1182,7 @@ do_resched: /* r10 contains MSR_KERNEL here */
+@@ -1175,7 +1182,7 @@
MTMSRD(r10) /* disable interrupts */
CURRENT_THREAD_INFO(r9, r1)
lwz r9,TI_FLAGS(r9)
@@ -1465,11 +1147,10 @@ index 2405631e91a2..c21b4b42eaa0 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 9916d150b28c..5dce9354223c 100644
---- a/arch/powerpc/kernel/entry_64.S
-+++ b/arch/powerpc/kernel/entry_64.S
-@@ -644,7 +644,7 @@ _GLOBAL(ret_from_except_lite)
+diff -Nur linux-4.6.6.orig/arch/powerpc/kernel/entry_64.S linux-4.6.6/arch/powerpc/kernel/entry_64.S
+--- linux-4.6.6.orig/arch/powerpc/kernel/entry_64.S 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/powerpc/kernel/entry_64.S 2016-08-22 21:27:46.485833601 +0200
+@@ -644,7 +644,7 @@
bl restore_math
b restore
#endif
@@ -1478,29 +1159,27 @@ index 9916d150b28c..5dce9354223c 100644
beq 2f
bl restore_interrupts
SCHEDULE_USER
-@@ -706,10 +706,18 @@ _GLOBAL(ret_from_except_lite)
+@@ -706,10 +706,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
-@@ -726,7 +734,7 @@ _GLOBAL(ret_from_except_lite)
+@@ -726,7 +734,7 @@
/* Re-test flags and eventually loop */
CURRENT_THREAD_INFO(r9, r1)
ld r4,TI_FLAGS(r9)
@@ -1509,11 +1188,10 @@ index 9916d150b28c..5dce9354223c 100644
bne 1b
/*
-diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
-index 290559df1e8b..070afa6da35d 100644
---- a/arch/powerpc/kernel/irq.c
-+++ b/arch/powerpc/kernel/irq.c
-@@ -614,6 +614,7 @@ void irq_ctx_init(void)
+diff -Nur linux-4.6.6.orig/arch/powerpc/kernel/irq.c linux-4.6.6/arch/powerpc/kernel/irq.c
+--- linux-4.6.6.orig/arch/powerpc/kernel/irq.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/powerpc/kernel/irq.c 2016-08-22 21:27:46.493834114 +0200
+@@ -614,6 +614,7 @@
}
}
@@ -1521,7 +1199,7 @@ index 290559df1e8b..070afa6da35d 100644
void do_softirq_own_stack(void)
{
struct thread_info *curtp, *irqtp;
-@@ -631,6 +632,7 @@ void do_softirq_own_stack(void)
+@@ -631,6 +632,7 @@
if (irqtp->flags)
set_bits(irqtp->flags, &curtp->flags);
}
@@ -1529,10 +1207,9 @@ index 290559df1e8b..070afa6da35d 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 bf5160fbf9d8..e551d78c8038 100644
---- a/arch/powerpc/kernel/misc_32.S
-+++ b/arch/powerpc/kernel/misc_32.S
+diff -Nur linux-4.6.6.orig/arch/powerpc/kernel/misc_32.S linux-4.6.6/arch/powerpc/kernel/misc_32.S
+--- linux-4.6.6.orig/arch/powerpc/kernel/misc_32.S 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/powerpc/kernel/misc_32.S 2016-08-22 21:27:46.497834367 +0200
@@ -40,6 +40,7 @@
* We store the saved ksp_limit in the unused part
* of the STACK_FRAME_OVERHEAD
@@ -1541,7 +1218,7 @@ index bf5160fbf9d8..e551d78c8038 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
@@ -1549,10 +1226,9 @@ index bf5160fbf9d8..e551d78c8038 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 f28754c497e5..31ae513acac9 100644
---- a/arch/powerpc/kernel/misc_64.S
-+++ b/arch/powerpc/kernel/misc_64.S
+diff -Nur linux-4.6.6.orig/arch/powerpc/kernel/misc_64.S linux-4.6.6/arch/powerpc/kernel/misc_64.S
+--- linux-4.6.6.orig/arch/powerpc/kernel/misc_64.S 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/powerpc/kernel/misc_64.S 2016-08-22 21:27:46.497834367 +0200
@@ -30,6 +30,7 @@
.text
@@ -1561,7 +1237,7 @@ index f28754c497e5..31ae513acac9 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
@@ -1569,11 +1245,10 @@ index f28754c497e5..31ae513acac9 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.6.6.orig/arch/powerpc/kvm/Kconfig linux-4.6.6/arch/powerpc/kvm/Kconfig
+--- linux-4.6.6.orig/arch/powerpc/kvm/Kconfig 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/powerpc/kvm/Kconfig 2016-08-22 21:27:46.501834627 +0200
+@@ -172,6 +172,7 @@
config KVM_MPIC
bool "KVM in-kernel MPIC emulation"
depends on KVM && E500
@@ -1581,11 +1256,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 3f175e8aedb4..c4c02f91904c 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.6.6.orig/arch/powerpc/platforms/ps3/device-init.c linux-4.6.6/arch/powerpc/platforms/ps3/device-init.c
+--- linux-4.6.6.orig/arch/powerpc/platforms/ps3/device-init.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/powerpc/platforms/ps3/device-init.c 2016-08-22 21:27:46.509835141 +0200
+@@ -752,7 +752,7 @@
}
pr_debug("%s:%u: notification %s issued\n", __func__, __LINE__, op);
@@ -1594,11 +1268,10 @@ index 3f175e8aedb4..c4c02f91904c 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.6.6.orig/arch/sh/kernel/irq.c linux-4.6.6/arch/sh/kernel/irq.c
+--- linux-4.6.6.orig/arch/sh/kernel/irq.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/sh/kernel/irq.c 2016-08-22 21:27:46.517835654 +0200
+@@ -147,6 +147,7 @@
hardirq_ctx[cpu] = NULL;
}
@@ -1606,7 +1279,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"
);
}
@@ -1614,11 +1287,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 57ffaf285c2f..733c72826f28 100644
---- a/arch/sparc/Kconfig
-+++ b/arch/sparc/Kconfig
-@@ -184,12 +184,10 @@ config NR_CPUS
+diff -Nur linux-4.6.6.orig/arch/sparc/Kconfig linux-4.6.6/arch/sparc/Kconfig
+--- linux-4.6.6.orig/arch/sparc/Kconfig 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/sparc/Kconfig 2016-08-22 21:27:46.525836167 +0200
+@@ -184,12 +184,10 @@
source kernel/Kconfig.hz
config RWSEM_GENERIC_SPINLOCK
@@ -1633,11 +1305,10 @@ index 57ffaf285c2f..733c72826f28 100644
config GENERIC_HWEIGHT
bool
-diff --git a/arch/sparc/kernel/irq_64.c b/arch/sparc/kernel/irq_64.c
-index e22416ce56ea..d359de71153a 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.6.6.orig/arch/sparc/kernel/irq_64.c linux-4.6.6/arch/sparc/kernel/irq_64.c
+--- linux-4.6.6.orig/arch/sparc/kernel/irq_64.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/sparc/kernel/irq_64.c 2016-08-22 21:27:46.533836680 +0200
+@@ -854,6 +854,7 @@
set_irq_regs(old_regs);
}
@@ -1645,7 +1316,7 @@ index e22416ce56ea..d359de71153a 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));
}
@@ -1653,45 +1324,10 @@ index e22416ce56ea..d359de71153a 100644
#ifdef CONFIG_HOTPLUG_CPU
void fixup_irqs(void)
-diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
-index 2dc18605831f..ea65dc777a77 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
-@@ -230,8 +231,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
-@@ -889,7 +893,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 064c7e2bd7c8..e400dd3947db 100644
---- a/arch/x86/crypto/aesni-intel_glue.c
-+++ b/arch/x86/crypto/aesni-intel_glue.c
-@@ -383,14 +383,14 @@ static int ecb_encrypt(struct blkcipher_desc *desc,
+diff -Nur linux-4.6.6.orig/arch/x86/crypto/aesni-intel_glue.c linux-4.6.6/arch/x86/crypto/aesni-intel_glue.c
+--- linux-4.6.6.orig/arch/x86/crypto/aesni-intel_glue.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/x86/crypto/aesni-intel_glue.c 2016-08-22 21:27:46.549837706 +0200
+@@ -383,14 +383,14 @@
err = blkcipher_walk_virt(desc, &walk);
desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;
@@ -1709,7 +1345,7 @@ index 064c7e2bd7c8..e400dd3947db 100644
return err;
}
-@@ -407,14 +407,14 @@ static int ecb_decrypt(struct blkcipher_desc *desc,
+@@ -407,14 +407,14 @@
err = blkcipher_walk_virt(desc, &walk);
desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;
@@ -1726,7 +1362,7 @@ index 064c7e2bd7c8..e400dd3947db 100644
return err;
}
-@@ -431,14 +431,14 @@ static int cbc_encrypt(struct blkcipher_desc *desc,
+@@ -431,14 +431,14 @@
err = blkcipher_walk_virt(desc, &walk);
desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;
@@ -1743,7 +1379,7 @@ index 064c7e2bd7c8..e400dd3947db 100644
return err;
}
-@@ -455,14 +455,14 @@ static int cbc_decrypt(struct blkcipher_desc *desc,
+@@ -455,14 +455,14 @@
err = blkcipher_walk_virt(desc, &walk);
desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;
@@ -1760,7 +1396,7 @@ index 064c7e2bd7c8..e400dd3947db 100644
return err;
}
-@@ -514,18 +514,20 @@ static int ctr_crypt(struct blkcipher_desc *desc,
+@@ -514,18 +514,20 @@
err = blkcipher_walk_virt_block(desc, &walk, AES_BLOCK_SIZE);
desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;
@@ -1783,11 +1419,10 @@ index 064c7e2bd7c8..e400dd3947db 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.6.6.orig/arch/x86/crypto/cast5_avx_glue.c linux-4.6.6/arch/x86/crypto/cast5_avx_glue.c
+--- linux-4.6.6.orig/arch/x86/crypto/cast5_avx_glue.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/x86/crypto/cast5_avx_glue.c 2016-08-22 21:27:46.561838472 +0200
+@@ -59,7 +59,7 @@
static int ecb_crypt(struct blkcipher_desc *desc, struct blkcipher_walk *walk,
bool enc)
{
@@ -1796,7 +1431,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;
@@ -1805,7 +1440,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:
@@ -1817,7 +1452,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)
{
@@ -1826,7 +1461,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)) {
@@ -1841,7 +1476,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)
{
@@ -1850,7 +1485,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) {
@@ -1866,11 +1501,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.6.6.orig/arch/x86/crypto/glue_helper.c linux-4.6.6/arch/x86/crypto/glue_helper.c
+--- linux-4.6.6.orig/arch/x86/crypto/glue_helper.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/x86/crypto/glue_helper.c 2016-08-22 21:27:46.565838732 +0200
+@@ -39,7 +39,7 @@
void *ctx = crypto_blkcipher_ctx(desc->tfm);
const unsigned int bsize = 128 / 8;
unsigned int nbytes, i, func_bytes;
@@ -1879,7 +1513,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,
@@ -1888,7 +1522,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:
@@ -1900,7 +1534,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;
@@ -1909,7 +1543,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,
@@ -1924,7 +1558,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;
@@ -1933,7 +1567,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,
@@ -1949,7 +1583,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;
@@ -1958,7 +1592,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,
@@ -1985,11 +1619,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 e79d93d44ecd..ef2564dc2656 100644
---- a/arch/x86/entry/common.c
-+++ b/arch/x86/entry/common.c
-@@ -202,7 +202,7 @@ long syscall_trace_enter(struct pt_regs *regs)
+diff -Nur linux-4.6.6.orig/arch/x86/entry/common.c linux-4.6.6/arch/x86/entry/common.c
+--- linux-4.6.6.orig/arch/x86/entry/common.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/x86/entry/common.c 2016-08-22 21:27:46.577839498 +0200
+@@ -202,7 +202,7 @@
#define EXIT_TO_USERMODE_LOOP_FLAGS \
(_TIF_SIGPENDING | _TIF_NOTIFY_RESUME | _TIF_UPROBE | \
@@ -1998,7 +1631,7 @@ index e79d93d44ecd..ef2564dc2656 100644
static void exit_to_usermode_loop(struct pt_regs *regs, u32 cached_flags)
{
-@@ -218,9 +218,16 @@ static void exit_to_usermode_loop(struct pt_regs *regs, u32 cached_flags)
+@@ -218,9 +218,16 @@
/* We have work to do. */
local_irq_enable();
@@ -2016,11 +1649,10 @@ index e79d93d44ecd..ef2564dc2656 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 10868aa734dc..7c7d3085f046 100644
---- a/arch/x86/entry/entry_32.S
-+++ b/arch/x86/entry/entry_32.S
-@@ -278,8 +278,24 @@ END(ret_from_exception)
+diff -Nur linux-4.6.6.orig/arch/x86/entry/entry_32.S linux-4.6.6/arch/x86/entry/entry_32.S
+--- linux-4.6.6.orig/arch/x86/entry/entry_32.S 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/x86/entry/entry_32.S 2016-08-22 21:27:46.577839498 +0200
+@@ -278,8 +278,24 @@
ENTRY(resume_kernel)
DISABLE_INTERRUPTS(CLBR_ANY)
need_resched:
@@ -2045,11 +1677,10 @@ index 10868aa734dc..7c7d3085f046 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 858b555e274b..a93639ddfbf6 100644
---- a/arch/x86/entry/entry_64.S
-+++ b/arch/x86/entry/entry_64.S
-@@ -511,7 +511,23 @@ GLOBAL(retint_user)
+diff -Nur linux-4.6.6.orig/arch/x86/entry/entry_64.S linux-4.6.6/arch/x86/entry/entry_64.S
+--- linux-4.6.6.orig/arch/x86/entry/entry_64.S 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/x86/entry/entry_64.S 2016-08-22 21:27:46.581839759 +0200
+@@ -511,7 +511,23 @@
bt $9, EFLAGS(%rsp) /* were interrupts off? */
jnc 1f
0: cmpl $0, PER_CPU_VAR(__preempt_count)
@@ -2073,7 +1704,7 @@ index 858b555e274b..a93639ddfbf6 100644
call preempt_schedule_irq
jmp 0b
1:
-@@ -799,6 +815,7 @@ END(native_load_gs_index)
+@@ -799,6 +815,7 @@
jmp 2b
.previous
@@ -2081,7 +1712,7 @@ index 858b555e274b..a93639ddfbf6 100644
/* Call softirq on interrupt stack. Interrupts are off. */
ENTRY(do_softirq_own_stack)
pushq %rbp
-@@ -811,6 +828,7 @@ ENTRY(do_softirq_own_stack)
+@@ -811,6 +828,7 @@
decl PER_CPU_VAR(irq_count)
ret
END(do_softirq_own_stack)
@@ -2089,11 +1720,10 @@ index 858b555e274b..a93639ddfbf6 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 d397deb58146..190af4271b5c 100644
---- a/arch/x86/include/asm/preempt.h
-+++ b/arch/x86/include/asm/preempt.h
-@@ -79,17 +79,33 @@ static __always_inline void __preempt_count_sub(int val)
+diff -Nur linux-4.6.6.orig/arch/x86/include/asm/preempt.h linux-4.6.6/arch/x86/include/asm/preempt.h
+--- linux-4.6.6.orig/arch/x86/include/asm/preempt.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/x86/include/asm/preempt.h 2016-08-22 21:27:46.585840012 +0200
+@@ -79,17 +79,33 @@
* a decrement which hits zero means we have no preempt_count and should
* reschedule.
*/
@@ -2128,11 +1758,10 @@ index d397deb58146..190af4271b5c 100644
}
#ifdef CONFIG_PREEMPT
-diff --git a/arch/x86/include/asm/signal.h b/arch/x86/include/asm/signal.h
-index 2138c9ae19ee..3f5b4ee2e2c1 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.6.6.orig/arch/x86/include/asm/signal.h linux-4.6.6/arch/x86/include/asm/signal.h
+--- linux-4.6.6.orig/arch/x86/include/asm/signal.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/x86/include/asm/signal.h 2016-08-22 21:27:46.585840012 +0200
+@@ -23,6 +23,19 @@
unsigned long sig[_NSIG_WORDS];
} sigset_t;
@@ -2152,10 +1781,9 @@ index 2138c9ae19ee..3f5b4ee2e2c1 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.6.6.orig/arch/x86/include/asm/stackprotector.h linux-4.6.6/arch/x86/include/asm/stackprotector.h
+--- linux-4.6.6.orig/arch/x86/include/asm/stackprotector.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/x86/include/asm/stackprotector.h 2016-08-22 21:27:46.585840012 +0200
@@ -59,7 +59,7 @@
*/
static __always_inline void boot_init_stack_canary(void)
@@ -2165,7 +1793,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.
@@ -2181,11 +1809,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 ffae84df8a93..b4575ba19a59 100644
---- a/arch/x86/include/asm/thread_info.h
-+++ b/arch/x86/include/asm/thread_info.h
-@@ -58,6 +58,8 @@ struct thread_info {
+diff -Nur linux-4.6.6.orig/arch/x86/include/asm/thread_info.h linux-4.6.6/arch/x86/include/asm/thread_info.h
+--- linux-4.6.6.orig/arch/x86/include/asm/thread_info.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/x86/include/asm/thread_info.h 2016-08-22 21:27:46.589840272 +0200
+@@ -58,6 +58,8 @@
__u32 status; /* thread synchronous flags */
__u32 cpu; /* current CPU */
mm_segment_t addr_limit;
@@ -2194,7 +1821,7 @@ index ffae84df8a93..b4575ba19a59 100644
unsigned int sig_on_uaccess_error:1;
unsigned int uaccess_err:1; /* uaccess failed */
};
-@@ -95,6 +97,7 @@ struct thread_info {
+@@ -95,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 */
@@ -2202,7 +1829,7 @@ index ffae84df8a93..b4575ba19a59 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 */
-@@ -119,6 +122,7 @@ struct thread_info {
+@@ -119,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)
@@ -2210,7 +1837,7 @@ index ffae84df8a93..b4575ba19a59 100644
#define _TIF_USER_RETURN_NOTIFY (1 << TIF_USER_RETURN_NOTIFY)
#define _TIF_UPROBE (1 << TIF_UPROBE)
#define _TIF_NOTSC (1 << TIF_NOTSC)
-@@ -155,6 +159,8 @@ struct thread_info {
+@@ -155,6 +159,8 @@
#define _TIF_WORK_CTXSW_PREV (_TIF_WORK_CTXSW|_TIF_USER_RETURN_NOTIFY)
#define _TIF_WORK_CTXSW_NEXT (_TIF_WORK_CTXSW)
@@ -2219,11 +1846,28 @@ index ffae84df8a93..b4575ba19a59 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 fc808b83fccb..ebb40118abf5 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.6.6.orig/arch/x86/include/asm/tlbflush.h linux-4.6.6/arch/x86/include/asm/tlbflush.h
+--- linux-4.6.6.orig/arch/x86/include/asm/tlbflush.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/x86/include/asm/tlbflush.h 2016-08-22 21:27:46.589840272 +0200
+@@ -135,7 +135,14 @@
+
+ static inline void __native_flush_tlb(void)
+ {
++ /*
++ * if current->mm == NULL then we borrow a mm which may change during a
++ * task switch and therefore we must not be preempted while we write CR3
++ * back.
++ */
++ preempt_disable();
+ native_write_cr3(native_read_cr3());
++ preempt_enable();
+ }
+
+ static inline void __native_flush_tlb_global_irq_disabled(void)
+diff -Nur linux-4.6.6.orig/arch/x86/include/asm/uv/uv_bau.h linux-4.6.6/arch/x86/include/asm/uv/uv_bau.h
+--- linux-4.6.6.orig/arch/x86/include/asm/uv/uv_bau.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/x86/include/asm/uv/uv_bau.h 2016-08-22 21:27:46.593840525 +0200
+@@ -615,9 +615,9 @@
cycles_t send_message;
cycles_t period_end;
cycles_t period_time;
@@ -2236,7 +1880,7 @@ index fc808b83fccb..ebb40118abf5 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.
*/
@@ -2256,11 +1900,10 @@ index fc808b83fccb..ebb40118abf5 100644
return 1;
}
-diff --git a/arch/x86/include/asm/uv/uv_hub.h b/arch/x86/include/asm/uv/uv_hub.h
-index ea7074784cc4..01ec643ce66e 100644
---- a/arch/x86/include/asm/uv/uv_hub.h
-+++ b/arch/x86/include/asm/uv/uv_hub.h
-@@ -492,7 +492,7 @@ struct uv_blade_info {
+diff -Nur linux-4.6.6.orig/arch/x86/include/asm/uv/uv_hub.h linux-4.6.6/arch/x86/include/asm/uv/uv_hub.h
+--- linux-4.6.6.orig/arch/x86/include/asm/uv/uv_hub.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/x86/include/asm/uv/uv_hub.h 2016-08-22 21:27:46.593840525 +0200
+@@ -492,7 +492,7 @@
unsigned short nr_online_cpus;
unsigned short pnode;
short memory_nid;
@@ -2269,11 +1912,43 @@ index ea7074784cc4..01ec643ce66e 100644
unsigned long nmi_count; /* obsolete, see uv_hub_nmi */
};
extern struct uv_blade_info *uv_blade_info;
-diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
-index fdb0fbfb1197..678c711e2a16 100644
---- a/arch/x86/kernel/apic/io_apic.c
-+++ b/arch/x86/kernel/apic/io_apic.c
-@@ -1711,7 +1711,8 @@ static bool io_apic_level_ack_pending(struct mp_chip_data *data)
+diff -Nur linux-4.6.6.orig/arch/x86/Kconfig linux-4.6.6/arch/x86/Kconfig
+--- linux-4.6.6.orig/arch/x86/Kconfig 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/x86/Kconfig 2016-08-22 21:27:46.549837706 +0200
+@@ -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
+@@ -230,8 +231,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
+@@ -889,7 +893,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.6.6.orig/arch/x86/kernel/apic/io_apic.c linux-4.6.6/arch/x86/kernel/apic/io_apic.c
+--- linux-4.6.6.orig/arch/x86/kernel/apic/io_apic.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/x86/kernel/apic/io_apic.c 2016-08-22 21:27:46.605841298 +0200
+@@ -1711,7 +1711,8 @@
static inline bool ioapic_irqd_mask(struct irq_data *data)
{
/* If we are moving the irq we need to mask it */
@@ -2283,11 +1958,10 @@ index fdb0fbfb1197..678c711e2a16 100644
mask_ioapic_irq(data);
return true;
}
-diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
-index d7ce96a7daca..cd97771f61d6 100644
---- a/arch/x86/kernel/apic/x2apic_uv_x.c
-+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
-@@ -755,7 +755,7 @@ static void uv_heartbeat(unsigned long ignored)
+diff -Nur linux-4.6.6.orig/arch/x86/kernel/apic/x2apic_uv_x.c linux-4.6.6/arch/x86/kernel/apic/x2apic_uv_x.c
+--- linux-4.6.6.orig/arch/x86/kernel/apic/x2apic_uv_x.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/x86/kernel/apic/x2apic_uv_x.c 2016-08-22 21:27:46.617842064 +0200
+@@ -755,7 +755,7 @@
uv_set_scir_bits(bits);
/* enable next timer period */
@@ -2296,7 +1970,7 @@ index d7ce96a7daca..cd97771f61d6 100644
}
static void uv_heartbeat_enable(int cpu)
-@@ -764,7 +764,7 @@ static void uv_heartbeat_enable(int cpu)
+@@ -764,7 +764,7 @@
struct timer_list *timer = &uv_cpu_hub_info(cpu)->scir.timer;
uv_set_cpu_scir_bits(cpu, SCIR_CPU_HEARTBEAT|SCIR_CPU_ACTIVITY);
@@ -2305,7 +1979,7 @@ index d7ce96a7daca..cd97771f61d6 100644
timer->expires = jiffies + SCIR_CPU_HB_INTERVAL;
add_timer_on(timer, cpu);
uv_cpu_hub_info(cpu)->scir.enabled = 1;
-@@ -950,7 +950,7 @@ void __init uv_system_init(void)
+@@ -950,7 +950,7 @@
uv_blade_info[blade].pnode = pnode;
uv_blade_info[blade].nr_possible_cpus = 0;
uv_blade_info[blade].nr_online_cpus = 0;
@@ -2314,11 +1988,10 @@ index d7ce96a7daca..cd97771f61d6 100644
min_pnode = min(pnode, min_pnode);
max_pnode = max(pnode, max_pnode);
blade++;
-diff --git a/arch/x86/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c
-index 5c042466f274..ea558b0576d0 100644
---- a/arch/x86/kernel/asm-offsets.c
-+++ b/arch/x86/kernel/asm-offsets.c
-@@ -32,6 +32,7 @@ void common(void) {
+diff -Nur linux-4.6.6.orig/arch/x86/kernel/asm-offsets.c linux-4.6.6/arch/x86/kernel/asm-offsets.c
+--- linux-4.6.6.orig/arch/x86/kernel/asm-offsets.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/x86/kernel/asm-offsets.c 2016-08-22 21:27:46.617842064 +0200
+@@ -32,6 +32,7 @@
OFFSET(TI_flags, thread_info, flags);
OFFSET(TI_status, thread_info, status);
OFFSET(TI_addr_limit, thread_info, addr_limit);
@@ -2326,16 +1999,15 @@ index 5c042466f274..ea558b0576d0 100644
BLANK();
OFFSET(crypto_tfm_ctx_offset, crypto_tfm, __crt_ctx);
-@@ -85,4 +86,5 @@ void common(void) {
+@@ -85,4 +86,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 f0c921b03e42..f3bd7b8302ef 100644
---- a/arch/x86/kernel/cpu/mcheck/mce.c
-+++ b/arch/x86/kernel/cpu/mcheck/mce.c
+diff -Nur linux-4.6.6.orig/arch/x86/kernel/cpu/mcheck/mce.c linux-4.6.6/arch/x86/kernel/cpu/mcheck/mce.c
+--- linux-4.6.6.orig/arch/x86/kernel/cpu/mcheck/mce.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/x86/kernel/cpu/mcheck/mce.c 2016-08-22 21:27:46.629842834 +0200
@@ -41,6 +41,8 @@
#include <linux/debugfs.h>
#include <linux/irq_work.h>
@@ -2345,7 +2017,7 @@ index f0c921b03e42..f3bd7b8302ef 100644
#include <asm/processor.h>
#include <asm/traps.h>
-@@ -1240,7 +1242,7 @@ void mce_log_therm_throt_event(__u64 status)
+@@ -1240,7 +1242,7 @@
static unsigned long check_interval = INITIAL_CHECK_INTERVAL;
static DEFINE_PER_CPU(unsigned long, mce_next_interval); /* in jiffies */
@@ -2354,7 +2026,7 @@ index f0c921b03e42..f3bd7b8302ef 100644
static unsigned long mce_adjust_timer_default(unsigned long interval)
{
-@@ -1249,32 +1251,18 @@ static unsigned long mce_adjust_timer_default(unsigned long interval)
+@@ -1249,32 +1251,18 @@
static unsigned long (*mce_adjust_timer)(unsigned long interval) = mce_adjust_timer_default;
@@ -2393,7 +2065,7 @@ index f0c921b03e42..f3bd7b8302ef 100644
iv = __this_cpu_read(mce_next_interval);
if (mce_available(this_cpu_ptr(&cpu_info))) {
-@@ -1297,7 +1285,7 @@ static void mce_timer_fn(unsigned long data)
+@@ -1297,7 +1285,7 @@
done:
__this_cpu_write(mce_next_interval, iv);
@@ -2402,7 +2074,7 @@ index f0c921b03e42..f3bd7b8302ef 100644
}
/*
-@@ -1305,7 +1293,7 @@ static void mce_timer_fn(unsigned long data)
+@@ -1305,7 +1293,7 @@
*/
void mce_timer_kick(unsigned long interval)
{
@@ -2411,7 +2083,7 @@ index f0c921b03e42..f3bd7b8302ef 100644
unsigned long iv = __this_cpu_read(mce_next_interval);
__restart_timer(t, interval);
-@@ -1320,7 +1308,7 @@ static void mce_timer_delete_all(void)
+@@ -1320,7 +1308,7 @@
int cpu;
for_each_online_cpu(cpu)
@@ -2420,7 +2092,7 @@ index f0c921b03e42..f3bd7b8302ef 100644
}
static void mce_do_trigger(struct work_struct *work)
-@@ -1330,6 +1318,56 @@ static void mce_do_trigger(struct work_struct *work)
+@@ -1330,6 +1318,56 @@
static DECLARE_WORK(mce_trigger_work, mce_do_trigger);
@@ -2477,7 +2149,7 @@ index f0c921b03e42..f3bd7b8302ef 100644
/*
* Notify the user(s) about new machine check events.
* Can be called from interrupt context, but not from machine check/NMI
-@@ -1337,19 +1375,8 @@ static DECLARE_WORK(mce_trigger_work, mce_do_trigger);
+@@ -1337,19 +1375,8 @@
*/
int mce_notify_irq(void)
{
@@ -2498,7 +2170,7 @@ index f0c921b03e42..f3bd7b8302ef 100644
return 1;
}
return 0;
-@@ -1654,7 +1681,7 @@ static void __mcheck_cpu_clear_vendor(struct cpuinfo_x86 *c)
+@@ -1654,7 +1681,7 @@
}
}
@@ -2507,7 +2179,7 @@ index f0c921b03e42..f3bd7b8302ef 100644
{
unsigned long iv = check_interval * HZ;
-@@ -1663,16 +1690,17 @@ static void mce_start_timer(unsigned int cpu, struct timer_list *t)
+@@ -1663,16 +1690,17 @@
per_cpu(mce_next_interval, cpu) = iv;
@@ -2529,7 +2201,7 @@ index f0c921b03e42..f3bd7b8302ef 100644
mce_start_timer(cpu, t);
}
-@@ -2393,6 +2421,8 @@ static void mce_disable_cpu(void *h)
+@@ -2393,6 +2421,8 @@
if (!mce_available(raw_cpu_ptr(&cpu_info)))
return;
@@ -2538,7 +2210,7 @@ index f0c921b03e42..f3bd7b8302ef 100644
if (!(action & CPU_TASKS_FROZEN))
cmci_clear();
-@@ -2415,6 +2445,7 @@ static void mce_reenable_cpu(void *h)
+@@ -2415,6 +2445,7 @@
if (b->init)
wrmsrl(MSR_IA32_MCx_CTL(i), b->ctl);
}
@@ -2546,7 +2218,7 @@ index f0c921b03e42..f3bd7b8302ef 100644
}
/* Get notified when a cpu comes on/off. Be hotplug friendly. */
-@@ -2422,7 +2453,6 @@ static int
+@@ -2422,7 +2453,6 @@
mce_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
{
unsigned int cpu = (unsigned long)hcpu;
@@ -2554,7 +2226,7 @@ index f0c921b03e42..f3bd7b8302ef 100644
switch (action & ~CPU_TASKS_FROZEN) {
case CPU_ONLINE:
-@@ -2442,11 +2472,9 @@ mce_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
+@@ -2442,11 +2472,9 @@
break;
case CPU_DOWN_PREPARE:
smp_call_function_single(cpu, mce_disable_cpu, &action, 1);
@@ -2566,7 +2238,7 @@ index f0c921b03e42..f3bd7b8302ef 100644
break;
}
-@@ -2485,6 +2513,10 @@ static __init int mcheck_init_device(void)
+@@ -2485,6 +2513,10 @@
goto err_out;
}
@@ -2577,11 +2249,10 @@ index f0c921b03e42..f3bd7b8302ef 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 464ffd69b92e..00db1aad1548 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.6.6.orig/arch/x86/kernel/dumpstack_32.c linux-4.6.6/arch/x86/kernel/dumpstack_32.c
+--- linux-4.6.6.orig/arch/x86/kernel/dumpstack_32.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/x86/kernel/dumpstack_32.c 2016-08-22 21:27:46.633843092 +0200
+@@ -42,7 +42,7 @@
unsigned long *stack, unsigned long bp,
const struct stacktrace_ops *ops, void *data)
{
@@ -2590,7 +2261,7 @@ index 464ffd69b92e..00db1aad1548 100644
int graph = 0;
u32 *prev_esp;
-@@ -86,7 +86,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
+@@ -86,7 +86,7 @@
break;
touch_nmi_watchdog();
}
@@ -2599,11 +2270,10 @@ index 464ffd69b92e..00db1aad1548 100644
}
EXPORT_SYMBOL(dump_trace);
-diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c
-index 5f1c6266eb30..c331e3fef465 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.6.6.orig/arch/x86/kernel/dumpstack_64.c linux-4.6.6/arch/x86/kernel/dumpstack_64.c
+--- linux-4.6.6.orig/arch/x86/kernel/dumpstack_64.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/x86/kernel/dumpstack_64.c 2016-08-22 21:27:46.633843092 +0200
+@@ -152,7 +152,7 @@
unsigned long *stack, unsigned long bp,
const struct stacktrace_ops *ops, void *data)
{
@@ -2612,7 +2282,7 @@ index 5f1c6266eb30..c331e3fef465 100644
struct thread_info *tinfo;
unsigned long *irq_stack = (unsigned long *)per_cpu(irq_stack_ptr, cpu);
unsigned long dummy;
-@@ -241,7 +241,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
+@@ -241,7 +241,7 @@
* This handles the process stack:
*/
bp = ops->walk_stack(tinfo, stack, bp, ops, data, NULL, &graph);
@@ -2621,7 +2291,7 @@ index 5f1c6266eb30..c331e3fef465 100644
}
EXPORT_SYMBOL(dump_trace);
-@@ -255,7 +255,7 @@ show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs,
+@@ -255,7 +255,7 @@
int cpu;
int i;
@@ -2630,7 +2300,7 @@ index 5f1c6266eb30..c331e3fef465 100644
cpu = smp_processor_id();
irq_stack_end = (unsigned long *)(per_cpu(irq_stack_ptr, cpu));
-@@ -291,7 +291,7 @@ show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs,
+@@ -291,7 +291,7 @@
pr_cont(" %016lx", *stack++);
touch_nmi_watchdog();
}
@@ -2639,11 +2309,10 @@ index 5f1c6266eb30..c331e3fef465 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 38da8f29a9c8..ce71f7098f15 100644
---- a/arch/x86/kernel/irq_32.c
-+++ b/arch/x86/kernel/irq_32.c
-@@ -128,6 +128,7 @@ void irq_ctx_init(int cpu)
+diff -Nur linux-4.6.6.orig/arch/x86/kernel/irq_32.c linux-4.6.6/arch/x86/kernel/irq_32.c
+--- linux-4.6.6.orig/arch/x86/kernel/irq_32.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/x86/kernel/irq_32.c 2016-08-22 21:27:46.637843343 +0200
+@@ -128,6 +128,7 @@
cpu, per_cpu(hardirq_stack, cpu), per_cpu(softirq_stack, cpu));
}
@@ -2651,7 +2320,7 @@ index 38da8f29a9c8..ce71f7098f15 100644
void do_softirq_own_stack(void)
{
struct thread_info *curstk;
-@@ -146,6 +147,7 @@ void do_softirq_own_stack(void)
+@@ -146,6 +147,7 @@
call_on_stack(__do_softirq, isp);
}
@@ -2659,10 +2328,9 @@ index 38da8f29a9c8..ce71f7098f15 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 9f950917528b..4dd4beae917a 100644
---- a/arch/x86/kernel/process_32.c
-+++ b/arch/x86/kernel/process_32.c
+diff -Nur linux-4.6.6.orig/arch/x86/kernel/process_32.c linux-4.6.6/arch/x86/kernel/process_32.c
+--- linux-4.6.6.orig/arch/x86/kernel/process_32.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/x86/kernel/process_32.c 2016-08-22 21:27:46.641843602 +0200
@@ -35,6 +35,7 @@
#include <linux/uaccess.h>
#include <linux/io.h>
@@ -2671,7 +2339,7 @@ index 9f950917528b..4dd4beae917a 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);
@@ -2707,7 +2375,7 @@ index 9f950917528b..4dd4beae917a 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);
@@ -2716,11 +2384,10 @@ index 9f950917528b..4dd4beae917a 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 1a2da0e5a373..a0c78a291f02 100644
---- a/arch/x86/kvm/lapic.c
-+++ b/arch/x86/kvm/lapic.c
-@@ -1870,6 +1870,7 @@ int kvm_create_lapic(struct kvm_vcpu *vcpu)
+diff -Nur linux-4.6.6.orig/arch/x86/kvm/lapic.c linux-4.6.6/arch/x86/kvm/lapic.c
+--- linux-4.6.6.orig/arch/x86/kvm/lapic.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/x86/kvm/lapic.c 2016-08-22 21:27:46.649844115 +0200
+@@ -1870,6 +1870,7 @@
hrtimer_init(&apic->lapic_timer.timer, CLOCK_MONOTONIC,
HRTIMER_MODE_ABS_PINNED);
apic->lapic_timer.timer.function = apic_timer_fn;
@@ -2728,11 +2395,10 @@ index 1a2da0e5a373..a0c78a291f02 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 6b9701babaa1..9da12e3ebcc5 100644
---- a/arch/x86/kvm/x86.c
-+++ b/arch/x86/kvm/x86.c
-@@ -5855,6 +5855,13 @@ int kvm_arch_init(void *opaque)
+diff -Nur linux-4.6.6.orig/arch/x86/kvm/x86.c linux-4.6.6/arch/x86/kvm/x86.c
+--- linux-4.6.6.orig/arch/x86/kvm/x86.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/x86/kvm/x86.c 2016-08-22 21:27:46.665845141 +0200
+@@ -5855,6 +5855,13 @@
goto out;
}
@@ -2746,11 +2412,10 @@ index 6b9701babaa1..9da12e3ebcc5 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 a6d739258137..bd24ba1c4a86 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.6.6.orig/arch/x86/mm/highmem_32.c linux-4.6.6/arch/x86/mm/highmem_32.c
+--- linux-4.6.6.orig/arch/x86/mm/highmem_32.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/x86/mm/highmem_32.c 2016-08-22 21:27:46.673845654 +0200
+@@ -32,10 +32,11 @@
*/
void *kmap_atomic_prot(struct page *page, pgprot_t prot)
{
@@ -2763,7 +2428,7 @@ index a6d739258137..bd24ba1c4a86 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)));
@@ -2775,7 +2440,7 @@ index a6d739258137..bd24ba1c4a86 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.
*/
@@ -2785,7 +2450,7 @@ index a6d739258137..bd24ba1c4a86 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();
@@ -2794,11 +2459,10 @@ index a6d739258137..bd24ba1c4a86 100644
}
EXPORT_SYMBOL(__kunmap_atomic);
-diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c
-index 9c0ff045fdd4..dd25dd1671b6 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.6.6.orig/arch/x86/mm/iomap_32.c linux-4.6.6/arch/x86/mm/iomap_32.c
+--- linux-4.6.6.orig/arch/x86/mm/iomap_32.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/x86/mm/iomap_32.c 2016-08-22 21:27:46.673845654 +0200
+@@ -56,6 +56,7 @@
void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot)
{
@@ -2806,7 +2470,7 @@ index 9c0ff045fdd4..dd25dd1671b6 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);
@@ -2820,7 +2484,7 @@ index 9c0ff045fdd4..dd25dd1671b6 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.
*/
@@ -2830,11 +2494,10 @@ index 9c0ff045fdd4..dd25dd1671b6 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 3b6ec42718e4..7871083de089 100644
---- a/arch/x86/platform/uv/tlb_uv.c
-+++ b/arch/x86/platform/uv/tlb_uv.c
-@@ -714,9 +714,9 @@ static void destination_plugged(struct bau_desc *bau_desc,
+diff -Nur linux-4.6.6.orig/arch/x86/platform/uv/tlb_uv.c linux-4.6.6/arch/x86/platform/uv/tlb_uv.c
+--- linux-4.6.6.orig/arch/x86/platform/uv/tlb_uv.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/x86/platform/uv/tlb_uv.c 2016-08-22 21:27:46.681846167 +0200
+@@ -714,9 +714,9 @@
quiesce_local_uvhub(hmaster);
@@ -2846,7 +2509,7 @@ index 3b6ec42718e4..7871083de089 100644
end_uvhub_quiesce(hmaster);
-@@ -736,9 +736,9 @@ static void destination_timeout(struct bau_desc *bau_desc,
+@@ -736,9 +736,9 @@
quiesce_local_uvhub(hmaster);
@@ -2858,7 +2521,7 @@ index 3b6ec42718e4..7871083de089 100644
end_uvhub_quiesce(hmaster);
-@@ -759,7 +759,7 @@ static void disable_for_period(struct bau_control *bcp, struct ptc_stats *stat)
+@@ -759,7 +759,7 @@
cycles_t tm1;
hmaster = bcp->uvhub_master;
@@ -2867,7 +2530,7 @@ index 3b6ec42718e4..7871083de089 100644
if (!bcp->baudisabled) {
stat->s_bau_disabled++;
tm1 = get_cycles();
-@@ -772,7 +772,7 @@ static void disable_for_period(struct bau_control *bcp, struct ptc_stats *stat)
+@@ -772,7 +772,7 @@
}
}
}
@@ -2876,7 +2539,7 @@ index 3b6ec42718e4..7871083de089 100644
}
static void count_max_concurr(int stat, struct bau_control *bcp,
-@@ -835,7 +835,7 @@ static void record_send_stats(cycles_t time1, cycles_t time2,
+@@ -835,7 +835,7 @@
*/
static void uv1_throttle(struct bau_control *hmaster, struct ptc_stats *stat)
{
@@ -2885,7 +2548,7 @@ index 3b6ec42718e4..7871083de089 100644
atomic_t *v;
v = &hmaster->active_descriptor_count;
-@@ -968,7 +968,7 @@ static int check_enable(struct bau_control *bcp, struct ptc_stats *stat)
+@@ -968,7 +968,7 @@
struct bau_control *hmaster;
hmaster = bcp->uvhub_master;
@@ -2894,7 +2557,7 @@ index 3b6ec42718e4..7871083de089 100644
if (bcp->baudisabled && (get_cycles() >= bcp->set_bau_on_time)) {
stat->s_bau_reenabled++;
for_each_present_cpu(tcpu) {
-@@ -980,10 +980,10 @@ static int check_enable(struct bau_control *bcp, struct ptc_stats *stat)
+@@ -980,10 +980,10 @@
tbcp->period_giveups = 0;
}
}
@@ -2907,7 +2570,7 @@ index 3b6ec42718e4..7871083de089 100644
return -1;
}
-@@ -1901,9 +1901,9 @@ static void __init init_per_cpu_tunables(void)
+@@ -1901,9 +1901,9 @@
bcp->cong_reps = congested_reps;
bcp->disabled_period = sec_2_cycles(disabled_period);
bcp->giveup_limit = giveup_limit;
@@ -2920,11 +2583,10 @@ index 3b6ec42718e4..7871083de089 100644
}
}
-diff --git a/arch/x86/platform/uv/uv_time.c b/arch/x86/platform/uv/uv_time.c
-index 2b158a9fa1d7..5e0b122620cb 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.6.6.orig/arch/x86/platform/uv/uv_time.c linux-4.6.6/arch/x86/platform/uv/uv_time.c
+--- linux-4.6.6.orig/arch/x86/platform/uv/uv_time.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/arch/x86/platform/uv/uv_time.c 2016-08-22 21:27:46.681846167 +0200
+@@ -57,7 +57,7 @@
/* There is one of these allocated per node */
struct uv_rtc_timer_head {
@@ -2933,7 +2595,7 @@ index 2b158a9fa1d7..5e0b122620cb 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;
}
@@ -2942,7 +2604,7 @@ index 2b158a9fa1d7..5e0b122620cb 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;
@@ -2951,7 +2613,7 @@ index 2b158a9fa1d7..5e0b122620cb 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);
@@ -2966,7 +2628,7 @@ index 2b158a9fa1d7..5e0b122620cb 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;
@@ -2975,7 +2637,7 @@ index 2b158a9fa1d7..5e0b122620cb 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);
}
@@ -2984,7 +2646,7 @@ index 2b158a9fa1d7..5e0b122620cb 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;
@@ -3004,11 +2666,10 @@ index 2b158a9fa1d7..5e0b122620cb 100644
}
/*
-diff --git a/block/blk-core.c b/block/blk-core.c
-index b60537b2c35b..b9bdc9d0262d 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.6.6.orig/block/blk-core.c linux-4.6.6/block/blk-core.c
+--- linux-4.6.6.orig/block/blk-core.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/block/blk-core.c 2016-08-22 21:27:46.693846941 +0200
+@@ -125,6 +125,9 @@
INIT_LIST_HEAD(&rq->queuelist);
INIT_LIST_HEAD(&rq->timeout_list);
@@ -3018,7 +2679,7 @@ index b60537b2c35b..b9bdc9d0262d 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)
{
@@ -3027,7 +2688,7 @@ index b60537b2c35b..b9bdc9d0262d 100644
queue_flag_clear(QUEUE_FLAG_STOPPED, q);
__blk_run_queue(q);
-@@ -657,7 +660,7 @@ int blk_queue_enter(struct request_queue *q, bool nowait)
+@@ -657,7 +660,7 @@
if (nowait)
return -EBUSY;
@@ -3036,7 +2697,7 @@ index b60537b2c35b..b9bdc9d0262d 100644
!atomic_read(&q->mq_freeze_depth) ||
blk_queue_dying(q));
if (blk_queue_dying(q))
-@@ -677,7 +680,7 @@ static void blk_queue_usage_counter_release(struct percpu_ref *ref)
+@@ -677,7 +680,7 @@
struct request_queue *q =
container_of(ref, struct request_queue, q_usage_counter);
@@ -3045,7 +2706,7 @@ index b60537b2c35b..b9bdc9d0262d 100644
}
static void blk_rq_timed_out_timer(unsigned long data)
-@@ -746,7 +749,7 @@ struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id)
+@@ -746,7 +749,7 @@
q->bypass_depth = 1;
__set_bit(QUEUE_FLAG_BYPASS, &q->queue_flags);
@@ -3054,7 +2715,7 @@ index b60537b2c35b..b9bdc9d0262d 100644
/*
* Init percpu_ref in atomic mode so that it's faster to shutdown.
-@@ -3209,7 +3212,7 @@ static void queue_unplugged(struct request_queue *q, unsigned int depth,
+@@ -3209,7 +3212,7 @@
blk_run_queue_async(q);
else
__blk_run_queue(q);
@@ -3063,7 +2724,7 @@ index b60537b2c35b..b9bdc9d0262d 100644
}
static void flush_plug_callbacks(struct blk_plug *plug, bool from_schedule)
-@@ -3257,7 +3260,6 @@ EXPORT_SYMBOL(blk_check_plugged);
+@@ -3257,7 +3260,6 @@
void blk_flush_plug_list(struct blk_plug *plug, bool from_schedule)
{
struct request_queue *q;
@@ -3071,7 +2732,7 @@ index b60537b2c35b..b9bdc9d0262d 100644
struct request *rq;
LIST_HEAD(list);
unsigned int depth;
-@@ -3277,11 +3279,6 @@ void blk_flush_plug_list(struct blk_plug *plug, bool from_schedule)
+@@ -3277,11 +3279,6 @@
q = NULL;
depth = 0;
@@ -3083,7 +2744,7 @@ index b60537b2c35b..b9bdc9d0262d 100644
while (!list_empty(&list)) {
rq = list_entry_rq(list.next);
list_del_init(&rq->queuelist);
-@@ -3294,7 +3291,7 @@ void blk_flush_plug_list(struct blk_plug *plug, bool from_schedule)
+@@ -3294,7 +3291,7 @@
queue_unplugged(q, depth, from_schedule);
q = rq->q;
depth = 0;
@@ -3092,7 +2753,7 @@ index b60537b2c35b..b9bdc9d0262d 100644
}
/*
-@@ -3321,8 +3318,6 @@ void blk_flush_plug_list(struct blk_plug *plug, bool from_schedule)
+@@ -3321,8 +3318,6 @@
*/
if (q)
queue_unplugged(q, depth, from_schedule);
@@ -3101,10 +2762,9 @@ index b60537b2c35b..b9bdc9d0262d 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.6.6.orig/block/blk-ioc.c linux-4.6.6/block/blk-ioc.c
+--- linux-4.6.6.orig/block/blk-ioc.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/block/blk-ioc.c 2016-08-22 21:27:46.697847194 +0200
@@ -7,6 +7,7 @@
#include <linux/bio.h>
#include <linux/blkdev.h>
@@ -3113,7 +2773,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);
@@ -3122,7 +2782,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);
@@ -3131,66 +2791,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 1699baf39b78..2a2006009548 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.6.6.orig/block/blk-mq.c linux-4.6.6/block/blk-mq.c
+--- linux-4.6.6.orig/block/blk-mq.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/block/blk-mq.c 2016-08-22 21:27:46.705847707 +0200
+@@ -92,7 +92,7 @@
static void blk_mq_freeze_queue_wait(struct request_queue *q)
{
@@ -3199,7 +2803,7 @@ index 1699baf39b78..2a2006009548 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);
@@ -3208,7 +2812,7 @@ index 1699baf39b78..2a2006009548 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.
*/
@@ -3217,7 +2821,7 @@ index 1699baf39b78..2a2006009548 100644
}
bool blk_mq_can_queue(struct blk_mq_hw_ctx *hctx)
-@@ -196,6 +196,9 @@ static void blk_mq_rq_ctx_init(struct request_queue *q, struct blk_mq_ctx *ctx,
+@@ -196,6 +196,9 @@
rq->resid_len = 0;
rq->sense = NULL;
@@ -3227,7 +2831,7 @@ index 1699baf39b78..2a2006009548 100644
INIT_LIST_HEAD(&rq->timeout_list);
rq->timeout = 0;
-@@ -323,6 +326,17 @@ void blk_mq_end_request(struct request *rq, int error)
+@@ -323,6 +326,17 @@
}
EXPORT_SYMBOL(blk_mq_end_request);
@@ -3245,7 +2849,7 @@ index 1699baf39b78..2a2006009548 100644
static void __blk_mq_complete_request_remote(void *data)
{
struct request *rq = data;
-@@ -330,6 +344,8 @@ static void __blk_mq_complete_request_remote(void *data)
+@@ -330,6 +344,8 @@
rq->q->softirq_done_fn(rq);
}
@@ -3254,7 +2858,7 @@ index 1699baf39b78..2a2006009548 100644
static void blk_mq_ipi_complete_request(struct request *rq)
{
struct blk_mq_ctx *ctx = rq->mq_ctx;
-@@ -341,19 +357,23 @@ static void blk_mq_ipi_complete_request(struct request *rq)
+@@ -341,19 +357,23 @@
return;
}
@@ -3280,7 +2884,7 @@ index 1699baf39b78..2a2006009548 100644
}
static void __blk_mq_complete_request(struct request *rq)
-@@ -868,14 +888,14 @@ void blk_mq_run_hw_queue(struct blk_mq_hw_ctx *hctx, bool async)
+@@ -868,14 +888,14 @@
return;
if (!async) {
@@ -3298,7 +2902,7 @@ index 1699baf39b78..2a2006009548 100644
}
kblockd_schedule_delayed_work_on(blk_mq_hctx_next_cpu(hctx),
-@@ -1621,7 +1641,7 @@ static int blk_mq_hctx_notify(void *data, unsigned long action,
+@@ -1621,7 +1641,7 @@
{
struct blk_mq_hw_ctx *hctx = data;
@@ -3307,11 +2911,64 @@ index 1699baf39b78..2a2006009548 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.6.6.orig/block/blk-mq-cpu.c linux-4.6.6/block/blk-mq-cpu.c
+--- linux-4.6.6.orig/block/blk-mq-cpu.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/block/blk-mq-cpu.c 2016-08-22 21:27:46.701847454 +0200
+@@ -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.6.6.orig/block/blk-mq.h linux-4.6.6/block/blk-mq.h
+--- linux-4.6.6.orig/block/blk-mq.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/block/blk-mq.h 2016-08-22 21:27:46.705847707 +0200
+@@ -86,12 +86,12 @@
*/
static inline struct blk_mq_ctx *blk_mq_get_ctx(struct request_queue *q)
{
@@ -3326,11 +2983,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.6.6.orig/block/blk-softirq.c linux-4.6.6/block/blk-softirq.c
+--- linux-4.6.6.orig/block/blk-softirq.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/block/blk-softirq.c 2016-08-22 21:27:46.705847707 +0200
+@@ -51,6 +51,7 @@
raise_softirq_irqoff(BLOCK_SOFTIRQ);
local_irq_restore(flags);
@@ -3338,7 +2994,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();
@@ -3346,7 +3002,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);
@@ -3354,11 +3010,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.6.6.orig/block/bounce.c linux-4.6.6/block/bounce.c
+--- linux-4.6.6.orig/block/bounce.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/block/bounce.c 2016-08-22 21:27:46.705847707 +0200
+@@ -55,11 +55,11 @@
unsigned long flags;
unsigned char *vto;
@@ -3372,11 +3027,10 @@ index 1cb5dd3a5da1..2f1ec8a67cbe 100644
}
#else /* CONFIG_HIGHMEM */
-diff --git a/block/genhd.c b/block/genhd.c
-index 9f42526b4d62..f06d7f3b075b 100644
---- a/block/genhd.c
-+++ b/block/genhd.c
-@@ -1523,12 +1523,7 @@ static void __disk_unblock_events(struct gendisk *disk, bool check_now)
+diff -Nur linux-4.6.6.orig/block/genhd.c linux-4.6.6/block/genhd.c
+--- linux-4.6.6.orig/block/genhd.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/block/genhd.c 2016-08-22 21:27:46.709847967 +0200
+@@ -1523,12 +1523,7 @@
if (--ev->block)
goto out_unlock;
@@ -3389,11 +3043,10 @@ index 9f42526b4d62..f06d7f3b075b 100644
if (check_now)
queue_delayed_work(system_freezable_power_efficient_wq,
&ev->dwork, 0);
-diff --git a/crypto/algapi.c b/crypto/algapi.c
-index 731255a6104f..d3380591dfdd 100644
---- a/crypto/algapi.c
-+++ b/crypto/algapi.c
-@@ -718,13 +718,13 @@ EXPORT_SYMBOL_GPL(crypto_spawn_tfm2);
+diff -Nur linux-4.6.6.orig/crypto/algapi.c linux-4.6.6/crypto/algapi.c
+--- linux-4.6.6.orig/crypto/algapi.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/crypto/algapi.c 2016-08-22 21:27:46.721848733 +0200
+@@ -718,13 +718,13 @@
int crypto_register_notifier(struct notifier_block *nb)
{
@@ -3409,11 +3062,10 @@ index 731255a6104f..d3380591dfdd 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.6.6.orig/crypto/api.c linux-4.6.6/crypto/api.c
+--- linux-4.6.6.orig/crypto/api.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/crypto/api.c 2016-08-22 21:27:46.721848733 +0200
+@@ -31,7 +31,7 @@
DECLARE_RWSEM(crypto_alg_sem);
EXPORT_SYMBOL_GPL(crypto_alg_sem);
@@ -3422,7 +3074,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;
@@ -3435,11 +3087,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.6.6.orig/crypto/internal.h linux-4.6.6/crypto/internal.h
+--- linux-4.6.6.orig/crypto/internal.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/crypto/internal.h 2016-08-22 21:27:46.725848993 +0200
+@@ -47,7 +47,7 @@
extern struct list_head crypto_alg_list;
extern struct rw_semaphore crypto_alg_sem;
@@ -3448,7 +3099,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)
{
@@ -3457,11 +3108,291 @@ index 7eefcdb00227..0ecc7f5a2f40 100644
}
#endif /* _CRYPTO_INTERNAL_H */
-diff --git a/drivers/acpi/acpica/acglobal.h b/drivers/acpi/acpica/acglobal.h
-index 51b073b68f16..2d38ca5c6635 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.6.6.orig/Documentation/hwlat_detector.txt linux-4.6.6/Documentation/hwlat_detector.txt
+--- linux-4.6.6.orig/Documentation/hwlat_detector.txt 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.6.6/Documentation/hwlat_detector.txt 2016-08-22 21:27:46.213816153 +0200
+@@ -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.6.6.orig/Documentation/sysrq.txt linux-4.6.6/Documentation/sysrq.txt
+--- linux-4.6.6.orig/Documentation/sysrq.txt 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/Documentation/sysrq.txt 2016-08-22 21:27:46.225816925 +0200
+@@ -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.6.6.orig/Documentation/trace/histograms.txt linux-4.6.6/Documentation/trace/histograms.txt
+--- linux-4.6.6.orig/Documentation/trace/histograms.txt 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.6.6/Documentation/trace/histograms.txt 2016-08-22 21:27:46.229817185 +0200
+@@ -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.6.6.orig/drivers/acpi/acpica/acglobal.h linux-4.6.6/drivers/acpi/acpica/acglobal.h
+--- linux-4.6.6.orig/drivers/acpi/acpica/acglobal.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/acpi/acpica/acglobal.h 2016-08-22 21:27:46.733849506 +0200
+@@ -116,7 +116,7 @@
* interrupt level
*/
ACPI_GLOBAL(acpi_spinlock, acpi_gbl_gpe_lock); /* For GPE data structs and registers */
@@ -3470,11 +3401,10 @@ index 51b073b68f16..2d38ca5c6635 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 5ba0498412fd..ada43191fb31 100644
---- a/drivers/acpi/acpica/hwregs.c
-+++ b/drivers/acpi/acpica/hwregs.c
-@@ -269,14 +269,14 @@ acpi_status acpi_hw_clear_acpi_status(void)
+diff -Nur linux-4.6.6.orig/drivers/acpi/acpica/hwregs.c linux-4.6.6/drivers/acpi/acpica/hwregs.c
+--- linux-4.6.6.orig/drivers/acpi/acpica/hwregs.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/acpi/acpica/hwregs.c 2016-08-22 21:27:46.741850019 +0200
+@@ -269,14 +269,14 @@
ACPI_BITMASK_ALL_FIXED_STATUS,
ACPI_FORMAT_UINT64(acpi_gbl_xpm1a_status.address)));
@@ -3491,11 +3421,10 @@ index 5ba0498412fd..ada43191fb31 100644
if (ACPI_FAILURE(status)) {
goto exit;
-diff --git a/drivers/acpi/acpica/hwxface.c b/drivers/acpi/acpica/hwxface.c
-index a01ddb393a55..fb64afd9470b 100644
---- a/drivers/acpi/acpica/hwxface.c
-+++ b/drivers/acpi/acpica/hwxface.c
-@@ -374,7 +374,7 @@ acpi_status acpi_write_bit_register(u32 register_id, u32 value)
+diff -Nur linux-4.6.6.orig/drivers/acpi/acpica/hwxface.c linux-4.6.6/drivers/acpi/acpica/hwxface.c
+--- linux-4.6.6.orig/drivers/acpi/acpica/hwxface.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/acpi/acpica/hwxface.c 2016-08-22 21:27:46.745850272 +0200
+@@ -374,7 +374,7 @@
return_ACPI_STATUS(AE_BAD_PARAMETER);
}
@@ -3504,7 +3433,7 @@ index a01ddb393a55..fb64afd9470b 100644
/*
* At this point, we know that the parent register is one of the
-@@ -435,7 +435,7 @@ acpi_status acpi_write_bit_register(u32 register_id, u32 value)
+@@ -435,7 +435,7 @@
unlock_and_exit:
@@ -3513,11 +3442,10 @@ index a01ddb393a55..fb64afd9470b 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.6.6.orig/drivers/acpi/acpica/utmutex.c linux-4.6.6/drivers/acpi/acpica/utmutex.c
+--- linux-4.6.6.orig/drivers/acpi/acpica/utmutex.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/acpi/acpica/utmutex.c 2016-08-22 21:27:46.769851812 +0200
+@@ -88,7 +88,7 @@
return_ACPI_STATUS (status);
}
@@ -3526,7 +3454,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);
@@ -3535,11 +3463,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.6.6.orig/drivers/ata/libata-sff.c linux-4.6.6/drivers/ata/libata-sff.c
+--- linux-4.6.6.orig/drivers/ata/libata-sff.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/ata/libata-sff.c 2016-08-22 21:27:46.781852585 +0200
+@@ -678,9 +678,9 @@
unsigned long flags;
unsigned int consumed;
@@ -3551,7 +3478,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 */
@@ -3560,7 +3487,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);
@@ -3569,7 +3496,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 */
@@ -3578,7 +3505,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);
@@ -3587,11 +3514,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/zram_drv.c b/drivers/block/zram/zram_drv.c
-index 370c2f76016d..65e0b375a291 100644
---- a/drivers/block/zram/zram_drv.c
-+++ b/drivers/block/zram/zram_drv.c
-@@ -520,6 +520,8 @@ static struct zram_meta *zram_meta_alloc(char *pool_name, u64 disksize)
+diff -Nur linux-4.6.6.orig/drivers/block/zram/zram_drv.c linux-4.6.6/drivers/block/zram/zram_drv.c
+--- linux-4.6.6.orig/drivers/block/zram/zram_drv.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/block/zram/zram_drv.c 2016-08-22 21:27:46.789853098 +0200
+@@ -520,6 +520,8 @@
goto out_error;
}
@@ -3600,7 +3526,7 @@ index 370c2f76016d..65e0b375a291 100644
return meta;
out_error:
-@@ -568,12 +570,12 @@ static int zram_decompress_page(struct zram *zram, char *mem, u32 index)
+@@ -568,12 +570,12 @@
unsigned long handle;
size_t size;
@@ -3615,7 +3541,7 @@ index 370c2f76016d..65e0b375a291 100644
clear_page(mem);
return 0;
}
-@@ -584,7 +586,7 @@ static int zram_decompress_page(struct zram *zram, char *mem, u32 index)
+@@ -584,7 +586,7 @@
else
ret = zcomp_decompress(zram->comp, cmem, size, mem);
zs_unmap_object(meta->mem_pool, handle);
@@ -3624,7 +3550,7 @@ index 370c2f76016d..65e0b375a291 100644
/* Should NEVER happen. Return bio error if it does. */
if (unlikely(ret)) {
-@@ -604,14 +606,14 @@ static int zram_bvec_read(struct zram *zram, struct bio_vec *bvec,
+@@ -604,14 +606,14 @@
struct zram_meta *meta = zram->meta;
page = bvec->bv_page;
@@ -3642,7 +3568,7 @@ index 370c2f76016d..65e0b375a291 100644
if (is_partial_io(bvec))
/* Use a temporary buffer to decompress the page */
-@@ -689,10 +691,10 @@ static int zram_bvec_write(struct zram *zram, struct bio_vec *bvec, u32 index,
+@@ -689,10 +691,10 @@
if (user_mem)
kunmap_atomic(user_mem);
/* Free memory associated with this sector now. */
@@ -3655,7 +3581,7 @@ index 370c2f76016d..65e0b375a291 100644
atomic64_inc(&zram->stats.zero_pages);
ret = 0;
-@@ -752,12 +754,12 @@ static int zram_bvec_write(struct zram *zram, struct bio_vec *bvec, u32 index,
+@@ -752,12 +754,12 @@
* Free memory associated with this sector
* before overwriting unused sectors.
*/
@@ -3670,7 +3596,7 @@ index 370c2f76016d..65e0b375a291 100644
/* Update stats */
atomic64_add(clen, &zram->stats.compr_data_size);
-@@ -800,9 +802,9 @@ static void zram_bio_discard(struct zram *zram, u32 index,
+@@ -800,9 +802,9 @@
}
while (n >= PAGE_SIZE) {
@@ -3682,7 +3608,7 @@ index 370c2f76016d..65e0b375a291 100644
atomic64_inc(&zram->stats.notify_free);
index++;
n -= PAGE_SIZE;
-@@ -928,9 +930,9 @@ static void zram_slot_free_notify(struct block_device *bdev,
+@@ -928,9 +930,9 @@
zram = bdev->bd_disk->private_data;
meta = zram->meta;
@@ -3694,11 +3620,10 @@ index 370c2f76016d..65e0b375a291 100644
atomic64_inc(&zram->stats.notify_free);
}
-diff --git a/drivers/block/zram/zram_drv.h b/drivers/block/zram/zram_drv.h
-index 8e92339686d7..9e3e953d680e 100644
---- a/drivers/block/zram/zram_drv.h
-+++ b/drivers/block/zram/zram_drv.h
-@@ -72,6 +72,9 @@ enum zram_pageflags {
+diff -Nur linux-4.6.6.orig/drivers/block/zram/zram_drv.h linux-4.6.6/drivers/block/zram/zram_drv.h
+--- linux-4.6.6.orig/drivers/block/zram/zram_drv.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/block/zram/zram_drv.h 2016-08-22 21:27:46.789853098 +0200
+@@ -72,6 +72,9 @@
struct zram_table_entry {
unsigned long handle;
unsigned long value;
@@ -3708,7 +3633,7 @@ index 8e92339686d7..9e3e953d680e 100644
};
struct zram_stats {
-@@ -119,4 +122,42 @@ struct zram {
+@@ -119,4 +122,42 @@
*/
bool claim; /* Protected by bdev->bd_mutex */
};
@@ -3751,11 +3676,10 @@ index 8e92339686d7..9e3e953d680e 100644
+#endif /* CONFIG_PREEMPT_RT_BASE */
+
#endif
-diff --git a/drivers/char/random.c b/drivers/char/random.c
-index b583e5336630..ac2bd8c62de9 100644
---- a/drivers/char/random.c
-+++ b/drivers/char/random.c
-@@ -796,8 +796,6 @@ static void add_timer_randomness(struct timer_rand_state *state, unsigned num)
+diff -Nur linux-4.6.6.orig/drivers/char/random.c linux-4.6.6/drivers/char/random.c
+--- linux-4.6.6.orig/drivers/char/random.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/char/random.c 2016-08-22 21:27:46.797853611 +0200
+@@ -796,8 +796,6 @@
} sample;
long delta, delta2, delta3;
@@ -3764,7 +3688,7 @@ index b583e5336630..ac2bd8c62de9 100644
sample.jiffies = jiffies;
sample.cycles = random_get_entropy();
sample.num = num;
-@@ -838,7 +836,6 @@ static void add_timer_randomness(struct timer_rand_state *state, unsigned num)
+@@ -838,7 +836,6 @@
*/
credit_entropy_bits(r, min_t(int, fls(delta>>1), 11));
}
@@ -3772,7 +3696,7 @@ index b583e5336630..ac2bd8c62de9 100644
}
void add_input_randomness(unsigned int type, unsigned int code,
-@@ -891,28 +888,27 @@ static __u32 get_reg(struct fast_pool *f, struct pt_regs *regs)
+@@ -891,28 +888,27 @@
return *(ptr + f->reg_idx++);
}
@@ -3806,10 +3730,9 @@ index b583e5336630..ac2bd8c62de9 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.6.6.orig/drivers/clocksource/tcb_clksrc.c linux-4.6.6/drivers/clocksource/tcb_clksrc.c
+--- linux-4.6.6.orig/drivers/clocksource/tcb_clksrc.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/clocksource/tcb_clksrc.c 2016-08-22 21:27:46.805854124 +0200
@@ -23,8 +23,7 @@
* this 32 bit free-running counter. the second channel is not used.
*
@@ -3820,7 +3743,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;
@@ -3829,7 +3752,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);
}
@@ -3863,7 +3786,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));
@@ -3879,7 +3802,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);
@@ -3891,7 +3814,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.
*/
@@ -3907,7 +3830,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 */
@@ -3922,7 +3845,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;
}
@@ -3933,7 +3856,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;
@@ -3946,7 +3869,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;
}
@@ -3955,7 +3878,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 */
@@ -3967,11 +3890,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 d911c5dca8f1..7a40f7e88468 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.6.6.orig/drivers/clocksource/timer-atmel-pit.c linux-4.6.6/drivers/clocksource/timer-atmel-pit.c
+--- linux-4.6.6.orig/drivers/clocksource/timer-atmel-pit.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/clocksource/timer-atmel-pit.c 2016-08-22 21:27:46.805854124 +0200
+@@ -46,6 +46,7 @@
u32 cycle;
u32 cnt;
unsigned int irq;
@@ -3979,7 +3901,7 @@ index d911c5dca8f1..7a40f7e88468 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);
@@ -4009,7 +3931,7 @@ index d911c5dca8f1..7a40f7e88468 100644
/* update clocksource counter */
data->cnt += data->cycle * PIT_PICNT(pit_read(data->base, AT91_PIT_PIVR));
-@@ -181,7 +196,6 @@ static void __init at91sam926x_pit_common_init(struct pit_data *data)
+@@ -181,7 +196,6 @@
{
unsigned long pit_rate;
unsigned bits;
@@ -4017,7 +3939,7 @@ index d911c5dca8f1..7a40f7e88468 100644
/*
* Use our actual MCK to figure out how many MCK/16 ticks per
-@@ -206,13 +220,6 @@ static void __init at91sam926x_pit_common_init(struct pit_data *data)
+@@ -206,13 +220,6 @@
data->clksrc.flags = CLOCK_SOURCE_IS_CONTINUOUS;
clocksource_register_hz(&data->clksrc, pit_rate);
@@ -4031,11 +3953,10 @@ index d911c5dca8f1..7a40f7e88468 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 29d21d68df5a..103d0fd70cc4 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.6.6.orig/drivers/clocksource/timer-atmel-st.c linux-4.6.6/drivers/clocksource/timer-atmel-st.c
+--- linux-4.6.6.orig/drivers/clocksource/timer-atmel-st.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/clocksource/timer-atmel-st.c 2016-08-22 21:27:46.805854124 +0200
+@@ -115,18 +115,29 @@
last_crtr = read_CRTR();
}
@@ -4065,7 +3986,7 @@ index 29d21d68df5a..103d0fd70cc4 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)
{
@@ -4082,7 +4003,7 @@ index 29d21d68df5a..103d0fd70cc4 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 void __init atmel_st_timer_init(struct device_node *node)
+@@ -198,7 +217,7 @@
{
struct clk *sclk;
unsigned int sclk_rate, val;
@@ -4091,7 +4012,7 @@ index 29d21d68df5a..103d0fd70cc4 100644
regmap_st = syscon_node_to_regmap(node);
if (IS_ERR(regmap_st))
-@@ -210,17 +229,10 @@ static void __init atmel_st_timer_init(struct device_node *node)
+@@ -210,17 +229,10 @@
regmap_read(regmap_st, AT91_ST_SR, &val);
/* Get the interrupts property */
@@ -4111,11 +4032,10 @@ index 29d21d68df5a..103d0fd70cc4 100644
sclk = of_clk_get(node, 0);
if (IS_ERR(sclk))
panic(pr_fmt("Unable to get slow clock\n"));
-diff --git a/drivers/cpufreq/Kconfig.x86 b/drivers/cpufreq/Kconfig.x86
-index c59bdcb83217..8f23161d80be 100644
---- a/drivers/cpufreq/Kconfig.x86
-+++ b/drivers/cpufreq/Kconfig.x86
-@@ -123,7 +123,7 @@ config X86_POWERNOW_K7_ACPI
+diff -Nur linux-4.6.6.orig/drivers/cpufreq/Kconfig.x86 linux-4.6.6/drivers/cpufreq/Kconfig.x86
+--- linux-4.6.6.orig/drivers/cpufreq/Kconfig.x86 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/cpufreq/Kconfig.x86 2016-08-22 21:27:46.809854377 +0200
+@@ -123,7 +123,7 @@
config X86_POWERNOW_K8
tristate "AMD Opteron/Athlon64 PowerNow!"
@@ -4124,10 +4044,9 @@ index c59bdcb83217..8f23161d80be 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/crypto/ccp/ccp-dev.c b/drivers/crypto/ccp/ccp-dev.c
-index 4dbc18727235..2a8ad712a5f2 100644
---- a/drivers/crypto/ccp/ccp-dev.c
-+++ b/drivers/crypto/ccp/ccp-dev.c
+diff -Nur linux-4.6.6.orig/drivers/crypto/ccp/ccp-dev.c linux-4.6.6/drivers/crypto/ccp/ccp-dev.c
+--- linux-4.6.6.orig/drivers/crypto/ccp/ccp-dev.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/crypto/ccp/ccp-dev.c 2016-08-22 21:27:46.813854637 +0200
@@ -16,7 +16,6 @@
#include <linux/sched.h>
#include <linux/interrupt.h>
@@ -4136,11 +4055,10 @@ index 4dbc18727235..2a8ad712a5f2 100644
#include <linux/types.h>
#include <linux/mutex.h>
#include <linux/delay.h>
-diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
-index daba7ebb9699..18d58f136628 100644
---- a/drivers/gpu/drm/i915/i915_drv.h
-+++ b/drivers/gpu/drm/i915/i915_drv.h
-@@ -714,7 +714,7 @@ struct intel_uncore {
+diff -Nur linux-4.6.6.orig/drivers/gpu/drm/i915/i915_drv.h linux-4.6.6/drivers/gpu/drm/i915/i915_drv.h
+--- linux-4.6.6.orig/drivers/gpu/drm/i915/i915_drv.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/gpu/drm/i915/i915_drv.h 2016-08-22 21:27:46.833855915 +0200
+@@ -714,7 +714,7 @@
struct drm_i915_private *i915;
enum forcewake_domain_id id;
unsigned wake_count;
@@ -4149,11 +4067,10 @@ index daba7ebb9699..18d58f136628 100644
i915_reg_t reg_set;
u32 val_set;
u32 val_clear;
-diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
-index 1328bc5021b4..62103660b4c7 100644
---- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
-+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
-@@ -1314,7 +1314,9 @@ i915_gem_ringbuffer_submission(struct i915_execbuffer_params *params,
+diff -Nur linux-4.6.6.orig/drivers/gpu/drm/i915/i915_gem_execbuffer.c linux-4.6.6/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+--- linux-4.6.6.orig/drivers/gpu/drm/i915/i915_gem_execbuffer.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/gpu/drm/i915/i915_gem_execbuffer.c 2016-08-22 21:27:46.845856688 +0200
+@@ -1314,7 +1314,9 @@
if (ret)
return ret;
@@ -4163,11 +4080,10 @@ index 1328bc5021b4..62103660b4c7 100644
i915_gem_execbuffer_move_to_active(vmas, params->request);
i915_gem_execbuffer_retire_commands(params);
-diff --git a/drivers/gpu/drm/i915/i915_gem_shrinker.c b/drivers/gpu/drm/i915/i915_gem_shrinker.c
-index 3af40616bf8b..46882680468e 100644
---- a/drivers/gpu/drm/i915/i915_gem_shrinker.c
-+++ b/drivers/gpu/drm/i915/i915_gem_shrinker.c
-@@ -39,7 +39,7 @@ static bool mutex_is_locked_by(struct mutex *mutex, struct task_struct *task)
+diff -Nur linux-4.6.6.orig/drivers/gpu/drm/i915/i915_gem_shrinker.c linux-4.6.6/drivers/gpu/drm/i915/i915_gem_shrinker.c
+--- linux-4.6.6.orig/drivers/gpu/drm/i915/i915_gem_shrinker.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/gpu/drm/i915/i915_gem_shrinker.c 2016-08-22 21:27:46.845856688 +0200
+@@ -39,7 +39,7 @@
if (!mutex_is_locked(mutex))
return false;
@@ -4176,11 +4092,10 @@ index 3af40616bf8b..46882680468e 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 d1a46ef5ab3f..7d43f913de24 100644
---- a/drivers/gpu/drm/i915/i915_irq.c
-+++ b/drivers/gpu/drm/i915/i915_irq.c
-@@ -830,6 +830,7 @@ static int i915_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe,
+diff -Nur linux-4.6.6.orig/drivers/gpu/drm/i915/i915_irq.c linux-4.6.6/drivers/gpu/drm/i915/i915_irq.c
+--- linux-4.6.6.orig/drivers/gpu/drm/i915/i915_irq.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/gpu/drm/i915/i915_irq.c 2016-08-22 21:27:46.865857967 +0200
+@@ -830,6 +830,7 @@
spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);
/* preempt_disable_rt() should go right here in PREEMPT_RT patchset. */
@@ -4188,7 +4103,7 @@ index d1a46ef5ab3f..7d43f913de24 100644
/* Get optional system timestamp before query. */
if (stime)
-@@ -881,6 +882,7 @@ static int i915_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe,
+@@ -881,6 +882,7 @@
*etime = ktime_get();
/* preempt_enable_rt() should go right here in PREEMPT_RT patchset. */
@@ -4196,11 +4111,10 @@ index d1a46ef5ab3f..7d43f913de24 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 e5db9e1f623f..5ca085d99181 100644
---- a/drivers/gpu/drm/i915/intel_display.c
-+++ b/drivers/gpu/drm/i915/intel_display.c
-@@ -11496,7 +11496,7 @@ void intel_check_page_flip(struct drm_device *dev, int pipe)
+diff -Nur linux-4.6.6.orig/drivers/gpu/drm/i915/intel_display.c linux-4.6.6/drivers/gpu/drm/i915/intel_display.c
+--- linux-4.6.6.orig/drivers/gpu/drm/i915/intel_display.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/gpu/drm/i915/intel_display.c 2016-08-22 21:27:46.905860533 +0200
+@@ -11496,7 +11496,7 @@
struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
struct intel_unpin_work *work;
@@ -4209,10 +4123,9 @@ index e5db9e1f623f..5ca085d99181 100644
if (crtc == NULL)
return;
-diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
-index a2582c455b36..c459b91586b0 100644
---- a/drivers/gpu/drm/i915/intel_sprite.c
-+++ b/drivers/gpu/drm/i915/intel_sprite.c
+diff -Nur linux-4.6.6.orig/drivers/gpu/drm/i915/intel_sprite.c linux-4.6.6/drivers/gpu/drm/i915/intel_sprite.c
+--- linux-4.6.6.orig/drivers/gpu/drm/i915/intel_sprite.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/gpu/drm/i915/intel_sprite.c 2016-08-22 21:27:46.917861306 +0200
@@ -38,6 +38,7 @@
#include "intel_drv.h"
#include <drm/i915_drm.h>
@@ -4221,7 +4134,7 @@ index a2582c455b36..c459b91586b0 100644
static bool
format_is_yuv(uint32_t format)
-@@ -64,6 +65,8 @@ static int usecs_to_scanlines(const struct drm_display_mode *adjusted_mode,
+@@ -64,6 +65,8 @@
1000 * adjusted_mode->crtc_htotal);
}
@@ -4230,7 +4143,7 @@ index a2582c455b36..c459b91586b0 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
-@@ -96,7 +99,7 @@ void intel_pipe_update_start(struct intel_crtc *crtc)
+@@ -96,7 +99,7 @@
min = vblank_start - usecs_to_scanlines(adjusted_mode, 100);
max = vblank_start - 1;
@@ -4239,7 +4152,7 @@ index a2582c455b36..c459b91586b0 100644
if (min <= 0 || max <= 0)
return;
-@@ -126,11 +129,11 @@ void intel_pipe_update_start(struct intel_crtc *crtc)
+@@ -126,11 +129,11 @@
break;
}
@@ -4253,7 +4166,7 @@ index a2582c455b36..c459b91586b0 100644
}
finish_wait(wq, &wait);
-@@ -164,7 +167,7 @@ void intel_pipe_update_end(struct intel_crtc *crtc)
+@@ -164,7 +167,7 @@
trace_i915_pipe_update_end(crtc, end_vbl_count, scanline_end);
@@ -4262,11 +4175,10 @@ index a2582c455b36..c459b91586b0 100644
if (crtc->debug.start_vbl_count &&
crtc->debug.start_vbl_count != end_vbl_count) {
-diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
-index 68b6f69aa682..49aefb097c15 100644
---- a/drivers/gpu/drm/i915/intel_uncore.c
-+++ b/drivers/gpu/drm/i915/intel_uncore.c
-@@ -60,7 +60,11 @@ fw_domain_reset(const struct intel_uncore_forcewake_domain *d)
+diff -Nur linux-4.6.6.orig/drivers/gpu/drm/i915/intel_uncore.c linux-4.6.6/drivers/gpu/drm/i915/intel_uncore.c
+--- linux-4.6.6.orig/drivers/gpu/drm/i915/intel_uncore.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/gpu/drm/i915/intel_uncore.c 2016-08-22 21:27:46.921861559 +0200
+@@ -60,7 +60,11 @@
static inline void
fw_domain_arm_timer(struct intel_uncore_forcewake_domain *d)
{
@@ -4279,7 +4191,7 @@ index 68b6f69aa682..49aefb097c15 100644
}
static inline void
-@@ -224,9 +228,11 @@ static int __gen6_gt_wait_for_fifo(struct drm_i915_private *dev_priv)
+@@ -224,9 +228,11 @@
return ret;
}
@@ -4293,7 +4205,7 @@ index 68b6f69aa682..49aefb097c15 100644
unsigned long irqflags;
assert_rpm_device_not_suspended(domain->i915);
-@@ -240,6 +246,8 @@ static void intel_uncore_fw_release_timer(unsigned long arg)
+@@ -240,6 +246,8 @@
1 << domain->id);
spin_unlock_irqrestore(&domain->i915->uncore.lock, irqflags);
@@ -4302,7 +4214,7 @@ index 68b6f69aa682..49aefb097c15 100644
}
void intel_uncore_forcewake_reset(struct drm_device *dev, bool restore)
-@@ -259,16 +267,16 @@ void intel_uncore_forcewake_reset(struct drm_device *dev, bool restore)
+@@ -259,16 +267,16 @@
active_domains = 0;
for_each_fw_domain(domain, dev_priv, id) {
@@ -4322,7 +4234,7 @@ index 68b6f69aa682..49aefb097c15 100644
active_domains |= (1 << id);
}
-@@ -491,7 +499,6 @@ static void __intel_uncore_forcewake_put(struct drm_i915_private *dev_priv,
+@@ -491,7 +499,6 @@
if (--domain->wake_count)
continue;
@@ -4330,7 +4242,7 @@ index 68b6f69aa682..49aefb097c15 100644
fw_domain_arm_timer(domain);
}
}
-@@ -732,7 +739,6 @@ static inline void __force_wake_get(struct drm_i915_private *dev_priv,
+@@ -732,7 +739,6 @@
continue;
}
@@ -4338,7 +4250,7 @@ index 68b6f69aa682..49aefb097c15 100644
fw_domain_arm_timer(domain);
}
-@@ -1150,7 +1156,8 @@ static void fw_domain_init(struct drm_i915_private *dev_priv,
+@@ -1150,7 +1156,8 @@
d->i915 = dev_priv;
d->id = domain_id;
@@ -4348,11 +4260,10 @@ index 68b6f69aa682..49aefb097c15 100644
dev_priv->uncore.fw_domains |= (1 << domain_id);
-diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
-index fcc7483d3f7b..dc44af5675d9 100644
---- a/drivers/gpu/drm/radeon/radeon_display.c
-+++ b/drivers/gpu/drm/radeon/radeon_display.c
-@@ -1863,6 +1863,7 @@ int radeon_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe,
+diff -Nur linux-4.6.6.orig/drivers/gpu/drm/radeon/radeon_display.c linux-4.6.6/drivers/gpu/drm/radeon/radeon_display.c
+--- linux-4.6.6.orig/drivers/gpu/drm/radeon/radeon_display.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/gpu/drm/radeon/radeon_display.c 2016-08-22 21:27:46.929862072 +0200
+@@ -1863,6 +1863,7 @@
struct radeon_device *rdev = dev->dev_private;
/* preempt_disable_rt() should go right here in PREEMPT_RT patchset. */
@@ -4360,7 +4271,7 @@ index fcc7483d3f7b..dc44af5675d9 100644
/* Get optional system timestamp before query. */
if (stime)
-@@ -1955,6 +1956,7 @@ int radeon_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe,
+@@ -1955,6 +1956,7 @@
*etime = ktime_get();
/* preempt_enable_rt() should go right here in PREEMPT_RT patchset. */
@@ -4368,11 +4279,10 @@ index fcc7483d3f7b..dc44af5675d9 100644
/* Decode into vertical and horizontal scanout position. */
*vpos = position & 0x1fff;
-diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
-index 13c45296ce5b..50c035c73357 100644
---- a/drivers/i2c/busses/i2c-omap.c
-+++ b/drivers/i2c/busses/i2c-omap.c
-@@ -995,15 +995,12 @@ omap_i2c_isr(int irq, void *dev_id)
+diff -Nur linux-4.6.6.orig/drivers/i2c/busses/i2c-omap.c linux-4.6.6/drivers/i2c/busses/i2c-omap.c
+--- linux-4.6.6.orig/drivers/i2c/busses/i2c-omap.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/i2c/busses/i2c-omap.c 2016-08-22 21:27:46.945863099 +0200
+@@ -995,15 +995,12 @@
u16 mask;
u16 stat;
@@ -4389,11 +4299,10 @@ index 13c45296ce5b..50c035c73357 100644
return ret;
}
-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.6.6.orig/drivers/ide/alim15x3.c linux-4.6.6/drivers/ide/alim15x3.c
+--- linux-4.6.6.orig/drivers/ide/alim15x3.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/ide/alim15x3.c 2016-08-22 21:27:46.949863359 +0200
+@@ -234,7 +234,7 @@
isa_dev = pci_get_device(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1533, NULL);
@@ -4402,7 +4311,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);
@@ -4411,11 +4320,10 @@ index 36f76e28a0bf..394f142f90c7 100644
return 0;
}
-diff --git a/drivers/ide/hpt366.c b/drivers/ide/hpt366.c
-index f94baadbf424..71c41cfe85e9 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.6.6.orig/drivers/ide/hpt366.c linux-4.6.6/drivers/ide/hpt366.c
+--- linux-4.6.6.orig/drivers/ide/hpt366.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/ide/hpt366.c 2016-08-22 21:27:46.953863612 +0200
+@@ -1236,7 +1236,7 @@
dma_old = inb(base + 2);
@@ -4424,7 +4332,7 @@ index f94baadbf424..71c41cfe85e9 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);
@@ -4433,11 +4341,40 @@ index f94baadbf424..71c41cfe85e9 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.6.6.orig/drivers/ide/ide-io.c linux-4.6.6/drivers/ide/ide-io.c
+--- linux-4.6.6.orig/drivers/ide/ide-io.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/ide/ide-io.c 2016-08-22 21:27:46.957863872 +0200
+@@ -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.6.6.orig/drivers/ide/ide-iops.c linux-4.6.6/drivers/ide/ide-iops.c
+--- linux-4.6.6.orig/drivers/ide/ide-iops.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/ide/ide-iops.c 2016-08-22 21:27:46.957863872 +0200
+@@ -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.6.6.orig/drivers/ide/ide-io-std.c linux-4.6.6/drivers/ide/ide-io-std.c
+--- linux-4.6.6.orig/drivers/ide/ide-io-std.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/ide/ide-io-std.c 2016-08-22 21:27:46.957863872 +0200
+@@ -175,7 +175,7 @@
unsigned long uninitialized_var(flags);
if ((io_32bit & 2) && !mmio) {
@@ -4446,7 +4383,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)
@@ -4455,7 +4392,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) {
@@ -4464,7 +4401,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)
@@ -4473,43 +4410,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.6.6.orig/drivers/ide/ide-probe.c linux-4.6.6/drivers/ide/ide-probe.c
+--- linux-4.6.6.orig/drivers/ide/ide-probe.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/ide/ide-probe.c 2016-08-22 21:27:46.961864125 +0200
+@@ -196,10 +196,10 @@
int bswap = 1;
/* local CPU only; some systems need this */
@@ -4522,11 +4426,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.6.6.orig/drivers/ide/ide-taskfile.c linux-4.6.6/drivers/ide/ide-taskfile.c
+--- linux-4.6.6.orig/drivers/ide/ide-taskfile.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/ide/ide-taskfile.c 2016-08-22 21:27:46.961864125 +0200
+@@ -250,7 +250,7 @@
page_is_high = PageHighMem(page);
if (page_is_high)
@@ -4535,7 +4438,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)
@@ -4544,7 +4447,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)
@@ -4553,11 +4456,10 @@ index a716693417a3..be0568c722d6 100644
ide_set_handler(drive, &task_pio_intr, WAIT_WORSTCASE);
-diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ib.c b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
-index f0e55e47eb54..da5f28c892ca 100644
---- a/drivers/infiniband/ulp/ipoib/ipoib_ib.c
-+++ b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
-@@ -51,8 +51,6 @@ MODULE_PARM_DESC(data_debug_level,
+diff -Nur linux-4.6.6.orig/drivers/infiniband/ulp/ipoib/ipoib_ib.c linux-4.6.6/drivers/infiniband/ulp/ipoib/ipoib_ib.c
+--- linux-4.6.6.orig/drivers/infiniband/ulp/ipoib/ipoib_ib.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/infiniband/ulp/ipoib/ipoib_ib.c 2016-08-22 21:27:46.969864638 +0200
+@@ -51,8 +51,6 @@
"Enable data path debug tracing if > 0");
#endif
@@ -4566,11 +4468,10 @@ index f0e55e47eb54..da5f28c892ca 100644
struct ipoib_ah *ipoib_create_ah(struct net_device *dev,
struct ib_pd *pd, struct ib_ah_attr *attr)
{
-diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
-index 25889311b1e9..7fe9dd26a4da 100644
---- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
-+++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
-@@ -883,7 +883,7 @@ void ipoib_mcast_restart_task(struct work_struct *work)
+diff -Nur linux-4.6.6.orig/drivers/infiniband/ulp/ipoib/ipoib_multicast.c linux-4.6.6/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
+--- linux-4.6.6.orig/drivers/infiniband/ulp/ipoib/ipoib_multicast.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/infiniband/ulp/ipoib/ipoib_multicast.c 2016-08-22 21:27:46.969864638 +0200
+@@ -883,7 +883,7 @@
ipoib_dbg_mcast(priv, "restarting multicast task\n");
@@ -4579,7 +4480,7 @@ index 25889311b1e9..7fe9dd26a4da 100644
netif_addr_lock(dev);
spin_lock(&priv->lock);
-@@ -965,7 +965,7 @@ void ipoib_mcast_restart_task(struct work_struct *work)
+@@ -965,7 +965,7 @@
spin_unlock(&priv->lock);
netif_addr_unlock(dev);
@@ -4588,11 +4489,10 @@ index 25889311b1e9..7fe9dd26a4da 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.6.6.orig/drivers/input/gameport/gameport.c linux-4.6.6/drivers/input/gameport/gameport.c
+--- linux-4.6.6.orig/drivers/input/gameport/gameport.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/input/gameport/gameport.c 2016-08-22 21:27:46.977865151 +0200
+@@ -91,13 +91,13 @@
tx = ~0;
for (i = 0; i < 50; i++) {
@@ -4608,7 +4508,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++) {
@@ -4623,7 +4523,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++) {
@@ -4637,11 +4537,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 5efadad4615b..42fc6280729b 100644
---- a/drivers/iommu/amd_iommu.c
-+++ b/drivers/iommu/amd_iommu.c
-@@ -2165,10 +2165,10 @@ static int __attach_device(struct iommu_dev_data *dev_data,
+diff -Nur linux-4.6.6.orig/drivers/iommu/amd_iommu.c linux-4.6.6/drivers/iommu/amd_iommu.c
+--- linux-4.6.6.orig/drivers/iommu/amd_iommu.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/iommu/amd_iommu.c 2016-08-22 21:27:46.997866437 +0200
+@@ -2165,10 +2165,10 @@
int ret;
/*
@@ -4655,7 +4554,7 @@ index 5efadad4615b..42fc6280729b 100644
/* lock domain */
spin_lock(&domain->lock);
-@@ -2331,10 +2331,10 @@ static void __detach_device(struct iommu_dev_data *dev_data)
+@@ -2331,10 +2331,10 @@
struct protection_domain *domain;
/*
@@ -4669,11 +4568,10 @@ index 5efadad4615b..42fc6280729b 100644
if (WARN_ON(!dev_data->domain))
return;
-diff --git a/drivers/leds/trigger/Kconfig b/drivers/leds/trigger/Kconfig
-index 5bda6a9b56bb..d6286584c807 100644
---- a/drivers/leds/trigger/Kconfig
-+++ b/drivers/leds/trigger/Kconfig
-@@ -61,7 +61,7 @@ config LEDS_TRIGGER_BACKLIGHT
+diff -Nur linux-4.6.6.orig/drivers/leds/trigger/Kconfig linux-4.6.6/drivers/leds/trigger/Kconfig
+--- linux-4.6.6.orig/drivers/leds/trigger/Kconfig 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/leds/trigger/Kconfig 2016-08-22 21:27:47.005866951 +0200
+@@ -61,7 +61,7 @@
config LEDS_TRIGGER_CPU
bool "LED CPU Trigger"
@@ -4682,10 +4580,9 @@ index 5bda6a9b56bb..d6286584c807 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.6.6.orig/drivers/md/bcache/Kconfig linux-4.6.6/drivers/md/bcache/Kconfig
+--- linux-4.6.6.orig/drivers/md/bcache/Kconfig 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/md/bcache/Kconfig 2016-08-22 21:27:47.009867204 +0200
@@ -1,6 +1,7 @@
config BCACHE
@@ -4694,11 +4591,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.c b/drivers/md/dm.c
-index 3d3ac13287a4..b931c7b85a0b 100644
---- a/drivers/md/dm.c
-+++ b/drivers/md/dm.c
-@@ -2187,7 +2187,7 @@ static void dm_request_fn(struct request_queue *q)
+diff -Nur linux-4.6.6.orig/drivers/md/dm.c linux-4.6.6/drivers/md/dm.c
+--- linux-4.6.6.orig/drivers/md/dm.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/md/dm.c 2016-08-22 21:27:47.025868232 +0200
+@@ -2187,7 +2187,7 @@
/* Establish tio->ti before queuing work (map_tio_request) */
tio->ti = ti;
queue_kthread_work(&md->kworker, &tio->work);
@@ -4707,11 +4603,10 @@ index 3d3ac13287a4..b931c7b85a0b 100644
}
}
-diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
-index e48c262ce032..25b82212e67f 100644
---- a/drivers/md/raid5.c
-+++ b/drivers/md/raid5.c
-@@ -1918,8 +1918,9 @@ static void raid_run_ops(struct stripe_head *sh, unsigned long ops_request)
+diff -Nur linux-4.6.6.orig/drivers/md/raid5.c linux-4.6.6/drivers/md/raid5.c
+--- linux-4.6.6.orig/drivers/md/raid5.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/md/raid5.c 2016-08-22 21:27:47.041869254 +0200
+@@ -1918,8 +1918,9 @@
struct raid5_percpu *percpu;
unsigned long cpu;
@@ -4722,7 +4617,7 @@ index e48c262ce032..25b82212e67f 100644
if (test_bit(STRIPE_OP_BIOFILL, &ops_request)) {
ops_run_biofill(sh);
overlap_clear++;
-@@ -1975,7 +1976,8 @@ static void raid_run_ops(struct stripe_head *sh, unsigned long ops_request)
+@@ -1975,7 +1976,8 @@
if (test_and_clear_bit(R5_Overlap, &dev->flags))
wake_up(&sh->raid_conf->wait_for_overlap);
}
@@ -4732,7 +4627,7 @@ index e48c262ce032..25b82212e67f 100644
}
static struct stripe_head *alloc_stripe(struct kmem_cache *sc, gfp_t gfp)
-@@ -6415,6 +6417,7 @@ static int raid5_alloc_percpu(struct r5conf *conf)
+@@ -6415,6 +6417,7 @@
__func__, cpu);
break;
}
@@ -4740,11 +4635,10 @@ index e48c262ce032..25b82212e67f 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.6.6.orig/drivers/md/raid5.h linux-4.6.6/drivers/md/raid5.h
+--- linux-4.6.6.orig/drivers/md/raid5.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/md/raid5.h 2016-08-22 21:27:47.041869254 +0200
+@@ -504,6 +504,7 @@
int recovery_disabled;
/* per cpu variables */
struct raid5_percpu {
@@ -4752,97 +4646,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 a216b4667742..cea73201112e 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 b2fb6dbffcef..22827d5a3ba6 100644
---- a/drivers/misc/Makefile
-+++ b/drivers/misc/Makefile
-@@ -39,6 +39,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.6.6.orig/drivers/misc/hwlat_detector.c linux-4.6.6/drivers/misc/hwlat_detector.c
+--- linux-4.6.6.orig/drivers/misc/hwlat_detector.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.6.6/drivers/misc/hwlat_detector.c 2016-08-22 21:27:47.053870028 +0200
@@ -0,0 +1,1240 @@
+/*
+ * hwlat_detector.c - A simple Hardware Latency detector.
@@ -6084,11 +5890,94 @@ index 000000000000..52f5ad5fd9c0
+
+module_init(detector_init);
+module_exit(detector_exit);
-diff --git a/drivers/mmc/host/jz4740_mmc.c b/drivers/mmc/host/jz4740_mmc.c
-index 03ddf0ecf402..684087db170b 100644
---- a/drivers/mmc/host/jz4740_mmc.c
-+++ b/drivers/mmc/host/jz4740_mmc.c
-@@ -1068,8 +1068,6 @@ static int jz4740_mmc_probe(struct platform_device* pdev)
+diff -Nur linux-4.6.6.orig/drivers/misc/Kconfig linux-4.6.6/drivers/misc/Kconfig
+--- linux-4.6.6.orig/drivers/misc/Kconfig 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/misc/Kconfig 2016-08-22 21:27:47.049869767 +0200
+@@ -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.6.6.orig/drivers/misc/Makefile linux-4.6.6/drivers/misc/Makefile
+--- linux-4.6.6.orig/drivers/misc/Makefile 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/misc/Makefile 2016-08-22 21:27:47.049869767 +0200
+@@ -39,6 +39,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.6.6.orig/drivers/mmc/host/jz4740_mmc.c linux-4.6.6/drivers/mmc/host/jz4740_mmc.c
+--- linux-4.6.6.orig/drivers/mmc/host/jz4740_mmc.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/mmc/host/jz4740_mmc.c 2016-08-22 21:27:47.061870541 +0200
+@@ -1068,8 +1068,6 @@
jz4740_mmc_clock_disable(host);
setup_timer(&host->timeout_timer, jz4740_mmc_timeout,
(unsigned long)host);
@@ -6097,11 +5986,10 @@ index 03ddf0ecf402..684087db170b 100644
host->use_dma = true;
if (host->use_dma && jz4740_mmc_acquire_dma_channels(host) != 0)
-diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
-index 2e6c96845c9a..578ddbeab8ed 100644
---- a/drivers/mmc/host/mmci.c
-+++ b/drivers/mmc/host/mmci.c
-@@ -1155,15 +1155,12 @@ static irqreturn_t mmci_pio_irq(int irq, void *dev_id)
+diff -Nur linux-4.6.6.orig/drivers/mmc/host/mmci.c linux-4.6.6/drivers/mmc/host/mmci.c
+--- linux-4.6.6.orig/drivers/mmc/host/mmci.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/mmc/host/mmci.c 2016-08-22 21:27:47.069871054 +0200
+@@ -1155,15 +1155,12 @@
struct sg_mapping_iter *sg_miter = &host->sg_miter;
struct variant_data *variant = host->variant;
void __iomem *base = host->base;
@@ -6117,7 +6005,7 @@ index 2e6c96845c9a..578ddbeab8ed 100644
do {
unsigned int remain, len;
char *buffer;
-@@ -1203,8 +1200,6 @@ static irqreturn_t mmci_pio_irq(int irq, void *dev_id)
+@@ -1203,8 +1200,6 @@
sg_miter_stop(sg_miter);
@@ -6126,11 +6014,10 @@ index 2e6c96845c9a..578ddbeab8ed 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 d81fceddbe0e..dbcecb8845c6 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.6.6.orig/drivers/net/ethernet/3com/3c59x.c linux-4.6.6/drivers/net/ethernet/3com/3c59x.c
+--- linux-4.6.6.orig/drivers/net/ethernet/3com/3c59x.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/net/ethernet/3com/3c59x.c 2016-08-22 21:27:47.081871820 +0200
+@@ -842,9 +842,9 @@
{
struct vortex_private *vp = netdev_priv(dev);
unsigned long flags;
@@ -6142,7 +6029,7 @@ index d81fceddbe0e..dbcecb8845c6 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;
@@ -6157,11 +6044,10 @@ index d81fceddbe0e..dbcecb8845c6 100644
}
}
-diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
-index d0084d4d1a9b..38370772f5dc 100644
---- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
-+++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
-@@ -2217,11 +2217,7 @@ static netdev_tx_t atl1c_xmit_frame(struct sk_buff *skb,
+diff -Nur linux-4.6.6.orig/drivers/net/ethernet/atheros/atl1c/atl1c_main.c linux-4.6.6/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
+--- linux-4.6.6.orig/drivers/net/ethernet/atheros/atl1c/atl1c_main.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/net/ethernet/atheros/atl1c/atl1c_main.c 2016-08-22 21:27:47.093872593 +0200
+@@ -2217,11 +2217,7 @@
}
tpd_req = atl1c_cal_tpd_req(skb);
@@ -6174,11 +6060,10 @@ index d0084d4d1a9b..38370772f5dc 100644
if (atl1c_tpd_avail(adapter, type) < tpd_req) {
/* no enough descriptor, just stop queue */
-diff --git a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
-index 59a03a193e83..734f7a7ad2c3 100644
---- a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
-+++ b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
-@@ -1880,8 +1880,7 @@ static netdev_tx_t atl1e_xmit_frame(struct sk_buff *skb,
+diff -Nur linux-4.6.6.orig/drivers/net/ethernet/atheros/atl1e/atl1e_main.c linux-4.6.6/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
+--- linux-4.6.6.orig/drivers/net/ethernet/atheros/atl1e/atl1e_main.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/net/ethernet/atheros/atl1e/atl1e_main.c 2016-08-22 21:27:47.101873106 +0200
+@@ -1880,8 +1880,7 @@
return NETDEV_TX_OK;
}
tpd_req = atl1e_cal_tdp_req(skb);
@@ -6188,11 +6073,10 @@ index 59a03a193e83..734f7a7ad2c3 100644
if (atl1e_tpd_avail(adapter) < tpd_req) {
/* no enough descriptor, just stop queue */
-diff --git a/drivers/net/ethernet/chelsio/cxgb/sge.c b/drivers/net/ethernet/chelsio/cxgb/sge.c
-index 526ea74e82d9..86f467a2c485 100644
---- a/drivers/net/ethernet/chelsio/cxgb/sge.c
-+++ b/drivers/net/ethernet/chelsio/cxgb/sge.c
-@@ -1664,8 +1664,7 @@ static int t1_sge_tx(struct sk_buff *skb, struct adapter *adapter,
+diff -Nur linux-4.6.6.orig/drivers/net/ethernet/chelsio/cxgb/sge.c linux-4.6.6/drivers/net/ethernet/chelsio/cxgb/sge.c
+--- linux-4.6.6.orig/drivers/net/ethernet/chelsio/cxgb/sge.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/net/ethernet/chelsio/cxgb/sge.c 2016-08-22 21:27:47.113873872 +0200
+@@ -1664,8 +1664,7 @@
struct cmdQ *q = &sge->cmdQ[qid];
unsigned int credits, pidx, genbit, count, use_sched_skb = 0;
@@ -6202,11 +6086,10 @@ index 526ea74e82d9..86f467a2c485 100644
reclaim_completed_tx(sge, q);
-diff --git a/drivers/net/ethernet/neterion/s2io.c b/drivers/net/ethernet/neterion/s2io.c
-index 9ba975853ec6..813cfa698160 100644
---- a/drivers/net/ethernet/neterion/s2io.c
-+++ b/drivers/net/ethernet/neterion/s2io.c
-@@ -4084,12 +4084,7 @@ static netdev_tx_t s2io_xmit(struct sk_buff *skb, struct net_device *dev)
+diff -Nur linux-4.6.6.orig/drivers/net/ethernet/neterion/s2io.c linux-4.6.6/drivers/net/ethernet/neterion/s2io.c
+--- linux-4.6.6.orig/drivers/net/ethernet/neterion/s2io.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/net/ethernet/neterion/s2io.c 2016-08-22 21:27:47.141875672 +0200
+@@ -4084,12 +4084,7 @@
[skb->priority & (MAX_TX_FIFOS - 1)];
fifo = &mac_control->fifos[queue];
@@ -6220,11 +6103,10 @@ index 9ba975853ec6..813cfa698160 100644
if (sp->config.multiq) {
if (__netif_subqueue_stopped(dev, fifo->fifo_no)) {
-diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
-index 3b98b263bad0..ca4add749410 100644
---- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
-+++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
-@@ -2137,10 +2137,8 @@ static int pch_gbe_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
+diff -Nur linux-4.6.6.orig/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c linux-4.6.6/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
+--- linux-4.6.6.orig/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c 2016-08-22 21:27:47.149876185 +0200
+@@ -2137,10 +2137,8 @@
struct pch_gbe_tx_ring *tx_ring = adapter->tx_ring;
unsigned long flags;
@@ -6237,11 +6119,10 @@ index 3b98b263bad0..ca4add749410 100644
if (unlikely(!PCH_GBE_DESC_UNUSED(tx_ring))) {
netif_stop_queue(netdev);
spin_unlock_irqrestore(&tx_ring->tx_lock, flags);
-diff --git a/drivers/net/ethernet/realtek/8139too.c b/drivers/net/ethernet/realtek/8139too.c
-index ef668d300800..d987d571fdd6 100644
---- a/drivers/net/ethernet/realtek/8139too.c
-+++ b/drivers/net/ethernet/realtek/8139too.c
-@@ -2229,7 +2229,7 @@ static void rtl8139_poll_controller(struct net_device *dev)
+diff -Nur linux-4.6.6.orig/drivers/net/ethernet/realtek/8139too.c linux-4.6.6/drivers/net/ethernet/realtek/8139too.c
+--- linux-4.6.6.orig/drivers/net/ethernet/realtek/8139too.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/net/ethernet/realtek/8139too.c 2016-08-22 21:27:47.157876698 +0200
+@@ -2229,7 +2229,7 @@
struct rtl8139_private *tp = netdev_priv(dev);
const int irq = tp->pci_dev->irq;
@@ -6250,11 +6131,10 @@ index ef668d300800..d987d571fdd6 100644
rtl8139_interrupt(irq, dev);
enable_irq(irq);
}
-diff --git a/drivers/net/ethernet/tehuti/tehuti.c b/drivers/net/ethernet/tehuti/tehuti.c
-index 14c9d1baa85c..e1a5305418a8 100644
---- a/drivers/net/ethernet/tehuti/tehuti.c
-+++ b/drivers/net/ethernet/tehuti/tehuti.c
-@@ -1629,13 +1629,8 @@ static netdev_tx_t bdx_tx_transmit(struct sk_buff *skb,
+diff -Nur linux-4.6.6.orig/drivers/net/ethernet/tehuti/tehuti.c linux-4.6.6/drivers/net/ethernet/tehuti/tehuti.c
+--- linux-4.6.6.orig/drivers/net/ethernet/tehuti/tehuti.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/net/ethernet/tehuti/tehuti.c 2016-08-22 21:27:47.165877211 +0200
+@@ -1629,13 +1629,8 @@
unsigned long flags;
ENTER;
@@ -6270,11 +6150,10 @@ index 14c9d1baa85c..e1a5305418a8 100644
/* build tx descriptor */
BDX_ASSERT(f->m.wptr >= f->m.memsz); /* started with valid wptr */
-diff --git a/drivers/net/ethernet/tile/tilepro.c b/drivers/net/ethernet/tile/tilepro.c
-index 298e059d0498..ea5d774fc89b 100644
---- a/drivers/net/ethernet/tile/tilepro.c
-+++ b/drivers/net/ethernet/tile/tilepro.c
-@@ -588,7 +588,7 @@ static bool tile_net_lepp_free_comps(struct net_device *dev, bool all)
+diff -Nur linux-4.6.6.orig/drivers/net/ethernet/tile/tilepro.c linux-4.6.6/drivers/net/ethernet/tile/tilepro.c
+--- linux-4.6.6.orig/drivers/net/ethernet/tile/tilepro.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/net/ethernet/tile/tilepro.c 2016-08-22 21:27:47.173877724 +0200
+@@ -588,7 +588,7 @@
static void tile_net_schedule_egress_timer(struct tile_net_cpu *info)
{
if (!info->egress_timer_scheduled) {
@@ -6283,7 +6162,7 @@ index 298e059d0498..ea5d774fc89b 100644
info->egress_timer_scheduled = true;
}
}
-@@ -1004,7 +1004,7 @@ static void tile_net_register(void *dev_ptr)
+@@ -1004,7 +1004,7 @@
BUG();
/* Initialize the egress timer. */
@@ -6292,11 +6171,10 @@ index 298e059d0498..ea5d774fc89b 100644
info->egress_timer.data = (long)info;
info->egress_timer.function = tile_net_handle_egress_timer;
-diff --git a/drivers/net/rionet.c b/drivers/net/rionet.c
-index 9cfe6aeac84e..a31f4610b493 100644
---- a/drivers/net/rionet.c
-+++ b/drivers/net/rionet.c
-@@ -179,11 +179,7 @@ static int rionet_start_xmit(struct sk_buff *skb, struct net_device *ndev)
+diff -Nur linux-4.6.6.orig/drivers/net/rionet.c linux-4.6.6/drivers/net/rionet.c
+--- linux-4.6.6.orig/drivers/net/rionet.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/net/rionet.c 2016-08-22 21:27:47.181878237 +0200
+@@ -179,11 +179,7 @@
unsigned long flags;
int add_num = 1;
@@ -6309,11 +6187,10 @@ index 9cfe6aeac84e..a31f4610b493 100644
if (is_multicast_ether_addr(eth->h_dest))
add_num = nets[rnet->mport->id].nact;
-diff --git a/drivers/net/wireless/intersil/orinoco/orinoco_usb.c b/drivers/net/wireless/intersil/orinoco/orinoco_usb.c
-index f2cd513d54b2..6c0f4c9638a2 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.6.6.orig/drivers/net/wireless/intersil/orinoco/orinoco_usb.c linux-4.6.6/drivers/net/wireless/intersil/orinoco/orinoco_usb.c
+--- linux-4.6.6.orig/drivers/net/wireless/intersil/orinoco/orinoco_usb.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/net/wireless/intersil/orinoco/orinoco_usb.c 2016-08-22 21:27:47.193879004 +0200
+@@ -697,7 +697,7 @@
while (!ctx->done.done && msecs--)
udelay(1000);
} else {
@@ -6322,11 +6199,10 @@ index f2cd513d54b2..6c0f4c9638a2 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.6.6.orig/drivers/pci/access.c linux-4.6.6/drivers/pci/access.c
+--- linux-4.6.6.orig/drivers/pci/access.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/pci/access.c 2016-08-22 21:27:47.201879517 +0200
+@@ -672,7 +672,7 @@
WARN_ON(!dev->block_cfg_access);
dev->block_cfg_access = 0;
@@ -6335,11 +6211,10 @@ index d11cdbb8fba3..223bbb9acb03 100644
raw_spin_unlock_irqrestore(&pci_lock, flags);
}
EXPORT_SYMBOL_GPL(pci_cfg_access_unlock);
-diff --git a/drivers/power/bq27xxx_battery.c b/drivers/power/bq27xxx_battery.c
-index 45f6ebf88df6..e90b3f307e0f 100644
---- a/drivers/power/bq27xxx_battery.c
-+++ b/drivers/power/bq27xxx_battery.c
-@@ -735,11 +735,8 @@ static void bq27xxx_battery_poll(struct work_struct *work)
+diff -Nur linux-4.6.6.orig/drivers/power/bq27xxx_battery.c linux-4.6.6/drivers/power/bq27xxx_battery.c
+--- linux-4.6.6.orig/drivers/power/bq27xxx_battery.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/power/bq27xxx_battery.c 2016-08-22 21:27:47.213880286 +0200
+@@ -735,11 +735,8 @@
bq27xxx_battery_update(di);
@@ -6352,11 +6227,10 @@ index 45f6ebf88df6..e90b3f307e0f 100644
}
/*
-diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c
-index 0efe7112fc1f..3d232657218d 100644
---- a/drivers/scsi/fcoe/fcoe.c
-+++ b/drivers/scsi/fcoe/fcoe.c
-@@ -1286,7 +1286,7 @@ static void fcoe_percpu_thread_destroy(unsigned int cpu)
+diff -Nur linux-4.6.6.orig/drivers/scsi/fcoe/fcoe.c linux-4.6.6/drivers/scsi/fcoe/fcoe.c
+--- linux-4.6.6.orig/drivers/scsi/fcoe/fcoe.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/scsi/fcoe/fcoe.c 2016-08-22 21:27:47.221880796 +0200
+@@ -1286,7 +1286,7 @@
struct sk_buff *skb;
#ifdef CONFIG_SMP
struct fcoe_percpu_s *p0;
@@ -6365,7 +6239,7 @@ index 0efe7112fc1f..3d232657218d 100644
#endif /* CONFIG_SMP */
FCOE_DBG("Destroying receive thread for CPU %d\n", cpu);
-@@ -1342,7 +1342,7 @@ static void fcoe_percpu_thread_destroy(unsigned int cpu)
+@@ -1342,7 +1342,7 @@
kfree_skb(skb);
spin_unlock_bh(&p->fcoe_rx_list.lock);
}
@@ -6374,7 +6248,7 @@ index 0efe7112fc1f..3d232657218d 100644
#else
/*
* This a non-SMP scenario where the singular Rx thread is
-@@ -1566,11 +1566,11 @@ static int fcoe_rcv(struct sk_buff *skb, struct net_device *netdev,
+@@ -1566,11 +1566,11 @@
static int fcoe_alloc_paged_crc_eof(struct sk_buff *skb, int tlen)
{
struct fcoe_percpu_s *fps;
@@ -6389,7 +6263,7 @@ index 0efe7112fc1f..3d232657218d 100644
return rc;
}
-@@ -1766,11 +1766,11 @@ static inline int fcoe_filter_frames(struct fc_lport *lport,
+@@ -1766,11 +1766,11 @@
return 0;
}
@@ -6403,7 +6277,16 @@ index 0efe7112fc1f..3d232657218d 100644
return -EINVAL;
}
-@@ -1846,13 +1846,13 @@ static void fcoe_recv_frame(struct sk_buff *skb)
+@@ -1814,7 +1814,7 @@
+ */
+ hp = (struct fcoe_hdr *) skb_network_header(skb);
+
+- stats = per_cpu_ptr(lport->stats, get_cpu());
++ stats = per_cpu_ptr(lport->stats, get_cpu_light());
+ if (unlikely(FC_FCOE_DECAPS_VER(hp) != FC_FCOE_VER)) {
+ if (stats->ErrorFrames < 5)
+ printk(KERN_WARNING "fcoe: FCoE version "
+@@ -1846,13 +1846,13 @@
goto drop;
if (!fcoe_filter_frames(lport, fp)) {
@@ -6419,11 +6302,10 @@ index 0efe7112fc1f..3d232657218d 100644
kfree_skb(skb);
}
-diff --git a/drivers/scsi/fcoe/fcoe_ctlr.c b/drivers/scsi/fcoe/fcoe_ctlr.c
-index 3e83d485f743..bc69ff93127c 100644
---- a/drivers/scsi/fcoe/fcoe_ctlr.c
-+++ b/drivers/scsi/fcoe/fcoe_ctlr.c
-@@ -831,7 +831,7 @@ static unsigned long fcoe_ctlr_age_fcfs(struct fcoe_ctlr *fip)
+diff -Nur linux-4.6.6.orig/drivers/scsi/fcoe/fcoe_ctlr.c linux-4.6.6/drivers/scsi/fcoe/fcoe_ctlr.c
+--- linux-4.6.6.orig/drivers/scsi/fcoe/fcoe_ctlr.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/scsi/fcoe/fcoe_ctlr.c 2016-08-22 21:27:47.233881568 +0200
+@@ -831,7 +831,7 @@
INIT_LIST_HEAD(&del_list);
@@ -6432,7 +6314,7 @@ index 3e83d485f743..bc69ff93127c 100644
list_for_each_entry_safe(fcf, next, &fip->fcfs, list) {
deadline = fcf->time + fcf->fka_period + fcf->fka_period / 2;
-@@ -867,7 +867,7 @@ static unsigned long fcoe_ctlr_age_fcfs(struct fcoe_ctlr *fip)
+@@ -867,7 +867,7 @@
sel_time = fcf->time;
}
}
@@ -6441,11 +6323,10 @@ index 3e83d485f743..bc69ff93127c 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 30f9ef0c0d4f..6c686bc01a82 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.6.6.orig/drivers/scsi/libfc/fc_exch.c linux-4.6.6/drivers/scsi/libfc/fc_exch.c
+--- linux-4.6.6.orig/drivers/scsi/libfc/fc_exch.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/scsi/libfc/fc_exch.c 2016-08-22 21:27:47.245882341 +0200
+@@ -814,10 +814,10 @@
}
memset(ep, 0, sizeof(*ep));
@@ -6458,11 +6339,10 @@ index 30f9ef0c0d4f..6c686bc01a82 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 9c706d8c1441..d968ffc79c08 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.6.6.orig/drivers/scsi/libsas/sas_ata.c linux-4.6.6/drivers/scsi/libsas/sas_ata.c
+--- linux-4.6.6.orig/drivers/scsi/libsas/sas_ata.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/scsi/libsas/sas_ata.c 2016-08-22 21:27:47.253882854 +0200
+@@ -190,7 +190,7 @@
/* TODO: audit callers to ensure they are ready for qc_issue to
* unconditionally re-enable interrupts
*/
@@ -6471,7 +6351,7 @@ index 9c706d8c1441..d968ffc79c08 100644
spin_unlock(ap->lock);
/* If the device fell off, no sense in issuing commands */
-@@ -255,7 +255,7 @@ static unsigned int sas_ata_qc_issue(struct ata_queued_cmd *qc)
+@@ -255,7 +255,7 @@
out:
spin_lock(ap->lock);
@@ -6480,11 +6360,10 @@ index 9c706d8c1441..d968ffc79c08 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.6.6.orig/drivers/scsi/qla2xxx/qla_inline.h linux-4.6.6/drivers/scsi/qla2xxx/qla_inline.h
+--- linux-4.6.6.orig/drivers/scsi/qla2xxx/qla_inline.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/scsi/qla2xxx/qla_inline.h 2016-08-22 21:27:47.261883367 +0200
+@@ -59,12 +59,12 @@
{
unsigned long flags;
struct qla_hw_data *ha = rsp->hw;
@@ -6499,10 +6378,9 @@ index edc48f3b8230..ee5c6f9dfb6f 100644
}
static inline uint8_t *
-diff --git a/drivers/thermal/x86_pkg_temp_thermal.c b/drivers/thermal/x86_pkg_temp_thermal.c
-index 7fc919f7da4d..e03fa17b8670 100644
---- a/drivers/thermal/x86_pkg_temp_thermal.c
-+++ b/drivers/thermal/x86_pkg_temp_thermal.c
+diff -Nur linux-4.6.6.orig/drivers/thermal/x86_pkg_temp_thermal.c linux-4.6.6/drivers/thermal/x86_pkg_temp_thermal.c
+--- linux-4.6.6.orig/drivers/thermal/x86_pkg_temp_thermal.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/thermal/x86_pkg_temp_thermal.c 2016-08-22 21:27:47.273884133 +0200
@@ -29,6 +29,7 @@
#include <linux/pm.h>
#include <linux/thermal.h>
@@ -6511,7 +6389,7 @@ index 7fc919f7da4d..e03fa17b8670 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 @@
}
}
@@ -6520,7 +6398,7 @@ index 7fc919f7da4d..e03fa17b8670 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);
@@ -6529,7 +6407,7 @@ index 7fc919f7da4d..e03fa17b8670 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));
@@ -6578,7 +6456,7 @@ index 7fc919f7da4d..e03fa17b8670 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;
@@ -6588,7 +6466,7 @@ index 7fc919f7da4d..e03fa17b8670 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;
@@ -6597,7 +6475,7 @@ index 7fc919f7da4d..e03fa17b8670 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;
@@ -6605,11 +6483,10 @@ index 7fc919f7da4d..e03fa17b8670 100644
for_each_online_cpu(i)
cancel_delayed_work_sync(
&per_cpu(pkg_temp_thermal_threshold_work, i));
-diff --git a/drivers/tty/metag_da.c b/drivers/tty/metag_da.c
-index 9325262289f9..25ccef2fe748 100644
---- a/drivers/tty/metag_da.c
-+++ b/drivers/tty/metag_da.c
-@@ -323,12 +323,12 @@ static void dashtty_timer(unsigned long ignored)
+diff -Nur linux-4.6.6.orig/drivers/tty/metag_da.c linux-4.6.6/drivers/tty/metag_da.c
+--- linux-4.6.6.orig/drivers/tty/metag_da.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/tty/metag_da.c 2016-08-22 21:27:47.273884133 +0200
+@@ -323,12 +323,12 @@
if (channel >= 0)
fetch_data(channel);
@@ -6624,11 +6501,10 @@ index 9325262289f9..25ccef2fe748 100644
poll_timer->expires = jiffies + DA_TTY_POLL;
/*
-diff --git a/drivers/tty/mips_ejtag_fdc.c b/drivers/tty/mips_ejtag_fdc.c
-index a119176a1855..234123b0c642 100644
---- a/drivers/tty/mips_ejtag_fdc.c
-+++ b/drivers/tty/mips_ejtag_fdc.c
-@@ -689,7 +689,7 @@ static void mips_ejtag_fdc_tty_timer(unsigned long opaque)
+diff -Nur linux-4.6.6.orig/drivers/tty/mips_ejtag_fdc.c linux-4.6.6/drivers/tty/mips_ejtag_fdc.c
+--- linux-4.6.6.orig/drivers/tty/mips_ejtag_fdc.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/tty/mips_ejtag_fdc.c 2016-08-22 21:27:47.273884133 +0200
+@@ -689,7 +689,7 @@
mips_ejtag_fdc_handle(priv);
if (!priv->removing)
@@ -6637,7 +6513,7 @@ index a119176a1855..234123b0c642 100644
}
/* TTY Port operations */
-@@ -1002,7 +1002,7 @@ static int mips_ejtag_fdc_tty_probe(struct mips_cdmm_device *dev)
+@@ -1002,7 +1002,7 @@
raw_spin_unlock_irq(&priv->lock);
} else {
/* If we didn't get an usable IRQ, poll instead */
@@ -6646,11 +6522,10 @@ index a119176a1855..234123b0c642 100644
(unsigned long)priv);
priv->poll_timer.expires = jiffies + FDC_TTY_POLL;
/*
-diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c
-index 2f4f5ee651db..6ea6a3134e16 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.6.6.orig/drivers/tty/serial/8250/8250_core.c linux-4.6.6/drivers/tty/serial/8250/8250_core.c
+--- linux-4.6.6.orig/drivers/tty/serial/8250/8250_core.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/tty/serial/8250/8250_core.c 2016-08-22 21:27:47.273884133 +0200
+@@ -58,7 +58,16 @@
static unsigned int skip_txen_test; /* force skip of txen test at init time */
@@ -6668,10 +6543,9 @@ index 2f4f5ee651db..6ea6a3134e16 100644
#include <asm/serial.h>
/*
-diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c
-index 00ad2637b08c..c9f6a4937b23 100644
---- a/drivers/tty/serial/8250/8250_port.c
-+++ b/drivers/tty/serial/8250/8250_port.c
+diff -Nur linux-4.6.6.orig/drivers/tty/serial/8250/8250_port.c linux-4.6.6/drivers/tty/serial/8250/8250_port.c
+--- linux-4.6.6.orig/drivers/tty/serial/8250/8250_port.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/tty/serial/8250/8250_port.c 2016-08-22 21:27:47.277884393 +0200
@@ -35,6 +35,7 @@
#include <linux/nmi.h>
#include <linux/mutex.h>
@@ -6680,7 +6554,7 @@ index 00ad2637b08c..c9f6a4937b23 100644
#include <linux/uaccess.h>
#include <linux/pm_runtime.h>
#include <linux/timer.h>
-@@ -3092,9 +3093,9 @@ void serial8250_console_write(struct uart_8250_port *up, const char *s,
+@@ -3092,9 +3093,9 @@
serial8250_rpm_get(up);
@@ -6692,11 +6566,10 @@ index 00ad2637b08c..c9f6a4937b23 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 7c198e0a3178..a26b81c4aae6 100644
---- a/drivers/tty/serial/amba-pl011.c
-+++ b/drivers/tty/serial/amba-pl011.c
-@@ -2166,13 +2166,19 @@ pl011_console_write(struct console *co, const char *s, unsigned int count)
+diff -Nur linux-4.6.6.orig/drivers/tty/serial/amba-pl011.c linux-4.6.6/drivers/tty/serial/amba-pl011.c
+--- linux-4.6.6.orig/drivers/tty/serial/amba-pl011.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/tty/serial/amba-pl011.c 2016-08-22 21:27:47.277884393 +0200
+@@ -2166,13 +2166,19 @@
clk_enable(uap->clk);
@@ -6719,7 +6592,7 @@ index 7c198e0a3178..a26b81c4aae6 100644
/*
* First save the CR then disable the interrupts
-@@ -2196,8 +2202,7 @@ pl011_console_write(struct console *co, const char *s, unsigned int count)
+@@ -2196,8 +2202,7 @@
pl011_write(old_cr, uap, REG_CR);
if (locked)
@@ -6729,11 +6602,10 @@ index 7c198e0a3178..a26b81c4aae6 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.6.6.orig/drivers/tty/serial/omap-serial.c linux-4.6.6/drivers/tty/serial/omap-serial.c
+--- linux-4.6.6.orig/drivers/tty/serial/omap-serial.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/tty/serial/omap-serial.c 2016-08-22 21:27:47.281884646 +0200
+@@ -1257,13 +1257,10 @@
pm_runtime_get_sync(up->dev);
@@ -6750,7 +6622,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)
@@ -6760,11 +6632,10 @@ index a2a529994ba5..0ee7c4c518df 100644
}
static int __init
-diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c
-index 025a4264430e..73d46e2155a9 100644
---- a/drivers/tty/serial/sc16is7xx.c
-+++ b/drivers/tty/serial/sc16is7xx.c
-@@ -1251,7 +1251,7 @@ static int sc16is7xx_probe(struct device *dev,
+diff -Nur linux-4.6.6.orig/drivers/tty/serial/sc16is7xx.c linux-4.6.6/drivers/tty/serial/sc16is7xx.c
+--- linux-4.6.6.orig/drivers/tty/serial/sc16is7xx.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/tty/serial/sc16is7xx.c 2016-08-22 21:27:47.281884646 +0200
+@@ -1251,7 +1251,7 @@
/* Setup interrupt */
ret = devm_request_irq(dev, irq, sc16is7xx_irq,
@@ -6773,11 +6644,10 @@ index 025a4264430e..73d46e2155a9 100644
if (!ret)
return 0;
-diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
-index 2d107d0f61b0..28a5cb87289a 100644
---- a/drivers/usb/core/hcd.c
-+++ b/drivers/usb/core/hcd.c
-@@ -1759,9 +1759,9 @@ static void __usb_hcd_giveback_urb(struct urb *urb)
+diff -Nur linux-4.6.6.orig/drivers/usb/core/hcd.c linux-4.6.6/drivers/usb/core/hcd.c
+--- linux-4.6.6.orig/drivers/usb/core/hcd.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/usb/core/hcd.c 2016-08-22 21:27:47.281884646 +0200
+@@ -1759,9 +1759,9 @@
* and no one may trigger the above deadlock situation when
* running complete() in tasklet.
*/
@@ -6789,11 +6659,10 @@ index 2d107d0f61b0..28a5cb87289a 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 73515d54e1cc..78a9351b6226 100644
---- a/drivers/usb/gadget/function/f_fs.c
-+++ b/drivers/usb/gadget/function/f_fs.c
-@@ -1393,7 +1393,7 @@ static void ffs_data_put(struct ffs_data *ffs)
+diff -Nur linux-4.6.6.orig/drivers/usb/gadget/function/f_fs.c linux-4.6.6/drivers/usb/gadget/function/f_fs.c
+--- linux-4.6.6.orig/drivers/usb/gadget/function/f_fs.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/usb/gadget/function/f_fs.c 2016-08-22 21:27:47.285884906 +0200
+@@ -1393,7 +1393,7 @@
pr_info("%s(): freeing\n", __func__);
ffs_data_clear(ffs);
BUG_ON(waitqueue_active(&ffs->ev.waitq) ||
@@ -6802,11 +6671,10 @@ index 73515d54e1cc..78a9351b6226 100644
kfree(ffs->dev_name);
kfree(ffs);
}
-diff --git a/drivers/usb/gadget/legacy/inode.c b/drivers/usb/gadget/legacy/inode.c
-index aa3707bdebb4..665654412e4f 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.6.6.orig/drivers/usb/gadget/legacy/inode.c linux-4.6.6/drivers/usb/gadget/legacy/inode.c
+--- linux-4.6.6.orig/drivers/usb/gadget/legacy/inode.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/usb/gadget/legacy/inode.c 2016-08-22 21:27:47.285884906 +0200
+@@ -346,7 +346,7 @@
spin_unlock_irq (&epdata->dev->lock);
if (likely (value == 0)) {
@@ -6815,7 +6683,7 @@ index aa3707bdebb4..665654412e4f 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);
@@ -6824,11 +6692,10 @@ index aa3707bdebb4..665654412e4f 100644
if (epdata->status == -ECONNRESET)
epdata->status = -EINTR;
} else {
-diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
-index 04dcedfdebf8..86919ec47163 100644
---- a/drivers/usb/host/ohci-hcd.c
-+++ b/drivers/usb/host/ohci-hcd.c
-@@ -500,7 +500,6 @@ static int ohci_init (struct ohci_hcd *ohci)
+diff -Nur linux-4.6.6.orig/drivers/usb/host/ohci-hcd.c linux-4.6.6/drivers/usb/host/ohci-hcd.c
+--- linux-4.6.6.orig/drivers/usb/host/ohci-hcd.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/usb/host/ohci-hcd.c 2016-08-22 21:27:47.289885159 +0200
+@@ -500,7 +500,6 @@
setup_timer(&ohci->io_watchdog, io_watchdog_func,
(unsigned long) ohci);
@@ -6836,11 +6703,10 @@ index 04dcedfdebf8..86919ec47163 100644
ohci->hcca = dma_alloc_coherent (hcd->self.controller,
sizeof(*ohci->hcca), &ohci->hcca_dma, GFP_KERNEL);
-diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
-index 327280535848..7901a685b8de 100644
---- a/drivers/usb/host/xhci.c
-+++ b/drivers/usb/host/xhci.c
-@@ -490,8 +490,6 @@ static void compliance_mode_recovery_timer_init(struct xhci_hcd *xhci)
+diff -Nur linux-4.6.6.orig/drivers/usb/host/xhci.c linux-4.6.6/drivers/usb/host/xhci.c
+--- linux-4.6.6.orig/drivers/usb/host/xhci.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/drivers/usb/host/xhci.c 2016-08-22 21:27:47.289885159 +0200
+@@ -490,8 +490,6 @@
xhci->comp_mode_recovery_timer.expires = jiffies +
msecs_to_jiffies(COMP_MODE_RCVRY_MSECS);
@@ -6849,10 +6715,9 @@ index 327280535848..7901a685b8de 100644
add_timer(&xhci->comp_mode_recovery_timer);
xhci_dbg_trace(xhci, trace_xhci_dbg_quirks,
"Compliance mode recovery timer initialized");
-diff --git a/fs/aio.c b/fs/aio.c
-index 155f84253f33..dd8d6f234a0b 100644
---- a/fs/aio.c
-+++ b/fs/aio.c
+diff -Nur linux-4.6.6.orig/fs/aio.c linux-4.6.6/fs/aio.c
+--- linux-4.6.6.orig/fs/aio.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/fs/aio.c 2016-08-22 21:27:47.293885419 +0200
@@ -40,6 +40,7 @@
#include <linux/ramfs.h>
#include <linux/percpu-refcount.h>
@@ -6861,7 +6726,7 @@ index 155f84253f33..dd8d6f234a0b 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;
@@ -6870,7 +6735,7 @@ index 155f84253f33..dd8d6f234a0b 100644
/*
* signals when all in-flight requests are done
-@@ -253,6 +254,7 @@ static int __init aio_setup(void)
+@@ -253,6 +254,7 @@
.mount = aio_mount,
.kill_sb = kill_anon_super,
};
@@ -6878,7 +6743,7 @@ index 155f84253f33..dd8d6f234a0b 100644
aio_mnt = kern_mount(&aio_fs);
if (IS_ERR(aio_mnt))
panic("Failed to create aio fs mount.");
-@@ -568,9 +570,9 @@ static int kiocb_cancel(struct aio_kiocb *kiocb)
+@@ -568,9 +570,9 @@
return cancel(&kiocb->common);
}
@@ -6890,7 +6755,7 @@ index 155f84253f33..dd8d6f234a0b 100644
pr_debug("freeing %p\n", ctx);
-@@ -589,8 +591,8 @@ static void free_ioctx_reqs(struct percpu_ref *ref)
+@@ -589,8 +591,8 @@
if (ctx->rq_wait && atomic_dec_and_test(&ctx->rq_wait->count))
complete(&ctx->rq_wait->comp);
@@ -6901,7 +6766,7 @@ index 155f84253f33..dd8d6f234a0b 100644
}
/*
-@@ -598,9 +600,9 @@ static void free_ioctx_reqs(struct percpu_ref *ref)
+@@ -598,9 +600,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.
*/
@@ -6913,7 +6778,7 @@ index 155f84253f33..dd8d6f234a0b 100644
struct aio_kiocb *req;
spin_lock_irq(&ctx->ctx_lock);
-@@ -619,6 +621,14 @@ static void free_ioctx_users(struct percpu_ref *ref)
+@@ -619,6 +621,14 @@
percpu_ref_put(&ctx->reqs);
}
@@ -6928,10 +6793,9 @@ index 155f84253f33..dd8d6f234a0b 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 f0d268b97d19..dfbccaefae5d 100644
---- a/fs/autofs4/autofs_i.h
-+++ b/fs/autofs4/autofs_i.h
+diff -Nur linux-4.6.6.orig/fs/autofs4/autofs_i.h linux-4.6.6/fs/autofs4/autofs_i.h
+--- linux-4.6.6.orig/fs/autofs4/autofs_i.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/fs/autofs4/autofs_i.h 2016-08-22 21:27:47.293885419 +0200
@@ -30,6 +30,7 @@
#include <linux/sched.h>
#include <linux/mount.h>
@@ -6940,11 +6804,10 @@ index f0d268b97d19..dfbccaefae5d 100644
#include <asm/current.h>
#include <linux/uaccess.h>
-diff --git a/fs/autofs4/expire.c b/fs/autofs4/expire.c
-index 9510d8d2e9cd..893c87d4f5a9 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.6.6.orig/fs/autofs4/expire.c linux-4.6.6/fs/autofs4/expire.c
+--- linux-4.6.6.orig/fs/autofs4/expire.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/fs/autofs4/expire.c 2016-08-22 21:27:47.293885419 +0200
+@@ -148,7 +148,7 @@
parent = p->d_parent;
if (!spin_trylock(&parent->d_lock)) {
spin_unlock(&p->d_lock);
@@ -6953,11 +6816,10 @@ index 9510d8d2e9cd..893c87d4f5a9 100644
goto relock;
}
spin_unlock(&p->d_lock);
-diff --git a/fs/buffer.c b/fs/buffer.c
-index af0d9a82a8ed..370df12f9df7 100644
---- a/fs/buffer.c
-+++ b/fs/buffer.c
-@@ -300,8 +300,7 @@ static void end_buffer_async_read(struct buffer_head *bh, int uptodate)
+diff -Nur linux-4.6.6.orig/fs/buffer.c linux-4.6.6/fs/buffer.c
+--- linux-4.6.6.orig/fs/buffer.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/fs/buffer.c 2016-08-22 21:27:47.293885419 +0200
+@@ -300,8 +300,7 @@
* decide that the page is now completely done.
*/
first = page_buffers(page);
@@ -6967,7 +6829,7 @@ index af0d9a82a8ed..370df12f9df7 100644
clear_buffer_async_read(bh);
unlock_buffer(bh);
tmp = bh;
-@@ -314,8 +313,7 @@ static void end_buffer_async_read(struct buffer_head *bh, int uptodate)
+@@ -314,8 +313,7 @@
}
tmp = tmp->b_this_page;
} while (tmp != bh);
@@ -6977,7 +6839,7 @@ index af0d9a82a8ed..370df12f9df7 100644
/*
* If none of the buffers had errors and they are all
-@@ -327,9 +325,7 @@ static void end_buffer_async_read(struct buffer_head *bh, int uptodate)
+@@ -327,9 +325,7 @@
return;
still_busy:
@@ -6988,7 +6850,7 @@ index af0d9a82a8ed..370df12f9df7 100644
}
/*
-@@ -357,8 +353,7 @@ void end_buffer_async_write(struct buffer_head *bh, int uptodate)
+@@ -357,8 +353,7 @@
}
first = page_buffers(page);
@@ -6998,7 +6860,7 @@ index af0d9a82a8ed..370df12f9df7 100644
clear_buffer_async_write(bh);
unlock_buffer(bh);
-@@ -370,15 +365,12 @@ void end_buffer_async_write(struct buffer_head *bh, int uptodate)
+@@ -370,15 +365,12 @@
}
tmp = tmp->b_this_page;
}
@@ -7016,7 +6878,7 @@ index af0d9a82a8ed..370df12f9df7 100644
}
EXPORT_SYMBOL(end_buffer_async_write);
-@@ -3314,6 +3306,7 @@ struct buffer_head *alloc_buffer_head(gfp_t gfp_flags)
+@@ -3314,6 +3306,7 @@
struct buffer_head *ret = kmem_cache_zalloc(bh_cachep, gfp_flags);
if (ret) {
INIT_LIST_HEAD(&ret->b_assoc_buffers);
@@ -7024,10 +6886,9 @@ index af0d9a82a8ed..370df12f9df7 100644
preempt_disable();
__this_cpu_inc(bh_accounting.nr);
recalc_bh_state();
-diff --git a/fs/dcache.c b/fs/dcache.c
-index 44008e3fafc4..abc87dc3b8bf 100644
---- a/fs/dcache.c
-+++ b/fs/dcache.c
+diff -Nur linux-4.6.6.orig/fs/dcache.c linux-4.6.6/fs/dcache.c
+--- linux-4.6.6.orig/fs/dcache.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/fs/dcache.c 2016-08-22 21:27:47.297885672 +0200
@@ -19,6 +19,7 @@
#include <linux/mm.h>
#include <linux/fs.h>
@@ -7036,7 +6897,7 @@ index 44008e3fafc4..abc87dc3b8bf 100644
#include <linux/slab.h>
#include <linux/init.h>
#include <linux/hash.h>
-@@ -578,7 +579,7 @@ static struct dentry *dentry_kill(struct dentry *dentry)
+@@ -578,7 +579,7 @@
failed:
spin_unlock(&dentry->d_lock);
@@ -7045,7 +6906,7 @@ index 44008e3fafc4..abc87dc3b8bf 100644
return dentry; /* try again with same dentry */
}
-@@ -2316,7 +2317,7 @@ void d_delete(struct dentry * dentry)
+@@ -2316,7 +2317,7 @@
if (dentry->d_lockref.count == 1) {
if (!spin_trylock(&inode->i_lock)) {
spin_unlock(&dentry->d_lock);
@@ -7054,11 +6915,10 @@ index 44008e3fafc4..abc87dc3b8bf 100644
goto again;
}
dentry->d_flags &= ~DCACHE_CANT_MOUNT;
-diff --git a/fs/eventpoll.c b/fs/eventpoll.c
-index 8a74a2a52e0f..b92f9110a641 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.6.6.orig/fs/eventpoll.c linux-4.6.6/fs/eventpoll.c
+--- linux-4.6.6.orig/fs/eventpoll.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/fs/eventpoll.c 2016-08-22 21:27:47.297885672 +0200
+@@ -510,12 +510,12 @@
*/
static void ep_poll_safewake(wait_queue_head_t *wq)
{
@@ -7073,11 +6933,10 @@ index 8a74a2a52e0f..b92f9110a641 100644
}
static void ep_remove_wait_queue(struct eppoll_entry *pwq)
-diff --git a/fs/exec.c b/fs/exec.c
-index c4010b8207a1..879fd0772b78 100644
---- a/fs/exec.c
-+++ b/fs/exec.c
-@@ -961,12 +961,14 @@ static int exec_mmap(struct mm_struct *mm)
+diff -Nur linux-4.6.6.orig/fs/exec.c linux-4.6.6/fs/exec.c
+--- linux-4.6.6.orig/fs/exec.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/fs/exec.c 2016-08-22 21:27:47.301885933 +0200
+@@ -961,12 +961,14 @@
}
}
task_lock(tsk);
@@ -7092,11 +6951,10 @@ index c4010b8207a1..879fd0772b78 100644
task_unlock(tsk);
if (old_mm) {
up_read(&old_mm->mmap_sem);
-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.6.6.orig/fs/jbd2/checkpoint.c linux-4.6.6/fs/jbd2/checkpoint.c
+--- linux-4.6.6.orig/fs/jbd2/checkpoint.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/fs/jbd2/checkpoint.c 2016-08-22 21:27:47.301885933 +0200
+@@ -116,6 +116,8 @@
nblocks = jbd2_space_needed(journal);
while (jbd2_log_space_left(journal) < nblocks) {
write_unlock(&journal->j_state_lock);
@@ -7105,10 +6963,9 @@ index 684996c8a3a4..6e18a06aaabe 100644
mutex_lock(&journal->j_checkpoint_mutex);
/*
-diff --git a/fs/namespace.c b/fs/namespace.c
-index 783004af5707..ff8492bd3de7 100644
---- a/fs/namespace.c
-+++ b/fs/namespace.c
+diff -Nur linux-4.6.6.orig/fs/namespace.c linux-4.6.6/fs/namespace.c
+--- linux-4.6.6.orig/fs/namespace.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/fs/namespace.c 2016-08-22 21:27:47.301885933 +0200
@@ -14,6 +14,7 @@
#include <linux/mnt_namespace.h>
#include <linux/user_namespace.h>
@@ -7117,7 +6974,7 @@ index 783004af5707..ff8492bd3de7 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();
@@ -7131,11 +6988,10 @@ index 783004af5707..ff8492bd3de7 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/ntfs/aops.c b/fs/ntfs/aops.c
-index 97768a1379f2..6d2ea1af146b 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.6.6.orig/fs/ntfs/aops.c linux-4.6.6/fs/ntfs/aops.c
+--- linux-4.6.6.orig/fs/ntfs/aops.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/fs/ntfs/aops.c 2016-08-22 21:27:47.305886186 +0200
+@@ -92,13 +92,13 @@
ofs = 0;
if (file_ofs < init_size)
ofs = init_size - file_ofs;
@@ -7151,7 +7007,7 @@ index 97768a1379f2..6d2ea1af146b 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);
@@ -7161,7 +7017,7 @@ index 97768a1379f2..6d2ea1af146b 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);
@@ -7171,7 +7027,7 @@ index 97768a1379f2..6d2ea1af146b 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);
@@ -7187,7 +7043,7 @@ index 97768a1379f2..6d2ea1af146b 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:
@@ -7198,11 +7054,10 @@ index 97768a1379f2..6d2ea1af146b 100644
}
/**
-diff --git a/fs/timerfd.c b/fs/timerfd.c
-index 053818dd6c18..c4bc14fe0085 100644
---- a/fs/timerfd.c
-+++ b/fs/timerfd.c
-@@ -450,7 +450,10 @@ static int do_timerfd_settime(int ufd, int flags,
+diff -Nur linux-4.6.6.orig/fs/timerfd.c linux-4.6.6/fs/timerfd.c
+--- linux-4.6.6.orig/fs/timerfd.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/fs/timerfd.c 2016-08-22 21:27:47.305886186 +0200
+@@ -450,7 +450,10 @@
break;
}
spin_unlock_irq(&ctx->wqh.lock);
@@ -7214,10 +7069,9 @@ index 053818dd6c18..c4bc14fe0085 100644
}
/*
-diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h
-index 45c2d6528829..794eead4f075 100644
---- a/include/acpi/platform/aclinux.h
-+++ b/include/acpi/platform/aclinux.h
+diff -Nur linux-4.6.6.orig/include/acpi/platform/aclinux.h linux-4.6.6/include/acpi/platform/aclinux.h
+--- linux-4.6.6.orig/include/acpi/platform/aclinux.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/acpi/platform/aclinux.h 2016-08-22 21:27:47.305886186 +0200
@@ -127,6 +127,7 @@
#define acpi_cache_t struct kmem_cache
@@ -7247,11 +7101,10 @@ index 45c2d6528829..794eead4f075 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.6.6.orig/include/asm-generic/bug.h linux-4.6.6/include/asm-generic/bug.h
+--- linux-4.6.6.orig/include/asm-generic/bug.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/asm-generic/bug.h 2016-08-22 21:27:47.305886186 +0200
+@@ -215,6 +215,20 @@
# define WARN_ON_SMP(x) ({0;})
#endif
@@ -7272,10 +7125,9 @@ index 6f96247226a4..fa53a21263c2 100644
#endif /* __ASSEMBLY__ */
#endif
-diff --git a/include/asm-generic/preempt.h b/include/asm-generic/preempt.h
-index 5d8ffa3e6f8c..c1cde3577551 100644
---- a/include/asm-generic/preempt.h
-+++ b/include/asm-generic/preempt.h
+diff -Nur linux-4.6.6.orig/include/asm-generic/preempt.h linux-4.6.6/include/asm-generic/preempt.h
+--- linux-4.6.6.orig/include/asm-generic/preempt.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/asm-generic/preempt.h 2016-08-22 21:27:47.305886186 +0200
@@ -7,10 +7,10 @@
static __always_inline int preempt_count(void)
@@ -7289,23 +7141,10 @@ index 5d8ffa3e6f8c..c1cde3577551 100644
{
return &current_thread_info()->preempt_count;
}
-diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h
-index 9ac9799b702b..05fc2492131a 100644
---- a/include/linux/blk-mq.h
-+++ b/include/linux/blk-mq.h
-@@ -218,6 +218,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 669e419d6234..6678028d8508 100644
---- a/include/linux/blkdev.h
-+++ b/include/linux/blkdev.h
-@@ -90,6 +90,7 @@ struct request {
+diff -Nur linux-4.6.6.orig/include/linux/blkdev.h linux-4.6.6/include/linux/blkdev.h
+--- linux-4.6.6.orig/include/linux/blkdev.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/linux/blkdev.h 2016-08-22 21:27:47.309886446 +0200
+@@ -90,6 +90,7 @@
struct list_head queuelist;
union {
struct call_single_data csd;
@@ -7313,7 +7152,7 @@ index 669e419d6234..6678028d8508 100644
unsigned long fifo_time;
};
-@@ -457,7 +458,7 @@ struct request_queue {
+@@ -457,7 +458,7 @@
struct throtl_data *td;
#endif
struct rcu_head rcu_head;
@@ -7322,10 +7161,20 @@ index 669e419d6234..6678028d8508 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.6.6.orig/include/linux/blk-mq.h linux-4.6.6/include/linux/blk-mq.h
+--- linux-4.6.6.orig/include/linux/blk-mq.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/linux/blk-mq.h 2016-08-22 21:27:47.305886186 +0200
+@@ -218,6 +218,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.6.6.orig/include/linux/bottom_half.h linux-4.6.6/include/linux/bottom_half.h
+--- linux-4.6.6.orig/include/linux/bottom_half.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/linux/bottom_half.h 2016-08-22 21:27:47.309886446 +0200
@@ -3,6 +3,39 @@
#include <linux/preempt.h>
@@ -7366,18 +7215,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 d48daa3f6f20..91588cd809ce 100644
---- a/include/linux/buffer_head.h
-+++ b/include/linux/buffer_head.h
-@@ -75,8 +75,50 @@ struct buffer_head {
+diff -Nur linux-4.6.6.orig/include/linux/buffer_head.h linux-4.6.6/include/linux/buffer_head.h
+--- linux-4.6.6.orig/include/linux/buffer_head.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/linux/buffer_head.h 2016-08-22 21:27:47.309886446 +0200
+@@ -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 */
@@ -7428,10 +7276,9 @@ index d48daa3f6f20..91588cd809ce 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.6.6.orig/include/linux/cgroup-defs.h linux-4.6.6/include/linux/cgroup-defs.h
+--- linux-4.6.6.orig/include/linux/cgroup-defs.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/linux/cgroup-defs.h 2016-08-22 21:27:47.309886446 +0200
@@ -16,6 +16,7 @@
#include <linux/percpu-refcount.h>
#include <linux/percpu-rwsem.h>
@@ -7440,7 +7287,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;
@@ -7448,10 +7295,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.6.6.orig/include/linux/completion.h linux-4.6.6/include/linux/completion.h
+--- linux-4.6.6.orig/include/linux/completion.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/linux/completion.h 2016-08-22 21:27:47.309886446 +0200
@@ -7,8 +7,7 @@
* Atomic wait-for-completion handler data structures.
* See kernel/sched/completion.c for details.
@@ -7476,7 +7322,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;
@@ -7485,11 +7331,10 @@ index 5d5aaae3af43..3bca1590e29f 100644
}
/**
-diff --git a/include/linux/cpu.h b/include/linux/cpu.h
-index f9b1fab4388a..d4cc4818d13e 100644
---- a/include/linux/cpu.h
-+++ b/include/linux/cpu.h
-@@ -230,6 +230,8 @@ extern void get_online_cpus(void);
+diff -Nur linux-4.6.6.orig/include/linux/cpu.h linux-4.6.6/include/linux/cpu.h
+--- linux-4.6.6.orig/include/linux/cpu.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/linux/cpu.h 2016-08-22 21:27:47.309886446 +0200
+@@ -230,6 +230,8 @@
extern void put_online_cpus(void);
extern void cpu_hotplug_disable(void);
extern void cpu_hotplug_enable(void);
@@ -7498,7 +7343,7 @@ index f9b1fab4388a..d4cc4818d13e 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)
-@@ -247,6 +249,8 @@ static inline void cpu_hotplug_done(void) {}
+@@ -247,6 +249,8 @@
#define put_online_cpus() do { } while (0)
#define cpu_hotplug_disable() do { } while (0)
#define cpu_hotplug_enable() do { } while (0)
@@ -7507,11 +7352,10 @@ index f9b1fab4388a..d4cc4818d13e 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/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.6.6.orig/include/linux/delay.h linux-4.6.6/include/linux/delay.h
+--- linux-4.6.6.orig/include/linux/delay.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/linux/delay.h 2016-08-22 21:27:47.309886446 +0200
+@@ -52,4 +52,10 @@
msleep(seconds * 1000);
}
@@ -7522,10 +7366,9 @@ index a6ecb34cf547..37caab306336 100644
+#endif
+
#endif /* defined(_LINUX_DELAY_H) */
-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.6.6.orig/include/linux/highmem.h linux-4.6.6/include/linux/highmem.h
+--- linux-4.6.6.orig/include/linux/highmem.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/linux/highmem.h 2016-08-22 21:27:47.309886446 +0200
@@ -7,6 +7,7 @@
#include <linux/mm.h>
#include <linux/uaccess.h>
@@ -7534,7 +7377,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)
{
@@ -7543,7 +7386,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();
@@ -7552,7 +7395,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)
@@ -7608,11 +7451,10 @@ index bb3f3297062a..a117a33ef72c 100644
#endif
}
-diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h
-index c98c6539e2c2..573ffbce6ab7 100644
---- a/include/linux/hrtimer.h
-+++ b/include/linux/hrtimer.h
-@@ -87,6 +87,9 @@ enum hrtimer_restart {
+diff -Nur linux-4.6.6.orig/include/linux/hrtimer.h linux-4.6.6/include/linux/hrtimer.h
+--- linux-4.6.6.orig/include/linux/hrtimer.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/linux/hrtimer.h 2016-08-22 21:27:47.313886699 +0200
+@@ -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)
@@ -7622,7 +7464,7 @@ index c98c6539e2c2..573ffbce6ab7 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;
@@ -7634,7 +7476,7 @@ index c98c6539e2c2..573ffbce6ab7 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;
};
@@ -7646,7 +7488,7 @@ index c98c6539e2c2..573ffbce6ab7 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
@@ -7654,7 +7496,7 @@ index c98c6539e2c2..573ffbce6ab7 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;
@@ -7662,7 +7504,7 @@ index c98c6539e2c2..573ffbce6ab7 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;
@@ -7670,7 +7512,7 @@ index c98c6539e2c2..573ffbce6ab7 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
@@ -7680,7 +7522,7 @@ index c98c6539e2c2..573ffbce6ab7 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);
}
@@ -7694,7 +7536,7 @@ index c98c6539e2c2..573ffbce6ab7 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
*/
@@ -7703,11 +7545,10 @@ index c98c6539e2c2..573ffbce6ab7 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.6.6.orig/include/linux/idr.h linux-4.6.6/include/linux/idr.h
+--- linux-4.6.6.orig/include/linux/idr.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/linux/idr.h 2016-08-22 21:27:47.313886699 +0200
+@@ -95,10 +95,14 @@
* Each idr_preload() should be matched with an invocation of this
* function. See idr_preload() for details.
*/
@@ -7722,11 +7563,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 f2cb8d45513d..60fadde71a44 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.6.6.orig/include/linux/init_task.h linux-4.6.6/include/linux/init_task.h
+--- linux-4.6.6.orig/include/linux/init_task.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/linux/init_task.h 2016-08-22 21:27:47.313886699 +0200
+@@ -148,6 +148,12 @@
# define INIT_PERF_EVENTS(tsk)
#endif
@@ -7739,7 +7579,7 @@ index f2cb8d45513d..60fadde71a44 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 */ \
@@ -7747,10 +7587,9 @@ index f2cb8d45513d..60fadde71a44 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 9fcabeb07787..e6f7e42c8253 100644
---- a/include/linux/interrupt.h
-+++ b/include/linux/interrupt.h
+diff -Nur linux-4.6.6.orig/include/linux/interrupt.h linux-4.6.6/include/linux/interrupt.h
+--- linux-4.6.6.orig/include/linux/interrupt.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/linux/interrupt.h 2016-08-22 21:27:47.313886699 +0200
@@ -61,6 +61,7 @@
* interrupt handler after suspending interrupts. For system
* wakeup devices users need to implement wakeup detection in
@@ -7767,7 +7606,7 @@ index 9fcabeb07787..e6f7e42c8253 100644
#define IRQF_TIMER (__IRQF_TIMER | IRQF_NO_SUSPEND | IRQF_NO_THREAD)
-@@ -196,7 +198,7 @@ extern void devm_free_irq(struct device *dev, unsigned int irq, void *dev_id);
+@@ -196,7 +198,7 @@
#ifdef CONFIG_LOCKDEP
# define local_irq_enable_in_hardirq() do { } while (0)
#else
@@ -7776,7 +7615,7 @@ index 9fcabeb07787..e6f7e42c8253 100644
#endif
extern void disable_irq_nosync(unsigned int irq);
-@@ -217,6 +219,7 @@ extern void resume_device_irqs(void);
+@@ -217,6 +219,7 @@
* @irq: Interrupt to which notification applies
* @kref: Reference count, for internal use
* @work: Work item, for internal use
@@ -7784,7 +7623,7 @@ index 9fcabeb07787..e6f7e42c8253 100644
* @notify: Function to be called on change. This will be
* called in process context.
* @release: Function to be called on release. This will be
-@@ -228,6 +231,7 @@ struct irq_affinity_notify {
+@@ -228,6 +231,7 @@
unsigned int irq;
struct kref kref;
struct work_struct work;
@@ -7792,7 +7631,7 @@ index 9fcabeb07787..e6f7e42c8253 100644
void (*notify)(struct irq_affinity_notify *, const cpumask_t *mask);
void (*release)(struct kref *ref);
};
-@@ -390,9 +394,13 @@ extern int irq_set_irqchip_state(unsigned int irq, enum irqchip_irq_state which,
+@@ -390,9 +394,13 @@
bool state);
#ifdef CONFIG_IRQ_FORCED_THREADING
@@ -7807,7 +7646,7 @@ index 9fcabeb07787..e6f7e42c8253 100644
#endif
#ifndef __ARCH_SET_SOFTIRQ_PENDING
-@@ -449,9 +457,10 @@ struct softirq_action
+@@ -449,9 +457,10 @@
void (*action)(struct softirq_action *);
};
@@ -7819,7 +7658,7 @@ index 9fcabeb07787..e6f7e42c8253 100644
#ifdef __ARCH_HAS_DO_SOFTIRQ
void do_softirq_own_stack(void);
#else
-@@ -460,13 +469,25 @@ static inline void do_softirq_own_stack(void)
+@@ -460,13 +469,25 @@
__do_softirq();
}
#endif
@@ -7845,7 +7684,7 @@ index 9fcabeb07787..e6f7e42c8253 100644
DECLARE_PER_CPU(struct task_struct *, ksoftirqd);
-@@ -488,8 +509,9 @@ static inline struct task_struct *this_cpu_ksoftirqd(void)
+@@ -488,8 +509,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.
@@ -7857,7 +7696,7 @@ index 9fcabeb07787..e6f7e42c8253 100644
* Tasklet is strictly serialized wrt itself, but not
wrt another tasklets. If client needs some intertask synchronization,
he makes it with spinlocks.
-@@ -514,27 +536,36 @@ struct tasklet_struct name = { NULL, 0, ATOMIC_INIT(1), func, data }
+@@ -514,27 +536,36 @@
enum
{
TASKLET_STATE_SCHED, /* Tasklet is scheduled for execution */
@@ -7900,7 +7739,7 @@ index 9fcabeb07787..e6f7e42c8253 100644
#define tasklet_unlock_wait(t) do { } while (0)
#define tasklet_unlock(t) do { } while (0)
#endif
-@@ -583,12 +614,7 @@ static inline void tasklet_disable(struct tasklet_struct *t)
+@@ -583,12 +614,7 @@
smp_mb();
}
@@ -7914,7 +7753,7 @@ index 9fcabeb07787..e6f7e42c8253 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,
-@@ -619,6 +645,12 @@ void tasklet_hrtimer_cancel(struct tasklet_hrtimer *ttimer)
+@@ -619,6 +645,12 @@
tasklet_kill(&ttimer->tasklet);
}
@@ -7927,62 +7766,10 @@ index 9fcabeb07787..e6f7e42c8253 100644
/*
* Autoprobing for irqs:
*
-diff --git a/include/linux/irq.h b/include/linux/irq.h
-index c4de62348ff2..7432b5e3d79c 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 dcca77c4b9d2..edb6573c9e0e 100644
---- a/include/linux/irqdesc.h
-+++ b/include/linux/irqdesc.h
-@@ -64,6 +64,7 @@ struct irq_desc {
+diff -Nur linux-4.6.6.orig/include/linux/irqdesc.h linux-4.6.6/include/linux/irqdesc.h
+--- linux-4.6.6.orig/include/linux/irqdesc.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/linux/irqdesc.h 2016-08-22 21:27:47.313886699 +0200
+@@ -64,6 +64,7 @@
unsigned int irqs_unhandled;
atomic_t threads_handled;
int threads_handled_last;
@@ -7990,10 +7777,9 @@ index dcca77c4b9d2..edb6573c9e0e 100644
raw_spinlock_t lock;
struct cpumask *percpu_enabled;
#ifdef CONFIG_SMP
-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.6.6.orig/include/linux/irqflags.h linux-4.6.6/include/linux/irqflags.h
+--- linux-4.6.6.orig/include/linux/irqflags.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/linux/irqflags.h 2016-08-22 21:27:47.317886959 +0200
@@ -25,8 +25,6 @@
# define trace_softirqs_enabled(p) ((p)->softirqs_enabled)
# define trace_hardirq_enter() do { current->hardirq_context++; } while (0)
@@ -8044,11 +7830,59 @@ index 5dd1272d1ab2..9b77034f7c5e 100644
+#endif
+
#endif
-diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h
-index fd1083c46c61..1485e18b9c3b 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.6.6.orig/include/linux/irq.h linux-4.6.6/include/linux/irq.h
+--- linux-4.6.6.orig/include/linux/irq.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/linux/irq.h 2016-08-22 21:27:47.313886699 +0200
+@@ -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.6.6.orig/include/linux/irq_work.h linux-4.6.6/include/linux/irq_work.h
+--- linux-4.6.6.orig/include/linux/irq_work.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/linux/irq_work.h 2016-08-22 21:27:47.313886699 +0200
+@@ -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.6.6.orig/include/linux/jbd2.h linux-4.6.6/include/linux/jbd2.h
+--- linux-4.6.6.orig/include/linux/jbd2.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/linux/jbd2.h 2016-08-22 21:27:47.317886959 +0200
+@@ -347,32 +347,56 @@
static inline void jbd_lock_bh_state(struct buffer_head *bh)
{
@@ -8105,11 +7939,10 @@ index fd1083c46c61..1485e18b9c3b 100644
}
#define J_ASSERT(assert) BUG_ON(!(assert))
-diff --git a/include/linux/kdb.h b/include/linux/kdb.h
-index a19bcf9e762e..897495386446 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.6.6.orig/include/linux/kdb.h linux-4.6.6/include/linux/kdb.h
+--- linux-4.6.6.orig/include/linux/kdb.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/linux/kdb.h 2016-08-22 21:27:47.317886959 +0200
+@@ -167,6 +167,7 @@
extern __printf(1, 2) int kdb_printf(const char *, ...);
typedef __printf(1, 2) int (*kdb_printf_t)(const char *, ...);
@@ -8117,7 +7950,7 @@ index a19bcf9e762e..897495386446 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; }
@@ -8125,11 +7958,10 @@ index a19bcf9e762e..897495386446 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 2f7775e229b0..a7f8e266ab50 100644
---- a/include/linux/kernel.h
-+++ b/include/linux/kernel.h
-@@ -188,6 +188,9 @@ extern int _cond_resched(void);
+diff -Nur linux-4.6.6.orig/include/linux/kernel.h linux-4.6.6/include/linux/kernel.h
+--- linux-4.6.6.orig/include/linux/kernel.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/linux/kernel.h 2016-08-22 21:27:47.317886959 +0200
+@@ -188,6 +188,9 @@
*/
# define might_sleep() \
do { __might_sleep(__FILE__, __LINE__, 0); might_resched(); } while (0)
@@ -8139,7 +7971,7 @@ index 2f7775e229b0..a7f8e266ab50 100644
# define sched_annotate_sleep() (current->task_state_change = 0)
#else
static inline void ___might_sleep(const char *file, int line,
-@@ -195,6 +198,7 @@ extern int _cond_resched(void);
+@@ -195,6 +198,7 @@
static inline void __might_sleep(const char *file, int line,
int preempt_offset) { }
# define might_sleep() do { might_resched(); } while (0)
@@ -8147,7 +7979,7 @@ index 2f7775e229b0..a7f8e266ab50 100644
# define sched_annotate_sleep() do { } while (0)
#endif
-@@ -484,6 +488,7 @@ extern enum system_states {
+@@ -484,6 +488,7 @@
SYSTEM_HALT,
SYSTEM_POWER_OFF,
SYSTEM_RESTART,
@@ -8155,10 +7987,9 @@ index 2f7775e229b0..a7f8e266ab50 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.6.6.orig/include/linux/lglock.h linux-4.6.6/include/linux/lglock.h
+--- linux-4.6.6.orig/include/linux/lglock.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/linux/lglock.h 2016-08-22 21:27:47.317886959 +0200
@@ -34,13 +34,30 @@
#endif
@@ -8190,7 +8021,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 }
@@ -8198,7 +8029,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);
@@ -8211,31 +8042,9 @@ index c92ebd100d9b..6f035f635d0e 100644
#else
/* When !CONFIG_SMP, map lglock to spinlock */
#define lglock spinlock
-diff --git a/include/linux/list.h b/include/linux/list.h
-index 5356f4d661a7..3df0783a25e4 100644
---- a/include/linux/list.h
-+++ b/include/linux/list.h
-@@ -679,6 +679,16 @@ static inline bool hlist_fake(struct hlist_node *h)
- }
-
- /*
-+ * Check whether the node is the only node of the head without
-+ * accessing head.
-+ */
-+static inline bool hlist_is_singular_node(struct hlist_node *n,
-+ struct hlist_head *h)
-+{
-+ return !n->next && n->pprev == &h->first;
-+}
-+
-+/*
- * Move a list from one list head to another. Fixup the pprev
- * reference of the first entry if it exists.
- */
-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.6.6.orig/include/linux/list_bl.h linux-4.6.6/include/linux/list_bl.h
+--- linux-4.6.6.orig/include/linux/list_bl.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/linux/list_bl.h 2016-08-22 21:27:47.321887212 +0200
@@ -2,6 +2,7 @@
#define _LINUX_LIST_BL_H
@@ -8271,7 +8080,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)
{
@@ -8298,11 +8107,29 @@ 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.6.6.orig/include/linux/list.h linux-4.6.6/include/linux/list.h
+--- linux-4.6.6.orig/include/linux/list.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/linux/list.h 2016-08-22 21:27:47.317886959 +0200
+@@ -679,6 +679,16 @@
+ }
+
+ /*
++ * Check whether the node is the only node of the head without
++ * accessing head.
++ */
++static inline bool hlist_is_singular_node(struct hlist_node *n,
++ struct hlist_head *h)
++{
++ return !n->next && n->pprev == &h->first;
++}
++
++/*
+ * Move a list from one list head to another. Fixup the pprev
+ * reference of the first entry if it exists.
+ */
+diff -Nur linux-4.6.6.orig/include/linux/locallock.h linux-4.6.6/include/linux/locallock.h
+--- linux-4.6.6.orig/include/linux/locallock.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.6.6/include/linux/locallock.h 2016-08-22 21:27:47.321887212 +0200
@@ -0,0 +1,278 @@
+#ifndef _LINUX_LOCALLOCK_H
+#define _LINUX_LOCALLOCK_H
@@ -8582,10 +8409,9 @@ index 000000000000..845c77f1a5ca
+#endif
+
+#endif
-diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
-index c2d75b4fa86c..8349504e0bbe 100644
---- a/include/linux/mm_types.h
-+++ b/include/linux/mm_types.h
+diff -Nur linux-4.6.6.orig/include/linux/mm_types.h linux-4.6.6/include/linux/mm_types.h
+--- linux-4.6.6.orig/include/linux/mm_types.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/linux/mm_types.h 2016-08-22 21:27:47.321887212 +0200
@@ -11,6 +11,7 @@
#include <linux/completion.h>
#include <linux/cpumask.h>
@@ -8594,7 +8420,7 @@ index c2d75b4fa86c..8349504e0bbe 100644
#include <linux/page-flags-layout.h>
#include <asm/page.h>
#include <asm/mmu.h>
-@@ -502,6 +503,9 @@ struct mm_struct {
+@@ -502,6 +503,9 @@
bool tlb_flush_pending;
#endif
struct uprobes_state uprobes_state;
@@ -8604,10 +8430,9 @@ index c2d75b4fa86c..8349504e0bbe 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.6.6.orig/include/linux/mutex.h linux-4.6.6/include/linux/mutex.h
+--- linux-4.6.6.orig/include/linux/mutex.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/linux/mutex.h 2016-08-22 21:27:47.321887212 +0200
@@ -19,6 +19,17 @@
#include <asm/processor.h>
#include <linux/osq_lock.h>
@@ -8626,7 +8451,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
@@ -8640,7 +8465,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);
@@ -8649,11 +8474,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.6.6.orig/include/linux/mutex_rt.h linux-4.6.6/include/linux/mutex_rt.h
+--- linux-4.6.6.orig/include/linux/mutex_rt.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.6.6/include/linux/mutex_rt.h 2016-08-22 21:27:47.321887212 +0200
@@ -0,0 +1,84 @@
+#ifndef __LINUX_MUTEX_RT_H
+#define __LINUX_MUTEX_RT_H
@@ -8739,11 +8562,10 @@ index 000000000000..c38a44b14da5
+} while (0)
+
+#endif
-diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
-index 78181a88903b..06863e4f1172 100644
---- a/include/linux/netdevice.h
-+++ b/include/linux/netdevice.h
-@@ -2396,11 +2396,20 @@ void netdev_freemem(struct net_device *dev);
+diff -Nur linux-4.6.6.orig/include/linux/netdevice.h linux-4.6.6/include/linux/netdevice.h
+--- linux-4.6.6.orig/include/linux/netdevice.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/linux/netdevice.h 2016-08-22 21:27:47.325887472 +0200
+@@ -2396,11 +2396,20 @@
void synchronize_net(void);
int init_dummy_netdev(struct net_device *dev);
@@ -8764,7 +8586,7 @@ index 78181a88903b..06863e4f1172 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);
-@@ -2776,6 +2785,7 @@ struct softnet_data {
+@@ -2776,6 +2785,7 @@
unsigned int dropped;
struct sk_buff_head input_pkt_queue;
struct napi_struct backlog;
@@ -8772,10 +8594,9 @@ index 78181a88903b..06863e4f1172 100644
};
-diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h
-index 4dd9306c9d56..6b13e8fd0aba 100644
---- a/include/linux/netfilter/x_tables.h
-+++ b/include/linux/netfilter/x_tables.h
+diff -Nur linux-4.6.6.orig/include/linux/netfilter/x_tables.h linux-4.6.6/include/linux/netfilter/x_tables.h
+--- linux-4.6.6.orig/include/linux/netfilter/x_tables.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/linux/netfilter/x_tables.h 2016-08-22 21:27:47.325887472 +0200
@@ -4,6 +4,7 @@
#include <linux/netdevice.h>
@@ -8784,7 +8605,7 @@ index 4dd9306c9d56..6b13e8fd0aba 100644
#include <uapi/linux/netfilter/x_tables.h>
/**
-@@ -292,6 +293,8 @@ void xt_free_table_info(struct xt_table_info *info);
+@@ -292,6 +293,8 @@
*/
DECLARE_PER_CPU(seqcount_t, xt_recseq);
@@ -8793,7 +8614,7 @@ index 4dd9306c9d56..6b13e8fd0aba 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.
-@@ -312,6 +315,9 @@ static inline unsigned int xt_write_recseq_begin(void)
+@@ -312,6 +315,9 @@
{
unsigned int addend;
@@ -8803,7 +8624,7 @@ index 4dd9306c9d56..6b13e8fd0aba 100644
/*
* Low order bit of sequence is set if we already
* called xt_write_recseq_begin().
-@@ -342,6 +348,7 @@ static inline void xt_write_recseq_end(unsigned int addend)
+@@ -342,6 +348,7 @@
/* this is kind of a write_seqcount_end(), but addend is 0 or 1 */
smp_wmb();
__this_cpu_add(xt_recseq.sequence, addend);
@@ -8811,10 +8632,9 @@ index 4dd9306c9d56..6b13e8fd0aba 100644
}
/*
-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.6.6.orig/include/linux/notifier.h linux-4.6.6/include/linux/notifier.h
+--- linux-4.6.6.orig/include/linux/notifier.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/linux/notifier.h 2016-08-22 21:27:47.325887472 +0200
@@ -6,7 +6,7 @@
*
* Alan Cox <Alan.Cox@linux.org>
@@ -8835,7 +8655,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)
@@ -8844,7 +8664,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 }
@@ -8859,7 +8679,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)
@@ -8878,7 +8698,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
@@ -8894,10 +8714,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 4bc6dafb703e..c0b6779d8f67 100644
---- a/include/linux/percpu.h
-+++ b/include/linux/percpu.h
+diff -Nur linux-4.6.6.orig/include/linux/percpu.h linux-4.6.6/include/linux/percpu.h
+--- linux-4.6.6.orig/include/linux/percpu.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/linux/percpu.h 2016-08-22 21:27:47.325887472 +0200
@@ -18,6 +18,35 @@
#define PERCPU_MODULE_RESERVE 0
#endif
@@ -8934,10 +8753,9 @@ index 4bc6dafb703e..c0b6779d8f67 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.6.6.orig/include/linux/pid.h linux-4.6.6/include/linux/pid.h
+--- linux-4.6.6.orig/include/linux/pid.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/linux/pid.h 2016-08-22 21:27:47.325887472 +0200
@@ -2,6 +2,7 @@
#define _LINUX_PID_H
@@ -8946,10 +8764,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.6.6.orig/include/linux/preempt.h linux-4.6.6/include/linux/preempt.h
+--- linux-4.6.6.orig/include/linux/preempt.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/linux/preempt.h 2016-08-22 21:27:47.325887472 +0200
@@ -50,7 +50,11 @@
#define HARDIRQ_OFFSET (1UL << HARDIRQ_SHIFT)
#define NMI_OFFSET (1UL << NMI_SHIFT)
@@ -9000,7 +8817,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)
@@ -9021,7 +8838,7 @@ index 75e4e30677f1..1cfb1cb72354 100644
#ifdef CONFIG_PREEMPT_COUNT
#define preempt_disable() \
-@@ -148,13 +175,25 @@ do { \
+@@ -148,13 +175,25 @@
barrier(); \
} while (0)
@@ -9048,7 +8865,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)
@@ -9062,7 +8879,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()
@@ -9070,7 +8887,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 { \
@@ -9103,11 +8920,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 9ccbdf2c1453..428d6a7fa4e8 100644
---- a/include/linux/printk.h
-+++ b/include/linux/printk.h
-@@ -117,9 +117,11 @@ do { \
+diff -Nur linux-4.6.6.orig/include/linux/printk.h linux-4.6.6/include/linux/printk.h
+--- linux-4.6.6.orig/include/linux/printk.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/linux/printk.h 2016-08-22 21:27:47.329887725 +0200
+@@ -117,9 +117,11 @@
#ifdef CONFIG_EARLY_PRINTK
extern asmlinkage __printf(1, 2)
void early_printk(const char *fmt, ...);
@@ -9119,11 +8935,10 @@ index 9ccbdf2c1453..428d6a7fa4e8 100644
#endif
typedef __printf(1, 0) int (*printk_func_t)(const char *fmt, va_list args);
-diff --git a/include/linux/radix-tree.h b/include/linux/radix-tree.h
-index 51a97ac8bfbf..0608483c91fc 100644
---- a/include/linux/radix-tree.h
-+++ b/include/linux/radix-tree.h
-@@ -294,8 +294,13 @@ radix_tree_gang_lookup(struct radix_tree_root *root, void **results,
+diff -Nur linux-4.6.6.orig/include/linux/radix-tree.h linux-4.6.6/include/linux/radix-tree.h
+--- linux-4.6.6.orig/include/linux/radix-tree.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/linux/radix-tree.h 2016-08-22 21:27:47.329887725 +0200
+@@ -294,8 +294,13 @@
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);
@@ -9137,7 +8952,7 @@ index 51a97ac8bfbf..0608483c91fc 100644
void radix_tree_init(void);
void *radix_tree_tag_set(struct radix_tree_root *root,
unsigned long index, unsigned int tag);
-@@ -320,7 +325,7 @@ unsigned long radix_tree_locate_item(struct radix_tree_root *root, void *item);
+@@ -320,7 +325,7 @@
static inline void radix_tree_preload_end(void)
{
@@ -9146,11 +8961,10 @@ index 51a97ac8bfbf..0608483c91fc 100644
}
/**
-diff --git a/include/linux/random.h b/include/linux/random.h
-index 9c29122037f9..e7f2f8604918 100644
---- a/include/linux/random.h
-+++ b/include/linux/random.h
-@@ -20,7 +20,7 @@ struct random_ready_callback {
+diff -Nur linux-4.6.6.orig/include/linux/random.h linux-4.6.6/include/linux/random.h
+--- linux-4.6.6.orig/include/linux/random.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/linux/random.h 2016-08-22 21:27:47.329887725 +0200
+@@ -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);
@@ -9159,10 +8973,9 @@ index 9c29122037f9..e7f2f8604918 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 b6900099ea81..fdc2e95173e0 100644
---- a/include/linux/rbtree.h
-+++ b/include/linux/rbtree.h
+diff -Nur linux-4.6.6.orig/include/linux/rbtree.h linux-4.6.6/include/linux/rbtree.h
+--- linux-4.6.6.orig/include/linux/rbtree.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/linux/rbtree.h 2016-08-22 21:27:47.329887725 +0200
@@ -31,7 +31,6 @@
#include <linux/kernel.h>
@@ -9171,7 +8984,7 @@ index b6900099ea81..fdc2e95173e0 100644
struct rb_node {
unsigned long __rb_parent_color;
-@@ -86,14 +85,8 @@ static inline void rb_link_node(struct rb_node *node, struct rb_node *parent,
+@@ -86,14 +85,8 @@
*rb_link = node;
}
@@ -9188,11 +9001,10 @@ index b6900099ea81..fdc2e95173e0 100644
#define rb_entry_safe(ptr, type, member) \
({ typeof(ptr) ____ptr = (ptr); \
-diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
-index 2657aff2725b..ea90179fee34 100644
---- a/include/linux/rcupdate.h
-+++ b/include/linux/rcupdate.h
-@@ -177,6 +177,9 @@ void call_rcu(struct rcu_head *head,
+diff -Nur linux-4.6.6.orig/include/linux/rcupdate.h linux-4.6.6/include/linux/rcupdate.h
+--- linux-4.6.6.orig/include/linux/rcupdate.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/linux/rcupdate.h 2016-08-22 21:27:47.329887725 +0200
+@@ -177,6 +177,9 @@
#endif /* #else #ifdef CONFIG_PREEMPT_RCU */
@@ -9202,7 +9014,7 @@ index 2657aff2725b..ea90179fee34 100644
/**
* call_rcu_bh() - Queue an RCU for invocation after a quicker grace period.
* @head: structure to be used for queueing the RCU updates.
-@@ -200,6 +203,7 @@ void call_rcu(struct rcu_head *head,
+@@ -200,6 +203,7 @@
*/
void call_rcu_bh(struct rcu_head *head,
rcu_callback_t func);
@@ -9210,7 +9022,7 @@ index 2657aff2725b..ea90179fee34 100644
/**
* call_rcu_sched() - Queue an RCU for invocation after sched grace period.
-@@ -300,6 +304,11 @@ void synchronize_rcu(void);
+@@ -300,6 +304,11 @@
* types of kernel builds, the rcu_read_lock() nesting depth is unknowable.
*/
#define rcu_preempt_depth() (current->rcu_read_lock_nesting)
@@ -9222,7 +9034,7 @@ index 2657aff2725b..ea90179fee34 100644
#else /* #ifdef CONFIG_PREEMPT_RCU */
-@@ -325,6 +334,8 @@ static inline int rcu_preempt_depth(void)
+@@ -325,6 +334,8 @@
return 0;
}
@@ -9231,7 +9043,7 @@ index 2657aff2725b..ea90179fee34 100644
#endif /* #else #ifdef CONFIG_PREEMPT_RCU */
/* Internal to kernel */
-@@ -498,7 +509,14 @@ extern struct lockdep_map rcu_callback_map;
+@@ -498,7 +509,14 @@
int debug_lockdep_rcu_enabled(void);
int rcu_read_lock_held(void);
@@ -9246,7 +9058,7 @@ index 2657aff2725b..ea90179fee34 100644
/**
* rcu_read_lock_sched_held() - might we be in RCU-sched read-side critical section?
-@@ -946,10 +964,14 @@ static inline void rcu_read_unlock(void)
+@@ -946,10 +964,14 @@
static inline void rcu_read_lock_bh(void)
{
local_bh_disable();
@@ -9261,7 +9073,7 @@ index 2657aff2725b..ea90179fee34 100644
}
/*
-@@ -959,10 +981,14 @@ static inline void rcu_read_lock_bh(void)
+@@ -959,10 +981,14 @@
*/
static inline void rcu_read_unlock_bh(void)
{
@@ -9276,11 +9088,10 @@ index 2657aff2725b..ea90179fee34 100644
local_bh_enable();
}
-diff --git a/include/linux/rcutree.h b/include/linux/rcutree.h
-index ad1eda9fa4da..732192c5da11 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.6.6.orig/include/linux/rcutree.h linux-4.6.6/include/linux/rcutree.h
+--- linux-4.6.6.orig/include/linux/rcutree.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/linux/rcutree.h 2016-08-22 21:27:47.329887725 +0200
+@@ -44,7 +44,11 @@
rcu_note_context_switch();
}
@@ -9292,7 +9103,7 @@ index ad1eda9fa4da..732192c5da11 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);
@@ -9304,7 +9115,7 @@ index ad1eda9fa4da..732192c5da11 100644
void rcu_barrier_sched(void);
unsigned long get_state_synchronize_rcu(void);
void cond_synchronize_rcu(unsigned long oldstate);
-@@ -85,12 +93,10 @@ unsigned long rcu_batches_started(void);
+@@ -85,12 +93,10 @@
unsigned long rcu_batches_started_bh(void);
unsigned long rcu_batches_started_sched(void);
unsigned long rcu_batches_completed(void);
@@ -9317,7 +9128,7 @@ index ad1eda9fa4da..732192c5da11 100644
void rcu_sched_force_quiescent_state(void);
void rcu_idle_enter(void);
-@@ -107,6 +113,14 @@ extern int rcu_scheduler_active __read_mostly;
+@@ -107,6 +113,14 @@
bool rcu_is_watching(void);
@@ -9332,10 +9143,9 @@ index ad1eda9fa4da..732192c5da11 100644
void rcu_all_qs(void);
#endif /* __LINUX_RCUTREE_H */
-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.6.6.orig/include/linux/rtmutex.h linux-4.6.6/include/linux/rtmutex.h
+--- linux-4.6.6.orig/include/linux/rtmutex.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/linux/rtmutex.h 2016-08-22 21:27:47.329887725 +0200
@@ -13,11 +13,15 @@
#define __LINUX_RT_MUTEX_H
@@ -9353,7 +9163,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;
@@ -9363,7 +9173,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
@@ -9402,7 +9212,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);
@@ -9410,11 +9220,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.6.6.orig/include/linux/rwlock_rt.h linux-4.6.6/include/linux/rwlock_rt.h
+--- linux-4.6.6.orig/include/linux/rwlock_rt.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.6.6/include/linux/rwlock_rt.h 2016-08-22 21:27:47.329887725 +0200
@@ -0,0 +1,99 @@
+#ifndef __LINUX_RWLOCK_RT_H
+#define __LINUX_RWLOCK_RT_H
@@ -9515,10 +9323,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.6.6.orig/include/linux/rwlock_types.h linux-4.6.6/include/linux/rwlock_types.h
+--- linux-4.6.6.orig/include/linux/rwlock_types.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/linux/rwlock_types.h 2016-08-22 21:27:47.329887725 +0200
@@ -1,6 +1,10 @@
#ifndef __LINUX_RWLOCK_TYPES_H
#define __LINUX_RWLOCK_TYPES_H
@@ -9530,11 +9337,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.6.6.orig/include/linux/rwlock_types_rt.h linux-4.6.6/include/linux/rwlock_types_rt.h
+--- linux-4.6.6.orig/include/linux/rwlock_types_rt.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.6.6/include/linux/rwlock_types_rt.h 2016-08-22 21:27:47.333887985 +0200
@@ -0,0 +1,33 @@
+#ifndef __LINUX_RWLOCK_TYPES_RT_H
+#define __LINUX_RWLOCK_TYPES_RT_H
@@ -9569,10 +9374,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 8f498cdde280..2b2148431f14 100644
---- a/include/linux/rwsem.h
-+++ b/include/linux/rwsem.h
+diff -Nur linux-4.6.6.orig/include/linux/rwsem.h linux-4.6.6/include/linux/rwsem.h
+--- linux-4.6.6.orig/include/linux/rwsem.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/linux/rwsem.h 2016-08-22 21:27:47.333887985 +0200
@@ -18,6 +18,10 @@
#include <linux/osq_lock.h>
#endif
@@ -9584,18 +9388,16 @@ index 8f498cdde280..2b2148431f14 100644
struct rw_semaphore;
#ifdef CONFIG_RWSEM_GENERIC_SPINLOCK
-@@ -177,4 +181,6 @@ extern void up_read_non_owner(struct rw_semaphore *sem);
+@@ -177,4 +181,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..f97860b2e2a4
---- /dev/null
-+++ b/include/linux/rwsem_rt.h
+diff -Nur linux-4.6.6.orig/include/linux/rwsem_rt.h linux-4.6.6/include/linux/rwsem_rt.h
+--- linux-4.6.6.orig/include/linux/rwsem_rt.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.6.6/include/linux/rwsem_rt.h 2016-08-22 21:27:47.333887985 +0200
@@ -0,0 +1,152 @@
+#ifndef _LINUX_RWSEM_RT_H
+#define _LINUX_RWSEM_RT_H
@@ -9749,11 +9551,10 @@ index 000000000000..f97860b2e2a4
+}
+#endif
+#endif
-diff --git a/include/linux/sched.h b/include/linux/sched.h
-index 52c4847b05e2..c242cbd84485 100644
---- a/include/linux/sched.h
-+++ b/include/linux/sched.h
-@@ -26,6 +26,7 @@ struct sched_param {
+diff -Nur linux-4.6.6.orig/include/linux/sched.h linux-4.6.6/include/linux/sched.h
+--- linux-4.6.6.orig/include/linux/sched.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/linux/sched.h 2016-08-22 21:27:47.333887985 +0200
+@@ -26,6 +26,7 @@
#include <linux/nodemask.h>
#include <linux/mm_types.h>
#include <linux/preempt.h>
@@ -9761,7 +9562,7 @@ index 52c4847b05e2..c242cbd84485 100644
#include <asm/page.h>
#include <asm/ptrace.h>
-@@ -241,10 +242,7 @@ extern char ___assert_task_state[1 - 2*!!(
+@@ -241,10 +242,7 @@
TASK_UNINTERRUPTIBLE | __TASK_STOPPED | \
__TASK_TRACED | EXIT_ZOMBIE | EXIT_DEAD)
@@ -9772,7 +9573,7 @@ index 52c4847b05e2..c242cbd84485 100644
#define task_contributes_to_load(task) \
((task->state & TASK_UNINTERRUPTIBLE) != 0 && \
(task->flags & PF_FROZEN) == 0 && \
-@@ -310,6 +308,11 @@ extern char ___assert_task_state[1 - 2*!!(
+@@ -310,6 +308,11 @@
#endif
@@ -9784,7 +9585,7 @@ index 52c4847b05e2..c242cbd84485 100644
/* Task command name length */
#define TASK_COMM_LEN 16
-@@ -981,8 +984,18 @@ struct wake_q_head {
+@@ -981,8 +984,18 @@
struct wake_q_head name = { WAKE_Q_TAIL, &name.first }
extern void wake_q_add(struct wake_q_head *head,
@@ -9805,7 +9606,7 @@ index 52c4847b05e2..c242cbd84485 100644
/*
* sched-domains (multiprocessor balancing) declarations:
-@@ -1393,6 +1406,7 @@ struct tlbflush_unmap_batch {
+@@ -1393,6 +1406,7 @@
struct task_struct {
volatile long state; /* -1 unrunnable, 0 runnable, >0 stopped */
@@ -9813,7 +9614,7 @@ index 52c4847b05e2..c242cbd84485 100644
void *stack;
atomic_t usage;
unsigned int flags; /* per process flags, defined below */
-@@ -1429,6 +1443,12 @@ struct task_struct {
+@@ -1429,6 +1443,12 @@
#endif
unsigned int policy;
@@ -9826,7 +9627,7 @@ index 52c4847b05e2..c242cbd84485 100644
int nr_cpus_allowed;
cpumask_t cpus_allowed;
-@@ -1559,6 +1579,9 @@ struct task_struct {
+@@ -1559,6 +1579,9 @@
struct task_cputime cputime_expires;
struct list_head cpu_timers[3];
@@ -9836,7 +9637,7 @@ index 52c4847b05e2..c242cbd84485 100644
/* process credentials */
const struct cred __rcu *real_cred; /* objective and real subjective task
-@@ -1589,10 +1612,15 @@ struct task_struct {
+@@ -1589,10 +1612,15 @@
/* signal handlers */
struct signal_struct *signal;
struct sighand_struct *sighand;
@@ -9852,7 +9653,7 @@ index 52c4847b05e2..c242cbd84485 100644
unsigned long sas_ss_sp;
size_t sas_ss_size;
-@@ -1820,6 +1848,12 @@ struct task_struct {
+@@ -1820,6 +1848,12 @@
/* bitmask and counter of trace recursion */
unsigned long trace_recursion;
#endif /* CONFIG_TRACING */
@@ -9865,7 +9666,7 @@ index 52c4847b05e2..c242cbd84485 100644
#ifdef CONFIG_KCOV
/* Coverage collection mode enabled for this task (0 if disabled). */
enum kcov_mode kcov_mode;
-@@ -1845,9 +1879,23 @@ struct task_struct {
+@@ -1845,9 +1879,23 @@
unsigned int sequential_io;
unsigned int sequential_io_avg;
#endif
@@ -9889,7 +9690,7 @@ index 52c4847b05e2..c242cbd84485 100644
int pagefault_disabled;
#ifdef CONFIG_MMU
struct task_struct *oom_reaper_list;
-@@ -1868,9 +1916,6 @@ extern int arch_task_struct_size __read_mostly;
+@@ -1868,9 +1916,6 @@
# define arch_task_struct_size (sizeof(struct task_struct))
#endif
@@ -9899,7 +9700,7 @@ index 52c4847b05e2..c242cbd84485 100644
#define TNF_MIGRATED 0x01
#define TNF_NO_GROUP 0x02
#define TNF_SHARED 0x04
-@@ -2060,6 +2105,15 @@ extern struct pid *cad_pid;
+@@ -2060,6 +2105,15 @@
extern void free_task(struct task_struct *tsk);
#define get_task_struct(tsk) do { atomic_inc(&(tsk)->usage); } while(0)
@@ -9915,7 +9716,7 @@ index 52c4847b05e2..c242cbd84485 100644
extern void __put_task_struct(struct task_struct *t);
static inline void put_task_struct(struct task_struct *t)
-@@ -2067,6 +2121,7 @@ static inline void put_task_struct(struct task_struct *t)
+@@ -2067,6 +2121,7 @@
if (atomic_dec_and_test(&t->usage))
__put_task_struct(t);
}
@@ -9923,7 +9724,7 @@ index 52c4847b05e2..c242cbd84485 100644
#ifdef CONFIG_VIRT_CPU_ACCOUNTING_GEN
extern void task_cputime(struct task_struct *t,
-@@ -2105,6 +2160,7 @@ extern void thread_group_cputime_adjusted(struct task_struct *p, cputime_t *ut,
+@@ -2105,6 +2160,7 @@
/*
* Per process flags
*/
@@ -9931,7 +9732,7 @@ index 52c4847b05e2..c242cbd84485 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 */
-@@ -2269,6 +2325,10 @@ extern void do_set_cpus_allowed(struct task_struct *p,
+@@ -2269,6 +2325,10 @@
extern int set_cpus_allowed_ptr(struct task_struct *p,
const struct cpumask *new_mask);
@@ -9942,7 +9743,7 @@ index 52c4847b05e2..c242cbd84485 100644
#else
static inline void do_set_cpus_allowed(struct task_struct *p,
const struct cpumask *new_mask)
-@@ -2281,6 +2341,9 @@ static inline int set_cpus_allowed_ptr(struct task_struct *p,
+@@ -2281,6 +2341,9 @@
return -EINVAL;
return 0;
}
@@ -9952,7 +9753,7 @@ index 52c4847b05e2..c242cbd84485 100644
#endif
#ifdef CONFIG_NO_HZ_COMMON
-@@ -2487,6 +2550,7 @@ extern void xtime_update(unsigned long ticks);
+@@ -2487,6 +2550,7 @@
extern int wake_up_state(struct task_struct *tsk, unsigned int state);
extern int wake_up_process(struct task_struct *tsk);
@@ -9960,7 +9761,7 @@ index 52c4847b05e2..c242cbd84485 100644
extern void wake_up_new_task(struct task_struct *tsk);
#ifdef CONFIG_SMP
extern void kick_process(struct task_struct *tsk);
-@@ -2610,12 +2674,24 @@ extern struct mm_struct * mm_alloc(void);
+@@ -2610,12 +2674,24 @@
/* mmdrop drops the mm and the page tables */
extern void __mmdrop(struct mm_struct *);
@@ -9985,7 +9786,7 @@ index 52c4847b05e2..c242cbd84485 100644
/* mmput gets rid of the mappings and all user-space */
extern void mmput(struct mm_struct *);
/* Grab a reference to a task's mm, if it is not already going away */
-@@ -2933,6 +3009,43 @@ static inline int test_tsk_need_resched(struct task_struct *tsk)
+@@ -2933,6 +3009,43 @@
return unlikely(test_tsk_thread_flag(tsk,TIF_NEED_RESCHED));
}
@@ -10029,7 +9830,7 @@ index 52c4847b05e2..c242cbd84485 100644
static inline int restart_syscall(void)
{
set_tsk_thread_flag(current, TIF_SIGPENDING);
-@@ -2964,6 +3077,51 @@ static inline int signal_pending_state(long state, struct task_struct *p)
+@@ -2964,6 +3077,51 @@
return (state & TASK_INTERRUPTIBLE) || __fatal_signal_pending(p);
}
@@ -10081,7 +9882,7 @@ index 52c4847b05e2..c242cbd84485 100644
/*
* cond_resched() and cond_resched_lock(): latency reduction via
* explicit rescheduling in places that are safe. The return
-@@ -2985,12 +3143,16 @@ extern int __cond_resched_lock(spinlock_t *lock);
+@@ -2985,12 +3143,16 @@
__cond_resched_lock(lock); \
})
@@ -10098,7 +9899,7 @@ index 52c4847b05e2..c242cbd84485 100644
static inline void cond_resched_rcu(void)
{
-@@ -3152,6 +3314,31 @@ static inline void set_task_cpu(struct task_struct *p, unsigned int cpu)
+@@ -3152,6 +3314,31 @@
#endif /* CONFIG_SMP */
@@ -10130,11 +9931,10 @@ index 52c4847b05e2..c242cbd84485 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 e0582106ef4f..b14f4d2368aa 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.6.6.orig/include/linux/seqlock.h linux-4.6.6/include/linux/seqlock.h
+--- linux-4.6.6.orig/include/linux/seqlock.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/linux/seqlock.h 2016-08-22 21:27:47.337888238 +0200
+@@ -220,20 +220,30 @@
return __read_seqcount_retry(s, start);
}
@@ -10169,7 +9969,7 @@ index e0582106ef4f..b14f4d2368aa 100644
/**
* raw_write_seqcount_barrier - do a seq write barrier
* @s: pointer to seqcount_t
-@@ -425,10 +435,32 @@ typedef struct {
+@@ -425,10 +435,32 @@
/*
* Read side functions for starting and finalizing a read side section.
*/
@@ -10202,7 +10002,7 @@ index e0582106ef4f..b14f4d2368aa 100644
static inline unsigned read_seqretry(const seqlock_t *sl, unsigned start)
{
-@@ -443,36 +475,36 @@ static inline unsigned read_seqretry(const seqlock_t *sl, unsigned start)
+@@ -443,36 +475,36 @@
static inline void write_seqlock(seqlock_t *sl)
{
spin_lock(&sl->lock);
@@ -10245,7 +10045,7 @@ index e0582106ef4f..b14f4d2368aa 100644
spin_unlock_irq(&sl->lock);
}
-@@ -481,7 +513,7 @@ static inline unsigned long __write_seqlock_irqsave(seqlock_t *sl)
+@@ -481,7 +513,7 @@
unsigned long flags;
spin_lock_irqsave(&sl->lock, flags);
@@ -10254,7 +10054,7 @@ index e0582106ef4f..b14f4d2368aa 100644
return flags;
}
-@@ -491,7 +523,7 @@ static inline unsigned long __write_seqlock_irqsave(seqlock_t *sl)
+@@ -491,7 +523,7 @@
static inline void
write_sequnlock_irqrestore(seqlock_t *sl, unsigned long flags)
{
@@ -10263,11 +10063,10 @@ index e0582106ef4f..b14f4d2368aa 100644
spin_unlock_irqrestore(&sl->lock, flags);
}
-diff --git a/include/linux/signal.h b/include/linux/signal.h
-index d80259afb9e5..ddd1e6866a54 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.6.6.orig/include/linux/signal.h linux-4.6.6/include/linux/signal.h
+--- linux-4.6.6.orig/include/linux/signal.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/linux/signal.h 2016-08-22 21:27:47.337888238 +0200
+@@ -233,6 +233,7 @@
}
extern void flush_sigqueue(struct sigpending *queue);
@@ -10275,11 +10074,10 @@ index d80259afb9e5..ddd1e6866a54 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 794b924e9669..db2af7c88a6a 100644
---- a/include/linux/skbuff.h
-+++ b/include/linux/skbuff.h
-@@ -283,6 +283,7 @@ struct sk_buff_head {
+diff -Nur linux-4.6.6.orig/include/linux/skbuff.h linux-4.6.6/include/linux/skbuff.h
+--- linux-4.6.6.orig/include/linux/skbuff.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/linux/skbuff.h 2016-08-22 21:27:47.337888238 +0200
+@@ -283,6 +283,7 @@
__u32 qlen;
spinlock_t lock;
@@ -10287,7 +10085,7 @@ index 794b924e9669..db2af7c88a6a 100644
};
struct sk_buff;
-@@ -1538,6 +1539,12 @@ static inline void skb_queue_head_init(struct sk_buff_head *list)
+@@ -1538,6 +1539,12 @@
__skb_queue_head_init(list);
}
@@ -10300,11 +10098,10 @@ index 794b924e9669..db2af7c88a6a 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 c4414074bd88..e6ab36aeaaab 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.6.6.orig/include/linux/smp.h linux-4.6.6/include/linux/smp.h
+--- linux-4.6.6.orig/include/linux/smp.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/linux/smp.h 2016-08-22 21:27:47.341888498 +0200
+@@ -185,6 +185,9 @@
#define get_cpu() ({ preempt_disable(); smp_processor_id(); })
#define put_cpu() preempt_enable()
@@ -10314,11 +10111,23 @@ index c4414074bd88..e6ab36aeaaab 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..b241cc044bd3 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.6.6.orig/include/linux/spinlock_api_smp.h linux-4.6.6/include/linux/spinlock_api_smp.h
+--- linux-4.6.6.orig/include/linux/spinlock_api_smp.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/linux/spinlock_api_smp.h 2016-08-22 21:27:47.341888498 +0200
+@@ -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.6.6.orig/include/linux/spinlock.h linux-4.6.6/include/linux/spinlock.h
+--- linux-4.6.6.orig/include/linux/spinlock.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/linux/spinlock.h 2016-08-22 21:27:47.341888498 +0200
+@@ -271,7 +271,11 @@
#define raw_spin_can_lock(lock) (!raw_spin_is_locked(lock))
/* Include rwlock functions */
@@ -10331,7 +10140,7 @@ index 47dd0cebd204..b241cc044bd3 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
@@ -10342,32 +10151,16 @@ index 47dd0cebd204..b241cc044bd3 100644
/*
* Map the spin_lock functions to the raw variants for PREEMPT_RT=n
*/
-@@ -416,4 +424,6 @@ extern int _atomic_dec_and_lock(atomic_t *atomic, spinlock_t *lock);
+@@ -416,4 +424,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..3b2825537531
---- /dev/null
-+++ b/include/linux/spinlock_rt.h
+diff -Nur linux-4.6.6.orig/include/linux/spinlock_rt.h linux-4.6.6/include/linux/spinlock_rt.h
+--- linux-4.6.6.orig/include/linux/spinlock_rt.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.6.6/include/linux/spinlock_rt.h 2016-08-22 21:27:47.341888498 +0200
@@ -0,0 +1,163 @@
+#ifndef __LINUX_SPINLOCK_RT_H
+#define __LINUX_SPINLOCK_RT_H
@@ -10532,28 +10325,19 @@ index 000000000000..3b2825537531
+ 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.6.6.orig/include/linux/spinlock_types.h linux-4.6.6/include/linux/spinlock_types.h
+--- linux-4.6.6.orig/include/linux/spinlock_types.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/linux/spinlock_types.h 2016-08-22 21:27:47.341888498 +0200
@@ -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 {
@@ -10579,16 +10363,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, \
@@ -10625,11 +10416,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.6.6.orig/include/linux/spinlock_types_nort.h linux-4.6.6/include/linux/spinlock_types_nort.h
+--- linux-4.6.6.orig/include/linux/spinlock_types_nort.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.6.6/include/linux/spinlock_types_nort.h 2016-08-22 21:27:47.341888498 +0200
@@ -0,0 +1,33 @@
+#ifndef __LINUX_SPINLOCK_TYPES_NORT_H
+#define __LINUX_SPINLOCK_TYPES_NORT_H
@@ -10664,11 +10453,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.6.6.orig/include/linux/spinlock_types_raw.h linux-4.6.6/include/linux/spinlock_types_raw.h
+--- linux-4.6.6.orig/include/linux/spinlock_types_raw.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.6.6/include/linux/spinlock_types_raw.h 2016-08-22 21:27:47.341888498 +0200
@@ -0,0 +1,56 @@
+#ifndef __LINUX_SPINLOCK_TYPES_RAW_H
+#define __LINUX_SPINLOCK_TYPES_RAW_H
@@ -10726,11 +10513,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.6.6.orig/include/linux/spinlock_types_rt.h linux-4.6.6/include/linux/spinlock_types_rt.h
+--- linux-4.6.6.orig/include/linux/spinlock_types_rt.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.6.6/include/linux/spinlock_types_rt.h 2016-08-22 21:27:47.341888498 +0200
@@ -0,0 +1,48 @@
+#ifndef __LINUX_SPINLOCK_TYPES_RT_H
+#define __LINUX_SPINLOCK_TYPES_RT_H
@@ -10780,11 +10565,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.6.6.orig/include/linux/srcu.h linux-4.6.6/include/linux/srcu.h
+--- linux-4.6.6.orig/include/linux/srcu.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/linux/srcu.h 2016-08-22 21:27:47.341888498 +0200
+@@ -84,10 +84,10 @@
void process_srcu(struct work_struct *work);
@@ -10797,7 +10581,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);\
@@ -10806,11 +10590,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 8b6ec7ef0854..9b77d4cc929f 100644
---- a/include/linux/suspend.h
-+++ b/include/linux/suspend.h
-@@ -194,6 +194,12 @@ struct platform_freeze_ops {
+diff -Nur linux-4.6.6.orig/include/linux/suspend.h linux-4.6.6/include/linux/suspend.h
+--- linux-4.6.6.orig/include/linux/suspend.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/linux/suspend.h 2016-08-22 21:27:47.345888751 +0200
+@@ -194,6 +194,12 @@
void (*end)(void);
};
@@ -10823,11 +10606,10 @@ index 8b6ec7ef0854..9b77d4cc929f 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.6.6.orig/include/linux/swait.h linux-4.6.6/include/linux/swait.h
+--- linux-4.6.6.orig/include/linux/swait.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/linux/swait.h 2016-08-22 21:27:47.345888751 +0200
+@@ -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);
@@ -10835,10 +10617,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 ad220359f1b0..2b7721949dd5 100644
---- a/include/linux/swap.h
-+++ b/include/linux/swap.h
+diff -Nur linux-4.6.6.orig/include/linux/swap.h linux-4.6.6/include/linux/swap.h
+--- linux-4.6.6.orig/include/linux/swap.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/linux/swap.h 2016-08-22 21:27:47.345888751 +0200
@@ -11,6 +11,7 @@
#include <linux/fs.h>
#include <linux/atomic.h>
@@ -10847,7 +10628,7 @@ index ad220359f1b0..2b7721949dd5 100644
#include <asm/page.h>
struct notifier_block;
-@@ -252,7 +253,8 @@ struct swap_info_struct {
+@@ -252,7 +253,8 @@
void *workingset_eviction(struct address_space *mapping, struct page *page);
bool workingset_refault(void *shadow);
void workingset_activation(struct page *page);
@@ -10857,7 +10638,7 @@ index ad220359f1b0..2b7721949dd5 100644
static inline unsigned int workingset_node_pages(struct radix_tree_node *node)
{
-@@ -295,6 +297,7 @@ extern unsigned long nr_free_pagecache_pages(void);
+@@ -295,6 +297,7 @@
/* linux/mm/swap.c */
@@ -10865,11 +10646,9 @@ index ad220359f1b0..2b7721949dd5 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.6.6.orig/include/linux/swork.h linux-4.6.6/include/linux/swork.h
+--- linux-4.6.6.orig/include/linux/swork.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.6.6/include/linux/swork.h 2016-08-22 21:27:47.345888751 +0200
@@ -0,0 +1,24 @@
+#ifndef _LINUX_SWORK_H
+#define _LINUX_SWORK_H
@@ -10895,11 +10674,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 b4c2a485b28a..5580c2c8410d 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.6.6.orig/include/linux/thread_info.h linux-4.6.6/include/linux/thread_info.h
+--- linux-4.6.6.orig/include/linux/thread_info.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/linux/thread_info.h 2016-08-22 21:27:47.345888751 +0200
+@@ -103,7 +103,17 @@
#define test_thread_flag(flag) \
test_ti_thread_flag(current_thread_info(), flag)
@@ -10918,11 +10696,10 @@ index b4c2a485b28a..5580c2c8410d 100644
#if defined TIF_RESTORE_SIGMASK && !defined HAVE_SET_RESTORE_SIGMASK
/*
-diff --git a/include/linux/timer.h b/include/linux/timer.h
-index 61aa61dc410c..a915acbd0072 100644
---- a/include/linux/timer.h
-+++ b/include/linux/timer.h
-@@ -19,7 +19,6 @@ struct timer_list {
+diff -Nur linux-4.6.6.orig/include/linux/timer.h linux-4.6.6/include/linux/timer.h
+--- linux-4.6.6.orig/include/linux/timer.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/linux/timer.h 2016-08-22 21:27:47.345888751 +0200
+@@ -19,7 +19,6 @@
void (*function)(unsigned long);
unsigned long data;
u32 flags;
@@ -10930,7 +10707,7 @@ index 61aa61dc410c..a915acbd0072 100644
#ifdef CONFIG_TIMER_STATS
int start_pid;
-@@ -58,11 +57,14 @@ struct timer_list {
+@@ -58,11 +57,14 @@
* workqueue locking issues. It's not meant for executing random crap
* with interrupts disabled. Abuse is monitored!
*/
@@ -10948,7 +10725,7 @@ index 61aa61dc410c..a915acbd0072 100644
#define __TIMER_INITIALIZER(_function, _expires, _data, _flags) { \
.entry = { .next = TIMER_ENTRY_STATIC }, \
-@@ -70,7 +72,6 @@ struct timer_list {
+@@ -70,7 +72,6 @@
.expires = (_expires), \
.data = (_data), \
.flags = (_flags), \
@@ -10956,7 +10733,7 @@ index 61aa61dc410c..a915acbd0072 100644
__TIMER_LOCKDEP_MAP_INITIALIZER( \
__FILE__ ":" __stringify(__LINE__)) \
}
-@@ -78,9 +79,15 @@ struct timer_list {
+@@ -78,9 +79,15 @@
#define TIMER_INITIALIZER(_function, _expires, _data) \
__TIMER_INITIALIZER((_function), (_expires), (_data), 0)
@@ -10972,7 +10749,7 @@ index 61aa61dc410c..a915acbd0072 100644
#define DEFINE_TIMER(_name, _function, _expires, _data) \
struct timer_list _name = \
TIMER_INITIALIZER(_function, _expires, _data)
-@@ -124,8 +131,12 @@ static inline void init_timer_on_stack_key(struct timer_list *timer,
+@@ -124,8 +131,12 @@
#define init_timer(timer) \
__init_timer((timer), 0)
@@ -10985,7 +10762,7 @@ index 61aa61dc410c..a915acbd0072 100644
#define init_timer_on_stack(timer) \
__init_timer_on_stack((timer), 0)
-@@ -145,10 +156,20 @@ static inline void init_timer_on_stack_key(struct timer_list *timer,
+@@ -145,10 +156,20 @@
#define setup_timer(timer, fn, data) \
__setup_timer((timer), (fn), (data), 0)
@@ -11006,20 +10783,20 @@ index 61aa61dc410c..a915acbd0072 100644
/**
* timer_pending - is a timer pending?
-@@ -169,12 +190,7 @@ extern void add_timer_on(struct timer_list *timer, int cpu);
+@@ -169,12 +190,7 @@
extern int del_timer(struct timer_list * timer);
extern int mod_timer(struct timer_list *timer, unsigned long expires);
extern int mod_timer_pending(struct timer_list *timer, unsigned long expires);
-extern int mod_timer_pinned(struct timer_list *timer, unsigned long expires);
-
--extern void set_timer_slack(struct timer_list *time, int slack_hz);
-
+-extern void set_timer_slack(struct timer_list *time, int slack_hz);
+
-#define TIMER_NOT_PINNED 0
-#define TIMER_PINNED 1
/*
* The jiffies value which is added to now, when there is no timer
* in the timer wheel:
-@@ -225,7 +241,7 @@ extern void add_timer(struct timer_list *timer);
+@@ -225,7 +241,7 @@
extern int try_to_del_timer_sync(struct timer_list *timer);
@@ -11028,11 +10805,10 @@ index 61aa61dc410c..a915acbd0072 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 0810f81b6db2..682bfdf20f16 100644
---- a/include/linux/trace_events.h
-+++ b/include/linux/trace_events.h
-@@ -56,6 +56,9 @@ struct trace_entry {
+diff -Nur linux-4.6.6.orig/include/linux/trace_events.h linux-4.6.6/include/linux/trace_events.h
+--- linux-4.6.6.orig/include/linux/trace_events.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/linux/trace_events.h 2016-08-22 21:27:47.345888751 +0200
+@@ -56,6 +56,9 @@
unsigned char flags;
unsigned char preempt_count;
int pid;
@@ -11042,11 +10818,10 @@ index 0810f81b6db2..682bfdf20f16 100644
};
#define TRACE_EVENT_TYPE_MAX \
-diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h
-index 349557825428..1d65e4f0668e 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.6.6.orig/include/linux/uaccess.h linux-4.6.6/include/linux/uaccess.h
+--- linux-4.6.6.orig/include/linux/uaccess.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/linux/uaccess.h 2016-08-22 21:27:47.345888751 +0200
+@@ -24,6 +24,7 @@
*/
static inline void pagefault_disable(void)
{
@@ -11054,7 +10829,7 @@ index 349557825428..1d65e4f0668e 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();
@@ -11062,10 +10837,9 @@ index 349557825428..1d65e4f0668e 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.6.6.orig/include/linux/uprobes.h linux-4.6.6/include/linux/uprobes.h
+--- linux-4.6.6.orig/include/linux/uprobes.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/linux/uprobes.h 2016-08-22 21:27:47.345888751 +0200
@@ -27,6 +27,7 @@
#include <linux/errno.h>
#include <linux/rbtree.h>
@@ -11074,11 +10848,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 73fae8c4a5fb..de8a124fd65d 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.6.6.orig/include/linux/vmstat.h linux-4.6.6/include/linux/vmstat.h
+--- linux-4.6.6.orig/include/linux/vmstat.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/linux/vmstat.h 2016-08-22 21:27:47.345888751 +0200
+@@ -33,7 +33,9 @@
*/
static inline void __count_vm_event(enum vm_event_item item)
{
@@ -11088,7 +10861,7 @@ index 73fae8c4a5fb..de8a124fd65d 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)
{
@@ -11098,10 +10871,9 @@ index 73fae8c4a5fb..de8a124fd65d 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 27d7a0ab5da3..7b3542de6db2 100644
---- a/include/linux/wait.h
-+++ b/include/linux/wait.h
+diff -Nur linux-4.6.6.orig/include/linux/wait.h linux-4.6.6/include/linux/wait.h
+--- linux-4.6.6.orig/include/linux/wait.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/linux/wait.h 2016-08-22 21:27:47.349889011 +0200
@@ -8,6 +8,7 @@
#include <linux/spinlock.h>
#include <asm/current.h>
@@ -11110,11 +10882,10 @@ index 27d7a0ab5da3..7b3542de6db2 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 5c98443c1c9e..22b81c7cec27 100644
---- a/include/net/dst.h
-+++ b/include/net/dst.h
-@@ -449,7 +449,7 @@ static inline void dst_confirm(struct dst_entry *dst)
+diff -Nur linux-4.6.6.orig/include/net/dst.h linux-4.6.6/include/net/dst.h
+--- linux-4.6.6.orig/include/net/dst.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/net/dst.h 2016-08-22 21:27:47.349889011 +0200
+@@ -449,7 +449,7 @@
static inline int dst_neigh_output(struct dst_entry *dst, struct neighbour *n,
struct sk_buff *skb)
{
@@ -11123,11 +10894,10 @@ index 5c98443c1c9e..22b81c7cec27 100644
if (dst->pending_confirm) {
unsigned long now = jiffies;
-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.6.6.orig/include/net/neighbour.h linux-4.6.6/include/net/neighbour.h
+--- linux-4.6.6.orig/include/net/neighbour.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/net/neighbour.h 2016-08-22 21:27:47.349889011 +0200
+@@ -446,7 +446,7 @@
}
#endif
@@ -11136,7 +10906,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)
@@ -11145,11 +10915,10 @@ index 8b683841e574..bf656008f6e7 100644
const struct net_device *dev)
{
unsigned int seq;
-diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
-index a69cde3ce460..bee40aadee1f 100644
---- a/include/net/netns/ipv4.h
-+++ b/include/net/netns/ipv4.h
-@@ -70,6 +70,7 @@ struct netns_ipv4 {
+diff -Nur linux-4.6.6.orig/include/net/netns/ipv4.h linux-4.6.6/include/net/netns/ipv4.h
+--- linux-4.6.6.orig/include/net/netns/ipv4.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/include/net/netns/ipv4.h 2016-08-22 21:27:47.349889011 +0200
+@@ -70,6 +70,7 @@
int sysctl_icmp_echo_ignore_all;
int sysctl_icmp_echo_ignore_broadcasts;
@@ -11157,11 +10926,9 @@ index a69cde3ce460..bee40aadee1f 100644
int sysctl_icmp_ignore_bogus_error_responses;
int sysctl_icmp_ratelimit;
int sysctl_icmp_ratemask;
-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.6.6.orig/include/trace/events/hist.h linux-4.6.6/include/trace/events/hist.h
+--- linux-4.6.6.orig/include/trace/events/hist.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.6.6/include/trace/events/hist.h 2016-08-22 21:27:47.349889011 +0200
@@ -0,0 +1,73 @@
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM hist
@@ -11236,11 +11003,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.6.6.orig/include/trace/events/latency_hist.h linux-4.6.6/include/trace/events/latency_hist.h
+--- linux-4.6.6.orig/include/trace/events/latency_hist.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.6.6/include/trace/events/latency_hist.h 2016-08-22 21:27:47.349889011 +0200
@@ -0,0 +1,29 @@
+#ifndef _LATENCY_HIST_H
+#define _LATENCY_HIST_H
@@ -11271,11 +11036,10 @@ index 000000000000..d3f2fbd560b1
+}
+
+#endif /* _LATENCY_HIST_H */
-diff --git a/init/Kconfig b/init/Kconfig
-index 0dfd09d54c65..a74c5a0d8376 100644
---- a/init/Kconfig
-+++ b/init/Kconfig
-@@ -494,7 +494,7 @@ config TINY_RCU
+diff -Nur linux-4.6.6.orig/init/Kconfig linux-4.6.6/init/Kconfig
+--- linux-4.6.6.orig/init/Kconfig 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/init/Kconfig 2016-08-22 21:27:47.353889264 +0200
+@@ -494,7 +494,7 @@
config RCU_EXPERT
bool "Make expert-level adjustments to RCU configuration"
@@ -11284,7 +11048,7 @@ index 0dfd09d54c65..a74c5a0d8376 100644
help
This option needs to be enabled if you wish to make
expert-level adjustments to RCU configuration. By default,
-@@ -610,7 +610,7 @@ config RCU_FANOUT_LEAF
+@@ -610,7 +610,7 @@
config RCU_FAST_NO_HZ
bool "Accelerate last non-dyntick-idle CPU's grace periods"
@@ -11293,7 +11057,7 @@ index 0dfd09d54c65..a74c5a0d8376 100644
default n
help
This option permits CPUs to enter dynticks-idle state even if
-@@ -637,7 +637,7 @@ config TREE_RCU_TRACE
+@@ -637,7 +637,7 @@
config RCU_BOOST
bool "Enable RCU priority boosting"
depends on RT_MUTEXES && PREEMPT_RCU && RCU_EXPERT
@@ -11302,7 +11066,7 @@ index 0dfd09d54c65..a74c5a0d8376 100644
help
This option boosts the priority of preempted RCU readers that
block the current preemptible RCU grace period for too long.
-@@ -1029,6 +1029,7 @@ config CFS_BANDWIDTH
+@@ -1029,6 +1029,7 @@
config RT_GROUP_SCHED
bool "Group scheduling for SCHED_RR/FIFO"
depends on CGROUP_SCHED
@@ -11310,7 +11074,7 @@ index 0dfd09d54c65..a74c5a0d8376 100644
default n
help
This feature lets you explicitly allocate real CPU bandwidth
-@@ -1717,6 +1718,7 @@ choice
+@@ -1718,6 +1719,7 @@
config SLAB
bool "SLAB"
@@ -11318,7 +11082,7 @@ index 0dfd09d54c65..a74c5a0d8376 100644
help
The regular slab allocator that is established and known to work
well in all environments. It organizes cache hot objects in
-@@ -1735,6 +1737,7 @@ config SLUB
+@@ -1736,6 +1738,7 @@
config SLOB
depends on EXPERT
bool "SLOB (Simple Allocator)"
@@ -11326,7 +11090,7 @@ index 0dfd09d54c65..a74c5a0d8376 100644
help
SLOB replaces the stock allocator with a drastically simpler
allocator. SLOB is generally more space efficient but
-@@ -1744,7 +1747,7 @@ endchoice
+@@ -1745,7 +1748,7 @@
config SLUB_CPU_PARTIAL
default y
@@ -11335,21 +11099,10 @@ index 0dfd09d54c65..a74c5a0d8376 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 b3c6e363ae18..920f9ebd3d95 100644
---- a/init/main.c
-+++ b/init/main.c
-@@ -507,6 +507,7 @@ asmlinkage __visible void __init start_kernel(void)
+diff -Nur linux-4.6.6.orig/init/main.c linux-4.6.6/init/main.c
+--- linux-4.6.6.orig/init/main.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/init/main.c 2016-08-22 21:27:47.353889264 +0200
+@@ -507,6 +507,7 @@
setup_command_line(command_line);
setup_nr_cpu_ids();
setup_per_cpu_areas();
@@ -11357,11 +11110,19 @@ index b3c6e363ae18..920f9ebd3d95 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 1471db9a7e61..b8c5e7f2bebc 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.6.6.orig/init/Makefile linux-4.6.6/init/Makefile
+--- linux-4.6.6.orig/init/Makefile 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/init/Makefile 2016-08-22 21:27:47.353889264 +0200
+@@ -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.6.6.orig/ipc/msg.c linux-4.6.6/ipc/msg.c
+--- linux-4.6.6.orig/ipc/msg.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/ipc/msg.c 2016-08-22 21:27:47.353889264 +0200
+@@ -183,20 +183,14 @@
}
}
@@ -11386,7 +11147,7 @@ index 1471db9a7e61..b8c5e7f2bebc 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);
@@ -11401,7 +11162,7 @@ index 1471db9a7e61..b8c5e7f2bebc 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;
@@ -11409,7 +11170,7 @@ index 1471db9a7e61..b8c5e7f2bebc 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.
*/
@@ -11418,7 +11179,7 @@ index 1471db9a7e61..b8c5e7f2bebc 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);
@@ -11426,7 +11187,7 @@ index 1471db9a7e61..b8c5e7f2bebc 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;
}
@@ -11436,7 +11197,7 @@ index 1471db9a7e61..b8c5e7f2bebc 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) {
@@ -11466,7 +11227,7 @@ index 1471db9a7e61..b8c5e7f2bebc 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;
@@ -11474,7 +11235,7 @@ index 1471db9a7e61..b8c5e7f2bebc 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();
@@ -11483,7 +11244,7 @@ index 1471db9a7e61..b8c5e7f2bebc 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);
@@ -11491,7 +11252,7 @@ index 1471db9a7e61..b8c5e7f2bebc 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:
@@ -11560,11 +11321,10 @@ index 1471db9a7e61..b8c5e7f2bebc 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 b3757ea0694b..981a60ac6b6c 100644
---- a/ipc/sem.c
-+++ b/ipc/sem.c
-@@ -697,6 +697,13 @@ static int perform_atomic_semop(struct sem_array *sma, struct sem_queue *q)
+diff -Nur linux-4.6.6.orig/ipc/sem.c linux-4.6.6/ipc/sem.c
+--- linux-4.6.6.orig/ipc/sem.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/ipc/sem.c 2016-08-22 21:27:47.357889524 +0200
+@@ -697,6 +697,13 @@
static void wake_up_sem_queue_prepare(struct list_head *pt,
struct sem_queue *q, int error)
{
@@ -11578,7 +11338,7 @@ index b3757ea0694b..981a60ac6b6c 100644
if (list_empty(pt)) {
/*
* Hold preempt off so that we don't get preempted and have the
-@@ -708,6 +715,7 @@ static void wake_up_sem_queue_prepare(struct list_head *pt,
+@@ -708,6 +715,7 @@
q->pid = error;
list_add_tail(&q->list, pt);
@@ -11586,7 +11346,7 @@ index b3757ea0694b..981a60ac6b6c 100644
}
/**
-@@ -721,6 +729,7 @@ static void wake_up_sem_queue_prepare(struct list_head *pt,
+@@ -721,6 +729,7 @@
*/
static void wake_up_sem_queue_do(struct list_head *pt)
{
@@ -11594,7 +11354,7 @@ index b3757ea0694b..981a60ac6b6c 100644
struct sem_queue *q, *t;
int did_something;
-@@ -733,6 +742,7 @@ static void wake_up_sem_queue_do(struct list_head *pt)
+@@ -733,6 +742,7 @@
}
if (did_something)
preempt_enable();
@@ -11602,85 +11362,10 @@ index b3757ea0694b..981a60ac6b6c 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/cgroup.c b/kernel/cgroup.c
-index 86cb5c6e8932..3920f49948f8 100644
---- a/kernel/cgroup.c
-+++ b/kernel/cgroup.c
-@@ -5005,10 +5005,10 @@ static void css_free_rcu_fn(struct rcu_head *rcu_head)
+diff -Nur linux-4.6.6.orig/kernel/cgroup.c linux-4.6.6/kernel/cgroup.c
+--- linux-4.6.6.orig/kernel/cgroup.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/cgroup.c 2016-08-22 21:27:47.361889777 +0200
+@@ -5011,10 +5011,10 @@
queue_work(cgroup_destroy_wq, &css->destroy_work);
}
@@ -11693,7 +11378,7 @@ index 86cb5c6e8932..3920f49948f8 100644
struct cgroup_subsys *ss = css->ss;
struct cgroup *cgrp = css->cgroup;
-@@ -5049,8 +5049,8 @@ static void css_release(struct percpu_ref *ref)
+@@ -5055,8 +5055,8 @@
struct cgroup_subsys_state *css =
container_of(ref, struct cgroup_subsys_state, refcnt);
@@ -11704,7 +11389,7 @@ index 86cb5c6e8932..3920f49948f8 100644
}
static void init_and_link_css(struct cgroup_subsys_state *css,
-@@ -5694,6 +5694,7 @@ static int __init cgroup_wq_init(void)
+@@ -5698,6 +5698,7 @@
*/
cgroup_destroy_wq = alloc_workqueue("cgroup_destroy", 0, 1);
BUG_ON(!cgroup_destroy_wq);
@@ -11712,11 +11397,10 @@ index 86cb5c6e8932..3920f49948f8 100644
/*
* Used to destroy pidlists and separate to serve as flush domain.
-diff --git a/kernel/cpu.c b/kernel/cpu.c
-index 3e3f6e49eabb..e4d7491c1c12 100644
---- a/kernel/cpu.c
-+++ b/kernel/cpu.c
-@@ -152,8 +152,8 @@ static struct {
+diff -Nur linux-4.6.6.orig/kernel/cpu.c linux-4.6.6/kernel/cpu.c
+--- linux-4.6.6.orig/kernel/cpu.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/cpu.c 2016-08-22 21:27:47.361889777 +0200
+@@ -152,8 +152,8 @@
#endif
} cpu_hotplug = {
.active_writer = NULL,
@@ -11726,7 +11410,7 @@ index 3e3f6e49eabb..e4d7491c1c12 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)
@@ -12016,7 +11700,7 @@ index 3e3f6e49eabb..e4d7491c1c12 100644
void get_online_cpus(void)
{
-@@ -718,10 +1001,14 @@ static int takedown_cpu(unsigned int cpu)
+@@ -718,10 +1001,14 @@
else
synchronize_rcu();
@@ -12031,7 +11715,7 @@ index 3e3f6e49eabb..e4d7491c1c12 100644
/*
* Prevent irq alloc/free while the dying cpu reorganizes the
* interrupt affinities.
-@@ -807,6 +1094,9 @@ static int __ref _cpu_down(unsigned int cpu, int tasks_frozen,
+@@ -807,6 +1094,9 @@
struct cpuhp_cpu_state *st = per_cpu_ptr(&cpuhp_state, cpu);
int prev_state, ret = 0;
bool hasdied = false;
@@ -12041,7 +11725,7 @@ index 3e3f6e49eabb..e4d7491c1c12 100644
if (num_online_cpus() == 1)
return -EBUSY;
-@@ -814,7 +1104,34 @@ static int __ref _cpu_down(unsigned int cpu, int tasks_frozen,
+@@ -814,7 +1104,34 @@
if (!cpu_present(cpu))
return -EINVAL;
@@ -12076,7 +11760,7 @@ index 3e3f6e49eabb..e4d7491c1c12 100644
cpuhp_tasks_frozen = tasks_frozen;
-@@ -853,10 +1170,15 @@ static int __ref _cpu_down(unsigned int cpu, int tasks_frozen,
+@@ -853,10 +1170,15 @@
hasdied = prev_state != st->state && st->state == CPUHP_OFFLINE;
out:
@@ -12092,11 +11776,10 @@ index 3e3f6e49eabb..e4d7491c1c12 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.6.6.orig/kernel/debug/kdb/kdb_io.c linux-4.6.6/kernel/debug/kdb/kdb_io.c
+--- linux-4.6.6.orig/kernel/debug/kdb/kdb_io.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/debug/kdb/kdb_io.c 2016-08-22 21:27:47.365890038 +0200
+@@ -554,7 +554,6 @@
int linecount;
int colcount;
int logging, saved_loglevel = 0;
@@ -12104,7 +11787,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();
@@ -12113,7 +11796,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);
}
@@ -12121,7 +11804,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;
@@ -12133,11 +11816,10 @@ index fc1ef736253c..83c666537a7a 100644
return r;
}
-diff --git a/kernel/events/core.c b/kernel/events/core.c
-index a69c90cea05d..dc7b7c094abb 100644
---- a/kernel/events/core.c
-+++ b/kernel/events/core.c
-@@ -963,6 +963,7 @@ static void __perf_mux_hrtimer_init(struct perf_cpu_context *cpuctx, int cpu)
+diff -Nur linux-4.6.6.orig/kernel/events/core.c linux-4.6.6/kernel/events/core.c
+--- linux-4.6.6.orig/kernel/events/core.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/events/core.c 2016-08-22 21:27:47.369890291 +0200
+@@ -963,6 +963,7 @@
raw_spin_lock_init(&cpuctx->hrtimer_lock);
hrtimer_init(timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS_PINNED);
timer->function = perf_mux_hrtimer_handler;
@@ -12145,7 +11827,7 @@ index a69c90cea05d..dc7b7c094abb 100644
}
static int perf_mux_hrtimer_restart(struct perf_cpu_context *cpuctx)
-@@ -7261,6 +7262,7 @@ static void perf_swevent_init_hrtimer(struct perf_event *event)
+@@ -7261,6 +7262,7 @@
hrtimer_init(&hwc->hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
hwc->hrtimer.function = perf_swevent_hrtimer;
@@ -12153,11 +11835,10 @@ index a69c90cea05d..dc7b7c094abb 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 79c7e38a203b..12da2d0ba120 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.6.6.orig/kernel/exit.c linux-4.6.6/kernel/exit.c
+--- linux-4.6.6.orig/kernel/exit.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/exit.c 2016-08-22 21:27:47.369890291 +0200
+@@ -143,7 +143,7 @@
* Do this under ->siglock, we can race with another thread
* doing sigqueue_free() if we have SIGQUEUE_PREALLOC signals.
*/
@@ -12166,11 +11847,10 @@ index 79c7e38a203b..12da2d0ba120 100644
tsk->sighand = NULL;
spin_unlock(&sighand->siglock);
-diff --git a/kernel/fork.c b/kernel/fork.c
-index d277e83ed3e0..18cc63048297 100644
---- a/kernel/fork.c
-+++ b/kernel/fork.c
-@@ -253,7 +253,9 @@ static inline void put_signal_struct(struct signal_struct *sig)
+diff -Nur linux-4.6.6.orig/kernel/fork.c linux-4.6.6/kernel/fork.c
+--- linux-4.6.6.orig/kernel/fork.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/fork.c 2016-08-22 21:27:47.373890551 +0200
+@@ -253,7 +253,9 @@
if (atomic_dec_and_test(&sig->sigcnt))
free_signal_struct(sig);
}
@@ -12181,7 +11861,7 @@ index d277e83ed3e0..18cc63048297 100644
void __put_task_struct(struct task_struct *tsk)
{
WARN_ON(!tsk->exit_state);
-@@ -270,7 +272,18 @@ void __put_task_struct(struct task_struct *tsk)
+@@ -270,7 +272,18 @@
if (!profile_handoff_task(tsk))
free_task(tsk);
}
@@ -12200,7 +11880,7 @@ index d277e83ed3e0..18cc63048297 100644
void __init __weak arch_task_cache_init(void) { }
-@@ -699,6 +712,19 @@ void __mmdrop(struct mm_struct *mm)
+@@ -699,6 +712,19 @@
}
EXPORT_SYMBOL_GPL(__mmdrop);
@@ -12220,7 +11900,7 @@ index d277e83ed3e0..18cc63048297 100644
/*
* Decrement the use count and release all resources for an mm.
*/
-@@ -1228,6 +1254,9 @@ static void rt_mutex_init_task(struct task_struct *p)
+@@ -1228,6 +1254,9 @@
*/
static void posix_cpu_timers_init(struct task_struct *tsk)
{
@@ -12230,7 +11910,7 @@ index d277e83ed3e0..18cc63048297 100644
tsk->cputime_expires.prof_exp = 0;
tsk->cputime_expires.virt_exp = 0;
tsk->cputime_expires.sched_exp = 0;
-@@ -1352,6 +1381,7 @@ static struct task_struct *copy_process(unsigned long clone_flags,
+@@ -1352,6 +1381,7 @@
spin_lock_init(&p->alloc_lock);
init_sigpending(&p->pending);
@@ -12238,11 +11918,10 @@ index d277e83ed3e0..18cc63048297 100644
p->utime = p->stime = p->gtime = 0;
p->utimescaled = p->stimescaled = 0;
-diff --git a/kernel/futex.c b/kernel/futex.c
-index 6555d5459e98..2d572edcac53 100644
---- a/kernel/futex.c
-+++ b/kernel/futex.c
-@@ -874,7 +874,9 @@ void exit_pi_state_list(struct task_struct *curr)
+diff -Nur linux-4.6.6.orig/kernel/futex.c linux-4.6.6/kernel/futex.c
+--- linux-4.6.6.orig/kernel/futex.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/futex.c 2016-08-22 21:27:47.373890551 +0200
+@@ -874,7 +874,9 @@
* task still owns the PI-state:
*/
if (head->next != next) {
@@ -12252,7 +11931,7 @@ index 6555d5459e98..2d572edcac53 100644
continue;
}
-@@ -1269,6 +1271,7 @@ static int wake_futex_pi(u32 __user *uaddr, u32 uval, struct futex_q *this,
+@@ -1269,6 +1271,7 @@
struct futex_pi_state *pi_state = this->pi_state;
u32 uninitialized_var(curval), newval;
WAKE_Q(wake_q);
@@ -12260,7 +11939,7 @@ index 6555d5459e98..2d572edcac53 100644
bool deboost;
int ret = 0;
-@@ -1335,7 +1338,8 @@ static int wake_futex_pi(u32 __user *uaddr, u32 uval, struct futex_q *this,
+@@ -1335,7 +1338,8 @@
raw_spin_unlock_irq(&pi_state->pi_mutex.wait_lock);
@@ -12270,7 +11949,7 @@ index 6555d5459e98..2d572edcac53 100644
/*
* First unlock HB so the waiter does not spin on it once he got woken
-@@ -1345,6 +1349,7 @@ static int wake_futex_pi(u32 __user *uaddr, u32 uval, struct futex_q *this,
+@@ -1345,6 +1349,7 @@
*/
spin_unlock(&hb->lock);
wake_up_q(&wake_q);
@@ -12278,7 +11957,7 @@ index 6555d5459e98..2d572edcac53 100644
if (deboost)
rt_mutex_adjust_prio(current);
-@@ -1894,6 +1899,16 @@ static int futex_requeue(u32 __user *uaddr1, unsigned int flags,
+@@ -1894,6 +1899,16 @@
requeue_pi_wake_futex(this, &key2, hb2);
drop_count++;
continue;
@@ -12295,7 +11974,7 @@ index 6555d5459e98..2d572edcac53 100644
} else if (ret) {
/*
* rt_mutex_start_proxy_lock() detected a
-@@ -2784,7 +2799,7 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags,
+@@ -2784,7 +2799,7 @@
struct hrtimer_sleeper timeout, *to = NULL;
struct rt_mutex_waiter rt_waiter;
struct rt_mutex *pi_mutex = NULL;
@@ -12304,7 +11983,7 @@ index 6555d5459e98..2d572edcac53 100644
union futex_key key2 = FUTEX_KEY_INIT;
struct futex_q q = futex_q_init;
int res, ret;
-@@ -2809,10 +2824,7 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags,
+@@ -2809,10 +2824,7 @@
* The waiter is allocated on our stack, manipulated by the requeue
* code while we sleep on uaddr.
*/
@@ -12316,7 +11995,7 @@ index 6555d5459e98..2d572edcac53 100644
ret = get_futex_key(uaddr2, flags & FLAGS_SHARED, &key2, VERIFY_WRITE);
if (unlikely(ret != 0))
-@@ -2843,20 +2855,55 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags,
+@@ -2843,20 +2855,55 @@
/* Queue the futex_q, drop the hb lock, wait for wakeup. */
futex_wait_queue_me(hb, &q, to);
@@ -12383,7 +12062,7 @@ index 6555d5459e98..2d572edcac53 100644
/* Check if the requeue code acquired the second futex for us. */
if (!q.rt_waiter) {
-@@ -2865,14 +2912,15 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags,
+@@ -2865,14 +2912,15 @@
* did a lock-steal - fix up the PI-state in that case.
*/
if (q.pi_state && (q.pi_state->owner != current)) {
@@ -12401,7 +12080,7 @@ index 6555d5459e98..2d572edcac53 100644
}
} else {
/*
-@@ -2885,7 +2933,8 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags,
+@@ -2885,7 +2933,8 @@
ret = rt_mutex_finish_proxy_lock(pi_mutex, to, &rt_waiter);
debug_rt_mutex_free_waiter(&rt_waiter);
@@ -12411,11 +12090,10 @@ index 6555d5459e98..2d572edcac53 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 a15b5485b446..28c39c16f989 100644
---- a/kernel/irq/handle.c
-+++ b/kernel/irq/handle.c
-@@ -134,6 +134,8 @@ void __irq_wake_thread(struct irq_desc *desc, struct irqaction *action)
+diff -Nur linux-4.6.6.orig/kernel/irq/handle.c linux-4.6.6/kernel/irq/handle.c
+--- linux-4.6.6.orig/kernel/irq/handle.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/irq/handle.c 2016-08-22 21:27:47.373890551 +0200
+@@ -134,6 +134,8 @@
irqreturn_t handle_irq_event_percpu(struct irq_desc *desc)
{
@@ -12424,7 +12102,7 @@ index a15b5485b446..28c39c16f989 100644
irqreturn_t retval = IRQ_NONE;
unsigned int flags = 0, irq = desc->irq_data.irq;
struct irqaction *action;
-@@ -174,7 +176,11 @@ irqreturn_t handle_irq_event_percpu(struct irq_desc *desc)
+@@ -174,7 +176,11 @@
retval |= res;
}
@@ -12437,10 +12115,9 @@ index a15b5485b446..28c39c16f989 100644
if (!noirqdebug)
note_interrupt(desc, retval);
-diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
-index cc1cc641d653..f5e9fd5408d6 100644
---- a/kernel/irq/manage.c
-+++ b/kernel/irq/manage.c
+diff -Nur linux-4.6.6.orig/kernel/irq/manage.c linux-4.6.6/kernel/irq/manage.c
+--- linux-4.6.6.orig/kernel/irq/manage.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/irq/manage.c 2016-08-22 21:27:47.377890804 +0200
@@ -22,6 +22,7 @@
#include "internals.h"
@@ -12449,7 +12126,7 @@ index cc1cc641d653..f5e9fd5408d6 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);
@@ -12457,7 +12134,7 @@ index cc1cc641d653..f5e9fd5408d6 100644
#endif
static void __synchronize_hardirq(struct irq_desc *desc)
-@@ -179,6 +181,62 @@ static inline void
+@@ -179,6 +181,62 @@
irq_get_pending(struct cpumask *mask, struct irq_desc *desc) { }
#endif
@@ -12520,7 +12197,7 @@ index cc1cc641d653..f5e9fd5408d6 100644
int irq_do_set_affinity(struct irq_data *data, const struct cpumask *mask,
bool force)
{
-@@ -218,7 +276,17 @@ int irq_set_affinity_locked(struct irq_data *data, const struct cpumask *mask,
+@@ -218,7 +276,17 @@
if (desc->affinity_notify) {
kref_get(&desc->affinity_notify->kref);
@@ -12538,7 +12215,7 @@ index cc1cc641d653..f5e9fd5408d6 100644
}
irqd_set(data, IRQD_AFFINITY_SET);
-@@ -256,10 +324,8 @@ int irq_set_affinity_hint(unsigned int irq, const struct cpumask *m)
+@@ -256,10 +324,8 @@
}
EXPORT_SYMBOL_GPL(irq_set_affinity_hint);
@@ -12550,7 +12227,7 @@ index cc1cc641d653..f5e9fd5408d6 100644
struct irq_desc *desc = irq_to_desc(notify->irq);
cpumask_var_t cpumask;
unsigned long flags;
-@@ -281,6 +347,13 @@ static void irq_affinity_notify(struct work_struct *work)
+@@ -281,6 +347,13 @@
kref_put(&notify->kref, notify->release);
}
@@ -12564,7 +12241,7 @@ index cc1cc641d653..f5e9fd5408d6 100644
/**
* irq_set_affinity_notifier - control notification of IRQ affinity changes
* @irq: Interrupt for which to enable/disable notification
-@@ -310,6 +383,8 @@ irq_set_affinity_notifier(unsigned int irq, struct irq_affinity_notify *notify)
+@@ -310,6 +383,8 @@
notify->irq = irq;
kref_init(&notify->kref);
INIT_WORK(&notify->work, irq_affinity_notify);
@@ -12573,7 +12250,7 @@ index cc1cc641d653..f5e9fd5408d6 100644
}
raw_spin_lock_irqsave(&desc->lock, flags);
-@@ -863,7 +938,15 @@ irq_forced_thread_fn(struct irq_desc *desc, struct irqaction *action)
+@@ -863,7 +938,15 @@
local_bh_disable();
ret = action->thread_fn(action->irq, action->dev_id);
irq_finalize_oneshot(desc, action);
@@ -12590,7 +12267,7 @@ index cc1cc641d653..f5e9fd5408d6 100644
return ret;
}
-@@ -960,6 +1043,12 @@ static int irq_thread(void *data)
+@@ -960,6 +1043,12 @@
if (action_ret == IRQ_WAKE_THREAD)
irq_wake_secondary(desc, action);
@@ -12603,7 +12280,7 @@ index cc1cc641d653..f5e9fd5408d6 100644
wake_threads_waitq(desc);
}
-@@ -1313,6 +1402,9 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new)
+@@ -1313,6 +1402,9 @@
irqd_set(&desc->irq_data, IRQD_NO_BALANCING);
}
@@ -12613,7 +12290,7 @@ index cc1cc641d653..f5e9fd5408d6 100644
/* Set default affinity mask once everything is setup */
setup_affinity(desc, mask);
-@@ -1998,7 +2090,7 @@ EXPORT_SYMBOL_GPL(irq_get_irqchip_state);
+@@ -1998,7 +2090,7 @@
* This call sets the internal irqchip state of an interrupt,
* depending on the value of @which.
*
@@ -12622,11 +12299,10 @@ index cc1cc641d653..f5e9fd5408d6 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.6.6.orig/kernel/irq/settings.h linux-4.6.6/kernel/irq/settings.h
+--- linux-4.6.6.orig/kernel/irq/settings.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/irq/settings.h 2016-08-22 21:27:47.377890804 +0200
+@@ -16,6 +16,7 @@
_IRQ_PER_CPU_DEVID = IRQ_PER_CPU_DEVID,
_IRQ_IS_POLLED = IRQ_IS_POLLED,
_IRQ_DISABLE_UNLAZY = IRQ_DISABLE_UNLAZY,
@@ -12634,7 +12310,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
@@ -12642,7 +12318,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);
}
@@ -12659,11 +12335,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.6.6.orig/kernel/irq/spurious.c linux-4.6.6/kernel/irq/spurious.c
+--- linux-4.6.6.orig/kernel/irq/spurious.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/irq/spurious.c 2016-08-22 21:27:47.377890804 +0200
+@@ -442,6 +442,10 @@
static int __init irqfixup_setup(char *str)
{
@@ -12674,7 +12349,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)
{
@@ -12685,10 +12360,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.6.6.orig/kernel/irq_work.c linux-4.6.6/kernel/irq_work.c
+--- linux-4.6.6.orig/kernel/irq_work.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/irq_work.c 2016-08-22 21:27:47.377890804 +0200
@@ -17,6 +17,7 @@
#include <linux/cpu.h>
#include <linux/notifier.h>
@@ -12697,7 +12371,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)
{
@@ -12706,7 +12380,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;
@@ -12720,7 +12394,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)
{
@@ -12730,7 +12404,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();
@@ -12753,7 +12427,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);
@@ -12765,7 +12439,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;
@@ -12774,7 +12448,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));
@@ -12792,7 +12466,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);
@@ -12810,11 +12484,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 152da4a48867..9fe46356ed47 100644
---- a/kernel/ksysfs.c
-+++ b/kernel/ksysfs.c
-@@ -136,6 +136,15 @@ KERNEL_ATTR_RO(vmcoreinfo);
+diff -Nur linux-4.6.6.orig/kernel/Kconfig.locks linux-4.6.6/kernel/Kconfig.locks
+--- linux-4.6.6.orig/kernel/Kconfig.locks 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/Kconfig.locks 2016-08-22 21:27:47.357889524 +0200
+@@ -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.6.6.orig/kernel/Kconfig.preempt linux-4.6.6/kernel/Kconfig.preempt
+--- linux-4.6.6.orig/kernel/Kconfig.preempt 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/Kconfig.preempt 2016-08-22 21:27:47.357889524 +0200
+@@ -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.6.6.orig/kernel/ksysfs.c linux-4.6.6/kernel/ksysfs.c
+--- linux-4.6.6.orig/kernel/ksysfs.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/ksysfs.c 2016-08-22 21:27:47.377890804 +0200
+@@ -136,6 +136,15 @@
#endif /* CONFIG_KEXEC_CORE */
@@ -12830,7 +12575,7 @@ index 152da4a48867..9fe46356ed47 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
@@ -12840,46 +12585,9 @@ index 152da4a48867..9fe46356ed47 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.6.6.orig/kernel/locking/lglock.c linux-4.6.6/kernel/locking/lglock.c
+--- linux-4.6.6.orig/kernel/locking/lglock.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/locking/lglock.c 2016-08-22 21:27:47.377890804 +0200
@@ -4,6 +4,15 @@
#include <linux/cpu.h>
#include <linux/string.h>
@@ -12969,7 +12677,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);
@@ -13009,7 +12717,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) {
@@ -13048,11 +12756,10 @@ index 951cfcd10b4a..57e0ea72c28a 100644
+ }
+}
+#endif
-diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
-index 78c1c0ee6dc1..839175acc1c6 100644
---- a/kernel/locking/lockdep.c
-+++ b/kernel/locking/lockdep.c
-@@ -3648,6 +3648,7 @@ static void check_flags(unsigned long flags)
+diff -Nur linux-4.6.6.orig/kernel/locking/lockdep.c linux-4.6.6/kernel/locking/lockdep.c
+--- linux-4.6.6.orig/kernel/locking/lockdep.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/locking/lockdep.c 2016-08-22 21:27:47.381891064 +0200
+@@ -3648,6 +3648,7 @@
}
}
@@ -13060,7 +12767,7 @@ index 78c1c0ee6dc1..839175acc1c6 100644
/*
* We dont accurately track softirq state in e.g.
* hardirq contexts (such as on 4KSTACKS), so only
-@@ -3662,6 +3663,7 @@ static void check_flags(unsigned long flags)
+@@ -3662,6 +3663,7 @@
DEBUG_LOCKS_WARN_ON(!current->softirqs_enabled);
}
}
@@ -13068,10 +12775,9 @@ index 78c1c0ee6dc1..839175acc1c6 100644
if (!debug_locks)
print_irqtrace_events(current);
-diff --git a/kernel/locking/locktorture.c b/kernel/locking/locktorture.c
-index 8ef1919d63b2..291fc19e28e0 100644
---- a/kernel/locking/locktorture.c
-+++ b/kernel/locking/locktorture.c
+diff -Nur linux-4.6.6.orig/kernel/locking/locktorture.c linux-4.6.6/kernel/locking/locktorture.c
+--- linux-4.6.6.orig/kernel/locking/locktorture.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/locking/locktorture.c 2016-08-22 21:27:47.381891064 +0200
@@ -26,7 +26,6 @@
#include <linux/kthread.h>
#include <linux/sched/rt.h>
@@ -13080,11 +12786,44 @@ index 8ef1919d63b2..291fc19e28e0 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..d4ab61c1848b
---- /dev/null
-+++ b/kernel/locking/rt.c
+diff -Nur linux-4.6.6.orig/kernel/locking/Makefile linux-4.6.6/kernel/locking/Makefile
+--- linux-4.6.6.orig/kernel/locking/Makefile 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/locking/Makefile 2016-08-22 21:27:47.377890804 +0200
+@@ -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.6.6.orig/kernel/locking/rt.c linux-4.6.6/kernel/locking/rt.c
+--- linux-4.6.6.orig/kernel/locking/rt.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.6.6/kernel/locking/rt.c 2016-08-22 21:27:47.385891317 +0200
@@ -0,0 +1,474 @@
+/*
+ * kernel/rt.c
@@ -13560,10 +13299,9 @@ index 000000000000..d4ab61c1848b
+ return 1;
+}
+EXPORT_SYMBOL(atomic_dec_and_mutex_lock);
-diff --git a/kernel/locking/rtmutex.c b/kernel/locking/rtmutex.c
-index 3e746607abe5..fde5e54f1096 100644
---- a/kernel/locking/rtmutex.c
-+++ b/kernel/locking/rtmutex.c
+diff -Nur linux-4.6.6.orig/kernel/locking/rtmutex.c linux-4.6.6/kernel/locking/rtmutex.c
+--- linux-4.6.6.orig/kernel/locking/rtmutex.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/locking/rtmutex.c 2016-08-22 21:27:47.385891317 +0200
@@ -7,6 +7,11 @@
* Copyright (C) 2005-2006 Timesys Corp., Thomas Gleixner <tglx@timesys.com>
* Copyright (C) 2005 Kihon Technologies Inc., Steven Rostedt
@@ -13584,7 +13322,7 @@ index 3e746607abe5..fde5e54f1096 100644
#include "rtmutex_common.h"
-@@ -69,6 +75,12 @@ static void fixup_rt_mutex_waiters(struct rt_mutex *lock)
+@@ -69,6 +75,12 @@
clear_rt_mutex_waiters(lock);
}
@@ -13597,7 +13335,7 @@ index 3e746607abe5..fde5e54f1096 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,
+@@ -350,6 +362,14 @@
return debug_rt_mutex_detect_deadlock(waiter, chwalk);
}
@@ -13612,7 +13350,7 @@ index 3e746607abe5..fde5e54f1096 100644
/*
* Max number of times we'll walk the boosting chain:
*/
-@@ -357,7 +377,8 @@ int max_lock_depth = 1024;
+@@ -357,7 +377,8 @@
static inline struct rt_mutex *task_blocked_on_lock(struct task_struct *p)
{
@@ -13622,7 +13360,7 @@ index 3e746607abe5..fde5e54f1096 100644
}
/*
-@@ -493,7 +514,7 @@ static int rt_mutex_adjust_prio_chain(struct task_struct *task,
+@@ -493,7 +514,7 @@
* reached or the state of the chain has changed while we
* dropped the locks.
*/
@@ -13631,7 +13369,7 @@ index 3e746607abe5..fde5e54f1096 100644
goto out_unlock_pi;
/*
-@@ -655,13 +676,16 @@ static int rt_mutex_adjust_prio_chain(struct task_struct *task,
+@@ -655,13 +676,16 @@
* follow here. This is the end of the chain we are walking.
*/
if (!rt_mutex_owner(lock)) {
@@ -13650,7 +13388,7 @@ index 3e746607abe5..fde5e54f1096 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,
+@@ -754,6 +778,25 @@
return ret;
}
@@ -13676,7 +13414,7 @@ index 3e746607abe5..fde5e54f1096 100644
/*
* Try to take an rt-mutex
*
-@@ -764,8 +807,9 @@ static int rt_mutex_adjust_prio_chain(struct task_struct *task,
+@@ -764,8 +807,9 @@
* @waiter: The waiter that is queued to the lock's wait tree if the
* callsite called task_blocked_on_lock(), otherwise NULL
*/
@@ -13688,7 +13426,7 @@ index 3e746607abe5..fde5e54f1096 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,
+@@ -802,8 +846,10 @@
* If waiter is not the highest priority waiter of
* @lock, give up.
*/
@@ -13700,7 +13438,7 @@ index 3e746607abe5..fde5e54f1096 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,
+@@ -821,14 +867,10 @@
* not need to be dequeued.
*/
if (rt_mutex_has_waiters(lock)) {
@@ -13718,7 +13456,7 @@ index 3e746607abe5..fde5e54f1096 100644
/*
* The current top waiter stays enqueued. We
* don't have to change anything in the lock
-@@ -877,6 +919,399 @@ static int try_to_take_rt_mutex(struct rt_mutex *lock, struct task_struct *task,
+@@ -877,6 +919,399 @@
return 1;
}
@@ -14118,7 +13856,7 @@ index 3e746607abe5..fde5e54f1096 100644
/*
* Task blocks on lock.
*
-@@ -907,6 +1342,23 @@ static int task_blocks_on_rt_mutex(struct rt_mutex *lock,
+@@ -907,6 +1342,23 @@
return -EDEADLK;
raw_spin_lock(&task->pi_lock);
@@ -14142,7 +13880,7 @@ index 3e746607abe5..fde5e54f1096 100644
__rt_mutex_adjust_prio(task);
waiter->task = task;
waiter->lock = lock;
-@@ -930,7 +1382,7 @@ static int task_blocks_on_rt_mutex(struct rt_mutex *lock,
+@@ -930,7 +1382,7 @@
rt_mutex_enqueue_pi(owner, waiter);
__rt_mutex_adjust_prio(owner);
@@ -14151,7 +13889,7 @@ index 3e746607abe5..fde5e54f1096 100644
chain_walk = 1;
} else if (rt_mutex_cond_detect_deadlock(waiter, chwalk)) {
chain_walk = 1;
-@@ -972,6 +1424,7 @@ static int task_blocks_on_rt_mutex(struct rt_mutex *lock,
+@@ -972,6 +1424,7 @@
* Called with lock->wait_lock held and interrupts disabled.
*/
static void mark_wakeup_next_waiter(struct wake_q_head *wake_q,
@@ -14159,7 +13897,7 @@ index 3e746607abe5..fde5e54f1096 100644
struct rt_mutex *lock)
{
struct rt_mutex_waiter *waiter;
-@@ -1000,7 +1453,10 @@ static void mark_wakeup_next_waiter(struct wake_q_head *wake_q,
+@@ -1000,7 +1453,10 @@
raw_spin_unlock(&current->pi_lock);
@@ -14171,7 +13909,7 @@ index 3e746607abe5..fde5e54f1096 100644
}
/*
-@@ -1014,7 +1470,7 @@ static void remove_waiter(struct rt_mutex *lock,
+@@ -1014,7 +1470,7 @@
{
bool is_top_waiter = (waiter == rt_mutex_top_waiter(lock));
struct task_struct *owner = rt_mutex_owner(lock);
@@ -14180,7 +13918,7 @@ index 3e746607abe5..fde5e54f1096 100644
raw_spin_lock(&current->pi_lock);
rt_mutex_dequeue(lock, waiter);
-@@ -1038,7 +1494,8 @@ static void remove_waiter(struct rt_mutex *lock,
+@@ -1038,7 +1494,8 @@
__rt_mutex_adjust_prio(owner);
/* Store the lock on which owner is blocked or NULL */
@@ -14190,7 +13928,7 @@ index 3e746607abe5..fde5e54f1096 100644
raw_spin_unlock(&owner->pi_lock);
-@@ -1074,17 +1531,17 @@ void rt_mutex_adjust_pi(struct task_struct *task)
+@@ -1074,17 +1531,17 @@
raw_spin_lock_irqsave(&task->pi_lock, flags);
waiter = task->pi_blocked_on;
@@ -14210,7 +13948,7 @@ index 3e746607abe5..fde5e54f1096 100644
rt_mutex_adjust_prio_chain(task, RT_MUTEX_MIN_CHAINWALK, NULL,
next_lock, NULL, task);
}
-@@ -1102,7 +1559,8 @@ void rt_mutex_adjust_pi(struct task_struct *task)
+@@ -1102,7 +1559,8 @@
static int __sched
__rt_mutex_slowlock(struct rt_mutex *lock, int state,
struct hrtimer_sleeper *timeout,
@@ -14220,7 +13958,7 @@ index 3e746607abe5..fde5e54f1096 100644
{
int ret = 0;
-@@ -1125,6 +1583,12 @@ __rt_mutex_slowlock(struct rt_mutex *lock, int state,
+@@ -1125,6 +1583,12 @@
break;
}
@@ -14233,7 +13971,7 @@ index 3e746607abe5..fde5e54f1096 100644
raw_spin_unlock_irq(&lock->wait_lock);
debug_rt_mutex_print_deadlock(waiter);
-@@ -1159,21 +1623,96 @@ static void rt_mutex_handle_deadlock(int res, int detect_deadlock,
+@@ -1159,21 +1623,96 @@
}
}
@@ -14334,7 +14072,7 @@ index 3e746607abe5..fde5e54f1096 100644
/*
* Technically we could use raw_spin_[un]lock_irq() here, but this can
-@@ -1187,6 +1726,8 @@ rt_mutex_slowlock(struct rt_mutex *lock, int state,
+@@ -1187,6 +1726,8 @@
/* Try to acquire the lock again: */
if (try_to_take_rt_mutex(lock, current, NULL)) {
@@ -14343,7 +14081,7 @@ index 3e746607abe5..fde5e54f1096 100644
raw_spin_unlock_irqrestore(&lock->wait_lock, flags);
return 0;
}
-@@ -1201,13 +1742,23 @@ rt_mutex_slowlock(struct rt_mutex *lock, int state,
+@@ -1201,13 +1742,23 @@
if (likely(!ret))
/* sleep on the mutex */
@@ -14369,7 +14107,7 @@ index 3e746607abe5..fde5e54f1096 100644
}
/*
-@@ -1267,7 +1818,8 @@ static inline int rt_mutex_slowtrylock(struct rt_mutex *lock)
+@@ -1267,7 +1818,8 @@
* Return whether the current task needs to undo a potential priority boosting.
*/
static bool __sched rt_mutex_slowunlock(struct rt_mutex *lock,
@@ -14379,7 +14117,7 @@ index 3e746607abe5..fde5e54f1096 100644
{
unsigned long flags;
-@@ -1323,7 +1875,7 @@ static bool __sched rt_mutex_slowunlock(struct rt_mutex *lock,
+@@ -1323,7 +1875,7 @@
*
* Queue the next waiter for wakeup once we release the wait_lock.
*/
@@ -14388,7 +14126,7 @@ index 3e746607abe5..fde5e54f1096 100644
raw_spin_unlock_irqrestore(&lock->wait_lock, flags);
-@@ -1339,31 +1891,36 @@ static bool __sched rt_mutex_slowunlock(struct rt_mutex *lock,
+@@ -1339,31 +1891,36 @@
*/
static inline int
rt_mutex_fastlock(struct rt_mutex *lock, int state,
@@ -14429,7 +14167,7 @@ index 3e746607abe5..fde5e54f1096 100644
}
static inline int
-@@ -1380,17 +1937,20 @@ rt_mutex_fasttrylock(struct rt_mutex *lock,
+@@ -1380,17 +1937,20 @@
static inline void
rt_mutex_fastunlock(struct rt_mutex *lock,
bool (*slowfn)(struct rt_mutex *lock,
@@ -14452,7 +14190,7 @@ index 3e746607abe5..fde5e54f1096 100644
/* Undo pi boosting if necessary: */
if (deboost)
-@@ -1407,7 +1967,7 @@ void __sched rt_mutex_lock(struct rt_mutex *lock)
+@@ -1407,7 +1967,7 @@
{
might_sleep();
@@ -14461,7 +14199,7 @@ index 3e746607abe5..fde5e54f1096 100644
}
EXPORT_SYMBOL_GPL(rt_mutex_lock);
-@@ -1424,7 +1984,7 @@ int __sched rt_mutex_lock_interruptible(struct rt_mutex *lock)
+@@ -1424,7 +1984,7 @@
{
might_sleep();
@@ -14470,7 +14208,7 @@ index 3e746607abe5..fde5e54f1096 100644
}
EXPORT_SYMBOL_GPL(rt_mutex_lock_interruptible);
-@@ -1437,11 +1997,30 @@ int rt_mutex_timed_futex_lock(struct rt_mutex *lock,
+@@ -1437,11 +1997,30 @@
might_sleep();
return rt_mutex_timed_fastlock(lock, TASK_INTERRUPTIBLE, timeout,
@@ -14502,7 +14240,7 @@ index 3e746607abe5..fde5e54f1096 100644
* rt_mutex_timed_lock - lock a rt_mutex interruptible
* the timeout structure is provided
* by the caller
-@@ -1461,6 +2040,7 @@ rt_mutex_timed_lock(struct rt_mutex *lock, struct hrtimer_sleeper *timeout)
+@@ -1461,6 +2040,7 @@
return rt_mutex_timed_fastlock(lock, TASK_INTERRUPTIBLE, timeout,
RT_MUTEX_MIN_CHAINWALK,
@@ -14510,7 +14248,7 @@ index 3e746607abe5..fde5e54f1096 100644
rt_mutex_slowlock);
}
EXPORT_SYMBOL_GPL(rt_mutex_timed_lock);
-@@ -1478,7 +2058,11 @@ EXPORT_SYMBOL_GPL(rt_mutex_timed_lock);
+@@ -1478,7 +2058,11 @@
*/
int __sched rt_mutex_trylock(struct rt_mutex *lock)
{
@@ -14522,7 +14260,7 @@ index 3e746607abe5..fde5e54f1096 100644
return 0;
return rt_mutex_fasttrylock(lock, rt_mutex_slowtrylock);
-@@ -1504,13 +2088,14 @@ EXPORT_SYMBOL_GPL(rt_mutex_unlock);
+@@ -1504,13 +2088,14 @@
* required or not.
*/
bool __sched rt_mutex_futex_unlock(struct rt_mutex *lock,
@@ -14539,7 +14277,7 @@ index 3e746607abe5..fde5e54f1096 100644
}
/**
-@@ -1543,13 +2128,12 @@ EXPORT_SYMBOL_GPL(rt_mutex_destroy);
+@@ -1543,13 +2128,12 @@
void __rt_mutex_init(struct rt_mutex *lock, const char *name)
{
lock->owner = NULL;
@@ -14554,7 +14292,7 @@ index 3e746607abe5..fde5e54f1096 100644
/**
* rt_mutex_init_proxy_locked - initialize and lock a rt_mutex on behalf of a
-@@ -1564,7 +2148,7 @@ EXPORT_SYMBOL_GPL(__rt_mutex_init);
+@@ -1564,7 +2148,7 @@
void rt_mutex_init_proxy_locked(struct rt_mutex *lock,
struct task_struct *proxy_owner)
{
@@ -14563,7 +14301,7 @@ index 3e746607abe5..fde5e54f1096 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 +2196,35 @@ int rt_mutex_start_proxy_lock(struct rt_mutex *lock,
+@@ -1612,6 +2196,35 @@
return 1;
}
@@ -14599,7 +14337,7 @@ index 3e746607abe5..fde5e54f1096 100644
/* We enforce deadlock detection for futexes */
ret = task_blocks_on_rt_mutex(lock, waiter, task,
RT_MUTEX_FULL_CHAINWALK);
-@@ -1626,7 +2239,7 @@ int rt_mutex_start_proxy_lock(struct rt_mutex *lock,
+@@ -1626,7 +2239,7 @@
ret = 0;
}
@@ -14608,7 +14346,7 @@ index 3e746607abe5..fde5e54f1096 100644
remove_waiter(lock, waiter);
raw_spin_unlock_irq(&lock->wait_lock);
-@@ -1682,7 +2295,7 @@ int rt_mutex_finish_proxy_lock(struct rt_mutex *lock,
+@@ -1682,7 +2295,7 @@
set_current_state(TASK_INTERRUPTIBLE);
/* sleep on the mutex */
@@ -14617,7 +14355,7 @@ index 3e746607abe5..fde5e54f1096 100644
if (unlikely(ret))
remove_waiter(lock, waiter);
-@@ -1697,3 +2310,89 @@ int rt_mutex_finish_proxy_lock(struct rt_mutex *lock,
+@@ -1697,3 +2310,89 @@
return ret;
}
@@ -14707,11 +14445,10 @@ index 3e746607abe5..fde5e54f1096 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.6.6.orig/kernel/locking/rtmutex_common.h linux-4.6.6/kernel/locking/rtmutex_common.h
+--- linux-4.6.6.orig/kernel/locking/rtmutex_common.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/locking/rtmutex_common.h 2016-08-22 21:27:47.385891317 +0200
+@@ -27,6 +27,7 @@
struct rb_node pi_tree_entry;
struct task_struct *task;
struct rt_mutex *lock;
@@ -14719,7 +14456,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 {
+@@ -97,6 +98,9 @@
/*
* PI-futex support (proxy locking functions, etc.):
*/
@@ -14729,7 +14466,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,
+@@ -110,7 +114,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,
@@ -14739,7 +14476,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);
+@@ -119,4 +124,14 @@
# include "rtmutex.h"
#endif
@@ -14754,11 +14491,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.6.6.orig/kernel/locking/spinlock.c linux-4.6.6/kernel/locking/spinlock.c
+--- linux-4.6.6.orig/kernel/locking/spinlock.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/locking/spinlock.c 2016-08-22 21:27:47.389891577 +0200
+@@ -124,8 +124,11 @@
* __[spin|read|write]_lock_bh()
*/
BUILD_LOCK_OPS(spin, raw_spinlock);
@@ -14770,7 +14506,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
@@ -14779,7 +14515,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
@@ -14788,11 +14524,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.6.6.orig/kernel/locking/spinlock_debug.c linux-4.6.6/kernel/locking/spinlock_debug.c
+--- linux-4.6.6.orig/kernel/locking/spinlock_debug.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/locking/spinlock_debug.c 2016-08-22 21:27:47.389891577 +0200
+@@ -31,6 +31,7 @@
EXPORT_SYMBOL(__raw_spin_lock_init);
@@ -14800,7 +14535,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);
@@ -14808,7 +14543,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);
}
@@ -14816,17 +14551,16 @@ 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 535c96510a44..3373a70ac3f0 100644
---- a/kernel/panic.c
-+++ b/kernel/panic.c
-@@ -444,9 +444,11 @@ static u64 oops_id;
+diff -Nur linux-4.6.6.orig/kernel/panic.c linux-4.6.6/kernel/panic.c
+--- linux-4.6.6.orig/kernel/panic.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/panic.c 2016-08-22 21:27:47.389891577 +0200
+@@ -444,9 +444,11 @@
static int init_oops_id(void)
{
@@ -14838,11 +14572,10 @@ index 535c96510a44..3373a70ac3f0 100644
oops_id++;
return 0;
-diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
-index fca9254280ee..4e4063e7b5cc 100644
---- a/kernel/power/hibernate.c
-+++ b/kernel/power/hibernate.c
-@@ -285,6 +285,8 @@ static int create_image(int platform_mode)
+diff -Nur linux-4.6.6.orig/kernel/power/hibernate.c linux-4.6.6/kernel/power/hibernate.c
+--- linux-4.6.6.orig/kernel/power/hibernate.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/power/hibernate.c 2016-08-22 21:27:47.389891577 +0200
+@@ -285,6 +285,8 @@
local_irq_disable();
@@ -14851,7 +14584,7 @@ index fca9254280ee..4e4063e7b5cc 100644
error = syscore_suspend();
if (error) {
printk(KERN_ERR "PM: Some system devices failed to power down, "
-@@ -314,6 +316,7 @@ static int create_image(int platform_mode)
+@@ -314,6 +316,7 @@
syscore_resume();
Enable_irqs:
@@ -14859,7 +14592,7 @@ index fca9254280ee..4e4063e7b5cc 100644
local_irq_enable();
Enable_cpus:
-@@ -438,6 +441,7 @@ static int resume_target_kernel(bool platform_mode)
+@@ -438,6 +441,7 @@
goto Enable_cpus;
local_irq_disable();
@@ -14867,7 +14600,7 @@ index fca9254280ee..4e4063e7b5cc 100644
error = syscore_suspend();
if (error)
-@@ -471,6 +475,7 @@ static int resume_target_kernel(bool platform_mode)
+@@ -471,6 +475,7 @@
syscore_resume();
Enable_irqs:
@@ -14875,7 +14608,7 @@ index fca9254280ee..4e4063e7b5cc 100644
local_irq_enable();
Enable_cpus:
-@@ -556,6 +561,7 @@ int hibernation_platform_enter(void)
+@@ -556,6 +561,7 @@
goto Enable_cpus;
local_irq_disable();
@@ -14883,7 +14616,7 @@ index fca9254280ee..4e4063e7b5cc 100644
syscore_suspend();
if (pm_wakeup_pending()) {
error = -EAGAIN;
-@@ -568,6 +574,7 @@ int hibernation_platform_enter(void)
+@@ -568,6 +574,7 @@
Power_up:
syscore_resume();
@@ -14891,7 +14624,7 @@ index fca9254280ee..4e4063e7b5cc 100644
local_irq_enable();
Enable_cpus:
-@@ -642,6 +649,10 @@ static void power_down(void)
+@@ -642,6 +649,10 @@
cpu_relax();
}
@@ -14902,7 +14635,7 @@ index fca9254280ee..4e4063e7b5cc 100644
/**
* hibernate - Carry out system hibernation, including saving the image.
*/
-@@ -654,6 +665,8 @@ int hibernate(void)
+@@ -654,6 +665,8 @@
return -EPERM;
}
@@ -14911,7 +14644,7 @@ index fca9254280ee..4e4063e7b5cc 100644
lock_system_sleep();
/* The snapshot device should not be opened while we're running */
if (!atomic_add_unless(&snapshot_device_available, -1, 0)) {
-@@ -719,6 +732,7 @@ int hibernate(void)
+@@ -719,6 +732,7 @@
atomic_inc(&snapshot_device_available);
Unlock:
unlock_system_sleep();
@@ -14919,11 +14652,10 @@ index fca9254280ee..4e4063e7b5cc 100644
return error;
}
-diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
-index 5b70d64b871e..e25382cfb249 100644
---- a/kernel/power/suspend.c
-+++ b/kernel/power/suspend.c
-@@ -359,6 +359,8 @@ static int suspend_enter(suspend_state_t state, bool *wakeup)
+diff -Nur linux-4.6.6.orig/kernel/power/suspend.c linux-4.6.6/kernel/power/suspend.c
+--- linux-4.6.6.orig/kernel/power/suspend.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/power/suspend.c 2016-08-22 21:27:47.389891577 +0200
+@@ -359,6 +359,8 @@
arch_suspend_disable_irqs();
BUG_ON(!irqs_disabled());
@@ -14932,7 +14664,7 @@ index 5b70d64b871e..e25382cfb249 100644
error = syscore_suspend();
if (!error) {
*wakeup = pm_wakeup_pending();
-@@ -375,6 +377,8 @@ static int suspend_enter(suspend_state_t state, bool *wakeup)
+@@ -375,6 +377,8 @@
syscore_resume();
}
@@ -14941,7 +14673,7 @@ index 5b70d64b871e..e25382cfb249 100644
arch_suspend_enable_irqs();
BUG_ON(irqs_disabled());
-@@ -517,6 +521,8 @@ static int enter_state(suspend_state_t state)
+@@ -517,6 +521,8 @@
return error;
}
@@ -14950,7 +14682,7 @@ index 5b70d64b871e..e25382cfb249 100644
/**
* pm_suspend - Externally visible function for suspending the system.
* @state: System sleep state to enter.
-@@ -531,6 +537,8 @@ int pm_suspend(suspend_state_t state)
+@@ -531,6 +537,8 @@
if (state <= PM_SUSPEND_ON || state >= PM_SUSPEND_MAX)
return -EINVAL;
@@ -14959,7 +14691,7 @@ index 5b70d64b871e..e25382cfb249 100644
error = enter_state(state);
if (error) {
suspend_stats.fail++;
-@@ -538,6 +546,7 @@ int pm_suspend(suspend_state_t state)
+@@ -538,6 +546,7 @@
} else {
suspend_stats.success++;
}
@@ -14967,11 +14699,10 @@ index 5b70d64b871e..e25382cfb249 100644
return error;
}
EXPORT_SYMBOL(pm_suspend);
-diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
-index bfbf284e4218..ba5e3381a8cc 100644
---- a/kernel/printk/printk.c
-+++ b/kernel/printk/printk.c
-@@ -246,6 +246,65 @@ __packed __aligned(4)
+diff -Nur linux-4.6.6.orig/kernel/printk/printk.c linux-4.6.6/kernel/printk/printk.c
+--- linux-4.6.6.orig/kernel/printk/printk.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/printk/printk.c 2016-08-22 21:27:47.393891830 +0200
+@@ -246,6 +246,65 @@
*/
static DEFINE_RAW_SPINLOCK(logbuf_lock);
@@ -15037,7 +14768,7 @@ index bfbf284e4218..ba5e3381a8cc 100644
#ifdef CONFIG_PRINTK
DECLARE_WAIT_QUEUE_HEAD(log_wait);
/* the next printk record to read by syslog(READ) or /proc/kmsg */
-@@ -1209,6 +1268,7 @@ static int syslog_print_all(char __user *buf, int size, bool clear)
+@@ -1209,6 +1268,7 @@
{
char *text;
int len = 0;
@@ -15045,7 +14776,7 @@ index bfbf284e4218..ba5e3381a8cc 100644
text = kmalloc(LOG_LINE_MAX + PREFIX_MAX, GFP_KERNEL);
if (!text)
-@@ -1220,6 +1280,14 @@ static int syslog_print_all(char __user *buf, int size, bool clear)
+@@ -1220,6 +1280,14 @@
u64 seq;
u32 idx;
enum log_flags prev;
@@ -15060,7 +14791,7 @@ index bfbf284e4218..ba5e3381a8cc 100644
/*
* Find first record that fits, including all following records,
-@@ -1235,6 +1303,14 @@ static int syslog_print_all(char __user *buf, int size, bool clear)
+@@ -1235,6 +1303,14 @@
prev = msg->flags;
idx = log_next(idx);
seq++;
@@ -15075,7 +14806,7 @@ index bfbf284e4218..ba5e3381a8cc 100644
}
/* move first record forward until length fits into the buffer */
-@@ -1248,6 +1324,14 @@ static int syslog_print_all(char __user *buf, int size, bool clear)
+@@ -1248,6 +1324,14 @@
prev = msg->flags;
idx = log_next(idx);
seq++;
@@ -15090,7 +14821,7 @@ index bfbf284e4218..ba5e3381a8cc 100644
}
/* last message fitting into this dump */
-@@ -1288,6 +1372,7 @@ static int syslog_print_all(char __user *buf, int size, bool clear)
+@@ -1288,6 +1372,7 @@
clear_seq = log_next_seq;
clear_idx = log_next_idx;
}
@@ -15098,7 +14829,7 @@ index bfbf284e4218..ba5e3381a8cc 100644
raw_spin_unlock_irq(&logbuf_lock);
kfree(text);
-@@ -1443,6 +1528,12 @@ static void call_console_drivers(int level,
+@@ -1443,6 +1528,12 @@
if (!console_drivers)
return;
@@ -15111,7 +14842,7 @@ index bfbf284e4218..ba5e3381a8cc 100644
for_each_console(con) {
if (exclusive_console && con != exclusive_console)
continue;
-@@ -1458,6 +1549,7 @@ static void call_console_drivers(int level,
+@@ -1458,6 +1549,7 @@
else
con->write(con, text, len);
}
@@ -15119,7 +14850,7 @@ index bfbf284e4218..ba5e3381a8cc 100644
}
/*
-@@ -1620,6 +1712,13 @@ asmlinkage int vprintk_emit(int facility, int level,
+@@ -1620,6 +1712,13 @@
/* cpu currently holding logbuf_lock in this function */
static unsigned int logbuf_cpu = UINT_MAX;
@@ -15133,7 +14864,7 @@ index bfbf284e4218..ba5e3381a8cc 100644
if (level == LOGLEVEL_SCHED) {
level = LOGLEVEL_DEFAULT;
in_sched = true;
-@@ -1755,13 +1854,23 @@ asmlinkage int vprintk_emit(int facility, int level,
+@@ -1755,13 +1854,23 @@
/* If called from the scheduler, we can not call up(). */
if (!in_sched) {
@@ -15158,7 +14889,7 @@ index bfbf284e4218..ba5e3381a8cc 100644
console_unlock();
lockdep_on();
}
-@@ -1901,26 +2010,6 @@ DEFINE_PER_CPU(printk_func_t, printk_func);
+@@ -1901,26 +2010,6 @@
#endif /* CONFIG_PRINTK */
@@ -15185,7 +14916,7 @@ index bfbf284e4218..ba5e3381a8cc 100644
static int __add_preferred_console(char *name, int idx, char *options,
char *brl_options)
{
-@@ -2183,11 +2272,16 @@ static void console_cont_flush(char *text, size_t size)
+@@ -2183,11 +2272,16 @@
goto out;
len = cont_print_text(text, size);
@@ -15202,7 +14933,7 @@ index bfbf284e4218..ba5e3381a8cc 100644
return;
out:
raw_spin_unlock_irqrestore(&logbuf_lock, flags);
-@@ -2309,13 +2403,17 @@ void console_unlock(void)
+@@ -2309,13 +2403,17 @@
console_idx = log_next(console_idx);
console_seq++;
console_prev = msg->flags;
@@ -15221,7 +14952,7 @@ index bfbf284e4218..ba5e3381a8cc 100644
if (do_cond_resched)
cond_resched();
}
-@@ -2367,6 +2465,11 @@ void console_unblank(void)
+@@ -2367,6 +2465,11 @@
{
struct console *c;
@@ -15233,11 +14964,10 @@ index bfbf284e4218..ba5e3381a8cc 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 d49bfa1e53e6..b8cf7a82f4e2 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.6.6.orig/kernel/ptrace.c linux-4.6.6/kernel/ptrace.c
+--- linux-4.6.6.orig/kernel/ptrace.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/ptrace.c 2016-08-22 21:27:47.393891830 +0200
+@@ -128,7 +128,14 @@
spin_lock_irq(&task->sighand->siglock);
if (task_is_traced(task) && !__fatal_signal_pending(task)) {
@@ -15253,11 +14983,10 @@ index d49bfa1e53e6..b8cf7a82f4e2 100644
ret = true;
}
spin_unlock_irq(&task->sighand->siglock);
-diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c
-index 250ea67c1615..6349c9affa4d 100644
---- a/kernel/rcu/rcutorture.c
-+++ b/kernel/rcu/rcutorture.c
-@@ -409,6 +409,7 @@ static struct rcu_torture_ops rcu_ops = {
+diff -Nur linux-4.6.6.orig/kernel/rcu/rcutorture.c linux-4.6.6/kernel/rcu/rcutorture.c
+--- linux-4.6.6.orig/kernel/rcu/rcutorture.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/rcu/rcutorture.c 2016-08-22 21:27:47.393891830 +0200
+@@ -409,6 +409,7 @@
.name = "rcu"
};
@@ -15265,7 +14994,7 @@ index 250ea67c1615..6349c9affa4d 100644
/*
* Definitions for rcu_bh torture testing.
*/
-@@ -448,6 +449,12 @@ static struct rcu_torture_ops rcu_bh_ops = {
+@@ -448,6 +449,12 @@
.name = "rcu_bh"
};
@@ -15278,10 +15007,9 @@ index 250ea67c1615..6349c9affa4d 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 9a535a86e732..ae568fd4885b 100644
---- a/kernel/rcu/tree.c
-+++ b/kernel/rcu/tree.c
+diff -Nur linux-4.6.6.orig/kernel/rcu/tree.c linux-4.6.6/kernel/rcu/tree.c
+--- linux-4.6.6.orig/kernel/rcu/tree.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/rcu/tree.c 2016-08-22 21:27:47.397892090 +0200
@@ -56,6 +56,11 @@
#include <linux/random.h>
#include <linux/trace_events.h>
@@ -15294,7 +15022,7 @@ index 9a535a86e732..ae568fd4885b 100644
#include "tree.h"
#include "rcu.h"
-@@ -254,6 +259,19 @@ void rcu_sched_qs(void)
+@@ -254,6 +259,19 @@
this_cpu_ptr(&rcu_sched_data), true);
}
@@ -15314,7 +15042,7 @@ index 9a535a86e732..ae568fd4885b 100644
void rcu_bh_qs(void)
{
if (__this_cpu_read(rcu_bh_data.cpu_no_qs.s)) {
-@@ -263,6 +281,7 @@ void rcu_bh_qs(void)
+@@ -263,6 +281,7 @@
__this_cpu_write(rcu_bh_data.cpu_no_qs.b.norm, false);
}
}
@@ -15322,7 +15050,7 @@ index 9a535a86e732..ae568fd4885b 100644
static DEFINE_PER_CPU(int, rcu_sched_qs_mask);
-@@ -426,11 +445,13 @@ EXPORT_SYMBOL_GPL(rcu_batches_started_sched);
+@@ -426,11 +445,13 @@
/*
* Return the number of RCU BH batches started thus far for debug & stats.
*/
@@ -15336,7 +15064,7 @@ index 9a535a86e732..ae568fd4885b 100644
/*
* Return the number of RCU batches completed thus far for debug & stats.
-@@ -450,6 +471,7 @@ unsigned long rcu_batches_completed_sched(void)
+@@ -450,6 +471,7 @@
}
EXPORT_SYMBOL_GPL(rcu_batches_completed_sched);
@@ -15344,7 +15072,7 @@ index 9a535a86e732..ae568fd4885b 100644
/*
* Return the number of RCU BH batches completed thus far for debug & stats.
*/
-@@ -477,6 +499,13 @@ void rcu_bh_force_quiescent_state(void)
+@@ -477,6 +499,13 @@
}
EXPORT_SYMBOL_GPL(rcu_bh_force_quiescent_state);
@@ -15358,7 +15086,7 @@ index 9a535a86e732..ae568fd4885b 100644
/*
* Force a quiescent state for RCU-sched.
*/
-@@ -527,9 +556,11 @@ void rcutorture_get_gp_data(enum rcutorture_type test_type, int *flags,
+@@ -527,9 +556,11 @@
case RCU_FLAVOR:
rsp = rcu_state_p;
break;
@@ -15370,7 +15098,7 @@ index 9a535a86e732..ae568fd4885b 100644
case RCU_SCHED_FLAVOR:
rsp = &rcu_sched_state;
break;
-@@ -2920,18 +2951,17 @@ __rcu_process_callbacks(struct rcu_state *rsp)
+@@ -2920,18 +2951,17 @@
/*
* Do RCU core processing for the current CPU.
*/
@@ -15391,18 +15119,15 @@ index 9a535a86e732..ae568fd4885b 100644
/*
* Schedule RCU callback invocation. If the specified type of RCU
* does not support RCU priority boosting, just do a direct call,
-@@ -2943,19 +2973,106 @@ static void invoke_rcu_callbacks(struct rcu_state *rsp, struct rcu_data *rdp)
+@@ -2943,18 +2973,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)
+{
+ /*
@@ -15416,23 +15141,21 @@ index 9a535a86e732..ae568fd4885b 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;
@@ -15471,14 +15194,16 @@ index 9a535a86e732..ae568fd4885b 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,
@@ -15492,20 +15217,21 @@ index 9a535a86e732..ae568fd4885b 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.
- */
-@@ -3099,6 +3216,7 @@ void call_rcu_sched(struct rcu_head *head, rcu_callback_t func)
+@@ -3099,6 +3216,7 @@
}
EXPORT_SYMBOL_GPL(call_rcu_sched);
@@ -15513,7 +15239,7 @@ index 9a535a86e732..ae568fd4885b 100644
/*
* Queue an RCU callback for invocation after a quicker grace period.
*/
-@@ -3107,6 +3225,7 @@ void call_rcu_bh(struct rcu_head *head, rcu_callback_t func)
+@@ -3107,6 +3225,7 @@
__call_rcu(head, func, &rcu_bh_state, -1, 0);
}
EXPORT_SYMBOL_GPL(call_rcu_bh);
@@ -15521,7 +15247,7 @@ index 9a535a86e732..ae568fd4885b 100644
/*
* Queue an RCU callback for lazy invocation after a grace period.
-@@ -3198,6 +3317,7 @@ void synchronize_sched(void)
+@@ -3198,6 +3317,7 @@
}
EXPORT_SYMBOL_GPL(synchronize_sched);
@@ -15529,7 +15255,7 @@ index 9a535a86e732..ae568fd4885b 100644
/**
* synchronize_rcu_bh - wait until an rcu_bh grace period has elapsed.
*
-@@ -3224,6 +3344,7 @@ void synchronize_rcu_bh(void)
+@@ -3224,6 +3344,7 @@
wait_rcu_gp(call_rcu_bh);
}
EXPORT_SYMBOL_GPL(synchronize_rcu_bh);
@@ -15537,7 +15263,7 @@ index 9a535a86e732..ae568fd4885b 100644
/**
* get_state_synchronize_rcu - Snapshot current RCU state
-@@ -4104,6 +4225,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
+@@ -4104,6 +4225,7 @@
mutex_unlock(&rsp->barrier_mutex);
}
@@ -15545,7 +15271,7 @@ index 9a535a86e732..ae568fd4885b 100644
/**
* rcu_barrier_bh - Wait until all in-flight call_rcu_bh() callbacks complete.
*/
-@@ -4112,6 +4234,7 @@ void rcu_barrier_bh(void)
+@@ -4112,6 +4234,7 @@
_rcu_barrier(&rcu_bh_state);
}
EXPORT_SYMBOL_GPL(rcu_barrier_bh);
@@ -15553,7 +15279,7 @@ index 9a535a86e732..ae568fd4885b 100644
/**
* rcu_barrier_sched - Wait for in-flight call_rcu_sched() callbacks.
-@@ -4609,12 +4732,13 @@ void __init rcu_init(void)
+@@ -4609,12 +4732,13 @@
rcu_bootup_announce();
rcu_init_geometry();
@@ -15568,11 +15294,10 @@ index 9a535a86e732..ae568fd4885b 100644
/*
* We don't need protection against CPU-hotplug here because
-diff --git a/kernel/rcu/tree.h b/kernel/rcu/tree.h
-index df668c0f9e64..dd3efa3402fc 100644
---- a/kernel/rcu/tree.h
-+++ b/kernel/rcu/tree.h
-@@ -572,18 +572,18 @@ extern struct list_head rcu_struct_flavors;
+diff -Nur linux-4.6.6.orig/kernel/rcu/tree.h linux-4.6.6/kernel/rcu/tree.h
+--- linux-4.6.6.orig/kernel/rcu/tree.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/rcu/tree.h 2016-08-22 21:27:47.397892090 +0200
+@@ -572,18 +572,18 @@
*/
extern struct rcu_state rcu_sched_state;
@@ -15593,7 +15318,7 @@ index df668c0f9e64..dd3efa3402fc 100644
#ifndef RCU_TREE_NONCORE
-@@ -603,10 +603,9 @@ void call_rcu(struct rcu_head *head, rcu_callback_t func);
+@@ -603,10 +603,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);
@@ -15605,10 +15330,9 @@ index df668c0f9e64..dd3efa3402fc 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 efdf7b61ce12..6a4158a83375 100644
---- a/kernel/rcu/tree_plugin.h
-+++ b/kernel/rcu/tree_plugin.h
+diff -Nur linux-4.6.6.orig/kernel/rcu/tree_plugin.h linux-4.6.6/kernel/rcu/tree_plugin.h
+--- linux-4.6.6.orig/kernel/rcu/tree_plugin.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/rcu/tree_plugin.h 2016-08-22 21:27:47.401892343 +0200
@@ -24,25 +24,10 @@
* Paul E. McKenney <paulmck@linux.vnet.ibm.com>
*/
@@ -15635,7 +15359,7 @@ index efdf7b61ce12..6a4158a83375 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 */
@@ -15650,7 +15374,7 @@ index efdf7b61ce12..6a4158a83375 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? */
-@@ -428,7 +421,7 @@ void rcu_read_unlock_special(struct task_struct *t)
+@@ -428,7 +421,7 @@
}
/* Hardware IRQ handlers cannot block, complain if they get here. */
@@ -15659,7 +15383,7 @@ index efdf7b61ce12..6a4158a83375 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",
-@@ -634,15 +627,6 @@ static void rcu_preempt_check_callbacks(void)
+@@ -634,15 +627,6 @@
t->rcu_read_unlock_special.b.need_qs = true;
}
@@ -15675,7 +15399,7 @@ index efdf7b61ce12..6a4158a83375 100644
/*
* Queue a preemptible-RCU callback for invocation after a grace period.
*/
-@@ -924,6 +908,19 @@ void exit_rcu(void)
+@@ -924,6 +908,19 @@
#endif /* #else #ifdef CONFIG_PREEMPT_RCU */
@@ -15695,7 +15419,7 @@ index efdf7b61ce12..6a4158a83375 100644
#ifdef CONFIG_RCU_BOOST
#include "../locking/rtmutex_common.h"
-@@ -955,16 +952,6 @@ static void rcu_initiate_boost_trace(struct rcu_node *rnp)
+@@ -955,16 +952,6 @@
#endif /* #else #ifdef CONFIG_RCU_TRACE */
@@ -15712,7 +15436,7 @@ index efdf7b61ce12..6a4158a83375 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
-@@ -1108,23 +1095,6 @@ static void rcu_initiate_boost(struct rcu_node *rnp, unsigned long flags)
+@@ -1108,23 +1095,6 @@
}
/*
@@ -15736,7 +15460,7 @@ index efdf7b61ce12..6a4158a83375 100644
* Is the current CPU running the RCU-callbacks kthread?
* Caller must have preemption disabled.
*/
-@@ -1178,67 +1148,6 @@ static int rcu_spawn_one_boost_kthread(struct rcu_state *rsp,
+@@ -1178,67 +1148,6 @@
return 0;
}
@@ -15804,7 +15528,7 @@ index efdf7b61ce12..6a4158a83375 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
-@@ -1268,26 +1177,12 @@ static void rcu_boost_kthread_setaffinity(struct rcu_node *rnp, int outgoingcpu)
+@@ -1268,26 +1177,12 @@
free_cpumask_var(cm);
}
@@ -15831,7 +15555,7 @@ index efdf7b61ce12..6a4158a83375 100644
rcu_for_each_leaf_node(rcu_state_p, rnp)
(void)rcu_spawn_one_boost_kthread(rcu_state_p, rnp);
}
-@@ -1310,11 +1205,6 @@ static void rcu_initiate_boost(struct rcu_node *rnp, unsigned long flags)
+@@ -1310,11 +1205,6 @@
raw_spin_unlock_irqrestore_rcu_node(rnp, flags);
}
@@ -15843,7 +15567,7 @@ index efdf7b61ce12..6a4158a83375 100644
static bool rcu_is_callbacks_kthread(void)
{
return false;
-@@ -1338,7 +1228,7 @@ static void rcu_prepare_kthreads(int cpu)
+@@ -1338,7 +1228,7 @@
#endif /* #else #ifdef CONFIG_RCU_BOOST */
@@ -15852,7 +15576,7 @@ index efdf7b61ce12..6a4158a83375 100644
/*
* Check to see if any future RCU-related work will need to be done
-@@ -1355,7 +1245,9 @@ int rcu_needs_cpu(u64 basemono, u64 *nextevt)
+@@ -1355,7 +1245,9 @@
return IS_ENABLED(CONFIG_RCU_NOCB_CPU_ALL)
? 0 : rcu_cpu_has_callbacks(NULL);
}
@@ -15862,7 +15586,7 @@ index efdf7b61ce12..6a4158a83375 100644
/*
* Because we do not have RCU_FAST_NO_HZ, don't bother cleaning up
* after it.
-@@ -1451,6 +1343,8 @@ static bool __maybe_unused rcu_try_advance_all_cbs(void)
+@@ -1451,6 +1343,8 @@
return cbs_ready;
}
@@ -15871,7 +15595,7 @@ index efdf7b61ce12..6a4158a83375 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
-@@ -1496,6 +1390,7 @@ int rcu_needs_cpu(u64 basemono, u64 *nextevt)
+@@ -1496,6 +1390,7 @@
*nextevt = basemono + dj * TICK_NSEC;
return 0;
}
@@ -15879,11 +15603,10 @@ index efdf7b61ce12..6a4158a83375 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 ca828b41c938..6cbf7a9aa70f 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.6.6.orig/kernel/rcu/update.c linux-4.6.6/kernel/rcu/update.c
+--- linux-4.6.6.orig/kernel/rcu/update.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/rcu/update.c 2016-08-22 21:27:47.401892343 +0200
+@@ -295,6 +295,7 @@
}
EXPORT_SYMBOL_GPL(rcu_read_lock_held);
@@ -15891,7 +15614,7 @@ index ca828b41c938..6cbf7a9aa70f 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 +322,7 @@
return in_softirq() || irqs_disabled();
}
EXPORT_SYMBOL_GPL(rcu_read_lock_bh_held);
@@ -15899,11 +15622,10 @@ index ca828b41c938..6cbf7a9aa70f 100644
#endif /* #ifdef CONFIG_DEBUG_LOCK_ALLOC */
-diff --git a/kernel/relay.c b/kernel/relay.c
-index 074994bcfa9b..7206cef7d6da 100644
---- a/kernel/relay.c
-+++ b/kernel/relay.c
-@@ -336,6 +336,10 @@ static void wakeup_readers(unsigned long data)
+diff -Nur linux-4.6.6.orig/kernel/relay.c linux-4.6.6/kernel/relay.c
+--- linux-4.6.6.orig/kernel/relay.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/relay.c 2016-08-22 21:27:47.405892600 +0200
+@@ -336,6 +336,10 @@
{
struct rchan_buf *buf = (struct rchan_buf *)data;
wake_up_interruptible(&buf->read_wait);
@@ -15914,7 +15636,7 @@ index 074994bcfa9b..7206cef7d6da 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);
@@ -15922,7 +15644,7 @@ index 074994bcfa9b..7206cef7d6da 100644
} else
del_timer_sync(&buf->timer);
-@@ -736,15 +741,6 @@ size_t relay_switch_subbuf(struct rchan_buf *buf, size_t length)
+@@ -736,15 +741,6 @@
else
buf->early_bytes += buf->chan->subbuf_size -
buf->padding[old_subbuf];
@@ -15938,24 +15660,10 @@ index 074994bcfa9b..7206cef7d6da 100644
}
old = buf->data;
-diff --git a/kernel/sched/Makefile b/kernel/sched/Makefile
-index 414d9c16da42..5aaddf5838e9 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.6.6.orig/kernel/sched/completion.c linux-4.6.6/kernel/sched/completion.c
+--- linux-4.6.6.orig/kernel/sched/completion.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/sched/completion.c 2016-08-22 21:27:47.405892600 +0200
+@@ -30,10 +30,10 @@
{
unsigned long flags;
@@ -15969,7 +15677,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;
@@ -15983,7 +15691,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) {
@@ -16009,7 +15717,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();
@@ -16021,7 +15729,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;
@@ -16036,7 +15744,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();
@@ -16045,11 +15753,10 @@ index 8d0f35debf35..b62cf6400fe0 100644
return true;
}
EXPORT_SYMBOL(completion_done);
-diff --git a/kernel/sched/core.c b/kernel/sched/core.c
-index 11546a6ed5df..140ee06079b6 100644
---- a/kernel/sched/core.c
-+++ b/kernel/sched/core.c
-@@ -128,7 +128,11 @@ const_debug unsigned int sysctl_sched_features =
+diff -Nur linux-4.6.6.orig/kernel/sched/core.c linux-4.6.6/kernel/sched/core.c
+--- linux-4.6.6.orig/kernel/sched/core.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/sched/core.c 2016-08-22 21:27:47.413893109 +0200
+@@ -128,7 +128,11 @@
* Number of tasks to iterate in a single balance run.
* Limited because this is done with IRQs disabled.
*/
@@ -16061,7 +15768,7 @@ index 11546a6ed5df..140ee06079b6 100644
/*
* period over which we average the RT time consumption, measured
-@@ -306,6 +310,7 @@ static void init_rq_hrtick(struct rq *rq)
+@@ -306,6 +310,7 @@
hrtimer_init(&rq->hrtick_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
rq->hrtick_timer.function = hrtick;
@@ -16069,7 +15776,7 @@ index 11546a6ed5df..140ee06079b6 100644
}
#else /* CONFIG_SCHED_HRTICK */
static inline void hrtick_clear(struct rq *rq)
-@@ -414,7 +419,7 @@ void wake_q_add(struct wake_q_head *head, struct task_struct *task)
+@@ -414,7 +419,7 @@
head->lastp = &node->next;
}
@@ -16078,7 +15785,7 @@ index 11546a6ed5df..140ee06079b6 100644
{
struct wake_q_node *node = head->first;
-@@ -431,7 +436,10 @@ void wake_up_q(struct wake_q_head *head)
+@@ -431,7 +436,10 @@
* wake_up_process() implies a wmb() to pair with the queueing
* in wake_q_add() so as not to miss wakeups.
*/
@@ -16090,7 +15797,7 @@ index 11546a6ed5df..140ee06079b6 100644
put_task_struct(task);
}
}
-@@ -467,6 +475,38 @@ void resched_curr(struct rq *rq)
+@@ -467,6 +475,38 @@
trace_sched_wake_idle_without_ipi(cpu);
}
@@ -16129,7 +15836,7 @@ index 11546a6ed5df..140ee06079b6 100644
void resched_cpu(int cpu)
{
struct rq *rq = cpu_rq(cpu);
-@@ -490,11 +530,14 @@ void resched_cpu(int cpu)
+@@ -490,11 +530,14 @@
*/
int get_nohz_timer_target(void)
{
@@ -16146,7 +15853,7 @@ index 11546a6ed5df..140ee06079b6 100644
rcu_read_lock();
for_each_domain(cpu, sd) {
-@@ -510,6 +553,8 @@ int get_nohz_timer_target(void)
+@@ -510,6 +553,8 @@
cpu = housekeeping_any_cpu();
unlock:
rcu_read_unlock();
@@ -16155,7 +15862,7 @@ index 11546a6ed5df..140ee06079b6 100644
return cpu;
}
/*
-@@ -1051,6 +1096,11 @@ void do_set_cpus_allowed(struct task_struct *p, const struct cpumask *new_mask)
+@@ -1051,6 +1096,11 @@
lockdep_assert_held(&p->pi_lock);
@@ -16167,7 +15874,7 @@ index 11546a6ed5df..140ee06079b6 100644
queued = task_on_rq_queued(p);
running = task_current(rq, p);
-@@ -1073,6 +1123,84 @@ void do_set_cpus_allowed(struct task_struct *p, const struct cpumask *new_mask)
+@@ -1073,6 +1123,84 @@
enqueue_task(rq, p, ENQUEUE_RESTORE);
}
@@ -16252,7 +15959,7 @@ index 11546a6ed5df..140ee06079b6 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
-@@ -1112,7 +1240,7 @@ static int __set_cpus_allowed_ptr(struct task_struct *p,
+@@ -1112,7 +1240,7 @@
do_set_cpus_allowed(p, new_mask);
/* Can the task run on the task's current CPU? If so, we're done */
@@ -16261,7 +15968,7 @@ index 11546a6ed5df..140ee06079b6 100644
goto out;
dest_cpu = cpumask_any_and(cpu_active_mask, new_mask);
-@@ -1299,6 +1427,18 @@ int migrate_swap(struct task_struct *cur, struct task_struct *p)
+@@ -1299,6 +1427,18 @@
return ret;
}
@@ -16280,7 +15987,7 @@ index 11546a6ed5df..140ee06079b6 100644
/*
* wait_task_inactive - wait for a thread to unschedule.
*
-@@ -1343,7 +1483,7 @@ unsigned long wait_task_inactive(struct task_struct *p, long match_state)
+@@ -1343,7 +1483,7 @@
* is actually now running somewhere else!
*/
while (task_running(rq, p)) {
@@ -16289,7 +15996,7 @@ index 11546a6ed5df..140ee06079b6 100644
return 0;
cpu_relax();
}
-@@ -1358,7 +1498,8 @@ unsigned long wait_task_inactive(struct task_struct *p, long match_state)
+@@ -1358,7 +1498,8 @@
running = task_running(rq, p);
queued = task_on_rq_queued(p);
ncsw = 0;
@@ -16299,7 +16006,7 @@ index 11546a6ed5df..140ee06079b6 100644
ncsw = p->nvcsw | LONG_MIN; /* sets MSB */
task_rq_unlock(rq, p, &flags);
-@@ -1515,7 +1656,7 @@ int select_task_rq(struct task_struct *p, int cpu, int sd_flags, int wake_flags)
+@@ -1515,7 +1656,7 @@
{
lockdep_assert_held(&p->pi_lock);
@@ -16308,7 +16015,7 @@ index 11546a6ed5df..140ee06079b6 100644
cpu = p->sched_class->select_task_rq(p, cpu, sd_flags, wake_flags);
/*
-@@ -1595,10 +1736,6 @@ static inline void ttwu_activate(struct rq *rq, struct task_struct *p, int en_fl
+@@ -1595,10 +1736,6 @@
{
activate_task(rq, p, en_flags);
p->on_rq = TASK_ON_RQ_QUEUED;
@@ -16319,7 +16026,7 @@ index 11546a6ed5df..140ee06079b6 100644
}
/*
-@@ -1916,8 +2053,27 @@ try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags)
+@@ -1916,8 +2053,27 @@
*/
smp_mb__before_spinlock();
raw_spin_lock_irqsave(&p->pi_lock, flags);
@@ -16348,7 +16055,7 @@ index 11546a6ed5df..140ee06079b6 100644
trace_sched_waking(p);
-@@ -1982,53 +2138,6 @@ try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags)
+@@ -1982,53 +2138,6 @@
}
/**
@@ -16402,7 +16109,7 @@ index 11546a6ed5df..140ee06079b6 100644
* wake_up_process - Wake up a specific process
* @p: The process to be woken up.
*
-@@ -2046,6 +2155,18 @@ int wake_up_process(struct task_struct *p)
+@@ -2046,6 +2155,18 @@
}
EXPORT_SYMBOL(wake_up_process);
@@ -16421,7 +16128,7 @@ index 11546a6ed5df..140ee06079b6 100644
int wake_up_state(struct task_struct *p, unsigned int state)
{
return try_to_wake_up(p, state, 0);
-@@ -2303,6 +2424,9 @@ int sched_fork(unsigned long clone_flags, struct task_struct *p)
+@@ -2303,6 +2424,9 @@
p->on_cpu = 0;
#endif
init_task_preempt_count(p);
@@ -16431,7 +16138,7 @@ index 11546a6ed5df..140ee06079b6 100644
#ifdef CONFIG_SMP
plist_node_init(&p->pushable_tasks, MAX_PRIO);
RB_CLEAR_NODE(&p->pushable_dl_tasks);
-@@ -2627,8 +2751,12 @@ static struct rq *finish_task_switch(struct task_struct *prev)
+@@ -2627,8 +2751,12 @@
finish_arch_post_lock_switch();
fire_sched_in_preempt_notifiers(current);
@@ -16445,7 +16152,7 @@ index 11546a6ed5df..140ee06079b6 100644
if (unlikely(prev_state == TASK_DEAD)) {
if (prev->sched_class->task_dead)
prev->sched_class->task_dead(prev);
-@@ -3062,6 +3190,77 @@ static inline void schedule_debug(struct task_struct *prev)
+@@ -3062,6 +3190,77 @@
schedstat_inc(this_rq(), sched_count);
}
@@ -16523,7 +16230,7 @@ index 11546a6ed5df..140ee06079b6 100644
/*
* Pick up the highest-prio task:
*/
-@@ -3188,19 +3387,6 @@ static void __sched notrace __schedule(bool preempt)
+@@ -3188,19 +3387,6 @@
} else {
deactivate_task(rq, prev, DEQUEUE_SLEEP);
prev->on_rq = 0;
@@ -16543,7 +16250,7 @@ index 11546a6ed5df..140ee06079b6 100644
}
switch_count = &prev->nvcsw;
}
-@@ -3210,6 +3396,7 @@ static void __sched notrace __schedule(bool preempt)
+@@ -3210,6 +3396,7 @@
next = pick_next_task(rq, prev);
clear_tsk_need_resched(prev);
@@ -16551,7 +16258,7 @@ index 11546a6ed5df..140ee06079b6 100644
clear_preempt_need_resched();
rq->clock_skip_update = 0;
-@@ -3231,9 +3418,20 @@ STACK_FRAME_NON_STANDARD(__schedule); /* switch_to() */
+@@ -3231,9 +3418,20 @@
static inline void sched_submit_work(struct task_struct *tsk)
{
@@ -16573,7 +16280,7 @@ index 11546a6ed5df..140ee06079b6 100644
* If we are going to sleep and we have plugged IO queued,
* make sure to submit it to avoid deadlocks.
*/
-@@ -3241,6 +3439,12 @@ static inline void sched_submit_work(struct task_struct *tsk)
+@@ -3241,6 +3439,12 @@
blk_schedule_flush_plug(tsk);
}
@@ -16586,7 +16293,7 @@ index 11546a6ed5df..140ee06079b6 100644
asmlinkage __visible void __sched schedule(void)
{
struct task_struct *tsk = current;
-@@ -3251,6 +3455,7 @@ asmlinkage __visible void __sched schedule(void)
+@@ -3251,6 +3455,7 @@
__schedule(false);
sched_preempt_enable_no_resched();
} while (need_resched());
@@ -16594,7 +16301,7 @@ index 11546a6ed5df..140ee06079b6 100644
}
EXPORT_SYMBOL(schedule);
-@@ -3299,6 +3504,30 @@ static void __sched notrace preempt_schedule_common(void)
+@@ -3299,6 +3504,30 @@
} while (need_resched());
}
@@ -16625,7 +16332,7 @@ index 11546a6ed5df..140ee06079b6 100644
#ifdef CONFIG_PREEMPT
/*
* this is the entry point to schedule() from in-kernel preemption
-@@ -3313,6 +3542,8 @@ asmlinkage __visible void __sched notrace preempt_schedule(void)
+@@ -3313,6 +3542,8 @@
*/
if (likely(!preemptible()))
return;
@@ -16634,7 +16341,7 @@ index 11546a6ed5df..140ee06079b6 100644
preempt_schedule_common();
}
-@@ -3339,6 +3570,8 @@ asmlinkage __visible void __sched notrace preempt_schedule_notrace(void)
+@@ -3339,6 +3570,8 @@
if (likely(!preemptible()))
return;
@@ -16643,7 +16350,7 @@ index 11546a6ed5df..140ee06079b6 100644
do {
preempt_disable_notrace();
-@@ -3348,7 +3581,16 @@ asmlinkage __visible void __sched notrace preempt_schedule_notrace(void)
+@@ -3348,7 +3581,16 @@
* an infinite recursion.
*/
prev_ctx = exception_enter();
@@ -16660,7 +16367,7 @@ index 11546a6ed5df..140ee06079b6 100644
exception_exit(prev_ctx);
preempt_enable_no_resched_notrace();
-@@ -4693,6 +4935,7 @@ int __cond_resched_lock(spinlock_t *lock)
+@@ -4693,6 +4935,7 @@
}
EXPORT_SYMBOL(__cond_resched_lock);
@@ -16668,7 +16375,7 @@ index 11546a6ed5df..140ee06079b6 100644
int __sched __cond_resched_softirq(void)
{
BUG_ON(!in_softirq());
-@@ -4706,6 +4949,7 @@ int __sched __cond_resched_softirq(void)
+@@ -4706,6 +4949,7 @@
return 0;
}
EXPORT_SYMBOL(__cond_resched_softirq);
@@ -16676,7 +16383,7 @@ index 11546a6ed5df..140ee06079b6 100644
/**
* yield - yield the current processor to other threads.
-@@ -5072,7 +5316,9 @@ void init_idle(struct task_struct *idle, int cpu)
+@@ -5074,7 +5318,9 @@
/* Set the preempt count _outside_ the spinlocks! */
init_idle_preempt_count(idle, cpu);
@@ -16687,7 +16394,7 @@ index 11546a6ed5df..140ee06079b6 100644
/*
* The idle tasks have their own, simple scheduling class:
*/
-@@ -5213,6 +5459,8 @@ void sched_setnuma(struct task_struct *p, int nid)
+@@ -5215,6 +5461,8 @@
#endif /* CONFIG_NUMA_BALANCING */
#ifdef CONFIG_HOTPLUG_CPU
@@ -16696,7 +16403,7 @@ index 11546a6ed5df..140ee06079b6 100644
/*
* Ensures that the idle task is using init_mm right before its cpu goes
* offline.
-@@ -5227,7 +5475,11 @@ void idle_task_exit(void)
+@@ -5229,7 +5477,11 @@
switch_mm(mm, &init_mm, current);
finish_arch_post_lock_switch();
}
@@ -16709,7 +16416,7 @@ index 11546a6ed5df..140ee06079b6 100644
}
/*
-@@ -5423,6 +5675,10 @@ migration_call(struct notifier_block *nfb, unsigned long action, void *hcpu)
+@@ -5425,6 +5677,10 @@
case CPU_DEAD:
calc_load_migrate(rq);
@@ -16720,7 +16427,7 @@ index 11546a6ed5df..140ee06079b6 100644
break;
#endif
}
-@@ -7405,7 +7661,7 @@ void __init sched_init(void)
+@@ -7407,7 +7663,7 @@
#ifdef CONFIG_DEBUG_ATOMIC_SLEEP
static inline int preempt_count_equals(int preempt_offset)
{
@@ -16729,11 +16436,10 @@ index 11546a6ed5df..140ee06079b6 100644
return (nested == preempt_offset);
}
-diff --git a/kernel/sched/cpudeadline.c b/kernel/sched/cpudeadline.c
-index 5a75b08cfd85..5be58820465c 100644
---- a/kernel/sched/cpudeadline.c
-+++ b/kernel/sched/cpudeadline.c
-@@ -103,10 +103,10 @@ int cpudl_find(struct cpudl *cp, struct task_struct *p,
+diff -Nur linux-4.6.6.orig/kernel/sched/cpudeadline.c linux-4.6.6/kernel/sched/cpudeadline.c
+--- linux-4.6.6.orig/kernel/sched/cpudeadline.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/sched/cpudeadline.c 2016-08-22 21:27:47.413893109 +0200
+@@ -103,10 +103,10 @@
const struct sched_dl_entity *dl_se = &p->dl;
if (later_mask &&
@@ -16746,11 +16452,10 @@ index 5a75b08cfd85..5be58820465c 100644
dl_time_before(dl_se->deadline, cp->elements[0].dl)) {
best_cpu = cpudl_maximum(cp);
if (later_mask)
-diff --git a/kernel/sched/cpupri.c b/kernel/sched/cpupri.c
-index 981fcd7dc394..11e9705bf937 100644
---- a/kernel/sched/cpupri.c
-+++ b/kernel/sched/cpupri.c
-@@ -103,11 +103,11 @@ int cpupri_find(struct cpupri *cp, struct task_struct *p,
+diff -Nur linux-4.6.6.orig/kernel/sched/cpupri.c linux-4.6.6/kernel/sched/cpupri.c
+--- linux-4.6.6.orig/kernel/sched/cpupri.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/sched/cpupri.c 2016-08-22 21:27:47.413893109 +0200
+@@ -103,11 +103,11 @@
if (skip)
continue;
@@ -16764,11 +16469,10 @@ index 981fcd7dc394..11e9705bf937 100644
/*
* We have to ensure that we have at least one bit
-diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c
-index 686ec8adf952..8099333b5e1d 100644
---- a/kernel/sched/deadline.c
-+++ b/kernel/sched/deadline.c
-@@ -134,7 +134,7 @@ static void inc_dl_migration(struct sched_dl_entity *dl_se, struct dl_rq *dl_rq)
+diff -Nur linux-4.6.6.orig/kernel/sched/deadline.c linux-4.6.6/kernel/sched/deadline.c
+--- linux-4.6.6.orig/kernel/sched/deadline.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/sched/deadline.c 2016-08-22 21:27:47.413893109 +0200
+@@ -134,7 +134,7 @@
{
struct task_struct *p = dl_task_of(dl_se);
@@ -16777,7 +16481,7 @@ index 686ec8adf952..8099333b5e1d 100644
dl_rq->dl_nr_migratory++;
update_dl_migration(dl_rq);
-@@ -144,7 +144,7 @@ static void dec_dl_migration(struct sched_dl_entity *dl_se, struct dl_rq *dl_rq)
+@@ -144,7 +144,7 @@
{
struct task_struct *p = dl_task_of(dl_se);
@@ -16786,7 +16490,7 @@ index 686ec8adf952..8099333b5e1d 100644
dl_rq->dl_nr_migratory--;
update_dl_migration(dl_rq);
-@@ -694,6 +694,7 @@ void init_dl_task_timer(struct sched_dl_entity *dl_se)
+@@ -694,6 +694,7 @@
hrtimer_init(timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
timer->function = dl_task_timer;
@@ -16794,7 +16498,7 @@ index 686ec8adf952..8099333b5e1d 100644
}
static
-@@ -966,7 +967,7 @@ static void enqueue_task_dl(struct rq *rq, struct task_struct *p, int flags)
+@@ -966,7 +967,7 @@
enqueue_dl_entity(&p->dl, pi_se, flags);
@@ -16803,7 +16507,7 @@ index 686ec8adf952..8099333b5e1d 100644
enqueue_pushable_dl_task(rq, p);
}
-@@ -1040,9 +1041,9 @@ select_task_rq_dl(struct task_struct *p, int cpu, int sd_flag, int flags)
+@@ -1040,9 +1041,9 @@
* try to make it stay here, it might be important.
*/
if (unlikely(dl_task(curr)) &&
@@ -16815,7 +16519,7 @@ index 686ec8adf952..8099333b5e1d 100644
int target = find_later_rq(p);
if (target != -1 &&
-@@ -1063,7 +1064,7 @@ static void check_preempt_equal_dl(struct rq *rq, struct task_struct *p)
+@@ -1063,7 +1064,7 @@
* Current can't be migrated, useless to reschedule,
* let's hope p can move out.
*/
@@ -16824,7 +16528,7 @@ index 686ec8adf952..8099333b5e1d 100644
cpudl_find(&rq->rd->cpudl, rq->curr, NULL) == -1)
return;
-@@ -1071,7 +1072,7 @@ static void check_preempt_equal_dl(struct rq *rq, struct task_struct *p)
+@@ -1071,7 +1072,7 @@
* p is migratable, so let's not schedule it and
* see if it is pushed or pulled somewhere else.
*/
@@ -16833,7 +16537,7 @@ index 686ec8adf952..8099333b5e1d 100644
cpudl_find(&rq->rd->cpudl, p, NULL) != -1)
return;
-@@ -1185,7 +1186,7 @@ static void put_prev_task_dl(struct rq *rq, struct task_struct *p)
+@@ -1185,7 +1186,7 @@
{
update_curr_dl(rq);
@@ -16842,7 +16546,7 @@ index 686ec8adf952..8099333b5e1d 100644
enqueue_pushable_dl_task(rq, p);
}
-@@ -1286,7 +1287,7 @@ static int find_later_rq(struct task_struct *task)
+@@ -1286,7 +1287,7 @@
if (unlikely(!later_mask))
return -1;
@@ -16851,7 +16555,7 @@ index 686ec8adf952..8099333b5e1d 100644
return -1;
/*
-@@ -1392,7 +1393,7 @@ static struct rq *find_lock_later_rq(struct task_struct *task, struct rq *rq)
+@@ -1392,7 +1393,7 @@
if (double_lock_balance(rq, later_rq)) {
if (unlikely(task_rq(task) != rq ||
!cpumask_test_cpu(later_rq->cpu,
@@ -16860,7 +16564,7 @@ index 686ec8adf952..8099333b5e1d 100644
task_running(rq, task) ||
!dl_task(task) ||
!task_on_rq_queued(task))) {
-@@ -1432,7 +1433,7 @@ static struct task_struct *pick_next_pushable_dl_task(struct rq *rq)
+@@ -1432,7 +1433,7 @@
BUG_ON(rq->cpu != task_cpu(p));
BUG_ON(task_current(rq, p));
@@ -16869,7 +16573,7 @@ index 686ec8adf952..8099333b5e1d 100644
BUG_ON(!task_on_rq_queued(p));
BUG_ON(!dl_task(p));
-@@ -1471,7 +1472,7 @@ static int push_dl_task(struct rq *rq)
+@@ -1471,7 +1472,7 @@
*/
if (dl_task(rq->curr) &&
dl_time_before(next_task->dl.deadline, rq->curr->dl.deadline) &&
@@ -16878,7 +16582,7 @@ index 686ec8adf952..8099333b5e1d 100644
resched_curr(rq);
return 0;
}
-@@ -1618,9 +1619,9 @@ static void task_woken_dl(struct rq *rq, struct task_struct *p)
+@@ -1618,9 +1619,9 @@
{
if (!task_running(rq, p) &&
!test_tsk_need_resched(rq->curr) &&
@@ -16890,7 +16594,7 @@ index 686ec8adf952..8099333b5e1d 100644
!dl_entity_preempt(&p->dl, &rq->curr->dl))) {
push_dl_tasks(rq);
}
-@@ -1724,7 +1725,7 @@ static void switched_to_dl(struct rq *rq, struct task_struct *p)
+@@ -1724,7 +1725,7 @@
if (task_on_rq_queued(p) && rq->curr != p) {
#ifdef CONFIG_SMP
@@ -16899,11 +16603,10 @@ index 686ec8adf952..8099333b5e1d 100644
queue_push_tasks(rq);
#else
if (dl_task(rq->curr))
-diff --git a/kernel/sched/debug.c b/kernel/sched/debug.c
-index 4fbc3bd5ff60..5503c1f4290a 100644
---- a/kernel/sched/debug.c
-+++ b/kernel/sched/debug.c
-@@ -559,6 +559,9 @@ void print_rt_rq(struct seq_file *m, int cpu, struct rt_rq *rt_rq)
+diff -Nur linux-4.6.6.orig/kernel/sched/debug.c linux-4.6.6/kernel/sched/debug.c
+--- linux-4.6.6.orig/kernel/sched/debug.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/sched/debug.c 2016-08-22 21:27:47.413893109 +0200
+@@ -559,6 +559,9 @@
P(rt_throttled);
PN(rt_time);
PN(rt_runtime);
@@ -16913,7 +16616,7 @@ index 4fbc3bd5ff60..5503c1f4290a 100644
#undef PN
#undef P
-@@ -954,6 +957,10 @@ void proc_sched_show_task(struct task_struct *p, struct seq_file *m)
+@@ -954,6 +957,10 @@
#endif
P(policy);
P(prio);
@@ -16924,11 +16627,10 @@ index 4fbc3bd5ff60..5503c1f4290a 100644
#undef PN
#undef __PN
#undef P
-diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
-index eeaf920f46b9..3b66683e5b3f 100644
---- a/kernel/sched/fair.c
-+++ b/kernel/sched/fair.c
-@@ -3335,7 +3335,7 @@ check_preempt_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr)
+diff -Nur linux-4.6.6.orig/kernel/sched/fair.c linux-4.6.6/kernel/sched/fair.c
+--- linux-4.6.6.orig/kernel/sched/fair.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/sched/fair.c 2016-08-22 21:27:47.413893109 +0200
+@@ -3333,7 +3333,7 @@
ideal_runtime = sched_slice(cfs_rq, curr);
delta_exec = curr->sum_exec_runtime - curr->prev_sum_exec_runtime;
if (delta_exec > ideal_runtime) {
@@ -16937,7 +16639,7 @@ index eeaf920f46b9..3b66683e5b3f 100644
/*
* The current task ran long enough, ensure it doesn't get
* re-elected due to buddy favours.
-@@ -3359,7 +3359,7 @@ check_preempt_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr)
+@@ -3357,7 +3357,7 @@
return;
if (delta > ideal_runtime)
@@ -16946,7 +16648,7 @@ index eeaf920f46b9..3b66683e5b3f 100644
}
static void
-@@ -3504,7 +3504,7 @@ entity_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr, int queued)
+@@ -3502,7 +3502,7 @@
* validating it and just reschedule.
*/
if (queued) {
@@ -16955,7 +16657,7 @@ index eeaf920f46b9..3b66683e5b3f 100644
return;
}
/*
-@@ -3686,7 +3686,7 @@ static void __account_cfs_rq_runtime(struct cfs_rq *cfs_rq, u64 delta_exec)
+@@ -3684,7 +3684,7 @@
* hierarchy can be throttled
*/
if (!assign_cfs_rq_runtime(cfs_rq) && likely(cfs_rq->curr))
@@ -16964,7 +16666,7 @@ index eeaf920f46b9..3b66683e5b3f 100644
}
static __always_inline
-@@ -4298,7 +4298,7 @@ static void hrtick_start_fair(struct rq *rq, struct task_struct *p)
+@@ -4296,7 +4296,7 @@
if (delta < 0) {
if (rq->curr == p)
@@ -16973,7 +16675,7 @@ index eeaf920f46b9..3b66683e5b3f 100644
return;
}
hrtick_start(rq, delta);
-@@ -5438,7 +5438,7 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_
+@@ -5441,7 +5441,7 @@
return;
preempt:
@@ -16982,7 +16684,7 @@ index eeaf920f46b9..3b66683e5b3f 100644
/*
* Only set the backward buddy when the current task is still
* on the rq. This can happen when a wakeup gets interleaved
-@@ -8189,7 +8189,7 @@ static void task_fork_fair(struct task_struct *p)
+@@ -8192,7 +8192,7 @@
* 'current' within the tree based on its new key value.
*/
swap(curr->vruntime, se->vruntime);
@@ -16991,7 +16693,7 @@ index eeaf920f46b9..3b66683e5b3f 100644
}
se->vruntime -= cfs_rq->min_vruntime;
-@@ -8214,7 +8214,7 @@ prio_changed_fair(struct rq *rq, struct task_struct *p, int oldprio)
+@@ -8217,7 +8217,7 @@
*/
if (rq->curr == p) {
if (p->prio > oldprio)
@@ -17000,11 +16702,10 @@ index eeaf920f46b9..3b66683e5b3f 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.6.6.orig/kernel/sched/features.h linux-4.6.6/kernel/sched/features.h
+--- linux-4.6.6.orig/kernel/sched/features.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/sched/features.h 2016-08-22 21:27:47.413893109 +0200
+@@ -45,11 +45,19 @@
*/
SCHED_FEAT(NONTASK_CAPACITY, true)
@@ -17024,11 +16725,22 @@ index 69631fa46c2f..6d28fcd08872 100644
#ifdef HAVE_RT_PUSH_IPI
/*
-diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c
-index ec4f538d4396..f7b281059ddf 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.6.6.orig/kernel/sched/Makefile linux-4.6.6/kernel/sched/Makefile
+--- linux-4.6.6.orig/kernel/sched/Makefile 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/sched/Makefile 2016-08-22 21:27:47.405892600 +0200
+@@ -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.6.6.orig/kernel/sched/rt.c linux-4.6.6/kernel/sched/rt.c
+--- linux-4.6.6.orig/kernel/sched/rt.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/sched/rt.c 2016-08-22 21:27:47.417893368 +0200
+@@ -47,6 +47,7 @@
hrtimer_init(&rt_b->rt_period_timer,
CLOCK_MONOTONIC, HRTIMER_MODE_REL);
@@ -17036,7 +16748,7 @@ index ec4f538d4396..f7b281059ddf 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);
@@ -17044,7 +16756,7 @@ index ec4f538d4396..f7b281059ddf 100644
#endif
#endif /* CONFIG_SMP */
/* We start is dequeued state, because no RT tasks are queued */
-@@ -334,7 +336,7 @@ static void inc_rt_migration(struct sched_rt_entity *rt_se, struct rt_rq *rt_rq)
+@@ -334,7 +336,7 @@
rt_rq = &rq_of_rt_rq(rt_rq)->rt;
rt_rq->rt_nr_total++;
@@ -17053,7 +16765,7 @@ index ec4f538d4396..f7b281059ddf 100644
rt_rq->rt_nr_migratory++;
update_rt_migration(rt_rq);
-@@ -351,7 +353,7 @@ static void dec_rt_migration(struct sched_rt_entity *rt_se, struct rt_rq *rt_rq)
+@@ -351,7 +353,7 @@
rt_rq = &rq_of_rt_rq(rt_rq)->rt;
rt_rq->rt_nr_total--;
@@ -17062,7 +16774,7 @@ index ec4f538d4396..f7b281059ddf 100644
rt_rq->rt_nr_migratory--;
update_rt_migration(rt_rq);
-@@ -1324,7 +1326,7 @@ enqueue_task_rt(struct rq *rq, struct task_struct *p, int flags)
+@@ -1324,7 +1326,7 @@
enqueue_rt_entity(rt_se, flags);
@@ -17071,7 +16783,7 @@ index ec4f538d4396..f7b281059ddf 100644
enqueue_pushable_task(rq, p);
}
-@@ -1413,7 +1415,7 @@ select_task_rq_rt(struct task_struct *p, int cpu, int sd_flag, int flags)
+@@ -1413,7 +1415,7 @@
* will have to sort it out.
*/
if (curr && unlikely(rt_task(curr)) &&
@@ -17080,7 +16792,7 @@ index ec4f538d4396..f7b281059ddf 100644
curr->prio <= p->prio)) {
int target = find_lowest_rq(p);
-@@ -1437,7 +1439,7 @@ static void check_preempt_equal_prio(struct rq *rq, struct task_struct *p)
+@@ -1437,7 +1439,7 @@
* Current can't be migrated, useless to reschedule,
* let's hope p can move out.
*/
@@ -17089,7 +16801,7 @@ index ec4f538d4396..f7b281059ddf 100644
!cpupri_find(&rq->rd->cpupri, rq->curr, NULL))
return;
-@@ -1445,7 +1447,7 @@ static void check_preempt_equal_prio(struct rq *rq, struct task_struct *p)
+@@ -1445,7 +1447,7 @@
* p is migratable, so let's not schedule it and
* see if it is pushed or pulled somewhere else.
*/
@@ -17098,7 +16810,7 @@ index ec4f538d4396..f7b281059ddf 100644
&& cpupri_find(&rq->rd->cpupri, p, NULL))
return;
-@@ -1579,7 +1581,7 @@ static void put_prev_task_rt(struct rq *rq, struct task_struct *p)
+@@ -1579,7 +1581,7 @@
* The previous task needs to be made eligible for pushing
* if it is still active
*/
@@ -17107,7 +16819,7 @@ index ec4f538d4396..f7b281059ddf 100644
enqueue_pushable_task(rq, p);
}
-@@ -1629,7 +1631,7 @@ static int find_lowest_rq(struct task_struct *task)
+@@ -1629,7 +1631,7 @@
if (unlikely(!lowest_mask))
return -1;
@@ -17116,7 +16828,7 @@ index ec4f538d4396..f7b281059ddf 100644
return -1; /* No other targets possible */
if (!cpupri_find(&task_rq(task)->rd->cpupri, task, lowest_mask))
-@@ -1762,7 +1764,7 @@ static struct task_struct *pick_next_pushable_task(struct rq *rq)
+@@ -1762,7 +1764,7 @@
BUG_ON(rq->cpu != task_cpu(p));
BUG_ON(task_current(rq, p));
@@ -17125,7 +16837,7 @@ index ec4f538d4396..f7b281059ddf 100644
BUG_ON(!task_on_rq_queued(p));
BUG_ON(!rt_task(p));
-@@ -2122,9 +2124,9 @@ static void task_woken_rt(struct rq *rq, struct task_struct *p)
+@@ -2122,9 +2124,9 @@
{
if (!task_running(rq, p) &&
!test_tsk_need_resched(rq->curr) &&
@@ -17137,7 +16849,7 @@ index ec4f538d4396..f7b281059ddf 100644
rq->curr->prio <= p->prio))
push_rt_tasks(rq);
}
-@@ -2197,7 +2199,7 @@ static void switched_to_rt(struct rq *rq, struct task_struct *p)
+@@ -2197,7 +2199,7 @@
*/
if (task_on_rq_queued(p) && rq->curr != p) {
#ifdef CONFIG_SMP
@@ -17146,11 +16858,10 @@ index ec4f538d4396..f7b281059ddf 100644
queue_push_tasks(rq);
#else
if (p->prio < rq->curr->prio)
-diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
-index ec2e8d23527e..93c999cbe58f 100644
---- a/kernel/sched/sched.h
-+++ b/kernel/sched/sched.h
-@@ -1128,6 +1128,7 @@ static inline void finish_lock_switch(struct rq *rq, struct task_struct *prev)
+diff -Nur linux-4.6.6.orig/kernel/sched/sched.h linux-4.6.6/kernel/sched/sched.h
+--- linux-4.6.6.orig/kernel/sched/sched.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/sched/sched.h 2016-08-22 21:27:47.417893368 +0200
+@@ -1128,6 +1128,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 */
@@ -17158,7 +16869,7 @@ index ec2e8d23527e..93c999cbe58f 100644
/*
* To aid in avoiding the subversion of "niceness" due to uneven distribution
-@@ -1303,6 +1304,15 @@ extern void init_sched_fair_class(void);
+@@ -1303,6 +1304,15 @@
extern void resched_curr(struct rq *rq);
extern void resched_cpu(int cpu);
@@ -17174,10 +16885,9 @@ index ec2e8d23527e..93c999cbe58f 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..e2e224c59c0a 100644
---- a/kernel/sched/swait.c
-+++ b/kernel/sched/swait.c
+diff -Nur linux-4.6.6.orig/kernel/sched/swait.c linux-4.6.6/kernel/sched/swait.c
+--- linux-4.6.6.orig/kernel/sched/swait.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/sched/swait.c 2016-08-22 21:27:47.417893368 +0200
@@ -1,5 +1,6 @@
#include <linux/sched.h>
#include <linux/swait.h>
@@ -17185,7 +16895,7 @@ index 82f0dff90030..e2e224c59c0a 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);
@@ -17211,11 +16921,9 @@ index 82f0dff90030..e2e224c59c0a 100644
void swake_up(struct swait_queue_head *q)
{
unsigned long flags;
-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.6.6.orig/kernel/sched/swork.c linux-4.6.6/kernel/sched/swork.c
+--- linux-4.6.6.orig/kernel/sched/swork.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.6.6/kernel/sched/swork.c 2016-08-22 21:27:47.417893368 +0200
@@ -0,0 +1,173 @@
+/*
+ * Copyright (C) 2014 BMW Car IT GmbH, Daniel Wagner daniel.wagner@bmw-carit.de
@@ -17390,10 +17098,9 @@ index 000000000000..1950f40ca725
+ mutex_unlock(&worker_mutex);
+}
+EXPORT_SYMBOL_GPL(swork_put);
-diff --git a/kernel/signal.c b/kernel/signal.c
-index aa9bf00749c1..0a625c7b8792 100644
---- a/kernel/signal.c
-+++ b/kernel/signal.c
+diff -Nur linux-4.6.6.orig/kernel/signal.c linux-4.6.6/kernel/signal.c
+--- linux-4.6.6.orig/kernel/signal.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/signal.c 2016-08-22 21:27:47.417893368 +0200
@@ -14,6 +14,7 @@
#include <linux/export.h>
#include <linux/init.h>
@@ -17402,7 +17109,7 @@ index aa9bf00749c1..0a625c7b8792 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;
}
@@ -17434,7 +17141,7 @@ index aa9bf00749c1..0a625c7b8792 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)) {
@@ -17446,7 +17153,7 @@ index aa9bf00749c1..0a625c7b8792 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;
}
@@ -17460,7 +17167,7 @@ index aa9bf00749c1..0a625c7b8792 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);
}
@@ -17482,7 +17189,7 @@ index aa9bf00749c1..0a625c7b8792 100644
void flush_sigqueue(struct sigpending *queue)
{
struct sigqueue *q;
-@@ -414,6 +457,21 @@ void flush_sigqueue(struct sigpending *queue)
+@@ -414,6 +457,21 @@
}
/*
@@ -17504,7 +17211,7 @@ index aa9bf00749c1..0a625c7b8792 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);
@@ -17513,7 +17220,7 @@ index aa9bf00749c1..0a625c7b8792 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;
@@ -17522,7 +17229,7 @@ index aa9bf00749c1..0a625c7b8792 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.
*/
@@ -17533,7 +17240,7 @@ index aa9bf00749c1..0a625c7b8792 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;
}
@@ -17573,7 +17280,7 @@ index aa9bf00749c1..0a625c7b8792 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.
*/
@@ -17588,7 +17295,7 @@ index aa9bf00749c1..0a625c7b8792 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();
@@ -17597,7 +17304,7 @@ index aa9bf00749c1..0a625c7b8792 100644
}
return sighand;
-@@ -1485,7 +1578,8 @@ EXPORT_SYMBOL(kill_pid);
+@@ -1485,7 +1578,8 @@
*/
struct sigqueue *sigqueue_alloc(void)
{
@@ -17607,7 +17314,7 @@ index aa9bf00749c1..0a625c7b8792 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);
@@ -17623,7 +17330,7 @@ index aa9bf00749c1..0a625c7b8792 100644
freezable_schedule();
} else {
/*
-@@ -2751,23 +2837,18 @@ int copy_siginfo_to_user(siginfo_t __user *to, const siginfo_t *from)
+@@ -2751,23 +2837,18 @@
* @ts: upper bound on process time suspension
*/
int do_sigtimedwait(const sigset_t *which, siginfo_t *info,
@@ -17652,7 +17359,7 @@ index aa9bf00749c1..0a625c7b8792 100644
}
/*
-@@ -2778,7 +2859,7 @@ int do_sigtimedwait(const sigset_t *which, siginfo_t *info,
+@@ -2778,7 +2859,7 @@
spin_lock_irq(&tsk->sighand->siglock);
sig = dequeue_signal(tsk, &mask, info);
@@ -17661,7 +17368,7 @@ index aa9bf00749c1..0a625c7b8792 100644
/*
* None ready, temporarily unblock those we're interested
* while we are sleeping in so that we'll be awakened when
-@@ -2790,8 +2871,9 @@ int do_sigtimedwait(const sigset_t *which, siginfo_t *info,
+@@ -2790,8 +2871,9 @@
recalc_sigpending();
spin_unlock_irq(&tsk->sighand->siglock);
@@ -17673,7 +17380,7 @@ index aa9bf00749c1..0a625c7b8792 100644
spin_lock_irq(&tsk->sighand->siglock);
__set_task_blocked(tsk, &tsk->real_blocked);
sigemptyset(&tsk->real_blocked);
-@@ -2801,7 +2883,7 @@ int do_sigtimedwait(const sigset_t *which, siginfo_t *info,
+@@ -2801,7 +2883,7 @@
if (sig)
return sig;
@@ -17682,10 +17389,9 @@ index aa9bf00749c1..0a625c7b8792 100644
}
/**
-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.6.6.orig/kernel/softirq.c linux-4.6.6/kernel/softirq.c
+--- linux-4.6.6.orig/kernel/softirq.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/softirq.c 2016-08-22 21:27:47.417893368 +0200
@@ -21,10 +21,12 @@
#include <linux/freezer.h>
#include <linux/kthread.h>
@@ -17699,7 +17405,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);
@@ -17808,7 +17514,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);
}
@@ -17888,7 +17594,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;
@@ -17899,7 +17605,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);
@@ -17937,7 +17643,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 @@
}
/*
@@ -18248,7 +17954,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.
*/
@@ -18260,7 +17966,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)
{
@@ -18268,7 +17974,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();
}
@@ -18287,7 +17993,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! */
}
@@ -18314,7 +18020,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);
}
@@ -18327,7 +18033,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);
@@ -18377,7 +18083,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);
@@ -18389,7 +18095,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());
@@ -18530,8 +18236,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;
@@ -18549,7 +18254,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;
@@ -18561,7 +18267,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 {
@@ -18570,51 +18276,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,
@@ -18646,11 +18350,10 @@ index 17caf4b63342..a602b7152de7 100644
return 0;
}
-diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c
-index a467e6c28a3b..d01a5118d58a 100644
---- a/kernel/stop_machine.c
-+++ b/kernel/stop_machine.c
-@@ -36,7 +36,7 @@ struct cpu_stop_done {
+diff -Nur linux-4.6.6.orig/kernel/stop_machine.c linux-4.6.6/kernel/stop_machine.c
+--- linux-4.6.6.orig/kernel/stop_machine.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/stop_machine.c 2016-08-22 21:27:47.417893368 +0200
+@@ -36,7 +36,7 @@
struct cpu_stopper {
struct task_struct *thread;
@@ -18659,7 +18362,7 @@ index a467e6c28a3b..d01a5118d58a 100644
bool enabled; /* is this stopper enabled? */
struct list_head works; /* list of pending works */
-@@ -82,14 +82,14 @@ static bool cpu_stop_queue_work(unsigned int cpu, struct cpu_stop_work *work)
+@@ -82,14 +82,14 @@
unsigned long flags;
bool enabled;
@@ -18676,7 +18379,7 @@ index a467e6c28a3b..d01a5118d58a 100644
return enabled;
}
-@@ -224,8 +224,8 @@ static int cpu_stop_queue_two_works(int cpu1, struct cpu_stop_work *work1,
+@@ -224,8 +224,8 @@
int err;
lg_double_lock(&stop_cpus_lock, cpu1, cpu2);
@@ -18687,7 +18390,7 @@ index a467e6c28a3b..d01a5118d58a 100644
err = -ENOENT;
if (!stopper1->enabled || !stopper2->enabled)
-@@ -235,8 +235,8 @@ static int cpu_stop_queue_two_works(int cpu1, struct cpu_stop_work *work1,
+@@ -235,8 +235,8 @@
__cpu_stop_queue_work(stopper1, work1);
__cpu_stop_queue_work(stopper2, work2);
unlock:
@@ -18698,7 +18401,7 @@ index a467e6c28a3b..d01a5118d58a 100644
lg_double_unlock(&stop_cpus_lock, cpu1, cpu2);
return err;
-@@ -313,18 +313,21 @@ static DEFINE_MUTEX(stop_cpus_mutex);
+@@ -313,18 +313,21 @@
static bool queue_stop_cpus_work(const struct cpumask *cpumask,
cpu_stop_fn_t fn, void *arg,
@@ -18725,7 +18428,7 @@ index a467e6c28a3b..d01a5118d58a 100644
for_each_cpu(cpu, cpumask) {
work = &per_cpu(cpu_stopper.stop_work, cpu);
work->fn = fn;
-@@ -344,7 +347,7 @@ static int __stop_cpus(const struct cpumask *cpumask,
+@@ -344,7 +347,7 @@
struct cpu_stop_done done;
cpu_stop_init_done(&done, cpumask_weight(cpumask));
@@ -18734,7 +18437,7 @@ index a467e6c28a3b..d01a5118d58a 100644
return -ENOENT;
wait_for_completion(&done.completion);
return done.ret;
-@@ -425,9 +428,9 @@ static int cpu_stop_should_run(unsigned int cpu)
+@@ -425,9 +428,9 @@
unsigned long flags;
int run;
@@ -18746,7 +18449,7 @@ index a467e6c28a3b..d01a5118d58a 100644
return run;
}
-@@ -438,13 +441,13 @@ static void cpu_stopper_thread(unsigned int cpu)
+@@ -438,13 +441,13 @@
repeat:
work = NULL;
@@ -18762,7 +18465,7 @@ index a467e6c28a3b..d01a5118d58a 100644
if (work) {
cpu_stop_fn_t fn = work->fn;
-@@ -452,6 +455,16 @@ static void cpu_stopper_thread(unsigned int cpu)
+@@ -452,6 +455,16 @@
struct cpu_stop_done *done = work->done;
int ret;
@@ -18779,7 +18482,7 @@ index a467e6c28a3b..d01a5118d58a 100644
/* cpu stop callbacks must not sleep, make in_atomic() == T */
preempt_count_inc();
ret = fn(arg);
-@@ -518,10 +531,12 @@ static int __init cpu_stop_init(void)
+@@ -518,10 +531,12 @@
for_each_possible_cpu(cpu) {
struct cpu_stopper *stopper = &per_cpu(cpu_stopper, cpu);
@@ -18793,7 +18496,7 @@ index a467e6c28a3b..d01a5118d58a 100644
BUG_ON(smpboot_register_percpu_thread(&cpu_stop_threads));
stop_machine_unpark(raw_smp_processor_id());
stop_machine_initialized = true;
-@@ -616,7 +631,7 @@ int stop_machine_from_inactive_cpu(cpu_stop_fn_t fn, void *data,
+@@ -616,7 +631,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,
@@ -18802,10 +18505,9 @@ index a467e6c28a3b..d01a5118d58a 100644
ret = multi_cpu_stop(&msdata);
/* Busy wait for completion. */
-diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
-index fa0b983290cf..ab846abc8b7b 100644
---- a/kernel/time/hrtimer.c
-+++ b/kernel/time/hrtimer.c
+diff -Nur linux-4.6.6.orig/kernel/time/hrtimer.c linux-4.6.6/kernel/time/hrtimer.c
+--- linux-4.6.6.orig/kernel/time/hrtimer.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/time/hrtimer.c 2016-08-22 21:27:47.421893628 +0200
@@ -48,11 +48,13 @@
#include <linux/sched/rt.h>
#include <linux/sched/deadline.h>
@@ -18820,7 +18522,7 @@ index fa0b983290cf..ab846abc8b7b 100644
#include "tick-internal.h"
-@@ -706,6 +708,44 @@ static void clock_was_set_work(struct work_struct *work)
+@@ -706,6 +708,44 @@
static DECLARE_WORK(hrtimer_work, clock_was_set_work);
@@ -18865,7 +18567,7 @@ index fa0b983290cf..ab846abc8b7b 100644
/*
* Called from timekeeping and resume code to reprogramm the hrtimer
* interrupt device on all cpus.
-@@ -714,6 +754,7 @@ void clock_was_set_delayed(void)
+@@ -714,6 +754,7 @@
{
schedule_work(&hrtimer_work);
}
@@ -18873,7 +18575,7 @@ index fa0b983290cf..ab846abc8b7b 100644
#else
-@@ -723,11 +764,8 @@ static inline int hrtimer_is_hres_enabled(void) { return 0; }
+@@ -723,11 +764,8 @@
static inline void hrtimer_switch_to_hres(void) { }
static inline void
hrtimer_force_reprogram(struct hrtimer_cpu_base *base, int skip_equal) { }
@@ -18887,7 +18589,7 @@ index fa0b983290cf..ab846abc8b7b 100644
static inline void hrtimer_init_hres(struct hrtimer_cpu_base *base) { }
static inline void retrigger_next_event(void *arg) { }
-@@ -859,6 +897,32 @@ u64 hrtimer_forward(struct hrtimer *timer, ktime_t now, ktime_t interval)
+@@ -859,6 +897,32 @@
}
EXPORT_SYMBOL_GPL(hrtimer_forward);
@@ -18920,7 +18622,7 @@ index fa0b983290cf..ab846abc8b7b 100644
/*
* enqueue_hrtimer - internal function to (re)start a timer
*
-@@ -900,6 +964,11 @@ static void __remove_hrtimer(struct hrtimer *timer,
+@@ -900,6 +964,11 @@
if (!(state & HRTIMER_STATE_ENQUEUED))
return;
@@ -18932,7 +18634,7 @@ index fa0b983290cf..ab846abc8b7b 100644
if (!timerqueue_del(&base->active, &timer->node))
cpu_base->active_bases &= ~(1 << base->index);
-@@ -995,7 +1064,16 @@ void hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim,
+@@ -995,7 +1064,16 @@
new_base = switch_hrtimer_base(timer, base, mode & HRTIMER_MODE_PINNED);
timer_stats_hrtimer_set_start_info(timer);
@@ -18949,7 +18651,7 @@ index fa0b983290cf..ab846abc8b7b 100644
leftmost = enqueue_hrtimer(timer, new_base);
if (!leftmost)
goto unlock;
-@@ -1067,7 +1145,7 @@ int hrtimer_cancel(struct hrtimer *timer)
+@@ -1067,7 +1145,7 @@
if (ret >= 0)
return ret;
@@ -18958,7 +18660,7 @@ index fa0b983290cf..ab846abc8b7b 100644
}
}
EXPORT_SYMBOL_GPL(hrtimer_cancel);
-@@ -1131,6 +1209,7 @@ static void __hrtimer_init(struct hrtimer *timer, clockid_t clock_id,
+@@ -1131,6 +1209,7 @@
base = hrtimer_clockid_to_base(clock_id);
timer->base = &cpu_base->clock_base[base];
@@ -18966,7 +18668,7 @@ index fa0b983290cf..ab846abc8b7b 100644
timerqueue_init(&timer->node);
#ifdef CONFIG_TIMER_STATS
-@@ -1171,6 +1250,7 @@ bool hrtimer_active(const struct hrtimer *timer)
+@@ -1171,6 +1250,7 @@
seq = raw_read_seqcount_begin(&cpu_base->seq);
if (timer->state != HRTIMER_STATE_INACTIVE ||
@@ -18974,7 +18676,7 @@ index fa0b983290cf..ab846abc8b7b 100644
cpu_base->running == timer)
return true;
-@@ -1269,10 +1349,112 @@ static void __run_hrtimer(struct hrtimer_cpu_base *cpu_base,
+@@ -1269,10 +1349,112 @@
cpu_base->running = NULL;
}
@@ -19087,7 +18789,7 @@ index fa0b983290cf..ab846abc8b7b 100644
for (; active; base++, active >>= 1) {
struct timerqueue_node *node;
-@@ -1288,6 +1470,15 @@ static void __hrtimer_run_queues(struct hrtimer_cpu_base *cpu_base, ktime_t now)
+@@ -1288,6 +1470,15 @@
timer = container_of(node, struct hrtimer, node);
@@ -19103,7 +18805,7 @@ index fa0b983290cf..ab846abc8b7b 100644
/*
* The immediate goal for using the softexpires is
* minimizing wakeups, not running timers at the
-@@ -1303,9 +1494,14 @@ static void __hrtimer_run_queues(struct hrtimer_cpu_base *cpu_base, ktime_t now)
+@@ -1303,9 +1494,14 @@
if (basenow.tv64 < hrtimer_get_softexpires_tv64(timer))
break;
@@ -19119,7 +18821,7 @@ index fa0b983290cf..ab846abc8b7b 100644
}
#ifdef CONFIG_HIGH_RES_TIMERS
-@@ -1468,16 +1664,18 @@ static enum hrtimer_restart hrtimer_wakeup(struct hrtimer *timer)
+@@ -1468,16 +1664,18 @@
void hrtimer_init_sleeper(struct hrtimer_sleeper *sl, struct task_struct *task)
{
sl->timer.function = hrtimer_wakeup;
@@ -19140,7 +18842,7 @@ index fa0b983290cf..ab846abc8b7b 100644
hrtimer_start_expires(&t->timer, mode);
if (likely(t->task))
-@@ -1519,7 +1717,8 @@ long __sched hrtimer_nanosleep_restart(struct restart_block *restart)
+@@ -1519,7 +1717,8 @@
HRTIMER_MODE_ABS);
hrtimer_set_expires_tv64(&t.timer, restart->nanosleep.expires);
@@ -19150,7 +18852,7 @@ index fa0b983290cf..ab846abc8b7b 100644
goto out;
rmtp = restart->nanosleep.rmtp;
-@@ -1536,8 +1735,10 @@ long __sched hrtimer_nanosleep_restart(struct restart_block *restart)
+@@ -1536,8 +1735,10 @@
return ret;
}
@@ -19163,7 +18865,7 @@ index fa0b983290cf..ab846abc8b7b 100644
{
struct restart_block *restart;
struct hrtimer_sleeper t;
-@@ -1550,7 +1751,7 @@ long hrtimer_nanosleep(struct timespec *rqtp, struct timespec __user *rmtp,
+@@ -1550,7 +1751,7 @@
hrtimer_init_on_stack(&t.timer, clockid, mode);
hrtimer_set_expires_range_ns(&t.timer, timespec_to_ktime(*rqtp), slack);
@@ -19172,7 +18874,7 @@ index fa0b983290cf..ab846abc8b7b 100644
goto out;
/* Absolute timers do not update the rmtp value and restart: */
-@@ -1577,6 +1778,12 @@ long hrtimer_nanosleep(struct timespec *rqtp, struct timespec __user *rmtp,
+@@ -1577,6 +1778,12 @@
return ret;
}
@@ -19185,7 +18887,7 @@ index fa0b983290cf..ab846abc8b7b 100644
SYSCALL_DEFINE2(nanosleep, struct timespec __user *, rqtp,
struct timespec __user *, rmtp)
{
-@@ -1591,6 +1798,26 @@ SYSCALL_DEFINE2(nanosleep, struct timespec __user *, rqtp,
+@@ -1591,6 +1798,26 @@
return hrtimer_nanosleep(&tu, rmtp, HRTIMER_MODE_REL, CLOCK_MONOTONIC);
}
@@ -19212,7 +18914,7 @@ index fa0b983290cf..ab846abc8b7b 100644
/*
* Functions related to boot-time initialization:
*/
-@@ -1602,10 +1829,14 @@ static void init_hrtimers_cpu(int cpu)
+@@ -1602,10 +1829,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);
@@ -19227,7 +18929,7 @@ index fa0b983290cf..ab846abc8b7b 100644
}
#ifdef CONFIG_HOTPLUG_CPU
-@@ -1703,11 +1934,21 @@ static struct notifier_block hrtimers_nb = {
+@@ -1703,11 +1934,21 @@
.notifier_call = hrtimer_cpu_notify,
};
@@ -19249,11 +18951,10 @@ index fa0b983290cf..ab846abc8b7b 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.6.6.orig/kernel/time/itimer.c linux-4.6.6/kernel/time/itimer.c
+--- linux-4.6.6.orig/kernel/time/itimer.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/time/itimer.c 2016-08-22 21:27:47.421893628 +0200
+@@ -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);
@@ -19261,11 +18962,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.6.6.orig/kernel/time/jiffies.c linux-4.6.6/kernel/time/jiffies.c
+--- linux-4.6.6.orig/kernel/time/jiffies.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/time/jiffies.c 2016-08-22 21:27:47.421893628 +0200
+@@ -74,7 +74,8 @@
.max_cycles = 10,
};
@@ -19275,7 +18975,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 {
@@ -19287,10 +18987,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..6b4c19fa233f 100644
---- a/kernel/time/ntp.c
-+++ b/kernel/time/ntp.c
+diff -Nur linux-4.6.6.orig/kernel/time/ntp.c linux-4.6.6/kernel/time/ntp.c
+--- linux-4.6.6.orig/kernel/time/ntp.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/time/ntp.c 2016-08-22 21:27:47.421893628 +0200
@@ -10,6 +10,7 @@
#include <linux/workqueue.h>
#include <linux/hrtimer.h>
@@ -19299,7 +18998,7 @@ index 6df8927c58a5..6b4c19fa233f 100644
#include <linux/math64.h>
#include <linux/timex.h>
#include <linux/time.h>
-@@ -568,10 +569,52 @@ static void sync_cmos_clock(struct work_struct *work)
+@@ -568,10 +569,52 @@
&sync_cmos_work, timespec64_to_jiffies(&next));
}
@@ -19352,10 +19051,9 @@ index 6df8927c58a5..6b4c19fa233f 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 1cafba860b08..5f16807aa3ff 100644
---- a/kernel/time/posix-cpu-timers.c
-+++ b/kernel/time/posix-cpu-timers.c
+diff -Nur linux-4.6.6.orig/kernel/time/posix-cpu-timers.c linux-4.6.6/kernel/time/posix-cpu-timers.c
+--- linux-4.6.6.orig/kernel/time/posix-cpu-timers.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/time/posix-cpu-timers.c 2016-08-22 21:27:47.421893628 +0200
@@ -3,6 +3,7 @@
*/
@@ -19364,7 +19062,7 @@ index 1cafba860b08..5f16807aa3ff 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.
*/
@@ -19373,7 +19071,7 @@ index 1cafba860b08..5f16807aa3ff 100644
ret = 0;
old_incr = timer->it.cpu.incr;
-@@ -1063,7 +1064,7 @@ void posix_cpu_timer_schedule(struct k_itimer *timer)
+@@ -1064,7 +1065,7 @@
/*
* Now re-arm for the new expiry time.
*/
@@ -19382,7 +19080,7 @@ index 1cafba860b08..5f16807aa3ff 100644
arm_timer(timer);
unlock_task_sighand(p, &flags);
-@@ -1152,13 +1153,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.
*/
@@ -19398,7 +19096,7 @@ index 1cafba860b08..5f16807aa3ff 100644
/*
* The fast path checks that there are no expired thread or thread
-@@ -1212,6 +1213,190 @@ void run_posix_cpu_timers(struct task_struct *tsk)
+@@ -1213,6 +1214,190 @@
}
}
@@ -19589,11 +19287,10 @@ index 1cafba860b08..5f16807aa3ff 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.6.6.orig/kernel/time/posix-timers.c linux-4.6.6/kernel/time/posix-timers.c
+--- linux-4.6.6.orig/kernel/time/posix-timers.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/time/posix-timers.c 2016-08-22 21:27:47.421893628 +0200
+@@ -506,6 +506,7 @@
static struct pid *good_sigevent(sigevent_t * event)
{
struct task_struct *rtn = current->group_leader;
@@ -19601,7 +19298,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) &&
@@ -19611,7 +19308,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;
}
@@ -19632,7 +19329,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;
@@ -19640,7 +19337,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) {
@@ -19653,7 +19350,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;
@@ -19669,42 +19366,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 53d7184da0be..1b4ac3361c3f 100644
---- a/kernel/time/tick-broadcast-hrtimer.c
-+++ b/kernel/time/tick-broadcast-hrtimer.c
-@@ -106,5 +106,6 @@ void tick_setup_hrtimer_broadcast(void)
+diff -Nur linux-4.6.6.orig/kernel/time/tick-broadcast-hrtimer.c linux-4.6.6/kernel/time/tick-broadcast-hrtimer.c
+--- linux-4.6.6.orig/kernel/time/tick-broadcast-hrtimer.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/time/tick-broadcast-hrtimer.c 2016-08-22 21:27:47.421893628 +0200
+@@ -106,5 +106,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.6.6.orig/kernel/time/tick-common.c linux-4.6.6/kernel/time/tick-common.c
+--- linux-4.6.6.orig/kernel/time/tick-common.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/time/tick-common.c 2016-08-22 21:27:47.421893628 +0200
+@@ -79,13 +79,15 @@
static void tick_periodic(int cpu)
{
if (tick_do_timer_cpu == cpu) {
@@ -19722,7 +19416,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 {
@@ -19734,20 +19428,18 @@ index 4fcd99e12aa0..5a47f2e98faf 100644
clockevents_switch_state(dev, CLOCK_EVT_STATE_ONESHOT);
-diff --git a/kernel/time/tick-internal.h b/kernel/time/tick-internal.h
-index 966a5a6fdd0a..f738251000fe 100644
---- a/kernel/time/tick-internal.h
-+++ b/kernel/time/tick-internal.h
-@@ -164,3 +164,4 @@ static inline void timers_update_migration(bool update_nohz) { }
+diff -Nur linux-4.6.6.orig/kernel/time/tick-internal.h linux-4.6.6/kernel/time/tick-internal.h
+--- linux-4.6.6.orig/kernel/time/tick-internal.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/time/tick-internal.h 2016-08-22 21:27:47.421893628 +0200
+@@ -164,3 +164,4 @@
DECLARE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases);
extern u64 get_next_timer_interrupt(unsigned long basej, u64 basem);
+void timer_clear_idle(void);
-diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c
-index 58e3310c9b21..6fc9a5fdd5f4 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.6.6.orig/kernel/time/tick-sched.c linux-4.6.6/kernel/time/tick-sched.c
+--- linux-4.6.6.orig/kernel/time/tick-sched.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/time/tick-sched.c 2016-08-22 21:27:47.421893628 +0200
+@@ -62,7 +62,8 @@
return;
/* Reevalute with jiffies_lock held */
@@ -19757,7 +19449,7 @@ index 58e3310c9b21..6fc9a5fdd5f4 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 {
@@ -19772,7 +19464,7 @@ index 58e3310c9b21..6fc9a5fdd5f4 100644
update_wall_time();
}
-@@ -99,12 +102,14 @@ static ktime_t tick_init_jiffy_update(void)
+@@ -99,12 +102,14 @@
{
ktime_t period;
@@ -19789,7 +19481,7 @@ index 58e3310c9b21..6fc9a5fdd5f4 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,
@@ -19797,7 +19489,7 @@ index 58e3310c9b21..6fc9a5fdd5f4 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 {
@@ -19810,7 +19502,7 @@ index 58e3310c9b21..6fc9a5fdd5f4 100644
ts->last_jiffies = basejiff;
if (rcu_needs_cpu(basemono, &next_rcu) ||
-@@ -700,6 +706,12 @@ static ktime_t tick_nohz_stop_sched_tick(struct tick_sched *ts,
+@@ -700,6 +706,12 @@
delta = next_tick - basemono;
if (delta <= (u64)TICK_NSEC) {
tick.tv64 = 0;
@@ -19823,7 +19515,7 @@ index 58e3310c9b21..6fc9a5fdd5f4 100644
/*
* We've not stopped the tick yet, and there's a timer in the
* next period, so no point in stopping it either, bail.
-@@ -808,6 +820,12 @@ static void tick_nohz_restart_sched_tick(struct tick_sched *ts, ktime_t now, int
+@@ -808,6 +820,12 @@
tick_do_update_jiffies64(now);
update_cpu_load_nohz(active);
@@ -19836,7 +19528,7 @@ index 58e3310c9b21..6fc9a5fdd5f4 100644
calc_load_exit_idle();
touch_softlockup_watchdog_sched();
/*
-@@ -861,14 +879,7 @@ static bool can_stop_idle_tick(int cpu, struct tick_sched *ts)
+@@ -861,14 +879,7 @@
return false;
if (unlikely(local_softirq_pending() && cpu_online(cpu))) {
@@ -19852,7 +19544,7 @@ index 58e3310c9b21..6fc9a5fdd5f4 100644
return false;
}
-@@ -1091,35 +1102,6 @@ static void tick_nohz_switch_to_nohz(void)
+@@ -1091,35 +1102,6 @@
tick_nohz_activate(ts, NOHZ_MODE_LOWRES);
}
@@ -19888,7 +19580,7 @@ index 58e3310c9b21..6fc9a5fdd5f4 100644
static inline void tick_nohz_irq_enter(void)
{
struct tick_sched *ts = this_cpu_ptr(&tick_cpu_sched);
-@@ -1130,10 +1112,8 @@ static inline void tick_nohz_irq_enter(void)
+@@ -1130,10 +1112,8 @@
now = ktime_get();
if (ts->idle_active)
tick_nohz_stop_idle(ts, now);
@@ -19900,7 +19592,7 @@ index 58e3310c9b21..6fc9a5fdd5f4 100644
}
#else
-@@ -1208,6 +1188,7 @@ void tick_setup_sched_timer(void)
+@@ -1208,6 +1188,7 @@
* Emulate tick processing via per-CPU hrtimers:
*/
hrtimer_init(&ts->sched_timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
@@ -19908,11 +19600,10 @@ index 58e3310c9b21..6fc9a5fdd5f4 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 479d25cd3d4f..410c04b386e4 100644
---- a/kernel/time/timekeeping.c
-+++ b/kernel/time/timekeeping.c
-@@ -2319,8 +2319,10 @@ EXPORT_SYMBOL(hardpps);
+diff -Nur linux-4.6.6.orig/kernel/time/timekeeping.c linux-4.6.6/kernel/time/timekeeping.c
+--- linux-4.6.6.orig/kernel/time/timekeeping.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/time/timekeeping.c 2016-08-22 21:27:47.421893628 +0200
+@@ -2319,8 +2319,10 @@
*/
void xtime_update(unsigned long ticks)
{
@@ -19925,11 +19616,10 @@ index 479d25cd3d4f..410c04b386e4 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.6.6.orig/kernel/time/timekeeping.h linux-4.6.6/kernel/time/timekeeping.h
+--- linux-4.6.6.orig/kernel/time/timekeeping.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/time/timekeeping.h 2016-08-22 21:27:47.425893881 +0200
+@@ -19,7 +19,8 @@
extern void do_timer(unsigned long ticks);
extern void update_wall_time(void);
@@ -19939,11 +19629,10 @@ index 704f595ce83f..763a3e5121ff 100644
#define CS_NAME_LEN 32
-diff --git a/kernel/time/timer.c b/kernel/time/timer.c
-index 73164c3aa56b..b1d2d4026cfe 100644
---- a/kernel/time/timer.c
-+++ b/kernel/time/timer.c
-@@ -59,43 +59,156 @@ __visible u64 jiffies_64 __cacheline_aligned_in_smp = INITIAL_JIFFIES;
+diff -Nur linux-4.6.6.orig/kernel/time/timer.c linux-4.6.6/kernel/time/timer.c
+--- linux-4.6.6.orig/kernel/time/timer.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/time/timer.c 2016-08-22 21:27:47.425893881 +0200
+@@ -59,43 +59,156 @@
EXPORT_SYMBOL(jiffies_64);
/*
@@ -20033,6 +19722,18 @@ index 73164c3aa56b..b1d2d4026cfe 100644
+ * 5 320 327680 ms (~5m) 2621440 ms - 20971510 ms (~43m - ~5h)
+ * 6 384 2621440 ms (~43m) 20971520 ms - 167772150 ms (~5h - ~1d)
+ * 7 448 20971520 ms (~5h) 167772160 ms - 1342177270 ms (~1d - ~15d)
++ */
++
++/* Clock divisor for the next level */
++#define LVL_CLK_SHIFT 3
++#define LVL_CLK_DIV (1UL << LVL_CLK_SHIFT)
++#define LVL_CLK_MASK (LVL_CLK_DIV - 1)
++#define LVL_SHIFT(n) ((n) * LVL_CLK_SHIFT)
++#define LVL_GRAN(n) (1UL << LVL_SHIFT(n))
++
++/*
++ * The time start value for each level to select the bucket at enqueue
++ * time.
*/
-#define TVN_BITS (CONFIG_BASE_SMALL ? 4 : 6)
-#define TVR_BITS (CONFIG_BASE_SMALL ? 6 : 8)
@@ -20041,25 +19742,30 @@ index 73164c3aa56b..b1d2d4026cfe 100644
-#define TVN_MASK (TVN_SIZE - 1)
-#define TVR_MASK (TVR_SIZE - 1)
-#define MAX_TVAL ((unsigned long)((1ULL << (TVR_BITS + 4*TVN_BITS)) - 1))
++#define LVL_START(n) ((LVL_SIZE - 1) << (((n) - 1) * LVL_CLK_SHIFT))
-struct tvec {
- struct hlist_head vec[TVN_SIZE];
-};
-+/* Clock divisor for the next level */
-+#define LVL_CLK_SHIFT 3
-+#define LVL_CLK_DIV (1UL << LVL_CLK_SHIFT)
-+#define LVL_CLK_MASK (LVL_CLK_DIV - 1)
-+#define LVL_SHIFT(n) ((n) * LVL_CLK_SHIFT)
-+#define LVL_GRAN(n) (1UL << LVL_SHIFT(n))
++/* Size of each clock level */
++#define LVL_BITS 6
++#define LVL_SIZE (1UL << LVL_BITS)
++#define LVL_MASK (LVL_SIZE - 1)
++#define LVL_OFFS(n) ((n) * LVL_SIZE)
++
++/* Level depth */
++#if HZ > 100
++# define LVL_DEPTH 9
++# else
++# define LVL_DEPTH 8
++#endif
-struct tvec_root {
- struct hlist_head vec[TVR_SIZE];
-};
-+/*
-+ * The time start value for each level to select the bucket at enqueue
-+ * time.
-+ */
-+#define LVL_START(n) ((LVL_SIZE - 1) << (((n) - 1) * LVL_CLK_SHIFT))
++/* The cutoff (max. capacity of the wheel) */
++#define WHEEL_TIMEOUT_CUTOFF (LVL_START(LVL_DEPTH))
++#define WHEEL_TIMEOUT_MAX (WHEEL_TIMEOUT_CUTOFF - LVL_GRAN(LVL_DEPTH - 1))
-struct tvec_base {
- spinlock_t lock;
@@ -20076,29 +19782,13 @@ index 73164c3aa56b..b1d2d4026cfe 100644
- struct tvec tv3;
- struct tvec tv4;
- struct tvec tv5;
-+/* Size of each clock level */
-+#define LVL_BITS 6
-+#define LVL_SIZE (1UL << LVL_BITS)
-+#define LVL_MASK (LVL_SIZE - 1)
-+#define LVL_OFFS(n) ((n) * LVL_SIZE)
-+
-+/* Level depth */
-+#if HZ > 100
-+# define LVL_DEPTH 9
-+# else
-+# define LVL_DEPTH 8
-+#endif
-+
-+/* The cutoff (max. capacity of the wheel) */
-+#define WHEEL_TIMEOUT_CUTOFF (LVL_START(LVL_DEPTH))
-+#define WHEEL_TIMEOUT_MAX (WHEEL_TIMEOUT_CUTOFF - LVL_GRAN(LVL_DEPTH - 1))
-+
+-} ____cacheline_aligned;
+/*
+ * The resulting wheel size. If NOHZ is configured we allocate two
+ * wheels so we have a separate storage for the deferrable timers.
+ */
+#define WHEEL_SIZE (LVL_SIZE * LVL_DEPTH)
-+
+
+#ifdef CONFIG_NO_HZ_COMMON
+# define NR_BASES 2
+# define BASE_STD 0
@@ -20108,7 +19798,8 @@ index 73164c3aa56b..b1d2d4026cfe 100644
+# define BASE_STD 0
+# define BASE_DEF 0
+#endif
-+
+
+-static DEFINE_PER_CPU(struct tvec_base, tvec_bases);
+struct timer_base {
+ raw_spinlock_t lock;
+ struct timer_list *running_timer;
@@ -20123,15 +19814,13 @@ index 73164c3aa56b..b1d2d4026cfe 100644
+ bool is_idle;
+ DECLARE_BITMAP(pending_map, WHEEL_SIZE);
+ struct hlist_head vectors[WHEEL_SIZE];
- } ____cacheline_aligned;
-
--
--static DEFINE_PER_CPU(struct tvec_base, tvec_bases);
++} ____cacheline_aligned;
++
+static DEFINE_PER_CPU(struct timer_base, timer_bases[NR_BASES]);
#if defined(CONFIG_SMP) && defined(CONFIG_NO_HZ_COMMON)
unsigned int sysctl_timer_migration = 1;
-@@ -106,15 +219,17 @@ void timers_update_migration(bool update_nohz)
+@@ -106,15 +219,17 @@
unsigned int cpu;
/* Avoid the loop, if nothing to update */
@@ -20152,7 +19841,7 @@ index 73164c3aa56b..b1d2d4026cfe 100644
per_cpu(hrtimer_bases.nohz_active, cpu) = true;
}
}
-@@ -133,20 +248,6 @@ int timer_migration_handler(struct ctl_table *table, int write,
+@@ -133,20 +248,6 @@
mutex_unlock(&mutex);
return ret;
}
@@ -20173,7 +19862,7 @@ index 73164c3aa56b..b1d2d4026cfe 100644
#endif
static unsigned long round_jiffies_common(unsigned long j, int cpu,
-@@ -351,101 +452,126 @@ unsigned long round_jiffies_up_relative(unsigned long j)
+@@ -351,101 +452,126 @@
}
EXPORT_SYMBOL_GPL(round_jiffies_up_relative);
@@ -20196,14 +19885,38 @@ index 73164c3aa56b..b1d2d4026cfe 100644
{
- timer->slack = slack_hz;
+ return (timer->flags & TIMER_ARRAYMASK) >> TIMER_ARRAYSHIFT;
-+}
-+
+ }
+-EXPORT_SYMBOL_GPL(set_timer_slack);
+
+-static void
+-__internal_add_timer(struct tvec_base *base, struct timer_list *timer)
+static inline void timer_set_idx(struct timer_list *timer, unsigned int idx)
-+{
+ {
+- unsigned long expires = timer->expires;
+- unsigned long idx = expires - base->timer_jiffies;
+- struct hlist_head *vec;
+ timer->flags = (timer->flags & ~TIMER_ARRAYMASK) |
+ idx << TIMER_ARRAYSHIFT;
+}
-+
+
+- if (idx < TVR_SIZE) {
+- int i = expires & TVR_MASK;
+- vec = base->tv1.vec + i;
+- } else if (idx < 1 << (TVR_BITS + TVN_BITS)) {
+- int i = (expires >> TVR_BITS) & TVN_MASK;
+- vec = base->tv2.vec + i;
+- } else if (idx < 1 << (TVR_BITS + 2 * TVN_BITS)) {
+- int i = (expires >> (TVR_BITS + TVN_BITS)) & TVN_MASK;
+- vec = base->tv3.vec + i;
+- } else if (idx < 1 << (TVR_BITS + 3 * TVN_BITS)) {
+- int i = (expires >> (TVR_BITS + 2 * TVN_BITS)) & TVN_MASK;
+- vec = base->tv4.vec + i;
+- } else if ((signed long) idx < 0) {
+- /*
+- * Can happen if you add a timer with expires == jiffies,
+- * or you set a timer to go off in the past
+- */
+- vec = base->tv1.vec + (base->timer_jiffies & TVR_MASK);
+/*
+ * Helper function to calculate the array index for a given expiry
+ * time.
@@ -20237,19 +19950,30 @@ index 73164c3aa56b..b1d2d4026cfe 100644
+ idx = calc_index(expires, 7);
+ } else if ((long) delta < 0) {
+ idx = clk & LVL_MASK;
-+ } else {
+ } else {
+- int i;
+- /* If the timeout is larger than MAX_TVAL (on 64-bit
+- * architectures or with CONFIG_BASE_SMALL=1) then we
+- * use the maximum timeout.
+ /*
+ * Force expire obscene large timeouts to expire at the
+ * capacity limit of the wheel.
-+ */
+ */
+- if (idx > MAX_TVAL) {
+- idx = MAX_TVAL;
+- expires = idx + base->timer_jiffies;
+- }
+- i = (expires >> (TVR_BITS + 3 * TVN_BITS)) & TVN_MASK;
+- vec = base->tv5.vec + i;
+ if (expires >= WHEEL_TIMEOUT_CUTOFF)
+ expires = WHEEL_TIMEOUT_MAX;
+
+ idx = calc_index(expires, LVL_DEPTH - 1);
-+ }
+ }
+ return idx;
+}
-+
+
+- hlist_add_head(&timer->entry, vec);
+/*
+ * Enqueue the timer into the hash bucket, mark it pending in
+ * the bitmap and store the index in the timer flags.
@@ -20261,73 +19985,41 @@ index 73164c3aa56b..b1d2d4026cfe 100644
+ __set_bit(idx, base->pending_map);
+ timer_set_idx(timer, idx);
}
--EXPORT_SYMBOL_GPL(set_timer_slack);
- static void
--__internal_add_timer(struct tvec_base *base, struct timer_list *timer)
+-static void internal_add_timer(struct tvec_base *base, struct timer_list *timer)
++static void
+__internal_add_timer(struct timer_base *base, struct timer_list *timer)
{
-- unsigned long expires = timer->expires;
-- unsigned long idx = expires - base->timer_jiffies;
-- struct hlist_head *vec;
+- /* Advance base->jiffies, if the base is empty */
+- if (!base->all_timers++)
+- base->timer_jiffies = jiffies;
+ unsigned int idx;
-
-- if (idx < TVR_SIZE) {
-- int i = expires & TVR_MASK;
-- vec = base->tv1.vec + i;
-- } else if (idx < 1 << (TVR_BITS + TVN_BITS)) {
-- int i = (expires >> TVR_BITS) & TVN_MASK;
-- vec = base->tv2.vec + i;
-- } else if (idx < 1 << (TVR_BITS + 2 * TVN_BITS)) {
-- int i = (expires >> (TVR_BITS + TVN_BITS)) & TVN_MASK;
-- vec = base->tv3.vec + i;
-- } else if (idx < 1 << (TVR_BITS + 3 * TVN_BITS)) {
-- int i = (expires >> (TVR_BITS + 2 * TVN_BITS)) & TVN_MASK;
-- vec = base->tv4.vec + i;
-- } else if ((signed long) idx < 0) {
-- /*
-- * Can happen if you add a timer with expires == jiffies,
-- * or you set a timer to go off in the past
-- */
-- vec = base->tv1.vec + (base->timer_jiffies & TVR_MASK);
-- } else {
-- int i;
-- /* If the timeout is larger than MAX_TVAL (on 64-bit
-- * architectures or with CONFIG_BASE_SMALL=1) then we
-- * use the maximum timeout.
-- */
-- if (idx > MAX_TVAL) {
-- idx = MAX_TVAL;
-- expires = idx + base->timer_jiffies;
-- }
-- i = (expires >> (TVR_BITS + 3 * TVN_BITS)) & TVN_MASK;
-- vec = base->tv5.vec + i;
-- }
--
-- hlist_add_head(&timer->entry, vec);
++
+ idx = calc_wheel_index(timer->expires, base->clk);
+ enqueue_timer(base, timer, idx);
- }
-
--static void internal_add_timer(struct tvec_base *base, struct timer_list *timer)
++}
++
+static void
+trigger_dyntick_cpu(struct timer_base *base, struct timer_list *timer)
- {
-- /* Advance base->jiffies, if the base is empty */
-- if (!base->all_timers++)
-- base->timer_jiffies = jiffies;
--
++{
++ if (!IS_ENABLED(CONFIG_NO_HZ_COMMON) || !base->nohz_active)
++ return;
+
- __internal_add_timer(base, timer);
-- /*
+ /*
- * Update base->active_timers and base->next_timer
-- */
++ * This wants some optimizing similar to the below, but we do that
++ * when we switch from push to pull for deferrable timers.
+ */
- if (!(timer->flags & TIMER_DEFERRABLE)) {
- if (!base->active_timers++ ||
- time_before(timer->expires, base->next_timer))
- base->next_timer = timer->expires;
-- }
-+ if (!IS_ENABLED(CONFIG_NO_HZ_COMMON) || !base->nohz_active)
++ if (timer->flags & TIMER_DEFERRABLE) {
++ if (tick_nohz_full_cpu(base->cpu))
++ wake_up_nohz_cpu(base->cpu);
+ return;
+ }
/*
- * Check whether the other CPU is in dynticks mode and needs
@@ -20341,19 +20033,12 @@ index 73164c3aa56b..b1d2d4026cfe 100644
- * The next busy ticks will take care of it. Except full dynticks
- * require special care against races with idle_cpu(), lets deal
- * with that later.
-+ * This wants some optimizing similar to the below, but we do that
-+ * when we switch from push to pull for deferrable timers.
- */
+- */
- if (base->nohz_active) {
- if (!(timer->flags & TIMER_DEFERRABLE) ||
- tick_nohz_full_cpu(base->cpu))
-+ if (timer->flags & TIMER_DEFERRABLE) {
-+ if (tick_nohz_full_cpu(base->cpu))
- wake_up_nohz_cpu(base->cpu);
-+ return;
- }
-+
-+ /*
+- wake_up_nohz_cpu(base->cpu);
+- }
+ * We might have to IPI the remote CPU if the base is idle and the
+ * timer is not deferrable. If the other cpu is on the way to idle
+ * then it can't set base->is_idle as we hold base lock.
@@ -20381,7 +20066,7 @@ index 73164c3aa56b..b1d2d4026cfe 100644
}
#ifdef CONFIG_TIMER_STATS
-@@ -681,7 +807,6 @@ static void do_init_timer(struct timer_list *timer, unsigned int flags,
+@@ -681,7 +807,6 @@
{
timer->entry.pprev = NULL;
timer->flags = flags | raw_smp_processor_id();
@@ -20389,7 +20074,7 @@ index 73164c3aa56b..b1d2d4026cfe 100644
#ifdef CONFIG_TIMER_STATS
timer->start_site = NULL;
timer->start_pid = -1;
-@@ -721,71 +846,170 @@ static inline void detach_timer(struct timer_list *timer, bool clear_pending)
+@@ -721,71 +846,170 @@
entry->next = LIST_POISON2;
}
@@ -20594,7 +20279,7 @@ index 73164c3aa56b..b1d2d4026cfe 100644
timer_stats_timer_set_start_info(timer);
BUG_ON(!timer->function);
-@@ -797,33 +1021,44 @@ __mod_timer(struct timer_list *timer, unsigned long expires,
+@@ -797,33 +1021,44 @@
debug_activate(timer, expires);
@@ -20647,7 +20332,7 @@ index 73164c3aa56b..b1d2d4026cfe 100644
return ret;
}
-@@ -840,49 +1075,10 @@ __mod_timer(struct timer_list *timer, unsigned long expires,
+@@ -840,49 +1075,10 @@
*/
int mod_timer_pending(struct timer_list *timer, unsigned long expires)
{
@@ -20698,7 +20383,7 @@ index 73164c3aa56b..b1d2d4026cfe 100644
/**
* mod_timer - modify a timer's timeout
* @timer: the timer to be modified
-@@ -905,49 +1101,11 @@ unsigned long apply_slack(struct timer_list *timer, unsigned long expires)
+@@ -905,49 +1101,11 @@
*/
int mod_timer(struct timer_list *timer, unsigned long expires)
{
@@ -20749,7 +20434,7 @@ index 73164c3aa56b..b1d2d4026cfe 100644
* add_timer - start a timer
* @timer: the timer to be added
*
-@@ -977,13 +1135,14 @@ EXPORT_SYMBOL(add_timer);
+@@ -977,13 +1135,14 @@
*/
void add_timer_on(struct timer_list *timer, int cpu)
{
@@ -20766,7 +20451,7 @@ index 73164c3aa56b..b1d2d4026cfe 100644
/*
* If @timer was on a different CPU, it should be migrated with the
* old base locked to prevent other operations proceeding with the
-@@ -993,19 +1152,46 @@ void add_timer_on(struct timer_list *timer, int cpu)
+@@ -993,19 +1152,46 @@
if (base != new_base) {
timer->flags |= TIMER_MIGRATING;
@@ -20816,7 +20501,7 @@ index 73164c3aa56b..b1d2d4026cfe 100644
/**
* del_timer - deactive a timer.
* @timer: the timer to be deactivated
-@@ -1019,7 +1205,7 @@ EXPORT_SYMBOL_GPL(add_timer_on);
+@@ -1019,7 +1205,7 @@
*/
int del_timer(struct timer_list *timer)
{
@@ -20825,7 +20510,7 @@ index 73164c3aa56b..b1d2d4026cfe 100644
unsigned long flags;
int ret = 0;
-@@ -1029,7 +1215,7 @@ int del_timer(struct timer_list *timer)
+@@ -1029,7 +1215,7 @@
if (timer_pending(timer)) {
base = lock_timer_base(timer, &flags);
ret = detach_if_pending(timer, base, true);
@@ -20834,7 +20519,7 @@ index 73164c3aa56b..b1d2d4026cfe 100644
}
return ret;
-@@ -1045,7 +1231,7 @@ EXPORT_SYMBOL(del_timer);
+@@ -1045,7 +1231,7 @@
*/
int try_to_del_timer_sync(struct timer_list *timer)
{
@@ -20843,7 +20528,7 @@ index 73164c3aa56b..b1d2d4026cfe 100644
unsigned long flags;
int ret = -1;
-@@ -1057,13 +1243,13 @@ int try_to_del_timer_sync(struct timer_list *timer)
+@@ -1057,13 +1243,13 @@
timer_stats_timer_clear_start_info(timer);
ret = detach_if_pending(timer, base, true);
}
@@ -20859,7 +20544,7 @@ index 73164c3aa56b..b1d2d4026cfe 100644
/**
* del_timer_sync - deactivate a timer and wait for the handler to finish.
* @timer: the timer to be deactivated
-@@ -1123,33 +1309,12 @@ int del_timer_sync(struct timer_list *timer)
+@@ -1123,33 +1309,12 @@
int ret = try_to_del_timer_sync(timer);
if (ret >= 0)
return ret;
@@ -20894,7 +20579,7 @@ index 73164c3aa56b..b1d2d4026cfe 100644
static void call_timer_fn(struct timer_list *timer, void (*fn)(unsigned long),
unsigned long data)
{
-@@ -1193,147 +1358,144 @@ static void call_timer_fn(struct timer_list *timer, void (*fn)(unsigned long),
+@@ -1193,147 +1358,144 @@
}
}
@@ -20915,27 +20600,48 @@ index 73164c3aa56b..b1d2d4026cfe 100644
+ struct timer_list *timer;
+ void (*fn)(unsigned long);
+ unsigned long data;
-
-- spin_lock_irq(&base->lock);
++
+ timer = hlist_entry(head->first, struct timer_list, entry);
+ timer_stats_account_timer(timer);
+- spin_lock_irq(&base->lock);
++ base->running_timer = timer;
++ detach_timer(timer, true);
+
- while (time_after_eq(jiffies, base->timer_jiffies)) {
- struct hlist_head work_list;
- struct hlist_head *head = &work_list;
- int index;
-+ base->running_timer = timer;
-+ detach_timer(timer, true);
++ fn = timer->function;
++ data = timer->data;
- if (!base->all_timers) {
- base->timer_jiffies = jiffies;
- break;
-- }
-+ fn = timer->function;
-+ data = timer->data;
++ if (!IS_ENABLED(CONFIG_PREEMPT_RT_FULL) &&
++ timer->flags & TIMER_IRQSAFE) {
++ raw_spin_unlock(&base->lock);
++ call_timer_fn(timer, fn, data);
++ base->running_timer = NULL;
++ raw_spin_lock(&base->lock);
++ } else {
++ raw_spin_unlock_irq(&base->lock);
++ call_timer_fn(timer, fn, data);
++ base->running_timer = NULL;
++ raw_spin_lock_irq(&base->lock);
+ }
++ }
++}
- index = base->timer_jiffies & TVR_MASK;
--
++static int __collect_expired_timers(struct timer_base *base,
++ struct hlist_head *heads)
++{
++ unsigned long clk = base->clk;
++ struct hlist_head *vec;
++ int i, levels = 0;
++ unsigned int idx;
+
- /*
- * Cascade timers:
- */
@@ -20970,31 +20676,6 @@ index 73164c3aa56b..b1d2d4026cfe 100644
- call_timer_fn(timer, fn, data);
- spin_lock_irq(&base->lock);
- }
-+ if (!IS_ENABLED(CONFIG_PREEMPT_RT_FULL) &&
-+ timer->flags & TIMER_IRQSAFE) {
-+ raw_spin_unlock(&base->lock);
-+ call_timer_fn(timer, fn, data);
-+ base->running_timer = NULL;
-+ raw_spin_lock(&base->lock);
-+ } else {
-+ raw_spin_unlock_irq(&base->lock);
-+ call_timer_fn(timer, fn, data);
-+ base->running_timer = NULL;
-+ raw_spin_lock_irq(&base->lock);
- }
- }
-- base->running_timer = NULL;
-- spin_unlock_irq(&base->lock);
-+}
-+
-+static int __collect_expired_timers(struct timer_base *base,
-+ struct hlist_head *heads)
-+{
-+ unsigned long clk = base->clk;
-+ struct hlist_head *vec;
-+ int i, levels = 0;
-+ unsigned int idx;
-+
+ for (i = 0; i < LVL_DEPTH; i++) {
+ idx = (clk & LVL_MASK) + i * LVL_SIZE;
+
@@ -21002,13 +20683,15 @@ index 73164c3aa56b..b1d2d4026cfe 100644
+ vec = base->vectors + idx;
+ hlist_move_list(vec, heads++);
+ levels++;
-+ }
+ }
+ /* Is it time to look at the next level? */
+ if (clk & LVL_CLK_MASK)
+ break;
+ /* Shift clock for the next level granularity */
+ clk >>= LVL_CLK_SHIFT;
-+ }
+ }
+- base->running_timer = NULL;
+- spin_unlock_irq(&base->lock);
+ return levels;
}
@@ -21017,66 +20700,45 @@ index 73164c3aa56b..b1d2d4026cfe 100644
- * Find out when the next timer event is due to happen. This
- * is used on S/390 to stop all activity when a CPU is idle.
- * This function needs to be called with interrupts disabled.
-+ * Find the next pending bucket of a level. Search from level start (@offset)
-+ * + @clk upwards and if nothing there, search from start of the level
-+ * (@offset) up to @offset + clk.
- */
+- */
-static unsigned long __next_timer_interrupt(struct tvec_base *base)
-+static int next_pending_bucket(struct timer_base *base, unsigned offset,
-+ unsigned clk)
- {
+-{
- unsigned long timer_jiffies = base->timer_jiffies;
- unsigned long expires = timer_jiffies + NEXT_TIMER_MAX_DELTA;
- int index, slot, array, found = 0;
- struct timer_list *nte;
- struct tvec *varray[4];
-+ unsigned pos, start = offset + clk;
-+ unsigned end = offset + LVL_SIZE;
-
+-
- /* Look for timer events in tv1. */
- index = slot = timer_jiffies & TVR_MASK;
- do {
- hlist_for_each_entry(nte, base->tv1.vec + slot, entry) {
- if (nte->flags & TIMER_DEFERRABLE)
- continue;
-+ pos = find_next_bit(base->pending_map, end, start);
-+ if (pos < end)
-+ return pos - start;
-
+-
- found = 1;
- expires = nte->expires;
- /* Look at the cascade bucket(s)? */
- if (!index || slot < index)
- goto cascade;
- return expires;
-+ pos = find_next_bit(base->pending_map, start, offset);
-+ return pos < start ? pos + LVL_SIZE - start : -1;
-+}
-+
-+/*
-+ * Search the first expiring timer in the various clock levels. Caller must
-+ * hold base->lock.
+- }
+- slot = (slot + 1) & TVR_MASK;
+- } while (slot != index);
++ * Find the next pending bucket of a level. Search from level start (@offset)
++ * + @clk upwards and if nothing there, search from start of the level
++ * (@offset) up to @offset + clk.
+ */
-+static unsigned long __next_timer_interrupt(struct timer_base *base)
++static int next_pending_bucket(struct timer_base *base, unsigned offset,
++ unsigned clk)
+{
-+ unsigned long clk, next, adj;
-+ unsigned lvl, offset = 0;
-+
-+ next = base->clk + NEXT_TIMER_MAX_DELTA;
-+ clk = base->clk;
-+ for (lvl = 0; lvl < LVL_DEPTH; lvl++, offset += LVL_SIZE) {
-+ int pos = next_pending_bucket(base, offset, clk & LVL_MASK);
-+
-+ if (pos >= 0) {
-+ unsigned long tmp = clk + (unsigned long) pos;
++ unsigned pos, start = offset + clk;
++ unsigned end = offset + LVL_SIZE;
+
-+ tmp <<= LVL_SHIFT(lvl);
-+ if (time_before(tmp, next))
-+ next = tmp;
- }
-- slot = (slot + 1) & TVR_MASK;
-- } while (slot != index);
--
++ pos = find_next_bit(base->pending_map, end, start);
++ if (pos < end)
++ return pos - start;
+
-cascade:
- /* Calculate the next cascade event */
- if (index)
@@ -21118,6 +20780,31 @@ index 73164c3aa56b..b1d2d4026cfe 100644
- if (index)
- timer_jiffies += TVN_SIZE - index;
- timer_jiffies >>= TVN_BITS;
++ pos = find_next_bit(base->pending_map, start, offset);
++ return pos < start ? pos + LVL_SIZE - start : -1;
++}
++
++/*
++ * Search the first expiring timer in the various clock levels. Caller must
++ * hold base->lock.
++ */
++static unsigned long __next_timer_interrupt(struct timer_base *base)
++{
++ unsigned long clk, next, adj;
++ unsigned lvl, offset = 0;
++
++ next = base->clk + NEXT_TIMER_MAX_DELTA;
++ clk = base->clk;
++ for (lvl = 0; lvl < LVL_DEPTH; lvl++, offset += LVL_SIZE) {
++ int pos = next_pending_bucket(base, offset, clk & LVL_MASK);
++
++ if (pos >= 0) {
++ unsigned long tmp = clk + (unsigned long) pos;
++
++ tmp <<= LVL_SHIFT(lvl);
++ if (time_before(tmp, next))
++ next = tmp;
++ }
+ /*
+ * Clock for the next level. If the current level clock lower
+ * bits are zero, we look at the next level as is. If not we
@@ -21163,7 +20850,7 @@ index 73164c3aa56b..b1d2d4026cfe 100644
}
/*
-@@ -1379,7 +1541,7 @@ static u64 cmp_next_hrtimer_event(u64 basem, u64 expires)
+@@ -1379,7 +1541,7 @@
*/
u64 get_next_timer_interrupt(unsigned long basej, u64 basem)
{
@@ -21172,7 +20859,7 @@ index 73164c3aa56b..b1d2d4026cfe 100644
u64 expires = KTIME_MAX;
unsigned long nextevt;
-@@ -1390,20 +1552,81 @@ u64 get_next_timer_interrupt(unsigned long basej, u64 basem)
+@@ -1390,20 +1552,81 @@
if (cpu_is_offline(smp_processor_id()))
return expires;
@@ -21264,7 +20951,7 @@ index 73164c3aa56b..b1d2d4026cfe 100644
#endif
/*
-@@ -1416,25 +1639,54 @@ void update_process_times(int user_tick)
+@@ -1416,25 +1639,54 @@
/* Note: this timer irq context must be accounted for as well. */
account_process_tick(p, user_tick);
@@ -21313,18 +21000,18 @@ index 73164c3aa56b..b1d2d4026cfe 100644
{
- struct tvec_base *base = this_cpu_ptr(&tvec_bases);
+ struct timer_base *base = this_cpu_ptr(&timer_bases[BASE_STD]);
++
++ irq_work_tick_soft();
- if (time_after_eq(jiffies, base->timer_jiffies))
- __run_timers(base);
-+ irq_work_tick_soft();
-+
+ __run_timers(base);
+ if (IS_ENABLED(CONFIG_NO_HZ_COMMON) && base->nohz_active)
+ __run_timers(this_cpu_ptr(&timer_bases[BASE_DEF]));
}
/*
-@@ -1442,7 +1694,18 @@ static void run_timer_softirq(struct softirq_action *h)
+@@ -1442,7 +1694,18 @@
*/
void run_local_timers(void)
{
@@ -21343,7 +21030,7 @@ index 73164c3aa56b..b1d2d4026cfe 100644
raise_softirq(TIMER_SOFTIRQ);
}
-@@ -1527,7 +1790,7 @@ signed long __sched schedule_timeout(signed long timeout)
+@@ -1527,7 +1790,7 @@
expire = timeout + jiffies;
setup_timer_on_stack(&timer, process_timeout, (unsigned long)current);
@@ -21352,7 +21039,7 @@ index 73164c3aa56b..b1d2d4026cfe 100644
schedule();
del_singleshot_timer_sync(&timer);
-@@ -1578,14 +1841,13 @@ signed long __sched schedule_timeout_idle(signed long timeout)
+@@ -1578,14 +1841,13 @@
EXPORT_SYMBOL(schedule_timeout_idle);
#ifdef CONFIG_HOTPLUG_CPU
@@ -21368,7 +21055,7 @@ index 73164c3aa56b..b1d2d4026cfe 100644
detach_timer(timer, false);
timer->flags = (timer->flags & ~TIMER_BASEMASK) | cpu;
internal_add_timer(new_base, timer);
-@@ -1594,37 +1856,31 @@ static void migrate_timer_list(struct tvec_base *new_base, struct hlist_head *he
+@@ -1594,37 +1856,31 @@
static void migrate_timers(int cpu)
{
@@ -21407,36 +21094,35 @@ index 73164c3aa56b..b1d2d4026cfe 100644
- migrate_timer_list(new_base, old_base->tv3.vec + i);
- migrate_timer_list(new_base, old_base->tv4.vec + i);
- migrate_timer_list(new_base, old_base->tv5.vec + i);
+- }
+ BUG_ON(old_base->running_timer);
-+
-+ for (i = 0; i < WHEEL_SIZE; i++)
-+ migrate_timer_list(new_base, old_base->vectors + i);
-+
-+ raw_spin_unlock(&old_base->lock);
-+ raw_spin_unlock_irq(&new_base->lock);
-+ put_cpu_ptr(&timer_bases);
- }
--
+
- old_base->active_timers = 0;
- old_base->all_timers = 0;
--
++ for (i = 0; i < WHEEL_SIZE; i++)
++ migrate_timer_list(new_base, old_base->vectors + i);
+
- spin_unlock(&old_base->lock);
- spin_unlock_irq(&new_base->lock);
- put_cpu_ptr(&tvec_bases);
++ raw_spin_unlock(&old_base->lock);
++ raw_spin_unlock_irq(&new_base->lock);
++ put_cpu_ptr(&timer_bases);
++ }
}
static int timer_cpu_notify(struct notifier_block *self,
-@@ -1652,13 +1908,18 @@ static inline void timer_register_cpu_notifier(void) { }
+@@ -1652,13 +1908,18 @@
static void __init init_timer_cpu(int cpu)
{
- struct tvec_base *base = per_cpu_ptr(&tvec_bases, cpu);
+-
+- base->cpu = cpu;
+- spin_lock_init(&base->lock);
+ struct timer_base *base;
+ int i;
-- base->cpu = cpu;
-- spin_lock_init(&base->lock);
--
- base->timer_jiffies = jiffies;
- base->next_timer = base->timer_jiffies;
+ for (i = 0; i < NR_BASES; i++) {
@@ -21451,11 +21137,10 @@ index 73164c3aa56b..b1d2d4026cfe 100644
}
static void __init init_timer_cpus(void)
-diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
-index e45db6b0d878..364ccd0eb57b 100644
---- a/kernel/trace/Kconfig
-+++ b/kernel/trace/Kconfig
-@@ -187,6 +187,24 @@ config IRQSOFF_TRACER
+diff -Nur linux-4.6.6.orig/kernel/trace/Kconfig linux-4.6.6/kernel/trace/Kconfig
+--- linux-4.6.6.orig/kernel/trace/Kconfig 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/trace/Kconfig 2016-08-22 21:27:47.425893881 +0200
+@@ -187,6 +187,24 @@
enabled. This option and the preempt-off timing option can be
used together or separately.)
@@ -21480,7 +21165,7 @@ index e45db6b0d878..364ccd0eb57b 100644
config PREEMPT_TRACER
bool "Preemption-off Latency Tracer"
default n
-@@ -211,6 +229,24 @@ config PREEMPT_TRACER
+@@ -211,6 +229,24 @@
enabled. This option and the irqs-off timing option can be
used together or separately.)
@@ -21505,7 +21190,7 @@ index e45db6b0d878..364ccd0eb57b 100644
config SCHED_TRACER
bool "Scheduling Latency Tracer"
select GENERIC_TRACER
-@@ -221,6 +257,74 @@ config SCHED_TRACER
+@@ -221,6 +257,74 @@
This tracer tracks the latency of the highest priority task
to be scheduled in, starting from the point it has woken up.
@@ -21580,26 +21265,9 @@ index e45db6b0d878..364ccd0eb57b 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 9b1044e936a6..3bbaea06824a 100644
---- a/kernel/trace/Makefile
-+++ b/kernel/trace/Makefile
-@@ -36,6 +36,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.6.6.orig/kernel/trace/latency_hist.c linux-4.6.6/kernel/trace/latency_hist.c
+--- linux-4.6.6.orig/kernel/trace/latency_hist.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.6.6/kernel/trace/latency_hist.c 2016-08-22 21:27:47.425893881 +0200
@@ -0,0 +1,1178 @@
+/*
+ * kernel/trace/latency_hist.c
@@ -22779,11 +22447,24 @@ index 000000000000..7f6ee70dea41
+}
+
+device_initcall(latency_hist_init);
-diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
-index a2f0b9f33e9b..3ffea48d795c 100644
---- a/kernel/trace/trace.c
-+++ b/kernel/trace/trace.c
-@@ -1657,6 +1657,7 @@ tracing_generic_entry_update(struct trace_entry *entry, unsigned long flags,
+diff -Nur linux-4.6.6.orig/kernel/trace/Makefile linux-4.6.6/kernel/trace/Makefile
+--- linux-4.6.6.orig/kernel/trace/Makefile 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/trace/Makefile 2016-08-22 21:27:47.425893881 +0200
+@@ -36,6 +36,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.6.6.orig/kernel/trace/trace.c linux-4.6.6/kernel/trace/trace.c
+--- linux-4.6.6.orig/kernel/trace/trace.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/trace/trace.c 2016-08-22 21:27:47.429894141 +0200
+@@ -1657,6 +1657,7 @@
struct task_struct *tsk = current;
entry->preempt_count = pc & 0xff;
@@ -22791,7 +22472,7 @@ index a2f0b9f33e9b..3ffea48d795c 100644
entry->pid = (tsk) ? tsk->pid : 0;
entry->flags =
#ifdef CONFIG_TRACE_IRQFLAGS_SUPPORT
-@@ -1667,8 +1668,11 @@ tracing_generic_entry_update(struct trace_entry *entry, unsigned long flags,
+@@ -1667,8 +1668,11 @@
((pc & NMI_MASK ) ? TRACE_FLAG_NMI : 0) |
((pc & HARDIRQ_MASK) ? TRACE_FLAG_HARDIRQ : 0) |
((pc & SOFTIRQ_MASK) ? TRACE_FLAG_SOFTIRQ : 0) |
@@ -22804,7 +22485,7 @@ index a2f0b9f33e9b..3ffea48d795c 100644
}
EXPORT_SYMBOL_GPL(tracing_generic_entry_update);
-@@ -2561,14 +2565,17 @@ get_total_entries(struct trace_buffer *buf,
+@@ -2561,14 +2565,17 @@
static void print_lat_help_header(struct seq_file *m)
{
@@ -22830,7 +22511,7 @@ index a2f0b9f33e9b..3ffea48d795c 100644
}
static void print_event_info(struct trace_buffer *buf, struct seq_file *m)
-@@ -2594,11 +2601,14 @@ static void print_func_help_header_irq(struct trace_buffer *buf, struct seq_file
+@@ -2594,11 +2601,14 @@
print_event_info(buf, m);
seq_puts(m, "# _-----=> irqs-off\n"
"# / _----=> need-resched\n"
@@ -22850,31 +22531,10 @@ index a2f0b9f33e9b..3ffea48d795c 100644
}
void
-diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
-index 3fff4adfd431..acb00bc2b0e0 100644
---- a/kernel/trace/trace.h
-+++ b/kernel/trace/trace.h
-@@ -117,6 +117,7 @@ struct kretprobe_trace_entry_head {
- * NEED_RESCHED - reschedule is requested
- * HARDIRQ - inside an interrupt handler
- * SOFTIRQ - inside a softirq handler
-+ * NEED_RESCHED_LAZY - lazy reschedule is requested
- */
- enum trace_flag_type {
- TRACE_FLAG_IRQS_OFF = 0x01,
-@@ -126,6 +127,7 @@ enum trace_flag_type {
- TRACE_FLAG_SOFTIRQ = 0x10,
- TRACE_FLAG_PREEMPT_RESCHED = 0x20,
- TRACE_FLAG_NMI = 0x40,
-+ TRACE_FLAG_NEED_RESCHED_LAZY = 0x80,
- };
-
- #define TRACE_BUF_SIZE 1024
-diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
-index 6f965864cc02..72a4cf8dbef5 100644
---- a/kernel/trace/trace_events.c
-+++ b/kernel/trace/trace_events.c
-@@ -188,6 +188,8 @@ static int trace_define_common_fields(void)
+diff -Nur linux-4.6.6.orig/kernel/trace/trace_events.c linux-4.6.6/kernel/trace/trace_events.c
+--- linux-4.6.6.orig/kernel/trace/trace_events.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/trace/trace_events.c 2016-08-22 21:27:47.429894141 +0200
+@@ -188,6 +188,8 @@
__common_field(unsigned char, flags);
__common_field(unsigned char, preempt_count);
__common_field(int, pid);
@@ -22883,7 +22543,7 @@ index 6f965864cc02..72a4cf8dbef5 100644
return ret;
}
-@@ -244,6 +246,14 @@ void *trace_event_buffer_reserve(struct trace_event_buffer *fbuffer,
+@@ -244,6 +246,14 @@
local_save_flags(fbuffer->flags);
fbuffer->pc = preempt_count();
@@ -22898,10 +22558,28 @@ index 6f965864cc02..72a4cf8dbef5 100644
fbuffer->trace_file = trace_file;
fbuffer->event =
-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.6.6.orig/kernel/trace/trace.h linux-4.6.6/kernel/trace/trace.h
+--- linux-4.6.6.orig/kernel/trace/trace.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/trace/trace.h 2016-08-22 21:27:47.429894141 +0200
+@@ -117,6 +117,7 @@
+ * NEED_RESCHED - reschedule is requested
+ * HARDIRQ - inside an interrupt handler
+ * SOFTIRQ - inside a softirq handler
++ * NEED_RESCHED_LAZY - lazy reschedule is requested
+ */
+ enum trace_flag_type {
+ TRACE_FLAG_IRQS_OFF = 0x01,
+@@ -126,6 +127,7 @@
+ TRACE_FLAG_SOFTIRQ = 0x10,
+ TRACE_FLAG_PREEMPT_RESCHED = 0x20,
+ TRACE_FLAG_NMI = 0x40,
++ TRACE_FLAG_NEED_RESCHED_LAZY = 0x80,
+ };
+
+ #define TRACE_BUF_SIZE 1024
+diff -Nur linux-4.6.6.orig/kernel/trace/trace_irqsoff.c linux-4.6.6/kernel/trace/trace_irqsoff.c
+--- linux-4.6.6.orig/kernel/trace/trace_irqsoff.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/trace/trace_irqsoff.c 2016-08-22 21:27:47.429894141 +0200
@@ -13,6 +13,7 @@
#include <linux/uaccess.h>
#include <linux/module.h>
@@ -22910,7 +22588,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);
@@ -22924,7 +22602,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)
{
@@ -22932,7 +22610,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);
@@ -22940,7 +22618,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)
{
@@ -22948,7 +22626,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);
@@ -22962,7 +22640,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);
@@ -22970,7 +22648,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)
{
@@ -22985,11 +22663,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.6.6.orig/kernel/trace/trace_output.c linux-4.6.6/kernel/trace/trace_output.c
+--- linux-4.6.6.orig/kernel/trace/trace_output.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/trace/trace_output.c 2016-08-22 21:27:47.429894141 +0200
+@@ -386,6 +386,7 @@
{
char hardsoft_irq;
char need_resched;
@@ -22997,7 +22674,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;
}
@@ -23007,7 +22684,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' :
'.' ;
@@ -23035,11 +22712,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.6.6.orig/kernel/user.c linux-4.6.6/kernel/user.c
+--- linux-4.6.6.orig/kernel/user.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/user.c 2016-08-22 21:27:47.429894141 +0200
+@@ -161,11 +161,11 @@
if (!up)
return;
@@ -23053,11 +22729,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.6.6.orig/kernel/watchdog.c linux-4.6.6/kernel/watchdog.c
+--- linux-4.6.6.orig/kernel/watchdog.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/watchdog.c 2016-08-22 21:27:47.429894141 +0200
+@@ -315,6 +315,8 @@
#ifdef CONFIG_HARDLOCKUP_DETECTOR
@@ -23066,7 +22741,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;
@@ -23080,7 +22755,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();
@@ -23088,7 +22763,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;
@@ -23096,10 +22771,9 @@ index 9acb29f280ec..caba62080411 100644
/* Enable the perf event */
watchdog_nmi_enable(cpu);
-diff --git a/kernel/workqueue.c b/kernel/workqueue.c
-index 5f5068e94003..54fd5dfb05b1 100644
---- a/kernel/workqueue.c
-+++ b/kernel/workqueue.c
+diff -Nur linux-4.6.6.orig/kernel/workqueue.c linux-4.6.6/kernel/workqueue.c
+--- linux-4.6.6.orig/kernel/workqueue.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/workqueue.c 2016-08-22 21:27:47.433894394 +0200
@@ -48,6 +48,8 @@
#include <linux/nodemask.h>
#include <linux/moduleparam.h>
@@ -23109,7 +22783,7 @@ index 5f5068e94003..54fd5dfb05b1 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.
*
@@ -23127,7 +22801,7 @@ index 5f5068e94003..54fd5dfb05b1 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.
*
@@ -23136,7 +22810,7 @@ index 5f5068e94003..54fd5dfb05b1 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;
/*
@@ -23145,7 +22819,7 @@ index 5f5068e94003..54fd5dfb05b1 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
@@ -23154,7 +22828,7 @@ index 5f5068e94003..54fd5dfb05b1 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);
@@ -23163,7 +22837,7 @@ index 5f5068e94003..54fd5dfb05b1 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() \
@@ -23190,7 +22864,7 @@ index 5f5068e94003..54fd5dfb05b1 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
*
@@ -23199,7 +22873,7 @@ index 5f5068e94003..54fd5dfb05b1 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
*
@@ -23208,7 +22882,7 @@ index 5f5068e94003..54fd5dfb05b1 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
@@ -23240,7 +22914,7 @@ index 5f5068e94003..54fd5dfb05b1 100644
#ifdef CONFIG_DEBUG_OBJECTS_WORK
static struct debug_obj_descr work_debug_descr;
-@@ -574,7 +608,7 @@ static int worker_pool_assign_id(struct worker_pool *pool)
+@@ -574,7 +608,7 @@
* @wq: the target workqueue
* @node: the node ID
*
@@ -23249,7 +22923,7 @@ index 5f5068e94003..54fd5dfb05b1 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.
-@@ -718,8 +752,8 @@ static struct pool_workqueue *get_work_pwq(struct work_struct *work)
+@@ -718,8 +752,8 @@
* @work: the work item of interest
*
* Pools are created and destroyed under wq_pool_mutex, and allows read
@@ -23260,7 +22934,7 @@ index 5f5068e94003..54fd5dfb05b1 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
-@@ -856,50 +890,45 @@ static struct worker *first_idle_worker(struct worker_pool *pool)
+@@ -856,50 +890,45 @@
*/
static void wake_up_worker(struct worker_pool *pool)
{
@@ -23329,7 +23003,7 @@ index 5f5068e94003..54fd5dfb05b1 100644
struct worker_pool *pool;
/*
-@@ -908,29 +937,26 @@ struct task_struct *wq_worker_sleeping(struct task_struct *task)
+@@ -908,29 +937,26 @@
* checking NOT_RUNNING.
*/
if (worker->flags & WORKER_NOT_RUNNING)
@@ -23369,7 +23043,7 @@ index 5f5068e94003..54fd5dfb05b1 100644
}
/**
-@@ -1124,12 +1150,12 @@ static void put_pwq_unlocked(struct pool_workqueue *pwq)
+@@ -1124,12 +1150,12 @@
{
if (pwq) {
/*
@@ -23385,7 +23059,7 @@ index 5f5068e94003..54fd5dfb05b1 100644
}
}
-@@ -1233,7 +1259,7 @@ static int try_to_grab_pending(struct work_struct *work, bool is_dwork,
+@@ -1233,7 +1259,7 @@
struct worker_pool *pool;
struct pool_workqueue *pwq;
@@ -23394,7 +23068,7 @@ index 5f5068e94003..54fd5dfb05b1 100644
/* try to steal the timer if it exists */
if (is_dwork) {
-@@ -1252,6 +1278,7 @@ static int try_to_grab_pending(struct work_struct *work, bool is_dwork,
+@@ -1252,6 +1278,7 @@
if (!test_and_set_bit(WORK_STRUCT_PENDING_BIT, work_data_bits(work)))
return 0;
@@ -23402,7 +23076,7 @@ index 5f5068e94003..54fd5dfb05b1 100644
/*
* The queueing is in progress, or it is already queued. Try to
* steal it from ->worklist without clearing WORK_STRUCT_PENDING.
-@@ -1290,14 +1317,16 @@ static int try_to_grab_pending(struct work_struct *work, bool is_dwork,
+@@ -1290,14 +1317,16 @@
set_work_pool_and_keep_pending(work, pool->id);
spin_unlock(&pool->lock);
@@ -23421,7 +23095,7 @@ index 5f5068e94003..54fd5dfb05b1 100644
return -EAGAIN;
}
-@@ -1399,7 +1428,7 @@ static void __queue_work(int cpu, struct workqueue_struct *wq,
+@@ -1399,7 +1428,7 @@
* queued or lose PENDING. Grabbing PENDING and queueing should
* happen with IRQ disabled.
*/
@@ -23430,7 +23104,7 @@ index 5f5068e94003..54fd5dfb05b1 100644
debug_work_activate(work);
-@@ -1407,6 +1436,7 @@ static void __queue_work(int cpu, struct workqueue_struct *wq,
+@@ -1407,6 +1436,7 @@
if (unlikely(wq->flags & __WQ_DRAINING) &&
WARN_ON_ONCE(!is_chained_work(wq)))
return;
@@ -23438,7 +23112,7 @@ index 5f5068e94003..54fd5dfb05b1 100644
retry:
if (req_cpu == WORK_CPU_UNBOUND)
cpu = wq_select_unbound_cpu(raw_smp_processor_id());
-@@ -1463,10 +1493,8 @@ static void __queue_work(int cpu, struct workqueue_struct *wq,
+@@ -1463,10 +1493,8 @@
/* pwq determined, queue */
trace_workqueue_queue_work(req_cpu, pwq, work);
@@ -23451,7 +23125,7 @@ index 5f5068e94003..54fd5dfb05b1 100644
pwq->nr_in_flight[pwq->work_color]++;
work_flags = work_color_to_flags(pwq->work_color);
-@@ -1484,7 +1512,9 @@ static void __queue_work(int cpu, struct workqueue_struct *wq,
+@@ -1484,7 +1512,9 @@
insert_work(pwq, work, worklist, work_flags);
@@ -23461,7 +23135,7 @@ index 5f5068e94003..54fd5dfb05b1 100644
}
/**
-@@ -1504,14 +1534,14 @@ bool queue_work_on(int cpu, struct workqueue_struct *wq,
+@@ -1504,14 +1534,14 @@
bool ret = false;
unsigned long flags;
@@ -23478,7 +23152,7 @@ index 5f5068e94003..54fd5dfb05b1 100644
return ret;
}
EXPORT_SYMBOL(queue_work_on);
-@@ -1578,14 +1608,14 @@ bool queue_delayed_work_on(int cpu, struct workqueue_struct *wq,
+@@ -1578,14 +1608,14 @@
unsigned long flags;
/* read the comment in __queue_work() */
@@ -23495,7 +23169,7 @@ index 5f5068e94003..54fd5dfb05b1 100644
return ret;
}
EXPORT_SYMBOL(queue_delayed_work_on);
-@@ -1620,7 +1650,7 @@ bool mod_delayed_work_on(int cpu, struct workqueue_struct *wq,
+@@ -1620,7 +1650,7 @@
if (likely(ret >= 0)) {
__queue_delayed_work(cpu, wq, dwork, delay);
@@ -23504,7 +23178,7 @@ index 5f5068e94003..54fd5dfb05b1 100644
}
/* -ENOENT from try_to_grab_pending() becomes %true */
-@@ -1653,7 +1683,9 @@ static void worker_enter_idle(struct worker *worker)
+@@ -1653,7 +1683,9 @@
worker->last_active = jiffies;
/* idle_list is LIFO */
@@ -23514,7 +23188,7 @@ index 5f5068e94003..54fd5dfb05b1 100644
if (too_many_workers(pool) && !timer_pending(&pool->idle_timer))
mod_timer(&pool->idle_timer, jiffies + IDLE_WORKER_TIMEOUT);
-@@ -1686,7 +1718,9 @@ static void worker_leave_idle(struct worker *worker)
+@@ -1686,7 +1718,9 @@
return;
worker_clr_flags(worker, WORKER_IDLE);
pool->nr_idle--;
@@ -23524,7 +23198,7 @@ index 5f5068e94003..54fd5dfb05b1 100644
}
static struct worker *alloc_worker(int node)
-@@ -1852,7 +1886,9 @@ static void destroy_worker(struct worker *worker)
+@@ -1852,7 +1886,9 @@
pool->nr_workers--;
pool->nr_idle--;
@@ -23534,7 +23208,7 @@ index 5f5068e94003..54fd5dfb05b1 100644
worker->flags |= WORKER_DIE;
wake_up_process(worker->task);
}
-@@ -2811,14 +2847,14 @@ static bool start_flush_work(struct work_struct *work, struct wq_barrier *barr)
+@@ -2811,14 +2847,14 @@
might_sleep();
@@ -23552,7 +23226,7 @@ index 5f5068e94003..54fd5dfb05b1 100644
/* see the comment in try_to_grab_pending() with the same code */
pwq = get_work_pwq(work);
if (pwq) {
-@@ -2847,10 +2883,11 @@ static bool start_flush_work(struct work_struct *work, struct wq_barrier *barr)
+@@ -2847,10 +2883,11 @@
else
lock_map_acquire_read(&pwq->wq->lockdep_map);
lock_map_release(&pwq->wq->lockdep_map);
@@ -23565,7 +23239,7 @@ index 5f5068e94003..54fd5dfb05b1 100644
return false;
}
-@@ -2937,7 +2974,7 @@ static bool __cancel_work_timer(struct work_struct *work, bool is_dwork)
+@@ -2937,7 +2974,7 @@
/* tell other tasks trying to grab @work to back off */
mark_work_canceling(work);
@@ -23574,7 +23248,7 @@ index 5f5068e94003..54fd5dfb05b1 100644
flush_work(work);
clear_work_data(work);
-@@ -2992,10 +3029,10 @@ EXPORT_SYMBOL_GPL(cancel_work_sync);
+@@ -2992,10 +3029,10 @@
*/
bool flush_delayed_work(struct delayed_work *dwork)
{
@@ -23587,7 +23261,7 @@ index 5f5068e94003..54fd5dfb05b1 100644
return flush_work(&dwork->work);
}
EXPORT_SYMBOL(flush_delayed_work);
-@@ -3030,7 +3067,7 @@ bool cancel_delayed_work(struct delayed_work *dwork)
+@@ -3030,7 +3067,7 @@
set_work_pool_and_clear_pending(&dwork->work,
get_work_pool_id(&dwork->work));
@@ -23596,7 +23270,7 @@ index 5f5068e94003..54fd5dfb05b1 100644
return ret;
}
EXPORT_SYMBOL(cancel_delayed_work);
-@@ -3259,7 +3296,7 @@ static void rcu_free_pool(struct rcu_head *rcu)
+@@ -3259,7 +3296,7 @@
* put_unbound_pool - put a worker_pool
* @pool: worker_pool to put
*
@@ -23605,7 +23279,7 @@ index 5f5068e94003..54fd5dfb05b1 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().
-@@ -3313,8 +3350,8 @@ static void put_unbound_pool(struct worker_pool *pool)
+@@ -3313,8 +3350,8 @@
del_timer_sync(&pool->idle_timer);
del_timer_sync(&pool->mayday_timer);
@@ -23616,7 +23290,7 @@ index 5f5068e94003..54fd5dfb05b1 100644
}
/**
-@@ -3421,14 +3458,14 @@ static void pwq_unbound_release_workfn(struct work_struct *work)
+@@ -3421,14 +3458,14 @@
put_unbound_pool(pool);
mutex_unlock(&wq_pool_mutex);
@@ -23633,7 +23307,7 @@ index 5f5068e94003..54fd5dfb05b1 100644
}
/**
-@@ -4078,7 +4115,7 @@ void destroy_workqueue(struct workqueue_struct *wq)
+@@ -4078,7 +4115,7 @@
* The base ref is never dropped on per-cpu pwqs. Directly
* schedule RCU free.
*/
@@ -23642,7 +23316,7 @@ index 5f5068e94003..54fd5dfb05b1 100644
} else {
/*
* We're the sole accessor of @wq at this point. Directly
-@@ -4171,7 +4208,8 @@ bool workqueue_congested(int cpu, struct workqueue_struct *wq)
+@@ -4171,7 +4208,8 @@
struct pool_workqueue *pwq;
bool ret;
@@ -23652,7 +23326,7 @@ index 5f5068e94003..54fd5dfb05b1 100644
if (cpu == WORK_CPU_UNBOUND)
cpu = smp_processor_id();
-@@ -4182,7 +4220,8 @@ bool workqueue_congested(int cpu, struct workqueue_struct *wq)
+@@ -4182,7 +4220,8 @@
pwq = unbound_pwq_by_node(wq, cpu_to_node(cpu));
ret = !list_empty(&pwq->delayed_works);
@@ -23662,7 +23336,7 @@ index 5f5068e94003..54fd5dfb05b1 100644
return ret;
}
-@@ -4208,15 +4247,15 @@ unsigned int work_busy(struct work_struct *work)
+@@ -4208,15 +4247,15 @@
if (work_pending(work))
ret |= WORK_BUSY_PENDING;
@@ -23682,7 +23356,7 @@ index 5f5068e94003..54fd5dfb05b1 100644
return ret;
}
-@@ -4405,7 +4444,7 @@ void show_workqueue_state(void)
+@@ -4405,7 +4444,7 @@
unsigned long flags;
int pi;
@@ -23691,7 +23365,7 @@ index 5f5068e94003..54fd5dfb05b1 100644
pr_info("Showing busy workqueues and worker pools:\n");
-@@ -4458,7 +4497,7 @@ void show_workqueue_state(void)
+@@ -4458,7 +4497,7 @@
spin_unlock_irqrestore(&pool->lock, flags);
}
@@ -23700,7 +23374,7 @@ index 5f5068e94003..54fd5dfb05b1 100644
}
/*
-@@ -4819,16 +4858,16 @@ bool freeze_workqueues_busy(void)
+@@ -4819,16 +4858,16 @@
* nr_active is monotonically decreasing. It's safe
* to peek without lock.
*/
@@ -23720,7 +23394,7 @@ index 5f5068e94003..54fd5dfb05b1 100644
}
out_unlock:
mutex_unlock(&wq_pool_mutex);
-@@ -5018,7 +5057,8 @@ static ssize_t wq_pool_ids_show(struct device *dev,
+@@ -5018,7 +5057,8 @@
const char *delim = "";
int node, written = 0;
@@ -23730,7 +23404,7 @@ index 5f5068e94003..54fd5dfb05b1 100644
for_each_node(node) {
written += scnprintf(buf + written, PAGE_SIZE - written,
"%s%d:%d", delim, node,
-@@ -5026,7 +5066,8 @@ static ssize_t wq_pool_ids_show(struct device *dev,
+@@ -5026,7 +5066,8 @@
delim = " ";
}
written += scnprintf(buf + written, PAGE_SIZE - written, "\n");
@@ -23740,11 +23414,10 @@ index 5f5068e94003..54fd5dfb05b1 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.6.6.orig/kernel/workqueue_internal.h linux-4.6.6/kernel/workqueue_internal.h
+--- linux-4.6.6.orig/kernel/workqueue_internal.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/kernel/workqueue_internal.h 2016-08-22 21:27:47.433894394 +0200
+@@ -43,6 +43,7 @@
unsigned long last_active; /* L: last active timestamp */
unsigned int flags; /* X: flags */
int id; /* I: worker id */
@@ -23752,7 +23425,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.
*/
@@ -23762,23 +23435,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 3cca1222578e..b89fc373331f 100644
---- a/lib/Kconfig
-+++ b/lib/Kconfig
-@@ -397,6 +397,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/debugobjects.c b/lib/debugobjects.c
-index 519b5a10fd70..5970701e8f1e 100644
---- a/lib/debugobjects.c
-+++ b/lib/debugobjects.c
-@@ -309,7 +309,10 @@ __debug_object_init(void *addr, struct debug_obj_descr *descr, int onstack)
+diff -Nur linux-4.6.6.orig/lib/debugobjects.c linux-4.6.6/lib/debugobjects.c
+--- linux-4.6.6.orig/lib/debugobjects.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/lib/debugobjects.c 2016-08-22 21:27:47.433894394 +0200
+@@ -309,7 +309,10 @@
struct debug_obj *obj;
unsigned long flags;
@@ -23790,10 +23450,9 @@ index 519b5a10fd70..5970701e8f1e 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.6.6.orig/lib/idr.c linux-4.6.6/lib/idr.c
+--- linux-4.6.6.orig/lib/idr.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/lib/idr.c 2016-08-22 21:27:47.433894394 +0200
@@ -30,6 +30,7 @@
#include <linux/idr.h>
#include <linux/spinlock.h>
@@ -23802,7 +23461,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);
@@ -23840,7 +23499,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()) {
@@ -23857,7 +23516,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);
}
@@ -23865,7 +23524,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));
@@ -23874,7 +23533,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;
@@ -23886,11 +23545,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.6.6.orig/lib/irq_poll.c linux-4.6.6/lib/irq_poll.c
+--- linux-4.6.6.orig/lib/irq_poll.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/lib/irq_poll.c 2016-08-22 21:27:47.433894394 +0200
+@@ -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);
@@ -23898,7 +23556,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);
@@ -23906,7 +23564,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();
@@ -23914,7 +23572,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();
@@ -23922,7 +23580,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();
@@ -23930,11 +23588,21 @@ 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.6.6.orig/lib/Kconfig linux-4.6.6/lib/Kconfig
+--- linux-4.6.6.orig/lib/Kconfig 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/lib/Kconfig 2016-08-22 21:27:47.433894394 +0200
+@@ -397,6 +397,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.6.6.orig/lib/locking-selftest.c linux-4.6.6/lib/locking-selftest.c
+--- linux-4.6.6.orig/lib/locking-selftest.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/lib/locking-selftest.c 2016-08-22 21:27:47.433894394 +0200
+@@ -590,6 +590,8 @@
#include "locking-selftest-spin-hardirq.h"
GENERATE_PERMUTATIONS_2_EVENTS(irqsafe1_hard_spin)
@@ -23943,7 +23611,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)
@@ -23956,7 +23624,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
@@ -23965,7 +23633,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)
@@ -23974,7 +23642,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)
@@ -23983,7 +23651,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)
@@ -23992,7 +23660,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)
@@ -24001,7 +23669,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)
@@ -24010,7 +23678,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)
@@ -24025,7 +23693,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
@@ -24036,7 +23704,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
@@ -24045,7 +23713,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");
@@ -24053,7 +23721,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);
@@ -24082,10 +23750,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.6.6.orig/lib/percpu_ida.c linux-4.6.6/lib/percpu_ida.c
+--- linux-4.6.6.orig/lib/percpu_ida.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/lib/percpu_ida.c 2016-08-22 21:27:47.433894394 +0200
@@ -26,6 +26,9 @@
#include <linux/string.h>
#include <linux/spinlock.h>
@@ -24096,7 +23763,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;
@@ -24112,7 +23779,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);
@@ -24120,7 +23787,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);
@@ -24129,7 +23796,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();
@@ -24138,7 +23805,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);
@@ -24147,7 +23814,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);
}
@@ -24156,7 +23823,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;
@@ -24165,7 +23832,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:
@@ -24174,11 +23841,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 1624c4117961..5f53e83b2859 100644
---- a/lib/radix-tree.c
-+++ b/lib/radix-tree.c
-@@ -240,13 +240,14 @@ radix_tree_node_alloc(struct radix_tree_root *root)
+diff -Nur linux-4.6.6.orig/lib/radix-tree.c linux-4.6.6/lib/radix-tree.c
+--- linux-4.6.6.orig/lib/radix-tree.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/lib/radix-tree.c 2016-08-22 21:27:47.433894394 +0200
+@@ -240,13 +240,14 @@
* succeed in getting a node here (and never reach
* kmem_cache_alloc)
*/
@@ -24194,7 +23860,7 @@ index 1624c4117961..5f53e83b2859 100644
/*
* Update the allocation stack trace as this is more useful
* for debugging.
-@@ -287,6 +288,7 @@ radix_tree_node_free(struct radix_tree_node *node)
+@@ -287,6 +288,7 @@
call_rcu(&node->rcu_head, radix_tree_node_rcu_free);
}
@@ -24202,7 +23868,7 @@ index 1624c4117961..5f53e83b2859 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
-@@ -355,6 +357,7 @@ int radix_tree_maybe_preload(gfp_t gfp_mask)
+@@ -355,6 +357,7 @@
return 0;
}
EXPORT_SYMBOL(radix_tree_maybe_preload);
@@ -24210,11 +23876,10 @@ index 1624c4117961..5f53e83b2859 100644
/*
* Return the maximum key which can be store into a
-diff --git a/lib/random32.c b/lib/random32.c
-index 510d1ce7d4d2..69ed593aab07 100644
---- a/lib/random32.c
-+++ b/lib/random32.c
-@@ -233,7 +233,6 @@ static void __prandom_timer(unsigned long dontcare)
+diff -Nur linux-4.6.6.orig/lib/random32.c linux-4.6.6/lib/random32.c
+--- linux-4.6.6.orig/lib/random32.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/lib/random32.c 2016-08-22 21:27:47.433894394 +0200
+@@ -233,7 +233,6 @@
static void __init __prandom_start_seed_timer(void)
{
@@ -24222,10 +23887,9 @@ index 510d1ce7d4d2..69ed593aab07 100644
seed_timer.expires = jiffies + msecs_to_jiffies(40 * MSEC_PER_SEC);
add_timer(&seed_timer);
}
-diff --git a/lib/rbtree.c b/lib/rbtree.c
-index 1356454e36de..d15d6c4327f1 100644
---- a/lib/rbtree.c
-+++ b/lib/rbtree.c
+diff -Nur linux-4.6.6.orig/lib/rbtree.c linux-4.6.6/lib/rbtree.c
+--- linux-4.6.6.orig/lib/rbtree.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/lib/rbtree.c 2016-08-22 21:27:47.437894654 +0200
@@ -23,6 +23,7 @@
#include <linux/rbtree_augmented.h>
@@ -24234,7 +23898,7 @@ index 1356454e36de..d15d6c4327f1 100644
/*
* red-black trees properties: http://en.wikipedia.org/wiki/Rbtree
-@@ -590,3 +591,13 @@ struct rb_node *rb_first_postorder(const struct rb_root *root)
+@@ -590,3 +591,13 @@
return rb_left_deepest_node(root->rb_node);
}
EXPORT_SYMBOL(rb_first_postorder);
@@ -24248,11 +23912,10 @@ index 1356454e36de..d15d6c4327f1 100644
+ rcu_assign_pointer(*rb_link, node);
+}
+EXPORT_SYMBOL(rb_link_node_rcu);
-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.6.6.orig/lib/scatterlist.c linux-4.6.6/lib/scatterlist.c
+--- linux-4.6.6.orig/lib/scatterlist.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/lib/scatterlist.c 2016-08-22 21:27:47.437894654 +0200
+@@ -620,7 +620,7 @@
flush_kernel_dcache_page(miter->page);
if (miter->__flags & SG_MITER_ATOMIC) {
@@ -24261,7 +23924,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;
@@ -24270,7 +23933,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);
@@ -24279,11 +23942,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.6.6.orig/lib/smp_processor_id.c linux-4.6.6/lib/smp_processor_id.c
+--- linux-4.6.6.orig/lib/smp_processor_id.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/lib/smp_processor_id.c 2016-08-22 21:27:47.437894654 +0200
+@@ -39,8 +39,9 @@
if (!printk_ratelimit())
goto out_enable;
@@ -24295,24 +23957,15 @@ 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 989f8f3d77e0..1df53d6c7ec5 100644
---- a/mm/Kconfig
-+++ b/mm/Kconfig
-@@ -391,7 +391,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
- help
- Transparent Hugepages allows the kernel to use huge pages and
-diff --git a/mm/backing-dev.c b/mm/backing-dev.c
-index 0c6317b7db38..1e6ab5fbadb4 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.6.6.orig/localversion-rt linux-4.6.6/localversion-rt
+--- linux-4.6.6.orig/localversion-rt 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.6.6/localversion-rt 2016-08-22 21:27:47.437894654 +0200
+@@ -0,0 +1 @@
++-rt10
+diff -Nur linux-4.6.6.orig/mm/backing-dev.c linux-4.6.6/mm/backing-dev.c
+--- linux-4.6.6.orig/mm/backing-dev.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/mm/backing-dev.c 2016-08-22 21:27:47.437894654 +0200
+@@ -457,9 +457,9 @@
{
unsigned long flags;
@@ -24324,11 +23977,10 @@ index 0c6317b7db38..1e6ab5fbadb4 100644
return;
}
-diff --git a/mm/compaction.c b/mm/compaction.c
-index f8e925eb479b..14cfc4714e57 100644
---- a/mm/compaction.c
-+++ b/mm/compaction.c
-@@ -1414,10 +1414,12 @@ static int compact_zone(struct zone *zone, struct compact_control *cc)
+diff -Nur linux-4.6.6.orig/mm/compaction.c linux-4.6.6/mm/compaction.c
+--- linux-4.6.6.orig/mm/compaction.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/mm/compaction.c 2016-08-22 21:27:47.437894654 +0200
+@@ -1409,10 +1409,12 @@
cc->migrate_pfn & ~((1UL << cc->order) - 1);
if (cc->last_migrated_pfn < current_block_start) {
@@ -24343,11 +23995,10 @@ index f8e925eb479b..14cfc4714e57 100644
/* No more flushing until we migrate again */
cc->last_migrated_pfn = 0;
}
-diff --git a/mm/filemap.c b/mm/filemap.c
-index f2479af09da9..a87b65c2e402 100644
---- a/mm/filemap.c
-+++ b/mm/filemap.c
-@@ -169,7 +169,9 @@ static void page_cache_tree_delete(struct address_space *mapping,
+diff -Nur linux-4.6.6.orig/mm/filemap.c linux-4.6.6/mm/filemap.c
+--- linux-4.6.6.orig/mm/filemap.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/mm/filemap.c 2016-08-22 21:27:47.437894654 +0200
+@@ -169,7 +169,9 @@
if (!workingset_node_pages(node) &&
list_empty(&node->private_list)) {
node->private_data = mapping;
@@ -24358,7 +24009,7 @@ index f2479af09da9..a87b65c2e402 100644
}
}
-@@ -618,9 +620,12 @@ static int page_cache_tree_insert(struct address_space *mapping,
+@@ -618,9 +620,12 @@
* node->private_list is protected by
* mapping->tree_lock.
*/
@@ -24373,10 +24024,9 @@ index f2479af09da9..a87b65c2e402 100644
}
return 0;
}
-diff --git a/mm/highmem.c b/mm/highmem.c
-index 123bcd3ed4f2..16e8cf26d38a 100644
---- a/mm/highmem.c
-+++ b/mm/highmem.c
+diff -Nur linux-4.6.6.orig/mm/highmem.c linux-4.6.6/mm/highmem.c
+--- linux-4.6.6.orig/mm/highmem.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/mm/highmem.c 2016-08-22 21:27:47.437894654 +0200
@@ -29,10 +29,11 @@
#include <linux/kgdb.h>
#include <asm/tlbflush.h>
@@ -24390,7 +24040,7 @@ index 123bcd3ed4f2..16e8cf26d38a 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);
@@ -24401,10 +24051,21 @@ index 123bcd3ed4f2..16e8cf26d38a 100644
unsigned int nr_free_highpages (void)
{
-diff --git a/mm/memcontrol.c b/mm/memcontrol.c
-index a2e79b83920f..9764ec471f4d 100644
---- a/mm/memcontrol.c
-+++ b/mm/memcontrol.c
+diff -Nur linux-4.6.6.orig/mm/Kconfig linux-4.6.6/mm/Kconfig
+--- linux-4.6.6.orig/mm/Kconfig 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/mm/Kconfig 2016-08-22 21:27:47.437894654 +0200
+@@ -391,7 +391,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
+ help
+ Transparent Hugepages allows the kernel to use huge pages and
+diff -Nur linux-4.6.6.orig/mm/memcontrol.c linux-4.6.6/mm/memcontrol.c
+--- linux-4.6.6.orig/mm/memcontrol.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/mm/memcontrol.c 2016-08-22 21:27:47.441894907 +0200
@@ -67,6 +67,7 @@
#include <net/sock.h>
#include <net/ip.h>
@@ -24413,7 +24074,7 @@ index a2e79b83920f..9764ec471f4d 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
@@ -24422,7 +24083,7 @@ index a2e79b83920f..9764ec471f4d 100644
/* Whether legacy memory+swap accounting is active */
static bool do_memsw_account(void)
{
-@@ -1825,14 +1828,17 @@ static void drain_local_stock(struct work_struct *dummy)
+@@ -1825,14 +1828,17 @@
*/
static void refill_stock(struct mem_cgroup *memcg, unsigned int nr_pages)
{
@@ -24442,7 +24103,7 @@ index a2e79b83920f..9764ec471f4d 100644
}
/*
-@@ -1848,7 +1854,7 @@ static void drain_all_stock(struct mem_cgroup *root_memcg)
+@@ -1848,7 +1854,7 @@
return;
/* Notify other cpus that system-wide "drain" is running */
get_online_cpus();
@@ -24451,7 +24112,7 @@ index a2e79b83920f..9764ec471f4d 100644
for_each_online_cpu(cpu) {
struct memcg_stock_pcp *stock = &per_cpu(memcg_stock, cpu);
struct mem_cgroup *memcg;
-@@ -1865,7 +1871,7 @@ static void drain_all_stock(struct mem_cgroup *root_memcg)
+@@ -1865,7 +1871,7 @@
schedule_work_on(cpu, &stock->work);
}
}
@@ -24460,7 +24121,7 @@ index a2e79b83920f..9764ec471f4d 100644
put_online_cpus();
mutex_unlock(&percpu_charge_mutex);
}
-@@ -4487,12 +4493,12 @@ static int mem_cgroup_move_account(struct page *page,
+@@ -4551,12 +4557,12 @@
ret = 0;
@@ -24475,7 +24136,7 @@ index a2e79b83920f..9764ec471f4d 100644
out_unlock:
unlock_page(page);
out:
-@@ -5342,10 +5348,10 @@ void mem_cgroup_commit_charge(struct page *page, struct mem_cgroup *memcg,
+@@ -5406,10 +5412,10 @@
commit_charge(page, memcg, lrucare);
@@ -24488,7 +24149,7 @@ index a2e79b83920f..9764ec471f4d 100644
if (do_memsw_account() && PageSwapCache(page)) {
swp_entry_t entry = { .val = page_private(page) };
-@@ -5397,14 +5403,14 @@ static void uncharge_batch(struct mem_cgroup *memcg, unsigned long pgpgout,
+@@ -5461,14 +5467,14 @@
memcg_oom_recover(memcg);
}
@@ -24505,20 +24166,7 @@ index a2e79b83920f..9764ec471f4d 100644
if (!mem_cgroup_is_root(memcg))
css_put_many(&memcg->css, nr_pages);
-@@ -5554,10 +5560,10 @@ void mem_cgroup_migrate(struct page *oldpage, struct page *newpage)
-
- commit_charge(newpage, memcg, false);
-
-- local_irq_disable();
-+ local_lock_irq(event_lock);
- mem_cgroup_charge_statistics(memcg, newpage, compound, nr_pages);
- memcg_check_events(memcg, newpage);
-- local_irq_enable();
-+ local_unlock_irq(event_lock);
- }
-
- DEFINE_STATIC_KEY_FALSE(memcg_sockets_enabled_key);
-@@ -5722,6 +5728,7 @@ void mem_cgroup_swapout(struct page *page, swp_entry_t entry)
+@@ -5787,6 +5793,7 @@
{
struct mem_cgroup *memcg;
unsigned short oldid;
@@ -24526,25 +24174,10 @@ index a2e79b83920f..9764ec471f4d 100644
VM_BUG_ON_PAGE(PageLRU(page), page);
VM_BUG_ON_PAGE(page_count(page), page);
-@@ -5750,9 +5757,13 @@ void mem_cgroup_swapout(struct page *page, swp_entry_t entry)
- * important here to have the interrupts disabled because it is the
- * only synchronisation we have for udpating the per-CPU variables.
- */
-+ local_lock_irqsave(event_lock, flags);
-+#ifndef CONFIG_PREEMPT_RT_BASE
- VM_BUG_ON(!irqs_disabled());
-+#endif
- mem_cgroup_charge_statistics(memcg, page, false, -1);
- memcg_check_events(memcg, page);
-+ local_unlock_irqrestore(event_lock, flags);
- }
-
- /*
-diff --git a/mm/mmu_context.c b/mm/mmu_context.c
-index f802c2d216a7..b1b6f238e42d 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.6.6.orig/mm/mmu_context.c linux-4.6.6/mm/mmu_context.c
+--- linux-4.6.6.orig/mm/mmu_context.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/mm/mmu_context.c 2016-08-22 21:27:47.441894907 +0200
+@@ -23,6 +23,7 @@
struct task_struct *tsk = current;
task_lock(tsk);
@@ -24552,7 +24185,7 @@ index f802c2d216a7..b1b6f238e42d 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);
@@ -24560,10 +24193,9 @@ index f802c2d216a7..b1b6f238e42d 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 898fe3f909f9..301140302ff8 100644
---- a/mm/page_alloc.c
-+++ b/mm/page_alloc.c
+diff -Nur linux-4.6.6.orig/mm/page_alloc.c linux-4.6.6/mm/page_alloc.c
+--- linux-4.6.6.orig/mm/page_alloc.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/mm/page_alloc.c 2016-08-22 21:27:47.441894907 +0200
@@ -61,6 +61,7 @@
#include <linux/page_ext.h>
#include <linux/hugetlb.h>
@@ -24572,7 +24204,7 @@ index 898fe3f909f9..301140302ff8 100644
#include <linux/page_owner.h>
#include <linux/kthread.h>
-@@ -275,6 +276,18 @@ EXPORT_SYMBOL(nr_node_ids);
+@@ -275,6 +276,18 @@
EXPORT_SYMBOL(nr_online_nodes);
#endif
@@ -24591,7 +24223,7 @@ index 898fe3f909f9..301140302ff8 100644
int page_group_by_mobility_disabled __read_mostly;
#ifdef CONFIG_DEFERRED_STRUCT_PAGE_INIT
-@@ -814,7 +827,7 @@ static inline int free_pages_check(struct page *page)
+@@ -816,7 +829,7 @@
}
/*
@@ -24600,7 +24232,7 @@ index 898fe3f909f9..301140302ff8 100644
* Assumes all pages on list are in same zone, and of same order.
* count is the number of pages to free.
*
-@@ -825,18 +838,53 @@ static inline int free_pages_check(struct page *page)
+@@ -827,18 +840,53 @@
* pinned" detection logic.
*/
static void free_pcppages_bulk(struct zone *zone, int count,
@@ -24658,7 +24290,7 @@ index 898fe3f909f9..301140302ff8 100644
while (to_free) {
struct page *page;
struct list_head *list;
-@@ -852,7 +900,7 @@ static void free_pcppages_bulk(struct zone *zone, int count,
+@@ -854,7 +902,7 @@
batch_free++;
if (++migratetype == MIGRATE_PCPTYPES)
migratetype = 0;
@@ -24667,7 +24299,7 @@ index 898fe3f909f9..301140302ff8 100644
} while (list_empty(list));
/* This is the only non-empty list. Free them all. */
-@@ -860,24 +908,12 @@ static void free_pcppages_bulk(struct zone *zone, int count,
+@@ -862,24 +910,12 @@
batch_free = to_free;
do {
@@ -24693,7 +24325,7 @@ index 898fe3f909f9..301140302ff8 100644
}
static void free_one_page(struct zone *zone,
-@@ -886,7 +922,9 @@ static void free_one_page(struct zone *zone,
+@@ -888,7 +924,9 @@
int migratetype)
{
unsigned long nr_scanned;
@@ -24704,7 +24336,7 @@ index 898fe3f909f9..301140302ff8 100644
nr_scanned = zone_page_state(zone, NR_PAGES_SCANNED);
if (nr_scanned)
__mod_zone_page_state(zone, NR_PAGES_SCANNED, -nr_scanned);
-@@ -896,7 +934,7 @@ static void free_one_page(struct zone *zone,
+@@ -898,7 +936,7 @@
migratetype = get_pfnblock_migratetype(page, pfn);
}
__free_one_page(page, pfn, zone, order, migratetype);
@@ -24713,7 +24345,7 @@ index 898fe3f909f9..301140302ff8 100644
}
static int free_tail_pages_check(struct page *head_page, struct page *page)
-@@ -1070,10 +1108,10 @@ static void __free_pages_ok(struct page *page, unsigned int order)
+@@ -1072,10 +1110,10 @@
return;
migratetype = get_pfnblock_migratetype(page, pfn);
@@ -24726,7 +24358,7 @@ index 898fe3f909f9..301140302ff8 100644
}
static void __init __free_pages_boot_core(struct page *page,
-@@ -2015,16 +2053,18 @@ static int rmqueue_bulk(struct zone *zone, unsigned int order,
+@@ -2017,16 +2055,18 @@
void drain_zone_pages(struct zone *zone, struct per_cpu_pages *pcp)
{
unsigned long flags;
@@ -24748,7 +24380,7 @@ index 898fe3f909f9..301140302ff8 100644
}
#endif
-@@ -2040,16 +2080,21 @@ static void drain_pages_zone(unsigned int cpu, struct zone *zone)
+@@ -2042,16 +2082,21 @@
unsigned long flags;
struct per_cpu_pageset *pset;
struct per_cpu_pages *pcp;
@@ -24774,7 +24406,7 @@ index 898fe3f909f9..301140302ff8 100644
}
/*
-@@ -2135,8 +2180,17 @@ void drain_all_pages(struct zone *zone)
+@@ -2137,8 +2182,17 @@
else
cpumask_clear_cpu(cpu, &cpus_with_pcps);
}
@@ -24792,7 +24424,7 @@ index 898fe3f909f9..301140302ff8 100644
}
#ifdef CONFIG_HIBERNATION
-@@ -2192,7 +2246,7 @@ void free_hot_cold_page(struct page *page, bool cold)
+@@ -2194,7 +2248,7 @@
migratetype = get_pfnblock_migratetype(page, pfn);
set_pcppage_migratetype(page, migratetype);
@@ -24801,7 +24433,7 @@ index 898fe3f909f9..301140302ff8 100644
__count_vm_event(PGFREE);
/*
-@@ -2218,12 +2272,17 @@ void free_hot_cold_page(struct page *page, bool cold)
+@@ -2220,12 +2274,17 @@
pcp->count++;
if (pcp->count >= pcp->high) {
unsigned long batch = READ_ONCE(pcp->batch);
@@ -24821,7 +24453,7 @@ index 898fe3f909f9..301140302ff8 100644
}
/*
-@@ -2358,7 +2417,7 @@ struct page *buffered_rmqueue(struct zone *preferred_zone,
+@@ -2360,7 +2419,7 @@
struct per_cpu_pages *pcp;
struct list_head *list;
@@ -24830,7 +24462,7 @@ index 898fe3f909f9..301140302ff8 100644
pcp = &this_cpu_ptr(zone->pageset)->pcp;
list = &pcp->lists[migratetype];
if (list_empty(list)) {
-@@ -2382,7 +2441,7 @@ struct page *buffered_rmqueue(struct zone *preferred_zone,
+@@ -2384,7 +2443,7 @@
* allocate greater than order-1 page units with __GFP_NOFAIL.
*/
WARN_ON_ONCE((gfp_flags & __GFP_NOFAIL) && (order > 1));
@@ -24839,7 +24471,7 @@ index 898fe3f909f9..301140302ff8 100644
page = NULL;
if (alloc_flags & ALLOC_HARDER) {
-@@ -2392,11 +2451,13 @@ struct page *buffered_rmqueue(struct zone *preferred_zone,
+@@ -2394,11 +2453,13 @@
}
if (!page)
page = __rmqueue(zone, order, migratetype);
@@ -24855,7 +24487,7 @@ index 898fe3f909f9..301140302ff8 100644
}
__mod_zone_page_state(zone, NR_ALLOC_BATCH, -(1 << order));
-@@ -2406,13 +2467,13 @@ struct page *buffered_rmqueue(struct zone *preferred_zone,
+@@ -2408,13 +2469,13 @@
__count_zone_vm_events(PGALLOC, zone, 1 << order);
zone_statistics(preferred_zone, zone, gfp_flags);
@@ -24871,7 +24503,7 @@ index 898fe3f909f9..301140302ff8 100644
return NULL;
}
-@@ -6213,7 +6274,9 @@ static int page_alloc_cpu_notify(struct notifier_block *self,
+@@ -6215,7 +6276,9 @@
int cpu = (unsigned long)hcpu;
if (action == CPU_DEAD || action == CPU_DEAD_FROZEN) {
@@ -24881,7 +24513,7 @@ index 898fe3f909f9..301140302ff8 100644
drain_pages(cpu);
/*
-@@ -6239,6 +6302,7 @@ static int page_alloc_cpu_notify(struct notifier_block *self,
+@@ -6241,6 +6304,7 @@
void __init page_alloc_init(void)
{
hotcpu_notifier(page_alloc_cpu_notify, 0);
@@ -24889,7 +24521,7 @@ index 898fe3f909f9..301140302ff8 100644
}
/*
-@@ -7163,7 +7227,7 @@ void zone_pcp_reset(struct zone *zone)
+@@ -7165,7 +7229,7 @@
struct per_cpu_pageset *pset;
/* avoid races with drain_pages() */
@@ -24898,7 +24530,7 @@ index 898fe3f909f9..301140302ff8 100644
if (zone->pageset != &boot_pageset) {
for_each_online_cpu(cpu) {
pset = per_cpu_ptr(zone->pageset, cpu);
-@@ -7172,7 +7236,7 @@ void zone_pcp_reset(struct zone *zone)
+@@ -7174,7 +7238,7 @@
free_percpu(zone->pageset);
zone->pageset = &boot_pageset;
}
@@ -24907,11 +24539,10 @@ index 898fe3f909f9..301140302ff8 100644
}
#ifdef CONFIG_MEMORY_HOTREMOVE
-diff --git a/mm/slab.h b/mm/slab.h
-index 5969769fbee6..b85c60f6dba8 100644
---- a/mm/slab.h
-+++ b/mm/slab.h
-@@ -415,7 +415,11 @@ static inline void slab_post_alloc_hook(struct kmem_cache *s, gfp_t flags,
+diff -Nur linux-4.6.6.orig/mm/slab.h linux-4.6.6/mm/slab.h
+--- linux-4.6.6.orig/mm/slab.h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/mm/slab.h 2016-08-22 21:27:47.441894907 +0200
+@@ -415,7 +415,11 @@
* The slab lists for all objects.
*/
struct kmem_cache_node {
@@ -24923,11 +24554,10 @@ index 5969769fbee6..b85c60f6dba8 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 4dbb109eb8cd..2d10cc519150 100644
---- a/mm/slub.c
-+++ b/mm/slub.c
-@@ -1143,7 +1143,7 @@ static noinline int free_debug_processing(
+diff -Nur linux-4.6.6.orig/mm/slub.c linux-4.6.6/mm/slub.c
+--- linux-4.6.6.orig/mm/slub.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/mm/slub.c 2016-08-22 21:27:47.445895167 +0200
+@@ -1143,7 +1143,7 @@
unsigned long uninitialized_var(flags);
int ret = 0;
@@ -24936,7 +24566,7 @@ index 4dbb109eb8cd..2d10cc519150 100644
slab_lock(page);
if (s->flags & SLAB_CONSISTENCY_CHECKS) {
-@@ -1178,7 +1178,7 @@ static noinline int free_debug_processing(
+@@ -1178,7 +1178,7 @@
bulk_cnt, cnt);
slab_unlock(page);
@@ -24945,7 +24575,7 @@ index 4dbb109eb8cd..2d10cc519150 100644
if (!ret)
slab_fix(s, "Object at 0x%p not freed", object);
return ret;
-@@ -1306,6 +1306,12 @@ static inline void dec_slabs_node(struct kmem_cache *s, int node,
+@@ -1306,6 +1306,12 @@
#endif /* CONFIG_SLUB_DEBUG */
@@ -24958,7 +24588,7 @@ index 4dbb109eb8cd..2d10cc519150 100644
/*
* Hooks for other subsystems that check memory allocations. In a typical
* production configuration these hooks all should produce no code at all.
-@@ -1412,10 +1418,17 @@ static struct page *allocate_slab(struct kmem_cache *s, gfp_t flags, int node)
+@@ -1412,10 +1418,17 @@
gfp_t alloc_gfp;
void *start, *p;
int idx, order;
@@ -24976,7 +24606,7 @@ index 4dbb109eb8cd..2d10cc519150 100644
local_irq_enable();
flags |= s->allocflags;
-@@ -1486,7 +1499,7 @@ static struct page *allocate_slab(struct kmem_cache *s, gfp_t flags, int node)
+@@ -1486,7 +1499,7 @@
page->frozen = 1;
out:
@@ -24985,7 +24615,7 @@ index 4dbb109eb8cd..2d10cc519150 100644
local_irq_disable();
if (!page)
return NULL;
-@@ -1543,6 +1556,16 @@ static void __free_slab(struct kmem_cache *s, struct page *page)
+@@ -1543,6 +1556,16 @@
__free_pages(page, order);
}
@@ -25002,7 +24632,7 @@ index 4dbb109eb8cd..2d10cc519150 100644
#define need_reserve_slab_rcu \
(sizeof(((struct page *)NULL)->lru) < sizeof(struct rcu_head))
-@@ -1574,6 +1597,12 @@ static void free_slab(struct kmem_cache *s, struct page *page)
+@@ -1574,6 +1597,12 @@
}
call_rcu(head, rcu_free_slab);
@@ -25015,7 +24645,7 @@ index 4dbb109eb8cd..2d10cc519150 100644
} else
__free_slab(s, page);
}
-@@ -1681,7 +1710,7 @@ static void *get_partial_node(struct kmem_cache *s, struct kmem_cache_node *n,
+@@ -1681,7 +1710,7 @@
if (!n || !n->nr_partial)
return NULL;
@@ -25024,7 +24654,7 @@ index 4dbb109eb8cd..2d10cc519150 100644
list_for_each_entry_safe(page, page2, &n->partial, lru) {
void *t;
-@@ -1706,7 +1735,7 @@ static void *get_partial_node(struct kmem_cache *s, struct kmem_cache_node *n,
+@@ -1706,7 +1735,7 @@
break;
}
@@ -25033,7 +24663,7 @@ index 4dbb109eb8cd..2d10cc519150 100644
return object;
}
-@@ -1952,7 +1981,7 @@ static void deactivate_slab(struct kmem_cache *s, struct page *page,
+@@ -1952,7 +1981,7 @@
* that acquire_slab() will see a slab page that
* is frozen
*/
@@ -25042,7 +24672,7 @@ index 4dbb109eb8cd..2d10cc519150 100644
}
} else {
m = M_FULL;
-@@ -1963,7 +1992,7 @@ static void deactivate_slab(struct kmem_cache *s, struct page *page,
+@@ -1963,7 +1992,7 @@
* slabs from diagnostic functions will not see
* any frozen slabs.
*/
@@ -25051,7 +24681,7 @@ index 4dbb109eb8cd..2d10cc519150 100644
}
}
-@@ -1998,7 +2027,7 @@ static void deactivate_slab(struct kmem_cache *s, struct page *page,
+@@ -1998,7 +2027,7 @@
goto redo;
if (lock)
@@ -25060,7 +24690,7 @@ index 4dbb109eb8cd..2d10cc519150 100644
if (m == M_FREE) {
stat(s, DEACTIVATE_EMPTY);
-@@ -2030,10 +2059,10 @@ static void unfreeze_partials(struct kmem_cache *s,
+@@ -2030,10 +2059,10 @@
n2 = get_node(s, page_to_nid(page));
if (n != n2) {
if (n)
@@ -25073,7 +24703,7 @@ index 4dbb109eb8cd..2d10cc519150 100644
}
do {
-@@ -2062,7 +2091,7 @@ static void unfreeze_partials(struct kmem_cache *s,
+@@ -2062,7 +2091,7 @@
}
if (n)
@@ -25082,7 +24712,7 @@ index 4dbb109eb8cd..2d10cc519150 100644
while (discard_page) {
page = discard_page;
-@@ -2101,14 +2130,21 @@ static void put_cpu_partial(struct kmem_cache *s, struct page *page, int drain)
+@@ -2101,14 +2130,21 @@
pobjects = oldpage->pobjects;
pages = oldpage->pages;
if (drain && pobjects > s->cpu_partial) {
@@ -25104,7 +24734,7 @@ index 4dbb109eb8cd..2d10cc519150 100644
oldpage = NULL;
pobjects = 0;
pages = 0;
-@@ -2180,7 +2216,22 @@ static bool has_cpu_slab(int cpu, void *info)
+@@ -2180,7 +2216,22 @@
static void flush_all(struct kmem_cache *s)
{
@@ -25127,7 +24757,7 @@ index 4dbb109eb8cd..2d10cc519150 100644
}
/*
-@@ -2216,10 +2267,10 @@ static unsigned long count_partial(struct kmem_cache_node *n,
+@@ -2216,10 +2267,10 @@
unsigned long x = 0;
struct page *page;
@@ -25140,7 +24770,7 @@ index 4dbb109eb8cd..2d10cc519150 100644
return x;
}
#endif /* CONFIG_SLUB_DEBUG || CONFIG_SYSFS */
-@@ -2357,8 +2408,10 @@ static inline void *get_freelist(struct kmem_cache *s, struct page *page)
+@@ -2357,8 +2408,10 @@
* already disabled (which is the case for bulk allocation).
*/
static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,
@@ -25152,7 +24782,7 @@ index 4dbb109eb8cd..2d10cc519150 100644
void *freelist;
struct page *page;
-@@ -2418,6 +2471,13 @@ static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,
+@@ -2418,6 +2471,13 @@
VM_BUG_ON(!c->page->frozen);
c->freelist = get_freepointer(s, freelist);
c->tid = next_tid(c->tid);
@@ -25166,7 +24796,7 @@ index 4dbb109eb8cd..2d10cc519150 100644
return freelist;
new_slab:
-@@ -2449,7 +2509,7 @@ static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,
+@@ -2449,7 +2509,7 @@
deactivate_slab(s, page, get_freepointer(s, freelist));
c->page = NULL;
c->freelist = NULL;
@@ -25175,7 +24805,7 @@ index 4dbb109eb8cd..2d10cc519150 100644
}
/*
-@@ -2461,6 +2521,7 @@ static void *__slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,
+@@ -2461,6 +2521,7 @@
{
void *p;
unsigned long flags;
@@ -25183,7 +24813,7 @@ index 4dbb109eb8cd..2d10cc519150 100644
local_irq_save(flags);
#ifdef CONFIG_PREEMPT
-@@ -2472,8 +2533,9 @@ static void *__slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,
+@@ -2472,8 +2533,9 @@
c = this_cpu_ptr(s->cpu_slab);
#endif
@@ -25194,7 +24824,7 @@ index 4dbb109eb8cd..2d10cc519150 100644
return p;
}
-@@ -2659,7 +2721,7 @@ static void __slab_free(struct kmem_cache *s, struct page *page,
+@@ -2659,7 +2721,7 @@
do {
if (unlikely(n)) {
@@ -25203,7 +24833,7 @@ index 4dbb109eb8cd..2d10cc519150 100644
n = NULL;
}
prior = page->freelist;
-@@ -2691,7 +2753,7 @@ static void __slab_free(struct kmem_cache *s, struct page *page,
+@@ -2691,7 +2753,7 @@
* Otherwise the list_lock will synchronize with
* other processors updating the list of slabs.
*/
@@ -25212,7 +24842,7 @@ index 4dbb109eb8cd..2d10cc519150 100644
}
}
-@@ -2733,7 +2795,7 @@ static void __slab_free(struct kmem_cache *s, struct page *page,
+@@ -2733,7 +2795,7 @@
add_partial(n, page, DEACTIVATE_TO_TAIL);
stat(s, FREE_ADD_PARTIAL);
}
@@ -25221,7 +24851,7 @@ index 4dbb109eb8cd..2d10cc519150 100644
return;
slab_empty:
-@@ -2748,7 +2810,7 @@ static void __slab_free(struct kmem_cache *s, struct page *page,
+@@ -2748,7 +2810,7 @@
remove_full(s, n, page);
}
@@ -25230,7 +24860,7 @@ index 4dbb109eb8cd..2d10cc519150 100644
stat(s, FREE_SLAB);
discard_slab(s, page);
}
-@@ -2935,6 +2997,7 @@ int kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size,
+@@ -2935,6 +2997,7 @@
void **p)
{
struct kmem_cache_cpu *c;
@@ -25238,7 +24868,7 @@ index 4dbb109eb8cd..2d10cc519150 100644
int i;
/* memcg and kmem_cache debug support */
-@@ -2958,7 +3021,7 @@ int kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size,
+@@ -2958,7 +3021,7 @@
* of re-populating per CPU c->freelist
*/
p[i] = ___slab_alloc(s, flags, NUMA_NO_NODE,
@@ -25247,7 +24877,7 @@ index 4dbb109eb8cd..2d10cc519150 100644
if (unlikely(!p[i]))
goto error;
-@@ -2970,6 +3033,7 @@ int kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size,
+@@ -2970,6 +3033,7 @@
}
c->tid = next_tid(c->tid);
local_irq_enable();
@@ -25255,7 +24885,7 @@ index 4dbb109eb8cd..2d10cc519150 100644
/* Clear memory outside IRQ disabled fastpath loop */
if (unlikely(flags & __GFP_ZERO)) {
-@@ -3117,7 +3181,7 @@ static void
+@@ -3117,7 +3181,7 @@
init_kmem_cache_node(struct kmem_cache_node *n)
{
n->nr_partial = 0;
@@ -25264,7 +24894,7 @@ index 4dbb109eb8cd..2d10cc519150 100644
INIT_LIST_HEAD(&n->partial);
#ifdef CONFIG_SLUB_DEBUG
atomic_long_set(&n->nr_slabs, 0);
-@@ -3450,6 +3514,10 @@ static void list_slab_objects(struct kmem_cache *s, struct page *page,
+@@ -3450,6 +3514,10 @@
const char *text)
{
#ifdef CONFIG_SLUB_DEBUG
@@ -25275,7 +24905,7 @@ index 4dbb109eb8cd..2d10cc519150 100644
void *addr = page_address(page);
void *p;
unsigned long *map = kzalloc(BITS_TO_LONGS(page->objects) *
-@@ -3470,6 +3538,7 @@ static void list_slab_objects(struct kmem_cache *s, struct page *page,
+@@ -3470,6 +3538,7 @@
slab_unlock(page);
kfree(map);
#endif
@@ -25283,7 +24913,7 @@ index 4dbb109eb8cd..2d10cc519150 100644
}
/*
-@@ -3482,7 +3551,7 @@ static void free_partial(struct kmem_cache *s, struct kmem_cache_node *n)
+@@ -3482,7 +3551,7 @@
struct page *page, *h;
BUG_ON(irqs_disabled());
@@ -25292,7 +24922,7 @@ index 4dbb109eb8cd..2d10cc519150 100644
list_for_each_entry_safe(page, h, &n->partial, lru) {
if (!page->inuse) {
remove_partial(n, page);
-@@ -3492,7 +3561,7 @@ static void free_partial(struct kmem_cache *s, struct kmem_cache_node *n)
+@@ -3492,7 +3561,7 @@
"Objects remaining in %s on __kmem_cache_shutdown()");
}
}
@@ -25301,7 +24931,7 @@ index 4dbb109eb8cd..2d10cc519150 100644
}
/*
-@@ -3706,7 +3775,7 @@ int __kmem_cache_shrink(struct kmem_cache *s, bool deactivate)
+@@ -3706,7 +3775,7 @@
for (i = 0; i < SHRINK_PROMOTE_MAX; i++)
INIT_LIST_HEAD(promote + i);
@@ -25310,7 +24940,7 @@ index 4dbb109eb8cd..2d10cc519150 100644
/*
* Build lists of slabs to discard or promote.
-@@ -3737,7 +3806,7 @@ int __kmem_cache_shrink(struct kmem_cache *s, bool deactivate)
+@@ -3737,7 +3806,7 @@
for (i = SHRINK_PROMOTE_MAX - 1; i >= 0; i--)
list_splice(promote + i, &n->partial);
@@ -25319,7 +24949,7 @@ index 4dbb109eb8cd..2d10cc519150 100644
/* Release empty slabs */
list_for_each_entry_safe(page, t, &discard, lru)
-@@ -3913,6 +3982,12 @@ void __init kmem_cache_init(void)
+@@ -3913,6 +3982,12 @@
{
static __initdata struct kmem_cache boot_kmem_cache,
boot_kmem_cache_node;
@@ -25332,7 +24962,7 @@ index 4dbb109eb8cd..2d10cc519150 100644
if (debug_guardpage_minorder())
slub_max_order = 0;
-@@ -4156,7 +4231,7 @@ static int validate_slab_node(struct kmem_cache *s,
+@@ -4156,7 +4231,7 @@
struct page *page;
unsigned long flags;
@@ -25341,7 +24971,7 @@ index 4dbb109eb8cd..2d10cc519150 100644
list_for_each_entry(page, &n->partial, lru) {
validate_slab_slab(s, page, map);
-@@ -4178,7 +4253,7 @@ static int validate_slab_node(struct kmem_cache *s,
+@@ -4178,7 +4253,7 @@
s->name, count, atomic_long_read(&n->nr_slabs));
out:
@@ -25350,7 +24980,7 @@ index 4dbb109eb8cd..2d10cc519150 100644
return count;
}
-@@ -4366,12 +4441,12 @@ static int list_locations(struct kmem_cache *s, char *buf,
+@@ -4366,12 +4441,12 @@
if (!atomic_long_read(&n->nr_slabs))
continue;
@@ -25365,10 +24995,9 @@ index 4dbb109eb8cd..2d10cc519150 100644
}
for (i = 0; i < t.count; i++) {
-diff --git a/mm/swap.c b/mm/swap.c
-index 03aacbcb013f..d3558eb2f685 100644
---- a/mm/swap.c
-+++ b/mm/swap.c
+diff -Nur linux-4.6.6.orig/mm/swap.c linux-4.6.6/mm/swap.c
+--- linux-4.6.6.orig/mm/swap.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/mm/swap.c 2016-08-22 21:37:54.852846351 +0200
@@ -32,6 +32,7 @@
#include <linux/memcontrol.h>
#include <linux/gfp.h>
@@ -25377,7 +25006,7 @@ index 03aacbcb013f..d3558eb2f685 100644
#include <linux/hugetlb.h>
#include <linux/page_idle.h>
-@@ -48,6 +49,9 @@ static DEFINE_PER_CPU(struct pagevec, lru_rotate_pvecs);
+@@ -48,6 +49,9 @@
static DEFINE_PER_CPU(struct pagevec, lru_deactivate_file_pvecs);
static DEFINE_PER_CPU(struct pagevec, lru_deactivate_pvecs);
@@ -25387,21 +25016,21 @@ index 03aacbcb013f..d3558eb2f685 100644
/*
* This path almost never happens for VM activity - pages are normally
* freed via pagevecs. But it gets used by networking.
-@@ -237,11 +241,11 @@ void rotate_reclaimable_page(struct page *page)
+@@ -237,11 +241,11 @@
unsigned long flags;
get_page(page);
- local_irq_save(flags);
+ local_lock_irqsave(rotate_lock, flags);
pvec = this_cpu_ptr(&lru_rotate_pvecs);
- if (!pagevec_add(pvec, page))
+ if (!pagevec_add(pvec, page) || PageCompound(page))
pagevec_move_tail(pvec);
- local_irq_restore(flags);
+ local_unlock_irqrestore(rotate_lock, flags);
}
}
-@@ -292,12 +296,13 @@ static bool need_activate_page_drain(int cpu)
+@@ -292,12 +296,13 @@
void activate_page(struct page *page)
{
if (PageLRU(page) && !PageActive(page) && !PageUnevictable(page)) {
@@ -25410,14 +25039,14 @@ index 03aacbcb013f..d3558eb2f685 100644
+ activate_page_pvecs);
get_page(page);
- if (!pagevec_add(pvec, page))
+ if (!pagevec_add(pvec, page) || PageCompound(page))
pagevec_lru_move_fn(pvec, __activate_page, NULL);
- put_cpu_var(activate_page_pvecs);
+ put_locked_var(swapvec_lock, activate_page_pvecs);
}
}
-@@ -323,7 +328,7 @@ void activate_page(struct page *page)
+@@ -323,7 +328,7 @@
static void __lru_cache_activate_page(struct page *page)
{
@@ -25426,7 +25055,7 @@ index 03aacbcb013f..d3558eb2f685 100644
int i;
/*
-@@ -345,7 +350,7 @@ static void __lru_cache_activate_page(struct page *page)
+@@ -345,7 +350,7 @@
}
}
@@ -25435,7 +25064,7 @@ index 03aacbcb013f..d3558eb2f685 100644
}
/*
-@@ -387,13 +392,13 @@ EXPORT_SYMBOL(mark_page_accessed);
+@@ -387,12 +392,12 @@
static void __lru_cache_add(struct page *page)
{
@@ -25443,60 +25072,44 @@ index 03aacbcb013f..d3558eb2f685 100644
+ struct pagevec *pvec = &get_locked_var(swapvec_lock, lru_add_pvec);
get_page(page);
- if (!pagevec_space(pvec))
+ if (!pagevec_add(pvec, page) || PageCompound(page))
__pagevec_lru_add(pvec);
- pagevec_add(pvec, page);
- put_cpu_var(lru_add_pvec);
+ put_locked_var(swapvec_lock, lru_add_pvec);
}
/**
-@@ -591,9 +596,15 @@ void lru_add_drain_cpu(int cpu)
+@@ -590,9 +595,15 @@
unsigned long flags;
/* No harm done if a racing interrupt already did this */
- local_irq_save(flags);
+#ifdef CONFIG_PREEMPT_RT_BASE
+ local_lock_irqsave_on(rotate_lock, flags, cpu);
- pagevec_move_tail(pvec);
-- local_irq_restore(flags);
++ pagevec_move_tail(pvec);
+ local_unlock_irqrestore_on(rotate_lock, flags, cpu);
+#else
+ local_lock_irqsave(rotate_lock, flags);
-+ pagevec_move_tail(pvec);
+ pagevec_move_tail(pvec);
+- local_irq_restore(flags);
+ local_unlock_irqrestore(rotate_lock, flags);
+#endif
}
pvec = &per_cpu(lru_deactivate_file_pvecs, cpu);
-@@ -625,11 +636,12 @@ void deactivate_file_page(struct page *page)
- return;
-
- if (likely(get_page_unless_zero(page))) {
-- struct pagevec *pvec = &get_cpu_var(lru_deactivate_file_pvecs);
-+ struct pagevec *pvec = &get_locked_var(swapvec_lock,
-+ lru_deactivate_file_pvecs);
-
- if (!pagevec_add(pvec, page))
- pagevec_lru_move_fn(pvec, lru_deactivate_file_fn, NULL);
-- put_cpu_var(lru_deactivate_file_pvecs);
-+ put_locked_var(swapvec_lock, lru_deactivate_file_pvecs);
- }
- }
-
-@@ -644,27 +656,48 @@ void deactivate_file_page(struct page *page)
+@@ -643,27 +654,47 @@
void deactivate_page(struct page *page)
{
if (PageLRU(page) && PageActive(page) && !PageUnevictable(page)) {
- struct pagevec *pvec = &get_cpu_var(lru_deactivate_pvecs);
+ struct pagevec *pvec = &get_locked_var(swapvec_lock,
-+ lru_deactivate_pvecs);
++ lru_deactivate_file_pvecs);
get_page(page);
- if (!pagevec_add(pvec, page))
+ if (!pagevec_add(pvec, page) || PageCompound(page))
pagevec_lru_move_fn(pvec, lru_deactivate_fn, NULL);
- put_cpu_var(lru_deactivate_pvecs);
-+ put_locked_var(swapvec_lock, lru_deactivate_pvecs);
++ put_locked_var(swapvec_lock, lru_deactivate_file_pvecs);
}
}
@@ -25508,7 +25121,6 @@ index 03aacbcb013f..d3558eb2f685 100644
+ local_unlock_cpu(swapvec_lock);
}
-+
+#ifdef CONFIG_PREEMPT_RT_BASE
+static inline void remote_lru_add_drain(int cpu, struct cpumask *has_work)
+{
@@ -25537,7 +25149,7 @@ index 03aacbcb013f..d3558eb2f685 100644
void lru_add_drain_all(void)
{
-@@ -677,21 +710,18 @@ void lru_add_drain_all(void)
+@@ -676,21 +707,18 @@
cpumask_clear(&has_work);
for_each_online_cpu(cpu) {
@@ -25563,11 +25175,10 @@ index 03aacbcb013f..d3558eb2f685 100644
put_online_cpus();
mutex_unlock(&lock);
-diff --git a/mm/truncate.c b/mm/truncate.c
-index b00272810871..dcc445a87dfe 100644
---- a/mm/truncate.c
-+++ b/mm/truncate.c
-@@ -63,9 +63,12 @@ static void clear_exceptional_entry(struct address_space *mapping,
+diff -Nur linux-4.6.6.orig/mm/truncate.c linux-4.6.6/mm/truncate.c
+--- linux-4.6.6.orig/mm/truncate.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/mm/truncate.c 2016-08-22 21:27:47.445895167 +0200
+@@ -63,9 +63,12 @@
* protected by mapping->tree_lock.
*/
if (!workingset_node_shadows(node) &&
@@ -25582,11 +25193,10 @@ index b00272810871..dcc445a87dfe 100644
__radix_tree_delete_node(&mapping->page_tree, node);
}
unlock:
-diff --git a/mm/vmalloc.c b/mm/vmalloc.c
-index ae7d20b447ff..b7d6f721c2a7 100644
---- a/mm/vmalloc.c
-+++ b/mm/vmalloc.c
-@@ -819,7 +819,7 @@ static void *new_vmap_block(unsigned int order, gfp_t gfp_mask)
+diff -Nur linux-4.6.6.orig/mm/vmalloc.c linux-4.6.6/mm/vmalloc.c
+--- linux-4.6.6.orig/mm/vmalloc.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/mm/vmalloc.c 2016-08-22 21:27:47.445895167 +0200
+@@ -819,7 +819,7 @@
struct vmap_block *vb;
struct vmap_area *va;
unsigned long vb_idx;
@@ -25595,7 +25205,7 @@ index ae7d20b447ff..b7d6f721c2a7 100644
void *vaddr;
node = numa_node_id();
-@@ -862,11 +862,12 @@ static void *new_vmap_block(unsigned int order, gfp_t gfp_mask)
+@@ -862,11 +862,12 @@
BUG_ON(err);
radix_tree_preload_end();
@@ -25610,7 +25220,7 @@ index ae7d20b447ff..b7d6f721c2a7 100644
return vaddr;
}
-@@ -935,6 +936,7 @@ static void *vb_alloc(unsigned long size, gfp_t gfp_mask)
+@@ -935,6 +936,7 @@
struct vmap_block *vb;
void *vaddr = NULL;
unsigned int order;
@@ -25618,7 +25228,7 @@ index ae7d20b447ff..b7d6f721c2a7 100644
BUG_ON(offset_in_page(size));
BUG_ON(size > PAGE_SIZE*VMAP_MAX_ALLOC);
-@@ -949,7 +951,8 @@ static void *vb_alloc(unsigned long size, gfp_t gfp_mask)
+@@ -949,7 +951,8 @@
order = get_order(size);
rcu_read_lock();
@@ -25628,7 +25238,7 @@ index ae7d20b447ff..b7d6f721c2a7 100644
list_for_each_entry_rcu(vb, &vbq->free, free_list) {
unsigned long pages_off;
-@@ -972,7 +975,7 @@ static void *vb_alloc(unsigned long size, gfp_t gfp_mask)
+@@ -972,7 +975,7 @@
break;
}
@@ -25637,11 +25247,10 @@ index ae7d20b447ff..b7d6f721c2a7 100644
rcu_read_unlock();
/* Allocate new block if nothing was found */
-diff --git a/mm/vmstat.c b/mm/vmstat.c
-index 5e4300482897..1ae743192c66 100644
---- a/mm/vmstat.c
-+++ b/mm/vmstat.c
-@@ -226,6 +226,7 @@ void __mod_zone_page_state(struct zone *zone, enum zone_stat_item item,
+diff -Nur linux-4.6.6.orig/mm/vmstat.c linux-4.6.6/mm/vmstat.c
+--- linux-4.6.6.orig/mm/vmstat.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/mm/vmstat.c 2016-08-22 21:27:47.445895167 +0200
+@@ -226,6 +226,7 @@
long x;
long t;
@@ -25649,7 +25258,7 @@ index 5e4300482897..1ae743192c66 100644
x = delta + __this_cpu_read(*p);
t = __this_cpu_read(pcp->stat_threshold);
-@@ -235,6 +236,7 @@ void __mod_zone_page_state(struct zone *zone, enum zone_stat_item item,
+@@ -235,6 +236,7 @@
x = 0;
}
__this_cpu_write(*p, x);
@@ -25657,7 +25266,7 @@ index 5e4300482897..1ae743192c66 100644
}
EXPORT_SYMBOL(__mod_zone_page_state);
-@@ -267,6 +269,7 @@ void __inc_zone_state(struct zone *zone, enum zone_stat_item item)
+@@ -267,6 +269,7 @@
s8 __percpu *p = pcp->vm_stat_diff + item;
s8 v, t;
@@ -25665,7 +25274,7 @@ index 5e4300482897..1ae743192c66 100644
v = __this_cpu_inc_return(*p);
t = __this_cpu_read(pcp->stat_threshold);
if (unlikely(v > t)) {
-@@ -275,6 +278,7 @@ void __inc_zone_state(struct zone *zone, enum zone_stat_item item)
+@@ -275,6 +278,7 @@
zone_page_state_add(v + overstep, zone, item);
__this_cpu_write(*p, -overstep);
}
@@ -25673,7 +25282,7 @@ index 5e4300482897..1ae743192c66 100644
}
void __inc_zone_page_state(struct page *page, enum zone_stat_item item)
-@@ -289,6 +293,7 @@ void __dec_zone_state(struct zone *zone, enum zone_stat_item item)
+@@ -289,6 +293,7 @@
s8 __percpu *p = pcp->vm_stat_diff + item;
s8 v, t;
@@ -25681,7 +25290,7 @@ index 5e4300482897..1ae743192c66 100644
v = __this_cpu_dec_return(*p);
t = __this_cpu_read(pcp->stat_threshold);
if (unlikely(v < - t)) {
-@@ -297,6 +302,7 @@ void __dec_zone_state(struct zone *zone, enum zone_stat_item item)
+@@ -297,6 +302,7 @@
zone_page_state_add(v - overstep, zone, item);
__this_cpu_write(*p, overstep);
}
@@ -25689,11 +25298,10 @@ index 5e4300482897..1ae743192c66 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 8a75f8d2916a..00a38f9f0f37 100644
---- a/mm/workingset.c
-+++ b/mm/workingset.c
-@@ -335,7 +335,8 @@ void workingset_activation(struct page *page)
+diff -Nur linux-4.6.6.orig/mm/workingset.c linux-4.6.6/mm/workingset.c
+--- linux-4.6.6.orig/mm/workingset.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/mm/workingset.c 2016-08-22 21:27:47.445895167 +0200
+@@ -335,7 +335,8 @@
* point where they would still be useful.
*/
@@ -25703,7 +25311,7 @@ index 8a75f8d2916a..00a38f9f0f37 100644
static unsigned long count_shadow_nodes(struct shrinker *shrinker,
struct shrink_control *sc)
-@@ -345,9 +346,9 @@ static unsigned long count_shadow_nodes(struct shrinker *shrinker,
+@@ -345,9 +346,9 @@
unsigned long pages;
/* list_lru lock nests inside IRQ-safe mapping->tree_lock */
@@ -25716,7 +25324,7 @@ index 8a75f8d2916a..00a38f9f0f37 100644
if (memcg_kmem_enabled())
pages = mem_cgroup_node_nr_lru_pages(sc->memcg, sc->nid,
-@@ -440,9 +441,9 @@ static enum lru_status shadow_lru_isolate(struct list_head *item,
+@@ -440,9 +441,9 @@
spin_unlock(&mapping->tree_lock);
ret = LRU_REMOVED_RETRY;
out:
@@ -25728,7 +25336,7 @@ index 8a75f8d2916a..00a38f9f0f37 100644
spin_lock(lru_lock);
return ret;
}
-@@ -453,10 +454,10 @@ static unsigned long scan_shadow_nodes(struct shrinker *shrinker,
+@@ -453,10 +454,10 @@
unsigned long ret;
/* list_lru lock nests inside IRQ-safe mapping->tree_lock */
@@ -25742,7 +25350,7 @@ index 8a75f8d2916a..00a38f9f0f37 100644
return ret;
}
-@@ -494,7 +495,7 @@ static int __init workingset_init(void)
+@@ -494,7 +495,7 @@
printk("workingset: timestamp_bits=%d max_order=%d bucket_order=%u\n",
timestamp_bits, max_order, bucket_order);
@@ -25751,7 +25359,7 @@ index 8a75f8d2916a..00a38f9f0f37 100644
if (ret)
goto err;
ret = register_shrinker(&workingset_shadow_shrinker);
-@@ -502,7 +503,7 @@ static int __init workingset_init(void)
+@@ -502,7 +503,7 @@
goto err_list_lru;
return 0;
err_list_lru:
@@ -25760,11 +25368,10 @@ index 8a75f8d2916a..00a38f9f0f37 100644
err:
return ret;
}
-diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c
-index fe47fbba995a..e46d7bcf562e 100644
---- a/mm/zsmalloc.c
-+++ b/mm/zsmalloc.c
-@@ -1292,7 +1292,7 @@ void *zs_map_object(struct zs_pool *pool, unsigned long handle,
+diff -Nur linux-4.6.6.orig/mm/zsmalloc.c linux-4.6.6/mm/zsmalloc.c
+--- linux-4.6.6.orig/mm/zsmalloc.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/mm/zsmalloc.c 2016-08-22 21:27:47.449895420 +0200
+@@ -1292,7 +1292,7 @@
class = pool->size_class[class_idx];
off = obj_idx_to_offset(page, obj_idx, class->size);
@@ -25773,7 +25380,7 @@ index fe47fbba995a..e46d7bcf562e 100644
area->vm_mm = mm;
if (off + class->size <= PAGE_SIZE) {
/* this object is contained entirely within a page */
-@@ -1345,7 +1345,7 @@ void zs_unmap_object(struct zs_pool *pool, unsigned long handle)
+@@ -1345,7 +1345,7 @@
__zs_unmap_object(area, pages, off, class->size);
}
@@ -25782,11 +25389,10 @@ index fe47fbba995a..e46d7bcf562e 100644
unpin_tag(handle);
}
EXPORT_SYMBOL_GPL(zs_unmap_object);
-diff --git a/net/core/dev.c b/net/core/dev.c
-index 5c925ac50b95..a8fedf89eb12 100644
---- a/net/core/dev.c
-+++ b/net/core/dev.c
-@@ -188,6 +188,7 @@ static unsigned int napi_gen_id = NR_CPUS;
+diff -Nur linux-4.6.6.orig/net/core/dev.c linux-4.6.6/net/core/dev.c
+--- linux-4.6.6.orig/net/core/dev.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/net/core/dev.c 2016-08-22 21:27:47.449895420 +0200
+@@ -188,6 +188,7 @@
static DEFINE_READ_MOSTLY_HASHTABLE(napi_hash, 8);
static seqcount_t devnet_rename_seq;
@@ -25794,7 +25400,7 @@ index 5c925ac50b95..a8fedf89eb12 100644
static inline void dev_base_seq_inc(struct net *net)
{
-@@ -209,14 +210,14 @@ static inline struct hlist_head *dev_index_hash(struct net *net, int ifindex)
+@@ -209,14 +210,14 @@
static inline void rps_lock(struct softnet_data *sd)
{
#ifdef CONFIG_RPS
@@ -25811,7 +25417,7 @@ index 5c925ac50b95..a8fedf89eb12 100644
#endif
}
-@@ -886,7 +887,8 @@ int netdev_get_name(struct net *net, char *name, int ifindex)
+@@ -886,7 +887,8 @@
strcpy(name, dev->name);
rcu_read_unlock();
if (read_seqcount_retry(&devnet_rename_seq, seq)) {
@@ -25821,7 +25427,7 @@ index 5c925ac50b95..a8fedf89eb12 100644
goto retry;
}
-@@ -1155,20 +1157,17 @@ int dev_change_name(struct net_device *dev, const char *newname)
+@@ -1155,20 +1157,17 @@
if (dev->flags & IFF_UP)
return -EBUSY;
@@ -25848,7 +25454,7 @@ index 5c925ac50b95..a8fedf89eb12 100644
if (oldname[0] && !strchr(oldname, '%'))
netdev_info(dev, "renamed from %s\n", oldname);
-@@ -1181,11 +1180,12 @@ int dev_change_name(struct net_device *dev, const char *newname)
+@@ -1181,11 +1180,12 @@
if (ret) {
memcpy(dev->name, oldname, IFNAMSIZ);
dev->name_assign_type = old_assign_type;
@@ -25864,7 +25470,7 @@ index 5c925ac50b95..a8fedf89eb12 100644
netdev_adjacent_rename_links(dev, oldname);
-@@ -1206,7 +1206,8 @@ int dev_change_name(struct net_device *dev, const char *newname)
+@@ -1206,7 +1206,8 @@
/* err >= 0 after dev_alloc_name() or stores the first errno */
if (err >= 0) {
err = ret;
@@ -25874,7 +25480,7 @@ index 5c925ac50b95..a8fedf89eb12 100644
memcpy(dev->name, oldname, IFNAMSIZ);
memcpy(oldname, newname, IFNAMSIZ);
dev->name_assign_type = old_assign_type;
-@@ -1219,6 +1220,11 @@ int dev_change_name(struct net_device *dev, const char *newname)
+@@ -1219,6 +1220,11 @@
}
return err;
@@ -25886,7 +25492,7 @@ index 5c925ac50b95..a8fedf89eb12 100644
}
/**
-@@ -2264,6 +2270,7 @@ static inline void __netif_reschedule(struct Qdisc *q)
+@@ -2264,6 +2270,7 @@
sd->output_queue_tailp = &q->next_sched;
raise_softirq_irqoff(NET_TX_SOFTIRQ);
local_irq_restore(flags);
@@ -25894,7 +25500,7 @@ index 5c925ac50b95..a8fedf89eb12 100644
}
void __netif_schedule(struct Qdisc *q)
-@@ -2345,6 +2352,7 @@ void __dev_kfree_skb_irq(struct sk_buff *skb, enum skb_free_reason reason)
+@@ -2345,6 +2352,7 @@
__this_cpu_write(softnet_data.completion_queue, skb);
raise_softirq_irqoff(NET_TX_SOFTIRQ);
local_irq_restore(flags);
@@ -25902,7 +25508,7 @@ index 5c925ac50b95..a8fedf89eb12 100644
}
EXPORT_SYMBOL(__dev_kfree_skb_irq);
-@@ -3035,7 +3043,11 @@ static inline int __dev_xmit_skb(struct sk_buff *skb, struct Qdisc *q,
+@@ -3035,7 +3043,11 @@
* This permits __QDISC___STATE_RUNNING owner to get the lock more
* often and dequeue packets faster.
*/
@@ -25914,7 +25520,7 @@ index 5c925ac50b95..a8fedf89eb12 100644
if (unlikely(contended))
spin_lock(&q->busylock);
-@@ -3096,9 +3108,44 @@ static void skb_update_prio(struct sk_buff *skb)
+@@ -3096,9 +3108,44 @@
#define skb_update_prio(skb)
#endif
@@ -25959,7 +25565,7 @@ index 5c925ac50b95..a8fedf89eb12 100644
#define RECURSION_LIMIT 10
/**
-@@ -3344,7 +3391,7 @@ static int __dev_queue_xmit(struct sk_buff *skb, void *accel_priv)
+@@ -3344,7 +3391,7 @@
if (txq->xmit_lock_owner != cpu) {
@@ -25968,7 +25574,7 @@ index 5c925ac50b95..a8fedf89eb12 100644
goto recursion_alert;
skb = validate_xmit_skb(skb, dev);
-@@ -3354,9 +3401,9 @@ static int __dev_queue_xmit(struct sk_buff *skb, void *accel_priv)
+@@ -3354,9 +3401,9 @@
HARD_TX_LOCK(dev, txq, cpu);
if (!netif_xmit_stopped(txq)) {
@@ -25980,7 +25586,7 @@ index 5c925ac50b95..a8fedf89eb12 100644
if (dev_xmit_complete(rc)) {
HARD_TX_UNLOCK(dev, txq);
goto out;
-@@ -3730,6 +3777,7 @@ static int enqueue_to_backlog(struct sk_buff *skb, int cpu,
+@@ -3730,6 +3777,7 @@
rps_unlock(sd);
local_irq_restore(flags);
@@ -25988,7 +25594,7 @@ index 5c925ac50b95..a8fedf89eb12 100644
atomic_long_inc(&skb->dev->rx_dropped);
kfree_skb(skb);
-@@ -3748,7 +3796,7 @@ static int netif_rx_internal(struct sk_buff *skb)
+@@ -3748,7 +3796,7 @@
struct rps_dev_flow voidflow, *rflow = &voidflow;
int cpu;
@@ -25997,7 +25603,7 @@ index 5c925ac50b95..a8fedf89eb12 100644
rcu_read_lock();
cpu = get_rps_cpu(skb->dev, skb, &rflow);
-@@ -3758,13 +3806,13 @@ static int netif_rx_internal(struct sk_buff *skb)
+@@ -3758,13 +3806,13 @@
ret = enqueue_to_backlog(skb, cpu, &rflow->last_qtail);
rcu_read_unlock();
@@ -26014,7 +25620,7 @@ index 5c925ac50b95..a8fedf89eb12 100644
}
return ret;
}
-@@ -3798,16 +3846,44 @@ int netif_rx_ni(struct sk_buff *skb)
+@@ -3798,16 +3846,44 @@
trace_netif_rx_ni_entry(skb);
@@ -26063,7 +25669,7 @@ index 5c925ac50b95..a8fedf89eb12 100644
static void net_tx_action(struct softirq_action *h)
{
struct softnet_data *sd = this_cpu_ptr(&softnet_data);
-@@ -3855,7 +3931,7 @@ static void net_tx_action(struct softirq_action *h)
+@@ -3855,7 +3931,7 @@
head = head->next_sched;
root_lock = qdisc_lock(q);
@@ -26072,7 +25678,7 @@ index 5c925ac50b95..a8fedf89eb12 100644
smp_mb__before_atomic();
clear_bit(__QDISC_STATE_SCHED,
&q->state);
-@@ -4264,7 +4340,7 @@ static void flush_backlog(void *arg)
+@@ -4264,7 +4340,7 @@
skb_queue_walk_safe(&sd->input_pkt_queue, skb, tmp) {
if (skb->dev == dev) {
__skb_unlink(skb, &sd->input_pkt_queue);
@@ -26081,7 +25687,7 @@ index 5c925ac50b95..a8fedf89eb12 100644
input_queue_head_incr(sd);
}
}
-@@ -4273,10 +4349,13 @@ static void flush_backlog(void *arg)
+@@ -4273,10 +4349,13 @@
skb_queue_walk_safe(&sd->process_queue, skb, tmp) {
if (skb->dev == dev) {
__skb_unlink(skb, &sd->process_queue);
@@ -26096,7 +25702,7 @@ index 5c925ac50b95..a8fedf89eb12 100644
}
static int napi_gro_complete(struct sk_buff *skb)
-@@ -4735,6 +4814,7 @@ static void net_rps_action_and_irq_enable(struct softnet_data *sd)
+@@ -4735,6 +4814,7 @@
sd->rps_ipi_list = NULL;
local_irq_enable();
@@ -26104,7 +25710,7 @@ index 5c925ac50b95..a8fedf89eb12 100644
/* Send pending IPI's to kick RPS processing on remote cpus. */
while (remsd) {
-@@ -4748,6 +4828,7 @@ static void net_rps_action_and_irq_enable(struct softnet_data *sd)
+@@ -4748,6 +4828,7 @@
} else
#endif
local_irq_enable();
@@ -26112,7 +25718,7 @@ index 5c925ac50b95..a8fedf89eb12 100644
}
static bool sd_has_rps_ipi_waiting(struct softnet_data *sd)
-@@ -4829,6 +4910,7 @@ void __napi_schedule(struct napi_struct *n)
+@@ -4829,6 +4910,7 @@
local_irq_save(flags);
____napi_schedule(this_cpu_ptr(&softnet_data), n);
local_irq_restore(flags);
@@ -26120,7 +25726,7 @@ index 5c925ac50b95..a8fedf89eb12 100644
}
EXPORT_SYMBOL(__napi_schedule);
-@@ -5169,7 +5251,7 @@ static void net_rx_action(struct softirq_action *h)
+@@ -5169,7 +5251,7 @@
list_splice_tail(&repoll, &list);
list_splice(&list, &sd->poll_list);
if (!list_empty(&sd->poll_list))
@@ -26129,7 +25735,7 @@ index 5c925ac50b95..a8fedf89eb12 100644
net_rps_action_and_irq_enable(sd);
}
-@@ -7534,7 +7616,7 @@ EXPORT_SYMBOL(free_netdev);
+@@ -7534,7 +7616,7 @@
void synchronize_net(void)
{
might_sleep();
@@ -26138,7 +25744,7 @@ index 5c925ac50b95..a8fedf89eb12 100644
synchronize_rcu_expedited();
else
synchronize_rcu();
-@@ -7775,16 +7857,20 @@ static int dev_cpu_callback(struct notifier_block *nfb,
+@@ -7775,16 +7857,20 @@
raise_softirq_irqoff(NET_TX_SOFTIRQ);
local_irq_enable();
@@ -26160,7 +25766,7 @@ index 5c925ac50b95..a8fedf89eb12 100644
return NOTIFY_OK;
}
-@@ -8086,8 +8172,9 @@ static int __init net_dev_init(void)
+@@ -8086,8 +8172,9 @@
for_each_possible_cpu(i) {
struct softnet_data *sd = &per_cpu(softnet_data, i);
@@ -26172,10 +25778,9 @@ index 5c925ac50b95..a8fedf89eb12 100644
INIT_LIST_HEAD(&sd->poll_list);
sd->output_queue_tailp = &sd->output_queue;
#ifdef CONFIG_RPS
-diff --git a/net/core/skbuff.c b/net/core/skbuff.c
-index 59bf4d77154f..0c1e29b0f8fb 100644
---- a/net/core/skbuff.c
-+++ b/net/core/skbuff.c
+diff -Nur linux-4.6.6.orig/net/core/skbuff.c linux-4.6.6/net/core/skbuff.c
+--- linux-4.6.6.orig/net/core/skbuff.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/net/core/skbuff.c 2016-08-22 21:27:47.449895420 +0200
@@ -63,6 +63,7 @@
#include <linux/errqueue.h>
#include <linux/prefetch.h>
@@ -26184,7 +25789,7 @@ index 59bf4d77154f..0c1e29b0f8fb 100644
#include <net/protocol.h>
#include <net/dst.h>
-@@ -359,6 +360,8 @@ struct napi_alloc_cache {
+@@ -359,6 +360,8 @@
static DEFINE_PER_CPU(struct page_frag_cache, netdev_alloc_cache);
static DEFINE_PER_CPU(struct napi_alloc_cache, napi_alloc_cache);
@@ -26193,7 +25798,7 @@ index 59bf4d77154f..0c1e29b0f8fb 100644
static void *__netdev_alloc_frag(unsigned int fragsz, gfp_t gfp_mask)
{
-@@ -366,10 +369,10 @@ static void *__netdev_alloc_frag(unsigned int fragsz, gfp_t gfp_mask)
+@@ -366,10 +369,10 @@
unsigned long flags;
void *data;
@@ -26206,7 +25811,7 @@ index 59bf4d77154f..0c1e29b0f8fb 100644
return data;
}
-@@ -388,9 +391,13 @@ EXPORT_SYMBOL(netdev_alloc_frag);
+@@ -388,9 +391,13 @@
static void *__napi_alloc_frag(unsigned int fragsz, gfp_t gfp_mask)
{
@@ -26222,7 +25827,7 @@ index 59bf4d77154f..0c1e29b0f8fb 100644
}
void *napi_alloc_frag(unsigned int fragsz)
-@@ -437,13 +444,13 @@ struct sk_buff *__netdev_alloc_skb(struct net_device *dev, unsigned int len,
+@@ -437,13 +444,13 @@
if (sk_memalloc_socks())
gfp_mask |= __GFP_MEMALLOC;
@@ -26238,7 +25843,7 @@ index 59bf4d77154f..0c1e29b0f8fb 100644
if (unlikely(!data))
return NULL;
-@@ -484,9 +491,10 @@ EXPORT_SYMBOL(__netdev_alloc_skb);
+@@ -484,9 +491,10 @@
struct sk_buff *__napi_alloc_skb(struct napi_struct *napi, unsigned int len,
gfp_t gfp_mask)
{
@@ -26250,7 +25855,7 @@ index 59bf4d77154f..0c1e29b0f8fb 100644
len += NET_SKB_PAD + NET_IP_ALIGN;
-@@ -504,7 +512,10 @@ struct sk_buff *__napi_alloc_skb(struct napi_struct *napi, unsigned int len,
+@@ -504,7 +512,10 @@
if (sk_memalloc_socks())
gfp_mask |= __GFP_MEMALLOC;
@@ -26261,7 +25866,7 @@ index 59bf4d77154f..0c1e29b0f8fb 100644
if (unlikely(!data))
return NULL;
-@@ -515,7 +526,7 @@ struct sk_buff *__napi_alloc_skb(struct napi_struct *napi, unsigned int len,
+@@ -515,7 +526,7 @@
}
/* use OR instead of assignment to avoid clearing of bits in mask */
@@ -26270,7 +25875,7 @@ index 59bf4d77154f..0c1e29b0f8fb 100644
skb->pfmemalloc = 1;
skb->head_frag = 1;
-@@ -759,23 +770,26 @@ EXPORT_SYMBOL(consume_skb);
+@@ -759,23 +770,26 @@
void __kfree_skb_flush(void)
{
@@ -26299,7 +25904,7 @@ index 59bf4d77154f..0c1e29b0f8fb 100644
/* record skb to CPU local list */
nc->skb_cache[nc->skb_count++] = skb;
-@@ -790,6 +804,7 @@ static inline void _kfree_skb_defer(struct sk_buff *skb)
+@@ -790,6 +804,7 @@
nc->skb_cache);
nc->skb_count = 0;
}
@@ -26307,11 +25912,10 @@ index 59bf4d77154f..0c1e29b0f8fb 100644
}
void __kfree_skb_defer(struct sk_buff *skb)
{
-diff --git a/net/core/sock.c b/net/core/sock.c
-index 7e73c26b6bb4..885fe2ec43fb 100644
---- a/net/core/sock.c
-+++ b/net/core/sock.c
-@@ -2421,12 +2421,11 @@ void lock_sock_nested(struct sock *sk, int subclass)
+diff -Nur linux-4.6.6.orig/net/core/sock.c linux-4.6.6/net/core/sock.c
+--- linux-4.6.6.orig/net/core/sock.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/net/core/sock.c 2016-08-22 21:27:47.453895680 +0200
+@@ -2421,12 +2421,11 @@
if (sk->sk_lock.owned)
__lock_sock(sk);
sk->sk_lock.owned = 1;
@@ -26325,10 +25929,9 @@ index 7e73c26b6bb4..885fe2ec43fb 100644
}
EXPORT_SYMBOL(lock_sock_nested);
-diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
-index 6333489771ed..c1f1d5030d37 100644
---- a/net/ipv4/icmp.c
-+++ b/net/ipv4/icmp.c
+diff -Nur linux-4.6.6.orig/net/ipv4/icmp.c linux-4.6.6/net/ipv4/icmp.c
+--- linux-4.6.6.orig/net/ipv4/icmp.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/net/ipv4/icmp.c 2016-08-22 21:27:47.453895680 +0200
@@ -69,6 +69,7 @@
#include <linux/jiffies.h>
#include <linux/kernel.h>
@@ -26337,7 +25940,7 @@ index 6333489771ed..c1f1d5030d37 100644
#include <linux/socket.h>
#include <linux/in.h>
#include <linux/inet.h>
-@@ -891,6 +892,30 @@ static bool icmp_redirect(struct sk_buff *skb)
+@@ -891,6 +892,30 @@
}
/*
@@ -26368,7 +25971,7 @@ index 6333489771ed..c1f1d5030d37 100644
* Handle ICMP_ECHO ("ping") requests.
*
* RFC 1122: 3.2.2.6 MUST have an echo server that answers ICMP echo
-@@ -917,6 +942,11 @@ static bool icmp_echo(struct sk_buff *skb)
+@@ -917,6 +942,11 @@
icmp_param.data_len = skb->len;
icmp_param.head_len = sizeof(struct icmphdr);
icmp_reply(&icmp_param, skb);
@@ -26380,11 +25983,10 @@ index 6333489771ed..c1f1d5030d37 100644
}
/* should there be an ICMP stat for ignored echos? */
return true;
-diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
-index bc5196ea1bdf..fc646aa7fad7 100644
---- a/net/ipv4/inet_connection_sock.c
-+++ b/net/ipv4/inet_connection_sock.c
-@@ -603,7 +603,7 @@ static void reqsk_timer_handler(unsigned long data)
+diff -Nur linux-4.6.6.orig/net/ipv4/inet_connection_sock.c linux-4.6.6/net/ipv4/inet_connection_sock.c
+--- linux-4.6.6.orig/net/ipv4/inet_connection_sock.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/net/ipv4/inet_connection_sock.c 2016-08-22 21:27:47.453895680 +0200
+@@ -603,7 +603,7 @@
if (req->num_timeout++ == 0)
atomic_dec(&queue->young);
timeo = min(TCP_TIMEOUT_INIT << req->num_timeout, TCP_RTO_MAX);
@@ -26393,7 +25995,7 @@ index bc5196ea1bdf..fc646aa7fad7 100644
return;
}
drop:
-@@ -617,8 +617,9 @@ static void reqsk_queue_hash_req(struct request_sock *req,
+@@ -617,8 +617,9 @@
req->num_timeout = 0;
req->sk = NULL;
@@ -26405,11 +26007,10 @@ index bc5196ea1bdf..fc646aa7fad7 100644
inet_ehash_insert(req_to_sk(req), NULL);
/* before letting lookups find us, make sure all req fields
-diff --git a/net/ipv4/inet_timewait_sock.c b/net/ipv4/inet_timewait_sock.c
-index c67f9bd7699c..dfb6286f2e49 100644
---- a/net/ipv4/inet_timewait_sock.c
-+++ b/net/ipv4/inet_timewait_sock.c
-@@ -188,7 +188,8 @@ struct inet_timewait_sock *inet_twsk_alloc(const struct sock *sk,
+diff -Nur linux-4.6.6.orig/net/ipv4/inet_timewait_sock.c linux-4.6.6/net/ipv4/inet_timewait_sock.c
+--- linux-4.6.6.orig/net/ipv4/inet_timewait_sock.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/net/ipv4/inet_timewait_sock.c 2016-08-22 21:27:47.453895680 +0200
+@@ -188,7 +188,8 @@
tw->tw_prot = sk->sk_prot_creator;
atomic64_set(&tw->tw_cookie, atomic64_read(&sk->sk_cookie));
twsk_net_set(tw, sock_net(sk));
@@ -26419,7 +26020,7 @@ index c67f9bd7699c..dfb6286f2e49 100644
/*
* Because we use RCU lookups, we should not set tw_refcnt
* to a non null value before everything is setup for this
-@@ -248,7 +249,7 @@ void __inet_twsk_schedule(struct inet_timewait_sock *tw, int timeo, bool rearm)
+@@ -248,7 +249,7 @@
tw->tw_kill = timeo <= 4*HZ;
if (!rearm) {
@@ -26428,11 +26029,10 @@ index c67f9bd7699c..dfb6286f2e49 100644
atomic_inc(&tw->tw_dr->tw_count);
} else {
mod_timer_pending(&tw->tw_timer, jiffies + timeo);
-diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
-index 03112a3106ab..daa6c5184977 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.6.6.orig/net/ipv4/sysctl_net_ipv4.c linux-4.6.6/net/ipv4/sysctl_net_ipv4.c
+--- linux-4.6.6.orig/net/ipv4/sysctl_net_ipv4.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/net/ipv4/sysctl_net_ipv4.c 2016-08-22 21:27:47.453895680 +0200
+@@ -681,6 +681,13 @@
.proc_handler = proc_dointvec
},
{
@@ -26446,11 +26046,10 @@ index 03112a3106ab..daa6c5184977 100644
.procname = "icmp_ignore_bogus_error_responses",
.data = &init_net.ipv4.sysctl_icmp_ignore_bogus_error_responses,
.maxlen = sizeof(int),
-diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
-index dc27becb9b71..7815f28bc30b 100644
---- a/net/mac80211/rx.c
-+++ b/net/mac80211/rx.c
-@@ -3679,7 +3679,7 @@ void ieee80211_rx_napi(struct ieee80211_hw *hw, struct sk_buff *skb,
+diff -Nur linux-4.6.6.orig/net/mac80211/rx.c linux-4.6.6/net/mac80211/rx.c
+--- linux-4.6.6.orig/net/mac80211/rx.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/net/mac80211/rx.c 2016-08-22 21:27:47.453895680 +0200
+@@ -3679,7 +3679,7 @@
struct ieee80211_supported_band *sband;
struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);
@@ -26459,10 +26058,9 @@ index dc27becb9b71..7815f28bc30b 100644
if (WARN_ON(status->band >= IEEE80211_NUM_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.6.6.orig/net/netfilter/core.c linux-4.6.6/net/netfilter/core.c
+--- linux-4.6.6.orig/net/netfilter/core.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/net/netfilter/core.c 2016-08-22 21:27:47.453895680 +0200
@@ -22,11 +22,17 @@
#include <linux/proc_fs.h>
#include <linux/mutex.h>
@@ -26481,10 +26079,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 8012f67ca5ae..dbfd52456676 100644
---- a/net/packet/af_packet.c
-+++ b/net/packet/af_packet.c
+diff -Nur linux-4.6.6.orig/net/packet/af_packet.c linux-4.6.6/net/packet/af_packet.c
+--- linux-4.6.6.orig/net/packet/af_packet.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/net/packet/af_packet.c 2016-08-22 21:27:47.457895933 +0200
@@ -63,6 +63,7 @@
#include <linux/if_packet.h>
#include <linux/wireless.h>
@@ -26493,7 +26090,7 @@ index 8012f67ca5ae..dbfd52456676 100644
#include <linux/kmod.h>
#include <linux/slab.h>
#include <linux/vmalloc.h>
-@@ -694,7 +695,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... */
@@ -26502,7 +26099,7 @@ index 8012f67ca5ae..dbfd52456676 100644
}
}
-@@ -956,7 +957,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... */
@@ -26511,10 +26108,9 @@ index 8012f67ca5ae..dbfd52456676 100644
}
}
prb_close_block(pkc, pbd, po, status);
-diff --git a/net/rds/ib_rdma.c b/net/rds/ib_rdma.c
-index f7164ac1ffc1..6f37dd5fc717 100644
---- a/net/rds/ib_rdma.c
-+++ b/net/rds/ib_rdma.c
+diff -Nur linux-4.6.6.orig/net/rds/ib_rdma.c linux-4.6.6/net/rds/ib_rdma.c
+--- linux-4.6.6.orig/net/rds/ib_rdma.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/net/rds/ib_rdma.c 2016-08-22 21:27:47.457895933 +0200
@@ -34,6 +34,7 @@
#include <linux/slab.h>
#include <linux/rculist.h>
@@ -26523,7 +26119,7 @@ index f7164ac1ffc1..6f37dd5fc717 100644
#include "ib_mr.h"
-@@ -209,7 +210,7 @@ static inline void wait_clean_list_grace(void)
+@@ -209,7 +210,7 @@
for_each_online_cpu(cpu) {
flag = &per_cpu(clean_list_grace, cpu);
while (test_bit(CLEAN_LIST_BUSY_BIT, flag))
@@ -26532,11 +26128,10 @@ index f7164ac1ffc1..6f37dd5fc717 100644
}
}
-diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
-index 80742edea96f..31f70ee7e609 100644
---- a/net/sched/sch_generic.c
-+++ b/net/sched/sch_generic.c
-@@ -894,7 +894,7 @@ void dev_deactivate_many(struct list_head *head)
+diff -Nur linux-4.6.6.orig/net/sched/sch_generic.c linux-4.6.6/net/sched/sch_generic.c
+--- linux-4.6.6.orig/net/sched/sch_generic.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/net/sched/sch_generic.c 2016-08-22 21:27:47.457895933 +0200
+@@ -894,7 +894,7 @@
/* Wait for outstanding qdisc_run calls. */
list_for_each_entry(dev, head, close_list)
while (some_qdisc_is_busy(dev))
@@ -26545,11 +26140,10 @@ index 80742edea96f..31f70ee7e609 100644
}
void dev_deactivate(struct net_device *dev)
-diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c
-index 7231cb413a2c..e9c57cd2cb7c 100644
---- a/net/sunrpc/svc_xprt.c
-+++ b/net/sunrpc/svc_xprt.c
-@@ -344,7 +344,7 @@ void svc_xprt_do_enqueue(struct svc_xprt *xprt)
+diff -Nur linux-4.6.6.orig/net/sunrpc/svc_xprt.c linux-4.6.6/net/sunrpc/svc_xprt.c
+--- linux-4.6.6.orig/net/sunrpc/svc_xprt.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/net/sunrpc/svc_xprt.c 2016-08-22 21:27:47.457895933 +0200
+@@ -344,7 +344,7 @@
goto out;
}
@@ -26558,7 +26152,7 @@ index 7231cb413a2c..e9c57cd2cb7c 100644
pool = svc_pool_for_cpu(xprt->xpt_server, cpu);
atomic_long_inc(&pool->sp_stats.packets);
-@@ -380,7 +380,7 @@ void svc_xprt_do_enqueue(struct svc_xprt *xprt)
+@@ -380,7 +380,7 @@
atomic_long_inc(&pool->sp_stats.threads_woken);
wake_up_process(rqstp->rq_task);
@@ -26567,7 +26161,7 @@ index 7231cb413a2c..e9c57cd2cb7c 100644
goto out;
}
rcu_read_unlock();
-@@ -401,7 +401,7 @@ void svc_xprt_do_enqueue(struct svc_xprt *xprt)
+@@ -401,7 +401,7 @@
goto redo_search;
}
rqstp = NULL;
@@ -26576,11 +26170,10 @@ index 7231cb413a2c..e9c57cd2cb7c 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.6.6.orig/scripts/mkcompile_h linux-4.6.6/scripts/mkcompile_h
+--- linux-4.6.6.orig/scripts/mkcompile_h 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/scripts/mkcompile_h 2016-08-22 21:27:47.457895933 +0200
+@@ -4,7 +4,8 @@
ARCH=$2
SMP=$3
PREEMPT=$4
@@ -26590,7 +26183,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
@@ -26598,11 +26191,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 9106d8e2300e..6c55707fdc30 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.6.6.orig/sound/core/pcm_native.c linux-4.6.6/sound/core/pcm_native.c
+--- linux-4.6.6.orig/sound/core/pcm_native.c 2016-08-10 12:54:57.000000000 +0200
++++ linux-4.6.6/sound/core/pcm_native.c 2016-08-22 21:27:47.457895933 +0200
+@@ -135,7 +135,7 @@
void snd_pcm_stream_lock_irq(struct snd_pcm_substream *substream)
{
if (!substream->pcm->nonatomic)
@@ -26611,7 +26203,7 @@ index 9106d8e2300e..6c55707fdc30 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)
@@ -26620,7 +26212,7 @@ index 9106d8e2300e..6c55707fdc30 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)
@@ -26629,7 +26221,7 @@ index 9106d8e2300e..6c55707fdc30 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)