diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2017-04-18 18:05:48 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2017-04-19 19:40:09 +0200 |
| commit | af2a435d240c3969b55a5c48a429a4184faa3941 (patch) | |
| tree | f12c1f7055c3f92d0ec4f9583cb96ac33926f779 /target/linux | |
| parent | df940cfc9ea35b7f547297a98f4abda6e5b6a9a2 (diff) | |
linux: update 4.1.x to 4.1.39 including rt-patch
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/patches/4.1.39/cleankernel.patch (renamed from target/linux/patches/4.1.35/cleankernel.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/4.1.39/cris-header.patch (renamed from target/linux/patches/4.1.35/cris-header.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/4.1.39/initramfs-nosizelimit.patch (renamed from target/linux/patches/4.1.35/initramfs-nosizelimit.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/4.1.39/j2-core.patch (renamed from target/linux/patches/4.1.35/j2-core.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/4.1.39/mtd-rootfs.patch (renamed from target/linux/patches/4.1.35/mtd-rootfs.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/4.1.39/patch-realtime (renamed from target/linux/patches/4.1.35/patch-realtime) | 8656 | ||||
| -rw-r--r-- | target/linux/patches/4.1.39/regmap-default-on.patch (renamed from target/linux/patches/4.1.35/regmap-default-on.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/4.1.39/remove-warn.patch (renamed from target/linux/patches/4.1.35/remove-warn.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/4.1.39/startup.patch (renamed from target/linux/patches/4.1.35/startup.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/4.1.39/use-gawk.patch (renamed from target/linux/patches/4.1.35/use-gawk.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/4.1.39/use-libgcc-for-sh.patch (renamed from target/linux/patches/4.1.35/use-libgcc-for-sh.patch) | 0 |
11 files changed, 4534 insertions, 4122 deletions
diff --git a/target/linux/patches/4.1.35/cleankernel.patch b/target/linux/patches/4.1.39/cleankernel.patch index 59693f426..59693f426 100644 --- a/target/linux/patches/4.1.35/cleankernel.patch +++ b/target/linux/patches/4.1.39/cleankernel.patch diff --git a/target/linux/patches/4.1.35/cris-header.patch b/target/linux/patches/4.1.39/cris-header.patch index 2b5a88461..2b5a88461 100644 --- a/target/linux/patches/4.1.35/cris-header.patch +++ b/target/linux/patches/4.1.39/cris-header.patch diff --git a/target/linux/patches/4.1.35/initramfs-nosizelimit.patch b/target/linux/patches/4.1.39/initramfs-nosizelimit.patch index 40d2f6bd8..40d2f6bd8 100644 --- a/target/linux/patches/4.1.35/initramfs-nosizelimit.patch +++ b/target/linux/patches/4.1.39/initramfs-nosizelimit.patch diff --git a/target/linux/patches/4.1.35/j2-core.patch b/target/linux/patches/4.1.39/j2-core.patch index 38136df2c..38136df2c 100644 --- a/target/linux/patches/4.1.35/j2-core.patch +++ b/target/linux/patches/4.1.39/j2-core.patch diff --git a/target/linux/patches/4.1.35/mtd-rootfs.patch b/target/linux/patches/4.1.39/mtd-rootfs.patch index 5f6d82b5c..5f6d82b5c 100644 --- a/target/linux/patches/4.1.35/mtd-rootfs.patch +++ b/target/linux/patches/4.1.39/mtd-rootfs.patch diff --git a/target/linux/patches/4.1.35/patch-realtime b/target/linux/patches/4.1.39/patch-realtime index 94d6fe355..52f9bd3d2 100644 --- a/target/linux/patches/4.1.35/patch-realtime +++ b/target/linux/patches/4.1.39/patch-realtime @@ -1,313 +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 0e307c94809a..6964d0f80ae7 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 a65eafb24997..78d3ed24484a 100644 ---- a/arch/Kconfig -+++ b/arch/Kconfig -@@ -6,6 +6,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 -@@ -49,6 +50,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/alpha/mm/fault.c b/arch/alpha/mm/fault.c -index 9d0ac091a52a..4a905bd667e2 100644 ---- a/arch/alpha/mm/fault.c -+++ b/arch/alpha/mm/fault.c +diff -Nur linux-4.1.39.orig/arch/alpha/mm/fault.c linux-4.1.39/arch/alpha/mm/fault.c +--- linux-4.1.39.orig/arch/alpha/mm/fault.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/alpha/mm/fault.c 2017-04-18 17:56:30.549394649 +0200 @@ -23,8 +23,7 @@ #include <linux/smp.h> #include <linux/interrupt.h> @@ -318,7 +11,7 @@ index 9d0ac091a52a..4a905bd667e2 100644 extern void die_if_kernel(char *,struct pt_regs *,long, unsigned long *); -@@ -107,7 +106,7 @@ do_page_fault(unsigned long address, unsigned long mmcsr, +@@ -107,7 +106,7 @@ /* If we're in an interrupt context, or have no user context, we must not take the fault. */ @@ -327,11 +20,10 @@ index 9d0ac091a52a..4a905bd667e2 100644 goto no_context; #ifdef CONFIG_ALPHA_LARGE_VMALLOC -diff --git a/arch/arc/include/asm/futex.h b/arch/arc/include/asm/futex.h -index 4dc64ddebece..05b5aaf5b0f9 100644 ---- a/arch/arc/include/asm/futex.h -+++ b/arch/arc/include/asm/futex.h -@@ -53,7 +53,7 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr) +diff -Nur linux-4.1.39.orig/arch/arc/include/asm/futex.h linux-4.1.39/arch/arc/include/asm/futex.h +--- linux-4.1.39.orig/arch/arc/include/asm/futex.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/arc/include/asm/futex.h 2017-04-18 17:56:30.549394649 +0200 +@@ -53,7 +53,7 @@ if (!access_ok(VERIFY_WRITE, uaddr, sizeof(int))) return -EFAULT; @@ -340,7 +32,7 @@ index 4dc64ddebece..05b5aaf5b0f9 100644 switch (op) { case FUTEX_OP_SET: -@@ -75,7 +75,7 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr) +@@ -75,7 +75,7 @@ ret = -ENOSYS; } @@ -349,7 +41,7 @@ index 4dc64ddebece..05b5aaf5b0f9 100644 if (!ret) { switch (cmp) { -@@ -104,7 +104,7 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr) +@@ -104,7 +104,7 @@ return ret; } @@ -358,7 +50,7 @@ index 4dc64ddebece..05b5aaf5b0f9 100644 * Notes: * -Best-Effort: Exchg happens only if compare succeeds. * If compare fails, returns; leaving retry/looping to upper layers -@@ -121,7 +121,7 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, u32 oldval, +@@ -121,7 +121,7 @@ if (!access_ok(VERIFY_WRITE, uaddr, sizeof(int))) return -EFAULT; @@ -367,7 +59,7 @@ index 4dc64ddebece..05b5aaf5b0f9 100644 /* TBD : can use llock/scond */ __asm__ __volatile__( -@@ -142,7 +142,7 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, u32 oldval, +@@ -142,7 +142,7 @@ : "r"(oldval), "r"(newval), "r"(uaddr), "ir"(-EFAULT) : "cc", "memory"); @@ -376,11 +68,10 @@ index 4dc64ddebece..05b5aaf5b0f9 100644 *uval = val; return val; -diff --git a/arch/arc/mm/fault.c b/arch/arc/mm/fault.c -index 6a2e006cbcce..d948e4e9d89c 100644 ---- a/arch/arc/mm/fault.c -+++ b/arch/arc/mm/fault.c -@@ -86,7 +86,7 @@ void do_page_fault(unsigned long address, struct pt_regs *regs) +diff -Nur linux-4.1.39.orig/arch/arc/mm/fault.c linux-4.1.39/arch/arc/mm/fault.c +--- linux-4.1.39.orig/arch/arc/mm/fault.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/arc/mm/fault.c 2017-04-18 17:56:30.549394649 +0200 +@@ -86,7 +86,7 @@ * If we're in an interrupt or have no user * context, we must not take the fault.. */ @@ -389,32 +80,10 @@ index 6a2e006cbcce..d948e4e9d89c 100644 goto no_context; if (user_mode(regs)) -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index 19f4cc634b0e..e16a259177d4 100644 ---- a/arch/arm/Kconfig -+++ b/arch/arm/Kconfig -@@ -31,7 +31,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 -+ select HAVE_ARCH_JUMP_LABEL if (!XIP_KERNEL && !PREEMPT_RT_BASE) - select HAVE_ARCH_KGDB - select HAVE_ARCH_SECCOMP_FILTER if (AEABI && !OABI_COMPAT) - select HAVE_ARCH_TRACEHOOK -@@ -66,6 +66,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/cmpxchg.h b/arch/arm/include/asm/cmpxchg.h -index abb2c3769b01..2386e9745ba4 100644 ---- a/arch/arm/include/asm/cmpxchg.h -+++ b/arch/arm/include/asm/cmpxchg.h -@@ -129,6 +129,8 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size +diff -Nur linux-4.1.39.orig/arch/arm/include/asm/cmpxchg.h linux-4.1.39/arch/arm/include/asm/cmpxchg.h +--- linux-4.1.39.orig/arch/arm/include/asm/cmpxchg.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/arm/include/asm/cmpxchg.h 2017-04-18 17:56:30.549394649 +0200 +@@ -129,6 +129,8 @@ #else /* min ARCH >= ARMv6 */ @@ -423,11 +92,10 @@ index abb2c3769b01..2386e9745ba4 100644 extern void __bad_cmpxchg(volatile void *ptr, int size); /* -diff --git a/arch/arm/include/asm/futex.h b/arch/arm/include/asm/futex.h -index 4e78065a16aa..5eed82809d82 100644 ---- a/arch/arm/include/asm/futex.h -+++ b/arch/arm/include/asm/futex.h -@@ -93,6 +93,7 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, +diff -Nur linux-4.1.39.orig/arch/arm/include/asm/futex.h linux-4.1.39/arch/arm/include/asm/futex.h +--- linux-4.1.39.orig/arch/arm/include/asm/futex.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/arm/include/asm/futex.h 2017-04-18 17:56:30.549394649 +0200 +@@ -93,6 +93,7 @@ if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32))) return -EFAULT; @@ -435,7 +103,7 @@ index 4e78065a16aa..5eed82809d82 100644 __asm__ __volatile__("@futex_atomic_cmpxchg_inatomic\n" "1: " TUSER(ldr) " %1, [%4]\n" " teq %1, %2\n" -@@ -104,6 +105,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, +@@ -104,6 +105,8 @@ : "cc", "memory"); *uval = val; @@ -444,7 +112,7 @@ index 4e78065a16aa..5eed82809d82 100644 return ret; } -@@ -124,7 +127,10 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr) +@@ -124,7 +127,10 @@ if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32))) return -EFAULT; @@ -456,7 +124,7 @@ index 4e78065a16aa..5eed82809d82 100644 switch (op) { case FUTEX_OP_SET: -@@ -146,7 +152,10 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr) +@@ -146,7 +152,10 @@ ret = -ENOSYS; } @@ -468,10 +136,9 @@ index 4e78065a16aa..5eed82809d82 100644 if (!ret) { switch (cmp) { -diff --git a/arch/arm/include/asm/switch_to.h b/arch/arm/include/asm/switch_to.h -index c99e259469f7..f3e3d800c407 100644 ---- a/arch/arm/include/asm/switch_to.h -+++ b/arch/arm/include/asm/switch_to.h +diff -Nur linux-4.1.39.orig/arch/arm/include/asm/switch_to.h linux-4.1.39/arch/arm/include/asm/switch_to.h +--- linux-4.1.39.orig/arch/arm/include/asm/switch_to.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/arm/include/asm/switch_to.h 2017-04-18 17:56:30.549394649 +0200 @@ -3,6 +3,13 @@ #include <linux/thread_info.h> @@ -486,7 +153,7 @@ index c99e259469f7..f3e3d800c407 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 -@@ -22,6 +29,7 @@ extern struct task_struct *__switch_to(struct task_struct *, struct thread_info +@@ -22,6 +29,7 @@ #define switch_to(prev,next,last) \ do { \ @@ -494,11 +161,10 @@ index c99e259469f7..f3e3d800c407 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 bd32eded3e50..b5a616376f60 100644 ---- a/arch/arm/include/asm/thread_info.h -+++ b/arch/arm/include/asm/thread_info.h -@@ -50,6 +50,7 @@ struct cpu_context_save { +diff -Nur linux-4.1.39.orig/arch/arm/include/asm/thread_info.h linux-4.1.39/arch/arm/include/asm/thread_info.h +--- linux-4.1.39.orig/arch/arm/include/asm/thread_info.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/arm/include/asm/thread_info.h 2017-04-18 17:56:30.549394649 +0200 +@@ -50,6 +50,7 @@ struct thread_info { unsigned long flags; /* low level flags */ int preempt_count; /* 0 => preemptable, <0 => bug */ @@ -506,7 +172,7 @@ index bd32eded3e50..b5a616376f60 100644 mm_segment_t addr_limit; /* address limit */ struct task_struct *task; /* main task structure */ __u32 cpu; /* cpu */ -@@ -147,6 +148,7 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *, +@@ -147,6 +148,7 @@ #define TIF_SIGPENDING 0 #define TIF_NEED_RESCHED 1 #define TIF_NOTIFY_RESUME 2 /* callback before returning to user */ @@ -514,7 +180,7 @@ index bd32eded3e50..b5a616376f60 100644 #define TIF_UPROBE 7 #define TIF_SYSCALL_TRACE 8 #define TIF_SYSCALL_AUDIT 9 -@@ -160,6 +162,7 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *, +@@ -160,6 +162,7 @@ #define _TIF_SIGPENDING (1 << TIF_SIGPENDING) #define _TIF_NEED_RESCHED (1 << TIF_NEED_RESCHED) #define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME) @@ -522,11 +188,30 @@ index bd32eded3e50..b5a616376f60 100644 #define _TIF_UPROBE (1 << TIF_UPROBE) #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE) #define _TIF_SYSCALL_AUDIT (1 << TIF_SYSCALL_AUDIT) -diff --git a/arch/arm/kernel/asm-offsets.c b/arch/arm/kernel/asm-offsets.c -index 871b8267d211..4dbe70de7318 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.1.39.orig/arch/arm/Kconfig linux-4.1.39/arch/arm/Kconfig +--- linux-4.1.39.orig/arch/arm/Kconfig 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/arm/Kconfig 2017-04-18 17:56:30.549394649 +0200 +@@ -31,7 +31,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 ++ select HAVE_ARCH_JUMP_LABEL if (!XIP_KERNEL && !PREEMPT_RT_BASE) + select HAVE_ARCH_KGDB + select HAVE_ARCH_SECCOMP_FILTER if (AEABI && !OABI_COMPAT) + select HAVE_ARCH_TRACEHOOK +@@ -66,6 +66,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.1.39.orig/arch/arm/kernel/asm-offsets.c linux-4.1.39/arch/arm/kernel/asm-offsets.c +--- linux-4.1.39.orig/arch/arm/kernel/asm-offsets.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/arm/kernel/asm-offsets.c 2017-04-18 17:56:30.549394649 +0200 +@@ -65,6 +65,7 @@ BLANK(); DEFINE(TI_FLAGS, offsetof(struct thread_info, flags)); DEFINE(TI_PREEMPT, offsetof(struct thread_info, preempt_count)); @@ -534,11 +219,10 @@ index 871b8267d211..4dbe70de7318 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 570306c49406..797a13d959b7 100644 ---- a/arch/arm/kernel/entry-armv.S -+++ b/arch/arm/kernel/entry-armv.S -@@ -208,11 +208,18 @@ __irq_svc: +diff -Nur linux-4.1.39.orig/arch/arm/kernel/entry-armv.S linux-4.1.39/arch/arm/kernel/entry-armv.S +--- linux-4.1.39.orig/arch/arm/kernel/entry-armv.S 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/arm/kernel/entry-armv.S 2017-04-18 17:56:30.549394649 +0200 +@@ -208,11 +208,18 @@ #ifdef CONFIG_PREEMPT get_thread_info tsk ldr r8, [tsk, #TI_PREEMPT] @ get preempt count @@ -559,7 +243,7 @@ index 570306c49406..797a13d959b7 100644 #endif svc_exit r5, irq = 1 @ return from exception -@@ -227,8 +234,14 @@ svc_preempt: +@@ -227,8 +234,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 @@ -575,11 +259,40 @@ index 570306c49406..797a13d959b7 100644 #endif __und_fault: -diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c -index f192a2a41719..649247ac00e6 100644 ---- a/arch/arm/kernel/process.c -+++ b/arch/arm/kernel/process.c -@@ -290,6 +290,30 @@ unsigned long arch_randomize_brk(struct mm_struct *mm) +diff -Nur linux-4.1.39.orig/arch/arm/kernel/patch.c linux-4.1.39/arch/arm/kernel/patch.c +--- linux-4.1.39.orig/arch/arm/kernel/patch.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/arm/kernel/patch.c 2017-04-18 17:56:30.549394649 +0200 +@@ -15,7 +15,7 @@ + unsigned int insn; + }; + +-static DEFINE_SPINLOCK(patch_lock); ++static DEFINE_RAW_SPINLOCK(patch_lock); + + static void __kprobes *patch_map(void *addr, int fixmap, unsigned long *flags) + __acquires(&patch_lock) +@@ -32,7 +32,7 @@ + return addr; + + if (flags) +- spin_lock_irqsave(&patch_lock, *flags); ++ raw_spin_lock_irqsave(&patch_lock, *flags); + else + __acquire(&patch_lock); + +@@ -47,7 +47,7 @@ + clear_fixmap(fixmap); + + if (flags) +- spin_unlock_irqrestore(&patch_lock, *flags); ++ raw_spin_unlock_irqrestore(&patch_lock, *flags); + else + __release(&patch_lock); + } +diff -Nur linux-4.1.39.orig/arch/arm/kernel/process.c linux-4.1.39/arch/arm/kernel/process.c +--- linux-4.1.39.orig/arch/arm/kernel/process.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/arm/kernel/process.c 2017-04-18 17:56:30.549394649 +0200 +@@ -290,6 +290,30 @@ } #ifdef CONFIG_MMU @@ -610,11 +323,10 @@ index f192a2a41719..649247ac00e6 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 586eef26203d..25bd12ef0b36 100644 ---- a/arch/arm/kernel/signal.c -+++ b/arch/arm/kernel/signal.c -@@ -568,7 +568,8 @@ asmlinkage int +diff -Nur linux-4.1.39.orig/arch/arm/kernel/signal.c linux-4.1.39/arch/arm/kernel/signal.c +--- linux-4.1.39.orig/arch/arm/kernel/signal.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/arm/kernel/signal.c 2017-04-18 17:56:30.549394649 +0200 +@@ -568,7 +568,8 @@ do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall) { do { @@ -624,11 +336,10 @@ index 586eef26203d..25bd12ef0b36 100644 schedule(); } else { if (unlikely(!user_mode(regs))) -diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c -index f11d82527076..e561aef093c7 100644 ---- a/arch/arm/kernel/smp.c -+++ b/arch/arm/kernel/smp.c -@@ -213,8 +213,6 @@ int __cpu_disable(void) +diff -Nur linux-4.1.39.orig/arch/arm/kernel/smp.c linux-4.1.39/arch/arm/kernel/smp.c +--- linux-4.1.39.orig/arch/arm/kernel/smp.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/arm/kernel/smp.c 2017-04-18 17:56:30.549394649 +0200 +@@ -213,8 +213,6 @@ flush_cache_louis(); local_flush_tlb_all(); @@ -637,7 +348,7 @@ index f11d82527076..e561aef093c7 100644 return 0; } -@@ -230,6 +228,9 @@ void __cpu_die(unsigned int cpu) +@@ -230,6 +228,9 @@ pr_err("CPU%u: cpu didn't die\n", cpu); return; } @@ -647,11 +358,10 @@ index f11d82527076..e561aef093c7 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.1.39.orig/arch/arm/kernel/unwind.c linux-4.1.39/arch/arm/kernel/unwind.c +--- linux-4.1.39.orig/arch/arm/kernel/unwind.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/arm/kernel/unwind.c 2017-04-18 17:56:30.549394649 +0200 +@@ -93,7 +93,7 @@ static const struct unwind_idx *__origin_unwind_idx; extern const struct unwind_idx __stop_unwind_idx[]; @@ -660,7 +370,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; @@ -669,7 +379,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; } } @@ -678,7 +388,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; @@ -690,7 +400,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; @@ -702,11 +412,10 @@ index 0bee233fef9a..314cfb232a63 100644 kfree(tab); } -diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c -index 87b2663a5564..ce5e58d76cf9 100644 ---- a/arch/arm/kvm/arm.c -+++ b/arch/arm/kvm/arm.c -@@ -473,9 +473,9 @@ bool kvm_arch_intc_initialized(struct kvm *kvm) +diff -Nur linux-4.1.39.orig/arch/arm/kvm/arm.c linux-4.1.39/arch/arm/kvm/arm.c +--- linux-4.1.39.orig/arch/arm/kvm/arm.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/arm/kvm/arm.c 2017-04-18 17:56:30.549394649 +0200 +@@ -473,9 +473,9 @@ static void vcpu_pause(struct kvm_vcpu *vcpu) { @@ -718,11 +427,10 @@ index 87b2663a5564..ce5e58d76cf9 100644 } static int kvm_vcpu_initialized(struct kvm_vcpu *vcpu) -diff --git a/arch/arm/kvm/psci.c b/arch/arm/kvm/psci.c -index 531e922486b2..e24f0461ea2d 100644 ---- a/arch/arm/kvm/psci.c -+++ b/arch/arm/kvm/psci.c -@@ -68,7 +68,7 @@ static unsigned long kvm_psci_vcpu_on(struct kvm_vcpu *source_vcpu) +diff -Nur linux-4.1.39.orig/arch/arm/kvm/psci.c linux-4.1.39/arch/arm/kvm/psci.c +--- linux-4.1.39.orig/arch/arm/kvm/psci.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/arm/kvm/psci.c 2017-04-18 17:56:30.549394649 +0200 +@@ -68,7 +68,7 @@ { struct kvm *kvm = source_vcpu->kvm; struct kvm_vcpu *vcpu = NULL; @@ -731,7 +439,7 @@ index 531e922486b2..e24f0461ea2d 100644 unsigned long cpu_id; unsigned long context_id; phys_addr_t target_pc; -@@ -117,7 +117,7 @@ static unsigned long kvm_psci_vcpu_on(struct kvm_vcpu *source_vcpu) +@@ -117,7 +117,7 @@ smp_mb(); /* Make sure the above is visible */ wq = kvm_arch_vcpu_wq(vcpu); @@ -740,10 +448,9 @@ index 531e922486b2..e24f0461ea2d 100644 return PSCI_RET_SUCCESS; } -diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c -index eaf58f88ef5d..8d3cb458a99c 100644 ---- a/arch/arm/mach-at91/at91rm9200.c -+++ b/arch/arm/mach-at91/at91rm9200.c +diff -Nur linux-4.1.39.orig/arch/arm/mach-at91/at91rm9200.c linux-4.1.39/arch/arm/mach-at91/at91rm9200.c +--- linux-4.1.39.orig/arch/arm/mach-at91/at91rm9200.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/arm/mach-at91/at91rm9200.c 2017-04-18 17:56:30.549394649 +0200 @@ -13,7 +13,6 @@ #include <linux/of_platform.h> @@ -752,7 +459,7 @@ index eaf58f88ef5d..8d3cb458a99c 100644 #include "generic.h" #include "soc.h" -@@ -34,7 +33,6 @@ static void __init at91rm9200_dt_device_init(void) +@@ -34,7 +33,6 @@ of_platform_populate(NULL, of_default_bus_match_table, NULL, soc_dev); @@ -760,11 +467,10 @@ index eaf58f88ef5d..8d3cb458a99c 100644 at91rm9200_pm_init(); } -diff --git a/arch/arm/mach-at91/at91sam9.c b/arch/arm/mach-at91/at91sam9.c -index e47a2093a0e7..d2bede665a1b 100644 ---- a/arch/arm/mach-at91/at91sam9.c -+++ b/arch/arm/mach-at91/at91sam9.c -@@ -62,8 +62,6 @@ static void __init at91sam9_common_init(void) +diff -Nur linux-4.1.39.orig/arch/arm/mach-at91/at91sam9.c linux-4.1.39/arch/arm/mach-at91/at91sam9.c +--- linux-4.1.39.orig/arch/arm/mach-at91/at91sam9.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/arm/mach-at91/at91sam9.c 2017-04-18 17:56:30.549394649 +0200 +@@ -62,8 +62,6 @@ soc_dev = soc_device_to_device(soc); of_platform_populate(NULL, of_default_bus_match_table, NULL, soc_dev); @@ -773,10 +479,9 @@ index e47a2093a0e7..d2bede665a1b 100644 } static void __init at91sam9_dt_device_init(void) -diff --git a/arch/arm/mach-at91/generic.h b/arch/arm/mach-at91/generic.h -index b0fa7dc7286d..28ca57a2060f 100644 ---- a/arch/arm/mach-at91/generic.h -+++ b/arch/arm/mach-at91/generic.h +diff -Nur linux-4.1.39.orig/arch/arm/mach-at91/generic.h linux-4.1.39/arch/arm/mach-at91/generic.h +--- linux-4.1.39.orig/arch/arm/mach-at91/generic.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/arm/mach-at91/generic.h 2017-04-18 17:56:30.549394649 +0200 @@ -11,27 +11,18 @@ #ifndef _AT91_GENERIC_H #define _AT91_GENERIC_H @@ -807,10 +512,9 @@ index b0fa7dc7286d..28ca57a2060f 100644 #endif #endif /* _AT91_GENERIC_H */ -diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c -index 5062699cbb12..3be82cf983dd 100644 ---- a/arch/arm/mach-at91/pm.c -+++ b/arch/arm/mach-at91/pm.c +diff -Nur linux-4.1.39.orig/arch/arm/mach-at91/pm.c linux-4.1.39/arch/arm/mach-at91/pm.c +--- linux-4.1.39.orig/arch/arm/mach-at91/pm.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/arm/mach-at91/pm.c 2017-04-18 17:56:30.549394649 +0200 @@ -31,10 +31,13 @@ #include <asm/mach/irq.h> #include <asm/fncpy.h> @@ -825,7 +529,7 @@ index 5062699cbb12..3be82cf983dd 100644 /* * FIXME: this is needed to communicate between the pinctrl driver and * the PM implementation in the machine. Possibly part of the PM -@@ -85,7 +88,7 @@ static int at91_pm_verify_clocks(void) +@@ -85,7 +88,7 @@ unsigned long scsr; int i; @@ -834,7 +538,7 @@ index 5062699cbb12..3be82cf983dd 100644 /* USB must not be using PLLB */ if ((scsr & at91_pm_data.uhp_udp_mask) != 0) { -@@ -99,8 +102,7 @@ static int at91_pm_verify_clocks(void) +@@ -99,8 +102,7 @@ if ((scsr & (AT91_PMC_PCK0 << i)) == 0) continue; @@ -844,7 +548,7 @@ index 5062699cbb12..3be82cf983dd 100644 if (css != AT91_PMC_CSS_SLOW) { pr_err("AT91: PM - Suspend-to-RAM with PCK%d src %d\n", i, css); return 0; -@@ -143,8 +145,8 @@ static void at91_pm_suspend(suspend_state_t state) +@@ -143,8 +145,8 @@ flush_cache_all(); outer_disable(); @@ -855,7 +559,7 @@ index 5062699cbb12..3be82cf983dd 100644 outer_resume(); } -@@ -348,6 +350,21 @@ static __init void at91_dt_ramc(void) +@@ -348,6 +350,21 @@ at91_pm_set_standby(standby); } @@ -877,7 +581,7 @@ index 5062699cbb12..3be82cf983dd 100644 static void __init at91_pm_sram_init(void) { struct gen_pool *sram_pool; -@@ -394,13 +411,36 @@ static void __init at91_pm_sram_init(void) +@@ -394,13 +411,36 @@ &at91_pm_suspend_in_sram, at91_pm_suspend_in_sram_sz); } @@ -916,7 +620,7 @@ index 5062699cbb12..3be82cf983dd 100644 if (at91_suspend_sram_fn) suspend_set_ops(&at91_pm_ops); else -@@ -419,7 +459,7 @@ void __init at91rm9200_pm_init(void) +@@ -419,7 +459,7 @@ at91_pm_data.uhp_udp_mask = AT91RM9200_PMC_UHP | AT91RM9200_PMC_UDP; at91_pm_data.memctrl = AT91_MEMCTRL_MC; @@ -925,7 +629,7 @@ index 5062699cbb12..3be82cf983dd 100644 } void __init at91sam9260_pm_init(void) -@@ -427,7 +467,7 @@ void __init at91sam9260_pm_init(void) +@@ -427,7 +467,7 @@ at91_dt_ramc(); at91_pm_data.memctrl = AT91_MEMCTRL_SDRAMC; at91_pm_data.uhp_udp_mask = AT91SAM926x_PMC_UHP | AT91SAM926x_PMC_UDP; @@ -934,7 +638,7 @@ index 5062699cbb12..3be82cf983dd 100644 } void __init at91sam9g45_pm_init(void) -@@ -435,7 +475,7 @@ void __init at91sam9g45_pm_init(void) +@@ -435,7 +475,7 @@ at91_dt_ramc(); at91_pm_data.uhp_udp_mask = AT91SAM926x_PMC_UHP; at91_pm_data.memctrl = AT91_MEMCTRL_DDRSDR; @@ -943,7 +647,7 @@ index 5062699cbb12..3be82cf983dd 100644 } void __init at91sam9x5_pm_init(void) -@@ -443,5 +483,13 @@ void __init at91sam9x5_pm_init(void) +@@ -443,5 +483,13 @@ at91_dt_ramc(); at91_pm_data.uhp_udp_mask = AT91SAM926x_PMC_UHP | AT91SAM926x_PMC_UDP; at91_pm_data.memctrl = AT91_MEMCTRL_DDRSDR; @@ -958,11 +662,10 @@ index 5062699cbb12..3be82cf983dd 100644 + at91_pm_data.memctrl = AT91_MEMCTRL_DDRSDR; + at91_pm_init(NULL); } -diff --git a/arch/arm/mach-at91/sama5.c b/arch/arm/mach-at91/sama5.c -index 41d829d8e7d5..3755da6decf5 100644 ---- a/arch/arm/mach-at91/sama5.c -+++ b/arch/arm/mach-at91/sama5.c -@@ -49,7 +49,7 @@ static void __init sama5_dt_device_init(void) +diff -Nur linux-4.1.39.orig/arch/arm/mach-at91/sama5.c linux-4.1.39/arch/arm/mach-at91/sama5.c +--- linux-4.1.39.orig/arch/arm/mach-at91/sama5.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/arm/mach-at91/sama5.c 2017-04-18 17:56:30.549394649 +0200 +@@ -49,7 +49,7 @@ soc_dev = soc_device_to_device(soc); of_platform_populate(NULL, of_default_bus_match_table, NULL, soc_dev); @@ -971,11 +674,10 @@ index 41d829d8e7d5..3755da6decf5 100644 } static const char *sama5_dt_board_compat[] __initconst = { -diff --git a/arch/arm/mach-exynos/platsmp.c b/arch/arm/mach-exynos/platsmp.c -index a825bca2a2b6..4619e228df41 100644 ---- a/arch/arm/mach-exynos/platsmp.c -+++ b/arch/arm/mach-exynos/platsmp.c -@@ -231,7 +231,7 @@ static void __iomem *scu_base_addr(void) +diff -Nur linux-4.1.39.orig/arch/arm/mach-exynos/platsmp.c linux-4.1.39/arch/arm/mach-exynos/platsmp.c +--- linux-4.1.39.orig/arch/arm/mach-exynos/platsmp.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/arm/mach-exynos/platsmp.c 2017-04-18 17:56:30.549394649 +0200 +@@ -231,7 +231,7 @@ return (void __iomem *)(S5P_VA_SCU); } @@ -984,7 +686,7 @@ index a825bca2a2b6..4619e228df41 100644 static void exynos_secondary_init(unsigned int cpu) { -@@ -244,8 +244,8 @@ static void exynos_secondary_init(unsigned int cpu) +@@ -244,8 +244,8 @@ /* * Synchronise with the boot thread. */ @@ -995,7 +697,7 @@ index a825bca2a2b6..4619e228df41 100644 } static int exynos_boot_secondary(unsigned int cpu, struct task_struct *idle) -@@ -259,7 +259,7 @@ static int exynos_boot_secondary(unsigned int cpu, struct task_struct *idle) +@@ -259,7 +259,7 @@ * Set synchronisation state between this boot processor * and the secondary one */ @@ -1004,7 +706,7 @@ index a825bca2a2b6..4619e228df41 100644 /* * The secondary processor is waiting to be released from -@@ -286,7 +286,7 @@ static int exynos_boot_secondary(unsigned int cpu, struct task_struct *idle) +@@ -286,7 +286,7 @@ if (timeout == 0) { printk(KERN_ERR "cpu1 power enable failed"); @@ -1013,7 +715,7 @@ index a825bca2a2b6..4619e228df41 100644 return -ETIMEDOUT; } } -@@ -342,7 +342,7 @@ static int exynos_boot_secondary(unsigned int cpu, struct task_struct *idle) +@@ -342,7 +342,7 @@ * calibrations, then wait for it to finish */ fail: @@ -1022,10 +724,9 @@ index a825bca2a2b6..4619e228df41 100644 return pen_release != -1 ? ret : 0; } -diff --git a/arch/arm/mach-hisi/platmcpm.c b/arch/arm/mach-hisi/platmcpm.c -index 280f3f14f77c..bc2ed95c0e62 100644 ---- a/arch/arm/mach-hisi/platmcpm.c -+++ b/arch/arm/mach-hisi/platmcpm.c +diff -Nur linux-4.1.39.orig/arch/arm/mach-hisi/platmcpm.c linux-4.1.39/arch/arm/mach-hisi/platmcpm.c +--- linux-4.1.39.orig/arch/arm/mach-hisi/platmcpm.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/arm/mach-hisi/platmcpm.c 2017-04-18 17:56:30.549394649 +0200 @@ -57,7 +57,7 @@ static void __iomem *sysctrl, *fabric; @@ -1035,7 +736,7 @@ index 280f3f14f77c..bc2ed95c0e62 100644 static u32 fabric_phys_addr; /* * [0]: bootwrapper physical address -@@ -104,7 +104,7 @@ static int hip04_mcpm_power_up(unsigned int cpu, unsigned int cluster) +@@ -104,7 +104,7 @@ if (cluster >= HIP04_MAX_CLUSTERS || cpu >= HIP04_MAX_CPUS_PER_CLUSTER) return -EINVAL; @@ -1044,7 +745,7 @@ index 280f3f14f77c..bc2ed95c0e62 100644 if (hip04_cpu_table[cluster][cpu]) goto out; -@@ -133,7 +133,7 @@ static int hip04_mcpm_power_up(unsigned int cpu, unsigned int cluster) +@@ -133,7 +133,7 @@ udelay(20); out: hip04_cpu_table[cluster][cpu]++; @@ -1053,7 +754,7 @@ index 280f3f14f77c..bc2ed95c0e62 100644 return 0; } -@@ -149,7 +149,7 @@ static void hip04_mcpm_power_down(void) +@@ -149,7 +149,7 @@ __mcpm_cpu_going_down(cpu, cluster); @@ -1062,7 +763,7 @@ index 280f3f14f77c..bc2ed95c0e62 100644 BUG_ON(__mcpm_cluster_state(cluster) != CLUSTER_UP); hip04_cpu_table[cluster][cpu]--; if (hip04_cpu_table[cluster][cpu] == 1) { -@@ -162,7 +162,7 @@ static void hip04_mcpm_power_down(void) +@@ -162,7 +162,7 @@ last_man = hip04_cluster_is_down(cluster); if (last_man && __mcpm_outbound_enter_critical(cpu, cluster)) { @@ -1071,7 +772,7 @@ index 280f3f14f77c..bc2ed95c0e62 100644 /* Since it's Cortex A15, disable L2 prefetching. */ asm volatile( "mcr p15, 1, %0, c15, c0, 3 \n\t" -@@ -173,7 +173,7 @@ static void hip04_mcpm_power_down(void) +@@ -173,7 +173,7 @@ hip04_set_snoop_filter(cluster, 0); __mcpm_outbound_leave_critical(cluster, CLUSTER_DOWN); } else { @@ -1080,7 +781,7 @@ index 280f3f14f77c..bc2ed95c0e62 100644 v7_exit_coherency_flush(louis); } -@@ -192,7 +192,7 @@ static int hip04_mcpm_wait_for_powerdown(unsigned int cpu, unsigned int cluster) +@@ -192,7 +192,7 @@ cpu >= HIP04_MAX_CPUS_PER_CLUSTER); count = TIMEOUT_MSEC / POLL_MSEC; @@ -1089,7 +790,7 @@ index 280f3f14f77c..bc2ed95c0e62 100644 for (tries = 0; tries < count; tries++) { if (hip04_cpu_table[cluster][cpu]) { ret = -EBUSY; -@@ -202,10 +202,10 @@ static int hip04_mcpm_wait_for_powerdown(unsigned int cpu, unsigned int cluster) +@@ -202,10 +202,10 @@ data = readl_relaxed(sysctrl + SC_CPU_RESET_STATUS(cluster)); if (data & CORE_WFI_STATUS(cpu)) break; @@ -1102,7 +803,7 @@ index 280f3f14f77c..bc2ed95c0e62 100644 } if (tries >= count) goto err; -@@ -220,10 +220,10 @@ static int hip04_mcpm_wait_for_powerdown(unsigned int cpu, unsigned int cluster) +@@ -220,10 +220,10 @@ } if (tries >= count) goto err; @@ -1115,7 +816,7 @@ index 280f3f14f77c..bc2ed95c0e62 100644 return ret; } -@@ -235,10 +235,10 @@ static void hip04_mcpm_powered_up(void) +@@ -235,10 +235,10 @@ cpu = MPIDR_AFFINITY_LEVEL(mpidr, 0); cluster = MPIDR_AFFINITY_LEVEL(mpidr, 1); @@ -1128,11 +829,10 @@ index 280f3f14f77c..bc2ed95c0e62 100644 } static void __naked hip04_mcpm_power_up_setup(unsigned int affinity_level) -diff --git a/arch/arm/mach-omap2/gpio.c b/arch/arm/mach-omap2/gpio.c -index 7a577145b68b..689a1af47c80 100644 ---- a/arch/arm/mach-omap2/gpio.c -+++ b/arch/arm/mach-omap2/gpio.c -@@ -130,7 +130,6 @@ static int __init omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused) +diff -Nur linux-4.1.39.orig/arch/arm/mach-omap2/gpio.c linux-4.1.39/arch/arm/mach-omap2/gpio.c +--- linux-4.1.39.orig/arch/arm/mach-omap2/gpio.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/arm/mach-omap2/gpio.c 2017-04-18 17:56:30.549394649 +0200 +@@ -130,7 +130,6 @@ } pwrdm = omap_hwmod_get_pwrdm(oh); @@ -1140,10 +840,9 @@ index 7a577145b68b..689a1af47c80 100644 pdev = omap_device_build(name, id - 1, oh, pdata, sizeof(*pdata)); kfree(pdata); -diff --git a/arch/arm/mach-omap2/omap-smp.c b/arch/arm/mach-omap2/omap-smp.c -index 5305ec7341ec..19732b56088b 100644 ---- a/arch/arm/mach-omap2/omap-smp.c -+++ b/arch/arm/mach-omap2/omap-smp.c +diff -Nur linux-4.1.39.orig/arch/arm/mach-omap2/omap-smp.c linux-4.1.39/arch/arm/mach-omap2/omap-smp.c +--- linux-4.1.39.orig/arch/arm/mach-omap2/omap-smp.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/arm/mach-omap2/omap-smp.c 2017-04-18 17:56:30.549394649 +0200 @@ -43,7 +43,7 @@ /* SCU base address */ static void __iomem *scu_base; @@ -1153,7 +852,7 @@ index 5305ec7341ec..19732b56088b 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. */ @@ -1164,7 +863,7 @@ index 5305ec7341ec..19732b56088b 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 */ @@ -1173,7 +872,7 @@ index 5305ec7341ec..19732b56088b 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 */ @@ -1182,11 +881,10 @@ index 5305ec7341ec..19732b56088b 100644 return 0; } -diff --git a/arch/arm/mach-omap2/powerdomain.c b/arch/arm/mach-omap2/powerdomain.c -index 78af6d8cf2e2..ef4227ffa3b6 100644 ---- a/arch/arm/mach-omap2/powerdomain.c -+++ b/arch/arm/mach-omap2/powerdomain.c -@@ -1166,43 +1166,3 @@ int pwrdm_get_context_loss_count(struct powerdomain *pwrdm) +diff -Nur linux-4.1.39.orig/arch/arm/mach-omap2/powerdomain.c linux-4.1.39/arch/arm/mach-omap2/powerdomain.c +--- linux-4.1.39.orig/arch/arm/mach-omap2/powerdomain.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/arm/mach-omap2/powerdomain.c 2017-04-18 17:56:30.553394804 +0200 +@@ -1166,43 +1166,3 @@ return count; } @@ -1230,11 +928,10 @@ index 78af6d8cf2e2..ef4227ffa3b6 100644 - - return 0; -} -diff --git a/arch/arm/mach-omap2/powerdomain.h b/arch/arm/mach-omap2/powerdomain.h -index 28a796ce07d7..5e0c033a21db 100644 ---- a/arch/arm/mach-omap2/powerdomain.h -+++ b/arch/arm/mach-omap2/powerdomain.h -@@ -244,7 +244,6 @@ int pwrdm_state_switch(struct powerdomain *pwrdm); +diff -Nur linux-4.1.39.orig/arch/arm/mach-omap2/powerdomain.h linux-4.1.39/arch/arm/mach-omap2/powerdomain.h +--- linux-4.1.39.orig/arch/arm/mach-omap2/powerdomain.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/arm/mach-omap2/powerdomain.h 2017-04-18 17:56:30.553394804 +0200 +@@ -244,7 +244,6 @@ int pwrdm_pre_transition(struct powerdomain *pwrdm); int pwrdm_post_transition(struct powerdomain *pwrdm); int pwrdm_get_context_loss_count(struct powerdomain *pwrdm); @@ -1242,10 +939,9 @@ index 28a796ce07d7..5e0c033a21db 100644 extern int omap_set_pwrdm_state(struct powerdomain *pwrdm, u8 state); -diff --git a/arch/arm/mach-prima2/platsmp.c b/arch/arm/mach-prima2/platsmp.c -index e46c91094dde..dcb3ed0c26da 100644 ---- a/arch/arm/mach-prima2/platsmp.c -+++ b/arch/arm/mach-prima2/platsmp.c +diff -Nur linux-4.1.39.orig/arch/arm/mach-prima2/platsmp.c linux-4.1.39/arch/arm/mach-prima2/platsmp.c +--- linux-4.1.39.orig/arch/arm/mach-prima2/platsmp.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/arm/mach-prima2/platsmp.c 2017-04-18 17:56:30.553394804 +0200 @@ -22,7 +22,7 @@ static void __iomem *clk_base; @@ -1255,7 +951,7 @@ index e46c91094dde..dcb3ed0c26da 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. */ @@ -1266,7 +962,7 @@ index e46c91094dde..dcb3ed0c26da 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(); @@ -1275,7 +971,7 @@ index e46c91094dde..dcb3ed0c26da 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 */ @@ -1284,10 +980,9 @@ index e46c91094dde..dcb3ed0c26da 100644 return pen_release != -1 ? -ENOSYS : 0; } -diff --git a/arch/arm/mach-qcom/platsmp.c b/arch/arm/mach-qcom/platsmp.c -index 5cde63a64b34..82c9b9145c3e 100644 ---- a/arch/arm/mach-qcom/platsmp.c -+++ b/arch/arm/mach-qcom/platsmp.c +diff -Nur linux-4.1.39.orig/arch/arm/mach-qcom/platsmp.c linux-4.1.39/arch/arm/mach-qcom/platsmp.c +--- linux-4.1.39.orig/arch/arm/mach-qcom/platsmp.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/arm/mach-qcom/platsmp.c 2017-04-18 17:56:30.553394804 +0200 @@ -46,7 +46,7 @@ extern void secondary_startup_arm(void); @@ -1297,7 +992,7 @@ index 5cde63a64b34..82c9b9145c3e 100644 #ifdef CONFIG_HOTPLUG_CPU static void __ref 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. */ @@ -1308,7 +1003,7 @@ index 5cde63a64b34..82c9b9145c3e 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 */ @@ -1317,7 +1012,7 @@ index 5cde63a64b34..82c9b9145c3e 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 */ @@ -1326,11 +1021,10 @@ index 5cde63a64b34..82c9b9145c3e 100644 return ret; } -diff --git a/arch/arm/mach-spear/platsmp.c b/arch/arm/mach-spear/platsmp.c -index fd4297713d67..b0553b2c2d53 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.1.39.orig/arch/arm/mach-spear/platsmp.c linux-4.1.39/arch/arm/mach-spear/platsmp.c +--- linux-4.1.39.orig/arch/arm/mach-spear/platsmp.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/arm/mach-spear/platsmp.c 2017-04-18 17:56:30.553394804 +0200 +@@ -32,7 +32,7 @@ sync_cache_w(&pen_release); } @@ -1339,7 +1033,7 @@ index fd4297713d67..b0553b2c2d53 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. */ @@ -1350,7 +1044,7 @@ index fd4297713d67..b0553b2c2d53 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 */ @@ -1359,7 +1053,7 @@ index fd4297713d67..b0553b2c2d53 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 */ @@ -1368,11 +1062,10 @@ index fd4297713d67..b0553b2c2d53 100644 return pen_release != -1 ? -ENOSYS : 0; } -diff --git a/arch/arm/mach-sti/platsmp.c b/arch/arm/mach-sti/platsmp.c -index d4b624f8dfcb..56d4028122f5 100644 ---- a/arch/arm/mach-sti/platsmp.c -+++ b/arch/arm/mach-sti/platsmp.c -@@ -34,7 +34,7 @@ static void write_pen_release(int val) +diff -Nur linux-4.1.39.orig/arch/arm/mach-sti/platsmp.c linux-4.1.39/arch/arm/mach-sti/platsmp.c +--- linux-4.1.39.orig/arch/arm/mach-sti/platsmp.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/arm/mach-sti/platsmp.c 2017-04-18 17:56:30.553394804 +0200 +@@ -34,7 +34,7 @@ sync_cache_w(&pen_release); } @@ -1381,7 +1074,7 @@ index d4b624f8dfcb..56d4028122f5 100644 static void sti_secondary_init(unsigned int cpu) { -@@ -49,8 +49,8 @@ static void sti_secondary_init(unsigned int cpu) +@@ -49,8 +49,8 @@ /* * Synchronise with the boot thread. */ @@ -1392,7 +1085,7 @@ index d4b624f8dfcb..56d4028122f5 100644 } static int sti_boot_secondary(unsigned int cpu, struct task_struct *idle) -@@ -61,7 +61,7 @@ static int sti_boot_secondary(unsigned int cpu, struct task_struct *idle) +@@ -61,7 +61,7 @@ * set synchronisation state between this boot processor * and the secondary one */ @@ -1401,7 +1094,7 @@ index d4b624f8dfcb..56d4028122f5 100644 /* * The secondary processor is waiting to be released from -@@ -92,7 +92,7 @@ static int sti_boot_secondary(unsigned int cpu, struct task_struct *idle) +@@ -92,7 +92,7 @@ * now the secondary core is starting up let it run its * calibrations, then wait for it to finish */ @@ -1410,11 +1103,10 @@ index d4b624f8dfcb..56d4028122f5 100644 return pen_release != -1 ? -ENOSYS : 0; } -diff --git a/arch/arm/mach-ux500/platsmp.c b/arch/arm/mach-ux500/platsmp.c -index a44967f3168c..3af22a4836bf 100644 ---- a/arch/arm/mach-ux500/platsmp.c -+++ b/arch/arm/mach-ux500/platsmp.c -@@ -51,7 +51,7 @@ static void __iomem *scu_base_addr(void) +diff -Nur linux-4.1.39.orig/arch/arm/mach-ux500/platsmp.c linux-4.1.39/arch/arm/mach-ux500/platsmp.c +--- linux-4.1.39.orig/arch/arm/mach-ux500/platsmp.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/arm/mach-ux500/platsmp.c 2017-04-18 17:56:30.553394804 +0200 +@@ -51,7 +51,7 @@ return NULL; } @@ -1423,7 +1115,7 @@ index a44967f3168c..3af22a4836bf 100644 static void ux500_secondary_init(unsigned int cpu) { -@@ -64,8 +64,8 @@ static void ux500_secondary_init(unsigned int cpu) +@@ -64,8 +64,8 @@ /* * Synchronise with the boot thread. */ @@ -1434,7 +1126,7 @@ index a44967f3168c..3af22a4836bf 100644 } static int ux500_boot_secondary(unsigned int cpu, struct task_struct *idle) -@@ -76,7 +76,7 @@ static int ux500_boot_secondary(unsigned int cpu, struct task_struct *idle) +@@ -76,7 +76,7 @@ * set synchronisation state between this boot processor * and the secondary one */ @@ -1443,7 +1135,7 @@ index a44967f3168c..3af22a4836bf 100644 /* * The secondary processor is waiting to be released from -@@ -97,7 +97,7 @@ static int ux500_boot_secondary(unsigned int cpu, struct task_struct *idle) +@@ -97,7 +97,7 @@ * now the secondary core is starting up let it run its * calibrations, then wait for it to finish */ @@ -1452,11 +1144,10 @@ index a44967f3168c..3af22a4836bf 100644 return pen_release != -1 ? -ENOSYS : 0; } -diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c -index 6333d9c17875..62016e3e4a9c 100644 ---- a/arch/arm/mm/fault.c -+++ b/arch/arm/mm/fault.c -@@ -276,7 +276,7 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs) +diff -Nur linux-4.1.39.orig/arch/arm/mm/fault.c linux-4.1.39/arch/arm/mm/fault.c +--- linux-4.1.39.orig/arch/arm/mm/fault.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/arm/mm/fault.c 2017-04-18 17:56:30.553394804 +0200 +@@ -276,7 +276,7 @@ * If we're in an interrupt or have no user * context, we must not take the fault.. */ @@ -1465,7 +1156,7 @@ index 6333d9c17875..62016e3e4a9c 100644 goto no_context; if (user_mode(regs)) -@@ -430,6 +430,9 @@ do_translation_fault(unsigned long addr, unsigned int fsr, +@@ -430,6 +430,9 @@ if (addr < TASK_SIZE) return do_page_fault(addr, fsr, regs); @@ -1475,7 +1166,7 @@ index 6333d9c17875..62016e3e4a9c 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) { @@ -1485,11 +1176,10 @@ index 6333d9c17875..62016e3e4a9c 100644 do_bad_area(addr, fsr, regs); return 0; } -diff --git a/arch/arm/mm/highmem.c b/arch/arm/mm/highmem.c -index b98895d9fe57..4050e9d99d6b 100644 ---- a/arch/arm/mm/highmem.c -+++ b/arch/arm/mm/highmem.c -@@ -54,11 +54,13 @@ EXPORT_SYMBOL(kunmap); +diff -Nur linux-4.1.39.orig/arch/arm/mm/highmem.c linux-4.1.39/arch/arm/mm/highmem.c +--- linux-4.1.39.orig/arch/arm/mm/highmem.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/arm/mm/highmem.c 2017-04-18 17:56:30.553394804 +0200 +@@ -54,11 +54,13 @@ void *kmap_atomic(struct page *page) { @@ -1503,7 +1193,7 @@ index b98895d9fe57..4050e9d99d6b 100644 pagefault_disable(); if (!PageHighMem(page)) return page_address(page); -@@ -92,7 +94,10 @@ void *kmap_atomic(struct page *page) +@@ -92,7 +94,10 @@ * in place, so the contained TLB flush ensures the TLB is updated * with the new mapping. */ @@ -1515,7 +1205,7 @@ index b98895d9fe57..4050e9d99d6b 100644 return (void *)vaddr; } -@@ -109,27 +114,33 @@ void __kunmap_atomic(void *kvaddr) +@@ -109,27 +114,33 @@ if (cache_is_vivt()) __cpuc_flush_dcache_area((void *)vaddr, PAGE_SIZE); @@ -1550,7 +1240,7 @@ index b98895d9fe57..4050e9d99d6b 100644 pagefault_disable(); if (!PageHighMem(page)) return page_address(page); -@@ -140,7 +151,10 @@ void *kmap_atomic_pfn(unsigned long pfn) +@@ -140,7 +151,10 @@ #ifdef CONFIG_DEBUG_HIGHMEM BUG_ON(!pte_none(get_fixmap_pte(vaddr))); #endif @@ -1562,7 +1252,7 @@ index b98895d9fe57..4050e9d99d6b 100644 return (void *)vaddr; } -@@ -154,3 +168,28 @@ struct page *kmap_atomic_to_page(const void *ptr) +@@ -154,3 +168,28 @@ return pte_page(get_fixmap_pte(vaddr)); } @@ -1591,11 +1281,10 @@ index b98895d9fe57..4050e9d99d6b 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.1.39.orig/arch/arm/plat-versatile/platsmp.c linux-4.1.39/arch/arm/plat-versatile/platsmp.c +--- linux-4.1.39.orig/arch/arm/plat-versatile/platsmp.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/arm/plat-versatile/platsmp.c 2017-04-18 17:56:30.553394804 +0200 +@@ -30,7 +30,7 @@ sync_cache_w(&pen_release); } @@ -1604,7 +1293,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. */ @@ -1615,7 +1304,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 */ @@ -1624,7 +1313,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 */ @@ -1633,35 +1322,10 @@ index 53feb90c840c..b4a8d54fc3f3 100644 return pen_release != -1 ? -ENOSYS : 0; } -diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig -index 6f0a3b41b009..09a41259b984 100644 ---- a/arch/arm64/Kconfig -+++ b/arch/arm64/Kconfig -@@ -69,8 +69,10 @@ 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 IRQ_DOMAIN -+ select IRQ_FORCED_THREADING - select MODULES_USE_ELF_RELA - select NO_BOOTMEM - select OF -@@ -599,7 +601,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 - help - Say Y if you want to run Linux in a Virtual Machine on Xen on ARM64. -diff --git a/arch/arm64/include/asm/futex.h b/arch/arm64/include/asm/futex.h -index 5f750dc96e0f..74069b3bd919 100644 ---- a/arch/arm64/include/asm/futex.h -+++ b/arch/arm64/include/asm/futex.h -@@ -58,7 +58,7 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr) +diff -Nur linux-4.1.39.orig/arch/arm64/include/asm/futex.h linux-4.1.39/arch/arm64/include/asm/futex.h +--- linux-4.1.39.orig/arch/arm64/include/asm/futex.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/arm64/include/asm/futex.h 2017-04-18 17:56:30.553394804 +0200 +@@ -58,7 +58,7 @@ if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32))) return -EFAULT; @@ -1670,7 +1334,7 @@ index 5f750dc96e0f..74069b3bd919 100644 switch (op) { case FUTEX_OP_SET: -@@ -85,7 +85,7 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr) +@@ -85,7 +85,7 @@ ret = -ENOSYS; } @@ -1679,11 +1343,10 @@ index 5f750dc96e0f..74069b3bd919 100644 if (!ret) { switch (cmp) { -diff --git a/arch/arm64/include/asm/thread_info.h b/arch/arm64/include/asm/thread_info.h -index dcd06d18a42a..7d45b00db1b3 100644 ---- a/arch/arm64/include/asm/thread_info.h -+++ b/arch/arm64/include/asm/thread_info.h -@@ -47,6 +47,7 @@ struct thread_info { +diff -Nur linux-4.1.39.orig/arch/arm64/include/asm/thread_info.h linux-4.1.39/arch/arm64/include/asm/thread_info.h +--- linux-4.1.39.orig/arch/arm64/include/asm/thread_info.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/arm64/include/asm/thread_info.h 2017-04-18 17:56:30.553394804 +0200 +@@ -47,6 +47,7 @@ mm_segment_t addr_limit; /* address limit */ struct task_struct *task; /* main task structure */ int preempt_count; /* 0 => preemptable, <0 => bug */ @@ -1691,7 +1354,7 @@ index dcd06d18a42a..7d45b00db1b3 100644 int cpu; /* cpu */ }; -@@ -101,6 +102,7 @@ static inline struct thread_info *current_thread_info(void) +@@ -101,6 +102,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 */ @@ -1699,7 +1362,7 @@ index dcd06d18a42a..7d45b00db1b3 100644 #define TIF_NOHZ 7 #define TIF_SYSCALL_TRACE 8 #define TIF_SYSCALL_AUDIT 9 -@@ -117,6 +119,7 @@ static inline struct thread_info *current_thread_info(void) +@@ -117,6 +119,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) @@ -1707,11 +1370,33 @@ index dcd06d18a42a..7d45b00db1b3 100644 #define _TIF_NOHZ (1 << TIF_NOHZ) #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE) #define _TIF_SYSCALL_AUDIT (1 << TIF_SYSCALL_AUDIT) -diff --git a/arch/arm64/kernel/asm-offsets.c b/arch/arm64/kernel/asm-offsets.c -index 4106ac64f95e..21f4a79bda0a 100644 ---- a/arch/arm64/kernel/asm-offsets.c -+++ b/arch/arm64/kernel/asm-offsets.c -@@ -35,6 +35,7 @@ int main(void) +diff -Nur linux-4.1.39.orig/arch/arm64/Kconfig linux-4.1.39/arch/arm64/Kconfig +--- linux-4.1.39.orig/arch/arm64/Kconfig 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/arm64/Kconfig 2017-04-18 17:56:30.553394804 +0200 +@@ -69,8 +69,10 @@ + select HAVE_PERF_REGS + select HAVE_PERF_USER_STACK_DUMP + select HAVE_RCU_TABLE_FREE ++ select HAVE_PREEMPT_LAZY + select HAVE_SYSCALL_TRACEPOINTS + select IRQ_DOMAIN ++ select IRQ_FORCED_THREADING + select MODULES_USE_ELF_RELA + select NO_BOOTMEM + select OF +@@ -599,7 +601,7 @@ + + config XEN + bool "Xen guest support on ARM64" +- depends on ARM64 && OF ++ depends on ARM64 && OF && !PREEMPT_RT_FULL + select SWIOTLB_XEN + help + Say Y if you want to run Linux in a Virtual Machine on Xen on ARM64. +diff -Nur linux-4.1.39.orig/arch/arm64/kernel/asm-offsets.c linux-4.1.39/arch/arm64/kernel/asm-offsets.c +--- linux-4.1.39.orig/arch/arm64/kernel/asm-offsets.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/arm64/kernel/asm-offsets.c 2017-04-18 17:56:30.553394804 +0200 +@@ -35,6 +35,7 @@ BLANK(); DEFINE(TI_FLAGS, offsetof(struct thread_info, flags)); DEFINE(TI_PREEMPT, offsetof(struct thread_info, preempt_count)); @@ -1719,11 +1404,10 @@ index 4106ac64f95e..21f4a79bda0a 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 05012cdb555f..7abfb48bd163 100644 ---- a/arch/arm64/kernel/entry.S -+++ b/arch/arm64/kernel/entry.S -@@ -380,11 +380,16 @@ el1_irq: +diff -Nur linux-4.1.39.orig/arch/arm64/kernel/entry.S linux-4.1.39/arch/arm64/kernel/entry.S +--- linux-4.1.39.orig/arch/arm64/kernel/entry.S 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/arm64/kernel/entry.S 2017-04-18 17:56:30.553394804 +0200 +@@ -380,11 +380,16 @@ #ifdef CONFIG_PREEMPT get_thread_info tsk ldr w24, [tsk, #TI_PREEMPT] // get preempt count @@ -1743,7 +1427,7 @@ index 05012cdb555f..7abfb48bd163 100644 #endif #ifdef CONFIG_TRACE_IRQFLAGS bl trace_hardirqs_on -@@ -398,6 +403,7 @@ el1_preempt: +@@ -398,6 +403,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? @@ -1751,7 +1435,7 @@ index 05012cdb555f..7abfb48bd163 100644 ret x24 #endif -@@ -635,6 +641,7 @@ fast_work_pending: +@@ -635,6 +641,7 @@ str x0, [sp, #S_X0] // returned x0 work_pending: tbnz x1, #TIF_NEED_RESCHED, work_resched @@ -1759,11 +1443,10 @@ index 05012cdb555f..7abfb48bd163 100644 /* TIF_SIGPENDING, TIF_NOTIFY_RESUME or TIF_FOREIGN_FPSTATE case */ ldr x2, [sp, #S_PSTATE] mov x0, sp // 'regs' -diff --git a/arch/arm64/kernel/insn.c b/arch/arm64/kernel/insn.c -index 924902083e47..30eb88e5b896 100644 ---- a/arch/arm64/kernel/insn.c -+++ b/arch/arm64/kernel/insn.c -@@ -77,7 +77,7 @@ bool __kprobes aarch64_insn_is_nop(u32 insn) +diff -Nur linux-4.1.39.orig/arch/arm64/kernel/insn.c linux-4.1.39/arch/arm64/kernel/insn.c +--- linux-4.1.39.orig/arch/arm64/kernel/insn.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/arm64/kernel/insn.c 2017-04-18 17:56:30.553394804 +0200 +@@ -77,7 +77,7 @@ } } @@ -1772,7 +1455,7 @@ index 924902083e47..30eb88e5b896 100644 static void __kprobes *patch_map(void *addr, int fixmap) { -@@ -124,13 +124,13 @@ static int __kprobes __aarch64_insn_write(void *addr, u32 insn) +@@ -124,13 +124,13 @@ unsigned long flags = 0; int ret; @@ -1788,11 +1471,10 @@ index 924902083e47..30eb88e5b896 100644 return ret; } -diff --git a/arch/arm64/kernel/perf_event.c b/arch/arm64/kernel/perf_event.c -index b67b01cb5109..c4cb2596ede6 100644 ---- a/arch/arm64/kernel/perf_event.c -+++ b/arch/arm64/kernel/perf_event.c -@@ -488,7 +488,7 @@ armpmu_reserve_hardware(struct arm_pmu *armpmu) +diff -Nur linux-4.1.39.orig/arch/arm64/kernel/perf_event.c linux-4.1.39/arch/arm64/kernel/perf_event.c +--- linux-4.1.39.orig/arch/arm64/kernel/perf_event.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/arm64/kernel/perf_event.c 2017-04-18 17:56:30.553394804 +0200 +@@ -488,7 +488,7 @@ } err = request_irq(irq, armpmu->handle_irq, @@ -1801,11 +1483,10 @@ index b67b01cb5109..c4cb2596ede6 100644 "arm-pmu", armpmu); if (err) { pr_err("unable to request IRQ%d for ARM PMU counters\n", -diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c -index fa5efaa5c3ac..1fdbb3704698 100644 ---- a/arch/arm64/mm/fault.c -+++ b/arch/arm64/mm/fault.c -@@ -211,7 +211,7 @@ static int __kprobes do_page_fault(unsigned long addr, unsigned int esr, +diff -Nur linux-4.1.39.orig/arch/arm64/mm/fault.c linux-4.1.39/arch/arm64/mm/fault.c +--- linux-4.1.39.orig/arch/arm64/mm/fault.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/arm64/mm/fault.c 2017-04-18 17:56:30.553394804 +0200 +@@ -211,7 +211,7 @@ * If we're in an interrupt or have no user context, we must not take * the fault. */ @@ -1814,11 +1495,10 @@ index fa5efaa5c3ac..1fdbb3704698 100644 goto no_context; if (user_mode(regs)) -diff --git a/arch/avr32/include/asm/uaccess.h b/arch/avr32/include/asm/uaccess.h -index 20b52c40bcd2..b1ec1fa06463 100644 ---- a/arch/avr32/include/asm/uaccess.h -+++ b/arch/avr32/include/asm/uaccess.h -@@ -106,7 +106,8 @@ static inline __kernel_size_t copy_from_user(void *to, +diff -Nur linux-4.1.39.orig/arch/avr32/include/asm/uaccess.h linux-4.1.39/arch/avr32/include/asm/uaccess.h +--- linux-4.1.39.orig/arch/avr32/include/asm/uaccess.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/avr32/include/asm/uaccess.h 2017-04-18 17:56:30.553394804 +0200 +@@ -106,7 +106,8 @@ * @x: Value to copy to user space. * @ptr: Destination address, in user space. * @@ -1828,7 +1508,7 @@ index 20b52c40bcd2..b1ec1fa06463 100644 * * This macro copies a single simple value from kernel space to user * space. It supports simple types like char and int, but not larger -@@ -125,7 +126,8 @@ static inline __kernel_size_t copy_from_user(void *to, +@@ -125,7 +126,8 @@ * @x: Variable to store result. * @ptr: Source address, in user space. * @@ -1838,7 +1518,7 @@ index 20b52c40bcd2..b1ec1fa06463 100644 * * This macro copies a single simple variable from user space to kernel * space. It supports simple types like char and int, but not larger -@@ -145,7 +147,8 @@ static inline __kernel_size_t copy_from_user(void *to, +@@ -145,7 +147,8 @@ * @x: Value to copy to user space. * @ptr: Destination address, in user space. * @@ -1848,7 +1528,7 @@ index 20b52c40bcd2..b1ec1fa06463 100644 * * This macro copies a single simple value from kernel space to user * space. It supports simple types like char and int, but not larger -@@ -167,7 +170,8 @@ static inline __kernel_size_t copy_from_user(void *to, +@@ -167,7 +170,8 @@ * @x: Variable to store result. * @ptr: Source address, in user space. * @@ -1858,10 +1538,9 @@ index 20b52c40bcd2..b1ec1fa06463 100644 * * This macro copies a single simple variable from user space to kernel * space. It supports simple types like char and int, but not larger -diff --git a/arch/avr32/mm/fault.c b/arch/avr32/mm/fault.c -index d223a8b57c1e..c03533937a9f 100644 ---- a/arch/avr32/mm/fault.c -+++ b/arch/avr32/mm/fault.c +diff -Nur linux-4.1.39.orig/arch/avr32/mm/fault.c linux-4.1.39/arch/avr32/mm/fault.c +--- linux-4.1.39.orig/arch/avr32/mm/fault.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/avr32/mm/fault.c 2017-04-18 17:56:30.553394804 +0200 @@ -14,11 +14,11 @@ #include <linux/pagemap.h> #include <linux/kdebug.h> @@ -1875,7 +1554,7 @@ index d223a8b57c1e..c03533937a9f 100644 #ifdef CONFIG_KPROBES static inline int notify_page_fault(struct pt_regs *regs, int trap) -@@ -81,7 +81,7 @@ asmlinkage void do_page_fault(unsigned long ecr, struct pt_regs *regs) +@@ -81,7 +81,7 @@ * If we're in an interrupt or have no user context, we must * not take the fault... */ @@ -1884,10 +1563,9 @@ index d223a8b57c1e..c03533937a9f 100644 goto no_context; local_irq_enable(); -diff --git a/arch/cris/mm/fault.c b/arch/cris/mm/fault.c -index 83f12f2ed9e3..3066d40a6db1 100644 ---- a/arch/cris/mm/fault.c -+++ b/arch/cris/mm/fault.c +diff -Nur linux-4.1.39.orig/arch/cris/mm/fault.c linux-4.1.39/arch/cris/mm/fault.c +--- linux-4.1.39.orig/arch/cris/mm/fault.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/cris/mm/fault.c 2017-04-18 17:56:30.553394804 +0200 @@ -8,7 +8,7 @@ #include <linux/interrupt.h> #include <linux/module.h> @@ -1897,7 +1575,7 @@ index 83f12f2ed9e3..3066d40a6db1 100644 #include <arch/system.h> extern int find_fixup_code(struct pt_regs *); -@@ -109,11 +109,11 @@ do_page_fault(unsigned long address, struct pt_regs *regs, +@@ -109,11 +109,11 @@ info.si_code = SEGV_MAPERR; /* @@ -1911,10 +1589,9 @@ index 83f12f2ed9e3..3066d40a6db1 100644 goto no_context; if (user_mode(regs)) -diff --git a/arch/frv/mm/fault.c b/arch/frv/mm/fault.c -index ec4917ddf678..61d99767fe16 100644 ---- a/arch/frv/mm/fault.c -+++ b/arch/frv/mm/fault.c +diff -Nur linux-4.1.39.orig/arch/frv/mm/fault.c linux-4.1.39/arch/frv/mm/fault.c +--- linux-4.1.39.orig/arch/frv/mm/fault.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/frv/mm/fault.c 2017-04-18 17:56:30.553394804 +0200 @@ -19,9 +19,9 @@ #include <linux/kernel.h> #include <linux/ptrace.h> @@ -1926,7 +1603,7 @@ index ec4917ddf678..61d99767fe16 100644 #include <asm/gdb-stub.h> /*****************************************************************************/ -@@ -78,7 +78,7 @@ asmlinkage void do_page_fault(int datammu, unsigned long esr0, unsigned long ear +@@ -78,7 +78,7 @@ * If we're in an interrupt or have no user * context, we must not take the fault.. */ @@ -1935,11 +1612,10 @@ index ec4917ddf678..61d99767fe16 100644 goto no_context; if (user_mode(__frame)) -diff --git a/arch/frv/mm/highmem.c b/arch/frv/mm/highmem.c -index bed9a9bd3c10..785344bbdc07 100644 ---- a/arch/frv/mm/highmem.c -+++ b/arch/frv/mm/highmem.c -@@ -42,6 +42,7 @@ void *kmap_atomic(struct page *page) +diff -Nur linux-4.1.39.orig/arch/frv/mm/highmem.c linux-4.1.39/arch/frv/mm/highmem.c +--- linux-4.1.39.orig/arch/frv/mm/highmem.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/frv/mm/highmem.c 2017-04-18 17:56:30.553394804 +0200 +@@ -42,6 +42,7 @@ unsigned long paddr; int type; @@ -1947,17 +1623,16 @@ index bed9a9bd3c10..785344bbdc07 100644 pagefault_disable(); type = kmap_atomic_idx_push(); paddr = page_to_phys(page); -@@ -85,5 +86,6 @@ void __kunmap_atomic(void *kvaddr) +@@ -85,5 +86,6 @@ } kmap_atomic_idx_pop(); pagefault_enable(); + preempt_enable(); } EXPORT_SYMBOL(__kunmap_atomic); -diff --git a/arch/hexagon/include/asm/uaccess.h b/arch/hexagon/include/asm/uaccess.h -index 25fc9049db8a..f61cfb28e9f2 100644 ---- a/arch/hexagon/include/asm/uaccess.h -+++ b/arch/hexagon/include/asm/uaccess.h +diff -Nur linux-4.1.39.orig/arch/hexagon/include/asm/uaccess.h linux-4.1.39/arch/hexagon/include/asm/uaccess.h +--- linux-4.1.39.orig/arch/hexagon/include/asm/uaccess.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/hexagon/include/asm/uaccess.h 2017-04-18 17:56:30.553394804 +0200 @@ -36,7 +36,8 @@ * @addr: User space pointer to start of block to check * @size: Size of block to check @@ -1968,10 +1643,9 @@ index 25fc9049db8a..f61cfb28e9f2 100644 * * Checks if a pointer to a block of memory in user space is valid. * -diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c -index ba5ba7accd0d..70b40d1205a6 100644 ---- a/arch/ia64/mm/fault.c -+++ b/arch/ia64/mm/fault.c +diff -Nur linux-4.1.39.orig/arch/ia64/mm/fault.c linux-4.1.39/arch/ia64/mm/fault.c +--- linux-4.1.39.orig/arch/ia64/mm/fault.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/ia64/mm/fault.c 2017-04-18 17:56:30.553394804 +0200 @@ -11,10 +11,10 @@ #include <linux/kprobes.h> #include <linux/kdebug.h> @@ -1984,7 +1658,7 @@ index ba5ba7accd0d..70b40d1205a6 100644 extern int die(char *, struct pt_regs *, long); -@@ -96,7 +96,7 @@ ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *re +@@ -96,7 +96,7 @@ /* * If we're in an interrupt or have no user context, we must not take the fault.. */ @@ -1993,11 +1667,29 @@ index ba5ba7accd0d..70b40d1205a6 100644 goto no_context; #ifdef CONFIG_VIRTUAL_MEM_MAP -diff --git a/arch/m32r/include/asm/uaccess.h b/arch/m32r/include/asm/uaccess.h -index c66a38d0a895..6f8982157a75 100644 ---- a/arch/m32r/include/asm/uaccess.h -+++ b/arch/m32r/include/asm/uaccess.h -@@ -91,7 +91,8 @@ static inline void set_fs(mm_segment_t s) +diff -Nur linux-4.1.39.orig/arch/Kconfig linux-4.1.39/arch/Kconfig +--- linux-4.1.39.orig/arch/Kconfig 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/Kconfig 2017-04-18 17:56:30.549394649 +0200 +@@ -6,6 +6,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 +@@ -49,6 +50,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.1.39.orig/arch/m32r/include/asm/uaccess.h linux-4.1.39/arch/m32r/include/asm/uaccess.h +--- linux-4.1.39.orig/arch/m32r/include/asm/uaccess.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/m32r/include/asm/uaccess.h 2017-04-18 17:56:30.553394804 +0200 +@@ -91,7 +91,8 @@ * @addr: User space pointer to start of block to check * @size: Size of block to check * @@ -2007,7 +1699,7 @@ index c66a38d0a895..6f8982157a75 100644 * * Checks if a pointer to a block of memory in user space is valid. * -@@ -155,7 +156,8 @@ extern int fixup_exception(struct pt_regs *regs); +@@ -155,7 +156,8 @@ * @x: Variable to store result. * @ptr: Source address, in user space. * @@ -2017,7 +1709,7 @@ index c66a38d0a895..6f8982157a75 100644 * * This macro copies a single simple variable from user space to kernel * space. It supports simple types like char and int, but not larger -@@ -175,7 +177,8 @@ extern int fixup_exception(struct pt_regs *regs); +@@ -175,7 +177,8 @@ * @x: Value to copy to user space. * @ptr: Destination address, in user space. * @@ -2027,7 +1719,7 @@ index c66a38d0a895..6f8982157a75 100644 * * This macro copies a single simple value from kernel space to user * space. It supports simple types like char and int, but not larger -@@ -194,7 +197,8 @@ extern int fixup_exception(struct pt_regs *regs); +@@ -194,7 +197,8 @@ * @x: Variable to store result. * @ptr: Source address, in user space. * @@ -2037,7 +1729,7 @@ index c66a38d0a895..6f8982157a75 100644 * * This macro copies a single simple variable from user space to kernel * space. It supports simple types like char and int, but not larger -@@ -274,7 +278,8 @@ do { \ +@@ -274,7 +278,8 @@ * @x: Value to copy to user space. * @ptr: Destination address, in user space. * @@ -2047,7 +1739,7 @@ index c66a38d0a895..6f8982157a75 100644 * * This macro copies a single simple value from kernel space to user * space. It supports simple types like char and int, but not larger -@@ -568,7 +573,8 @@ unsigned long __generic_copy_from_user(void *, const void __user *, unsigned lon +@@ -568,7 +573,8 @@ * @from: Source address, in kernel space. * @n: Number of bytes to copy. * @@ -2057,7 +1749,7 @@ index c66a38d0a895..6f8982157a75 100644 * * Copy data from kernel space to user space. Caller must check * the specified block with access_ok() before calling this function. -@@ -588,7 +594,8 @@ unsigned long __generic_copy_from_user(void *, const void __user *, unsigned lon +@@ -588,7 +594,8 @@ * @from: Source address, in kernel space. * @n: Number of bytes to copy. * @@ -2067,7 +1759,7 @@ index c66a38d0a895..6f8982157a75 100644 * * Copy data from kernel space to user space. * -@@ -606,7 +613,8 @@ unsigned long __generic_copy_from_user(void *, const void __user *, unsigned lon +@@ -606,7 +613,8 @@ * @from: Source address, in user space. * @n: Number of bytes to copy. * @@ -2077,7 +1769,7 @@ index c66a38d0a895..6f8982157a75 100644 * * Copy data from user space to kernel space. Caller must check * the specified block with access_ok() before calling this function. -@@ -626,7 +634,8 @@ unsigned long __generic_copy_from_user(void *, const void __user *, unsigned lon +@@ -626,7 +634,8 @@ * @from: Source address, in user space. * @n: Number of bytes to copy. * @@ -2087,7 +1779,7 @@ index c66a38d0a895..6f8982157a75 100644 * * Copy data from user space to kernel space. * -@@ -677,7 +686,8 @@ unsigned long clear_user(void __user *mem, unsigned long len); +@@ -677,7 +686,8 @@ * strlen_user: - Get the size of a string in user space. * @str: The string to measure. * @@ -2097,10 +1789,9 @@ index c66a38d0a895..6f8982157a75 100644 * * Get the size of a NUL-terminated string in user space. * -diff --git a/arch/m32r/mm/fault.c b/arch/m32r/mm/fault.c -index e3d4d4890104..8f9875b7933d 100644 ---- a/arch/m32r/mm/fault.c -+++ b/arch/m32r/mm/fault.c +diff -Nur linux-4.1.39.orig/arch/m32r/mm/fault.c linux-4.1.39/arch/m32r/mm/fault.c +--- linux-4.1.39.orig/arch/m32r/mm/fault.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/m32r/mm/fault.c 2017-04-18 17:56:30.553394804 +0200 @@ -24,9 +24,9 @@ #include <linux/vt_kern.h> /* For unblank_screen() */ #include <linux/highmem.h> @@ -2112,7 +1803,7 @@ index e3d4d4890104..8f9875b7933d 100644 #include <asm/hardirq.h> #include <asm/mmu_context.h> #include <asm/tlbflush.h> -@@ -111,10 +111,10 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long error_code, +@@ -111,10 +111,10 @@ mm = tsk->mm; /* @@ -2126,10 +1817,9 @@ index e3d4d4890104..8f9875b7933d 100644 goto bad_area_nosemaphore; if (error_code & ACE_USERMODE) -diff --git a/arch/m68k/mm/fault.c b/arch/m68k/mm/fault.c -index b2f04aee46ec..6a94cdd0c830 100644 ---- a/arch/m68k/mm/fault.c -+++ b/arch/m68k/mm/fault.c +diff -Nur linux-4.1.39.orig/arch/m68k/mm/fault.c linux-4.1.39/arch/m68k/mm/fault.c +--- linux-4.1.39.orig/arch/m68k/mm/fault.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/m68k/mm/fault.c 2017-04-18 17:56:30.557394959 +0200 @@ -10,10 +10,10 @@ #include <linux/ptrace.h> #include <linux/interrupt.h> @@ -2142,7 +1832,7 @@ index b2f04aee46ec..6a94cdd0c830 100644 #include <asm/pgalloc.h> extern void die_if_kernel(char *, struct pt_regs *, long); -@@ -81,7 +81,7 @@ int do_page_fault(struct pt_regs *regs, unsigned long address, +@@ -81,7 +81,7 @@ * If we're in an interrupt or have no user * context, we must not take the fault.. */ @@ -2151,11 +1841,10 @@ index b2f04aee46ec..6a94cdd0c830 100644 goto no_context; if (user_mode(regs)) -diff --git a/arch/metag/mm/fault.c b/arch/metag/mm/fault.c -index 2de5dc695a87..f57edca63609 100644 ---- a/arch/metag/mm/fault.c -+++ b/arch/metag/mm/fault.c -@@ -105,7 +105,7 @@ int do_page_fault(struct pt_regs *regs, unsigned long address, +diff -Nur linux-4.1.39.orig/arch/metag/mm/fault.c linux-4.1.39/arch/metag/mm/fault.c +--- linux-4.1.39.orig/arch/metag/mm/fault.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/metag/mm/fault.c 2017-04-18 17:56:30.557394959 +0200 +@@ -105,7 +105,7 @@ mm = tsk->mm; @@ -2164,11 +1853,10 @@ index 2de5dc695a87..f57edca63609 100644 goto no_context; if (user_mode(regs)) -diff --git a/arch/metag/mm/highmem.c b/arch/metag/mm/highmem.c -index d71f621a2c0b..807f1b1c4e65 100644 ---- a/arch/metag/mm/highmem.c -+++ b/arch/metag/mm/highmem.c -@@ -43,7 +43,7 @@ void *kmap_atomic(struct page *page) +diff -Nur linux-4.1.39.orig/arch/metag/mm/highmem.c linux-4.1.39/arch/metag/mm/highmem.c +--- linux-4.1.39.orig/arch/metag/mm/highmem.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/metag/mm/highmem.c 2017-04-18 17:56:30.557394959 +0200 +@@ -43,7 +43,7 @@ unsigned long vaddr; int type; @@ -2177,7 +1865,7 @@ index d71f621a2c0b..807f1b1c4e65 100644 pagefault_disable(); if (!PageHighMem(page)) return page_address(page); -@@ -82,6 +82,7 @@ void __kunmap_atomic(void *kvaddr) +@@ -82,6 +82,7 @@ } pagefault_enable(); @@ -2185,7 +1873,7 @@ index d71f621a2c0b..807f1b1c4e65 100644 } EXPORT_SYMBOL(__kunmap_atomic); -@@ -95,6 +96,7 @@ void *kmap_atomic_pfn(unsigned long pfn) +@@ -95,6 +96,7 @@ unsigned long vaddr; int type; @@ -2193,11 +1881,10 @@ index d71f621a2c0b..807f1b1c4e65 100644 pagefault_disable(); type = kmap_atomic_idx_push(); -diff --git a/arch/microblaze/include/asm/uaccess.h b/arch/microblaze/include/asm/uaccess.h -index 0c0a5cfbf79a..826676778094 100644 ---- a/arch/microblaze/include/asm/uaccess.h -+++ b/arch/microblaze/include/asm/uaccess.h -@@ -178,7 +178,8 @@ extern long __user_bad(void); +diff -Nur linux-4.1.39.orig/arch/microblaze/include/asm/uaccess.h linux-4.1.39/arch/microblaze/include/asm/uaccess.h +--- linux-4.1.39.orig/arch/microblaze/include/asm/uaccess.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/microblaze/include/asm/uaccess.h 2017-04-18 17:56:30.557394959 +0200 +@@ -178,7 +178,8 @@ * @x: Variable to store result. * @ptr: Source address, in user space. * @@ -2207,7 +1894,7 @@ index 0c0a5cfbf79a..826676778094 100644 * * This macro copies a single simple variable from user space to kernel * space. It supports simple types like char and int, but not larger -@@ -290,7 +291,8 @@ extern long __user_bad(void); +@@ -290,7 +291,8 @@ * @x: Value to copy to user space. * @ptr: Destination address, in user space. * @@ -2217,11 +1904,10 @@ index 0c0a5cfbf79a..826676778094 100644 * * This macro copies a single simple value from kernel space to user * space. It supports simple types like char and int, but not larger -diff --git a/arch/microblaze/mm/fault.c b/arch/microblaze/mm/fault.c -index d46a5ebb7570..177dfc003643 100644 ---- a/arch/microblaze/mm/fault.c -+++ b/arch/microblaze/mm/fault.c -@@ -107,14 +107,14 @@ void do_page_fault(struct pt_regs *regs, unsigned long address, +diff -Nur linux-4.1.39.orig/arch/microblaze/mm/fault.c linux-4.1.39/arch/microblaze/mm/fault.c +--- linux-4.1.39.orig/arch/microblaze/mm/fault.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/microblaze/mm/fault.c 2017-04-18 17:56:30.557394959 +0200 +@@ -107,14 +107,14 @@ if ((error_code & 0x13) == 0x13 || (error_code & 0x11) == 0x11) is_write = 0; @@ -2240,11 +1926,10 @@ index d46a5ebb7570..177dfc003643 100644 pr_emerg("r15 = %lx MSR = %lx\n", regs->r15, regs->msr); die("Weird page fault", regs, SIGSEGV); -diff --git a/arch/microblaze/mm/highmem.c b/arch/microblaze/mm/highmem.c -index 5a92576fad92..2fcc5a52d84d 100644 ---- a/arch/microblaze/mm/highmem.c -+++ b/arch/microblaze/mm/highmem.c -@@ -37,7 +37,7 @@ void *kmap_atomic_prot(struct page *page, pgprot_t prot) +diff -Nur linux-4.1.39.orig/arch/microblaze/mm/highmem.c linux-4.1.39/arch/microblaze/mm/highmem.c +--- linux-4.1.39.orig/arch/microblaze/mm/highmem.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/microblaze/mm/highmem.c 2017-04-18 17:56:30.557394959 +0200 +@@ -37,7 +37,7 @@ unsigned long vaddr; int idx, type; @@ -2253,7 +1938,7 @@ index 5a92576fad92..2fcc5a52d84d 100644 pagefault_disable(); if (!PageHighMem(page)) return page_address(page); -@@ -63,6 +63,7 @@ void __kunmap_atomic(void *kvaddr) +@@ -63,6 +63,7 @@ if (vaddr < __fix_to_virt(FIX_KMAP_END)) { pagefault_enable(); @@ -2261,31 +1946,17 @@ index 5a92576fad92..2fcc5a52d84d 100644 return; } -@@ -84,5 +85,6 @@ void __kunmap_atomic(void *kvaddr) +@@ -84,5 +85,6 @@ #endif kmap_atomic_idx_pop(); pagefault_enable(); + preempt_enable(); } EXPORT_SYMBOL(__kunmap_atomic); -diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig -index c99e8a32bea4..7e6ab18c488a 100644 ---- a/arch/mips/Kconfig -+++ b/arch/mips/Kconfig -@@ -2367,7 +2367,7 @@ config CPU_R4400_WORKAROUNDS - # - config HIGHMEM - bool "High Memory Support" -- depends on 32BIT && CPU_SUPPORTS_HIGHMEM && SYS_SUPPORTS_HIGHMEM && !CPU_MIPS32_3_5_EVA -+ depends on 32BIT && CPU_SUPPORTS_HIGHMEM && SYS_SUPPORTS_HIGHMEM && !CPU_MIPS32_3_5_EVA && !PREEMPT_RT_FULL - - config CPU_SUPPORTS_HIGHMEM - bool -diff --git a/arch/mips/include/asm/uaccess.h b/arch/mips/include/asm/uaccess.h -index bc2f5164ce51..6dc7f5130d49 100644 ---- a/arch/mips/include/asm/uaccess.h -+++ b/arch/mips/include/asm/uaccess.h -@@ -104,7 +104,8 @@ extern u64 __ua_limit; +diff -Nur linux-4.1.39.orig/arch/mips/include/asm/uaccess.h linux-4.1.39/arch/mips/include/asm/uaccess.h +--- linux-4.1.39.orig/arch/mips/include/asm/uaccess.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/mips/include/asm/uaccess.h 2017-04-18 17:56:30.557394959 +0200 +@@ -104,7 +104,8 @@ * @addr: User space pointer to start of block to check * @size: Size of block to check * @@ -2295,7 +1966,7 @@ index bc2f5164ce51..6dc7f5130d49 100644 * * Checks if a pointer to a block of memory in user space is valid. * -@@ -139,7 +140,8 @@ extern u64 __ua_limit; +@@ -139,7 +140,8 @@ * @x: Value to copy to user space. * @ptr: Destination address, in user space. * @@ -2305,7 +1976,7 @@ index bc2f5164ce51..6dc7f5130d49 100644 * * This macro copies a single simple value from kernel space to user * space. It supports simple types like char and int, but not larger -@@ -158,7 +160,8 @@ extern u64 __ua_limit; +@@ -158,7 +160,8 @@ * @x: Variable to store result. * @ptr: Source address, in user space. * @@ -2315,7 +1986,7 @@ index bc2f5164ce51..6dc7f5130d49 100644 * * This macro copies a single simple variable from user space to kernel * space. It supports simple types like char and int, but not larger -@@ -178,7 +181,8 @@ extern u64 __ua_limit; +@@ -178,7 +181,8 @@ * @x: Value to copy to user space. * @ptr: Destination address, in user space. * @@ -2325,7 +1996,7 @@ index bc2f5164ce51..6dc7f5130d49 100644 * * This macro copies a single simple value from kernel space to user * space. It supports simple types like char and int, but not larger -@@ -200,7 +204,8 @@ extern u64 __ua_limit; +@@ -200,7 +204,8 @@ * @x: Variable to store result. * @ptr: Source address, in user space. * @@ -2335,7 +2006,7 @@ index bc2f5164ce51..6dc7f5130d49 100644 * * This macro copies a single simple variable from user space to kernel * space. It supports simple types like char and int, but not larger -@@ -499,7 +504,8 @@ extern void __put_user_unknown(void); +@@ -499,7 +504,8 @@ * @x: Value to copy to user space. * @ptr: Destination address, in user space. * @@ -2345,7 +2016,7 @@ index bc2f5164ce51..6dc7f5130d49 100644 * * This macro copies a single simple value from kernel space to user * space. It supports simple types like char and int, but not larger -@@ -518,7 +524,8 @@ extern void __put_user_unknown(void); +@@ -518,7 +524,8 @@ * @x: Variable to store result. * @ptr: Source address, in user space. * @@ -2355,7 +2026,7 @@ index bc2f5164ce51..6dc7f5130d49 100644 * * This macro copies a single simple variable from user space to kernel * space. It supports simple types like char and int, but not larger -@@ -538,7 +545,8 @@ extern void __put_user_unknown(void); +@@ -538,7 +545,8 @@ * @x: Value to copy to user space. * @ptr: Destination address, in user space. * @@ -2365,7 +2036,7 @@ index bc2f5164ce51..6dc7f5130d49 100644 * * This macro copies a single simple value from kernel space to user * space. It supports simple types like char and int, but not larger -@@ -560,7 +568,8 @@ extern void __put_user_unknown(void); +@@ -560,7 +568,8 @@ * @x: Variable to store result. * @ptr: Source address, in user space. * @@ -2375,7 +2046,7 @@ index bc2f5164ce51..6dc7f5130d49 100644 * * This macro copies a single simple variable from user space to kernel * space. It supports simple types like char and int, but not larger -@@ -816,7 +825,8 @@ extern size_t __copy_user(void *__to, const void *__from, size_t __n); +@@ -816,7 +825,8 @@ * @from: Source address, in kernel space. * @n: Number of bytes to copy. * @@ -2385,7 +2056,7 @@ index bc2f5164ce51..6dc7f5130d49 100644 * * Copy data from kernel space to user space. Caller must check * the specified block with access_ok() before calling this function. -@@ -889,7 +899,8 @@ extern size_t __copy_user_inatomic(void *__to, const void *__from, size_t __n); +@@ -889,7 +899,8 @@ * @from: Source address, in kernel space. * @n: Number of bytes to copy. * @@ -2395,7 +2066,7 @@ index bc2f5164ce51..6dc7f5130d49 100644 * * Copy data from kernel space to user space. * -@@ -1076,7 +1087,8 @@ extern size_t __copy_in_user_eva(void *__to, const void *__from, size_t __n); +@@ -1076,7 +1087,8 @@ * @from: Source address, in user space. * @n: Number of bytes to copy. * @@ -2405,7 +2076,7 @@ index bc2f5164ce51..6dc7f5130d49 100644 * * Copy data from user space to kernel space. Caller must check * the specified block with access_ok() before calling this function. -@@ -1108,7 +1120,8 @@ extern size_t __copy_in_user_eva(void *__to, const void *__from, size_t __n); +@@ -1108,7 +1120,8 @@ * @from: Source address, in user space. * @n: Number of bytes to copy. * @@ -2415,7 +2086,7 @@ index bc2f5164ce51..6dc7f5130d49 100644 * * Copy data from user space to kernel space. * -@@ -1332,7 +1345,8 @@ strncpy_from_user(char *__to, const char __user *__from, long __len) +@@ -1332,7 +1345,8 @@ * strlen_user: - Get the size of a string in user space. * @str: The string to measure. * @@ -2425,7 +2096,7 @@ index bc2f5164ce51..6dc7f5130d49 100644 * * Get the size of a NUL-terminated string in user space. * -@@ -1401,7 +1415,8 @@ static inline long __strnlen_user(const char __user *s, long n) +@@ -1401,7 +1415,8 @@ * strnlen_user: - Get the size of a string in user space. * @str: The string to measure. * @@ -2435,11 +2106,22 @@ index bc2f5164ce51..6dc7f5130d49 100644 * * Get the size of a NUL-terminated string in user space. * -diff --git a/arch/mips/kernel/signal-common.h b/arch/mips/kernel/signal-common.h -index 06805e09bcd3..0b85f827cd18 100644 ---- a/arch/mips/kernel/signal-common.h -+++ b/arch/mips/kernel/signal-common.h -@@ -28,12 +28,7 @@ extern void __user *get_sigframe(struct ksignal *ksig, struct pt_regs *regs, +diff -Nur linux-4.1.39.orig/arch/mips/Kconfig linux-4.1.39/arch/mips/Kconfig +--- linux-4.1.39.orig/arch/mips/Kconfig 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/mips/Kconfig 2017-04-18 17:56:30.557394959 +0200 +@@ -2367,7 +2367,7 @@ + # + config HIGHMEM + bool "High Memory Support" +- depends on 32BIT && CPU_SUPPORTS_HIGHMEM && SYS_SUPPORTS_HIGHMEM && !CPU_MIPS32_3_5_EVA ++ depends on 32BIT && CPU_SUPPORTS_HIGHMEM && SYS_SUPPORTS_HIGHMEM && !CPU_MIPS32_3_5_EVA && !PREEMPT_RT_FULL + + config CPU_SUPPORTS_HIGHMEM + bool +diff -Nur linux-4.1.39.orig/arch/mips/kernel/signal-common.h linux-4.1.39/arch/mips/kernel/signal-common.h +--- linux-4.1.39.orig/arch/mips/kernel/signal-common.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/mips/kernel/signal-common.h 2017-04-18 17:56:30.557394959 +0200 +@@ -28,12 +28,7 @@ extern int fpcsr_pending(unsigned int __user *fpcsr); /* Make sure we will not lose FPU ownership */ @@ -2454,10 +2136,9 @@ index 06805e09bcd3..0b85f827cd18 100644 +#define unlock_fpu_owner() ({ pagefault_enable(); preempt_enable(); }) #endif /* __SIGNAL_COMMON_H */ -diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c -index 7ff8637e530d..36c0f26fac6b 100644 ---- a/arch/mips/mm/fault.c -+++ b/arch/mips/mm/fault.c +diff -Nur linux-4.1.39.orig/arch/mips/mm/fault.c linux-4.1.39/arch/mips/mm/fault.c +--- linux-4.1.39.orig/arch/mips/mm/fault.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/mips/mm/fault.c 2017-04-18 17:56:30.557394959 +0200 @@ -21,10 +21,10 @@ #include <linux/module.h> #include <linux/kprobes.h> @@ -2470,7 +2151,7 @@ index 7ff8637e530d..36c0f26fac6b 100644 #include <asm/ptrace.h> #include <asm/highmem.h> /* For VMALLOC_END */ #include <linux/kdebug.h> -@@ -94,7 +94,7 @@ static void __kprobes __do_page_fault(struct pt_regs *regs, unsigned long write, +@@ -94,7 +94,7 @@ * If we're in an interrupt or have no user * context, we must not take the fault.. */ @@ -2479,11 +2160,10 @@ index 7ff8637e530d..36c0f26fac6b 100644 goto bad_area_nosemaphore; if (user_mode(regs)) -diff --git a/arch/mips/mm/highmem.c b/arch/mips/mm/highmem.c -index da815d295239..11661cbc11a8 100644 ---- a/arch/mips/mm/highmem.c -+++ b/arch/mips/mm/highmem.c -@@ -47,7 +47,7 @@ void *kmap_atomic(struct page *page) +diff -Nur linux-4.1.39.orig/arch/mips/mm/highmem.c linux-4.1.39/arch/mips/mm/highmem.c +--- linux-4.1.39.orig/arch/mips/mm/highmem.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/mips/mm/highmem.c 2017-04-18 17:56:30.557394959 +0200 +@@ -47,7 +47,7 @@ unsigned long vaddr; int idx, type; @@ -2492,7 +2172,7 @@ index da815d295239..11661cbc11a8 100644 pagefault_disable(); if (!PageHighMem(page)) return page_address(page); -@@ -72,6 +72,7 @@ void __kunmap_atomic(void *kvaddr) +@@ -72,6 +72,7 @@ if (vaddr < FIXADDR_START) { // FIXME pagefault_enable(); @@ -2500,7 +2180,7 @@ index da815d295239..11661cbc11a8 100644 return; } -@@ -92,6 +93,7 @@ void __kunmap_atomic(void *kvaddr) +@@ -92,6 +93,7 @@ #endif kmap_atomic_idx_pop(); pagefault_enable(); @@ -2508,7 +2188,7 @@ index da815d295239..11661cbc11a8 100644 } EXPORT_SYMBOL(__kunmap_atomic); -@@ -104,6 +106,7 @@ void *kmap_atomic_pfn(unsigned long pfn) +@@ -104,6 +106,7 @@ unsigned long vaddr; int idx, type; @@ -2516,11 +2196,10 @@ index da815d295239..11661cbc11a8 100644 pagefault_disable(); type = kmap_atomic_idx_push(); -diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c -index faa5c9822ecc..198a3147dd7d 100644 ---- a/arch/mips/mm/init.c -+++ b/arch/mips/mm/init.c -@@ -90,6 +90,7 @@ static void *__kmap_pgprot(struct page *page, unsigned long addr, pgprot_t prot) +diff -Nur linux-4.1.39.orig/arch/mips/mm/init.c linux-4.1.39/arch/mips/mm/init.c +--- linux-4.1.39.orig/arch/mips/mm/init.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/mips/mm/init.c 2017-04-18 17:56:30.557394959 +0200 +@@ -90,6 +90,7 @@ BUG_ON(Page_dcache_dirty(page)); @@ -2528,7 +2207,7 @@ index faa5c9822ecc..198a3147dd7d 100644 pagefault_disable(); idx = (addr >> PAGE_SHIFT) & (FIX_N_COLOURS - 1); idx += in_interrupt() ? FIX_N_COLOURS : 0; -@@ -152,6 +153,7 @@ void kunmap_coherent(void) +@@ -152,6 +153,7 @@ write_c0_entryhi(old_ctx); local_irq_restore(flags); pagefault_enable(); @@ -2536,11 +2215,10 @@ index faa5c9822ecc..198a3147dd7d 100644 } void copy_user_highpage(struct page *to, struct page *from, -diff --git a/arch/mn10300/include/asm/highmem.h b/arch/mn10300/include/asm/highmem.h -index 2fbbe4d920aa..1ddea5afba09 100644 ---- a/arch/mn10300/include/asm/highmem.h -+++ b/arch/mn10300/include/asm/highmem.h -@@ -75,6 +75,7 @@ static inline void *kmap_atomic(struct page *page) +diff -Nur linux-4.1.39.orig/arch/mn10300/include/asm/highmem.h linux-4.1.39/arch/mn10300/include/asm/highmem.h +--- linux-4.1.39.orig/arch/mn10300/include/asm/highmem.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/mn10300/include/asm/highmem.h 2017-04-18 17:56:30.557394959 +0200 +@@ -75,6 +75,7 @@ unsigned long vaddr; int idx, type; @@ -2548,7 +2226,7 @@ index 2fbbe4d920aa..1ddea5afba09 100644 pagefault_disable(); if (page < highmem_start_page) return page_address(page); -@@ -98,6 +99,7 @@ static inline void __kunmap_atomic(unsigned long vaddr) +@@ -98,6 +99,7 @@ if (vaddr < FIXADDR_START) { /* FIXME */ pagefault_enable(); @@ -2556,7 +2234,7 @@ index 2fbbe4d920aa..1ddea5afba09 100644 return; } -@@ -122,6 +124,7 @@ static inline void __kunmap_atomic(unsigned long vaddr) +@@ -122,6 +124,7 @@ kmap_atomic_idx_pop(); pagefault_enable(); @@ -2564,10 +2242,9 @@ index 2fbbe4d920aa..1ddea5afba09 100644 } #endif /* __KERNEL__ */ -diff --git a/arch/mn10300/mm/fault.c b/arch/mn10300/mm/fault.c -index 0c2cc5d39c8e..4a1d181ed32f 100644 ---- a/arch/mn10300/mm/fault.c -+++ b/arch/mn10300/mm/fault.c +diff -Nur linux-4.1.39.orig/arch/mn10300/mm/fault.c linux-4.1.39/arch/mn10300/mm/fault.c +--- linux-4.1.39.orig/arch/mn10300/mm/fault.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/mn10300/mm/fault.c 2017-04-18 17:56:30.557394959 +0200 @@ -23,8 +23,8 @@ #include <linux/interrupt.h> #include <linux/init.h> @@ -2578,7 +2255,7 @@ index 0c2cc5d39c8e..4a1d181ed32f 100644 #include <asm/pgalloc.h> #include <asm/hardirq.h> #include <asm/cpu-regs.h> -@@ -168,7 +168,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long fault_code, +@@ -168,7 +168,7 @@ * If we're in an interrupt or have no user * context, we must not take the fault.. */ @@ -2587,11 +2264,10 @@ index 0c2cc5d39c8e..4a1d181ed32f 100644 goto no_context; if ((fault_code & MMUFCR_xFC_ACCESS) == MMUFCR_xFC_ACCESS_USR) -diff --git a/arch/nios2/mm/fault.c b/arch/nios2/mm/fault.c -index 0c9b6afe69e9..b51878b0c6b8 100644 ---- a/arch/nios2/mm/fault.c -+++ b/arch/nios2/mm/fault.c -@@ -77,7 +77,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long cause, +diff -Nur linux-4.1.39.orig/arch/nios2/mm/fault.c linux-4.1.39/arch/nios2/mm/fault.c +--- linux-4.1.39.orig/arch/nios2/mm/fault.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/nios2/mm/fault.c 2017-04-18 17:56:30.557394959 +0200 +@@ -77,7 +77,7 @@ * If we're in an interrupt or have no user * context, we must not take the fault.. */ @@ -2600,11 +2276,10 @@ index 0c9b6afe69e9..b51878b0c6b8 100644 goto bad_area_nosemaphore; if (user_mode(regs)) -diff --git a/arch/parisc/include/asm/cacheflush.h b/arch/parisc/include/asm/cacheflush.h -index de65f66ea64e..ec2df4bab302 100644 ---- a/arch/parisc/include/asm/cacheflush.h -+++ b/arch/parisc/include/asm/cacheflush.h -@@ -142,6 +142,7 @@ static inline void kunmap(struct page *page) +diff -Nur linux-4.1.39.orig/arch/parisc/include/asm/cacheflush.h linux-4.1.39/arch/parisc/include/asm/cacheflush.h +--- linux-4.1.39.orig/arch/parisc/include/asm/cacheflush.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/parisc/include/asm/cacheflush.h 2017-04-18 17:56:30.557394959 +0200 +@@ -142,6 +142,7 @@ static inline void *kmap_atomic(struct page *page) { @@ -2612,7 +2287,7 @@ index de65f66ea64e..ec2df4bab302 100644 pagefault_disable(); return page_address(page); } -@@ -150,6 +151,7 @@ static inline void __kunmap_atomic(void *addr) +@@ -150,6 +151,7 @@ { flush_kernel_dcache_page_addr(addr); pagefault_enable(); @@ -2620,10 +2295,9 @@ index de65f66ea64e..ec2df4bab302 100644 } #define kmap_atomic_prot(page, prot) kmap_atomic(page) -diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c -index bbf22658d1a3..341966889a51 100644 ---- a/arch/parisc/kernel/traps.c -+++ b/arch/parisc/kernel/traps.c +diff -Nur linux-4.1.39.orig/arch/parisc/kernel/traps.c linux-4.1.39/arch/parisc/kernel/traps.c +--- linux-4.1.39.orig/arch/parisc/kernel/traps.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/parisc/kernel/traps.c 2017-04-18 17:56:30.557394959 +0200 @@ -26,9 +26,9 @@ #include <linux/console.h> #include <linux/bug.h> @@ -2635,7 +2309,7 @@ index bbf22658d1a3..341966889a51 100644 #include <asm/io.h> #include <asm/irq.h> #include <asm/traps.h> -@@ -796,7 +796,7 @@ void notrace handle_interruption(int code, struct pt_regs *regs) +@@ -796,7 +796,7 @@ * unless pagefault_disable() was called before. */ @@ -2644,10 +2318,9 @@ index bbf22658d1a3..341966889a51 100644 { /* Clean up and return if in exception table. */ if (fixup_exception(regs)) -diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c -index 50d64a7fc672..3bc9db1ad19a 100644 ---- a/arch/parisc/mm/fault.c -+++ b/arch/parisc/mm/fault.c +diff -Nur linux-4.1.39.orig/arch/parisc/mm/fault.c linux-4.1.39/arch/parisc/mm/fault.c +--- linux-4.1.39.orig/arch/parisc/mm/fault.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/parisc/mm/fault.c 2017-04-18 17:56:30.557394959 +0200 @@ -15,8 +15,8 @@ #include <linux/sched.h> #include <linux/interrupt.h> @@ -2658,7 +2331,7 @@ index 50d64a7fc672..3bc9db1ad19a 100644 #include <asm/traps.h> /* Various important other fields */ -@@ -208,7 +208,7 @@ void do_page_fault(struct pt_regs *regs, unsigned long code, +@@ -208,7 +208,7 @@ int fault; unsigned int flags; @@ -2667,45 +2340,10 @@ index 50d64a7fc672..3bc9db1ad19a 100644 goto no_context; tsk = current; -diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig -index 190cc48abc0c..7b70a5754e34 100644 ---- a/arch/powerpc/Kconfig -+++ b/arch/powerpc/Kconfig -@@ -60,10 +60,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 -@@ -312,7 +314,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/kvm_host.h b/arch/powerpc/include/asm/kvm_host.h -index a193a13cf08b..a1ddf4080e1a 100644 ---- a/arch/powerpc/include/asm/kvm_host.h -+++ b/arch/powerpc/include/asm/kvm_host.h -@@ -280,7 +280,7 @@ struct kvmppc_vcore { +diff -Nur linux-4.1.39.orig/arch/powerpc/include/asm/kvm_host.h linux-4.1.39/arch/powerpc/include/asm/kvm_host.h +--- linux-4.1.39.orig/arch/powerpc/include/asm/kvm_host.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/powerpc/include/asm/kvm_host.h 2017-04-18 17:56:30.557394959 +0200 +@@ -280,7 +280,7 @@ u8 in_guest; struct list_head runnable_threads; spinlock_t lock; @@ -2714,7 +2352,7 @@ index a193a13cf08b..a1ddf4080e1a 100644 spinlock_t stoltb_lock; /* protects stolen_tb and preempt_tb */ u64 stolen_tb; u64 preempt_tb; -@@ -613,7 +613,7 @@ struct kvm_vcpu_arch { +@@ -614,7 +614,7 @@ u8 prodded; u32 last_inst; @@ -2723,11 +2361,10 @@ index a193a13cf08b..a1ddf4080e1a 100644 struct kvmppc_vcore *vcore; int ret; int trap; -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.1.39.orig/arch/powerpc/include/asm/thread_info.h linux-4.1.39/arch/powerpc/include/asm/thread_info.h +--- linux-4.1.39.orig/arch/powerpc/include/asm/thread_info.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/powerpc/include/asm/thread_info.h 2017-04-18 17:56:30.557394959 +0200 +@@ -42,6 +42,8 @@ int cpu; /* cpu we're on */ int preempt_count; /* 0 => preemptable, <0 => BUG */ @@ -2736,7 +2373,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 */ @@ -2746,7 +2383,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 @@ -2755,7 +2392,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) @@ -2773,11 +2410,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 0034b6b3556a..65cc771661c4 100644 ---- a/arch/powerpc/kernel/asm-offsets.c -+++ b/arch/powerpc/kernel/asm-offsets.c -@@ -160,6 +160,7 @@ int main(void) +diff -Nur linux-4.1.39.orig/arch/powerpc/Kconfig linux-4.1.39/arch/powerpc/Kconfig +--- linux-4.1.39.orig/arch/powerpc/Kconfig 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/powerpc/Kconfig 2017-04-18 17:56:30.557394959 +0200 +@@ -60,10 +60,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 +@@ -312,7 +314,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.1.39.orig/arch/powerpc/kernel/asm-offsets.c linux-4.1.39/arch/powerpc/kernel/asm-offsets.c +--- linux-4.1.39.orig/arch/powerpc/kernel/asm-offsets.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/powerpc/kernel/asm-offsets.c 2017-04-18 17:56:30.557394959 +0200 +@@ -160,6 +160,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)); @@ -2785,11 +2454,10 @@ index 0034b6b3556a..65cc771661c4 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 46fc0f4d8982..3d390ac490d9 100644 ---- a/arch/powerpc/kernel/entry_32.S -+++ b/arch/powerpc/kernel/entry_32.S -@@ -813,7 +813,14 @@ resume_kernel: +diff -Nur linux-4.1.39.orig/arch/powerpc/kernel/entry_32.S linux-4.1.39/arch/powerpc/kernel/entry_32.S +--- linux-4.1.39.orig/arch/powerpc/kernel/entry_32.S 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/powerpc/kernel/entry_32.S 2017-04-18 17:56:30.557394959 +0200 +@@ -813,7 +813,14 @@ cmpwi 0,r0,0 /* if non-zero, just restore regs and return */ bne restore andi. r8,r8,_TIF_NEED_RESCHED @@ -2804,7 +2472,7 @@ index 46fc0f4d8982..3d390ac490d9 100644 lwz r3,_MSR(r1) andi. r0,r3,MSR_EE /* interrupts off? */ beq restore /* don't schedule if so */ -@@ -824,11 +831,11 @@ resume_kernel: +@@ -824,11 +831,11 @@ */ bl trace_hardirqs_off #endif @@ -2819,7 +2487,7 @@ index 46fc0f4d8982..3d390ac490d9 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 -@@ -1149,7 +1156,7 @@ global_dbcr0: +@@ -1149,7 +1156,7 @@ #endif /* !(CONFIG_4xx || CONFIG_BOOKE) */ do_work: /* r10 contains MSR_KERNEL here */ @@ -2828,7 +2496,7 @@ index 46fc0f4d8982..3d390ac490d9 100644 beq do_user_signal do_resched: /* r10 contains MSR_KERNEL here */ -@@ -1170,7 +1177,7 @@ recheck: +@@ -1170,7 +1177,7 @@ MTMSRD(r10) /* disable interrupts */ CURRENT_THREAD_INFO(r9, r1) lwz r9,TI_FLAGS(r9) @@ -2837,11 +2505,10 @@ index 46fc0f4d8982..3d390ac490d9 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 afbc20019c2e..5e2d2645d1e0 100644 ---- a/arch/powerpc/kernel/entry_64.S -+++ b/arch/powerpc/kernel/entry_64.S -@@ -636,7 +636,7 @@ _GLOBAL(ret_from_except_lite) +diff -Nur linux-4.1.39.orig/arch/powerpc/kernel/entry_64.S linux-4.1.39/arch/powerpc/kernel/entry_64.S +--- linux-4.1.39.orig/arch/powerpc/kernel/entry_64.S 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/powerpc/kernel/entry_64.S 2017-04-18 17:56:30.561395114 +0200 +@@ -636,7 +636,7 @@ #else beq restore #endif @@ -2850,7 +2517,7 @@ index afbc20019c2e..5e2d2645d1e0 100644 beq 2f bl restore_interrupts SCHEDULE_USER -@@ -698,10 +698,18 @@ resume_kernel: +@@ -698,10 +698,18 @@ #ifdef CONFIG_PREEMPT /* Check if we need to preempt */ @@ -2870,7 +2537,7 @@ index afbc20019c2e..5e2d2645d1e0 100644 cmpwi cr1,r8,0 ld r0,SOFTE(r1) cmpdi r0,0 -@@ -718,7 +726,7 @@ resume_kernel: +@@ -718,7 +726,7 @@ /* Re-test flags and eventually loop */ CURRENT_THREAD_INFO(r9, r1) ld r4,TI_FLAGS(r9) @@ -2879,11 +2546,10 @@ index afbc20019c2e..5e2d2645d1e0 100644 bne 1b /* -diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c -index 45096033d37b..6a8e55a17683 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.1.39.orig/arch/powerpc/kernel/irq.c linux-4.1.39/arch/powerpc/kernel/irq.c +--- linux-4.1.39.orig/arch/powerpc/kernel/irq.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/powerpc/kernel/irq.c 2017-04-18 17:56:30.561395114 +0200 +@@ -614,6 +614,7 @@ } } @@ -2891,7 +2557,7 @@ index 45096033d37b..6a8e55a17683 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); } @@ -2899,10 +2565,9 @@ index 45096033d37b..6a8e55a17683 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 7c6bb4b17b49..e9dfe2270e93 100644 ---- a/arch/powerpc/kernel/misc_32.S -+++ b/arch/powerpc/kernel/misc_32.S +diff -Nur linux-4.1.39.orig/arch/powerpc/kernel/misc_32.S linux-4.1.39/arch/powerpc/kernel/misc_32.S +--- linux-4.1.39.orig/arch/powerpc/kernel/misc_32.S 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/powerpc/kernel/misc_32.S 2017-04-18 17:56:30.561395114 +0200 @@ -40,6 +40,7 @@ * We store the saved ksp_limit in the unused part * of the STACK_FRAME_OVERHEAD @@ -2911,7 +2576,7 @@ index 7c6bb4b17b49..e9dfe2270e93 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 @@ -2919,10 +2584,9 @@ index 7c6bb4b17b49..e9dfe2270e93 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 4e314b90c75d..8a7238dd2f4b 100644 ---- a/arch/powerpc/kernel/misc_64.S -+++ b/arch/powerpc/kernel/misc_64.S +diff -Nur linux-4.1.39.orig/arch/powerpc/kernel/misc_64.S linux-4.1.39/arch/powerpc/kernel/misc_64.S +--- linux-4.1.39.orig/arch/powerpc/kernel/misc_64.S 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/powerpc/kernel/misc_64.S 2017-04-18 17:56:30.561395114 +0200 @@ -29,6 +29,7 @@ .text @@ -2931,7 +2595,7 @@ index 4e314b90c75d..8a7238dd2f4b 100644 _GLOBAL(call_do_softirq) mflr r0 std r0,16(r1) -@@ -39,6 +40,7 @@ _GLOBAL(call_do_softirq) +@@ -39,6 +40,7 @@ ld r0,16(r1) mtlr r0 blr @@ -2939,23 +2603,10 @@ index 4e314b90c75d..8a7238dd2f4b 100644 _GLOBAL(call_do_irq) mflr r0 -diff --git a/arch/powerpc/kvm/Kconfig b/arch/powerpc/kvm/Kconfig -index 3caec2c42105..d4c48506ea1b 100644 ---- a/arch/powerpc/kvm/Kconfig -+++ b/arch/powerpc/kvm/Kconfig -@@ -172,6 +172,7 @@ config KVM_E500MC - config KVM_MPIC - bool "KVM in-kernel MPIC emulation" - depends on KVM && E500 -+ depends on !PREEMPT_RT_FULL - select HAVE_KVM_IRQCHIP - select HAVE_KVM_IRQFD - select HAVE_KVM_IRQ_ROUTING -diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c -index f5b3de7f7fa2..c3f43a405b58 100644 ---- a/arch/powerpc/kvm/book3s_hv.c -+++ b/arch/powerpc/kvm/book3s_hv.c -@@ -115,11 +115,11 @@ static bool kvmppc_ipi_thread(int cpu) +diff -Nur linux-4.1.39.orig/arch/powerpc/kvm/book3s_hv.c linux-4.1.39/arch/powerpc/kvm/book3s_hv.c +--- linux-4.1.39.orig/arch/powerpc/kvm/book3s_hv.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/powerpc/kvm/book3s_hv.c 2017-04-18 17:56:30.561395114 +0200 +@@ -115,11 +115,11 @@ static void kvmppc_fast_vcpu_kick_hv(struct kvm_vcpu *vcpu) { int cpu = vcpu->cpu; @@ -2970,7 +2621,7 @@ index f5b3de7f7fa2..c3f43a405b58 100644 ++vcpu->stat.halt_wakeup; } -@@ -692,8 +692,8 @@ int kvmppc_pseries_do_hcall(struct kvm_vcpu *vcpu) +@@ -692,8 +692,8 @@ tvcpu->arch.prodded = 1; smp_mb(); if (vcpu->arch.ceded) { @@ -2981,7 +2632,7 @@ index f5b3de7f7fa2..c3f43a405b58 100644 vcpu->stat.halt_wakeup++; } } -@@ -1432,7 +1432,7 @@ static struct kvmppc_vcore *kvmppc_vcore_create(struct kvm *kvm, int core) +@@ -1438,7 +1438,7 @@ INIT_LIST_HEAD(&vcore->runnable_threads); spin_lock_init(&vcore->lock); spin_lock_init(&vcore->stoltb_lock); @@ -2990,7 +2641,7 @@ index f5b3de7f7fa2..c3f43a405b58 100644 vcore->preempt_tb = TB_NIL; vcore->lpcr = kvm->arch.lpcr; vcore->first_vcpuid = core * threads_per_subcore; -@@ -2079,10 +2079,9 @@ static void kvmppc_vcore_blocked(struct kvmppc_vcore *vc) +@@ -2085,10 +2085,9 @@ { struct kvm_vcpu *vcpu; int do_sleep = 1; @@ -3003,7 +2654,7 @@ index f5b3de7f7fa2..c3f43a405b58 100644 /* * Check one last time for pending exceptions and ceded state after -@@ -2096,7 +2095,7 @@ static void kvmppc_vcore_blocked(struct kvmppc_vcore *vc) +@@ -2102,7 +2101,7 @@ } if (!do_sleep) { @@ -3012,7 +2663,7 @@ index f5b3de7f7fa2..c3f43a405b58 100644 return; } -@@ -2104,7 +2103,7 @@ static void kvmppc_vcore_blocked(struct kvmppc_vcore *vc) +@@ -2110,7 +2109,7 @@ trace_kvmppc_vcore_blocked(vc, 0); spin_unlock(&vc->lock); schedule(); @@ -3021,7 +2672,7 @@ index f5b3de7f7fa2..c3f43a405b58 100644 spin_lock(&vc->lock); vc->vcore_state = VCORE_INACTIVE; trace_kvmppc_vcore_blocked(vc, 1); -@@ -2148,7 +2147,7 @@ static int kvmppc_run_vcpu(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu) +@@ -2154,7 +2153,7 @@ kvmppc_start_thread(vcpu); trace_kvm_guest_enter(vcpu); } else if (vc->vcore_state == VCORE_SLEEPING) { @@ -3030,10 +2681,20 @@ index f5b3de7f7fa2..c3f43a405b58 100644 } } -diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c -index b396868d2aa7..6d535973b200 100644 ---- a/arch/powerpc/mm/fault.c -+++ b/arch/powerpc/mm/fault.c +diff -Nur linux-4.1.39.orig/arch/powerpc/kvm/Kconfig linux-4.1.39/arch/powerpc/kvm/Kconfig +--- linux-4.1.39.orig/arch/powerpc/kvm/Kconfig 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/powerpc/kvm/Kconfig 2017-04-18 17:56:30.561395114 +0200 +@@ -172,6 +172,7 @@ + config KVM_MPIC + bool "KVM in-kernel MPIC emulation" + depends on KVM && E500 ++ depends on !PREEMPT_RT_FULL + select HAVE_KVM_IRQCHIP + select HAVE_KVM_IRQFD + select HAVE_KVM_IRQ_ROUTING +diff -Nur linux-4.1.39.orig/arch/powerpc/mm/fault.c linux-4.1.39/arch/powerpc/mm/fault.c +--- linux-4.1.39.orig/arch/powerpc/mm/fault.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/powerpc/mm/fault.c 2017-04-18 17:56:30.561395114 +0200 @@ -33,13 +33,13 @@ #include <linux/ratelimit.h> #include <linux/context_tracking.h> @@ -3049,7 +2710,7 @@ index b396868d2aa7..6d535973b200 100644 #include <asm/tlbflush.h> #include <asm/siginfo.h> #include <asm/debug.h> -@@ -272,15 +272,16 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address, +@@ -272,15 +272,16 @@ if (!arch_irq_disabled_regs(regs)) local_irq_enable(); @@ -3069,11 +2730,10 @@ index b396868d2aa7..6d535973b200 100644 printk(KERN_EMERG "NIP = %lx MSR = %lx\n", regs->nip, regs->msr); die("Weird page fault", regs, SIGSEGV); -diff --git a/arch/powerpc/mm/highmem.c b/arch/powerpc/mm/highmem.c -index e7450bdbe83a..e292c8a60952 100644 ---- a/arch/powerpc/mm/highmem.c -+++ b/arch/powerpc/mm/highmem.c -@@ -34,7 +34,7 @@ void *kmap_atomic_prot(struct page *page, pgprot_t prot) +diff -Nur linux-4.1.39.orig/arch/powerpc/mm/highmem.c linux-4.1.39/arch/powerpc/mm/highmem.c +--- linux-4.1.39.orig/arch/powerpc/mm/highmem.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/powerpc/mm/highmem.c 2017-04-18 17:56:30.561395114 +0200 +@@ -34,7 +34,7 @@ unsigned long vaddr; int idx, type; @@ -3082,7 +2742,7 @@ index e7450bdbe83a..e292c8a60952 100644 pagefault_disable(); if (!PageHighMem(page)) return page_address(page); -@@ -59,6 +59,7 @@ void __kunmap_atomic(void *kvaddr) +@@ -59,6 +59,7 @@ if (vaddr < __fix_to_virt(FIX_KMAP_END)) { pagefault_enable(); @@ -3090,18 +2750,17 @@ index e7450bdbe83a..e292c8a60952 100644 return; } -@@ -82,5 +83,6 @@ void __kunmap_atomic(void *kvaddr) +@@ -82,5 +83,6 @@ kmap_atomic_idx_pop(); pagefault_enable(); + preempt_enable(); } EXPORT_SYMBOL(__kunmap_atomic); -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.1.39.orig/arch/powerpc/platforms/ps3/device-init.c linux-4.1.39/arch/powerpc/platforms/ps3/device-init.c +--- linux-4.1.39.orig/arch/powerpc/platforms/ps3/device-init.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/powerpc/platforms/ps3/device-init.c 2017-04-18 17:56:30.561395114 +0200 +@@ -752,7 +752,7 @@ } pr_debug("%s:%u: notification %s issued\n", __func__, __LINE__, op); @@ -3110,11 +2769,10 @@ index 3f175e8aedb4..c4c02f91904c 100644 dev->done.done || kthread_should_stop()); if (kthread_should_stop()) res = -EINTR; -diff --git a/arch/s390/include/asm/kvm_host.h b/arch/s390/include/asm/kvm_host.h -index d01fc588b5c3..905007eead88 100644 ---- a/arch/s390/include/asm/kvm_host.h -+++ b/arch/s390/include/asm/kvm_host.h -@@ -419,7 +419,7 @@ struct kvm_s390_irq_payload { +diff -Nur linux-4.1.39.orig/arch/s390/include/asm/kvm_host.h linux-4.1.39/arch/s390/include/asm/kvm_host.h +--- linux-4.1.39.orig/arch/s390/include/asm/kvm_host.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/s390/include/asm/kvm_host.h 2017-04-18 17:56:30.561395114 +0200 +@@ -419,7 +419,7 @@ struct kvm_s390_local_interrupt { spinlock_t lock; struct kvm_s390_float_interrupt *float_int; @@ -3123,11 +2781,10 @@ index d01fc588b5c3..905007eead88 100644 atomic_t *cpuflags; DECLARE_BITMAP(sigp_emerg_pending, KVM_MAX_VCPUS); struct kvm_s390_irq_payload irq; -diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h -index f6ac1d7e7ed8..5c7381c5ad7f 100644 ---- a/arch/s390/include/asm/uaccess.h -+++ b/arch/s390/include/asm/uaccess.h -@@ -98,7 +98,8 @@ static inline unsigned long extable_fixup(const struct exception_table_entry *x) +diff -Nur linux-4.1.39.orig/arch/s390/include/asm/uaccess.h linux-4.1.39/arch/s390/include/asm/uaccess.h +--- linux-4.1.39.orig/arch/s390/include/asm/uaccess.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/s390/include/asm/uaccess.h 2017-04-18 17:56:30.561395114 +0200 +@@ -98,7 +98,8 @@ * @from: Source address, in user space. * @n: Number of bytes to copy. * @@ -3137,7 +2794,7 @@ index f6ac1d7e7ed8..5c7381c5ad7f 100644 * * Copy data from user space to kernel space. Caller must check * the specified block with access_ok() before calling this function. -@@ -118,7 +119,8 @@ unsigned long __must_check __copy_from_user(void *to, const void __user *from, +@@ -118,7 +119,8 @@ * @from: Source address, in kernel space. * @n: Number of bytes to copy. * @@ -3147,7 +2804,7 @@ index f6ac1d7e7ed8..5c7381c5ad7f 100644 * * Copy data from kernel space to user space. Caller must check * the specified block with access_ok() before calling this function. -@@ -264,7 +266,8 @@ int __get_user_bad(void) __attribute__((noreturn)); +@@ -264,7 +266,8 @@ * @from: Source address, in kernel space. * @n: Number of bytes to copy. * @@ -3157,7 +2814,7 @@ index f6ac1d7e7ed8..5c7381c5ad7f 100644 * * Copy data from kernel space to user space. * -@@ -290,7 +293,8 @@ __compiletime_warning("copy_from_user() buffer size is not provably correct") +@@ -290,7 +293,8 @@ * @from: Source address, in user space. * @n: Number of bytes to copy. * @@ -3167,7 +2824,7 @@ index f6ac1d7e7ed8..5c7381c5ad7f 100644 * * Copy data from user space to kernel space. * -@@ -348,7 +352,8 @@ static inline unsigned long strnlen_user(const char __user *src, unsigned long n +@@ -348,7 +352,8 @@ * strlen_user: - Get the size of a string in user space. * @str: The string to measure. * @@ -3177,11 +2834,10 @@ index f6ac1d7e7ed8..5c7381c5ad7f 100644 * * Get the size of a NUL-terminated string in user space. * -diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c -index 3dbba9a2bb0f..15016703b4bf 100644 ---- a/arch/s390/kvm/interrupt.c -+++ b/arch/s390/kvm/interrupt.c -@@ -875,13 +875,13 @@ no_timer: +diff -Nur linux-4.1.39.orig/arch/s390/kvm/interrupt.c linux-4.1.39/arch/s390/kvm/interrupt.c +--- linux-4.1.39.orig/arch/s390/kvm/interrupt.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/s390/kvm/interrupt.c 2017-04-18 17:56:30.561395114 +0200 +@@ -875,13 +875,13 @@ void kvm_s390_vcpu_wakeup(struct kvm_vcpu *vcpu) { @@ -3197,7 +2853,7 @@ index 3dbba9a2bb0f..15016703b4bf 100644 vcpu->stat.halt_wakeup++; } } -@@ -987,7 +987,7 @@ int kvm_s390_inject_program_int(struct kvm_vcpu *vcpu, u16 code) +@@ -987,7 +987,7 @@ spin_lock(&li->lock); irq.u.pgm.code = code; __inject_prog(vcpu, &irq); @@ -3206,7 +2862,7 @@ index 3dbba9a2bb0f..15016703b4bf 100644 spin_unlock(&li->lock); return 0; } -@@ -1006,7 +1006,7 @@ int kvm_s390_inject_prog_irq(struct kvm_vcpu *vcpu, +@@ -1006,7 +1006,7 @@ spin_lock(&li->lock); irq.u.pgm = *pgm_info; rc = __inject_prog(vcpu, &irq); @@ -3215,11 +2871,10 @@ index 3dbba9a2bb0f..15016703b4bf 100644 spin_unlock(&li->lock); return rc; } -diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c -index 76515bcea2f1..4c8f5d7f9c23 100644 ---- a/arch/s390/mm/fault.c -+++ b/arch/s390/mm/fault.c -@@ -399,7 +399,7 @@ static inline int do_exception(struct pt_regs *regs, int access) +diff -Nur linux-4.1.39.orig/arch/s390/mm/fault.c linux-4.1.39/arch/s390/mm/fault.c +--- linux-4.1.39.orig/arch/s390/mm/fault.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/s390/mm/fault.c 2017-04-18 17:56:30.561395114 +0200 +@@ -399,7 +399,7 @@ * user context. */ fault = VM_FAULT_BADCONTEXT; @@ -3228,10 +2883,9 @@ index 76515bcea2f1..4c8f5d7f9c23 100644 goto out; address = trans_exc_code & __FAIL_ADDR_MASK; -diff --git a/arch/score/include/asm/uaccess.h b/arch/score/include/asm/uaccess.h -index 69326dfb894d..01aec8ccde83 100644 ---- a/arch/score/include/asm/uaccess.h -+++ b/arch/score/include/asm/uaccess.h +diff -Nur linux-4.1.39.orig/arch/score/include/asm/uaccess.h linux-4.1.39/arch/score/include/asm/uaccess.h +--- linux-4.1.39.orig/arch/score/include/asm/uaccess.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/score/include/asm/uaccess.h 2017-04-18 17:56:30.561395114 +0200 @@ -36,7 +36,8 @@ * @addr: User space pointer to start of block to check * @size: Size of block to check @@ -3282,10 +2936,9 @@ index 69326dfb894d..01aec8ccde83 100644 * * This macro copies a single simple variable from user space to kernel * space. It supports simple types like char and int, but not larger -diff --git a/arch/score/mm/fault.c b/arch/score/mm/fault.c -index 6860beb2a280..37a6c2e0e969 100644 ---- a/arch/score/mm/fault.c -+++ b/arch/score/mm/fault.c +diff -Nur linux-4.1.39.orig/arch/score/mm/fault.c linux-4.1.39/arch/score/mm/fault.c +--- linux-4.1.39.orig/arch/score/mm/fault.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/score/mm/fault.c 2017-04-18 17:56:30.561395114 +0200 @@ -34,6 +34,7 @@ #include <linux/string.h> #include <linux/types.h> @@ -3294,7 +2947,7 @@ index 6860beb2a280..37a6c2e0e969 100644 /* * This routine handles page faults. It determines the address, -@@ -73,7 +74,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long write, +@@ -73,7 +74,7 @@ * If we're in an interrupt or have no user * context, we must not take the fault.. */ @@ -3303,11 +2956,10 @@ index 6860beb2a280..37a6c2e0e969 100644 goto bad_area_nosemaphore; if (user_mode(regs)) -diff --git a/arch/sh/kernel/irq.c b/arch/sh/kernel/irq.c -index eb10ff84015c..6fe8089e63fa 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.1.39.orig/arch/sh/kernel/irq.c linux-4.1.39/arch/sh/kernel/irq.c +--- linux-4.1.39.orig/arch/sh/kernel/irq.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/sh/kernel/irq.c 2017-04-18 17:56:30.561395114 +0200 +@@ -147,6 +147,7 @@ hardirq_ctx[cpu] = NULL; } @@ -3315,7 +2967,7 @@ index eb10ff84015c..6fe8089e63fa 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" ); } @@ -3323,10 +2975,9 @@ index eb10ff84015c..6fe8089e63fa 100644 #else static inline void handle_one_irq(unsigned int irq) { -diff --git a/arch/sh/mm/fault.c b/arch/sh/mm/fault.c -index a58fec9b55e0..79d8276377d1 100644 ---- a/arch/sh/mm/fault.c -+++ b/arch/sh/mm/fault.c +diff -Nur linux-4.1.39.orig/arch/sh/mm/fault.c linux-4.1.39/arch/sh/mm/fault.c +--- linux-4.1.39.orig/arch/sh/mm/fault.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/sh/mm/fault.c 2017-04-18 17:56:30.561395114 +0200 @@ -17,6 +17,7 @@ #include <linux/kprobes.h> #include <linux/perf_event.h> @@ -3335,7 +2986,7 @@ index a58fec9b55e0..79d8276377d1 100644 #include <asm/io_trapped.h> #include <asm/mmu_context.h> #include <asm/tlbflush.h> -@@ -438,9 +439,9 @@ asmlinkage void __kprobes do_page_fault(struct pt_regs *regs, +@@ -438,9 +439,9 @@ /* * If we're in an interrupt, have no user context or are running @@ -3347,11 +2998,10 @@ index a58fec9b55e0..79d8276377d1 100644 bad_area_nosemaphore(regs, error_code, address); return; } -diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig -index e49502acbab4..85cb0c621283 100644 ---- a/arch/sparc/Kconfig -+++ b/arch/sparc/Kconfig -@@ -189,12 +189,10 @@ config NR_CPUS +diff -Nur linux-4.1.39.orig/arch/sparc/Kconfig linux-4.1.39/arch/sparc/Kconfig +--- linux-4.1.39.orig/arch/sparc/Kconfig 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/sparc/Kconfig 2017-04-18 17:56:30.561395114 +0200 +@@ -189,12 +189,10 @@ source kernel/Kconfig.hz config RWSEM_GENERIC_SPINLOCK @@ -3366,11 +3016,10 @@ index e49502acbab4..85cb0c621283 100644 config GENERIC_HWEIGHT bool -diff --git a/arch/sparc/kernel/irq_64.c b/arch/sparc/kernel/irq_64.c -index 4033c23bdfa6..763cd88b4e92 100644 ---- a/arch/sparc/kernel/irq_64.c -+++ b/arch/sparc/kernel/irq_64.c -@@ -849,6 +849,7 @@ void __irq_entry handler_irq(int pil, struct pt_regs *regs) +diff -Nur linux-4.1.39.orig/arch/sparc/kernel/irq_64.c linux-4.1.39/arch/sparc/kernel/irq_64.c +--- linux-4.1.39.orig/arch/sparc/kernel/irq_64.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/sparc/kernel/irq_64.c 2017-04-18 17:56:30.561395114 +0200 +@@ -849,6 +849,7 @@ set_irq_regs(old_regs); } @@ -3378,7 +3027,7 @@ index 4033c23bdfa6..763cd88b4e92 100644 void do_softirq_own_stack(void) { void *orig_sp, *sp = softirq_stack[smp_processor_id()]; -@@ -863,6 +864,7 @@ void do_softirq_own_stack(void) +@@ -863,6 +864,7 @@ __asm__ __volatile__("mov %0, %%sp" : : "r" (orig_sp)); } @@ -3386,10 +3035,9 @@ index 4033c23bdfa6..763cd88b4e92 100644 #ifdef CONFIG_HOTPLUG_CPU void fixup_irqs(void) -diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c -index 70d817154fe8..c399e7b3b035 100644 ---- a/arch/sparc/mm/fault_32.c -+++ b/arch/sparc/mm/fault_32.c +diff -Nur linux-4.1.39.orig/arch/sparc/mm/fault_32.c linux-4.1.39/arch/sparc/mm/fault_32.c +--- linux-4.1.39.orig/arch/sparc/mm/fault_32.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/sparc/mm/fault_32.c 2017-04-18 17:56:30.561395114 +0200 @@ -21,6 +21,7 @@ #include <linux/perf_event.h> #include <linux/interrupt.h> @@ -3406,7 +3054,7 @@ index 70d817154fe8..c399e7b3b035 100644 #include "mm_32.h" -@@ -196,7 +196,7 @@ asmlinkage void do_sparc_fault(struct pt_regs *regs, int text_fault, int write, +@@ -196,7 +196,7 @@ * If we're in an interrupt or have no user * context, we must not take the fault.. */ @@ -3415,10 +3063,9 @@ index 70d817154fe8..c399e7b3b035 100644 goto no_context; perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, address); -diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c -index 479823249429..e9268ea1a68d 100644 ---- a/arch/sparc/mm/fault_64.c -+++ b/arch/sparc/mm/fault_64.c +diff -Nur linux-4.1.39.orig/arch/sparc/mm/fault_64.c linux-4.1.39/arch/sparc/mm/fault_64.c +--- linux-4.1.39.orig/arch/sparc/mm/fault_64.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/sparc/mm/fault_64.c 2017-04-18 17:56:30.561395114 +0200 @@ -22,12 +22,12 @@ #include <linux/kdebug.h> #include <linux/percpu.h> @@ -3433,7 +3080,7 @@ index 479823249429..e9268ea1a68d 100644 #include <asm/asi.h> #include <asm/lsu.h> #include <asm/sections.h> -@@ -330,7 +330,7 @@ asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs) +@@ -330,7 +330,7 @@ * If we're in an interrupt or have no user * context, we must not take the fault.. */ @@ -3442,11 +3089,10 @@ index 479823249429..e9268ea1a68d 100644 goto intr_or_no_mm; perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, address); -diff --git a/arch/sparc/mm/highmem.c b/arch/sparc/mm/highmem.c -index 449f864f0cef..a454ec5ff07a 100644 ---- a/arch/sparc/mm/highmem.c -+++ b/arch/sparc/mm/highmem.c -@@ -53,7 +53,7 @@ void *kmap_atomic(struct page *page) +diff -Nur linux-4.1.39.orig/arch/sparc/mm/highmem.c linux-4.1.39/arch/sparc/mm/highmem.c +--- linux-4.1.39.orig/arch/sparc/mm/highmem.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/sparc/mm/highmem.c 2017-04-18 17:56:30.561395114 +0200 +@@ -53,7 +53,7 @@ unsigned long vaddr; long idx, type; @@ -3455,7 +3101,7 @@ index 449f864f0cef..a454ec5ff07a 100644 pagefault_disable(); if (!PageHighMem(page)) return page_address(page); -@@ -91,6 +91,7 @@ void __kunmap_atomic(void *kvaddr) +@@ -91,6 +91,7 @@ if (vaddr < FIXADDR_START) { // FIXME pagefault_enable(); @@ -3463,18 +3109,17 @@ index 449f864f0cef..a454ec5ff07a 100644 return; } -@@ -126,5 +127,6 @@ void __kunmap_atomic(void *kvaddr) +@@ -126,5 +127,6 @@ kmap_atomic_idx_pop(); pagefault_enable(); + preempt_enable(); } EXPORT_SYMBOL(__kunmap_atomic); -diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c -index 1d71181dcc04..1a55c8481272 100644 ---- a/arch/sparc/mm/init_64.c -+++ b/arch/sparc/mm/init_64.c -@@ -2738,7 +2738,7 @@ void hugetlb_setup(struct pt_regs *regs) +diff -Nur linux-4.1.39.orig/arch/sparc/mm/init_64.c linux-4.1.39/arch/sparc/mm/init_64.c +--- linux-4.1.39.orig/arch/sparc/mm/init_64.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/sparc/mm/init_64.c 2017-04-18 17:56:30.565395270 +0200 +@@ -2738,7 +2738,7 @@ struct mm_struct *mm = current->mm; struct tsb_config *tp; @@ -3483,11 +3128,10 @@ index 1d71181dcc04..1a55c8481272 100644 const struct exception_table_entry *entry; entry = search_exception_tables(regs->tpc); -diff --git a/arch/tile/include/asm/uaccess.h b/arch/tile/include/asm/uaccess.h -index f41cb53cf645..a33276bf5ca1 100644 ---- a/arch/tile/include/asm/uaccess.h -+++ b/arch/tile/include/asm/uaccess.h -@@ -78,7 +78,8 @@ int __range_ok(unsigned long addr, unsigned long size); +diff -Nur linux-4.1.39.orig/arch/tile/include/asm/uaccess.h linux-4.1.39/arch/tile/include/asm/uaccess.h +--- linux-4.1.39.orig/arch/tile/include/asm/uaccess.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/tile/include/asm/uaccess.h 2017-04-18 17:56:30.565395270 +0200 +@@ -78,7 +78,8 @@ * @addr: User space pointer to start of block to check * @size: Size of block to check * @@ -3497,7 +3141,7 @@ index f41cb53cf645..a33276bf5ca1 100644 * * Checks if a pointer to a block of memory in user space is valid. * -@@ -192,7 +193,8 @@ extern int __get_user_bad(void) +@@ -192,7 +193,8 @@ * @x: Variable to store result. * @ptr: Source address, in user space. * @@ -3507,7 +3151,7 @@ index f41cb53cf645..a33276bf5ca1 100644 * * This macro copies a single simple variable from user space to kernel * space. It supports simple types like char and int, but not larger -@@ -274,7 +276,8 @@ extern int __put_user_bad(void) +@@ -274,7 +276,8 @@ * @x: Value to copy to user space. * @ptr: Destination address, in user space. * @@ -3517,7 +3161,7 @@ index f41cb53cf645..a33276bf5ca1 100644 * * This macro copies a single simple value from kernel space to user * space. It supports simple types like char and int, but not larger -@@ -330,7 +333,8 @@ extern int __put_user_bad(void) +@@ -330,7 +333,8 @@ * @from: Source address, in kernel space. * @n: Number of bytes to copy. * @@ -3527,7 +3171,7 @@ index f41cb53cf645..a33276bf5ca1 100644 * * Copy data from kernel space to user space. Caller must check * the specified block with access_ok() before calling this function. -@@ -366,7 +370,8 @@ copy_to_user(void __user *to, const void *from, unsigned long n) +@@ -366,7 +370,8 @@ * @from: Source address, in user space. * @n: Number of bytes to copy. * @@ -3537,7 +3181,7 @@ index f41cb53cf645..a33276bf5ca1 100644 * * Copy data from user space to kernel space. Caller must check * the specified block with access_ok() before calling this function. -@@ -437,7 +442,8 @@ static inline unsigned long __must_check copy_from_user(void *to, +@@ -437,7 +442,8 @@ * @from: Source address, in user space. * @n: Number of bytes to copy. * @@ -3547,11 +3191,10 @@ index f41cb53cf645..a33276bf5ca1 100644 * * Copy data from user space to user space. Caller must check * the specified blocks with access_ok() before calling this function. -diff --git a/arch/tile/mm/fault.c b/arch/tile/mm/fault.c -index e83cc999da02..3f4f58d34a92 100644 ---- a/arch/tile/mm/fault.c -+++ b/arch/tile/mm/fault.c -@@ -354,9 +354,9 @@ static int handle_page_fault(struct pt_regs *regs, +diff -Nur linux-4.1.39.orig/arch/tile/mm/fault.c linux-4.1.39/arch/tile/mm/fault.c +--- linux-4.1.39.orig/arch/tile/mm/fault.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/tile/mm/fault.c 2017-04-18 17:56:30.565395270 +0200 +@@ -354,9 +354,9 @@ /* * If we're in an interrupt, have no user context or are running in an @@ -3563,11 +3206,10 @@ index e83cc999da02..3f4f58d34a92 100644 vma = NULL; /* happy compiler */ goto bad_area_nosemaphore; } -diff --git a/arch/tile/mm/highmem.c b/arch/tile/mm/highmem.c -index 6aa2f2625447..fcd545014e79 100644 ---- a/arch/tile/mm/highmem.c -+++ b/arch/tile/mm/highmem.c -@@ -201,7 +201,7 @@ void *kmap_atomic_prot(struct page *page, pgprot_t prot) +diff -Nur linux-4.1.39.orig/arch/tile/mm/highmem.c linux-4.1.39/arch/tile/mm/highmem.c +--- linux-4.1.39.orig/arch/tile/mm/highmem.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/tile/mm/highmem.c 2017-04-18 17:56:30.565395270 +0200 +@@ -201,7 +201,7 @@ int idx, type; pte_t *pte; @@ -3576,7 +3218,7 @@ index 6aa2f2625447..fcd545014e79 100644 pagefault_disable(); /* Avoid icache flushes by disallowing atomic executable mappings. */ -@@ -259,6 +259,7 @@ void __kunmap_atomic(void *kvaddr) +@@ -259,6 +259,7 @@ } pagefault_enable(); @@ -3584,11 +3226,10 @@ index 6aa2f2625447..fcd545014e79 100644 } EXPORT_SYMBOL(__kunmap_atomic); -diff --git a/arch/um/kernel/trap.c b/arch/um/kernel/trap.c -index 8e4daf44e980..f9c9e5a6beba 100644 ---- a/arch/um/kernel/trap.c -+++ b/arch/um/kernel/trap.c -@@ -35,10 +35,10 @@ int handle_page_fault(unsigned long address, unsigned long ip, +diff -Nur linux-4.1.39.orig/arch/um/kernel/trap.c linux-4.1.39/arch/um/kernel/trap.c +--- linux-4.1.39.orig/arch/um/kernel/trap.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/um/kernel/trap.c 2017-04-18 17:56:30.565395270 +0200 +@@ -35,10 +35,10 @@ *code_out = SEGV_MAPERR; /* @@ -3601,11 +3242,10 @@ index 8e4daf44e980..f9c9e5a6beba 100644 goto out_nosemaphore; if (is_user) -diff --git a/arch/unicore32/mm/fault.c b/arch/unicore32/mm/fault.c -index 0dc922dba915..afccef5529cc 100644 ---- a/arch/unicore32/mm/fault.c -+++ b/arch/unicore32/mm/fault.c -@@ -218,7 +218,7 @@ static int do_pf(unsigned long addr, unsigned int fsr, struct pt_regs *regs) +diff -Nur linux-4.1.39.orig/arch/unicore32/mm/fault.c linux-4.1.39/arch/unicore32/mm/fault.c +--- linux-4.1.39.orig/arch/unicore32/mm/fault.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/unicore32/mm/fault.c 2017-04-18 17:56:30.565395270 +0200 +@@ -218,7 +218,7 @@ * If we're in an interrupt or have no user * context, we must not take the fault.. */ @@ -3614,45 +3254,10 @@ index 0dc922dba915..afccef5529cc 100644 goto no_context; if (user_mode(regs)) -diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig -index 226d5696e1d1..aac357a4cd5c 100644 ---- a/arch/x86/Kconfig -+++ b/arch/x86/Kconfig -@@ -22,6 +22,7 @@ config X86_64 - ### Arch settings - config X86 - def_bool y -+ select HAVE_PREEMPT_LAZY - select ACPI_SYSTEM_POWER_STATES_SUPPORT if ACPI - select ARCH_MIGHT_HAVE_ACPI_PDC if ACPI - select ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS -@@ -203,8 +204,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 -@@ -838,7 +842,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 112cefacf2af..3fd3b16349ae 100644 ---- a/arch/x86/crypto/aesni-intel_glue.c -+++ b/arch/x86/crypto/aesni-intel_glue.c -@@ -382,14 +382,14 @@ static int ecb_encrypt(struct blkcipher_desc *desc, +diff -Nur linux-4.1.39.orig/arch/x86/crypto/aesni-intel_glue.c linux-4.1.39/arch/x86/crypto/aesni-intel_glue.c +--- linux-4.1.39.orig/arch/x86/crypto/aesni-intel_glue.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/x86/crypto/aesni-intel_glue.c 2017-04-18 17:56:30.565395270 +0200 +@@ -382,14 +382,14 @@ err = blkcipher_walk_virt(desc, &walk); desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP; @@ -3670,7 +3275,7 @@ index 112cefacf2af..3fd3b16349ae 100644 return err; } -@@ -406,14 +406,14 @@ static int ecb_decrypt(struct blkcipher_desc *desc, +@@ -406,14 +406,14 @@ err = blkcipher_walk_virt(desc, &walk); desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP; @@ -3687,7 +3292,7 @@ index 112cefacf2af..3fd3b16349ae 100644 return err; } -@@ -430,14 +430,14 @@ static int cbc_encrypt(struct blkcipher_desc *desc, +@@ -430,14 +430,14 @@ err = blkcipher_walk_virt(desc, &walk); desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP; @@ -3704,7 +3309,7 @@ index 112cefacf2af..3fd3b16349ae 100644 return err; } -@@ -454,14 +454,14 @@ static int cbc_decrypt(struct blkcipher_desc *desc, +@@ -454,14 +454,14 @@ err = blkcipher_walk_virt(desc, &walk); desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP; @@ -3721,7 +3326,7 @@ index 112cefacf2af..3fd3b16349ae 100644 return err; } -@@ -513,18 +513,20 @@ static int ctr_crypt(struct blkcipher_desc *desc, +@@ -513,18 +513,20 @@ err = blkcipher_walk_virt_block(desc, &walk, AES_BLOCK_SIZE); desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP; @@ -3744,11 +3349,10 @@ index 112cefacf2af..3fd3b16349ae 100644 return err; } -diff --git a/arch/x86/crypto/cast5_avx_glue.c b/arch/x86/crypto/cast5_avx_glue.c -index 236c80974457..f799ec36bfa7 100644 ---- a/arch/x86/crypto/cast5_avx_glue.c -+++ b/arch/x86/crypto/cast5_avx_glue.c -@@ -60,7 +60,7 @@ static inline void cast5_fpu_end(bool fpu_enabled) +diff -Nur linux-4.1.39.orig/arch/x86/crypto/cast5_avx_glue.c linux-4.1.39/arch/x86/crypto/cast5_avx_glue.c +--- linux-4.1.39.orig/arch/x86/crypto/cast5_avx_glue.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/x86/crypto/cast5_avx_glue.c 2017-04-18 17:56:30.565395270 +0200 +@@ -60,7 +60,7 @@ static int ecb_crypt(struct blkcipher_desc *desc, struct blkcipher_walk *walk, bool enc) { @@ -3757,7 +3361,7 @@ index 236c80974457..f799ec36bfa7 100644 struct cast5_ctx *ctx = crypto_blkcipher_ctx(desc->tfm); const unsigned int bsize = CAST5_BLOCK_SIZE; unsigned int nbytes; -@@ -76,7 +76,7 @@ static int ecb_crypt(struct blkcipher_desc *desc, struct blkcipher_walk *walk, +@@ -76,7 +76,7 @@ u8 *wsrc = walk->src.virt.addr; u8 *wdst = walk->dst.virt.addr; @@ -3766,7 +3370,7 @@ index 236c80974457..f799ec36bfa7 100644 /* Process multi-block batch */ if (nbytes >= bsize * CAST5_PARALLEL_BLOCKS) { -@@ -104,10 +104,9 @@ static int ecb_crypt(struct blkcipher_desc *desc, struct blkcipher_walk *walk, +@@ -104,10 +104,9 @@ } while (nbytes >= bsize); done: @@ -3778,7 +3382,7 @@ index 236c80974457..f799ec36bfa7 100644 return err; } -@@ -228,7 +227,7 @@ done: +@@ -228,7 +227,7 @@ static int cbc_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst, struct scatterlist *src, unsigned int nbytes) { @@ -3787,7 +3391,7 @@ index 236c80974457..f799ec36bfa7 100644 struct blkcipher_walk walk; int err; -@@ -237,12 +236,11 @@ static int cbc_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst, +@@ -237,12 +236,11 @@ desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP; while ((nbytes = walk.nbytes)) { @@ -3802,7 +3406,7 @@ index 236c80974457..f799ec36bfa7 100644 return err; } -@@ -312,7 +310,7 @@ done: +@@ -312,7 +310,7 @@ static int ctr_crypt(struct blkcipher_desc *desc, struct scatterlist *dst, struct scatterlist *src, unsigned int nbytes) { @@ -3811,7 +3415,7 @@ index 236c80974457..f799ec36bfa7 100644 struct blkcipher_walk walk; int err; -@@ -321,13 +319,12 @@ static int ctr_crypt(struct blkcipher_desc *desc, struct scatterlist *dst, +@@ -321,13 +319,12 @@ desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP; while ((nbytes = walk.nbytes) >= CAST5_BLOCK_SIZE) { @@ -3827,11 +3431,10 @@ index 236c80974457..f799ec36bfa7 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.1.39.orig/arch/x86/crypto/glue_helper.c linux-4.1.39/arch/x86/crypto/glue_helper.c +--- linux-4.1.39.orig/arch/x86/crypto/glue_helper.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/x86/crypto/glue_helper.c 2017-04-18 17:56:30.565395270 +0200 +@@ -39,7 +39,7 @@ void *ctx = crypto_blkcipher_ctx(desc->tfm); const unsigned int bsize = 128 / 8; unsigned int nbytes, i, func_bytes; @@ -3840,7 +3443,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, @@ -3849,7 +3452,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: @@ -3861,7 +3464,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; @@ -3870,7 +3473,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, @@ -3885,7 +3488,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; @@ -3894,7 +3497,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, @@ -3910,7 +3513,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; @@ -3919,7 +3522,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, @@ -3946,11 +3549,10 @@ index 6a85598931b5..3a506ce7ed93 100644 return err; } EXPORT_SYMBOL_GPL(glue_xts_crypt_128bit); -diff --git a/arch/x86/include/asm/preempt.h b/arch/x86/include/asm/preempt.h -index 67b6cd00a44f..eff1b8609f77 100644 ---- a/arch/x86/include/asm/preempt.h -+++ b/arch/x86/include/asm/preempt.h -@@ -82,17 +82,46 @@ static __always_inline void __preempt_count_sub(int val) +diff -Nur linux-4.1.39.orig/arch/x86/include/asm/preempt.h linux-4.1.39/arch/x86/include/asm/preempt.h +--- linux-4.1.39.orig/arch/x86/include/asm/preempt.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/x86/include/asm/preempt.h 2017-04-18 17:56:30.565395270 +0200 +@@ -82,17 +82,46 @@ * a decrement which hits zero means we have no preempt_count and should * reschedule. */ @@ -3998,11 +3600,10 @@ index 67b6cd00a44f..eff1b8609f77 100644 } #ifdef CONFIG_PREEMPT -diff --git a/arch/x86/include/asm/signal.h b/arch/x86/include/asm/signal.h -index 31eab867e6d3..0e7bfe98e1d1 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.1.39.orig/arch/x86/include/asm/signal.h linux-4.1.39/arch/x86/include/asm/signal.h +--- linux-4.1.39.orig/arch/x86/include/asm/signal.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/x86/include/asm/signal.h 2017-04-18 17:56:30.565395270 +0200 +@@ -23,6 +23,19 @@ unsigned long sig[_NSIG_WORDS]; } sigset_t; @@ -4022,10 +3623,9 @@ index 31eab867e6d3..0e7bfe98e1d1 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 6a998598f172..64fb5cbe54fa 100644 ---- a/arch/x86/include/asm/stackprotector.h -+++ b/arch/x86/include/asm/stackprotector.h +diff -Nur linux-4.1.39.orig/arch/x86/include/asm/stackprotector.h linux-4.1.39/arch/x86/include/asm/stackprotector.h +--- linux-4.1.39.orig/arch/x86/include/asm/stackprotector.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/x86/include/asm/stackprotector.h 2017-04-18 17:56:30.565395270 +0200 @@ -57,7 +57,7 @@ */ static __always_inline void boot_init_stack_canary(void) @@ -4035,7 +3635,7 @@ index 6a998598f172..64fb5cbe54fa 100644 u64 tsc; #ifdef CONFIG_X86_64 -@@ -68,8 +68,16 @@ static __always_inline void boot_init_stack_canary(void) +@@ -68,8 +68,16 @@ * 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. @@ -4052,11 +3652,10 @@ index 6a998598f172..64fb5cbe54fa 100644 tsc = __native_read_tsc(); canary += tsc + (tsc << 32UL); -diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h -index b4bdec3e9523..606144afb990 100644 ---- a/arch/x86/include/asm/thread_info.h -+++ b/arch/x86/include/asm/thread_info.h -@@ -55,6 +55,8 @@ struct thread_info { +diff -Nur linux-4.1.39.orig/arch/x86/include/asm/thread_info.h linux-4.1.39/arch/x86/include/asm/thread_info.h +--- linux-4.1.39.orig/arch/x86/include/asm/thread_info.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/x86/include/asm/thread_info.h 2017-04-18 17:56:30.565395270 +0200 +@@ -55,6 +55,8 @@ __u32 status; /* thread synchronous flags */ __u32 cpu; /* current CPU */ int saved_preempt_count; @@ -4065,7 +3664,7 @@ index b4bdec3e9523..606144afb990 100644 mm_segment_t addr_limit; void __user *sysenter_return; unsigned int sig_on_uaccess_error:1; -@@ -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 */ @@ -4073,7 +3672,7 @@ index b4bdec3e9523..606144afb990 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) @@ -4081,7 +3680,7 @@ index b4bdec3e9523..606144afb990 100644 #define _TIF_USER_RETURN_NOTIFY (1 << TIF_USER_RETURN_NOTIFY) #define _TIF_UPROBE (1 << TIF_UPROBE) #define _TIF_NOTSC (1 << TIF_NOTSC) -@@ -168,6 +172,8 @@ struct thread_info { +@@ -168,6 +172,8 @@ #define _TIF_WORK_CTXSW_PREV (_TIF_WORK_CTXSW|_TIF_USER_RETURN_NOTIFY) #define _TIF_WORK_CTXSW_NEXT (_TIF_WORK_CTXSW) @@ -4090,11 +3689,33 @@ index b4bdec3e9523..606144afb990 100644 #define STACK_WARN (THREAD_SIZE/8) /* -diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h -index d081e7e42fb3..705e3d89d84d 100644 ---- a/arch/x86/include/asm/uaccess.h -+++ b/arch/x86/include/asm/uaccess.h -@@ -74,7 +74,8 @@ static inline bool __chk_range_not_ok(unsigned long addr, unsigned long size, un +diff -Nur linux-4.1.39.orig/arch/x86/include/asm/uaccess_32.h linux-4.1.39/arch/x86/include/asm/uaccess_32.h +--- linux-4.1.39.orig/arch/x86/include/asm/uaccess_32.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/x86/include/asm/uaccess_32.h 2017-04-18 17:56:30.565395270 +0200 +@@ -70,7 +70,8 @@ + * @from: Source address, in kernel space. + * @n: Number of bytes to copy. + * +- * Context: User context only. This function may sleep. ++ * Context: User context only. This function may sleep if pagefaults are ++ * enabled. + * + * Copy data from kernel space to user space. Caller must check + * the specified block with access_ok() before calling this function. +@@ -117,7 +118,8 @@ + * @from: Source address, in user space. + * @n: Number of bytes to copy. + * +- * Context: User context only. This function may sleep. ++ * Context: User context only. This function may sleep if pagefaults are ++ * enabled. + * + * Copy data from user space to kernel space. Caller must check + * the specified block with access_ok() before calling this function. +diff -Nur linux-4.1.39.orig/arch/x86/include/asm/uaccess.h linux-4.1.39/arch/x86/include/asm/uaccess.h +--- linux-4.1.39.orig/arch/x86/include/asm/uaccess.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/x86/include/asm/uaccess.h 2017-04-18 17:56:30.565395270 +0200 +@@ -74,7 +74,8 @@ * @addr: User space pointer to start of block to check * @size: Size of block to check * @@ -4104,7 +3725,7 @@ index d081e7e42fb3..705e3d89d84d 100644 * * Checks if a pointer to a block of memory in user space is valid. * -@@ -145,7 +146,8 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL)) +@@ -145,7 +146,8 @@ * @x: Variable to store result. * @ptr: Source address, in user space. * @@ -4114,7 +3735,7 @@ index d081e7e42fb3..705e3d89d84d 100644 * * This macro copies a single simple variable from user space to kernel * space. It supports simple types like char and int, but not larger -@@ -240,7 +242,8 @@ extern void __put_user_8(void); +@@ -240,7 +242,8 @@ * @x: Value to copy to user space. * @ptr: Destination address, in user space. * @@ -4124,7 +3745,7 @@ index d081e7e42fb3..705e3d89d84d 100644 * * This macro copies a single simple value from kernel space to user * space. It supports simple types like char and int, but not larger -@@ -459,7 +462,8 @@ struct __large_struct { unsigned long buf[100]; }; +@@ -459,7 +462,8 @@ * @x: Variable to store result. * @ptr: Source address, in user space. * @@ -4134,7 +3755,7 @@ index d081e7e42fb3..705e3d89d84d 100644 * * This macro copies a single simple variable from user space to kernel * space. It supports simple types like char and int, but not larger -@@ -483,7 +487,8 @@ struct __large_struct { unsigned long buf[100]; }; +@@ -483,7 +487,8 @@ * @x: Value to copy to user space. * @ptr: Destination address, in user space. * @@ -4144,35 +3765,10 @@ index d081e7e42fb3..705e3d89d84d 100644 * * This macro copies a single simple value from kernel space to user * space. It supports simple types like char and int, but not larger -diff --git a/arch/x86/include/asm/uaccess_32.h b/arch/x86/include/asm/uaccess_32.h -index 3c03a5de64d3..7c8ad3451988 100644 ---- a/arch/x86/include/asm/uaccess_32.h -+++ b/arch/x86/include/asm/uaccess_32.h -@@ -70,7 +70,8 @@ __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n) - * @from: Source address, in kernel space. - * @n: Number of bytes to copy. - * -- * Context: User context only. This function may sleep. -+ * Context: User context only. This function may sleep if pagefaults are -+ * enabled. - * - * Copy data from kernel space to user space. Caller must check - * the specified block with access_ok() before calling this function. -@@ -117,7 +118,8 @@ __copy_from_user_inatomic(void *to, const void __user *from, unsigned long n) - * @from: Source address, in user space. - * @n: Number of bytes to copy. - * -- * Context: User context only. This function may sleep. -+ * Context: User context only. This function may sleep if pagefaults are -+ * enabled. - * - * Copy data from user space to kernel space. Caller must check - * the specified block with access_ok() before calling this function. -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.1.39.orig/arch/x86/include/asm/uv/uv_bau.h linux-4.1.39/arch/x86/include/asm/uv/uv_bau.h +--- linux-4.1.39.orig/arch/x86/include/asm/uv/uv_bau.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/x86/include/asm/uv/uv_bau.h 2017-04-18 17:56:30.565395270 +0200 +@@ -615,9 +615,9 @@ cycles_t send_message; cycles_t period_end; cycles_t period_time; @@ -4185,7 +3781,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. */ @@ -4205,11 +3801,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 a00ad8f2a657..c2729abe02bc 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.1.39.orig/arch/x86/include/asm/uv/uv_hub.h linux-4.1.39/arch/x86/include/asm/uv/uv_hub.h +--- linux-4.1.39.orig/arch/x86/include/asm/uv/uv_hub.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/x86/include/asm/uv/uv_hub.h 2017-04-18 17:56:30.565395270 +0200 +@@ -492,7 +492,7 @@ unsigned short nr_online_cpus; unsigned short pnode; short memory_nid; @@ -4218,11 +3813,56 @@ index a00ad8f2a657..c2729abe02bc 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 f4dc2462a1ac..07c6aba75aa0 100644 ---- a/arch/x86/kernel/apic/io_apic.c -+++ b/arch/x86/kernel/apic/io_apic.c -@@ -1891,7 +1891,8 @@ static bool io_apic_level_ack_pending(struct irq_cfg *cfg) +diff -Nur linux-4.1.39.orig/arch/x86/Kconfig linux-4.1.39/arch/x86/Kconfig +--- linux-4.1.39.orig/arch/x86/Kconfig 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/x86/Kconfig 2017-04-18 17:56:30.565395270 +0200 +@@ -22,6 +22,7 @@ + ### Arch settings + config X86 + def_bool y ++ select HAVE_PREEMPT_LAZY + select ACPI_SYSTEM_POWER_STATES_SUPPORT if ACPI + select ARCH_MIGHT_HAVE_ACPI_PDC if ACPI + select ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS +@@ -203,8 +204,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 +@@ -838,7 +842,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.1.39.orig/arch/x86/kernel/acpi/boot.c linux-4.1.39/arch/x86/kernel/acpi/boot.c +--- linux-4.1.39.orig/arch/x86/kernel/acpi/boot.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/x86/kernel/acpi/boot.c 2017-04-18 17:56:30.565395270 +0200 +@@ -87,7 +87,9 @@ + * ->ioapic_mutex + * ->ioapic_lock + */ ++#ifdef CONFIG_X86_IO_APIC + static DEFINE_MUTEX(acpi_ioapic_lock); ++#endif + + /* -------------------------------------------------------------------------- + Boot-time Configuration +diff -Nur linux-4.1.39.orig/arch/x86/kernel/apic/io_apic.c linux-4.1.39/arch/x86/kernel/apic/io_apic.c +--- linux-4.1.39.orig/arch/x86/kernel/apic/io_apic.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/x86/kernel/apic/io_apic.c 2017-04-18 17:56:30.565395270 +0200 +@@ -1891,7 +1891,8 @@ static inline bool ioapic_irqd_mask(struct irq_data *data, struct irq_cfg *cfg) { /* If we are moving the irq we need to mask it */ @@ -4232,11 +3872,10 @@ index f4dc2462a1ac..07c6aba75aa0 100644 mask_ioapic(cfg); return true; } -diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c -index c8d92950bc04..3d2fbca33b73 100644 ---- a/arch/x86/kernel/apic/x2apic_uv_x.c -+++ b/arch/x86/kernel/apic/x2apic_uv_x.c -@@ -949,7 +949,7 @@ void __init uv_system_init(void) +diff -Nur linux-4.1.39.orig/arch/x86/kernel/apic/x2apic_uv_x.c linux-4.1.39/arch/x86/kernel/apic/x2apic_uv_x.c +--- linux-4.1.39.orig/arch/x86/kernel/apic/x2apic_uv_x.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/x86/kernel/apic/x2apic_uv_x.c 2017-04-18 17:56:30.569395424 +0200 +@@ -949,7 +949,7 @@ uv_blade_info[blade].pnode = pnode; uv_blade_info[blade].nr_possible_cpus = 0; uv_blade_info[blade].nr_online_cpus = 0; @@ -4245,11 +3884,10 @@ index c8d92950bc04..3d2fbca33b73 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 9f6b9341950f..5701b507510b 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.1.39.orig/arch/x86/kernel/asm-offsets.c linux-4.1.39/arch/x86/kernel/asm-offsets.c +--- linux-4.1.39.orig/arch/x86/kernel/asm-offsets.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/x86/kernel/asm-offsets.c 2017-04-18 17:56:30.569395424 +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); @@ -4257,16 +3895,15 @@ index 9f6b9341950f..5701b507510b 100644 BLANK(); OFFSET(crypto_tfm_ctx_offset, crypto_tfm, __crt_ctx); -@@ -71,4 +72,5 @@ void common(void) { +@@ -71,4 +72,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 20190bdac9d5..9d46f9a133e1 100644 ---- a/arch/x86/kernel/cpu/mcheck/mce.c -+++ b/arch/x86/kernel/cpu/mcheck/mce.c +diff -Nur linux-4.1.39.orig/arch/x86/kernel/cpu/mcheck/mce.c linux-4.1.39/arch/x86/kernel/cpu/mcheck/mce.c +--- linux-4.1.39.orig/arch/x86/kernel/cpu/mcheck/mce.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/x86/kernel/cpu/mcheck/mce.c 2017-04-18 17:56:30.569395424 +0200 @@ -41,6 +41,8 @@ #include <linux/debugfs.h> #include <linux/irq_work.h> @@ -4276,7 +3913,7 @@ index 20190bdac9d5..9d46f9a133e1 100644 #include <asm/processor.h> #include <asm/traps.h> -@@ -1267,7 +1269,7 @@ void mce_log_therm_throt_event(__u64 status) +@@ -1267,7 +1269,7 @@ static unsigned long check_interval = INITIAL_CHECK_INTERVAL; static DEFINE_PER_CPU(unsigned long, mce_next_interval); /* in jiffies */ @@ -4285,7 +3922,7 @@ index 20190bdac9d5..9d46f9a133e1 100644 static unsigned long mce_adjust_timer_default(unsigned long interval) { -@@ -1276,32 +1278,18 @@ static unsigned long mce_adjust_timer_default(unsigned long interval) +@@ -1276,32 +1278,18 @@ static unsigned long (*mce_adjust_timer)(unsigned long interval) = mce_adjust_timer_default; @@ -4324,7 +3961,7 @@ index 20190bdac9d5..9d46f9a133e1 100644 iv = __this_cpu_read(mce_next_interval); if (mce_available(this_cpu_ptr(&cpu_info))) { -@@ -1324,7 +1312,7 @@ static void mce_timer_fn(unsigned long data) +@@ -1324,7 +1312,7 @@ done: __this_cpu_write(mce_next_interval, iv); @@ -4333,7 +3970,7 @@ index 20190bdac9d5..9d46f9a133e1 100644 } /* -@@ -1332,7 +1320,7 @@ done: +@@ -1332,7 +1320,7 @@ */ void mce_timer_kick(unsigned long interval) { @@ -4342,7 +3979,7 @@ index 20190bdac9d5..9d46f9a133e1 100644 unsigned long iv = __this_cpu_read(mce_next_interval); __restart_timer(t, interval); -@@ -1347,7 +1335,7 @@ static void mce_timer_delete_all(void) +@@ -1347,7 +1335,7 @@ int cpu; for_each_online_cpu(cpu) @@ -4351,7 +3988,7 @@ index 20190bdac9d5..9d46f9a133e1 100644 } static void mce_do_trigger(struct work_struct *work) -@@ -1357,6 +1345,56 @@ static void mce_do_trigger(struct work_struct *work) +@@ -1357,6 +1345,56 @@ static DECLARE_WORK(mce_trigger_work, mce_do_trigger); @@ -4408,7 +4045,7 @@ index 20190bdac9d5..9d46f9a133e1 100644 /* * Notify the user(s) about new machine check events. * Can be called from interrupt context, but not from machine check/NMI -@@ -1364,19 +1402,8 @@ static DECLARE_WORK(mce_trigger_work, mce_do_trigger); +@@ -1364,19 +1402,8 @@ */ int mce_notify_irq(void) { @@ -4429,7 +4066,7 @@ index 20190bdac9d5..9d46f9a133e1 100644 return 1; } return 0; -@@ -1649,7 +1676,7 @@ static void __mcheck_cpu_init_vendor(struct cpuinfo_x86 *c) +@@ -1649,7 +1676,7 @@ } } @@ -4438,7 +4075,7 @@ index 20190bdac9d5..9d46f9a133e1 100644 { unsigned long iv = check_interval * HZ; -@@ -1658,16 +1685,17 @@ static void mce_start_timer(unsigned int cpu, struct timer_list *t) +@@ -1658,16 +1685,17 @@ per_cpu(mce_next_interval, cpu) = iv; @@ -4460,7 +4097,7 @@ index 20190bdac9d5..9d46f9a133e1 100644 mce_start_timer(cpu, t); } -@@ -2345,6 +2373,8 @@ static void mce_disable_cpu(void *h) +@@ -2345,6 +2373,8 @@ if (!mce_available(raw_cpu_ptr(&cpu_info))) return; @@ -4469,7 +4106,7 @@ index 20190bdac9d5..9d46f9a133e1 100644 if (!(action & CPU_TASKS_FROZEN)) cmci_clear(); for (i = 0; i < mca_cfg.banks; i++) { -@@ -2371,6 +2401,7 @@ static void mce_reenable_cpu(void *h) +@@ -2371,6 +2401,7 @@ if (b->init) wrmsrl(MSR_IA32_MCx_CTL(i), b->ctl); } @@ -4477,7 +4114,7 @@ index 20190bdac9d5..9d46f9a133e1 100644 } /* Get notified when a cpu comes on/off. Be hotplug friendly. */ -@@ -2378,7 +2409,6 @@ static int +@@ -2378,7 +2409,6 @@ mce_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu) { unsigned int cpu = (unsigned long)hcpu; @@ -4485,7 +4122,7 @@ index 20190bdac9d5..9d46f9a133e1 100644 switch (action & ~CPU_TASKS_FROZEN) { case CPU_ONLINE: -@@ -2398,11 +2428,9 @@ mce_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu) +@@ -2398,11 +2428,9 @@ break; case CPU_DOWN_PREPARE: smp_call_function_single(cpu, mce_disable_cpu, &action, 1); @@ -4497,7 +4134,7 @@ index 20190bdac9d5..9d46f9a133e1 100644 break; } -@@ -2441,6 +2469,10 @@ static __init int mcheck_init_device(void) +@@ -2441,6 +2469,10 @@ goto err_out; } @@ -4508,11 +4145,10 @@ index 20190bdac9d5..9d46f9a133e1 100644 if (!zalloc_cpumask_var(&mce_device_initialized, GFP_KERNEL)) { err = -ENOMEM; goto err_out; -diff --git a/arch/x86/kernel/cpu/perf_event_intel_rapl.c b/arch/x86/kernel/cpu/perf_event_intel_rapl.c -index 358c54ad20d4..94689f19ad92 100644 ---- a/arch/x86/kernel/cpu/perf_event_intel_rapl.c -+++ b/arch/x86/kernel/cpu/perf_event_intel_rapl.c -@@ -119,7 +119,7 @@ static struct perf_pmu_events_attr event_attr_##v = { \ +diff -Nur linux-4.1.39.orig/arch/x86/kernel/cpu/perf_event_intel_rapl.c linux-4.1.39/arch/x86/kernel/cpu/perf_event_intel_rapl.c +--- linux-4.1.39.orig/arch/x86/kernel/cpu/perf_event_intel_rapl.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/x86/kernel/cpu/perf_event_intel_rapl.c 2017-04-18 17:56:30.569395424 +0200 +@@ -119,7 +119,7 @@ }; struct rapl_pmu { @@ -4521,7 +4157,7 @@ index 358c54ad20d4..94689f19ad92 100644 int n_active; /* number of active events */ struct list_head active_list; struct pmu *pmu; /* pointer to rapl_pmu_class */ -@@ -223,13 +223,13 @@ static enum hrtimer_restart rapl_hrtimer_handle(struct hrtimer *hrtimer) +@@ -223,13 +223,13 @@ if (!pmu->n_active) return HRTIMER_NORESTART; @@ -4537,7 +4173,7 @@ index 358c54ad20d4..94689f19ad92 100644 hrtimer_forward_now(hrtimer, pmu->timer_interval); -@@ -266,9 +266,9 @@ static void rapl_pmu_event_start(struct perf_event *event, int mode) +@@ -266,9 +266,9 @@ struct rapl_pmu *pmu = __this_cpu_read(rapl_pmu); unsigned long flags; @@ -4549,7 +4185,7 @@ index 358c54ad20d4..94689f19ad92 100644 } static void rapl_pmu_event_stop(struct perf_event *event, int mode) -@@ -277,7 +277,7 @@ static void rapl_pmu_event_stop(struct perf_event *event, int mode) +@@ -277,7 +277,7 @@ struct hw_perf_event *hwc = &event->hw; unsigned long flags; @@ -4558,7 +4194,7 @@ index 358c54ad20d4..94689f19ad92 100644 /* mark event as deactivated and stopped */ if (!(hwc->state & PERF_HES_STOPPED)) { -@@ -302,7 +302,7 @@ static void rapl_pmu_event_stop(struct perf_event *event, int mode) +@@ -302,7 +302,7 @@ hwc->state |= PERF_HES_UPTODATE; } @@ -4567,7 +4203,7 @@ index 358c54ad20d4..94689f19ad92 100644 } static int rapl_pmu_event_add(struct perf_event *event, int mode) -@@ -311,14 +311,14 @@ static int rapl_pmu_event_add(struct perf_event *event, int mode) +@@ -311,14 +311,14 @@ struct hw_perf_event *hwc = &event->hw; unsigned long flags; @@ -4584,7 +4220,7 @@ index 358c54ad20d4..94689f19ad92 100644 return 0; } -@@ -594,7 +594,7 @@ static int rapl_cpu_prepare(int cpu) +@@ -594,7 +594,7 @@ pmu = kzalloc_node(sizeof(*pmu), GFP_KERNEL, cpu_to_node(cpu)); if (!pmu) return -1; @@ -4593,11 +4229,10 @@ index 358c54ad20d4..94689f19ad92 100644 INIT_LIST_HEAD(&pmu->active_list); -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.1.39.orig/arch/x86/kernel/dumpstack_32.c linux-4.1.39/arch/x86/kernel/dumpstack_32.c +--- linux-4.1.39.orig/arch/x86/kernel/dumpstack_32.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/x86/kernel/dumpstack_32.c 2017-04-18 17:56:30.569395424 +0200 +@@ -42,7 +42,7 @@ unsigned long *stack, unsigned long bp, const struct stacktrace_ops *ops, void *data) { @@ -4606,7 +4241,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(); } @@ -4615,11 +4250,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.1.39.orig/arch/x86/kernel/dumpstack_64.c linux-4.1.39/arch/x86/kernel/dumpstack_64.c +--- linux-4.1.39.orig/arch/x86/kernel/dumpstack_64.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/x86/kernel/dumpstack_64.c 2017-04-18 17:56:30.569395424 +0200 +@@ -152,7 +152,7 @@ unsigned long *stack, unsigned long bp, const struct stacktrace_ops *ops, void *data) { @@ -4628,7 +4262,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); @@ -4637,7 +4271,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; @@ -4646,7 +4280,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(); } @@ -4655,11 +4289,10 @@ index 5f1c6266eb30..c331e3fef465 100644 pr_cont("\n"); show_trace_log_lvl(task, regs, sp, bp, log_lvl); -diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S -index 1c309763e321..8612b314af92 100644 ---- a/arch/x86/kernel/entry_32.S -+++ b/arch/x86/kernel/entry_32.S -@@ -359,8 +359,24 @@ END(ret_from_exception) +diff -Nur linux-4.1.39.orig/arch/x86/kernel/entry_32.S linux-4.1.39/arch/x86/kernel/entry_32.S +--- linux-4.1.39.orig/arch/x86/kernel/entry_32.S 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/x86/kernel/entry_32.S 2017-04-18 17:56:30.569395424 +0200 +@@ -359,8 +359,24 @@ ENTRY(resume_kernel) DISABLE_INTERRUPTS(CLBR_ANY) need_resched: @@ -4684,7 +4317,7 @@ index 1c309763e321..8612b314af92 100644 testl $X86_EFLAGS_IF,PT_EFLAGS(%esp) # interrupts off (exception path) ? jz restore_all call preempt_schedule_irq -@@ -594,7 +610,7 @@ ENDPROC(system_call) +@@ -594,7 +610,7 @@ ALIGN RING0_PTREGS_FRAME # can't unwind into user space anyway work_pending: @@ -4693,7 +4326,7 @@ index 1c309763e321..8612b314af92 100644 jz work_notifysig work_resched: call schedule -@@ -607,7 +623,7 @@ work_resched: +@@ -607,7 +623,7 @@ andl $_TIF_WORK_MASK, %ecx # is there any work to be done other # than syscall tracing? jz restore_all @@ -4702,11 +4335,10 @@ index 1c309763e321..8612b314af92 100644 jnz work_resched work_notifysig: # deal with pending signals and -diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S -index 6c9cb6073832..db2a15c91a65 100644 ---- a/arch/x86/kernel/entry_64.S -+++ b/arch/x86/kernel/entry_64.S -@@ -370,8 +370,8 @@ GLOBAL(int_with_check) +diff -Nur linux-4.1.39.orig/arch/x86/kernel/entry_64.S linux-4.1.39/arch/x86/kernel/entry_64.S +--- linux-4.1.39.orig/arch/x86/kernel/entry_64.S 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/x86/kernel/entry_64.S 2017-04-18 17:56:30.569395424 +0200 +@@ -370,8 +370,8 @@ /* First do a reschedule test. */ /* edx: work, edi: workmask */ int_careful: @@ -4717,7 +4349,7 @@ index 6c9cb6073832..db2a15c91a65 100644 TRACE_IRQS_ON ENABLE_INTERRUPTS(CLBR_NONE) pushq_cfi %rdi -@@ -776,7 +776,23 @@ retint_kernel: +@@ -776,7 +776,23 @@ bt $9,EFLAGS(%rsp) /* interrupts were off? */ jnc 1f 0: cmpl $0,PER_CPU_VAR(__preempt_count) @@ -4741,7 +4373,7 @@ index 6c9cb6073832..db2a15c91a65 100644 call preempt_schedule_irq jmp 0b 1: -@@ -844,8 +860,8 @@ native_irq_return_ldt: +@@ -844,8 +860,8 @@ /* edi: workmask, edx: work */ retint_careful: CFI_RESTORE_STATE @@ -4752,7 +4384,7 @@ index 6c9cb6073832..db2a15c91a65 100644 TRACE_IRQS_ON ENABLE_INTERRUPTS(CLBR_NONE) pushq_cfi %rdi -@@ -1118,6 +1134,7 @@ bad_gs: +@@ -1118,6 +1134,7 @@ jmp 2b .previous @@ -4760,7 +4392,7 @@ index 6c9cb6073832..db2a15c91a65 100644 /* Call softirq on interrupt stack. Interrupts are off. */ ENTRY(do_softirq_own_stack) CFI_STARTPROC -@@ -1137,6 +1154,7 @@ ENTRY(do_softirq_own_stack) +@@ -1137,6 +1154,7 @@ ret CFI_ENDPROC END(do_softirq_own_stack) @@ -4768,11 +4400,10 @@ index 6c9cb6073832..db2a15c91a65 100644 #ifdef CONFIG_XEN idtentry xen_hypervisor_callback xen_do_hypervisor_callback has_error_code=0 -diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c -index f9fd86a7fcc7..521ef3cc8066 100644 ---- a/arch/x86/kernel/irq_32.c -+++ b/arch/x86/kernel/irq_32.c -@@ -135,6 +135,7 @@ void irq_ctx_init(int cpu) +diff -Nur linux-4.1.39.orig/arch/x86/kernel/irq_32.c linux-4.1.39/arch/x86/kernel/irq_32.c +--- linux-4.1.39.orig/arch/x86/kernel/irq_32.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/x86/kernel/irq_32.c 2017-04-18 17:56:30.569395424 +0200 +@@ -135,6 +135,7 @@ cpu, per_cpu(hardirq_stack, cpu), per_cpu(softirq_stack, cpu)); } @@ -4780,7 +4411,7 @@ index f9fd86a7fcc7..521ef3cc8066 100644 void do_softirq_own_stack(void) { struct thread_info *curstk; -@@ -153,6 +154,7 @@ void do_softirq_own_stack(void) +@@ -153,6 +154,7 @@ call_on_stack(__do_softirq, isp); } @@ -4788,10 +4419,9 @@ index f9fd86a7fcc7..521ef3cc8066 100644 bool handle_irq(unsigned irq, struct pt_regs *regs) { -diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c -index 9435620062df..ba97b5b45879 100644 ---- a/arch/x86/kernel/kvm.c -+++ b/arch/x86/kernel/kvm.c +diff -Nur linux-4.1.39.orig/arch/x86/kernel/kvm.c linux-4.1.39/arch/x86/kernel/kvm.c +--- linux-4.1.39.orig/arch/x86/kernel/kvm.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/x86/kernel/kvm.c 2017-04-18 17:56:30.569395424 +0200 @@ -36,6 +36,7 @@ #include <linux/kprobes.h> #include <linux/debugfs.h> @@ -4800,7 +4430,7 @@ index 9435620062df..ba97b5b45879 100644 #include <asm/timer.h> #include <asm/cpu.h> #include <asm/traps.h> -@@ -91,14 +92,14 @@ static void kvm_io_delay(void) +@@ -91,14 +92,14 @@ struct kvm_task_sleep_node { struct hlist_node link; @@ -4817,7 +4447,7 @@ index 9435620062df..ba97b5b45879 100644 struct hlist_head list; } async_pf_sleepers[KVM_TASK_SLEEP_HASHSIZE]; -@@ -122,17 +123,17 @@ void kvm_async_pf_task_wait(u32 token) +@@ -122,17 +123,17 @@ u32 key = hash_32(token, KVM_TASK_SLEEP_HASHBITS); struct kvm_task_sleep_head *b = &async_pf_sleepers[key]; struct kvm_task_sleep_node n, *e; @@ -4838,7 +4468,7 @@ index 9435620062df..ba97b5b45879 100644 rcu_irq_exit(); return; -@@ -141,13 +142,13 @@ void kvm_async_pf_task_wait(u32 token) +@@ -141,13 +142,13 @@ n.token = token; n.cpu = smp_processor_id(); n.halted = is_idle_task(current) || preempt_count() > 1; @@ -4855,7 +4485,7 @@ index 9435620062df..ba97b5b45879 100644 if (hlist_unhashed(&n.link)) break; -@@ -166,7 +167,7 @@ void kvm_async_pf_task_wait(u32 token) +@@ -166,7 +167,7 @@ } } if (!n.halted) @@ -4864,7 +4494,7 @@ index 9435620062df..ba97b5b45879 100644 rcu_irq_exit(); return; -@@ -178,8 +179,8 @@ static void apf_task_wake_one(struct kvm_task_sleep_node *n) +@@ -178,8 +179,8 @@ hlist_del_init(&n->link); if (n->halted) smp_send_reschedule(n->cpu); @@ -4875,7 +4505,7 @@ index 9435620062df..ba97b5b45879 100644 } static void apf_task_wake_all(void) -@@ -189,14 +190,14 @@ static void apf_task_wake_all(void) +@@ -189,14 +190,14 @@ for (i = 0; i < KVM_TASK_SLEEP_HASHSIZE; i++) { struct hlist_node *p, *next; struct kvm_task_sleep_head *b = &async_pf_sleepers[i]; @@ -4892,7 +4522,7 @@ index 9435620062df..ba97b5b45879 100644 } } -@@ -212,7 +213,7 @@ void kvm_async_pf_task_wake(u32 token) +@@ -212,7 +213,7 @@ } again: @@ -4901,7 +4531,7 @@ index 9435620062df..ba97b5b45879 100644 n = _find_apf_task(b, token); if (!n) { /* -@@ -225,17 +226,17 @@ again: +@@ -225,17 +226,17 @@ * Allocation failed! Busy wait while other cpu * handles async PF. */ @@ -4922,7 +4552,7 @@ index 9435620062df..ba97b5b45879 100644 return; } EXPORT_SYMBOL_GPL(kvm_async_pf_task_wake); -@@ -486,7 +487,7 @@ void __init kvm_guest_init(void) +@@ -486,7 +487,7 @@ paravirt_ops_setup(); register_reboot_notifier(&kvm_pv_reboot_nb); for (i = 0; i < KVM_TASK_SLEEP_HASHSIZE; i++) @@ -4931,10 +4561,9 @@ index 9435620062df..ba97b5b45879 100644 if (kvm_para_has_feature(KVM_FEATURE_ASYNC_PF)) x86_init.irqs.trap_init = kvm_apf_trap_init; -diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c -index 8ed2106b06da..3a70713079c5 100644 ---- a/arch/x86/kernel/process_32.c -+++ b/arch/x86/kernel/process_32.c +diff -Nur linux-4.1.39.orig/arch/x86/kernel/process_32.c linux-4.1.39/arch/x86/kernel/process_32.c +--- linux-4.1.39.orig/arch/x86/kernel/process_32.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/x86/kernel/process_32.c 2017-04-18 17:56:30.569395424 +0200 @@ -35,6 +35,7 @@ #include <linux/uaccess.h> #include <linux/io.h> @@ -4943,7 +4572,7 @@ index 8ed2106b06da..3a70713079c5 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); @@ -4979,7 +4608,7 @@ index 8ed2106b06da..3a70713079c5 100644 /* * switch_to(x,y) should switch tasks from x to y. -@@ -292,6 +322,8 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p) +@@ -292,6 +322,8 @@ task_thread_info(next_p)->flags & _TIF_WORK_CTXSW_NEXT)) __switch_to_xtra(prev_p, next_p, tss); @@ -4988,11 +4617,10 @@ index 8ed2106b06da..3a70713079c5 100644 /* * Leave lazy mode, flushing any hypercalls made here. * This must be done before restoring TLS segments so -diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c -index 5d2e2e9af1c4..1c9cc74ba99b 100644 ---- a/arch/x86/kernel/signal.c -+++ b/arch/x86/kernel/signal.c -@@ -726,6 +726,14 @@ do_notify_resume(struct pt_regs *regs, void *unused, __u32 thread_info_flags) +diff -Nur linux-4.1.39.orig/arch/x86/kernel/signal.c linux-4.1.39/arch/x86/kernel/signal.c +--- linux-4.1.39.orig/arch/x86/kernel/signal.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/x86/kernel/signal.c 2017-04-18 17:56:30.569395424 +0200 +@@ -726,6 +726,14 @@ { user_exit(); @@ -5007,11 +4635,10 @@ index 5d2e2e9af1c4..1c9cc74ba99b 100644 if (thread_info_flags & _TIF_UPROBE) uprobe_notify_resume(regs); -diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c -index 7dd9a8d3911a..192de5908083 100644 ---- a/arch/x86/kvm/lapic.c -+++ b/arch/x86/kvm/lapic.c -@@ -1106,7 +1106,7 @@ static void apic_update_lvtt(struct kvm_lapic *apic) +diff -Nur linux-4.1.39.orig/arch/x86/kvm/lapic.c linux-4.1.39/arch/x86/kvm/lapic.c +--- linux-4.1.39.orig/arch/x86/kvm/lapic.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/x86/kvm/lapic.c 2017-04-18 17:56:30.569395424 +0200 +@@ -1106,7 +1106,7 @@ static void apic_timer_expired(struct kvm_lapic *apic) { struct kvm_vcpu *vcpu = apic->vcpu; @@ -5020,7 +4647,7 @@ index 7dd9a8d3911a..192de5908083 100644 struct kvm_timer *ktimer = &apic->lapic_timer; if (atomic_read(&apic->lapic_timer.pending)) -@@ -1115,8 +1115,8 @@ static void apic_timer_expired(struct kvm_lapic *apic) +@@ -1115,8 +1115,8 @@ atomic_inc(&apic->lapic_timer.pending); kvm_set_pending_timer(vcpu); @@ -5031,7 +4658,7 @@ index 7dd9a8d3911a..192de5908083 100644 if (apic_lvtt_tscdeadline(apic)) ktimer->expired_tscdeadline = ktimer->tscdeadline; -@@ -1169,8 +1169,36 @@ void wait_lapic_expire(struct kvm_vcpu *vcpu) +@@ -1169,8 +1169,36 @@ __delay(tsc_deadline - guest_tsc); } @@ -5068,7 +4695,7 @@ index 7dd9a8d3911a..192de5908083 100644 ktime_t now; atomic_set(&apic->lapic_timer.pending, 0); -@@ -1201,9 +1229,11 @@ static void start_apic_timer(struct kvm_lapic *apic) +@@ -1201,9 +1229,11 @@ } } @@ -5081,7 +4708,7 @@ index 7dd9a8d3911a..192de5908083 100644 apic_debug("%s: bus cycle is %" PRId64 "ns, now 0x%016" PRIx64 ", " -@@ -1235,8 +1265,10 @@ static void start_apic_timer(struct kvm_lapic *apic) +@@ -1235,8 +1265,10 @@ do_div(ns, this_tsc_khz); expire = ktime_add_ns(now, ns); expire = ktime_sub_ns(expire, lapic_timer_advance_ns); @@ -5093,7 +4720,7 @@ index 7dd9a8d3911a..192de5908083 100644 } else apic_timer_expired(apic); -@@ -1709,6 +1741,7 @@ int kvm_create_lapic(struct kvm_vcpu *vcpu) +@@ -1709,6 +1741,7 @@ hrtimer_init(&apic->lapic_timer.timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS); apic->lapic_timer.timer.function = apic_timer_fn; @@ -5101,7 +4728,7 @@ index 7dd9a8d3911a..192de5908083 100644 /* * APIC is created enabled. This will prevent kvm_lapic_set_base from -@@ -1836,7 +1869,8 @@ void __kvm_migrate_apic_timer(struct kvm_vcpu *vcpu) +@@ -1836,7 +1869,8 @@ timer = &vcpu->arch.apic->lapic_timer.timer; if (hrtimer_cancel(timer)) @@ -5111,11 +4738,10 @@ index 7dd9a8d3911a..192de5908083 100644 } /* -diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c -index bd84d2226ca1..ba639dd5f09d 100644 ---- a/arch/x86/kvm/x86.c -+++ b/arch/x86/kvm/x86.c -@@ -5815,6 +5815,13 @@ int kvm_arch_init(void *opaque) +diff -Nur linux-4.1.39.orig/arch/x86/kvm/x86.c linux-4.1.39/arch/x86/kvm/x86.c +--- linux-4.1.39.orig/arch/x86/kvm/x86.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/x86/kvm/x86.c 2017-04-18 17:56:30.569395424 +0200 +@@ -5837,6 +5837,13 @@ goto out; } @@ -5129,11 +4755,10 @@ index bd84d2226ca1..ba639dd5f09d 100644 r = kvm_mmu_module_init(); if (r) goto out_free_percpu; -diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c -index e2f5e21c03b3..91d93b95bd86 100644 ---- a/arch/x86/lib/usercopy_32.c -+++ b/arch/x86/lib/usercopy_32.c -@@ -647,7 +647,8 @@ EXPORT_SYMBOL(__copy_from_user_ll_nocache_nozero); +diff -Nur linux-4.1.39.orig/arch/x86/lib/usercopy_32.c linux-4.1.39/arch/x86/lib/usercopy_32.c +--- linux-4.1.39.orig/arch/x86/lib/usercopy_32.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/x86/lib/usercopy_32.c 2017-04-18 17:56:30.573395579 +0200 +@@ -647,7 +647,8 @@ * @from: Source address, in kernel space. * @n: Number of bytes to copy. * @@ -5143,7 +4768,7 @@ index e2f5e21c03b3..91d93b95bd86 100644 * * Copy data from kernel space to user space. * -@@ -668,7 +669,8 @@ EXPORT_SYMBOL(_copy_to_user); +@@ -668,7 +669,8 @@ * @from: Source address, in user space. * @n: Number of bytes to copy. * @@ -5153,10 +4778,9 @@ index e2f5e21c03b3..91d93b95bd86 100644 * * Copy data from user space to kernel space. * -diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c -index 62855ac37ab7..1d3beaf7526f 100644 ---- a/arch/x86/mm/fault.c -+++ b/arch/x86/mm/fault.c +diff -Nur linux-4.1.39.orig/arch/x86/mm/fault.c linux-4.1.39/arch/x86/mm/fault.c +--- linux-4.1.39.orig/arch/x86/mm/fault.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/x86/mm/fault.c 2017-04-18 17:56:30.573395579 +0200 @@ -13,6 +13,7 @@ #include <linux/hugetlb.h> /* hstate_index_to_shift */ #include <linux/prefetch.h> /* prefetchw */ @@ -5165,7 +4789,7 @@ index 62855ac37ab7..1d3beaf7526f 100644 #include <asm/traps.h> /* dotraplinkage, ... */ #include <asm/pgalloc.h> /* pgd_*(), ... */ -@@ -1133,9 +1134,9 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code, +@@ -1133,9 +1134,9 @@ /* * If we're in an interrupt, have no user context or are running @@ -5177,11 +4801,10 @@ index 62855ac37ab7..1d3beaf7526f 100644 bad_area_nosemaphore(regs, error_code, address); return; } -diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c -index 4500142bc4aa..0d1cbcf47f80 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.1.39.orig/arch/x86/mm/highmem_32.c linux-4.1.39/arch/x86/mm/highmem_32.c +--- linux-4.1.39.orig/arch/x86/mm/highmem_32.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/x86/mm/highmem_32.c 2017-04-18 17:56:30.573395579 +0200 +@@ -32,10 +32,11 @@ */ void *kmap_atomic_prot(struct page *page, pgprot_t prot) { @@ -5194,7 +4817,7 @@ index 4500142bc4aa..0d1cbcf47f80 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))); @@ -5206,7 +4829,7 @@ index 4500142bc4aa..0d1cbcf47f80 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. */ @@ -5216,7 +4839,7 @@ index 4500142bc4aa..0d1cbcf47f80 100644 kpte_clear_flush(kmap_pte-idx, vaddr); kmap_atomic_idx_pop(); arch_flush_lazy_mmu_mode(); -@@ -100,6 +107,7 @@ void __kunmap_atomic(void *kvaddr) +@@ -100,6 +107,7 @@ #endif pagefault_enable(); @@ -5224,11 +4847,10 @@ index 4500142bc4aa..0d1cbcf47f80 100644 } EXPORT_SYMBOL(__kunmap_atomic); -diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c -index 9ca35fc60cfe..b2ffa5c7d3d3 100644 ---- a/arch/x86/mm/iomap_32.c -+++ b/arch/x86/mm/iomap_32.c -@@ -56,15 +56,22 @@ EXPORT_SYMBOL_GPL(iomap_free); +diff -Nur linux-4.1.39.orig/arch/x86/mm/iomap_32.c linux-4.1.39/arch/x86/mm/iomap_32.c +--- linux-4.1.39.orig/arch/x86/mm/iomap_32.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/x86/mm/iomap_32.c 2017-04-18 17:56:30.573395579 +0200 +@@ -56,15 +56,22 @@ void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot) { @@ -5252,7 +4874,7 @@ index 9ca35fc60cfe..b2ffa5c7d3d3 100644 arch_flush_lazy_mmu_mode(); return (void *)vaddr; -@@ -112,10 +119,14 @@ iounmap_atomic(void __iomem *kvaddr) +@@ -112,10 +119,14 @@ * is a bad idea also, in case the page changes cacheability * attributes or becomes a protected page in a hypervisor. */ @@ -5267,11 +4889,29 @@ index 9ca35fc60cfe..b2ffa5c7d3d3 100644 + preempt_enable(); } EXPORT_SYMBOL_GPL(iounmap_atomic); -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.1.39.orig/arch/x86/mm/pageattr.c linux-4.1.39/arch/x86/mm/pageattr.c +--- linux-4.1.39.orig/arch/x86/mm/pageattr.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/x86/mm/pageattr.c 2017-04-18 17:56:30.573395579 +0200 +@@ -209,7 +209,15 @@ + int in_flags, struct page **pages) + { + unsigned int i, level; ++#ifdef CONFIG_PREEMPT ++ /* ++ * Avoid wbinvd() because it causes latencies on all CPUs, ++ * regardless of any CPU isolation that may be in effect. ++ */ ++ unsigned long do_wbinvd = 0; ++#else + unsigned long do_wbinvd = cache && numpages >= 1024; /* 4M threshold */ ++#endif + + BUG_ON(irqs_disabled()); + +diff -Nur linux-4.1.39.orig/arch/x86/platform/uv/tlb_uv.c linux-4.1.39/arch/x86/platform/uv/tlb_uv.c +--- linux-4.1.39.orig/arch/x86/platform/uv/tlb_uv.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/x86/platform/uv/tlb_uv.c 2017-04-18 17:56:30.573395579 +0200 +@@ -714,9 +714,9 @@ quiesce_local_uvhub(hmaster); @@ -5283,7 +4923,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); @@ -5295,7 +4935,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; @@ -5304,7 +4944,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 @@ } } } @@ -5313,7 +4953,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) { @@ -5322,7 +4962,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; @@ -5331,7 +4971,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; } } @@ -5344,7 +4984,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; @@ -5357,11 +4997,10 @@ index 3b6ec42718e4..7871083de089 100644 } } -diff --git a/arch/x86/platform/uv/uv_time.c b/arch/x86/platform/uv/uv_time.c -index a244237f3cfa..a718fe0d2e73 100644 ---- a/arch/x86/platform/uv/uv_time.c -+++ b/arch/x86/platform/uv/uv_time.c -@@ -58,7 +58,7 @@ static DEFINE_PER_CPU(struct clock_event_device, cpu_ced); +diff -Nur linux-4.1.39.orig/arch/x86/platform/uv/uv_time.c linux-4.1.39/arch/x86/platform/uv/uv_time.c +--- linux-4.1.39.orig/arch/x86/platform/uv/uv_time.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/x86/platform/uv/uv_time.c 2017-04-18 17:56:30.573395579 +0200 +@@ -58,7 +58,7 @@ /* There is one of these allocated per node */ struct uv_rtc_timer_head { @@ -5370,7 +5009,7 @@ index a244237f3cfa..a718fe0d2e73 100644 /* next cpu waiting for timer, local node relative: */ int next_cpu; /* number of cpus on this node: */ -@@ -178,7 +178,7 @@ static __init int uv_rtc_allocate_timers(void) +@@ -178,7 +178,7 @@ uv_rtc_deallocate_timers(); return -ENOMEM; } @@ -5379,7 +5018,7 @@ index a244237f3cfa..a718fe0d2e73 100644 head->ncpus = uv_blade_nr_possible_cpus(bid); head->next_cpu = -1; blade_info[bid] = head; -@@ -232,7 +232,7 @@ static int uv_rtc_set_timer(int cpu, u64 expires) +@@ -232,7 +232,7 @@ unsigned long flags; int next_cpu; @@ -5388,7 +5027,7 @@ index a244237f3cfa..a718fe0d2e73 100644 next_cpu = head->next_cpu; *t = expires; -@@ -244,12 +244,12 @@ static int uv_rtc_set_timer(int cpu, u64 expires) +@@ -244,12 +244,12 @@ if (uv_setup_intr(cpu, expires)) { *t = ULLONG_MAX; uv_rtc_find_next_timer(head, pnode); @@ -5403,7 +5042,7 @@ index a244237f3cfa..a718fe0d2e73 100644 return 0; } -@@ -268,7 +268,7 @@ static int uv_rtc_unset_timer(int cpu, int force) +@@ -268,7 +268,7 @@ unsigned long flags; int rc = 0; @@ -5412,7 +5051,7 @@ index a244237f3cfa..a718fe0d2e73 100644 if ((head->next_cpu == bcpu && uv_read_rtc(NULL) >= *t) || force) rc = 1; -@@ -280,7 +280,7 @@ static int uv_rtc_unset_timer(int cpu, int force) +@@ -280,7 +280,7 @@ uv_rtc_find_next_timer(head, pnode); } @@ -5421,7 +5060,7 @@ index a244237f3cfa..a718fe0d2e73 100644 return rc; } -@@ -300,13 +300,18 @@ static int uv_rtc_unset_timer(int cpu, int force) +@@ -300,13 +300,18 @@ static cycle_t uv_read_rtc(struct clocksource *cs) { unsigned long offset; @@ -5441,10 +5080,9 @@ index a244237f3cfa..a718fe0d2e73 100644 } /* -diff --git a/arch/xtensa/mm/fault.c b/arch/xtensa/mm/fault.c -index 9e3571a6535c..83a44a33cfa1 100644 ---- a/arch/xtensa/mm/fault.c -+++ b/arch/xtensa/mm/fault.c +diff -Nur linux-4.1.39.orig/arch/xtensa/mm/fault.c linux-4.1.39/arch/xtensa/mm/fault.c +--- linux-4.1.39.orig/arch/xtensa/mm/fault.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/xtensa/mm/fault.c 2017-04-18 17:56:30.573395579 +0200 @@ -15,10 +15,10 @@ #include <linux/mm.h> #include <linux/module.h> @@ -5457,7 +5095,7 @@ index 9e3571a6535c..83a44a33cfa1 100644 #include <asm/pgalloc.h> DEFINE_PER_CPU(unsigned long, asid_cache) = ASID_USER_FIRST; -@@ -57,7 +57,7 @@ void do_page_fault(struct pt_regs *regs) +@@ -57,7 +57,7 @@ /* If we're in an interrupt or have no user * context, we must not take the fault.. */ @@ -5466,11 +5104,10 @@ index 9e3571a6535c..83a44a33cfa1 100644 bad_page_fault(regs, address, SIGSEGV); return; } -diff --git a/arch/xtensa/mm/highmem.c b/arch/xtensa/mm/highmem.c -index 8cfb71ec0937..184ceadccc1a 100644 ---- a/arch/xtensa/mm/highmem.c -+++ b/arch/xtensa/mm/highmem.c -@@ -42,6 +42,7 @@ void *kmap_atomic(struct page *page) +diff -Nur linux-4.1.39.orig/arch/xtensa/mm/highmem.c linux-4.1.39/arch/xtensa/mm/highmem.c +--- linux-4.1.39.orig/arch/xtensa/mm/highmem.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/arch/xtensa/mm/highmem.c 2017-04-18 17:56:30.573395579 +0200 +@@ -42,6 +42,7 @@ enum fixed_addresses idx; unsigned long vaddr; @@ -5478,7 +5115,7 @@ index 8cfb71ec0937..184ceadccc1a 100644 pagefault_disable(); if (!PageHighMem(page)) return page_address(page); -@@ -79,6 +80,7 @@ void __kunmap_atomic(void *kvaddr) +@@ -79,6 +80,7 @@ } pagefault_enable(); @@ -5486,11 +5123,10 @@ index 8cfb71ec0937..184ceadccc1a 100644 } EXPORT_SYMBOL(__kunmap_atomic); -diff --git a/block/blk-core.c b/block/blk-core.c -index bbbf36e6066b..24935f6ca5bb 100644 ---- a/block/blk-core.c -+++ b/block/blk-core.c -@@ -100,6 +100,9 @@ void blk_rq_init(struct request_queue *q, struct request *rq) +diff -Nur linux-4.1.39.orig/block/blk-core.c linux-4.1.39/block/blk-core.c +--- linux-4.1.39.orig/block/blk-core.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/block/blk-core.c 2017-04-18 17:56:30.573395579 +0200 +@@ -100,6 +100,9 @@ INIT_LIST_HEAD(&rq->queuelist); INIT_LIST_HEAD(&rq->timeout_list); @@ -5500,7 +5136,7 @@ index bbbf36e6066b..24935f6ca5bb 100644 rq->cpu = -1; rq->q = q; rq->__sector = (sector_t) -1; -@@ -194,7 +197,7 @@ EXPORT_SYMBOL(blk_delay_queue); +@@ -194,7 +197,7 @@ **/ void blk_start_queue(struct request_queue *q) { @@ -5509,7 +5145,7 @@ index bbbf36e6066b..24935f6ca5bb 100644 queue_flag_clear(QUEUE_FLAG_STOPPED, q); __blk_run_queue(q); -@@ -663,7 +666,7 @@ struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id) +@@ -663,7 +666,7 @@ q->bypass_depth = 1; __set_bit(QUEUE_FLAG_BYPASS, &q->queue_flags); @@ -5518,7 +5154,7 @@ index bbbf36e6066b..24935f6ca5bb 100644 if (blkcg_init_queue(q)) goto fail_bdi; -@@ -3079,7 +3082,7 @@ static void queue_unplugged(struct request_queue *q, unsigned int depth, +@@ -3079,7 +3082,7 @@ blk_run_queue_async(q); else __blk_run_queue(q); @@ -5527,7 +5163,7 @@ index bbbf36e6066b..24935f6ca5bb 100644 } static void flush_plug_callbacks(struct blk_plug *plug, bool from_schedule) -@@ -3127,7 +3130,6 @@ EXPORT_SYMBOL(blk_check_plugged); +@@ -3127,7 +3130,6 @@ void blk_flush_plug_list(struct blk_plug *plug, bool from_schedule) { struct request_queue *q; @@ -5535,7 +5171,7 @@ index bbbf36e6066b..24935f6ca5bb 100644 struct request *rq; LIST_HEAD(list); unsigned int depth; -@@ -3147,11 +3149,6 @@ void blk_flush_plug_list(struct blk_plug *plug, bool from_schedule) +@@ -3147,11 +3149,6 @@ q = NULL; depth = 0; @@ -5547,7 +5183,7 @@ index bbbf36e6066b..24935f6ca5bb 100644 while (!list_empty(&list)) { rq = list_entry_rq(list.next); list_del_init(&rq->queuelist); -@@ -3164,7 +3161,7 @@ void blk_flush_plug_list(struct blk_plug *plug, bool from_schedule) +@@ -3164,7 +3161,7 @@ queue_unplugged(q, depth, from_schedule); q = rq->q; depth = 0; @@ -5556,7 +5192,7 @@ index bbbf36e6066b..24935f6ca5bb 100644 } /* -@@ -3191,8 +3188,6 @@ void blk_flush_plug_list(struct blk_plug *plug, bool from_schedule) +@@ -3191,8 +3188,6 @@ */ if (q) queue_unplugged(q, depth, from_schedule); @@ -5565,10 +5201,9 @@ index bbbf36e6066b..24935f6ca5bb 100644 } void blk_finish_plug(struct blk_plug *plug) -diff --git a/block/blk-ioc.c b/block/blk-ioc.c -index 1a27f45ec776..28f467e636cc 100644 ---- a/block/blk-ioc.c -+++ b/block/blk-ioc.c +diff -Nur linux-4.1.39.orig/block/blk-ioc.c linux-4.1.39/block/blk-ioc.c +--- linux-4.1.39.orig/block/blk-ioc.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/block/blk-ioc.c 2017-04-18 17:56:30.573395579 +0200 @@ -7,6 +7,7 @@ #include <linux/bio.h> #include <linux/blkdev.h> @@ -5577,7 +5212,7 @@ index 1a27f45ec776..28f467e636cc 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); @@ -5586,7 +5221,7 @@ index 1a27f45ec776..28f467e636cc 100644 spin_lock_irqsave_nested(&ioc->lock, flags, 1); } } -@@ -187,7 +188,7 @@ retry: +@@ -187,7 +188,7 @@ spin_unlock(icq->q->queue_lock); } else { spin_unlock_irqrestore(&ioc->lock, flags); @@ -5595,11 +5230,10 @@ index 1a27f45ec776..28f467e636cc 100644 goto retry; } } -diff --git a/block/blk-iopoll.c b/block/blk-iopoll.c -index 0736729d6494..3e21e31d0d7e 100644 ---- a/block/blk-iopoll.c -+++ b/block/blk-iopoll.c -@@ -35,6 +35,7 @@ void blk_iopoll_sched(struct blk_iopoll *iop) +diff -Nur linux-4.1.39.orig/block/blk-iopoll.c linux-4.1.39/block/blk-iopoll.c +--- linux-4.1.39.orig/block/blk-iopoll.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/block/blk-iopoll.c 2017-04-18 17:56:30.573395579 +0200 +@@ -35,6 +35,7 @@ list_add_tail(&iop->list, this_cpu_ptr(&blk_cpu_iopoll)); __raise_softirq_irqoff(BLOCK_IOPOLL_SOFTIRQ); local_irq_restore(flags); @@ -5607,7 +5241,7 @@ index 0736729d6494..3e21e31d0d7e 100644 } EXPORT_SYMBOL(blk_iopoll_sched); -@@ -132,6 +133,7 @@ static void blk_iopoll_softirq(struct softirq_action *h) +@@ -132,6 +133,7 @@ __raise_softirq_irqoff(BLOCK_IOPOLL_SOFTIRQ); local_irq_enable(); @@ -5615,7 +5249,7 @@ index 0736729d6494..3e21e31d0d7e 100644 } /** -@@ -201,6 +203,7 @@ static int blk_iopoll_cpu_notify(struct notifier_block *self, +@@ -201,6 +203,7 @@ this_cpu_ptr(&blk_cpu_iopoll)); __raise_softirq_irqoff(BLOCK_IOPOLL_SOFTIRQ); local_irq_enable(); @@ -5623,66 +5257,10 @@ index 0736729d6494..3e21e31d0d7e 100644 } return NOTIFY_OK; -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(¬ifier->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(¬ifier->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 2dc1fd6c5bdb..c473bd192a41 100644 ---- a/block/blk-mq.c -+++ b/block/blk-mq.c -@@ -88,7 +88,7 @@ static int blk_mq_queue_enter(struct request_queue *q, gfp_t gfp) +diff -Nur linux-4.1.39.orig/block/blk-mq.c linux-4.1.39/block/blk-mq.c +--- linux-4.1.39.orig/block/blk-mq.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/block/blk-mq.c 2017-04-18 17:56:30.573395579 +0200 +@@ -88,7 +88,7 @@ if (!(gfp & __GFP_WAIT)) return -EBUSY; @@ -5691,7 +5269,7 @@ index 2dc1fd6c5bdb..c473bd192a41 100644 !q->mq_freeze_depth || blk_queue_dying(q)); if (blk_queue_dying(q)) return -ENODEV; -@@ -107,7 +107,7 @@ static void blk_mq_usage_counter_release(struct percpu_ref *ref) +@@ -107,7 +107,7 @@ struct request_queue *q = container_of(ref, struct request_queue, mq_usage_counter); @@ -5700,7 +5278,7 @@ index 2dc1fd6c5bdb..c473bd192a41 100644 } void blk_mq_freeze_queue_start(struct request_queue *q) -@@ -127,7 +127,7 @@ EXPORT_SYMBOL_GPL(blk_mq_freeze_queue_start); +@@ -127,7 +127,7 @@ static void blk_mq_freeze_queue_wait(struct request_queue *q) { @@ -5709,7 +5287,7 @@ index 2dc1fd6c5bdb..c473bd192a41 100644 } /* -@@ -151,7 +151,7 @@ void blk_mq_unfreeze_queue(struct request_queue *q) +@@ -151,7 +151,7 @@ spin_unlock_irq(q->queue_lock); if (wake) { percpu_ref_reinit(&q->mq_usage_counter); @@ -5718,7 +5296,7 @@ index 2dc1fd6c5bdb..c473bd192a41 100644 } } EXPORT_SYMBOL_GPL(blk_mq_unfreeze_queue); -@@ -170,7 +170,7 @@ void blk_mq_wake_waiters(struct request_queue *q) +@@ -170,7 +170,7 @@ * dying, we need to ensure that processes currently waiting on * the queue are notified as well. */ @@ -5727,7 +5305,7 @@ index 2dc1fd6c5bdb..c473bd192a41 100644 } bool blk_mq_can_queue(struct blk_mq_hw_ctx *hctx) -@@ -217,6 +217,9 @@ static void blk_mq_rq_ctx_init(struct request_queue *q, struct blk_mq_ctx *ctx, +@@ -217,6 +217,9 @@ rq->resid_len = 0; rq->sense = NULL; @@ -5737,7 +5315,7 @@ index 2dc1fd6c5bdb..c473bd192a41 100644 INIT_LIST_HEAD(&rq->timeout_list); rq->timeout = 0; -@@ -346,6 +349,17 @@ void blk_mq_end_request(struct request *rq, int error) +@@ -346,6 +349,17 @@ } EXPORT_SYMBOL(blk_mq_end_request); @@ -5755,7 +5333,7 @@ index 2dc1fd6c5bdb..c473bd192a41 100644 static void __blk_mq_complete_request_remote(void *data) { struct request *rq = data; -@@ -353,6 +367,8 @@ static void __blk_mq_complete_request_remote(void *data) +@@ -353,6 +367,8 @@ rq->q->softirq_done_fn(rq); } @@ -5764,7 +5342,7 @@ index 2dc1fd6c5bdb..c473bd192a41 100644 static void blk_mq_ipi_complete_request(struct request *rq) { struct blk_mq_ctx *ctx = rq->mq_ctx; -@@ -364,19 +380,23 @@ static void blk_mq_ipi_complete_request(struct request *rq) +@@ -364,19 +380,23 @@ return; } @@ -5790,7 +5368,7 @@ index 2dc1fd6c5bdb..c473bd192a41 100644 } void __blk_mq_complete_request(struct request *rq) -@@ -905,14 +925,14 @@ void blk_mq_run_hw_queue(struct blk_mq_hw_ctx *hctx, bool async) +@@ -905,14 +925,14 @@ return; if (!async) { @@ -5808,7 +5386,7 @@ index 2dc1fd6c5bdb..c473bd192a41 100644 } kblockd_schedule_delayed_work_on(blk_mq_hctx_next_cpu(hctx), -@@ -1589,7 +1609,7 @@ static int blk_mq_hctx_notify(void *data, unsigned long action, +@@ -1589,7 +1609,7 @@ { struct blk_mq_hw_ctx *hctx = data; @@ -5817,11 +5395,64 @@ index 2dc1fd6c5bdb..c473bd192a41 100644 return blk_mq_hctx_cpu_offline(hctx, cpu); /* -diff --git a/block/blk-mq.h b/block/blk-mq.h -index 6a48c4c0d8a2..4b7cbf0e6e82 100644 ---- a/block/blk-mq.h -+++ b/block/blk-mq.h -@@ -76,7 +76,10 @@ struct blk_align_bitmap { +diff -Nur linux-4.1.39.orig/block/blk-mq-cpu.c linux-4.1.39/block/blk-mq-cpu.c +--- linux-4.1.39.orig/block/blk-mq-cpu.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/block/blk-mq-cpu.c 2017-04-18 17:56:30.573395579 +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(¬ifier->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(¬ifier->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.1.39.orig/block/blk-mq.h linux-4.1.39/block/blk-mq.h +--- linux-4.1.39.orig/block/blk-mq.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/block/blk-mq.h 2017-04-18 17:56:30.573395579 +0200 +@@ -76,7 +76,10 @@ static inline struct blk_mq_ctx *__blk_mq_get_ctx(struct request_queue *q, unsigned int cpu) { @@ -5833,7 +5464,7 @@ index 6a48c4c0d8a2..4b7cbf0e6e82 100644 } /* -@@ -87,12 +90,12 @@ static inline struct blk_mq_ctx *__blk_mq_get_ctx(struct request_queue *q, +@@ -87,12 +90,12 @@ */ static inline struct blk_mq_ctx *blk_mq_get_ctx(struct request_queue *q) { @@ -5848,11 +5479,10 @@ index 6a48c4c0d8a2..4b7cbf0e6e82 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.1.39.orig/block/blk-softirq.c linux-4.1.39/block/blk-softirq.c +--- linux-4.1.39.orig/block/blk-softirq.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/block/blk-softirq.c 2017-04-18 17:56:30.573395579 +0200 +@@ -51,6 +51,7 @@ raise_softirq_irqoff(BLOCK_SOFTIRQ); local_irq_restore(flags); @@ -5860,7 +5490,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(); @@ -5868,7 +5498,7 @@ index 53b1737e978d..81c3c0a62edf 100644 } return NOTIFY_OK; -@@ -150,6 +152,7 @@ do_local: +@@ -150,6 +152,7 @@ goto do_local; local_irq_restore(flags); @@ -5876,11 +5506,10 @@ index 53b1737e978d..81c3c0a62edf 100644 } /** -diff --git a/block/bounce.c b/block/bounce.c -index ed9dd8067120..39d123e0a989 100644 ---- a/block/bounce.c -+++ b/block/bounce.c -@@ -54,11 +54,11 @@ static void bounce_copy_vec(struct bio_vec *to, unsigned char *vfrom) +diff -Nur linux-4.1.39.orig/block/bounce.c linux-4.1.39/block/bounce.c +--- linux-4.1.39.orig/block/bounce.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/block/bounce.c 2017-04-18 17:56:30.573395579 +0200 +@@ -54,11 +54,11 @@ unsigned long flags; unsigned char *vto; @@ -5894,11 +5523,10 @@ index ed9dd8067120..39d123e0a989 100644 } #else /* CONFIG_HIGHMEM */ -diff --git a/crypto/algapi.c b/crypto/algapi.c -index dda720c6ab08..1629b110dabd 100644 ---- a/crypto/algapi.c -+++ b/crypto/algapi.c -@@ -695,13 +695,13 @@ EXPORT_SYMBOL_GPL(crypto_spawn_tfm2); +diff -Nur linux-4.1.39.orig/crypto/algapi.c linux-4.1.39/crypto/algapi.c +--- linux-4.1.39.orig/crypto/algapi.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/crypto/algapi.c 2017-04-18 17:56:30.573395579 +0200 +@@ -696,13 +696,13 @@ int crypto_register_notifier(struct notifier_block *nb) { @@ -5914,11 +5542,10 @@ index dda720c6ab08..1629b110dabd 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.1.39.orig/crypto/api.c linux-4.1.39/crypto/api.c +--- linux-4.1.39.orig/crypto/api.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/crypto/api.c 2017-04-18 17:56:30.573395579 +0200 +@@ -31,7 +31,7 @@ DECLARE_RWSEM(crypto_alg_sem); EXPORT_SYMBOL_GPL(crypto_alg_sem); @@ -5927,7 +5554,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; @@ -5940,11 +5567,10 @@ index bbc147cb5dec..bc1a848f02ec 100644 } return ok; -diff --git a/crypto/internal.h b/crypto/internal.h -index bd39bfc92eab..a5db167cba84 100644 ---- a/crypto/internal.h -+++ b/crypto/internal.h -@@ -48,7 +48,7 @@ struct crypto_larval { +diff -Nur linux-4.1.39.orig/crypto/internal.h linux-4.1.39/crypto/internal.h +--- linux-4.1.39.orig/crypto/internal.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/crypto/internal.h 2017-04-18 17:56:30.573395579 +0200 +@@ -48,7 +48,7 @@ extern struct list_head crypto_alg_list; extern struct rw_semaphore crypto_alg_sem; @@ -5953,7 +5579,7 @@ index bd39bfc92eab..a5db167cba84 100644 #ifdef CONFIG_PROC_FS void __init crypto_init_proc(void); -@@ -142,7 +142,7 @@ static inline int crypto_is_moribund(struct crypto_alg *alg) +@@ -142,7 +142,7 @@ static inline void crypto_notify(unsigned long val, void *v) { @@ -5962,11 +5588,291 @@ index bd39bfc92eab..a5db167cba84 100644 } #endif /* _CRYPTO_INTERNAL_H */ -diff --git a/drivers/acpi/acpica/acglobal.h b/drivers/acpi/acpica/acglobal.h -index a0c478784314..166ee955405f 100644 ---- a/drivers/acpi/acpica/acglobal.h -+++ b/drivers/acpi/acpica/acglobal.h -@@ -112,7 +112,7 @@ ACPI_GLOBAL(u8, acpi_gbl_global_lock_pending); +diff -Nur linux-4.1.39.orig/Documentation/hwlat_detector.txt linux-4.1.39/Documentation/hwlat_detector.txt +--- linux-4.1.39.orig/Documentation/hwlat_detector.txt 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.39/Documentation/hwlat_detector.txt 2017-04-18 17:56:30.545394493 +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.1.39.orig/Documentation/sysrq.txt linux-4.1.39/Documentation/sysrq.txt +--- linux-4.1.39.orig/Documentation/sysrq.txt 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/Documentation/sysrq.txt 2017-04-18 17:56:30.545394493 +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.1.39.orig/Documentation/trace/histograms.txt linux-4.1.39/Documentation/trace/histograms.txt +--- linux-4.1.39.orig/Documentation/trace/histograms.txt 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.39/Documentation/trace/histograms.txt 2017-04-18 17:56:30.545394493 +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.1.39.orig/drivers/acpi/acpica/acglobal.h linux-4.1.39/drivers/acpi/acpica/acglobal.h +--- linux-4.1.39.orig/drivers/acpi/acpica/acglobal.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/acpi/acpica/acglobal.h 2017-04-18 17:56:30.573395579 +0200 +@@ -112,7 +112,7 @@ * interrupt level */ ACPI_GLOBAL(acpi_spinlock, acpi_gbl_gpe_lock); /* For GPE data structs and registers */ @@ -5975,11 +5881,10 @@ index a0c478784314..166ee955405f 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 3cf77afd142c..dc32e72132f1 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.1.39.orig/drivers/acpi/acpica/hwregs.c linux-4.1.39/drivers/acpi/acpica/hwregs.c +--- linux-4.1.39.orig/drivers/acpi/acpica/hwregs.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/acpi/acpica/hwregs.c 2017-04-18 17:56:30.573395579 +0200 +@@ -269,14 +269,14 @@ ACPI_BITMASK_ALL_FIXED_STATUS, ACPI_FORMAT_UINT64(acpi_gbl_xpm1a_status.address))); @@ -5996,11 +5901,10 @@ index 3cf77afd142c..dc32e72132f1 100644 if (ACPI_FAILURE(status)) { goto exit; -diff --git a/drivers/acpi/acpica/hwxface.c b/drivers/acpi/acpica/hwxface.c -index 5f97468df8ff..8c017f15da7d 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.1.39.orig/drivers/acpi/acpica/hwxface.c linux-4.1.39/drivers/acpi/acpica/hwxface.c +--- linux-4.1.39.orig/drivers/acpi/acpica/hwxface.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/acpi/acpica/hwxface.c 2017-04-18 17:56:30.577395735 +0200 +@@ -374,7 +374,7 @@ return_ACPI_STATUS(AE_BAD_PARAMETER); } @@ -6009,7 +5913,7 @@ index 5f97468df8ff..8c017f15da7d 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: @@ -6018,11 +5922,10 @@ index 5f97468df8ff..8c017f15da7d 100644 return_ACPI_STATUS(status); } -diff --git a/drivers/acpi/acpica/utmutex.c b/drivers/acpi/acpica/utmutex.c -index 37b8b58fcd56..938795507d87 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.1.39.orig/drivers/acpi/acpica/utmutex.c linux-4.1.39/drivers/acpi/acpica/utmutex.c +--- linux-4.1.39.orig/drivers/acpi/acpica/utmutex.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/acpi/acpica/utmutex.c 2017-04-18 17:56:30.577395735 +0200 +@@ -88,7 +88,7 @@ return_ACPI_STATUS (status); } @@ -6031,7 +5934,7 @@ index 37b8b58fcd56..938795507d87 100644 if (ACPI_FAILURE (status)) { return_ACPI_STATUS (status); } -@@ -141,7 +141,7 @@ void acpi_ut_mutex_terminate(void) +@@ -141,7 +141,7 @@ /* Delete the spinlocks */ acpi_os_delete_lock(acpi_gbl_gpe_lock); @@ -6040,11 +5943,10 @@ index 37b8b58fcd56..938795507d87 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 7dbba387d12a..65beb7abb4e7 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.1.39.orig/drivers/ata/libata-sff.c linux-4.1.39/drivers/ata/libata-sff.c +--- linux-4.1.39.orig/drivers/ata/libata-sff.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/ata/libata-sff.c 2017-04-18 17:56:30.577395735 +0200 +@@ -678,9 +678,9 @@ unsigned long flags; unsigned int consumed; @@ -6056,7 +5958,7 @@ index 7dbba387d12a..65beb7abb4e7 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 */ @@ -6065,7 +5967,7 @@ index 7dbba387d12a..65beb7abb4e7 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); @@ -6074,7 +5976,7 @@ index 7dbba387d12a..65beb7abb4e7 100644 } else { buf = page_address(page); ap->ops->sff_data_xfer(qc->dev, buf + offset, qc->sect_size, -@@ -864,7 +864,7 @@ next_sg: +@@ -864,7 +864,7 @@ unsigned long flags; /* FIXME: use bounce buffer */ @@ -6083,7 +5985,7 @@ index 7dbba387d12a..65beb7abb4e7 100644 buf = kmap_atomic(page); /* do the actual data transfer */ -@@ -872,7 +872,7 @@ next_sg: +@@ -872,7 +872,7 @@ count, rw); kunmap_atomic(buf); @@ -6092,11 +5994,10 @@ index 7dbba387d12a..65beb7abb4e7 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 6e134f4759c0..d2782d492630 100644 ---- a/drivers/block/zram/zram_drv.c -+++ b/drivers/block/zram/zram_drv.c -@@ -386,6 +386,8 @@ static struct zram_meta *zram_meta_alloc(int device_id, u64 disksize) +diff -Nur linux-4.1.39.orig/drivers/block/zram/zram_drv.c linux-4.1.39/drivers/block/zram/zram_drv.c +--- linux-4.1.39.orig/drivers/block/zram/zram_drv.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/block/zram/zram_drv.c 2017-04-18 17:56:30.577395735 +0200 +@@ -386,6 +386,8 @@ goto out_error; } @@ -6105,7 +6006,7 @@ index 6e134f4759c0..d2782d492630 100644 return meta; out_error: -@@ -484,12 +486,12 @@ static int zram_decompress_page(struct zram *zram, char *mem, u32 index) +@@ -484,12 +486,12 @@ unsigned long handle; size_t size; @@ -6120,7 +6021,7 @@ index 6e134f4759c0..d2782d492630 100644 clear_page(mem); return 0; } -@@ -500,7 +502,7 @@ static int zram_decompress_page(struct zram *zram, char *mem, u32 index) +@@ -500,7 +502,7 @@ else ret = zcomp_decompress(zram->comp, cmem, size, mem); zs_unmap_object(meta->mem_pool, handle); @@ -6129,7 +6030,7 @@ index 6e134f4759c0..d2782d492630 100644 /* Should NEVER happen. Return bio error if it does. */ if (unlikely(ret)) { -@@ -520,14 +522,14 @@ static int zram_bvec_read(struct zram *zram, struct bio_vec *bvec, +@@ -520,14 +522,14 @@ struct zram_meta *meta = zram->meta; page = bvec->bv_page; @@ -6147,7 +6048,7 @@ index 6e134f4759c0..d2782d492630 100644 if (is_partial_io(bvec)) /* Use a temporary buffer to decompress the page */ -@@ -622,10 +624,10 @@ static int zram_bvec_write(struct zram *zram, struct bio_vec *bvec, u32 index, +@@ -622,10 +624,10 @@ if (user_mem) kunmap_atomic(user_mem); /* Free memory associated with this sector now. */ @@ -6160,7 +6061,7 @@ index 6e134f4759c0..d2782d492630 100644 atomic64_inc(&zram->stats.zero_pages); ret = 0; -@@ -685,12 +687,12 @@ static int zram_bvec_write(struct zram *zram, struct bio_vec *bvec, u32 index, +@@ -685,12 +687,12 @@ * Free memory associated with this sector * before overwriting unused sectors. */ @@ -6175,7 +6076,7 @@ index 6e134f4759c0..d2782d492630 100644 /* Update stats */ atomic64_add(clen, &zram->stats.compr_data_size); -@@ -762,9 +764,9 @@ static void zram_bio_discard(struct zram *zram, u32 index, +@@ -762,9 +764,9 @@ } while (n >= PAGE_SIZE) { @@ -6187,7 +6088,7 @@ index 6e134f4759c0..d2782d492630 100644 atomic64_inc(&zram->stats.notify_free); index++; n -= PAGE_SIZE; -@@ -1007,9 +1009,9 @@ static void zram_slot_free_notify(struct block_device *bdev, +@@ -1007,9 +1009,9 @@ zram = bdev->bd_disk->private_data; meta = zram->meta; @@ -6199,11 +6100,10 @@ index 6e134f4759c0..d2782d492630 100644 atomic64_inc(&zram->stats.notify_free); } -diff --git a/drivers/block/zram/zram_drv.h b/drivers/block/zram/zram_drv.h -index 570c598f4ce9..22c0173b00e3 100644 ---- a/drivers/block/zram/zram_drv.h -+++ b/drivers/block/zram/zram_drv.h -@@ -78,6 +78,9 @@ enum zram_pageflags { +diff -Nur linux-4.1.39.orig/drivers/block/zram/zram_drv.h linux-4.1.39/drivers/block/zram/zram_drv.h +--- linux-4.1.39.orig/drivers/block/zram/zram_drv.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/block/zram/zram_drv.h 2017-04-18 17:56:30.577395735 +0200 +@@ -78,6 +78,9 @@ struct zram_table_entry { unsigned long handle; unsigned long value; @@ -6213,7 +6113,7 @@ index 570c598f4ce9..22c0173b00e3 100644 }; struct zram_stats { -@@ -122,4 +125,42 @@ struct zram { +@@ -122,4 +125,42 @@ u64 disksize; /* bytes */ char compressor[10]; }; @@ -6256,11 +6156,10 @@ index 570c598f4ce9..22c0173b00e3 100644 +#endif /* CONFIG_PREEMPT_RT_BASE */ + #endif -diff --git a/drivers/char/random.c b/drivers/char/random.c -index 9cd6968e2f92..eb47efec2506 100644 ---- a/drivers/char/random.c -+++ b/drivers/char/random.c -@@ -776,8 +776,6 @@ static void add_timer_randomness(struct timer_rand_state *state, unsigned num) +diff -Nur linux-4.1.39.orig/drivers/char/random.c linux-4.1.39/drivers/char/random.c +--- linux-4.1.39.orig/drivers/char/random.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/char/random.c 2017-04-18 17:56:30.577395735 +0200 +@@ -776,8 +776,6 @@ } sample; long delta, delta2, delta3; @@ -6269,7 +6168,7 @@ index 9cd6968e2f92..eb47efec2506 100644 sample.jiffies = jiffies; sample.cycles = random_get_entropy(); sample.num = num; -@@ -818,7 +816,6 @@ static void add_timer_randomness(struct timer_rand_state *state, unsigned num) +@@ -818,7 +816,6 @@ */ credit_entropy_bits(r, min_t(int, fls(delta>>1), 11)); } @@ -6277,7 +6176,7 @@ index 9cd6968e2f92..eb47efec2506 100644 } void add_input_randomness(unsigned int type, unsigned int code, -@@ -871,28 +868,27 @@ static __u32 get_reg(struct fast_pool *f, struct pt_regs *regs) +@@ -871,28 +868,27 @@ return *(ptr + f->reg_idx++); } @@ -6311,10 +6210,9 @@ index 9cd6968e2f92..eb47efec2506 100644 fast_mix(fast_pool); add_interrupt_bench(cycles); -diff --git a/drivers/clk/at91/pmc.c b/drivers/clk/at91/pmc.c -index 3f27d21fb729..b83480f599ce 100644 ---- a/drivers/clk/at91/pmc.c -+++ b/drivers/clk/at91/pmc.c +diff -Nur linux-4.1.39.orig/drivers/clk/at91/pmc.c linux-4.1.39/drivers/clk/at91/pmc.c +--- linux-4.1.39.orig/drivers/clk/at91/pmc.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/clk/at91/pmc.c 2017-04-18 17:56:30.577395735 +0200 @@ -27,21 +27,6 @@ void __iomem *at91_pmc_base; EXPORT_SYMBOL_GPL(at91_pmc_base); @@ -6337,10 +6235,9 @@ index 3f27d21fb729..b83480f599ce 100644 int of_at91_get_clk_range(struct device_node *np, const char *propname, struct clk_range *range) { -diff --git a/drivers/clocksource/tcb_clksrc.c b/drivers/clocksource/tcb_clksrc.c -index 8bdbc45c6dad..43f1c6bc6e28 100644 ---- a/drivers/clocksource/tcb_clksrc.c -+++ b/drivers/clocksource/tcb_clksrc.c +diff -Nur linux-4.1.39.orig/drivers/clocksource/tcb_clksrc.c linux-4.1.39/drivers/clocksource/tcb_clksrc.c +--- linux-4.1.39.orig/drivers/clocksource/tcb_clksrc.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/clocksource/tcb_clksrc.c 2017-04-18 17:56:30.577395735 +0200 @@ -23,8 +23,7 @@ * this 32 bit free-running counter. the second channel is not used. * @@ -6351,7 +6248,7 @@ index 8bdbc45c6dad..43f1c6bc6e28 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,7 @@ static struct clocksource clksrc = { +@@ -74,6 +73,7 @@ struct tc_clkevt_device { struct clock_event_device clkevt; struct clk *clk; @@ -6359,7 +6256,7 @@ index 8bdbc45c6dad..43f1c6bc6e28 100644 void __iomem *regs; }; -@@ -82,13 +82,6 @@ static struct tc_clkevt_device *to_tc_clkevt(struct clock_event_device *clkevt) +@@ -82,13 +82,6 @@ return container_of(clkevt, struct tc_clkevt_device, clkevt); } @@ -6373,7 +6270,7 @@ index 8bdbc45c6dad..43f1c6bc6e28 100644 static u32 timer_clock; static void tc_mode(enum clock_event_mode m, struct clock_event_device *d) -@@ -111,11 +104,12 @@ static void tc_mode(enum clock_event_mode m, struct clock_event_device *d) +@@ -111,11 +104,12 @@ case CLOCK_EVT_MODE_PERIODIC: clk_enable(tcd->clk); @@ -6388,7 +6285,7 @@ index 8bdbc45c6dad..43f1c6bc6e28 100644 /* Enable clock and interrupts on RC compare */ __raw_writel(ATMEL_TC_CPCS, regs + ATMEL_TC_REG(2, IER)); -@@ -128,7 +122,7 @@ static void tc_mode(enum clock_event_mode m, struct clock_event_device *d) +@@ -128,7 +122,7 @@ case CLOCK_EVT_MODE_ONESHOT: clk_enable(tcd->clk); @@ -6397,7 +6294,7 @@ index 8bdbc45c6dad..43f1c6bc6e28 100644 __raw_writel(timer_clock | ATMEL_TC_CPCSTOP | ATMEL_TC_WAVE | ATMEL_TC_WAVESEL_UP_AUTO, regs + ATMEL_TC_REG(2, CMR)); -@@ -157,8 +151,12 @@ static struct tc_clkevt_device clkevt = { +@@ -157,8 +151,12 @@ .name = "tc_clkevt", .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT, @@ -6410,7 +6307,7 @@ index 8bdbc45c6dad..43f1c6bc6e28 100644 .set_next_event = tc_next_event, .set_mode = tc_mode, }, -@@ -178,8 +176,9 @@ static irqreturn_t ch2_irq(int irq, void *handle) +@@ -178,8 +176,9 @@ return IRQ_NONE; } @@ -6421,7 +6318,7 @@ index 8bdbc45c6dad..43f1c6bc6e28 100644 int ret; struct clk *t2_clk = tc->clk[2]; int irq = tc->irq[2]; -@@ -193,7 +192,11 @@ static int __init setup_clkevents(struct atmel_tc *tc, int clk32k_divisor_idx) +@@ -193,7 +192,11 @@ clkevt.regs = tc->regs; clkevt.clk = t2_clk; @@ -6434,7 +6331,7 @@ index 8bdbc45c6dad..43f1c6bc6e28 100644 clkevt.clkevt.cpumask = cpumask_of(0); -@@ -203,7 +206,7 @@ static int __init setup_clkevents(struct atmel_tc *tc, int clk32k_divisor_idx) +@@ -203,7 +206,7 @@ return ret; } @@ -6443,7 +6340,7 @@ index 8bdbc45c6dad..43f1c6bc6e28 100644 return ret; } -@@ -340,7 +343,11 @@ static int __init tcb_clksrc_init(void) +@@ -340,7 +343,11 @@ goto err_disable_t1; /* channel 2: periodic and oneshot timer support */ @@ -6455,11 +6352,10 @@ index 8bdbc45c6dad..43f1c6bc6e28 100644 if (ret) goto err_unregister_clksrc; -diff --git a/drivers/clocksource/timer-atmel-pit.c b/drivers/clocksource/timer-atmel-pit.c -index c0304ff608b0..6eb7bf435d9b 100644 ---- a/drivers/clocksource/timer-atmel-pit.c -+++ b/drivers/clocksource/timer-atmel-pit.c -@@ -90,6 +90,7 @@ static cycle_t read_pit_clk(struct clocksource *cs) +diff -Nur linux-4.1.39.orig/drivers/clocksource/timer-atmel-pit.c linux-4.1.39/drivers/clocksource/timer-atmel-pit.c +--- linux-4.1.39.orig/drivers/clocksource/timer-atmel-pit.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/clocksource/timer-atmel-pit.c 2017-04-18 17:56:30.577395735 +0200 +@@ -90,6 +90,7 @@ return elapsed; } @@ -6467,7 +6363,7 @@ index c0304ff608b0..6eb7bf435d9b 100644 /* * Clockevent device: interrupts every 1/HZ (== pit_cycles * MCK/16) */ -@@ -100,6 +101,8 @@ pit_clkevt_mode(enum clock_event_mode mode, struct clock_event_device *dev) +@@ -100,6 +101,8 @@ switch (mode) { case CLOCK_EVT_MODE_PERIODIC: @@ -6476,7 +6372,7 @@ index c0304ff608b0..6eb7bf435d9b 100644 /* update clocksource counter */ data->cnt += data->cycle * PIT_PICNT(pit_read(data->base, AT91_PIT_PIVR)); pit_write(data->base, AT91_PIT_MR, -@@ -113,6 +116,7 @@ pit_clkevt_mode(enum clock_event_mode mode, struct clock_event_device *dev) +@@ -113,6 +116,7 @@ /* disable irq, leaving the clocksource active */ pit_write(data->base, AT91_PIT_MR, (data->cycle - 1) | AT91_PIT_PITEN); @@ -6484,11 +6380,10 @@ index c0304ff608b0..6eb7bf435d9b 100644 break; case CLOCK_EVT_MODE_RESUME: break; -diff --git a/drivers/clocksource/timer-atmel-st.c b/drivers/clocksource/timer-atmel-st.c -index 1692e17e096b..306e2051f112 100644 ---- a/drivers/clocksource/timer-atmel-st.c -+++ b/drivers/clocksource/timer-atmel-st.c -@@ -131,6 +131,7 @@ clkevt32k_mode(enum clock_event_mode mode, struct clock_event_device *dev) +diff -Nur linux-4.1.39.orig/drivers/clocksource/timer-atmel-st.c linux-4.1.39/drivers/clocksource/timer-atmel-st.c +--- linux-4.1.39.orig/drivers/clocksource/timer-atmel-st.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/clocksource/timer-atmel-st.c 2017-04-18 17:56:30.577395735 +0200 +@@ -131,6 +131,7 @@ break; case CLOCK_EVT_MODE_SHUTDOWN: case CLOCK_EVT_MODE_UNUSED: @@ -6496,24 +6391,10 @@ index 1692e17e096b..306e2051f112 100644 case CLOCK_EVT_MODE_RESUME: irqmask = 0; break; -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 - - config X86_POWERNOW_K8 - tristate "AMD Opteron/Athlon64 PowerNow!" -- depends on ACPI && ACPI_PROCESSOR && X86_ACPI_CPUFREQ -+ depends on ACPI && ACPI_PROCESSOR && X86_ACPI_CPUFREQ && !PREEMPT_RT_BASE - 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/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c -index 8ae655c364f4..ce1d93e93d1a 100644 ---- a/drivers/cpufreq/cpufreq.c -+++ b/drivers/cpufreq/cpufreq.c -@@ -64,12 +64,6 @@ static inline bool has_target(void) +diff -Nur linux-4.1.39.orig/drivers/cpufreq/cpufreq.c linux-4.1.39/drivers/cpufreq/cpufreq.c +--- linux-4.1.39.orig/drivers/cpufreq/cpufreq.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/cpufreq/cpufreq.c 2017-04-18 17:56:30.577395735 +0200 +@@ -64,12 +64,6 @@ return cpufreq_driver->target_index || cpufreq_driver->target; } @@ -6526,7 +6407,7 @@ index 8ae655c364f4..ce1d93e93d1a 100644 /* internal prototypes */ static int __cpufreq_governor(struct cpufreq_policy *policy, unsigned int event); -@@ -215,9 +209,6 @@ struct cpufreq_policy *cpufreq_cpu_get(unsigned int cpu) +@@ -215,9 +209,6 @@ if (cpu >= nr_cpu_ids) return NULL; @@ -6536,7 +6417,7 @@ index 8ae655c364f4..ce1d93e93d1a 100644 /* get the cpufreq driver */ read_lock_irqsave(&cpufreq_driver_lock, flags); -@@ -230,9 +221,6 @@ struct cpufreq_policy *cpufreq_cpu_get(unsigned int cpu) +@@ -230,9 +221,6 @@ read_unlock_irqrestore(&cpufreq_driver_lock, flags); @@ -6546,7 +6427,7 @@ index 8ae655c364f4..ce1d93e93d1a 100644 return policy; } EXPORT_SYMBOL_GPL(cpufreq_cpu_get); -@@ -240,7 +228,6 @@ EXPORT_SYMBOL_GPL(cpufreq_cpu_get); +@@ -240,7 +228,6 @@ void cpufreq_cpu_put(struct cpufreq_policy *policy) { kobject_put(&policy->kobj); @@ -6554,7 +6435,7 @@ index 8ae655c364f4..ce1d93e93d1a 100644 } EXPORT_SYMBOL_GPL(cpufreq_cpu_put); -@@ -765,9 +752,6 @@ static ssize_t show(struct kobject *kobj, struct attribute *attr, char *buf) +@@ -765,9 +752,6 @@ struct freq_attr *fattr = to_attr(attr); ssize_t ret; @@ -6564,7 +6445,7 @@ index 8ae655c364f4..ce1d93e93d1a 100644 down_read(&policy->rwsem); if (fattr->show) -@@ -776,7 +760,6 @@ static ssize_t show(struct kobject *kobj, struct attribute *attr, char *buf) +@@ -776,7 +760,6 @@ ret = -EIO; up_read(&policy->rwsem); @@ -6572,7 +6453,7 @@ index 8ae655c364f4..ce1d93e93d1a 100644 return ret; } -@@ -793,9 +776,6 @@ static ssize_t store(struct kobject *kobj, struct attribute *attr, +@@ -793,9 +776,6 @@ if (!cpu_online(policy->cpu)) goto unlock; @@ -6582,7 +6463,7 @@ index 8ae655c364f4..ce1d93e93d1a 100644 down_write(&policy->rwsem); if (fattr->store) -@@ -804,8 +784,6 @@ static ssize_t store(struct kobject *kobj, struct attribute *attr, +@@ -804,8 +784,6 @@ ret = -EIO; up_write(&policy->rwsem); @@ -6591,7 +6472,7 @@ index 8ae655c364f4..ce1d93e93d1a 100644 unlock: put_online_cpus(); -@@ -1117,16 +1095,12 @@ static int __cpufreq_add_dev(struct device *dev, struct subsys_interface *sif) +@@ -1117,16 +1095,12 @@ if (unlikely(policy)) return 0; @@ -6608,7 +6489,7 @@ index 8ae655c364f4..ce1d93e93d1a 100644 return ret; } } -@@ -1269,8 +1243,6 @@ static int __cpufreq_add_dev(struct device *dev, struct subsys_interface *sif) +@@ -1269,8 +1243,6 @@ kobject_uevent(&policy->kobj, KOBJ_ADD); @@ -6617,7 +6498,7 @@ index 8ae655c364f4..ce1d93e93d1a 100644 /* Callback for handling stuff after policy is ready */ if (cpufreq_driver->ready) cpufreq_driver->ready(policy); -@@ -1304,8 +1276,6 @@ err_set_policy_cpu: +@@ -1304,8 +1276,6 @@ cpufreq_policy_free(policy); nomem_out: @@ -6626,7 +6507,7 @@ index 8ae655c364f4..ce1d93e93d1a 100644 return ret; } -@@ -2499,19 +2469,20 @@ int cpufreq_unregister_driver(struct cpufreq_driver *driver) +@@ -2499,19 +2469,20 @@ pr_debug("unregistering driver %s\n", driver->name); @@ -6649,23 +6530,21 @@ index 8ae655c364f4..ce1d93e93d1a 100644 return 0; } -diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig -index c88b01bbf9a3..0fd82b872f63 100644 ---- a/drivers/gpio/Kconfig -+++ b/drivers/gpio/Kconfig -@@ -309,7 +309,7 @@ config GPIO_OCTEON - family of SOCs. +diff -Nur linux-4.1.39.orig/drivers/cpufreq/Kconfig.x86 linux-4.1.39/drivers/cpufreq/Kconfig.x86 +--- linux-4.1.39.orig/drivers/cpufreq/Kconfig.x86 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/cpufreq/Kconfig.x86 2017-04-18 17:56:30.577395735 +0200 +@@ -123,7 +123,7 @@ - config GPIO_OMAP -- bool "TI OMAP GPIO support" if COMPILE_TEST && !ARCH_OMAP2PLUS -+ tristate "TI OMAP GPIO support" if ARCH_OMAP2PLUS || COMPILE_TEST - default y if ARCH_OMAP - depends on ARM - select GENERIC_IRQ_CHIP -diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c -index b232397ad7ec..4916fd726dce 100644 ---- a/drivers/gpio/gpio-omap.c -+++ b/drivers/gpio/gpio-omap.c + config X86_POWERNOW_K8 + tristate "AMD Opteron/Athlon64 PowerNow!" +- depends on ACPI && ACPI_PROCESSOR && X86_ACPI_CPUFREQ ++ depends on ACPI && ACPI_PROCESSOR && X86_ACPI_CPUFREQ && !PREEMPT_RT_BASE + help + This adds the CPUFreq driver for K8/early Opteron/Athlon64 processors. + Support for K10 and newer processors is now in acpi-cpufreq. +diff -Nur linux-4.1.39.orig/drivers/gpio/gpio-omap.c linux-4.1.39/drivers/gpio/gpio-omap.c +--- linux-4.1.39.orig/drivers/gpio/gpio-omap.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/gpio/gpio-omap.c 2017-04-18 17:56:30.577395735 +0200 @@ -29,6 +29,7 @@ #include <linux/platform_data/gpio-omap.h> @@ -6674,7 +6553,7 @@ index b232397ad7ec..4916fd726dce 100644 static LIST_HEAD(omap_gpio_list); -@@ -50,14 +51,15 @@ struct gpio_regs { +@@ -50,14 +51,15 @@ struct gpio_bank { struct list_head node; void __iomem *base; @@ -6692,7 +6571,7 @@ index b232397ad7ec..4916fd726dce 100644 struct gpio_chip chip; struct clk *dbck; u32 mod_usage; -@@ -67,7 +69,7 @@ struct gpio_bank { +@@ -67,7 +69,7 @@ struct device *dev; bool is_mpuio; bool dbck_flag; @@ -6701,7 +6580,7 @@ index b232397ad7ec..4916fd726dce 100644 bool context_valid; int stride; u32 width; -@@ -175,7 +177,7 @@ static inline void omap_gpio_rmw(void __iomem *base, u32 reg, u32 mask, bool set +@@ -175,7 +177,7 @@ static inline void omap_gpio_dbck_enable(struct gpio_bank *bank) { if (bank->dbck_enable_mask && !bank->dbck_enabled) { @@ -6710,7 +6589,7 @@ index b232397ad7ec..4916fd726dce 100644 bank->dbck_enabled = true; writel_relaxed(bank->dbck_enable_mask, -@@ -193,7 +195,7 @@ static inline void omap_gpio_dbck_disable(struct gpio_bank *bank) +@@ -193,7 +195,7 @@ */ writel_relaxed(0, bank->base + bank->regs->debounce_en); @@ -6719,7 +6598,7 @@ index b232397ad7ec..4916fd726dce 100644 bank->dbck_enabled = false; } } -@@ -204,8 +206,9 @@ static inline void omap_gpio_dbck_disable(struct gpio_bank *bank) +@@ -204,8 +206,9 @@ * @offset: the gpio number on this @bank * @debounce: debounce time to use * @@ -6731,7 +6610,7 @@ index b232397ad7ec..4916fd726dce 100644 */ static void omap2_set_gpio_debounce(struct gpio_bank *bank, unsigned offset, unsigned debounce) -@@ -213,34 +216,33 @@ static void omap2_set_gpio_debounce(struct gpio_bank *bank, unsigned offset, +@@ -213,34 +216,33 @@ void __iomem *reg; u32 val; u32 l; @@ -6774,7 +6653,7 @@ index b232397ad7ec..4916fd726dce 100644 /* * Enable debounce clock per module. * This call is mandatory because in omap_gpio_request() when -@@ -285,7 +287,7 @@ static void omap_clear_gpio_debounce(struct gpio_bank *bank, unsigned offset) +@@ -285,7 +287,7 @@ bank->context.debounce = 0; writel_relaxed(bank->context.debounce, bank->base + bank->regs->debounce); @@ -6783,7 +6662,7 @@ index b232397ad7ec..4916fd726dce 100644 bank->dbck_enabled = false; } } -@@ -488,9 +490,6 @@ static int omap_gpio_irq_type(struct irq_data *d, unsigned type) +@@ -488,9 +490,6 @@ unsigned long flags; unsigned offset = d->hwirq; @@ -6793,7 +6672,7 @@ index b232397ad7ec..4916fd726dce 100644 if (type & ~IRQ_TYPE_SENSE_MASK) return -EINVAL; -@@ -498,20 +497,28 @@ static int omap_gpio_irq_type(struct irq_data *d, unsigned type) +@@ -498,20 +497,28 @@ (type & (IRQ_TYPE_LEVEL_LOW|IRQ_TYPE_LEVEL_HIGH))) return -EINVAL; @@ -6826,7 +6705,7 @@ index b232397ad7ec..4916fd726dce 100644 return retval; } -@@ -626,34 +633,30 @@ static int omap_set_gpio_wakeup(struct gpio_bank *bank, unsigned offset, +@@ -626,34 +633,30 @@ return -EINVAL; } @@ -6869,7 +6748,7 @@ index b232397ad7ec..4916fd726dce 100644 } static int omap_gpio_request(struct gpio_chip *chip, unsigned offset) -@@ -668,17 +671,10 @@ static int omap_gpio_request(struct gpio_chip *chip, unsigned offset) +@@ -668,17 +671,10 @@ if (!BANK_USED(bank)) pm_runtime_get_sync(bank->dev); @@ -6890,7 +6769,7 @@ index b232397ad7ec..4916fd726dce 100644 return 0; } -@@ -688,11 +684,14 @@ static void omap_gpio_free(struct gpio_chip *chip, unsigned offset) +@@ -688,11 +684,14 @@ struct gpio_bank *bank = container_of(chip, struct gpio_bank, chip); unsigned long flags; @@ -6908,7 +6787,7 @@ index b232397ad7ec..4916fd726dce 100644 /* * If this is the last gpio to be freed in the bank, -@@ -711,29 +710,27 @@ static void omap_gpio_free(struct gpio_chip *chip, unsigned offset) +@@ -711,29 +710,27 @@ * line's interrupt handler has been run, we may miss some nested * interrupts. */ @@ -6946,7 +6825,7 @@ index b232397ad7ec..4916fd726dce 100644 enabled = omap_get_gpio_irqbank_mask(bank); isr_saved = isr = readl_relaxed(isr_reg) & enabled; -@@ -747,12 +744,7 @@ static void omap_gpio_irq_handler(unsigned int irq, struct irq_desc *desc) +@@ -747,12 +744,7 @@ omap_clear_gpio_irqbank(bank, isr_saved & ~level_mask); omap_enable_gpio_irqbank(bank, isr_saved & ~level_mask); @@ -6960,7 +6839,7 @@ index b232397ad7ec..4916fd726dce 100644 if (!isr) break; -@@ -761,6 +753,7 @@ static void omap_gpio_irq_handler(unsigned int irq, struct irq_desc *desc) +@@ -761,6 +753,7 @@ bit = __ffs(isr); isr &= ~(BIT(bit)); @@ -6968,7 +6847,7 @@ index b232397ad7ec..4916fd726dce 100644 /* * Some chips can't respond to both rising and falling * at the same time. If this irq was requested with -@@ -771,18 +764,20 @@ static void omap_gpio_irq_handler(unsigned int irq, struct irq_desc *desc) +@@ -771,18 +764,20 @@ if (bank->toggle_mask & (BIT(bit))) omap_toggle_gpio_edge_triggering(bank, bit); @@ -6995,7 +6874,7 @@ index b232397ad7ec..4916fd726dce 100644 } static unsigned int omap_gpio_irq_startup(struct irq_data *d) -@@ -791,15 +786,22 @@ static unsigned int omap_gpio_irq_startup(struct irq_data *d) +@@ -791,15 +786,22 @@ unsigned long flags; unsigned offset = d->hwirq; @@ -7023,7 +6902,7 @@ index b232397ad7ec..4916fd726dce 100644 } static void omap_gpio_irq_shutdown(struct irq_data *d) -@@ -808,11 +810,28 @@ static void omap_gpio_irq_shutdown(struct irq_data *d) +@@ -808,11 +810,28 @@ unsigned long flags; unsigned offset = d->hwirq; @@ -7055,7 +6934,7 @@ index b232397ad7ec..4916fd726dce 100644 /* * If this is the last IRQ to be freed in the bank, -@@ -836,10 +855,10 @@ static void omap_gpio_mask_irq(struct irq_data *d) +@@ -836,10 +855,10 @@ unsigned offset = d->hwirq; unsigned long flags; @@ -7068,7 +6947,7 @@ index b232397ad7ec..4916fd726dce 100644 } static void omap_gpio_unmask_irq(struct irq_data *d) -@@ -849,7 +868,7 @@ static void omap_gpio_unmask_irq(struct irq_data *d) +@@ -849,7 +868,7 @@ u32 trigger = irqd_get_trigger_type(d); unsigned long flags; @@ -7077,7 +6956,7 @@ index b232397ad7ec..4916fd726dce 100644 if (trigger) omap_set_gpio_triggering(bank, offset, trigger); -@@ -861,7 +880,7 @@ static void omap_gpio_unmask_irq(struct irq_data *d) +@@ -861,7 +880,7 @@ } omap_set_gpio_irqenable(bank, offset, 1); @@ -7086,7 +6965,7 @@ index b232397ad7ec..4916fd726dce 100644 } /*---------------------------------------------------------------------*/ -@@ -874,9 +893,9 @@ static int omap_mpuio_suspend_noirq(struct device *dev) +@@ -874,9 +893,9 @@ OMAP_MPUIO_GPIO_MASKIT / bank->stride; unsigned long flags; @@ -7098,7 +6977,7 @@ index b232397ad7ec..4916fd726dce 100644 return 0; } -@@ -889,9 +908,9 @@ static int omap_mpuio_resume_noirq(struct device *dev) +@@ -889,9 +908,9 @@ OMAP_MPUIO_GPIO_MASKIT / bank->stride; unsigned long flags; @@ -7110,7 +6989,7 @@ index b232397ad7ec..4916fd726dce 100644 return 0; } -@@ -937,9 +956,9 @@ static int omap_gpio_get_direction(struct gpio_chip *chip, unsigned offset) +@@ -937,9 +956,9 @@ bank = container_of(chip, struct gpio_bank, chip); reg = bank->base + bank->regs->direction; @@ -7122,7 +7001,7 @@ index b232397ad7ec..4916fd726dce 100644 return dir; } -@@ -949,9 +968,9 @@ static int omap_gpio_input(struct gpio_chip *chip, unsigned offset) +@@ -949,9 +968,9 @@ unsigned long flags; bank = container_of(chip, struct gpio_bank, chip); @@ -7134,7 +7013,7 @@ index b232397ad7ec..4916fd726dce 100644 return 0; } -@@ -973,10 +992,10 @@ static int omap_gpio_output(struct gpio_chip *chip, unsigned offset, int value) +@@ -973,10 +992,10 @@ unsigned long flags; bank = container_of(chip, struct gpio_bank, chip); @@ -7147,7 +7026,7 @@ index b232397ad7ec..4916fd726dce 100644 return 0; } -@@ -988,9 +1007,9 @@ static int omap_gpio_debounce(struct gpio_chip *chip, unsigned offset, +@@ -988,9 +1007,9 @@ bank = container_of(chip, struct gpio_bank, chip); @@ -7159,7 +7038,7 @@ index b232397ad7ec..4916fd726dce 100644 return 0; } -@@ -1001,9 +1020,9 @@ static void omap_gpio_set(struct gpio_chip *chip, unsigned offset, int value) +@@ -1001,9 +1020,9 @@ unsigned long flags; bank = container_of(chip, struct gpio_bank, chip); @@ -7171,7 +7050,7 @@ index b232397ad7ec..4916fd726dce 100644 } /*---------------------------------------------------------------------*/ -@@ -1048,10 +1067,6 @@ static void omap_gpio_mod_init(struct gpio_bank *bank) +@@ -1048,10 +1067,6 @@ /* Initialize interface clk ungated, module enabled */ if (bank->regs->ctrl) writel_relaxed(0, base + bank->regs->ctrl); @@ -7182,7 +7061,7 @@ index b232397ad7ec..4916fd726dce 100644 } static int omap_gpio_chip_init(struct gpio_bank *bank, struct irq_chip *irqc) -@@ -1080,7 +1095,6 @@ static int omap_gpio_chip_init(struct gpio_bank *bank, struct irq_chip *irqc) +@@ -1080,7 +1095,6 @@ } else { bank->chip.label = "gpio"; bank->chip.base = gpio; @@ -7190,7 +7069,7 @@ index b232397ad7ec..4916fd726dce 100644 } bank->chip.ngpio = bank->width; -@@ -1090,6 +1104,9 @@ static int omap_gpio_chip_init(struct gpio_bank *bank, struct irq_chip *irqc) +@@ -1090,6 +1104,9 @@ return ret; } @@ -7200,7 +7079,7 @@ index b232397ad7ec..4916fd726dce 100644 #ifdef CONFIG_ARCH_OMAP1 /* * REVISIT: Once we have OMAP1 supporting SPARSE_IRQ, we can drop -@@ -1112,7 +1129,7 @@ static int omap_gpio_chip_init(struct gpio_bank *bank, struct irq_chip *irqc) +@@ -1112,7 +1129,7 @@ } ret = gpiochip_irqchip_add(&bank->chip, irqc, @@ -7209,7 +7088,7 @@ index b232397ad7ec..4916fd726dce 100644 IRQ_TYPE_NONE); if (ret) { -@@ -1121,10 +1138,14 @@ static int omap_gpio_chip_init(struct gpio_bank *bank, struct irq_chip *irqc) +@@ -1121,10 +1138,14 @@ return -ENODEV; } @@ -7227,7 +7106,7 @@ index b232397ad7ec..4916fd726dce 100644 } static const struct of_device_id omap_gpio_match[]; -@@ -1163,17 +1184,23 @@ static int omap_gpio_probe(struct platform_device *pdev) +@@ -1163,17 +1184,23 @@ irqc->irq_unmask = omap_gpio_unmask_irq, irqc->irq_set_type = omap_gpio_irq_type, irqc->irq_set_wake = omap_gpio_wake_enable, @@ -7256,7 +7135,7 @@ index b232397ad7ec..4916fd726dce 100644 bank->dbck_flag = pdata->dbck_flag; bank->stride = pdata->bank_stride; bank->width = pdata->bank_width; -@@ -1183,15 +1210,9 @@ static int omap_gpio_probe(struct platform_device *pdev) +@@ -1183,15 +1210,9 @@ #ifdef CONFIG_OF_GPIO bank->chip.of_node = of_node_get(node); #endif @@ -7275,7 +7154,7 @@ index b232397ad7ec..4916fd726dce 100644 } if (bank->regs->set_dataout && bank->regs->clr_dataout) -@@ -1199,16 +1220,27 @@ static int omap_gpio_probe(struct platform_device *pdev) +@@ -1199,16 +1220,27 @@ else bank->set_dataout = omap_set_gpio_dataout_mask; @@ -7305,7 +7184,7 @@ index b232397ad7ec..4916fd726dce 100644 platform_set_drvdata(pdev, bank); pm_runtime_enable(bank->dev); -@@ -1221,8 +1253,11 @@ static int omap_gpio_probe(struct platform_device *pdev) +@@ -1221,8 +1253,11 @@ omap_gpio_mod_init(bank); ret = omap_gpio_chip_init(bank, irqc); @@ -7318,7 +7197,7 @@ index b232397ad7ec..4916fd726dce 100644 omap_gpio_show_rev(bank); -@@ -1233,6 +1268,19 @@ static int omap_gpio_probe(struct platform_device *pdev) +@@ -1233,6 +1268,19 @@ return 0; } @@ -7338,7 +7217,7 @@ index b232397ad7ec..4916fd726dce 100644 #ifdef CONFIG_ARCH_OMAP2PLUS #if defined(CONFIG_PM) -@@ -1246,7 +1294,7 @@ static int omap_gpio_runtime_suspend(struct device *dev) +@@ -1246,7 +1294,7 @@ unsigned long flags; u32 wake_low, wake_hi; @@ -7347,7 +7226,7 @@ index b232397ad7ec..4916fd726dce 100644 /* * Only edges can generate a wakeup event to the PRCM. -@@ -1299,7 +1347,7 @@ update_gpio_context_count: +@@ -1299,7 +1347,7 @@ bank->get_context_loss_count(bank->dev); omap_gpio_dbck_disable(bank); @@ -7356,7 +7235,7 @@ index b232397ad7ec..4916fd726dce 100644 return 0; } -@@ -1314,14 +1362,14 @@ static int omap_gpio_runtime_resume(struct device *dev) +@@ -1314,14 +1362,14 @@ unsigned long flags; int c; @@ -7373,7 +7252,7 @@ index b232397ad7ec..4916fd726dce 100644 omap_gpio_init_context(bank); if (bank->get_context_loss_count) -@@ -1342,22 +1390,20 @@ static int omap_gpio_runtime_resume(struct device *dev) +@@ -1342,22 +1390,20 @@ writel_relaxed(bank->context.risingdetect, bank->base + bank->regs->risingdetect); @@ -7404,7 +7283,7 @@ index b232397ad7ec..4916fd726dce 100644 return 0; } -@@ -1412,18 +1458,19 @@ static int omap_gpio_runtime_resume(struct device *dev) +@@ -1412,18 +1458,19 @@ } bank->workaround_enabled = false; @@ -7426,7 +7305,7 @@ index b232397ad7ec..4916fd726dce 100644 continue; bank->power_mode = pwr_mode; -@@ -1437,12 +1484,13 @@ void omap2_gpio_resume_after_idle(void) +@@ -1437,12 +1484,13 @@ struct gpio_bank *bank; list_for_each_entry(bank, &omap_gpio_list, node) { @@ -7441,7 +7320,7 @@ index b232397ad7ec..4916fd726dce 100644 #if defined(CONFIG_PM) static void omap_gpio_init_context(struct gpio_bank *p) -@@ -1598,6 +1646,7 @@ MODULE_DEVICE_TABLE(of, omap_gpio_match); +@@ -1598,6 +1646,7 @@ static struct platform_driver omap_gpio_driver = { .probe = omap_gpio_probe, @@ -7449,7 +7328,7 @@ index b232397ad7ec..4916fd726dce 100644 .driver = { .name = "omap_gpio", .pm = &gpio_pm_ops, -@@ -1615,3 +1664,13 @@ static int __init omap_gpio_drv_reg(void) +@@ -1615,3 +1664,13 @@ return platform_driver_register(&omap_gpio_driver); } postcore_initcall(omap_gpio_drv_reg); @@ -7463,10 +7342,21 @@ index b232397ad7ec..4916fd726dce 100644 +MODULE_DESCRIPTION("omap gpio driver"); +MODULE_ALIAS("platform:gpio-omap"); +MODULE_LICENSE("GPL v2"); -diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c -index 479024a4caad..a67a351e88ab 100644 ---- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c -+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c +diff -Nur linux-4.1.39.orig/drivers/gpio/Kconfig linux-4.1.39/drivers/gpio/Kconfig +--- linux-4.1.39.orig/drivers/gpio/Kconfig 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/gpio/Kconfig 2017-04-18 17:56:30.577395735 +0200 +@@ -309,7 +309,7 @@ + family of SOCs. + + config GPIO_OMAP +- bool "TI OMAP GPIO support" if COMPILE_TEST && !ARCH_OMAP2PLUS ++ tristate "TI OMAP GPIO support" if ARCH_OMAP2PLUS || COMPILE_TEST + default y if ARCH_OMAP + depends on ARM + select GENERIC_IRQ_CHIP +diff -Nur linux-4.1.39.orig/drivers/gpu/drm/i915/i915_gem_execbuffer.c linux-4.1.39/drivers/gpu/drm/i915/i915_gem_execbuffer.c +--- linux-4.1.39.orig/drivers/gpu/drm/i915/i915_gem_execbuffer.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/gpu/drm/i915/i915_gem_execbuffer.c 2017-04-18 17:56:30.577395735 +0200 @@ -32,6 +32,7 @@ #include "i915_trace.h" #include "intel_drv.h" @@ -7475,7 +7365,7 @@ index 479024a4caad..a67a351e88ab 100644 #define __EXEC_OBJECT_HAS_PIN (1<<31) #define __EXEC_OBJECT_HAS_FENCE (1<<30) -@@ -465,7 +466,7 @@ i915_gem_execbuffer_relocate_entry(struct drm_i915_gem_object *obj, +@@ -465,7 +466,7 @@ } /* We can't wait for rendering with pagefaults disabled */ @@ -7484,7 +7374,7 @@ index 479024a4caad..a67a351e88ab 100644 return -EFAULT; if (use_cpu_reloc(obj)) -@@ -1338,7 +1339,9 @@ i915_gem_ringbuffer_submission(struct drm_device *dev, struct drm_file *file, +@@ -1338,7 +1339,9 @@ return ret; } @@ -7494,11 +7384,10 @@ index 479024a4caad..a67a351e88ab 100644 i915_gem_execbuffer_move_to_active(vmas, ring); i915_gem_execbuffer_retire_commands(dev, file, ring, batch_obj); -diff --git a/drivers/gpu/drm/i915/i915_gem_shrinker.c b/drivers/gpu/drm/i915/i915_gem_shrinker.c -index 7ab9cc456dd2..e06515f4eb7c 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.1.39.orig/drivers/gpu/drm/i915/i915_gem_shrinker.c linux-4.1.39/drivers/gpu/drm/i915/i915_gem_shrinker.c +--- linux-4.1.39.orig/drivers/gpu/drm/i915/i915_gem_shrinker.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/gpu/drm/i915/i915_gem_shrinker.c 2017-04-18 17:56:30.577395735 +0200 +@@ -39,7 +39,7 @@ if (!mutex_is_locked(mutex)) return false; @@ -7507,11 +7396,10 @@ index 7ab9cc456dd2..e06515f4eb7c 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 b0df8d10482a..8d34df020842 100644 ---- a/drivers/gpu/drm/i915/i915_irq.c -+++ b/drivers/gpu/drm/i915/i915_irq.c -@@ -676,6 +676,7 @@ static int i915_get_crtc_scanoutpos(struct drm_device *dev, int pipe, +diff -Nur linux-4.1.39.orig/drivers/gpu/drm/i915/i915_irq.c linux-4.1.39/drivers/gpu/drm/i915/i915_irq.c +--- linux-4.1.39.orig/drivers/gpu/drm/i915/i915_irq.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/gpu/drm/i915/i915_irq.c 2017-04-18 17:56:30.581395889 +0200 +@@ -676,6 +676,7 @@ spin_lock_irqsave(&dev_priv->uncore.lock, irqflags); /* preempt_disable_rt() should go right here in PREEMPT_RT patchset. */ @@ -7519,7 +7407,7 @@ index b0df8d10482a..8d34df020842 100644 /* Get optional system timestamp before query. */ if (stime) -@@ -727,6 +728,7 @@ static int i915_get_crtc_scanoutpos(struct drm_device *dev, int pipe, +@@ -727,6 +728,7 @@ *etime = ktime_get(); /* preempt_enable_rt() should go right here in PREEMPT_RT patchset. */ @@ -7527,11 +7415,10 @@ index b0df8d10482a..8d34df020842 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 56323732c748..d1f1781392bf 100644 ---- a/drivers/gpu/drm/i915/intel_display.c -+++ b/drivers/gpu/drm/i915/intel_display.c -@@ -10084,7 +10084,7 @@ void intel_check_page_flip(struct drm_device *dev, int pipe) +diff -Nur linux-4.1.39.orig/drivers/gpu/drm/i915/intel_display.c linux-4.1.39/drivers/gpu/drm/i915/intel_display.c +--- linux-4.1.39.orig/drivers/gpu/drm/i915/intel_display.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/gpu/drm/i915/intel_display.c 2017-04-18 17:56:30.581395889 +0200 +@@ -10084,7 +10084,7 @@ struct drm_crtc *crtc = dev_priv->pipe_to_crtc_mapping[pipe]; struct intel_crtc *intel_crtc = to_intel_crtc(crtc); @@ -7540,10 +7427,9 @@ index 56323732c748..d1f1781392bf 100644 if (crtc == NULL) return; -diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c -index a4c0a04b5044..6da459fe20b2 100644 ---- a/drivers/gpu/drm/i915/intel_sprite.c -+++ b/drivers/gpu/drm/i915/intel_sprite.c +diff -Nur linux-4.1.39.orig/drivers/gpu/drm/i915/intel_sprite.c linux-4.1.39/drivers/gpu/drm/i915/intel_sprite.c +--- linux-4.1.39.orig/drivers/gpu/drm/i915/intel_sprite.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/gpu/drm/i915/intel_sprite.c 2017-04-18 17:56:30.581395889 +0200 @@ -37,6 +37,7 @@ #include "intel_drv.h" #include <drm/i915_drm.h> @@ -7552,7 +7438,7 @@ index a4c0a04b5044..6da459fe20b2 100644 static bool format_is_yuv(uint32_t format) -@@ -61,6 +62,8 @@ static int usecs_to_scanlines(const struct drm_display_mode *mode, int usecs) +@@ -61,6 +62,8 @@ return DIV_ROUND_UP(usecs * mode->crtc_clock, 1000 * mode->crtc_htotal); } @@ -7561,7 +7447,7 @@ index a4c0a04b5044..6da459fe20b2 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 -@@ -101,7 +104,7 @@ bool intel_pipe_update_start(struct intel_crtc *crtc, uint32_t *start_vbl_count) +@@ -101,7 +104,7 @@ if (WARN_ON(drm_crtc_vblank_get(&crtc->base))) return false; @@ -7570,7 +7456,7 @@ index a4c0a04b5044..6da459fe20b2 100644 trace_i915_pipe_update_start(crtc, min, max); -@@ -123,11 +126,11 @@ bool intel_pipe_update_start(struct intel_crtc *crtc, uint32_t *start_vbl_count) +@@ -123,11 +126,11 @@ break; } @@ -7584,7 +7470,7 @@ index a4c0a04b5044..6da459fe20b2 100644 } finish_wait(wq, &wait); -@@ -158,7 +161,7 @@ void intel_pipe_update_end(struct intel_crtc *crtc, u32 start_vbl_count) +@@ -158,7 +161,7 @@ trace_i915_pipe_update_end(crtc, end_vbl_count); @@ -7593,11 +7479,10 @@ index a4c0a04b5044..6da459fe20b2 100644 if (start_vbl_count != end_vbl_count) DRM_ERROR("Atomic update failure on pipe %c (start=%u end=%u)\n", -diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c -index 6743174acdbc..8ad198bbc24d 100644 ---- a/drivers/gpu/drm/radeon/radeon_display.c -+++ b/drivers/gpu/drm/radeon/radeon_display.c -@@ -1798,6 +1798,7 @@ int radeon_get_crtc_scanoutpos(struct drm_device *dev, int crtc, unsigned int fl +diff -Nur linux-4.1.39.orig/drivers/gpu/drm/radeon/radeon_display.c linux-4.1.39/drivers/gpu/drm/radeon/radeon_display.c +--- linux-4.1.39.orig/drivers/gpu/drm/radeon/radeon_display.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/gpu/drm/radeon/radeon_display.c 2017-04-18 17:56:30.581395889 +0200 +@@ -1798,6 +1798,7 @@ struct radeon_device *rdev = dev->dev_private; /* preempt_disable_rt() should go right here in PREEMPT_RT patchset. */ @@ -7605,7 +7490,7 @@ index 6743174acdbc..8ad198bbc24d 100644 /* Get optional system timestamp before query. */ if (stime) -@@ -1890,6 +1891,7 @@ int radeon_get_crtc_scanoutpos(struct drm_device *dev, int crtc, unsigned int fl +@@ -1890,6 +1891,7 @@ *etime = ktime_get(); /* preempt_enable_rt() should go right here in PREEMPT_RT patchset. */ @@ -7613,11 +7498,10 @@ index 6743174acdbc..8ad198bbc24d 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 0e894193accf..2f9de5ecb6ed 100644 ---- a/drivers/i2c/busses/i2c-omap.c -+++ b/drivers/i2c/busses/i2c-omap.c -@@ -996,15 +996,12 @@ omap_i2c_isr(int irq, void *dev_id) +diff -Nur linux-4.1.39.orig/drivers/i2c/busses/i2c-omap.c linux-4.1.39/drivers/i2c/busses/i2c-omap.c +--- linux-4.1.39.orig/drivers/i2c/busses/i2c-omap.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/i2c/busses/i2c-omap.c 2017-04-18 17:56:30.581395889 +0200 +@@ -996,15 +996,12 @@ u16 mask; u16 stat; @@ -7634,11 +7518,10 @@ index 0e894193accf..2f9de5ecb6ed 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.1.39.orig/drivers/ide/alim15x3.c linux-4.1.39/drivers/ide/alim15x3.c +--- linux-4.1.39.orig/drivers/ide/alim15x3.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/ide/alim15x3.c 2017-04-18 17:56:30.581395889 +0200 +@@ -234,7 +234,7 @@ isa_dev = pci_get_device(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1533, NULL); @@ -7647,7 +7530,7 @@ index 36f76e28a0bf..394f142f90c7 100644 if (m5229_revision < 0xC2) { /* -@@ -325,7 +325,7 @@ out: +@@ -325,7 +325,7 @@ } pci_dev_put(north); pci_dev_put(isa_dev); @@ -7656,11 +7539,10 @@ index 36f76e28a0bf..394f142f90c7 100644 return 0; } -diff --git a/drivers/ide/hpt366.c b/drivers/ide/hpt366.c -index 696b6c1ec940..0d0a96629b73 100644 ---- a/drivers/ide/hpt366.c -+++ b/drivers/ide/hpt366.c -@@ -1241,7 +1241,7 @@ static int init_dma_hpt366(ide_hwif_t *hwif, +diff -Nur linux-4.1.39.orig/drivers/ide/hpt366.c linux-4.1.39/drivers/ide/hpt366.c +--- linux-4.1.39.orig/drivers/ide/hpt366.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/ide/hpt366.c 2017-04-18 17:56:30.581395889 +0200 +@@ -1241,7 +1241,7 @@ dma_old = inb(base + 2); @@ -7669,7 +7551,7 @@ index 696b6c1ec940..0d0a96629b73 100644 dma_new = dma_old; pci_read_config_byte(dev, hwif->channel ? 0x4b : 0x43, &masterdma); -@@ -1252,7 +1252,7 @@ static int init_dma_hpt366(ide_hwif_t *hwif, +@@ -1252,7 +1252,7 @@ if (dma_new != dma_old) outb(dma_new, base + 2); @@ -7678,11 +7560,40 @@ index 696b6c1ec940..0d0a96629b73 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.1.39.orig/drivers/ide/ide-io.c linux-4.1.39/drivers/ide/ide-io.c +--- linux-4.1.39.orig/drivers/ide/ide-io.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/ide/ide-io.c 2017-04-18 17:56:30.581395889 +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.1.39.orig/drivers/ide/ide-iops.c linux-4.1.39/drivers/ide/ide-iops.c +--- linux-4.1.39.orig/drivers/ide/ide-iops.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/ide/ide-iops.c 2017-04-18 17:56:30.585396045 +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.1.39.orig/drivers/ide/ide-io-std.c linux-4.1.39/drivers/ide/ide-io-std.c +--- linux-4.1.39.orig/drivers/ide/ide-io-std.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/ide/ide-io-std.c 2017-04-18 17:56:30.581395889 +0200 +@@ -175,7 +175,7 @@ unsigned long uninitialized_var(flags); if ((io_32bit & 2) && !mmio) { @@ -7691,7 +7602,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) @@ -7700,7 +7611,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) { @@ -7709,7 +7620,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) @@ -7718,43 +7629,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 177db6d5b2f5..079ae6bebf18 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.1.39.orig/drivers/ide/ide-probe.c linux-4.1.39/drivers/ide/ide-probe.c +--- linux-4.1.39.orig/drivers/ide/ide-probe.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/ide/ide-probe.c 2017-04-18 17:56:30.585396045 +0200 +@@ -196,10 +196,10 @@ int bswap = 1; /* local CPU only; some systems need this */ @@ -7767,11 +7645,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 dabb88b1cbec..2cecea72520a 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.1.39.orig/drivers/ide/ide-taskfile.c linux-4.1.39/drivers/ide/ide-taskfile.c +--- linux-4.1.39.orig/drivers/ide/ide-taskfile.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/ide/ide-taskfile.c 2017-04-18 17:56:30.585396045 +0200 +@@ -250,7 +250,7 @@ page_is_high = PageHighMem(page); if (page_is_high) @@ -7780,7 +7657,7 @@ index dabb88b1cbec..2cecea72520a 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) @@ -7789,7 +7666,7 @@ index dabb88b1cbec..2cecea72520a 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) @@ -7798,11 +7675,10 @@ index dabb88b1cbec..2cecea72520a 100644 ide_set_handler(drive, &task_pio_intr, WAIT_WORSTCASE); -diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c -index 0d23e0568deb..140c94ce71c5 100644 ---- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c -+++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c -@@ -821,7 +821,7 @@ void ipoib_mcast_restart_task(struct work_struct *work) +diff -Nur linux-4.1.39.orig/drivers/infiniband/ulp/ipoib/ipoib_multicast.c linux-4.1.39/drivers/infiniband/ulp/ipoib/ipoib_multicast.c +--- linux-4.1.39.orig/drivers/infiniband/ulp/ipoib/ipoib_multicast.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/infiniband/ulp/ipoib/ipoib_multicast.c 2017-04-18 17:56:30.585396045 +0200 +@@ -824,7 +824,7 @@ ipoib_dbg_mcast(priv, "restarting multicast task\n"); @@ -7811,7 +7687,7 @@ index 0d23e0568deb..140c94ce71c5 100644 netif_addr_lock(dev); spin_lock(&priv->lock); -@@ -903,7 +903,7 @@ void ipoib_mcast_restart_task(struct work_struct *work) +@@ -906,7 +906,7 @@ spin_unlock(&priv->lock); netif_addr_unlock(dev); @@ -7820,11 +7696,10 @@ index 0d23e0568deb..140c94ce71c5 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 e853a2134680..5b6aa39a1de7 100644 ---- a/drivers/input/gameport/gameport.c -+++ b/drivers/input/gameport/gameport.c -@@ -124,12 +124,12 @@ static int old_gameport_measure_speed(struct gameport *gameport) +diff -Nur linux-4.1.39.orig/drivers/input/gameport/gameport.c linux-4.1.39/drivers/input/gameport/gameport.c +--- linux-4.1.39.orig/drivers/input/gameport/gameport.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/input/gameport/gameport.c 2017-04-18 17:56:30.585396045 +0200 +@@ -124,12 +124,12 @@ tx = 1 << 30; for(i = 0; i < 50; i++) { @@ -7839,7 +7714,7 @@ index e853a2134680..5b6aa39a1de7 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++) { @@ -7853,11 +7728,10 @@ index e853a2134680..5b6aa39a1de7 100644 udelay(i * 10); if (t2 - t1 < tx) tx = t2 - t1; } -diff --git a/drivers/leds/trigger/Kconfig b/drivers/leds/trigger/Kconfig -index 49794b47b51c..3d7245d6b2f8 100644 ---- a/drivers/leds/trigger/Kconfig -+++ b/drivers/leds/trigger/Kconfig -@@ -61,7 +61,7 @@ config LEDS_TRIGGER_BACKLIGHT +diff -Nur linux-4.1.39.orig/drivers/leds/trigger/Kconfig linux-4.1.39/drivers/leds/trigger/Kconfig +--- linux-4.1.39.orig/drivers/leds/trigger/Kconfig 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/leds/trigger/Kconfig 2017-04-18 17:56:30.585396045 +0200 +@@ -61,7 +61,7 @@ config LEDS_TRIGGER_CPU bool "LED CPU Trigger" @@ -7866,10 +7740,9 @@ index 49794b47b51c..3d7245d6b2f8 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.1.39.orig/drivers/md/bcache/Kconfig linux-4.1.39/drivers/md/bcache/Kconfig +--- linux-4.1.39.orig/drivers/md/bcache/Kconfig 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/md/bcache/Kconfig 2017-04-18 17:56:30.585396045 +0200 @@ -1,6 +1,7 @@ config BCACHE @@ -7878,11 +7751,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 87de9a0848b7..86f64c13ccf6 100644 ---- a/drivers/md/dm.c -+++ b/drivers/md/dm.c -@@ -2141,7 +2141,7 @@ static void dm_request_fn(struct request_queue *q) +diff -Nur linux-4.1.39.orig/drivers/md/dm.c linux-4.1.39/drivers/md/dm.c +--- linux-4.1.39.orig/drivers/md/dm.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/md/dm.c 2017-04-18 17:56:30.585396045 +0200 +@@ -2141,7 +2141,7 @@ /* Establish tio->ti before queuing work (map_tio_request) */ tio->ti = ti; queue_kthread_work(&md->kworker, &tio->work); @@ -7891,11 +7763,10 @@ index 87de9a0848b7..86f64c13ccf6 100644 } goto out; -diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c -index ef0a99a3a779..4e60997ef19a 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.1.39.orig/drivers/md/raid5.c linux-4.1.39/drivers/md/raid5.c +--- linux-4.1.39.orig/drivers/md/raid5.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/md/raid5.c 2017-04-18 17:56:30.585396045 +0200 +@@ -1918,8 +1918,9 @@ struct raid5_percpu *percpu; unsigned long cpu; @@ -7906,7 +7777,7 @@ index ef0a99a3a779..4e60997ef19a 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); } @@ -7916,7 +7787,7 @@ index ef0a99a3a779..4e60997ef19a 100644 } static struct stripe_head *alloc_stripe(struct kmem_cache *sc, gfp_t gfp) -@@ -6375,6 +6377,7 @@ static int raid5_alloc_percpu(struct r5conf *conf) +@@ -6375,6 +6377,7 @@ __func__, cpu); break; } @@ -7924,11 +7795,10 @@ index ef0a99a3a779..4e60997ef19a 100644 } put_online_cpus(); -diff --git a/drivers/md/raid5.h b/drivers/md/raid5.h -index d31ed93bb8a9..82fc623bf0b0 100644 ---- a/drivers/md/raid5.h -+++ b/drivers/md/raid5.h -@@ -495,6 +495,7 @@ struct r5conf { +diff -Nur linux-4.1.39.orig/drivers/md/raid5.h linux-4.1.39/drivers/md/raid5.h +--- linux-4.1.39.orig/drivers/md/raid5.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/md/raid5.h 2017-04-18 17:56:30.585396045 +0200 +@@ -495,6 +495,7 @@ int recovery_disabled; /* per cpu variables */ struct raid5_percpu { @@ -7936,97 +7806,9 @@ index d31ed93bb8a9..82fc623bf0b0 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 b3c10b7dae1f..b9d7f076f2f8 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 -@@ -113,6 +122,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 7d5c4cd118c4..6a8e39388cf9 100644 ---- a/drivers/misc/Makefile -+++ b/drivers/misc/Makefile -@@ -38,6 +38,7 @@ obj-$(CONFIG_C2PORT) += c2port/ - obj-$(CONFIG_HMC6352) += hmc6352.o - obj-y += eeprom/ - obj-y += cb710/ -+obj-$(CONFIG_HWLAT_DETECTOR) += hwlat_detector.o - obj-$(CONFIG_SPEAR13XX_PCIE_GADGET) += spear13xx_pcie_gadget.o - obj-$(CONFIG_VMWARE_BALLOON) += vmw_balloon.o - obj-$(CONFIG_ARM_CHARLCD) += arm-charlcd.o -diff --git a/drivers/misc/hwlat_detector.c b/drivers/misc/hwlat_detector.c -new file mode 100644 -index 000000000000..2429c4331e68 ---- /dev/null -+++ b/drivers/misc/hwlat_detector.c +diff -Nur linux-4.1.39.orig/drivers/misc/hwlat_detector.c linux-4.1.39/drivers/misc/hwlat_detector.c +--- linux-4.1.39.orig/drivers/misc/hwlat_detector.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.39/drivers/misc/hwlat_detector.c 2017-04-18 17:56:30.585396045 +0200 @@ -0,0 +1,1240 @@ +/* + * hwlat_detector.c - A simple Hardware Latency detector. @@ -9268,11 +9050,94 @@ index 000000000000..2429c4331e68 + +module_init(detector_init); +module_exit(detector_exit); -diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c -index acece3299756..58ea04a03fa9 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.1.39.orig/drivers/misc/Kconfig linux-4.1.39/drivers/misc/Kconfig +--- linux-4.1.39.orig/drivers/misc/Kconfig 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/misc/Kconfig 2017-04-18 17:56:30.585396045 +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 +@@ -113,6 +122,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.1.39.orig/drivers/misc/Makefile linux-4.1.39/drivers/misc/Makefile +--- linux-4.1.39.orig/drivers/misc/Makefile 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/misc/Makefile 2017-04-18 17:56:30.585396045 +0200 +@@ -38,6 +38,7 @@ + obj-$(CONFIG_HMC6352) += hmc6352.o + obj-y += eeprom/ + obj-y += cb710/ ++obj-$(CONFIG_HWLAT_DETECTOR) += hwlat_detector.o + obj-$(CONFIG_SPEAR13XX_PCIE_GADGET) += spear13xx_pcie_gadget.o + obj-$(CONFIG_VMWARE_BALLOON) += vmw_balloon.o + obj-$(CONFIG_ARM_CHARLCD) += arm-charlcd.o +diff -Nur linux-4.1.39.orig/drivers/mmc/host/mmci.c linux-4.1.39/drivers/mmc/host/mmci.c +--- linux-4.1.39.orig/drivers/mmc/host/mmci.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/mmc/host/mmci.c 2017-04-18 17:56:30.589396200 +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; @@ -9288,7 +9153,7 @@ index acece3299756..58ea04a03fa9 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); @@ -9297,11 +9162,10 @@ index acece3299756..58ea04a03fa9 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 41095ebad97f..b0a0cb22aec4 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.1.39.orig/drivers/net/ethernet/3com/3c59x.c linux-4.1.39/drivers/net/ethernet/3com/3c59x.c +--- linux-4.1.39.orig/drivers/net/ethernet/3com/3c59x.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/net/ethernet/3com/3c59x.c 2017-04-18 17:56:30.589396200 +0200 +@@ -842,9 +842,9 @@ { struct vortex_private *vp = netdev_priv(dev); unsigned long flags; @@ -9313,7 +9177,7 @@ index 41095ebad97f..b0a0cb22aec4 100644 } #endif -@@ -1916,12 +1916,12 @@ static void vortex_tx_timeout(struct net_device *dev) +@@ -1916,12 +1916,12 @@ * Block interrupts because vortex_interrupt does a bare spin_lock() */ unsigned long flags; @@ -9328,11 +9192,10 @@ index 41095ebad97f..b0a0cb22aec4 100644 } } -diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c -index 6e9036a06515..cc956b06ad18 100644 ---- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c -+++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c -@@ -2212,11 +2212,7 @@ static netdev_tx_t atl1c_xmit_frame(struct sk_buff *skb, +diff -Nur linux-4.1.39.orig/drivers/net/ethernet/atheros/atl1c/atl1c_main.c linux-4.1.39/drivers/net/ethernet/atheros/atl1c/atl1c_main.c +--- linux-4.1.39.orig/drivers/net/ethernet/atheros/atl1c/atl1c_main.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/net/ethernet/atheros/atl1c/atl1c_main.c 2017-04-18 17:56:30.589396200 +0200 +@@ -2212,11 +2212,7 @@ } tpd_req = atl1c_cal_tpd_req(skb); @@ -9345,11 +9208,10 @@ index 6e9036a06515..cc956b06ad18 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.1.39.orig/drivers/net/ethernet/atheros/atl1e/atl1e_main.c linux-4.1.39/drivers/net/ethernet/atheros/atl1e/atl1e_main.c +--- linux-4.1.39.orig/drivers/net/ethernet/atheros/atl1e/atl1e_main.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/net/ethernet/atheros/atl1e/atl1e_main.c 2017-04-18 17:56:30.589396200 +0200 +@@ -1880,8 +1880,7 @@ return NETDEV_TX_OK; } tpd_req = atl1e_cal_tdp_req(skb); @@ -9359,11 +9221,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.1.39.orig/drivers/net/ethernet/chelsio/cxgb/sge.c linux-4.1.39/drivers/net/ethernet/chelsio/cxgb/sge.c +--- linux-4.1.39.orig/drivers/net/ethernet/chelsio/cxgb/sge.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/net/ethernet/chelsio/cxgb/sge.c 2017-04-18 17:56:30.589396200 +0200 +@@ -1664,8 +1664,7 @@ struct cmdQ *q = &sge->cmdQ[qid]; unsigned int credits, pidx, genbit, count, use_sched_skb = 0; @@ -9373,11 +9234,10 @@ index 526ea74e82d9..86f467a2c485 100644 reclaim_completed_tx(sge, q); -diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c -index 4ee080d49bc0..e616b71d5014 100644 ---- a/drivers/net/ethernet/freescale/gianfar.c -+++ b/drivers/net/ethernet/freescale/gianfar.c -@@ -1540,7 +1540,7 @@ static int gfar_suspend(struct device *dev) +diff -Nur linux-4.1.39.orig/drivers/net/ethernet/freescale/gianfar.c linux-4.1.39/drivers/net/ethernet/freescale/gianfar.c +--- linux-4.1.39.orig/drivers/net/ethernet/freescale/gianfar.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/net/ethernet/freescale/gianfar.c 2017-04-18 17:56:30.589396200 +0200 +@@ -1540,7 +1540,7 @@ if (netif_running(ndev)) { @@ -9386,7 +9246,7 @@ index 4ee080d49bc0..e616b71d5014 100644 lock_tx_qs(priv); gfar_halt_nodisable(priv); -@@ -1556,7 +1556,7 @@ static int gfar_suspend(struct device *dev) +@@ -1556,7 +1556,7 @@ gfar_write(®s->maccfg1, tempval); unlock_tx_qs(priv); @@ -9395,7 +9255,7 @@ index 4ee080d49bc0..e616b71d5014 100644 disable_napi(priv); -@@ -1598,7 +1598,7 @@ static int gfar_resume(struct device *dev) +@@ -1598,7 +1598,7 @@ /* Disable Magic Packet mode, in case something * else woke us up. */ @@ -9404,7 +9264,7 @@ index 4ee080d49bc0..e616b71d5014 100644 lock_tx_qs(priv); tempval = gfar_read(®s->maccfg2); -@@ -1608,7 +1608,7 @@ static int gfar_resume(struct device *dev) +@@ -1608,7 +1608,7 @@ gfar_start(priv); unlock_tx_qs(priv); @@ -9413,7 +9273,7 @@ index 4ee080d49bc0..e616b71d5014 100644 netif_device_attach(ndev); -@@ -3418,14 +3418,14 @@ static irqreturn_t gfar_error(int irq, void *grp_id) +@@ -3418,14 +3418,14 @@ dev->stats.tx_dropped++; atomic64_inc(&priv->extra_stats.tx_underrun); @@ -9430,11 +9290,10 @@ index 4ee080d49bc0..e616b71d5014 100644 } netif_dbg(priv, tx_err, dev, "Transmit Error\n"); } -diff --git a/drivers/net/ethernet/neterion/s2io.c b/drivers/net/ethernet/neterion/s2io.c -index 1e0f72b65459..bb5ced2b5194 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.1.39.orig/drivers/net/ethernet/neterion/s2io.c linux-4.1.39/drivers/net/ethernet/neterion/s2io.c +--- linux-4.1.39.orig/drivers/net/ethernet/neterion/s2io.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/net/ethernet/neterion/s2io.c 2017-04-18 17:56:30.589396200 +0200 +@@ -4084,12 +4084,7 @@ [skb->priority & (MAX_TX_FIFOS - 1)]; fifo = &mac_control->fifos[queue]; @@ -9448,11 +9307,10 @@ index 1e0f72b65459..bb5ced2b5194 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.1.39.orig/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c linux-4.1.39/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c +--- linux-4.1.39.orig/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c 2017-04-18 17:56:30.589396200 +0200 +@@ -2137,10 +2137,8 @@ struct pch_gbe_tx_ring *tx_ring = adapter->tx_ring; unsigned long flags; @@ -9465,11 +9323,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 78bb4ceb1cdd..b5156963ca07 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.1.39.orig/drivers/net/ethernet/realtek/8139too.c linux-4.1.39/drivers/net/ethernet/realtek/8139too.c +--- linux-4.1.39.orig/drivers/net/ethernet/realtek/8139too.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/net/ethernet/realtek/8139too.c 2017-04-18 17:56:30.593396355 +0200 +@@ -2229,7 +2229,7 @@ struct rtl8139_private *tp = netdev_priv(dev); const int irq = tp->pci_dev->irq; @@ -9478,11 +9335,10 @@ index 78bb4ceb1cdd..b5156963ca07 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 a9cac8413e49..bd70b848174d 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.1.39.orig/drivers/net/ethernet/tehuti/tehuti.c linux-4.1.39/drivers/net/ethernet/tehuti/tehuti.c +--- linux-4.1.39.orig/drivers/net/ethernet/tehuti/tehuti.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/net/ethernet/tehuti/tehuti.c 2017-04-18 17:56:30.593396355 +0200 +@@ -1629,13 +1629,8 @@ unsigned long flags; ENTER; @@ -9498,11 +9354,10 @@ index a9cac8413e49..bd70b848174d 100644 /* build tx descriptor */ BDX_ASSERT(f->m.wptr >= f->m.memsz); /* started with valid wptr */ -diff --git a/drivers/net/rionet.c b/drivers/net/rionet.c -index 18cc2c8d5447..a5e0ef3c02d1 100644 ---- a/drivers/net/rionet.c -+++ b/drivers/net/rionet.c -@@ -174,11 +174,7 @@ static int rionet_start_xmit(struct sk_buff *skb, struct net_device *ndev) +diff -Nur linux-4.1.39.orig/drivers/net/rionet.c linux-4.1.39/drivers/net/rionet.c +--- linux-4.1.39.orig/drivers/net/rionet.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/net/rionet.c 2017-04-18 17:56:30.593396355 +0200 +@@ -174,11 +174,7 @@ unsigned long flags; int add_num = 1; @@ -9515,11 +9370,10 @@ index 18cc2c8d5447..a5e0ef3c02d1 100644 if (is_multicast_ether_addr(eth->h_dest)) add_num = nets[rnet->mport->id].nact; -diff --git a/drivers/net/wireless/orinoco/orinoco_usb.c b/drivers/net/wireless/orinoco/orinoco_usb.c -index 91f05442de28..8fb1c92724df 100644 ---- a/drivers/net/wireless/orinoco/orinoco_usb.c -+++ b/drivers/net/wireless/orinoco/orinoco_usb.c -@@ -697,7 +697,7 @@ static void ezusb_req_ctx_wait(struct ezusb_priv *upriv, +diff -Nur linux-4.1.39.orig/drivers/net/wireless/orinoco/orinoco_usb.c linux-4.1.39/drivers/net/wireless/orinoco/orinoco_usb.c +--- linux-4.1.39.orig/drivers/net/wireless/orinoco/orinoco_usb.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/net/wireless/orinoco/orinoco_usb.c 2017-04-18 17:56:30.593396355 +0200 +@@ -697,7 +697,7 @@ while (!ctx->done.done && msecs--) udelay(1000); } else { @@ -9528,11 +9382,10 @@ index 91f05442de28..8fb1c92724df 100644 ctx->done.done); } break; -diff --git a/drivers/pci/access.c b/drivers/pci/access.c -index 502a82ca1db0..6bb46e0a3349 100644 ---- a/drivers/pci/access.c -+++ b/drivers/pci/access.c -@@ -561,7 +561,7 @@ void pci_cfg_access_unlock(struct pci_dev *dev) +diff -Nur linux-4.1.39.orig/drivers/pci/access.c linux-4.1.39/drivers/pci/access.c +--- linux-4.1.39.orig/drivers/pci/access.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/pci/access.c 2017-04-18 17:56:30.593396355 +0200 +@@ -561,7 +561,7 @@ WARN_ON(!dev->block_cfg_access); dev->block_cfg_access = 0; @@ -9541,11 +9394,218 @@ index 502a82ca1db0..6bb46e0a3349 100644 raw_spin_unlock_irqrestore(&pci_lock, flags); } EXPORT_SYMBOL_GPL(pci_cfg_access_unlock); -diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c -index ec193a8357d7..455bf9c67b16 100644 ---- a/drivers/scsi/fcoe/fcoe.c -+++ b/drivers/scsi/fcoe/fcoe.c -@@ -1287,7 +1287,7 @@ static void fcoe_percpu_thread_destroy(unsigned int cpu) +diff -Nur linux-4.1.39.orig/drivers/pinctrl/qcom/pinctrl-msm.c linux-4.1.39/drivers/pinctrl/qcom/pinctrl-msm.c +--- linux-4.1.39.orig/drivers/pinctrl/qcom/pinctrl-msm.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/pinctrl/qcom/pinctrl-msm.c 2017-04-18 17:56:30.593396355 +0200 +@@ -59,7 +59,7 @@ + struct notifier_block restart_nb; + int irq; + +- spinlock_t lock; ++ raw_spinlock_t lock; + + DECLARE_BITMAP(dual_edge_irqs, MAX_NR_GPIO); + DECLARE_BITMAP(enabled_irqs, MAX_NR_GPIO); +@@ -155,14 +155,14 @@ + if (WARN_ON(i == g->nfuncs)) + return -EINVAL; + +- spin_lock_irqsave(&pctrl->lock, flags); ++ raw_spin_lock_irqsave(&pctrl->lock, flags); + + val = readl(pctrl->regs + g->ctl_reg); + val &= ~(0x7 << g->mux_bit); + val |= i << g->mux_bit; + writel(val, pctrl->regs + g->ctl_reg); + +- spin_unlock_irqrestore(&pctrl->lock, flags); ++ raw_spin_unlock_irqrestore(&pctrl->lock, flags); + + return 0; + } +@@ -325,14 +325,14 @@ + break; + case PIN_CONFIG_OUTPUT: + /* set output value */ +- spin_lock_irqsave(&pctrl->lock, flags); ++ raw_spin_lock_irqsave(&pctrl->lock, flags); + val = readl(pctrl->regs + g->io_reg); + if (arg) + val |= BIT(g->out_bit); + else + val &= ~BIT(g->out_bit); + writel(val, pctrl->regs + g->io_reg); +- spin_unlock_irqrestore(&pctrl->lock, flags); ++ raw_spin_unlock_irqrestore(&pctrl->lock, flags); + + /* enable output */ + arg = 1; +@@ -353,12 +353,12 @@ + return -EINVAL; + } + +- spin_lock_irqsave(&pctrl->lock, flags); ++ raw_spin_lock_irqsave(&pctrl->lock, flags); + val = readl(pctrl->regs + g->ctl_reg); + val &= ~(mask << bit); + val |= arg << bit; + writel(val, pctrl->regs + g->ctl_reg); +- spin_unlock_irqrestore(&pctrl->lock, flags); ++ raw_spin_unlock_irqrestore(&pctrl->lock, flags); + } + + return 0; +@@ -386,13 +386,13 @@ + + g = &pctrl->soc->groups[offset]; + +- spin_lock_irqsave(&pctrl->lock, flags); ++ raw_spin_lock_irqsave(&pctrl->lock, flags); + + val = readl(pctrl->regs + g->ctl_reg); + val &= ~BIT(g->oe_bit); + writel(val, pctrl->regs + g->ctl_reg); + +- spin_unlock_irqrestore(&pctrl->lock, flags); ++ raw_spin_unlock_irqrestore(&pctrl->lock, flags); + + return 0; + } +@@ -406,7 +406,7 @@ + + g = &pctrl->soc->groups[offset]; + +- spin_lock_irqsave(&pctrl->lock, flags); ++ raw_spin_lock_irqsave(&pctrl->lock, flags); + + val = readl(pctrl->regs + g->io_reg); + if (value) +@@ -419,7 +419,7 @@ + val |= BIT(g->oe_bit); + writel(val, pctrl->regs + g->ctl_reg); + +- spin_unlock_irqrestore(&pctrl->lock, flags); ++ raw_spin_unlock_irqrestore(&pctrl->lock, flags); + + return 0; + } +@@ -445,7 +445,7 @@ + + g = &pctrl->soc->groups[offset]; + +- spin_lock_irqsave(&pctrl->lock, flags); ++ raw_spin_lock_irqsave(&pctrl->lock, flags); + + val = readl(pctrl->regs + g->io_reg); + if (value) +@@ -454,7 +454,7 @@ + val &= ~BIT(g->out_bit); + writel(val, pctrl->regs + g->io_reg); + +- spin_unlock_irqrestore(&pctrl->lock, flags); ++ raw_spin_unlock_irqrestore(&pctrl->lock, flags); + } + + static int msm_gpio_request(struct gpio_chip *chip, unsigned offset) +@@ -585,7 +585,7 @@ + + g = &pctrl->soc->groups[d->hwirq]; + +- spin_lock_irqsave(&pctrl->lock, flags); ++ raw_spin_lock_irqsave(&pctrl->lock, flags); + + val = readl(pctrl->regs + g->intr_cfg_reg); + val &= ~BIT(g->intr_enable_bit); +@@ -593,7 +593,7 @@ + + clear_bit(d->hwirq, pctrl->enabled_irqs); + +- spin_unlock_irqrestore(&pctrl->lock, flags); ++ raw_spin_unlock_irqrestore(&pctrl->lock, flags); + } + + static void msm_gpio_irq_unmask(struct irq_data *d) +@@ -606,7 +606,7 @@ + + g = &pctrl->soc->groups[d->hwirq]; + +- spin_lock_irqsave(&pctrl->lock, flags); ++ raw_spin_lock_irqsave(&pctrl->lock, flags); + + val = readl(pctrl->regs + g->intr_status_reg); + val &= ~BIT(g->intr_status_bit); +@@ -618,7 +618,7 @@ + + set_bit(d->hwirq, pctrl->enabled_irqs); + +- spin_unlock_irqrestore(&pctrl->lock, flags); ++ raw_spin_unlock_irqrestore(&pctrl->lock, flags); + } + + static void msm_gpio_irq_ack(struct irq_data *d) +@@ -631,7 +631,7 @@ + + g = &pctrl->soc->groups[d->hwirq]; + +- spin_lock_irqsave(&pctrl->lock, flags); ++ raw_spin_lock_irqsave(&pctrl->lock, flags); + + val = readl(pctrl->regs + g->intr_status_reg); + if (g->intr_ack_high) +@@ -643,7 +643,7 @@ + if (test_bit(d->hwirq, pctrl->dual_edge_irqs)) + msm_gpio_update_dual_edge_pos(pctrl, g, d); + +- spin_unlock_irqrestore(&pctrl->lock, flags); ++ raw_spin_unlock_irqrestore(&pctrl->lock, flags); + } + + static int msm_gpio_irq_set_type(struct irq_data *d, unsigned int type) +@@ -656,7 +656,7 @@ + + g = &pctrl->soc->groups[d->hwirq]; + +- spin_lock_irqsave(&pctrl->lock, flags); ++ raw_spin_lock_irqsave(&pctrl->lock, flags); + + /* + * For hw without possibility of detecting both edges +@@ -730,7 +730,7 @@ + if (test_bit(d->hwirq, pctrl->dual_edge_irqs)) + msm_gpio_update_dual_edge_pos(pctrl, g, d); + +- spin_unlock_irqrestore(&pctrl->lock, flags); ++ raw_spin_unlock_irqrestore(&pctrl->lock, flags); + + if (type & (IRQ_TYPE_LEVEL_LOW | IRQ_TYPE_LEVEL_HIGH)) + __irq_set_handler_locked(d->irq, handle_level_irq); +@@ -746,11 +746,11 @@ + struct msm_pinctrl *pctrl = to_msm_pinctrl(gc); + unsigned long flags; + +- spin_lock_irqsave(&pctrl->lock, flags); ++ raw_spin_lock_irqsave(&pctrl->lock, flags); + + irq_set_irq_wake(pctrl->irq, on); + +- spin_unlock_irqrestore(&pctrl->lock, flags); ++ raw_spin_unlock_irqrestore(&pctrl->lock, flags); + + return 0; + } +@@ -887,7 +887,7 @@ + pctrl->soc = soc_data; + pctrl->chip = msm_gpio_template; + +- spin_lock_init(&pctrl->lock); ++ raw_spin_lock_init(&pctrl->lock); + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + pctrl->regs = devm_ioremap_resource(&pdev->dev, res); +diff -Nur linux-4.1.39.orig/drivers/scsi/fcoe/fcoe.c linux-4.1.39/drivers/scsi/fcoe/fcoe.c +--- linux-4.1.39.orig/drivers/scsi/fcoe/fcoe.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/scsi/fcoe/fcoe.c 2017-04-18 17:56:30.593396355 +0200 +@@ -1287,7 +1287,7 @@ struct sk_buff *skb; #ifdef CONFIG_SMP struct fcoe_percpu_s *p0; @@ -9554,7 +9614,7 @@ index ec193a8357d7..455bf9c67b16 100644 #endif /* CONFIG_SMP */ FCOE_DBG("Destroying receive thread for CPU %d\n", cpu); -@@ -1343,7 +1343,7 @@ static void fcoe_percpu_thread_destroy(unsigned int cpu) +@@ -1343,7 +1343,7 @@ kfree_skb(skb); spin_unlock_bh(&p->fcoe_rx_list.lock); } @@ -9563,7 +9623,7 @@ index ec193a8357d7..455bf9c67b16 100644 #else /* * This a non-SMP scenario where the singular Rx thread is -@@ -1567,11 +1567,11 @@ err2: +@@ -1567,11 +1567,11 @@ static int fcoe_alloc_paged_crc_eof(struct sk_buff *skb, int tlen) { struct fcoe_percpu_s *fps; @@ -9578,7 +9638,7 @@ index ec193a8357d7..455bf9c67b16 100644 return rc; } -@@ -1767,11 +1767,11 @@ static inline int fcoe_filter_frames(struct fc_lport *lport, +@@ -1767,11 +1767,11 @@ return 0; } @@ -9592,7 +9652,7 @@ index ec193a8357d7..455bf9c67b16 100644 return -EINVAL; } -@@ -1815,7 +1815,7 @@ static void fcoe_recv_frame(struct sk_buff *skb) +@@ -1815,7 +1815,7 @@ */ hp = (struct fcoe_hdr *) skb_network_header(skb); @@ -9601,7 +9661,7 @@ index ec193a8357d7..455bf9c67b16 100644 if (unlikely(FC_FCOE_DECAPS_VER(hp) != FC_FCOE_VER)) { if (stats->ErrorFrames < 5) printk(KERN_WARNING "fcoe: FCoE version " -@@ -1847,13 +1847,13 @@ static void fcoe_recv_frame(struct sk_buff *skb) +@@ -1847,13 +1847,13 @@ goto drop; if (!fcoe_filter_frames(lport, fp)) { @@ -9617,11 +9677,10 @@ index ec193a8357d7..455bf9c67b16 100644 kfree_skb(skb); } -diff --git a/drivers/scsi/fcoe/fcoe_ctlr.c b/drivers/scsi/fcoe/fcoe_ctlr.c -index 34a1b1f333b4..d91131210695 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.1.39.orig/drivers/scsi/fcoe/fcoe_ctlr.c linux-4.1.39/drivers/scsi/fcoe/fcoe_ctlr.c +--- linux-4.1.39.orig/drivers/scsi/fcoe/fcoe_ctlr.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/scsi/fcoe/fcoe_ctlr.c 2017-04-18 17:56:30.593396355 +0200 +@@ -831,7 +831,7 @@ INIT_LIST_HEAD(&del_list); @@ -9630,7 +9689,7 @@ index 34a1b1f333b4..d91131210695 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; } } @@ -9639,11 +9698,10 @@ index 34a1b1f333b4..d91131210695 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.1.39.orig/drivers/scsi/libfc/fc_exch.c linux-4.1.39/drivers/scsi/libfc/fc_exch.c +--- linux-4.1.39.orig/drivers/scsi/libfc/fc_exch.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/scsi/libfc/fc_exch.c 2017-04-18 17:56:30.593396355 +0200 +@@ -814,10 +814,10 @@ } memset(ep, 0, sizeof(*ep)); @@ -9656,11 +9714,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.1.39.orig/drivers/scsi/libsas/sas_ata.c linux-4.1.39/drivers/scsi/libsas/sas_ata.c +--- linux-4.1.39.orig/drivers/scsi/libsas/sas_ata.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/scsi/libsas/sas_ata.c 2017-04-18 17:56:30.593396355 +0200 +@@ -190,7 +190,7 @@ /* TODO: audit callers to ensure they are ready for qc_issue to * unconditionally re-enable interrupts */ @@ -9669,7 +9726,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); @@ -9678,11 +9735,10 @@ index 9c706d8c1441..d968ffc79c08 100644 return ret; } -diff --git a/drivers/scsi/qla2xxx/qla_inline.h b/drivers/scsi/qla2xxx/qla_inline.h -index fee9eb7c8a60..b42d4adc42dc 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.1.39.orig/drivers/scsi/qla2xxx/qla_inline.h linux-4.1.39/drivers/scsi/qla2xxx/qla_inline.h +--- linux-4.1.39.orig/drivers/scsi/qla2xxx/qla_inline.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/scsi/qla2xxx/qla_inline.h 2017-04-18 17:56:30.593396355 +0200 +@@ -59,12 +59,12 @@ { unsigned long flags; struct qla_hw_data *ha = rsp->hw; @@ -9697,10 +9753,9 @@ index fee9eb7c8a60..b42d4adc42dc 100644 } static inline uint8_t * -diff --git a/drivers/thermal/x86_pkg_temp_thermal.c b/drivers/thermal/x86_pkg_temp_thermal.c -index 9ea3d9d49ffc..9e68706ae5e2 100644 ---- a/drivers/thermal/x86_pkg_temp_thermal.c -+++ b/drivers/thermal/x86_pkg_temp_thermal.c +diff -Nur linux-4.1.39.orig/drivers/thermal/x86_pkg_temp_thermal.c linux-4.1.39/drivers/thermal/x86_pkg_temp_thermal.c +--- linux-4.1.39.orig/drivers/thermal/x86_pkg_temp_thermal.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/thermal/x86_pkg_temp_thermal.c 2017-04-18 17:56:30.593396355 +0200 @@ -29,6 +29,7 @@ #include <linux/pm.h> #include <linux/thermal.h> @@ -9709,7 +9764,7 @@ index 9ea3d9d49ffc..9e68706ae5e2 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 @@ } } @@ -9718,7 +9773,7 @@ index 9ea3d9d49ffc..9e68706ae5e2 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); @@ -9727,7 +9782,7 @@ index 9ea3d9d49ffc..9e68706ae5e2 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)); @@ -9776,7 +9831,7 @@ index 9ea3d9d49ffc..9e68706ae5e2 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; @@ -9786,7 +9841,7 @@ index 9ea3d9d49ffc..9e68706ae5e2 100644 spin_lock_init(&pkg_work_lock); platform_thermal_package_notify = pkg_temp_thermal_platform_thermal_notify; -@@ -608,7 +651,7 @@ err_ret: +@@ -608,7 +651,7 @@ kfree(pkg_work_scheduled); platform_thermal_package_notify = NULL; platform_thermal_package_rate_control = NULL; @@ -9795,7 +9850,7 @@ index 9ea3d9d49ffc..9e68706ae5e2 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; @@ -9803,10 +9858,9 @@ index 9ea3d9d49ffc..9e68706ae5e2 100644 for_each_online_cpu(i) cancel_delayed_work_sync( &per_cpu(pkg_temp_thermal_threshold_work, i)); -diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c -index a64d53f7b1d1..fd96ce65bc31 100644 ---- a/drivers/tty/serial/8250/8250_core.c -+++ b/drivers/tty/serial/8250/8250_core.c +diff -Nur linux-4.1.39.orig/drivers/tty/serial/8250/8250_core.c linux-4.1.39/drivers/tty/serial/8250/8250_core.c +--- linux-4.1.39.orig/drivers/tty/serial/8250/8250_core.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/tty/serial/8250/8250_core.c 2017-04-18 17:56:30.593396355 +0200 @@ -36,6 +36,7 @@ #include <linux/nmi.h> #include <linux/mutex.h> @@ -9815,7 +9869,7 @@ index a64d53f7b1d1..fd96ce65bc31 100644 #include <linux/uaccess.h> #include <linux/pm_runtime.h> #ifdef CONFIG_SPARC -@@ -80,7 +81,16 @@ static unsigned int skip_txen_test; /* force skip of txen test at init time */ +@@ -80,7 +81,16 @@ #define DEBUG_INTR(fmt...) do { } while (0) #endif @@ -9833,7 +9887,7 @@ index a64d53f7b1d1..fd96ce65bc31 100644 #define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE) -@@ -3366,7 +3376,7 @@ static void serial8250_console_write(struct uart_8250_port *up, const char *s, +@@ -3366,7 +3376,7 @@ if (port->sysrq) locked = 0; @@ -9842,11 +9896,10 @@ index a64d53f7b1d1..fd96ce65bc31 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 0cc622afb67d..52f45f3029b7 100644 ---- a/drivers/tty/serial/amba-pl011.c -+++ b/drivers/tty/serial/amba-pl011.c -@@ -2000,13 +2000,19 @@ pl011_console_write(struct console *co, const char *s, unsigned int count) +diff -Nur linux-4.1.39.orig/drivers/tty/serial/amba-pl011.c linux-4.1.39/drivers/tty/serial/amba-pl011.c +--- linux-4.1.39.orig/drivers/tty/serial/amba-pl011.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/tty/serial/amba-pl011.c 2017-04-18 17:56:30.597396510 +0200 +@@ -2000,13 +2000,19 @@ clk_enable(uap->clk); @@ -9869,7 +9922,7 @@ index 0cc622afb67d..52f45f3029b7 100644 /* * First save the CR then disable the interrupts -@@ -2028,8 +2034,7 @@ pl011_console_write(struct console *co, const char *s, unsigned int count) +@@ -2028,8 +2034,7 @@ writew(old_cr, uap->port.membase + UART011_CR); if (locked) @@ -9879,11 +9932,10 @@ index 0cc622afb67d..52f45f3029b7 100644 clk_disable(uap->clk); } -diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c -index 0a88693cd8ca..b89b06ed3b74 100644 ---- a/drivers/tty/serial/omap-serial.c -+++ b/drivers/tty/serial/omap-serial.c -@@ -1282,13 +1282,10 @@ serial_omap_console_write(struct console *co, const char *s, +diff -Nur linux-4.1.39.orig/drivers/tty/serial/omap-serial.c linux-4.1.39/drivers/tty/serial/omap-serial.c +--- linux-4.1.39.orig/drivers/tty/serial/omap-serial.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/tty/serial/omap-serial.c 2017-04-18 17:56:30.597396510 +0200 +@@ -1282,13 +1282,10 @@ pm_runtime_get_sync(up->dev); @@ -9900,7 +9952,7 @@ index 0a88693cd8ca..b89b06ed3b74 100644 /* * First save the IER then disable the interrupts -@@ -1317,8 +1314,7 @@ serial_omap_console_write(struct console *co, const char *s, +@@ -1317,8 +1314,7 @@ pm_runtime_mark_last_busy(up->dev); pm_runtime_put_autosuspend(up->dev); if (locked) @@ -9910,11 +9962,10 @@ index 0a88693cd8ca..b89b06ed3b74 100644 } static int __init -diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c -index 3a49ba2910df..c55c42603849 100644 ---- a/drivers/usb/core/hcd.c -+++ b/drivers/usb/core/hcd.c -@@ -1684,9 +1684,9 @@ static void __usb_hcd_giveback_urb(struct urb *urb) +diff -Nur linux-4.1.39.orig/drivers/usb/core/hcd.c linux-4.1.39/drivers/usb/core/hcd.c +--- linux-4.1.39.orig/drivers/usb/core/hcd.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/usb/core/hcd.c 2017-04-18 17:56:30.597396510 +0200 +@@ -1684,9 +1684,9 @@ * and no one may trigger the above deadlock situation when * running complete() in tasklet. */ @@ -9926,11 +9977,10 @@ index 3a49ba2910df..c55c42603849 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 db9433eed2cc..6536d557abc1 100644 ---- a/drivers/usb/gadget/function/f_fs.c -+++ b/drivers/usb/gadget/function/f_fs.c -@@ -1404,7 +1404,7 @@ static void ffs_data_put(struct ffs_data *ffs) +diff -Nur linux-4.1.39.orig/drivers/usb/gadget/function/f_fs.c linux-4.1.39/drivers/usb/gadget/function/f_fs.c +--- linux-4.1.39.orig/drivers/usb/gadget/function/f_fs.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/usb/gadget/function/f_fs.c 2017-04-18 17:56:30.597396510 +0200 +@@ -1404,7 +1404,7 @@ pr_info("%s(): freeing\n", __func__); ffs_data_clear(ffs); BUG_ON(waitqueue_active(&ffs->ev.waitq) || @@ -9939,11 +9989,10 @@ index db9433eed2cc..6536d557abc1 100644 kfree(ffs->dev_name); kfree(ffs); } -diff --git a/drivers/usb/gadget/legacy/inode.c b/drivers/usb/gadget/legacy/inode.c -index bccc5788bb98..8c23636963bc 100644 ---- a/drivers/usb/gadget/legacy/inode.c -+++ b/drivers/usb/gadget/legacy/inode.c -@@ -345,7 +345,7 @@ ep_io (struct ep_data *epdata, void *buf, unsigned len) +diff -Nur linux-4.1.39.orig/drivers/usb/gadget/legacy/inode.c linux-4.1.39/drivers/usb/gadget/legacy/inode.c +--- linux-4.1.39.orig/drivers/usb/gadget/legacy/inode.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/usb/gadget/legacy/inode.c 2017-04-18 17:56:30.597396510 +0200 +@@ -345,7 +345,7 @@ spin_unlock_irq (&epdata->dev->lock); if (likely (value == 0)) { @@ -9952,7 +10001,7 @@ index bccc5788bb98..8c23636963bc 100644 if (value != 0) { spin_lock_irq (&epdata->dev->lock); if (likely (epdata->ep != NULL)) { -@@ -354,7 +354,7 @@ ep_io (struct ep_data *epdata, void *buf, unsigned len) +@@ -354,7 +354,7 @@ usb_ep_dequeue (epdata->ep, epdata->req); spin_unlock_irq (&epdata->dev->lock); @@ -9961,10 +10010,9 @@ index bccc5788bb98..8c23636963bc 100644 if (epdata->status == -ECONNRESET) epdata->status = -EINTR; } else { -diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.c b/drivers/usb/gadget/udc/atmel_usba_udc.c -index d6ca3697d3c8..ee6bc64f9656 100644 ---- a/drivers/usb/gadget/udc/atmel_usba_udc.c -+++ b/drivers/usb/gadget/udc/atmel_usba_udc.c +diff -Nur linux-4.1.39.orig/drivers/usb/gadget/udc/atmel_usba_udc.c linux-4.1.39/drivers/usb/gadget/udc/atmel_usba_udc.c +--- linux-4.1.39.orig/drivers/usb/gadget/udc/atmel_usba_udc.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/usb/gadget/udc/atmel_usba_udc.c 2017-04-18 17:56:30.597396510 +0200 @@ -17,7 +17,9 @@ #include <linux/device.h> #include <linux/dma-mapping.h> @@ -9975,7 +10023,7 @@ index d6ca3697d3c8..ee6bc64f9656 100644 #include <linux/usb/ch9.h> #include <linux/usb/gadget.h> #include <linux/usb/atmel_usba_udc.h> -@@ -1889,20 +1891,15 @@ static int atmel_usba_stop(struct usb_gadget *gadget) +@@ -1889,20 +1891,15 @@ #ifdef CONFIG_OF static void at91sam9rl_toggle_bias(struct usba_udc *udc, int is_on) { @@ -10001,7 +10049,7 @@ index d6ca3697d3c8..ee6bc64f9656 100644 } static const struct usba_udc_errata at91sam9rl_errata = { -@@ -1939,6 +1936,9 @@ static struct usba_ep * atmel_udc_of_init(struct platform_device *pdev, +@@ -1939,6 +1936,9 @@ return ERR_PTR(-EINVAL); udc->errata = match->data; @@ -10011,11 +10059,10 @@ index d6ca3697d3c8..ee6bc64f9656 100644 udc->num_ep = 0; -diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.h b/drivers/usb/gadget/udc/atmel_usba_udc.h -index ea448a344767..3e1c9d589dfa 100644 ---- a/drivers/usb/gadget/udc/atmel_usba_udc.h -+++ b/drivers/usb/gadget/udc/atmel_usba_udc.h -@@ -354,6 +354,8 @@ struct usba_udc { +diff -Nur linux-4.1.39.orig/drivers/usb/gadget/udc/atmel_usba_udc.h linux-4.1.39/drivers/usb/gadget/udc/atmel_usba_udc.h +--- linux-4.1.39.orig/drivers/usb/gadget/udc/atmel_usba_udc.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/drivers/usb/gadget/udc/atmel_usba_udc.h 2017-04-18 17:56:30.597396510 +0200 +@@ -354,6 +354,8 @@ struct dentry *debugfs_root; struct dentry *debugfs_regs; #endif @@ -10024,10 +10071,9 @@ index ea448a344767..3e1c9d589dfa 100644 }; static inline struct usba_ep *to_usba_ep(struct usb_ep *ep) -diff --git a/fs/aio.c b/fs/aio.c -index 480440f4701f..5a2380de4a9b 100644 ---- a/fs/aio.c -+++ b/fs/aio.c +diff -Nur linux-4.1.39.orig/fs/aio.c linux-4.1.39/fs/aio.c +--- linux-4.1.39.orig/fs/aio.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/fs/aio.c 2017-04-18 17:56:30.597396510 +0200 @@ -40,6 +40,7 @@ #include <linux/ramfs.h> #include <linux/percpu-refcount.h> @@ -10036,7 +10082,7 @@ index 480440f4701f..5a2380de4a9b 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; @@ -10045,7 +10091,7 @@ index 480440f4701f..5a2380de4a9b 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, }; @@ -10053,7 +10099,7 @@ index 480440f4701f..5a2380de4a9b 100644 aio_mnt = kern_mount(&aio_fs); if (IS_ERR(aio_mnt)) panic("Failed to create aio fs mount."); -@@ -559,9 +561,9 @@ static int kiocb_cancel(struct aio_kiocb *kiocb) +@@ -559,9 +561,9 @@ return cancel(&kiocb->common); } @@ -10065,7 +10111,7 @@ index 480440f4701f..5a2380de4a9b 100644 pr_debug("freeing %p\n", ctx); -@@ -580,8 +582,8 @@ static void free_ioctx_reqs(struct percpu_ref *ref) +@@ -580,8 +582,8 @@ if (ctx->rq_wait && atomic_dec_and_test(&ctx->rq_wait->count)) complete(&ctx->rq_wait->comp); @@ -10076,7 +10122,7 @@ index 480440f4701f..5a2380de4a9b 100644 } /* -@@ -589,9 +591,9 @@ static void free_ioctx_reqs(struct percpu_ref *ref) +@@ -589,9 +591,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. */ @@ -10088,7 +10134,7 @@ index 480440f4701f..5a2380de4a9b 100644 struct aio_kiocb *req; spin_lock_irq(&ctx->ctx_lock); -@@ -610,6 +612,14 @@ static void free_ioctx_users(struct percpu_ref *ref) +@@ -610,6 +612,14 @@ percpu_ref_put(&ctx->reqs); } @@ -10103,10 +10149,9 @@ index 480440f4701f..5a2380de4a9b 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 6196b5eaf9a5..ab37f57136f3 100644 ---- a/fs/autofs4/autofs_i.h -+++ b/fs/autofs4/autofs_i.h +diff -Nur linux-4.1.39.orig/fs/autofs4/autofs_i.h linux-4.1.39/fs/autofs4/autofs_i.h +--- linux-4.1.39.orig/fs/autofs4/autofs_i.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/fs/autofs4/autofs_i.h 2017-04-18 17:56:30.597396510 +0200 @@ -34,6 +34,7 @@ #include <linux/sched.h> #include <linux/mount.h> @@ -10115,11 +10160,10 @@ index 6196b5eaf9a5..ab37f57136f3 100644 #include <asm/current.h> #include <asm/uaccess.h> -diff --git a/fs/autofs4/expire.c b/fs/autofs4/expire.c -index 7a5a598a2d94..d08bcdc30566 100644 ---- a/fs/autofs4/expire.c -+++ b/fs/autofs4/expire.c -@@ -150,7 +150,7 @@ again: +diff -Nur linux-4.1.39.orig/fs/autofs4/expire.c linux-4.1.39/fs/autofs4/expire.c +--- linux-4.1.39.orig/fs/autofs4/expire.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/fs/autofs4/expire.c 2017-04-18 17:56:30.597396510 +0200 +@@ -150,7 +150,7 @@ parent = p->d_parent; if (!spin_trylock(&parent->d_lock)) { spin_unlock(&p->d_lock); @@ -10128,11 +10172,10 @@ index 7a5a598a2d94..d08bcdc30566 100644 goto relock; } spin_unlock(&p->d_lock); -diff --git a/fs/buffer.c b/fs/buffer.c -index c7a5602d01ee..2907544c3a1d 100644 ---- a/fs/buffer.c -+++ b/fs/buffer.c -@@ -301,8 +301,7 @@ static void end_buffer_async_read(struct buffer_head *bh, int uptodate) +diff -Nur linux-4.1.39.orig/fs/buffer.c linux-4.1.39/fs/buffer.c +--- linux-4.1.39.orig/fs/buffer.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/fs/buffer.c 2017-04-18 17:56:30.597396510 +0200 +@@ -301,8 +301,7 @@ * decide that the page is now completely done. */ first = page_buffers(page); @@ -10142,7 +10185,7 @@ index c7a5602d01ee..2907544c3a1d 100644 clear_buffer_async_read(bh); unlock_buffer(bh); tmp = bh; -@@ -315,8 +314,7 @@ static void end_buffer_async_read(struct buffer_head *bh, int uptodate) +@@ -315,8 +314,7 @@ } tmp = tmp->b_this_page; } while (tmp != bh); @@ -10152,7 +10195,7 @@ index c7a5602d01ee..2907544c3a1d 100644 /* * If none of the buffers had errors and they are all -@@ -328,9 +326,7 @@ static void end_buffer_async_read(struct buffer_head *bh, int uptodate) +@@ -328,9 +326,7 @@ return; still_busy: @@ -10163,7 +10206,7 @@ index c7a5602d01ee..2907544c3a1d 100644 } /* -@@ -358,8 +354,7 @@ void end_buffer_async_write(struct buffer_head *bh, int uptodate) +@@ -358,8 +354,7 @@ } first = page_buffers(page); @@ -10173,7 +10216,7 @@ index c7a5602d01ee..2907544c3a1d 100644 clear_buffer_async_write(bh); unlock_buffer(bh); -@@ -371,15 +366,12 @@ void end_buffer_async_write(struct buffer_head *bh, int uptodate) +@@ -371,15 +366,12 @@ } tmp = tmp->b_this_page; } @@ -10191,7 +10234,7 @@ index c7a5602d01ee..2907544c3a1d 100644 } EXPORT_SYMBOL(end_buffer_async_write); -@@ -3325,6 +3317,7 @@ struct buffer_head *alloc_buffer_head(gfp_t gfp_flags) +@@ -3325,6 +3317,7 @@ struct buffer_head *ret = kmem_cache_zalloc(bh_cachep, gfp_flags); if (ret) { INIT_LIST_HEAD(&ret->b_assoc_buffers); @@ -10199,10 +10242,9 @@ index c7a5602d01ee..2907544c3a1d 100644 preempt_disable(); __this_cpu_inc(bh_accounting.nr); recalc_bh_state(); -diff --git a/fs/dcache.c b/fs/dcache.c -index 660857431b1c..c790b2b070ab 100644 ---- a/fs/dcache.c -+++ b/fs/dcache.c +diff -Nur linux-4.1.39.orig/fs/dcache.c linux-4.1.39/fs/dcache.c +--- linux-4.1.39.orig/fs/dcache.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/fs/dcache.c 2017-04-18 17:56:30.597396510 +0200 @@ -19,6 +19,7 @@ #include <linux/mm.h> #include <linux/fs.h> @@ -10211,7 +10253,7 @@ index 660857431b1c..c790b2b070ab 100644 #include <linux/slab.h> #include <linux/init.h> #include <linux/hash.h> -@@ -747,6 +748,8 @@ static inline bool fast_dput(struct dentry *dentry) +@@ -747,6 +748,8 @@ */ void dput(struct dentry *dentry) { @@ -10220,7 +10262,7 @@ index 660857431b1c..c790b2b070ab 100644 if (unlikely(!dentry)) return; -@@ -783,9 +786,18 @@ repeat: +@@ -783,9 +786,18 @@ return; kill_it: @@ -10242,7 +10284,7 @@ index 660857431b1c..c790b2b070ab 100644 goto repeat; } } -@@ -2391,7 +2403,7 @@ again: +@@ -2394,7 +2406,7 @@ if (dentry->d_lockref.count == 1) { if (!spin_trylock(&inode->i_lock)) { spin_unlock(&dentry->d_lock); @@ -10251,11 +10293,10 @@ index 660857431b1c..c790b2b070ab 100644 goto again; } dentry->d_flags &= ~DCACHE_CANT_MOUNT; -diff --git a/fs/eventpoll.c b/fs/eventpoll.c -index 1e009cad8d5c..d0c12504d3b4 100644 ---- a/fs/eventpoll.c -+++ b/fs/eventpoll.c -@@ -505,12 +505,12 @@ static int ep_poll_wakeup_proc(void *priv, void *cookie, int call_nests) +diff -Nur linux-4.1.39.orig/fs/eventpoll.c linux-4.1.39/fs/eventpoll.c +--- linux-4.1.39.orig/fs/eventpoll.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/fs/eventpoll.c 2017-04-18 17:56:30.601396665 +0200 +@@ -505,12 +505,12 @@ */ static void ep_poll_safewake(wait_queue_head_t *wq) { @@ -10270,11 +10311,10 @@ index 1e009cad8d5c..d0c12504d3b4 100644 } static void ep_remove_wait_queue(struct eppoll_entry *pwq) -diff --git a/fs/exec.c b/fs/exec.c -index 1977c2a553ac..0e7125be0283 100644 ---- a/fs/exec.c -+++ b/fs/exec.c -@@ -859,12 +859,14 @@ static int exec_mmap(struct mm_struct *mm) +diff -Nur linux-4.1.39.orig/fs/exec.c linux-4.1.39/fs/exec.c +--- linux-4.1.39.orig/fs/exec.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/fs/exec.c 2017-04-18 17:56:30.601396665 +0200 +@@ -859,12 +859,14 @@ } } task_lock(tsk); @@ -10289,10 +10329,9 @@ index 1977c2a553ac..0e7125be0283 100644 task_unlock(tsk); if (old_mm) { up_read(&old_mm->mmap_sem); -diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h -index 8de34ab6d5b1..4e80270703a4 100644 ---- a/fs/f2fs/f2fs.h -+++ b/fs/f2fs/f2fs.h +diff -Nur linux-4.1.39.orig/fs/f2fs/f2fs.h linux-4.1.39/fs/f2fs/f2fs.h +--- linux-4.1.39.orig/fs/f2fs/f2fs.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/fs/f2fs/f2fs.h 2017-04-18 17:56:30.601396665 +0200 @@ -22,7 +22,6 @@ #ifdef CONFIG_F2FS_CHECK_FS @@ -10309,7 +10348,7 @@ index 8de34ab6d5b1..4e80270703a4 100644 #endif /* -@@ -838,7 +836,7 @@ static inline void f2fs_unlock_op(struct f2fs_sb_info *sbi) +@@ -838,7 +836,7 @@ static inline void f2fs_lock_all(struct f2fs_sb_info *sbi) { @@ -10318,11 +10357,10 @@ index 8de34ab6d5b1..4e80270703a4 100644 } static inline void f2fs_unlock_all(struct f2fs_sb_info *sbi) -diff --git a/fs/jbd/checkpoint.c b/fs/jbd/checkpoint.c -index 08c03044abdd..95debd71e5fa 100644 ---- a/fs/jbd/checkpoint.c -+++ b/fs/jbd/checkpoint.c -@@ -129,6 +129,8 @@ void __log_wait_for_space(journal_t *journal) +diff -Nur linux-4.1.39.orig/fs/jbd/checkpoint.c linux-4.1.39/fs/jbd/checkpoint.c +--- linux-4.1.39.orig/fs/jbd/checkpoint.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/fs/jbd/checkpoint.c 2017-04-18 17:56:30.601396665 +0200 +@@ -129,6 +129,8 @@ if (journal->j_flags & JFS_ABORT) return; spin_unlock(&journal->j_state_lock); @@ -10331,11 +10369,10 @@ index 08c03044abdd..95debd71e5fa 100644 mutex_lock(&journal->j_checkpoint_mutex); /* -diff --git a/fs/jbd2/checkpoint.c b/fs/jbd2/checkpoint.c -index 8c44654ce274..78c1545a3fab 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.1.39.orig/fs/jbd2/checkpoint.c linux-4.1.39/fs/jbd2/checkpoint.c +--- linux-4.1.39.orig/fs/jbd2/checkpoint.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/fs/jbd2/checkpoint.c 2017-04-18 17:56:30.601396665 +0200 +@@ -116,6 +116,8 @@ nblocks = jbd2_space_needed(journal); while (jbd2_log_space_left(journal) < nblocks) { write_unlock(&journal->j_state_lock); @@ -10344,10 +10381,9 @@ index 8c44654ce274..78c1545a3fab 100644 mutex_lock(&journal->j_checkpoint_mutex); /* -diff --git a/fs/namespace.c b/fs/namespace.c -index 556721fb0cf6..d27cd4633f59 100644 ---- a/fs/namespace.c -+++ b/fs/namespace.c +diff -Nur linux-4.1.39.orig/fs/namespace.c linux-4.1.39/fs/namespace.c +--- linux-4.1.39.orig/fs/namespace.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/fs/namespace.c 2017-04-18 17:56:30.601396665 +0200 @@ -14,6 +14,7 @@ #include <linux/mnt_namespace.h> #include <linux/user_namespace.h> @@ -10356,7 +10392,7 @@ index 556721fb0cf6..d27cd4633f59 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) +@@ -356,8 +357,11 @@ * incremented count after it has set MNT_WRITE_HOLD. */ smp_mb(); @@ -10370,11 +10406,10 @@ index 556721fb0cf6..d27cd4633f59 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 7521e11db728..f0de4b6b8bf3 100644 ---- a/fs/ntfs/aops.c -+++ b/fs/ntfs/aops.c -@@ -107,8 +107,7 @@ static void ntfs_end_buffer_async_read(struct buffer_head *bh, int uptodate) +diff -Nur linux-4.1.39.orig/fs/ntfs/aops.c linux-4.1.39/fs/ntfs/aops.c +--- linux-4.1.39.orig/fs/ntfs/aops.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/fs/ntfs/aops.c 2017-04-18 17:56:30.601396665 +0200 +@@ -107,8 +107,7 @@ "0x%llx.", (unsigned long long)bh->b_blocknr); } first = page_buffers(page); @@ -10384,7 +10419,7 @@ index 7521e11db728..f0de4b6b8bf3 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); @@ -10394,7 +10429,7 @@ index 7521e11db728..f0de4b6b8bf3 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_CACHE_SIZE / rec_size; /* Should have been verified before we got here... */ BUG_ON(!recs); @@ -10410,7 +10445,7 @@ index 7521e11db728..f0de4b6b8bf3 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: @@ -10421,11 +10456,10 @@ index 7521e11db728..f0de4b6b8bf3 100644 } /** -diff --git a/fs/timerfd.c b/fs/timerfd.c -index b94fa6c3c6eb..64fb86066237 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.1.39.orig/fs/timerfd.c linux-4.1.39/fs/timerfd.c +--- linux-4.1.39.orig/fs/timerfd.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/fs/timerfd.c 2017-04-18 17:56:30.601396665 +0200 +@@ -450,7 +450,10 @@ break; } spin_unlock_irq(&ctx->wqh.lock); @@ -10437,11 +10471,10 @@ index b94fa6c3c6eb..64fb86066237 100644 } /* -diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c -index c29f34253e2b..f30d5b8cd5a1 100644 ---- a/fs/xfs/xfs_inode.c -+++ b/fs/xfs/xfs_inode.c -@@ -164,7 +164,7 @@ xfs_ilock( +diff -Nur linux-4.1.39.orig/fs/xfs/xfs_inode.c linux-4.1.39/fs/xfs/xfs_inode.c +--- linux-4.1.39.orig/fs/xfs/xfs_inode.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/fs/xfs/xfs_inode.c 2017-04-18 17:56:30.601396665 +0200 +@@ -164,7 +164,7 @@ (XFS_MMAPLOCK_SHARED | XFS_MMAPLOCK_EXCL)); ASSERT((lock_flags & (XFS_ILOCK_SHARED | XFS_ILOCK_EXCL)) != (XFS_ILOCK_SHARED | XFS_ILOCK_EXCL)); @@ -10450,7 +10483,7 @@ index c29f34253e2b..f30d5b8cd5a1 100644 if (lock_flags & XFS_IOLOCK_EXCL) mrupdate_nested(&ip->i_iolock, XFS_IOLOCK_DEP(lock_flags)); -@@ -212,7 +212,7 @@ xfs_ilock_nowait( +@@ -212,7 +212,7 @@ (XFS_MMAPLOCK_SHARED | XFS_MMAPLOCK_EXCL)); ASSERT((lock_flags & (XFS_ILOCK_SHARED | XFS_ILOCK_EXCL)) != (XFS_ILOCK_SHARED | XFS_ILOCK_EXCL)); @@ -10459,7 +10492,7 @@ index c29f34253e2b..f30d5b8cd5a1 100644 if (lock_flags & XFS_IOLOCK_EXCL) { if (!mrtryupdate(&ip->i_iolock)) -@@ -281,7 +281,7 @@ xfs_iunlock( +@@ -281,7 +281,7 @@ (XFS_MMAPLOCK_SHARED | XFS_MMAPLOCK_EXCL)); ASSERT((lock_flags & (XFS_ILOCK_SHARED | XFS_ILOCK_EXCL)) != (XFS_ILOCK_SHARED | XFS_ILOCK_EXCL)); @@ -10468,7 +10501,7 @@ index c29f34253e2b..f30d5b8cd5a1 100644 ASSERT(lock_flags != 0); if (lock_flags & XFS_IOLOCK_EXCL) -@@ -364,30 +364,38 @@ int xfs_lock_delays; +@@ -364,30 +364,38 @@ /* * Bump the subclass so xfs_lock_inodes() acquires each lock with a different @@ -10520,7 +10553,7 @@ index c29f34253e2b..f30d5b8cd5a1 100644 } /* -@@ -399,6 +407,11 @@ xfs_lock_inumorder(int lock_mode, int subclass) +@@ -399,6 +407,11 @@ * transaction (such as truncate). This can result in deadlock since the long * running trans might need to wait for the inode we just locked in order to * push the tail and free space in the log. @@ -10532,7 +10565,7 @@ index c29f34253e2b..f30d5b8cd5a1 100644 */ void xfs_lock_inodes( -@@ -409,8 +422,29 @@ xfs_lock_inodes( +@@ -409,8 +422,29 @@ int attempts = 0, i, j, try_lock; xfs_log_item_t *lp; @@ -10563,11 +10596,10 @@ index c29f34253e2b..f30d5b8cd5a1 100644 try_lock = 0; i = 0; -diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h -index 8f22d20368d8..ee26a603c131 100644 ---- a/fs/xfs/xfs_inode.h -+++ b/fs/xfs/xfs_inode.h -@@ -284,9 +284,9 @@ static inline int xfs_isiflocked(struct xfs_inode *ip) +diff -Nur linux-4.1.39.orig/fs/xfs/xfs_inode.h linux-4.1.39/fs/xfs/xfs_inode.h +--- linux-4.1.39.orig/fs/xfs/xfs_inode.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/fs/xfs/xfs_inode.h 2017-04-18 17:56:30.601396665 +0200 +@@ -284,9 +284,9 @@ * Flags for lockdep annotations. * * XFS_LOCK_PARENT - for directory operations that require locking a @@ -10580,7 +10612,7 @@ index 8f22d20368d8..ee26a603c131 100644 * * XFS_LOCK_RTBITMAP/XFS_LOCK_RTSUM - the realtime device bitmap and summary * inodes do not participate in the normal lock order, and thus have their -@@ -295,30 +295,63 @@ static inline int xfs_isiflocked(struct xfs_inode *ip) +@@ -295,30 +295,63 @@ * XFS_LOCK_INUMORDER - for locking several inodes at the some time * with xfs_lock_inodes(). This flag is used as the starting subclass * and each subsequent lock acquired will increment the subclass by one. @@ -10630,29 +10662,22 @@ index 8f22d20368d8..ee26a603c131 100644 - -#define XFS_IOLOCK_SHIFT 16 -#define XFS_IOLOCK_PARENT (XFS_LOCK_PARENT << XFS_IOLOCK_SHIFT) -- --#define XFS_MMAPLOCK_SHIFT 20 -- --#define XFS_ILOCK_SHIFT 24 --#define XFS_ILOCK_PARENT (XFS_LOCK_PARENT << XFS_ILOCK_SHIFT) --#define XFS_ILOCK_RTBITMAP (XFS_LOCK_RTBITMAP << XFS_ILOCK_SHIFT) --#define XFS_ILOCK_RTSUM (XFS_LOCK_RTSUM << XFS_ILOCK_SHIFT) -- --#define XFS_IOLOCK_DEP_MASK 0x000f0000 --#define XFS_MMAPLOCK_DEP_MASK 0x00f00000 --#define XFS_ILOCK_DEP_MASK 0xff000000 --#define XFS_LOCK_DEP_MASK (XFS_IOLOCK_DEP_MASK | \ +#define XFS_IOLOCK_SHIFT 16 +#define XFS_IOLOCK_PARENT_VAL 4 +#define XFS_IOLOCK_MAX_SUBCLASS (XFS_IOLOCK_PARENT_VAL - 1) +#define XFS_IOLOCK_DEP_MASK 0x000f0000 +#define XFS_IOLOCK_PARENT (XFS_IOLOCK_PARENT_VAL << XFS_IOLOCK_SHIFT) -+ + +-#define XFS_MMAPLOCK_SHIFT 20 +#define XFS_MMAPLOCK_SHIFT 20 +#define XFS_MMAPLOCK_NUMORDER 0 +#define XFS_MMAPLOCK_MAX_SUBCLASS 3 +#define XFS_MMAPLOCK_DEP_MASK 0x00f00000 -+ + +-#define XFS_ILOCK_SHIFT 24 +-#define XFS_ILOCK_PARENT (XFS_LOCK_PARENT << XFS_ILOCK_SHIFT) +-#define XFS_ILOCK_RTBITMAP (XFS_LOCK_RTBITMAP << XFS_ILOCK_SHIFT) +-#define XFS_ILOCK_RTSUM (XFS_LOCK_RTSUM << XFS_ILOCK_SHIFT) +#define XFS_ILOCK_SHIFT 24 +#define XFS_ILOCK_PARENT_VAL 5 +#define XFS_ILOCK_MAX_SUBCLASS (XFS_ILOCK_PARENT_VAL - 1) @@ -10662,15 +10687,18 @@ index 8f22d20368d8..ee26a603c131 100644 +#define XFS_ILOCK_PARENT (XFS_ILOCK_PARENT_VAL << XFS_ILOCK_SHIFT) +#define XFS_ILOCK_RTBITMAP (XFS_ILOCK_RTBITMAP_VAL << XFS_ILOCK_SHIFT) +#define XFS_ILOCK_RTSUM (XFS_ILOCK_RTSUM_VAL << XFS_ILOCK_SHIFT) -+ + +-#define XFS_IOLOCK_DEP_MASK 0x000f0000 +-#define XFS_MMAPLOCK_DEP_MASK 0x00f00000 +-#define XFS_ILOCK_DEP_MASK 0xff000000 +-#define XFS_LOCK_DEP_MASK (XFS_IOLOCK_DEP_MASK | \ +#define XFS_LOCK_SUBCLASS_MASK (XFS_IOLOCK_DEP_MASK | \ XFS_MMAPLOCK_DEP_MASK | \ XFS_ILOCK_DEP_MASK) -diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h -index 74ba46c8157a..ccde2a9ca7b7 100644 ---- a/include/acpi/platform/aclinux.h -+++ b/include/acpi/platform/aclinux.h +diff -Nur linux-4.1.39.orig/include/acpi/platform/aclinux.h linux-4.1.39/include/acpi/platform/aclinux.h +--- linux-4.1.39.orig/include/acpi/platform/aclinux.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/acpi/platform/aclinux.h 2017-04-18 17:56:30.601396665 +0200 @@ -123,6 +123,7 @@ #define acpi_cache_t struct kmem_cache @@ -10700,11 +10728,10 @@ index 74ba46c8157a..ccde2a9ca7b7 100644 /* * OSL interfaces used by debugger/disassembler */ -diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h -index 630dd2372238..850e4d993a88 100644 ---- a/include/asm-generic/bug.h -+++ b/include/asm-generic/bug.h -@@ -206,6 +206,20 @@ extern void warn_slowpath_null(const char *file, const int line); +diff -Nur linux-4.1.39.orig/include/asm-generic/bug.h linux-4.1.39/include/asm-generic/bug.h +--- linux-4.1.39.orig/include/asm-generic/bug.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/asm-generic/bug.h 2017-04-18 17:56:30.601396665 +0200 +@@ -206,6 +206,20 @@ # define WARN_ON_SMP(x) ({0;}) #endif @@ -10725,10 +10752,9 @@ index 630dd2372238..850e4d993a88 100644 #endif /* __ASSEMBLY__ */ #endif -diff --git a/include/asm-generic/futex.h b/include/asm-generic/futex.h -index b59b5a52637e..e56272c919b5 100644 ---- a/include/asm-generic/futex.h -+++ b/include/asm-generic/futex.h +diff -Nur linux-4.1.39.orig/include/asm-generic/futex.h linux-4.1.39/include/asm-generic/futex.h +--- linux-4.1.39.orig/include/asm-generic/futex.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/asm-generic/futex.h 2017-04-18 17:56:30.601396665 +0200 @@ -8,8 +8,7 @@ #ifndef CONFIG_SMP /* @@ -10739,7 +10765,7 @@ index b59b5a52637e..e56272c919b5 100644 * */ -@@ -38,6 +37,7 @@ futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr) +@@ -38,6 +37,7 @@ if (encoded_op & (FUTEX_OP_OPARG_SHIFT << 28)) oparg = 1 << oparg; @@ -10747,7 +10773,7 @@ index b59b5a52637e..e56272c919b5 100644 pagefault_disable(); ret = -EFAULT; -@@ -72,6 +72,7 @@ futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr) +@@ -72,6 +72,7 @@ out_pagefault_enable: pagefault_enable(); @@ -10755,7 +10781,7 @@ index b59b5a52637e..e56272c919b5 100644 if (ret == 0) { switch (cmp) { -@@ -106,6 +107,7 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, +@@ -106,6 +107,7 @@ { u32 val; @@ -10763,7 +10789,7 @@ index b59b5a52637e..e56272c919b5 100644 if (unlikely(get_user(val, uaddr) != 0)) return -EFAULT; -@@ -113,6 +115,7 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, +@@ -113,6 +115,7 @@ return -EFAULT; *uval = val; @@ -10771,10 +10797,9 @@ index b59b5a52637e..e56272c919b5 100644 return 0; } -diff --git a/include/asm-generic/preempt.h b/include/asm-generic/preempt.h -index b6a53e8e526a..c91d3d764c36 100644 ---- a/include/asm-generic/preempt.h -+++ b/include/asm-generic/preempt.h +diff -Nur linux-4.1.39.orig/include/asm-generic/preempt.h linux-4.1.39/include/asm-generic/preempt.h +--- linux-4.1.39.orig/include/asm-generic/preempt.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/asm-generic/preempt.h 2017-04-18 17:56:30.601396665 +0200 @@ -7,10 +7,10 @@ static __always_inline int preempt_count(void) @@ -10788,23 +10813,10 @@ index b6a53e8e526a..c91d3d764c36 100644 { return ¤t_thread_info()->preempt_count; } -diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h -index 2056a99b92f8..e6ff990c9f11 100644 ---- a/include/linux/blk-mq.h -+++ b/include/linux/blk-mq.h -@@ -202,6 +202,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 5d93a6645e88..37faf63af7f7 100644 ---- a/include/linux/blkdev.h -+++ b/include/linux/blkdev.h -@@ -101,6 +101,7 @@ struct request { +diff -Nur linux-4.1.39.orig/include/linux/blkdev.h linux-4.1.39/include/linux/blkdev.h +--- linux-4.1.39.orig/include/linux/blkdev.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/blkdev.h 2017-04-18 17:56:30.601396665 +0200 +@@ -101,6 +101,7 @@ struct list_head queuelist; union { struct call_single_data csd; @@ -10812,7 +10824,7 @@ index 5d93a6645e88..37faf63af7f7 100644 unsigned long fifo_time; }; -@@ -482,7 +483,7 @@ struct request_queue { +@@ -482,7 +483,7 @@ struct throtl_data *td; #endif struct rcu_head rcu_head; @@ -10821,10 +10833,20 @@ index 5d93a6645e88..37faf63af7f7 100644 struct percpu_ref mq_usage_counter; struct list_head all_q_node; -diff --git a/include/linux/bottom_half.h b/include/linux/bottom_half.h -index 86c12c93e3cf..d3c0c02acc97 100644 ---- a/include/linux/bottom_half.h -+++ b/include/linux/bottom_half.h +diff -Nur linux-4.1.39.orig/include/linux/blk-mq.h linux-4.1.39/include/linux/blk-mq.h +--- linux-4.1.39.orig/include/linux/blk-mq.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/blk-mq.h 2017-04-18 17:56:30.601396665 +0200 +@@ -202,6 +202,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.1.39.orig/include/linux/bottom_half.h linux-4.1.39/include/linux/bottom_half.h +--- linux-4.1.39.orig/include/linux/bottom_half.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/bottom_half.h 2017-04-18 17:56:30.601396665 +0200 @@ -4,6 +4,39 @@ #include <linux/preempt.h> #include <linux/preempt_mask.h> @@ -10865,18 +10887,17 @@ index 86c12c93e3cf..d3c0c02acc97 100644 #ifdef CONFIG_TRACE_IRQFLAGS extern void __local_bh_disable_ip(unsigned long ip, unsigned int cnt); #else -@@ -31,5 +64,6 @@ static inline void local_bh_enable(void) +@@ -31,5 +64,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 e6797ded700e..6d25afd8b847 100644 ---- a/include/linux/buffer_head.h -+++ b/include/linux/buffer_head.h -@@ -75,8 +75,52 @@ struct buffer_head { +diff -Nur linux-4.1.39.orig/include/linux/buffer_head.h linux-4.1.39/include/linux/buffer_head.h +--- linux-4.1.39.orig/include/linux/buffer_head.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/buffer_head.h 2017-04-18 17:56:30.601396665 +0200 +@@ -75,8 +75,52 @@ struct address_space *b_assoc_map; /* mapping this buffer is associated with */ atomic_t b_count; /* users using this buffer_head */ @@ -10929,11 +10950,10 @@ index e6797ded700e..6d25afd8b847 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 8d9c7e7a6432..3fd10743e452 100644 ---- a/include/linux/cgroup-defs.h -+++ b/include/linux/cgroup-defs.h -@@ -124,6 +124,7 @@ struct cgroup_subsys_state { +diff -Nur linux-4.1.39.orig/include/linux/cgroup-defs.h linux-4.1.39/include/linux/cgroup-defs.h +--- linux-4.1.39.orig/include/linux/cgroup-defs.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/cgroup-defs.h 2017-04-18 17:56:30.601396665 +0200 +@@ -124,6 +124,7 @@ /* percpu_ref killing and RCU release */ struct rcu_head rcu_head; struct work_struct destroy_work; @@ -10941,10 +10961,9 @@ index 8d9c7e7a6432..3fd10743e452 100644 }; /* -diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h -index 96a2ecd5aa69..7f08633d839a 100644 ---- a/include/linux/cgroup.h -+++ b/include/linux/cgroup.h +diff -Nur linux-4.1.39.orig/include/linux/cgroup.h linux-4.1.39/include/linux/cgroup.h +--- linux-4.1.39.orig/include/linux/cgroup.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/cgroup.h 2017-04-18 17:56:30.605396820 +0200 @@ -17,6 +17,8 @@ #include <linux/fs.h> #include <linux/seq_file.h> @@ -10954,10 +10973,9 @@ index 96a2ecd5aa69..7f08633d839a 100644 #include <linux/cgroup-defs.h> -diff --git a/include/linux/completion.h b/include/linux/completion.h -index 5d5aaae3af43..3fe8d14c98c0 100644 ---- a/include/linux/completion.h -+++ b/include/linux/completion.h +diff -Nur linux-4.1.39.orig/include/linux/completion.h linux-4.1.39/include/linux/completion.h +--- linux-4.1.39.orig/include/linux/completion.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/completion.h 2017-04-18 17:56:30.605396820 +0200 @@ -7,8 +7,7 @@ * Atomic wait-for-completion handler data structures. * See kernel/sched/completion.c for details. @@ -10982,7 +11000,7 @@ index 5d5aaae3af43..3fe8d14c98c0 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; @@ -10991,11 +11009,10 @@ index 5d5aaae3af43..3fe8d14c98c0 100644 } /** -diff --git a/include/linux/cpu.h b/include/linux/cpu.h -index c0fb6b1b4712..2a22c7c729bc 100644 ---- a/include/linux/cpu.h -+++ b/include/linux/cpu.h -@@ -231,6 +231,8 @@ extern bool try_get_online_cpus(void); +diff -Nur linux-4.1.39.orig/include/linux/cpu.h linux-4.1.39/include/linux/cpu.h +--- linux-4.1.39.orig/include/linux/cpu.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/cpu.h 2017-04-18 17:56:30.605396820 +0200 +@@ -231,6 +231,8 @@ extern void put_online_cpus(void); extern void cpu_hotplug_disable(void); extern void cpu_hotplug_enable(void); @@ -11004,7 +11021,7 @@ index c0fb6b1b4712..2a22c7c729bc 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) -@@ -249,6 +251,8 @@ static inline void cpu_hotplug_done(void) {} +@@ -249,6 +251,8 @@ #define put_online_cpus() do { } while (0) #define cpu_hotplug_disable() do { } while (0) #define cpu_hotplug_enable() do { } while (0) @@ -11013,11 +11030,10 @@ index c0fb6b1b4712..2a22c7c729bc 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.1.39.orig/include/linux/delay.h linux-4.1.39/include/linux/delay.h +--- linux-4.1.39.orig/include/linux/delay.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/delay.h 2017-04-18 17:56:30.605396820 +0200 +@@ -52,4 +52,10 @@ msleep(seconds * 1000); } @@ -11028,11 +11044,23 @@ index a6ecb34cf547..37caab306336 100644 +#endif + #endif /* defined(_LINUX_DELAY_H) */ -diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h -index 6cd8c0ee4b6f..1ec37fef6355 100644 ---- a/include/linux/ftrace.h -+++ b/include/linux/ftrace.h -@@ -682,6 +682,18 @@ static inline void __ftrace_enabled_restore(int enabled) +diff -Nur linux-4.1.39.orig/include/linux/ftrace_event.h linux-4.1.39/include/linux/ftrace_event.h +--- linux-4.1.39.orig/include/linux/ftrace_event.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/ftrace_event.h 2017-04-18 17:56:30.605396820 +0200 +@@ -66,6 +66,9 @@ + unsigned char flags; + unsigned char preempt_count; + int pid; ++ unsigned short migrate_disable; ++ unsigned short padding; ++ unsigned char preempt_lazy_count; + }; + + #define FTRACE_MAX_EVENT \ +diff -Nur linux-4.1.39.orig/include/linux/ftrace.h linux-4.1.39/include/linux/ftrace.h +--- linux-4.1.39.orig/include/linux/ftrace.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/ftrace.h 2017-04-18 17:56:30.605396820 +0200 +@@ -682,6 +682,18 @@ #define CALLER_ADDR5 ((unsigned long)ftrace_return_address(5)) #define CALLER_ADDR6 ((unsigned long)ftrace_return_address(6)) @@ -11051,24 +11079,9 @@ index 6cd8c0ee4b6f..1ec37fef6355 100644 #ifdef CONFIG_IRQSOFF_TRACER extern void time_hardirqs_on(unsigned long a0, unsigned long a1); extern void time_hardirqs_off(unsigned long a0, unsigned long a1); -diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h -index f9ecf63d47f1..2ef42aa7e484 100644 ---- a/include/linux/ftrace_event.h -+++ b/include/linux/ftrace_event.h -@@ -66,6 +66,9 @@ struct trace_entry { - unsigned char flags; - unsigned char preempt_count; - int pid; -+ unsigned short migrate_disable; -+ unsigned short padding; -+ unsigned char preempt_lazy_count; - }; - - #define FTRACE_MAX_EVENT \ -diff --git a/include/linux/highmem.h b/include/linux/highmem.h -index 9286a46b7d69..06bae5a6761d 100644 ---- a/include/linux/highmem.h -+++ b/include/linux/highmem.h +diff -Nur linux-4.1.39.orig/include/linux/highmem.h linux-4.1.39/include/linux/highmem.h +--- linux-4.1.39.orig/include/linux/highmem.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/highmem.h 2017-04-18 17:56:30.605396820 +0200 @@ -7,6 +7,7 @@ #include <linux/mm.h> #include <linux/uaccess.h> @@ -11077,7 +11090,7 @@ index 9286a46b7d69..06bae5a6761d 100644 #include <asm/cacheflush.h> -@@ -65,6 +66,7 @@ static inline void kunmap(struct page *page) +@@ -65,6 +66,7 @@ static inline void *kmap_atomic(struct page *page) { @@ -11085,7 +11098,7 @@ index 9286a46b7d69..06bae5a6761d 100644 pagefault_disable(); return page_address(page); } -@@ -73,6 +75,7 @@ static inline void *kmap_atomic(struct page *page) +@@ -73,6 +75,7 @@ static inline void __kunmap_atomic(void *addr) { pagefault_enable(); @@ -11093,7 +11106,7 @@ index 9286a46b7d69..06bae5a6761d 100644 } #define kmap_atomic_pfn(pfn) kmap_atomic(pfn_to_page(pfn)) -@@ -85,32 +88,51 @@ static inline void __kunmap_atomic(void *addr) +@@ -85,32 +88,51 @@ #if defined(CONFIG_HIGHMEM) || defined(CONFIG_X86_32) @@ -11149,11 +11162,10 @@ index 9286a46b7d69..06bae5a6761d 100644 #endif } -diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h -index 05f6df1fdf5b..64e1abb3715b 100644 ---- a/include/linux/hrtimer.h -+++ b/include/linux/hrtimer.h -@@ -111,6 +111,11 @@ struct hrtimer { +diff -Nur linux-4.1.39.orig/include/linux/hrtimer.h linux-4.1.39/include/linux/hrtimer.h +--- linux-4.1.39.orig/include/linux/hrtimer.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/hrtimer.h 2017-04-18 17:56:30.605396820 +0200 +@@ -111,6 +111,11 @@ enum hrtimer_restart (*function)(struct hrtimer *); struct hrtimer_clock_base *base; unsigned long state; @@ -11165,7 +11177,7 @@ index 05f6df1fdf5b..64e1abb3715b 100644 #ifdef CONFIG_TIMER_STATS int start_pid; void *start_site; -@@ -147,6 +152,7 @@ struct hrtimer_clock_base { +@@ -147,6 +152,7 @@ int index; clockid_t clockid; struct timerqueue_head active; @@ -11173,7 +11185,7 @@ index 05f6df1fdf5b..64e1abb3715b 100644 ktime_t resolution; ktime_t (*get_time)(void); ktime_t softirq_time; -@@ -194,6 +200,9 @@ struct hrtimer_cpu_base { +@@ -194,6 +200,9 @@ unsigned long nr_hangs; ktime_t max_hang_time; #endif @@ -11183,7 +11195,7 @@ index 05f6df1fdf5b..64e1abb3715b 100644 struct hrtimer_clock_base clock_base[HRTIMER_MAX_CLOCK_BASES]; }; -@@ -381,6 +390,13 @@ static inline int hrtimer_restart(struct hrtimer *timer) +@@ -381,6 +390,13 @@ return hrtimer_start_expires(timer, HRTIMER_MODE_ABS); } @@ -11197,11 +11209,10 @@ index 05f6df1fdf5b..64e1abb3715b 100644 /* Query timers: */ extern ktime_t hrtimer_get_remaining(const struct hrtimer *timer); extern int hrtimer_get_res(const clockid_t which_clock, struct timespec *tp); -diff --git a/include/linux/idr.h b/include/linux/idr.h -index 013fd9bc4cb6..f62be0aec911 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.1.39.orig/include/linux/idr.h linux-4.1.39/include/linux/idr.h +--- linux-4.1.39.orig/include/linux/idr.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/idr.h 2017-04-18 17:56:30.605396820 +0200 +@@ -95,10 +95,14 @@ * Each idr_preload() should be matched with an invocation of this * function. See idr_preload() for details. */ @@ -11216,11 +11227,10 @@ index 013fd9bc4cb6..f62be0aec911 100644 /** * idr_find - return pointer for given id -diff --git a/include/linux/init_task.h b/include/linux/init_task.h -index 696d22312b31..4a77d39ff7dd 100644 ---- a/include/linux/init_task.h -+++ b/include/linux/init_task.h -@@ -147,9 +147,16 @@ extern struct task_group root_task_group; +diff -Nur linux-4.1.39.orig/include/linux/init_task.h linux-4.1.39/include/linux/init_task.h +--- linux-4.1.39.orig/include/linux/init_task.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/init_task.h 2017-04-18 17:56:30.605396820 +0200 +@@ -147,9 +147,16 @@ # define INIT_PERF_EVENTS(tsk) #endif @@ -11238,7 +11248,7 @@ index 696d22312b31..4a77d39ff7dd 100644 .vtime_snap = 0, \ .vtime_snap_whence = VTIME_SYS, #else -@@ -238,6 +245,7 @@ extern struct task_group root_task_group; +@@ -238,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 */ \ @@ -11246,10 +11256,9 @@ index 696d22312b31..4a77d39ff7dd 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 950ae4501826..d11fd0a440ff 100644 ---- a/include/linux/interrupt.h -+++ b/include/linux/interrupt.h +diff -Nur linux-4.1.39.orig/include/linux/interrupt.h linux-4.1.39/include/linux/interrupt.h +--- linux-4.1.39.orig/include/linux/interrupt.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/interrupt.h 2017-04-18 17:56:30.605396820 +0200 @@ -61,6 +61,7 @@ * interrupt handler after suspending interrupts. For system * wakeup devices users need to implement wakeup detection in @@ -11266,7 +11275,7 @@ index 950ae4501826..d11fd0a440ff 100644 #define IRQF_TIMER (__IRQF_TIMER | IRQF_NO_SUSPEND | IRQF_NO_THREAD) -@@ -102,6 +104,7 @@ typedef irqreturn_t (*irq_handler_t)(int, void *); +@@ -102,6 +104,7 @@ * @flags: flags (see IRQF_* above) * @thread_fn: interrupt handler function for threaded interrupts * @thread: thread pointer for threaded interrupts @@ -11274,7 +11283,7 @@ index 950ae4501826..d11fd0a440ff 100644 * @thread_flags: flags related to @thread * @thread_mask: bitmask for keeping track of @thread activity * @dir: pointer to the proc/irq/NN/name entry -@@ -113,6 +116,7 @@ struct irqaction { +@@ -113,6 +116,7 @@ struct irqaction *next; irq_handler_t thread_fn; struct task_struct *thread; @@ -11282,7 +11291,7 @@ index 950ae4501826..d11fd0a440ff 100644 unsigned int irq; unsigned int flags; unsigned long thread_flags; -@@ -184,7 +188,7 @@ extern void devm_free_irq(struct device *dev, unsigned int irq, void *dev_id); +@@ -184,7 +188,7 @@ #ifdef CONFIG_LOCKDEP # define local_irq_enable_in_hardirq() do { } while (0) #else @@ -11291,7 +11300,7 @@ index 950ae4501826..d11fd0a440ff 100644 #endif extern void disable_irq_nosync(unsigned int irq); -@@ -215,6 +219,7 @@ struct irq_affinity_notify { +@@ -215,6 +219,7 @@ unsigned int irq; struct kref kref; struct work_struct work; @@ -11299,7 +11308,7 @@ index 950ae4501826..d11fd0a440ff 100644 void (*notify)(struct irq_affinity_notify *, const cpumask_t *mask); void (*release)(struct kref *ref); }; -@@ -377,9 +382,13 @@ extern int irq_set_irqchip_state(unsigned int irq, enum irqchip_irq_state which, +@@ -377,9 +382,13 @@ bool state); #ifdef CONFIG_IRQ_FORCED_THREADING @@ -11314,7 +11323,7 @@ index 950ae4501826..d11fd0a440ff 100644 #endif #ifndef __ARCH_SET_SOFTIRQ_PENDING -@@ -435,9 +444,10 @@ struct softirq_action +@@ -435,9 +444,10 @@ void (*action)(struct softirq_action *); }; @@ -11326,7 +11335,7 @@ index 950ae4501826..d11fd0a440ff 100644 #ifdef __ARCH_HAS_DO_SOFTIRQ void do_softirq_own_stack(void); #else -@@ -446,13 +456,25 @@ static inline void do_softirq_own_stack(void) +@@ -446,13 +456,25 @@ __do_softirq(); } #endif @@ -11352,7 +11361,7 @@ index 950ae4501826..d11fd0a440ff 100644 DECLARE_PER_CPU(struct task_struct *, ksoftirqd); -@@ -474,8 +496,9 @@ static inline struct task_struct *this_cpu_ksoftirqd(void) +@@ -474,8 +496,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. @@ -11364,7 +11373,7 @@ index 950ae4501826..d11fd0a440ff 100644 * Tasklet is strictly serialized wrt itself, but not wrt another tasklets. If client needs some intertask synchronization, he makes it with spinlocks. -@@ -500,27 +523,36 @@ struct tasklet_struct name = { NULL, 0, ATOMIC_INIT(1), func, data } +@@ -500,27 +523,36 @@ enum { TASKLET_STATE_SCHED, /* Tasklet is scheduled for execution */ @@ -11407,7 +11416,7 @@ index 950ae4501826..d11fd0a440ff 100644 #define tasklet_unlock_wait(t) do { } while (0) #define tasklet_unlock(t) do { } while (0) #endif -@@ -569,12 +601,7 @@ static inline void tasklet_disable(struct tasklet_struct *t) +@@ -569,12 +601,7 @@ smp_mb(); } @@ -11421,7 +11430,7 @@ index 950ae4501826..d11fd0a440ff 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, -@@ -605,6 +632,12 @@ void tasklet_hrtimer_cancel(struct tasklet_hrtimer *ttimer) +@@ -605,6 +632,12 @@ tasklet_kill(&ttimer->tasklet); } @@ -11434,11 +11443,10 @@ index 950ae4501826..d11fd0a440ff 100644 /* * Autoprobing for irqs: * -diff --git a/include/linux/io-mapping.h b/include/linux/io-mapping.h -index 657fab4efab3..c27dde7215b5 100644 ---- a/include/linux/io-mapping.h -+++ b/include/linux/io-mapping.h -@@ -141,6 +141,7 @@ static inline void __iomem * +diff -Nur linux-4.1.39.orig/include/linux/io-mapping.h linux-4.1.39/include/linux/io-mapping.h +--- linux-4.1.39.orig/include/linux/io-mapping.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/io-mapping.h 2017-04-18 17:56:30.605396820 +0200 +@@ -141,6 +141,7 @@ io_mapping_map_atomic_wc(struct io_mapping *mapping, unsigned long offset) { @@ -11446,7 +11454,7 @@ index 657fab4efab3..c27dde7215b5 100644 pagefault_disable(); return ((char __force __iomem *) mapping) + offset; } -@@ -149,6 +150,7 @@ static inline void +@@ -149,6 +150,7 @@ io_mapping_unmap_atomic(void __iomem *vaddr) { pagefault_enable(); @@ -11454,62 +11462,10 @@ index 657fab4efab3..c27dde7215b5 100644 } /* Non-atomic map/unmap */ -diff --git a/include/linux/irq.h b/include/linux/irq.h -index 33475a37f1bb..00e8834d2e02 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) - */ - enum { - IRQ_TYPE_NONE = 0x00000000, -@@ -97,13 +98,14 @@ enum { - IRQ_NOTHREAD = (1 << 16), - IRQ_PER_CPU_DEVID = (1 << 17), - IRQ_IS_POLLED = (1 << 18), -+ IRQ_NO_SOFTIRQ_CALL = (1 << 19), - }; - - #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_IS_POLLED | 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 dd1109fb241e..9d97cd5bb7c7 100644 ---- a/include/linux/irqdesc.h -+++ b/include/linux/irqdesc.h -@@ -63,6 +63,7 @@ struct irq_desc { +diff -Nur linux-4.1.39.orig/include/linux/irqdesc.h linux-4.1.39/include/linux/irqdesc.h +--- linux-4.1.39.orig/include/linux/irqdesc.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/irqdesc.h 2017-04-18 17:56:30.605396820 +0200 +@@ -63,6 +63,7 @@ unsigned int irqs_unhandled; atomic_t threads_handled; int threads_handled_last; @@ -11517,10 +11473,9 @@ index dd1109fb241e..9d97cd5bb7c7 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.1.39.orig/include/linux/irqflags.h linux-4.1.39/include/linux/irqflags.h +--- linux-4.1.39.orig/include/linux/irqflags.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/irqflags.h 2017-04-18 17:56:30.605396820 +0200 @@ -25,8 +25,6 @@ # define trace_softirqs_enabled(p) ((p)->softirqs_enabled) # define trace_hardirq_enter() do { current->hardirq_context++; } while (0) @@ -11571,11 +11526,59 @@ index 5dd1272d1ab2..9b77034f7c5e 100644 +#endif + #endif -diff --git a/include/linux/jbd_common.h b/include/linux/jbd_common.h -index 3dc53432355f..a90a6f5ca899 100644 ---- a/include/linux/jbd_common.h -+++ b/include/linux/jbd_common.h -@@ -15,32 +15,56 @@ static inline struct journal_head *bh2jh(struct buffer_head *bh) +diff -Nur linux-4.1.39.orig/include/linux/irq.h linux-4.1.39/include/linux/irq.h +--- linux-4.1.39.orig/include/linux/irq.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/irq.h 2017-04-18 17:56:30.605396820 +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) + */ + enum { + IRQ_TYPE_NONE = 0x00000000, +@@ -97,13 +98,14 @@ + IRQ_NOTHREAD = (1 << 16), + IRQ_PER_CPU_DEVID = (1 << 17), + IRQ_IS_POLLED = (1 << 18), ++ IRQ_NO_SOFTIRQ_CALL = (1 << 19), + }; + + #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_IS_POLLED | IRQ_NO_SOFTIRQ_CALL) + + #define IRQ_NO_BALANCING_MASK (IRQ_PER_CPU | IRQ_NO_BALANCING) + +diff -Nur linux-4.1.39.orig/include/linux/irq_work.h linux-4.1.39/include/linux/irq_work.h +--- linux-4.1.39.orig/include/linux/irq_work.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/irq_work.h 2017-04-18 17:56:30.605396820 +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.1.39.orig/include/linux/jbd_common.h linux-4.1.39/include/linux/jbd_common.h +--- linux-4.1.39.orig/include/linux/jbd_common.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/jbd_common.h 2017-04-18 17:56:30.605396820 +0200 +@@ -15,32 +15,56 @@ static inline void jbd_lock_bh_state(struct buffer_head *bh) { @@ -11632,11 +11635,10 @@ index 3dc53432355f..a90a6f5ca899 100644 } #endif -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.1.39.orig/include/linux/kdb.h linux-4.1.39/include/linux/kdb.h +--- linux-4.1.39.orig/include/linux/kdb.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/kdb.h 2017-04-18 17:56:30.605396820 +0200 +@@ -167,6 +167,7 @@ extern __printf(1, 2) int kdb_printf(const char *, ...); typedef __printf(1, 2) int (*kdb_printf_t)(const char *, ...); @@ -11644,7 +11646,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; } @@ -11652,11 +11654,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 d837f2a41665..2f4ce318c4fb 100644 ---- a/include/linux/kernel.h -+++ b/include/linux/kernel.h -@@ -188,6 +188,9 @@ extern int _cond_resched(void); +diff -Nur linux-4.1.39.orig/include/linux/kernel.h linux-4.1.39/include/linux/kernel.h +--- linux-4.1.39.orig/include/linux/kernel.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/kernel.h 2017-04-18 17:56:30.605396820 +0200 +@@ -188,6 +188,9 @@ */ # define might_sleep() \ do { __might_sleep(__FILE__, __LINE__, 0); might_resched(); } while (0) @@ -11666,7 +11667,7 @@ index d837f2a41665..2f4ce318c4fb 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) @@ -11674,7 +11675,7 @@ index d837f2a41665..2f4ce318c4fb 100644 # define sched_annotate_sleep() do { } while (0) #endif -@@ -244,7 +248,8 @@ static inline u32 reciprocal_scale(u32 val, u32 ep_ro) +@@ -244,7 +248,8 @@ #if defined(CONFIG_MMU) && \ (defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_DEBUG_ATOMIC_SLEEP)) @@ -11684,7 +11685,7 @@ index d837f2a41665..2f4ce318c4fb 100644 #else static inline void might_fault(void) { } #endif -@@ -466,6 +471,7 @@ extern enum system_states { +@@ -466,6 +471,7 @@ SYSTEM_HALT, SYSTEM_POWER_OFF, SYSTEM_RESTART, @@ -11692,11 +11693,10 @@ index d837f2a41665..2f4ce318c4fb 100644 } system_state; #define TAINT_PROPRIETARY_MODULE 0 -diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h -index 29a57a5b7cee..a081a0316379 100644 ---- a/include/linux/kvm_host.h -+++ b/include/linux/kvm_host.h -@@ -230,7 +230,7 @@ struct kvm_vcpu { +diff -Nur linux-4.1.39.orig/include/linux/kvm_host.h linux-4.1.39/include/linux/kvm_host.h +--- linux-4.1.39.orig/include/linux/kvm_host.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/kvm_host.h 2017-04-18 17:56:30.605396820 +0200 +@@ -230,7 +230,7 @@ int fpu_active; int guest_fpu_loaded, guest_xcr0_loaded; @@ -11705,7 +11705,7 @@ index 29a57a5b7cee..a081a0316379 100644 struct pid *pid; int sigset_active; sigset_t sigset; -@@ -701,7 +701,7 @@ static inline bool kvm_arch_has_noncoherent_dma(struct kvm *kvm) +@@ -701,7 +701,7 @@ } #endif @@ -11714,10 +11714,9 @@ index 29a57a5b7cee..a081a0316379 100644 { #ifdef __KVM_HAVE_ARCH_WQP return vcpu->arch.wqp; -diff --git a/include/linux/lglock.h b/include/linux/lglock.h -index 0081f000e34b..9603a1500267 100644 ---- a/include/linux/lglock.h -+++ b/include/linux/lglock.h +diff -Nur linux-4.1.39.orig/include/linux/lglock.h linux-4.1.39/include/linux/lglock.h +--- linux-4.1.39.orig/include/linux/lglock.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/lglock.h 2017-04-18 17:56:30.605396820 +0200 @@ -34,22 +34,39 @@ #endif @@ -11760,7 +11759,7 @@ index 0081f000e34b..9603a1500267 100644 void lg_lock_init(struct lglock *lg, char *name); void lg_local_lock(struct lglock *lg); -@@ -59,6 +76,12 @@ void lg_local_unlock_cpu(struct lglock *lg, int cpu); +@@ -59,6 +76,12 @@ void lg_global_lock(struct lglock *lg); void lg_global_unlock(struct lglock *lg); @@ -11773,10 +11772,9 @@ index 0081f000e34b..9603a1500267 100644 #else /* When !CONFIG_SMP, map lglock to spinlock */ #define lglock spinlock -diff --git a/include/linux/list_bl.h b/include/linux/list_bl.h -index 2eb88556c5c5..017d0f1c1eb4 100644 ---- a/include/linux/list_bl.h -+++ b/include/linux/list_bl.h +diff -Nur linux-4.1.39.orig/include/linux/list_bl.h linux-4.1.39/include/linux/list_bl.h +--- linux-4.1.39.orig/include/linux/list_bl.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/list_bl.h 2017-04-18 17:56:30.605396820 +0200 @@ -2,6 +2,7 @@ #define _LINUX_LIST_BL_H @@ -11812,7 +11810,7 @@ index 2eb88556c5c5..017d0f1c1eb4 100644 static inline void INIT_HLIST_BL_NODE(struct hlist_bl_node *h) { -@@ -117,12 +129,26 @@ static inline void hlist_bl_del_init(struct hlist_bl_node *n) +@@ -117,12 +129,26 @@ static inline void hlist_bl_lock(struct hlist_bl_head *b) { @@ -11839,11 +11837,9 @@ index 2eb88556c5c5..017d0f1c1eb4 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..0edbf192f6d1 ---- /dev/null -+++ b/include/linux/locallock.h +diff -Nur linux-4.1.39.orig/include/linux/locallock.h linux-4.1.39/include/linux/locallock.h +--- linux-4.1.39.orig/include/linux/locallock.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.39/include/linux/locallock.h 2017-04-18 17:56:30.605396820 +0200 @@ -0,0 +1,276 @@ +#ifndef _LINUX_LOCALLOCK_H +#define _LINUX_LOCALLOCK_H @@ -12121,10 +12117,9 @@ index 000000000000..0edbf192f6d1 +#endif + +#endif -diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h -index c0c6b33535fb..89c047144b1f 100644 ---- a/include/linux/mm_types.h -+++ b/include/linux/mm_types.h +diff -Nur linux-4.1.39.orig/include/linux/mm_types.h linux-4.1.39/include/linux/mm_types.h +--- linux-4.1.39.orig/include/linux/mm_types.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/mm_types.h 2017-04-18 17:56:30.605396820 +0200 @@ -11,6 +11,7 @@ #include <linux/completion.h> #include <linux/cpumask.h> @@ -12133,7 +12128,7 @@ index c0c6b33535fb..89c047144b1f 100644 #include <linux/page-flags-layout.h> #include <asm/page.h> #include <asm/mmu.h> -@@ -453,6 +454,9 @@ struct mm_struct { +@@ -453,6 +454,9 @@ bool tlb_flush_pending; #endif struct uprobes_state uprobes_state; @@ -12143,10 +12138,32 @@ index c0c6b33535fb..89c047144b1f 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.1.39.orig/include/linux/module.h linux-4.1.39/include/linux/module.h +--- linux-4.1.39.orig/include/linux/module.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/module.h 2017-04-18 17:56:30.605396820 +0200 +@@ -386,6 +386,7 @@ + struct module *__module_text_address(unsigned long addr); + struct module *__module_address(unsigned long addr); + bool is_module_address(unsigned long addr); ++bool __is_module_percpu_address(unsigned long addr, unsigned long *can_addr); + bool is_module_percpu_address(unsigned long addr); + bool is_module_text_address(unsigned long addr); + +@@ -537,6 +538,11 @@ + { + return false; + } ++ ++static inline bool __is_module_percpu_address(unsigned long addr, unsigned long *can_addr) ++{ ++ return false; ++} + + static inline bool is_module_text_address(unsigned long addr) + { +diff -Nur linux-4.1.39.orig/include/linux/mutex.h linux-4.1.39/include/linux/mutex.h +--- linux-4.1.39.orig/include/linux/mutex.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/mutex.h 2017-04-18 17:56:30.605396820 +0200 @@ -19,6 +19,17 @@ #include <asm/processor.h> #include <linux/osq_lock.h> @@ -12165,7 +12182,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 @@ -12179,7 +12196,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); @@ -12188,12 +12205,10 @@ 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 -@@ -0,0 +1,84 @@ +diff -Nur linux-4.1.39.orig/include/linux/mutex_rt.h linux-4.1.39/include/linux/mutex_rt.h +--- linux-4.1.39.orig/include/linux/mutex_rt.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.39/include/linux/mutex_rt.h 2017-04-18 17:56:30.605396820 +0200 +@@ -0,0 +1,89 @@ +#ifndef __LINUX_MUTEX_RT_H +#define __LINUX_MUTEX_RT_H + @@ -12239,7 +12254,12 @@ index 000000000000..c38a44b14da5 +#define mutex_lock_killable(l) _mutex_lock_killable(l) +#define mutex_trylock(l) _mutex_trylock(l) +#define mutex_unlock(l) _mutex_unlock(l) ++ ++#ifdef CONFIG_DEBUG_MUTEXES +#define mutex_destroy(l) rt_mutex_destroy(&(l)->lock) ++#else ++static inline void mutex_destroy(struct mutex *lock) {} ++#endif + +#ifdef CONFIG_DEBUG_LOCK_ALLOC +# define mutex_lock_nested(l, s) _mutex_lock_nested(l, s) @@ -12278,11 +12298,30 @@ index 000000000000..c38a44b14da5 +} while (0) + +#endif -diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h -index 6c86c7edafa7..27b25e97c3d4 100644 ---- a/include/linux/netdevice.h -+++ b/include/linux/netdevice.h -@@ -2193,11 +2193,20 @@ void netdev_freemem(struct net_device *dev); +diff -Nur linux-4.1.39.orig/include/linux/netdevice.h linux-4.1.39/include/linux/netdevice.h +--- linux-4.1.39.orig/include/linux/netdevice.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/netdevice.h 2017-04-18 17:56:30.609396976 +0200 +@@ -390,7 +390,19 @@ + typedef rx_handler_result_t rx_handler_func_t(struct sk_buff **pskb); + + void __napi_schedule(struct napi_struct *n); ++ ++/* ++ * When PREEMPT_RT_FULL is defined, all device interrupt handlers ++ * run as threads, and they can also be preempted (without PREEMPT_RT ++ * interrupt threads can not be preempted). Which means that calling ++ * __napi_schedule_irqoff() from an interrupt handler can be preempted ++ * and can corrupt the napi->poll_list. ++ */ ++#ifdef CONFIG_PREEMPT_RT_FULL ++#define __napi_schedule_irqoff(n) __napi_schedule(n) ++#else + void __napi_schedule_irqoff(struct napi_struct *n); ++#endif + + static inline bool napi_disable_pending(struct napi_struct *n) + { +@@ -2215,11 +2227,20 @@ void synchronize_net(void); int init_dummy_netdev(struct net_device *dev); @@ -12303,7 +12342,7 @@ index 6c86c7edafa7..27b25e97c3d4 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); -@@ -2488,6 +2497,7 @@ struct softnet_data { +@@ -2510,6 +2531,7 @@ unsigned int dropped; struct sk_buff_head input_pkt_queue; struct napi_struct backlog; @@ -12311,10 +12350,9 @@ index 6c86c7edafa7..27b25e97c3d4 100644 }; -diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h -index cc615e273f80..1a6ba6d7ff8b 100644 ---- a/include/linux/netfilter/x_tables.h -+++ b/include/linux/netfilter/x_tables.h +diff -Nur linux-4.1.39.orig/include/linux/netfilter/x_tables.h linux-4.1.39/include/linux/netfilter/x_tables.h +--- linux-4.1.39.orig/include/linux/netfilter/x_tables.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/netfilter/x_tables.h 2017-04-18 17:56:30.609396976 +0200 @@ -3,6 +3,7 @@ @@ -12323,7 +12361,7 @@ index cc615e273f80..1a6ba6d7ff8b 100644 #include <uapi/linux/netfilter/x_tables.h> /** -@@ -293,6 +294,8 @@ void xt_free_table_info(struct xt_table_info *info); +@@ -293,6 +294,8 @@ */ DECLARE_PER_CPU(seqcount_t, xt_recseq); @@ -12332,7 +12370,7 @@ index cc615e273f80..1a6ba6d7ff8b 100644 /** * xt_write_recseq_begin - start of a write section * -@@ -307,6 +310,9 @@ static inline unsigned int xt_write_recseq_begin(void) +@@ -307,6 +310,9 @@ { unsigned int addend; @@ -12342,7 +12380,7 @@ index cc615e273f80..1a6ba6d7ff8b 100644 /* * Low order bit of sequence is set if we already * called xt_write_recseq_begin(). -@@ -337,6 +343,7 @@ static inline void xt_write_recseq_end(unsigned int addend) +@@ -337,6 +343,7 @@ /* this is kind of a write_seqcount_end(), but addend is 0 or 1 */ smp_wmb(); __this_cpu_add(xt_recseq.sequence, addend); @@ -12350,10 +12388,9 @@ index cc615e273f80..1a6ba6d7ff8b 100644 } /* -diff --git a/include/linux/notifier.h b/include/linux/notifier.h -index d14a4c362465..2e4414a0c1c4 100644 ---- a/include/linux/notifier.h -+++ b/include/linux/notifier.h +diff -Nur linux-4.1.39.orig/include/linux/notifier.h linux-4.1.39/include/linux/notifier.h +--- linux-4.1.39.orig/include/linux/notifier.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/notifier.h 2017-04-18 17:56:30.609396976 +0200 @@ -6,7 +6,7 @@ * * Alan Cox <Alan.Cox@linux.org> @@ -12374,7 +12411,7 @@ index d14a4c362465..2e4414a0c1c4 100644 */ typedef int (*notifier_fn_t)(struct notifier_block *nb, -@@ -88,7 +86,7 @@ struct srcu_notifier_head { +@@ -88,7 +86,7 @@ (name)->head = NULL; \ } while (0) @@ -12383,7 +12420,7 @@ index d14a4c362465..2e4414a0c1c4 100644 extern void srcu_init_notifier_head(struct srcu_notifier_head *nh); #define srcu_cleanup_notifier_head(name) \ cleanup_srcu_struct(&(name)->srcu); -@@ -101,7 +99,13 @@ extern void srcu_init_notifier_head(struct srcu_notifier_head *nh); +@@ -101,7 +99,13 @@ .head = NULL } #define RAW_NOTIFIER_INIT(name) { \ .head = NULL } @@ -12398,7 +12435,7 @@ index d14a4c362465..2e4414a0c1c4 100644 #define ATOMIC_NOTIFIER_HEAD(name) \ struct atomic_notifier_head name = \ -@@ -113,6 +117,18 @@ extern void srcu_init_notifier_head(struct srcu_notifier_head *nh); +@@ -113,6 +117,18 @@ struct raw_notifier_head name = \ RAW_NOTIFIER_INIT(name) @@ -12417,7 +12454,7 @@ index d14a4c362465..2e4414a0c1c4 100644 #ifdef __KERNEL__ extern int atomic_notifier_chain_register(struct atomic_notifier_head *nh, -@@ -182,12 +198,12 @@ static inline int notifier_to_errno(int ret) +@@ -182,12 +198,12 @@ /* * Declared notifiers so far. I can imagine quite a few more chains @@ -12433,10 +12470,9 @@ index d14a4c362465..2e4414a0c1c4 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 caebf2a758dc..53a60a51c758 100644 ---- a/include/linux/percpu.h -+++ b/include/linux/percpu.h +diff -Nur linux-4.1.39.orig/include/linux/percpu.h linux-4.1.39/include/linux/percpu.h +--- linux-4.1.39.orig/include/linux/percpu.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/percpu.h 2017-04-18 17:56:30.609396976 +0200 @@ -24,6 +24,35 @@ PERCPU_MODULE_RESERVE) #endif @@ -12473,10 +12509,17 @@ index caebf2a758dc..53a60a51c758 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 +@@ -116,6 +145,7 @@ + #endif + + extern void __percpu *__alloc_reserved_percpu(size_t size, size_t align); ++extern bool __is_kernel_percpu_address(unsigned long addr, unsigned long *can_addr); + extern bool is_kernel_percpu_address(unsigned long addr); + + #if !defined(CONFIG_SMP) || !defined(CONFIG_HAVE_SETUP_PER_CPU_AREA) +diff -Nur linux-4.1.39.orig/include/linux/pid.h linux-4.1.39/include/linux/pid.h +--- linux-4.1.39.orig/include/linux/pid.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/pid.h 2017-04-18 17:56:30.609396976 +0200 @@ -2,6 +2,7 @@ #define _LINUX_PID_H @@ -12485,11 +12528,10 @@ index 23705a53abba..2cc64b779f03 100644 enum pid_type { -diff --git a/include/linux/platform_data/gpio-omap.h b/include/linux/platform_data/gpio-omap.h -index 5d50b25a73d7..ff43e01b8ca9 100644 ---- a/include/linux/platform_data/gpio-omap.h -+++ b/include/linux/platform_data/gpio-omap.h -@@ -198,7 +198,6 @@ struct omap_gpio_platform_data { +diff -Nur linux-4.1.39.orig/include/linux/platform_data/gpio-omap.h linux-4.1.39/include/linux/platform_data/gpio-omap.h +--- linux-4.1.39.orig/include/linux/platform_data/gpio-omap.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/platform_data/gpio-omap.h 2017-04-18 17:56:30.609396976 +0200 +@@ -198,7 +198,6 @@ int bank_width; /* GPIO bank width */ int bank_stride; /* Only needed for omap1 MPUIO */ bool dbck_flag; /* dbck required or not - True for OMAP3&4 */ @@ -12497,7 +12539,7 @@ index 5d50b25a73d7..ff43e01b8ca9 100644 bool is_mpuio; /* whether the bank is of type MPUIO */ u32 non_wakeup_gpios; -@@ -208,9 +207,17 @@ struct omap_gpio_platform_data { +@@ -208,9 +207,17 @@ int (*get_context_loss_count)(struct device *dev); }; @@ -12517,11 +12559,10 @@ index 5d50b25a73d7..ff43e01b8ca9 100644 +#endif #endif -diff --git a/include/linux/preempt.h b/include/linux/preempt.h -index 8cd6725c5758..8fa1d21dab70 100644 ---- a/include/linux/preempt.h -+++ b/include/linux/preempt.h -@@ -34,6 +34,20 @@ extern void preempt_count_sub(int val); +diff -Nur linux-4.1.39.orig/include/linux/preempt.h linux-4.1.39/include/linux/preempt.h +--- linux-4.1.39.orig/include/linux/preempt.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/preempt.h 2017-04-18 17:56:30.609396976 +0200 +@@ -34,6 +34,20 @@ #define preempt_count_inc() preempt_count_add(1) #define preempt_count_dec() preempt_count_sub(1) @@ -12542,7 +12583,7 @@ index 8cd6725c5758..8fa1d21dab70 100644 #ifdef CONFIG_PREEMPT_COUNT #define preempt_disable() \ -@@ -42,13 +56,25 @@ do { \ +@@ -42,13 +56,25 @@ barrier(); \ } while (0) @@ -12569,7 +12610,7 @@ index 8cd6725c5758..8fa1d21dab70 100644 #ifdef CONFIG_PREEMPT #define preempt_enable() \ -@@ -64,6 +90,13 @@ do { \ +@@ -64,6 +90,13 @@ __preempt_schedule(); \ } while (0) @@ -12583,7 +12624,7 @@ index 8cd6725c5758..8fa1d21dab70 100644 #else #define preempt_enable() \ do { \ -@@ -122,6 +155,7 @@ do { \ +@@ -122,6 +155,7 @@ #define preempt_disable_notrace() barrier() #define preempt_enable_no_resched_notrace() barrier() #define preempt_enable_notrace() barrier() @@ -12591,7 +12632,7 @@ index 8cd6725c5758..8fa1d21dab70 100644 #endif /* CONFIG_PREEMPT_COUNT */ -@@ -141,10 +175,31 @@ do { \ +@@ -141,10 +175,31 @@ } while (0) #define preempt_fold_need_resched() \ do { \ @@ -12624,10 +12665,9 @@ index 8cd6725c5758..8fa1d21dab70 100644 #ifdef CONFIG_PREEMPT_NOTIFIERS struct preempt_notifier; -diff --git a/include/linux/preempt_mask.h b/include/linux/preempt_mask.h -index 5cb25f17331a..26a33802dae2 100644 ---- a/include/linux/preempt_mask.h -+++ b/include/linux/preempt_mask.h +diff -Nur linux-4.1.39.orig/include/linux/preempt_mask.h linux-4.1.39/include/linux/preempt_mask.h +--- linux-4.1.39.orig/include/linux/preempt_mask.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/preempt_mask.h 2017-04-18 17:56:30.609396976 +0200 @@ -44,16 +44,26 @@ #define HARDIRQ_OFFSET (1UL << HARDIRQ_SHIFT) #define NMI_OFFSET (1UL << NMI_SHIFT) @@ -12677,11 +12717,10 @@ index 5cb25f17331a..26a33802dae2 100644 /* * The preempt_count offset needed for things like: -diff --git a/include/linux/printk.h b/include/linux/printk.h -index 9b30871c9149..08d0a7574fcf 100644 ---- a/include/linux/printk.h -+++ b/include/linux/printk.h -@@ -115,9 +115,11 @@ int no_printk(const char *fmt, ...) +diff -Nur linux-4.1.39.orig/include/linux/printk.h linux-4.1.39/include/linux/printk.h +--- linux-4.1.39.orig/include/linux/printk.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/printk.h 2017-04-18 17:56:30.609396976 +0200 +@@ -115,9 +115,11 @@ #ifdef CONFIG_EARLY_PRINTK extern asmlinkage __printf(1, 2) void early_printk(const char *fmt, ...); @@ -12693,37 +12732,33 @@ index 9b30871c9149..08d0a7574fcf 100644 #endif typedef 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 673dee29a9b9..9a80663a1574 100644 ---- a/include/linux/radix-tree.h -+++ b/include/linux/radix-tree.h -@@ -277,8 +277,13 @@ radix_tree_gang_lookup(struct radix_tree_root *root, void **results, - unsigned int radix_tree_gang_lookup_slot(struct radix_tree_root *root, - void ***results, unsigned long *indices, +diff -Nur linux-4.1.39.orig/include/linux/radix-tree.h linux-4.1.39/include/linux/radix-tree.h +--- linux-4.1.39.orig/include/linux/radix-tree.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/radix-tree.h 2017-04-18 17:56:30.609396976 +0200 +@@ -279,6 +279,8 @@ unsigned long first_index, unsigned int max_items); -+#ifndef CONFIG_PREEMPT_RT_FULL int radix_tree_preload(gfp_t gfp_mask); int radix_tree_maybe_preload(gfp_t gfp_mask); -+#else -+static inline int radix_tree_preload(gfp_t gm) { return 0; } -+static inline int radix_tree_maybe_preload(gfp_t gfp_mask) { return 0; } -+#endif ++void radix_tree_preload_end(void); ++ void radix_tree_init(void); void *radix_tree_tag_set(struct radix_tree_root *root, unsigned long index, unsigned int tag); -@@ -303,7 +308,7 @@ unsigned long radix_tree_locate_item(struct radix_tree_root *root, void *item); +@@ -301,11 +303,6 @@ + int radix_tree_tagged(struct radix_tree_root *root, unsigned int tag); + unsigned long radix_tree_locate_item(struct radix_tree_root *root, void *item); - static inline void radix_tree_preload_end(void) - { +-static inline void radix_tree_preload_end(void) +-{ - preempt_enable(); -+ preempt_enable_nort(); - } - +-} +- /** -diff --git a/include/linux/random.h b/include/linux/random.h -index b05856e16b75..4a64ad52dcb7 100644 ---- a/include/linux/random.h -+++ b/include/linux/random.h + * struct radix_tree_iter - radix tree iterator state + * +diff -Nur linux-4.1.39.orig/include/linux/random.h linux-4.1.39/include/linux/random.h +--- linux-4.1.39.orig/include/linux/random.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/random.h 2017-04-18 17:56:30.609396976 +0200 @@ -11,7 +11,7 @@ extern void add_device_randomness(const void *, unsigned int); extern void add_input_randomness(unsigned int type, unsigned int code, @@ -12733,11 +12768,10 @@ index b05856e16b75..4a64ad52dcb7 100644 extern void get_random_bytes(void *buf, int nbytes); extern void get_random_bytes_arch(void *buf, int nbytes); -diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h -index 573a5afd5ed8..5d090cdaaace 100644 ---- a/include/linux/rcupdate.h -+++ b/include/linux/rcupdate.h -@@ -167,6 +167,9 @@ void call_rcu(struct rcu_head *head, +diff -Nur linux-4.1.39.orig/include/linux/rcupdate.h linux-4.1.39/include/linux/rcupdate.h +--- linux-4.1.39.orig/include/linux/rcupdate.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/rcupdate.h 2017-04-18 17:56:30.609396976 +0200 +@@ -167,6 +167,9 @@ #endif /* #else #ifdef CONFIG_PREEMPT_RCU */ @@ -12747,7 +12781,7 @@ index 573a5afd5ed8..5d090cdaaace 100644 /** * call_rcu_bh() - Queue an RCU for invocation after a quicker grace period. * @head: structure to be used for queueing the RCU updates. -@@ -190,6 +193,7 @@ void call_rcu(struct rcu_head *head, +@@ -190,6 +193,7 @@ */ void call_rcu_bh(struct rcu_head *head, void (*func)(struct rcu_head *head)); @@ -12755,7 +12789,7 @@ index 573a5afd5ed8..5d090cdaaace 100644 /** * call_rcu_sched() - Queue an RCU for invocation after sched grace period. -@@ -260,6 +264,11 @@ void synchronize_rcu(void); +@@ -260,6 +264,11 @@ * types of kernel builds, the rcu_read_lock() nesting depth is unknowable. */ #define rcu_preempt_depth() (current->rcu_read_lock_nesting) @@ -12767,7 +12801,7 @@ index 573a5afd5ed8..5d090cdaaace 100644 #else /* #ifdef CONFIG_PREEMPT_RCU */ -@@ -283,6 +292,8 @@ static inline int rcu_preempt_depth(void) +@@ -283,6 +292,8 @@ return 0; } @@ -12776,7 +12810,7 @@ index 573a5afd5ed8..5d090cdaaace 100644 #endif /* #else #ifdef CONFIG_PREEMPT_RCU */ /* Internal to kernel */ -@@ -463,7 +474,14 @@ extern struct lockdep_map rcu_callback_map; +@@ -463,7 +474,14 @@ int debug_lockdep_rcu_enabled(void); int rcu_read_lock_held(void); @@ -12791,7 +12825,7 @@ index 573a5afd5ed8..5d090cdaaace 100644 /** * rcu_read_lock_sched_held() - might we be in RCU-sched read-side critical section? -@@ -990,10 +1008,14 @@ static inline void rcu_read_unlock(void) +@@ -990,10 +1008,14 @@ static inline void rcu_read_lock_bh(void) { local_bh_disable(); @@ -12806,7 +12840,7 @@ index 573a5afd5ed8..5d090cdaaace 100644 } /* -@@ -1003,10 +1025,14 @@ static inline void rcu_read_lock_bh(void) +@@ -1003,10 +1025,14 @@ */ static inline void rcu_read_unlock_bh(void) { @@ -12821,11 +12855,10 @@ index 573a5afd5ed8..5d090cdaaace 100644 local_bh_enable(); } -diff --git a/include/linux/rcutree.h b/include/linux/rcutree.h -index d2e583a6aaca..0b350893b46a 100644 ---- a/include/linux/rcutree.h -+++ b/include/linux/rcutree.h -@@ -46,7 +46,11 @@ static inline void rcu_virt_note_context_switch(int cpu) +diff -Nur linux-4.1.39.orig/include/linux/rcutree.h linux-4.1.39/include/linux/rcutree.h +--- linux-4.1.39.orig/include/linux/rcutree.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/rcutree.h 2017-04-18 17:56:30.609396976 +0200 +@@ -46,7 +46,11 @@ rcu_note_context_switch(); } @@ -12837,7 +12870,7 @@ index d2e583a6aaca..0b350893b46a 100644 void synchronize_sched_expedited(void); void synchronize_rcu_expedited(void); -@@ -74,7 +78,11 @@ static inline void synchronize_rcu_bh_expedited(void) +@@ -74,7 +78,11 @@ } void rcu_barrier(void); @@ -12849,7 +12882,7 @@ index d2e583a6aaca..0b350893b46a 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); @@ -12862,7 +12895,7 @@ index d2e583a6aaca..0b350893b46a 100644 void rcu_sched_force_quiescent_state(void); void exit_rcu(void); -@@ -100,6 +106,14 @@ extern int rcu_scheduler_active __read_mostly; +@@ -100,6 +106,14 @@ bool rcu_is_watching(void); @@ -12877,10 +12910,9 @@ index d2e583a6aaca..0b350893b46a 100644 void rcu_all_qs(void); #endif /* __LINUX_RCUTREE_H */ -diff --git a/include/linux/rtmutex.h b/include/linux/rtmutex.h -index 1abba5ce2a2f..d5a04ea47a13 100644 ---- a/include/linux/rtmutex.h -+++ b/include/linux/rtmutex.h +diff -Nur linux-4.1.39.orig/include/linux/rtmutex.h linux-4.1.39/include/linux/rtmutex.h +--- linux-4.1.39.orig/include/linux/rtmutex.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/rtmutex.h 2017-04-18 17:56:30.609396976 +0200 @@ -14,10 +14,14 @@ #include <linux/linkage.h> @@ -12897,7 +12929,7 @@ index 1abba5ce2a2f..d5a04ea47a13 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; @@ -12907,7 +12939,7 @@ index 1abba5ce2a2f..d5a04ea47a13 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 @@ -12946,7 +12978,7 @@ index 1abba5ce2a2f..d5a04ea47a13 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); @@ -12954,11 +12986,9 @@ index 1abba5ce2a2f..d5a04ea47a13 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.1.39.orig/include/linux/rwlock_rt.h linux-4.1.39/include/linux/rwlock_rt.h +--- linux-4.1.39.orig/include/linux/rwlock_rt.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.39/include/linux/rwlock_rt.h 2017-04-18 17:56:30.609396976 +0200 @@ -0,0 +1,99 @@ +#ifndef __LINUX_RWLOCK_RT_H +#define __LINUX_RWLOCK_RT_H @@ -13059,10 +13089,9 @@ index 000000000000..49ed2d45d3be + } while (0) + +#endif -diff --git a/include/linux/rwlock_types.h b/include/linux/rwlock_types.h -index cc0072e93e36..d0da966ad7a0 100644 ---- a/include/linux/rwlock_types.h -+++ b/include/linux/rwlock_types.h +diff -Nur linux-4.1.39.orig/include/linux/rwlock_types.h linux-4.1.39/include/linux/rwlock_types.h +--- linux-4.1.39.orig/include/linux/rwlock_types.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/rwlock_types.h 2017-04-18 17:56:30.609396976 +0200 @@ -1,6 +1,10 @@ #ifndef __LINUX_RWLOCK_TYPES_H #define __LINUX_RWLOCK_TYPES_H @@ -13074,7 +13103,7 @@ index cc0072e93e36..d0da966ad7a0 100644 /* * include/linux/rwlock_types.h - generic rwlock type definitions * and initializers -@@ -43,6 +47,7 @@ typedef struct { +@@ -43,6 +47,7 @@ RW_DEP_MAP_INIT(lockname) } #endif @@ -13083,11 +13112,9 @@ index cc0072e93e36..d0da966ad7a0 100644 + rwlock_t name __cacheline_aligned_in_smp = __RW_LOCK_UNLOCKED(name) #endif /* __LINUX_RWLOCK_TYPES_H */ -diff --git a/include/linux/rwlock_types_rt.h b/include/linux/rwlock_types_rt.h -new file mode 100644 -index 000000000000..b13832119591 ---- /dev/null -+++ b/include/linux/rwlock_types_rt.h +diff -Nur linux-4.1.39.orig/include/linux/rwlock_types_rt.h linux-4.1.39/include/linux/rwlock_types_rt.h +--- linux-4.1.39.orig/include/linux/rwlock_types_rt.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.39/include/linux/rwlock_types_rt.h 2017-04-18 17:56:30.609396976 +0200 @@ -0,0 +1,33 @@ +#ifndef __LINUX_RWLOCK_TYPES_RT_H +#define __LINUX_RWLOCK_TYPES_RT_H @@ -13122,10 +13149,9 @@ index 000000000000..b13832119591 + rwlock_t name __cacheline_aligned_in_smp = __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.1.39.orig/include/linux/rwsem.h linux-4.1.39/include/linux/rwsem.h +--- linux-4.1.39.orig/include/linux/rwsem.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/rwsem.h 2017-04-18 17:56:30.609396976 +0200 @@ -18,6 +18,10 @@ #include <linux/osq_lock.h> #endif @@ -13137,18 +13163,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..928a05cbf94f ---- /dev/null -+++ b/include/linux/rwsem_rt.h +diff -Nur linux-4.1.39.orig/include/linux/rwsem_rt.h linux-4.1.39/include/linux/rwsem_rt.h +--- linux-4.1.39.orig/include/linux/rwsem_rt.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.39/include/linux/rwsem_rt.h 2017-04-18 17:56:30.609396976 +0200 @@ -0,0 +1,140 @@ +#ifndef _LINUX_RWSEM_RT_H +#define _LINUX_RWSEM_RT_H @@ -13290,11 +13314,10 @@ index 000000000000..928a05cbf94f +} +#endif +#endif -diff --git a/include/linux/sched.h b/include/linux/sched.h -index 9e39deaeddd6..769f2cf30963 100644 ---- a/include/linux/sched.h -+++ b/include/linux/sched.h -@@ -26,6 +26,7 @@ struct sched_param { +diff -Nur linux-4.1.39.orig/include/linux/sched.h linux-4.1.39/include/linux/sched.h +--- linux-4.1.39.orig/include/linux/sched.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/sched.h 2017-04-18 17:56:30.609396976 +0200 +@@ -26,6 +26,7 @@ #include <linux/nodemask.h> #include <linux/mm_types.h> #include <linux/preempt_mask.h> @@ -13302,7 +13325,7 @@ index 9e39deaeddd6..769f2cf30963 100644 #include <asm/page.h> #include <asm/ptrace.h> -@@ -175,8 +176,6 @@ extern void get_iowait_load(unsigned long *nr_waiters, unsigned long *load); +@@ -175,8 +176,6 @@ extern void calc_global_load(unsigned long ticks); extern void update_cpu_load_nohz(void); @@ -13311,7 +13334,7 @@ index 9e39deaeddd6..769f2cf30963 100644 extern void dump_cpu_task(int cpu); struct seq_file; -@@ -234,10 +233,7 @@ extern char ___assert_task_state[1 - 2*!!( +@@ -234,10 +233,7 @@ TASK_UNINTERRUPTIBLE | __TASK_STOPPED | \ __TASK_TRACED | EXIT_ZOMBIE | EXIT_DEAD) @@ -13322,7 +13345,7 @@ index 9e39deaeddd6..769f2cf30963 100644 #define task_contributes_to_load(task) \ ((task->state & TASK_UNINTERRUPTIBLE) != 0 && \ (task->flags & PF_FROZEN) == 0) -@@ -302,6 +298,11 @@ extern char ___assert_task_state[1 - 2*!!( +@@ -302,6 +298,11 @@ #endif @@ -13334,7 +13357,7 @@ index 9e39deaeddd6..769f2cf30963 100644 /* Task command name length */ #define TASK_COMM_LEN 16 -@@ -902,6 +903,50 @@ enum cpu_idle_type { +@@ -902,6 +903,50 @@ #define SCHED_CAPACITY_SCALE (1L << SCHED_CAPACITY_SHIFT) /* @@ -13385,7 +13408,7 @@ index 9e39deaeddd6..769f2cf30963 100644 * sched-domains (multiprocessor balancing) declarations: */ #ifdef CONFIG_SMP -@@ -1293,6 +1338,7 @@ enum perf_event_task_context { +@@ -1293,6 +1338,7 @@ struct task_struct { volatile long state; /* -1 unrunnable, 0 runnable, >0 stopped */ @@ -13393,7 +13416,7 @@ index 9e39deaeddd6..769f2cf30963 100644 void *stack; atomic_t usage; unsigned int flags; /* per process flags, defined below */ -@@ -1329,6 +1375,12 @@ struct task_struct { +@@ -1329,6 +1375,12 @@ #endif unsigned int policy; @@ -13406,7 +13429,7 @@ index 9e39deaeddd6..769f2cf30963 100644 int nr_cpus_allowed; cpumask_t cpus_allowed; -@@ -1436,7 +1488,8 @@ struct task_struct { +@@ -1436,7 +1488,8 @@ struct cputime prev_cputime; #endif #ifdef CONFIG_VIRT_CPU_ACCOUNTING_GEN @@ -13416,7 +13439,7 @@ index 9e39deaeddd6..769f2cf30963 100644 unsigned long long vtime_snap; enum { VTIME_SLEEPING = 0, -@@ -1452,6 +1505,9 @@ struct task_struct { +@@ -1452,6 +1505,9 @@ struct task_cputime cputime_expires; struct list_head cpu_timers[3]; @@ -13425,8 +13448,8 @@ index 9e39deaeddd6..769f2cf30963 100644 +#endif /* process credentials */ - const struct cred __rcu *real_cred; /* objective and real subjective task -@@ -1484,10 +1540,15 @@ struct task_struct { + const struct cred __rcu *ptracer_cred; /* Tracer's credentials at attach */ +@@ -1485,10 +1541,15 @@ /* signal handlers */ struct signal_struct *signal; struct sighand_struct *sighand; @@ -13442,7 +13465,7 @@ index 9e39deaeddd6..769f2cf30963 100644 unsigned long sas_ss_sp; size_t sas_ss_size; -@@ -1513,6 +1574,8 @@ struct task_struct { +@@ -1514,6 +1575,8 @@ /* Protection of the PI data structures: */ raw_spinlock_t pi_lock; @@ -13451,7 +13474,7 @@ index 9e39deaeddd6..769f2cf30963 100644 #ifdef CONFIG_RT_MUTEXES /* PI waiters blocked on a rt_mutex held by this task */ struct rb_root pi_waiters; -@@ -1707,6 +1770,12 @@ struct task_struct { +@@ -1708,6 +1771,12 @@ unsigned long trace; /* bitmask and counter of trace recursion */ unsigned long trace_recursion; @@ -13464,7 +13487,7 @@ index 9e39deaeddd6..769f2cf30963 100644 #endif /* CONFIG_TRACING */ #ifdef CONFIG_MEMCG struct memcg_oom_info { -@@ -1723,14 +1792,26 @@ struct task_struct { +@@ -1724,14 +1793,26 @@ unsigned int sequential_io; unsigned int sequential_io_avg; #endif @@ -13494,7 +13517,7 @@ index 9e39deaeddd6..769f2cf30963 100644 #define TNF_MIGRATED 0x01 #define TNF_NO_GROUP 0x02 #define TNF_SHARED 0x04 -@@ -1919,6 +2000,15 @@ extern struct pid *cad_pid; +@@ -1920,6 +2001,15 @@ extern void free_task(struct task_struct *tsk); #define get_task_struct(tsk) do { atomic_inc(&(tsk)->usage); } while(0) @@ -13510,7 +13533,7 @@ index 9e39deaeddd6..769f2cf30963 100644 extern void __put_task_struct(struct task_struct *t); static inline void put_task_struct(struct task_struct *t) -@@ -1926,6 +2016,7 @@ static inline void put_task_struct(struct task_struct *t) +@@ -1927,6 +2017,7 @@ if (atomic_dec_and_test(&t->usage)) __put_task_struct(t); } @@ -13518,7 +13541,7 @@ index 9e39deaeddd6..769f2cf30963 100644 #ifdef CONFIG_VIRT_CPU_ACCOUNTING_GEN extern void task_cputime(struct task_struct *t, -@@ -1964,6 +2055,7 @@ extern void thread_group_cputime_adjusted(struct task_struct *p, cputime_t *ut, +@@ -1965,6 +2056,7 @@ /* * Per process flags */ @@ -13526,7 +13549,7 @@ index 9e39deaeddd6..769f2cf30963 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 */ -@@ -2128,6 +2220,10 @@ extern void do_set_cpus_allowed(struct task_struct *p, +@@ -2129,6 +2221,10 @@ extern int set_cpus_allowed_ptr(struct task_struct *p, const struct cpumask *new_mask); @@ -13537,7 +13560,7 @@ index 9e39deaeddd6..769f2cf30963 100644 #else static inline void do_set_cpus_allowed(struct task_struct *p, const struct cpumask *new_mask) -@@ -2140,6 +2236,9 @@ static inline int set_cpus_allowed_ptr(struct task_struct *p, +@@ -2141,6 +2237,9 @@ return -EINVAL; return 0; } @@ -13547,7 +13570,7 @@ index 9e39deaeddd6..769f2cf30963 100644 #endif #ifdef CONFIG_NO_HZ_COMMON -@@ -2356,6 +2455,7 @@ extern void xtime_update(unsigned long ticks); +@@ -2357,6 +2456,7 @@ extern int wake_up_state(struct task_struct *tsk, unsigned int state); extern int wake_up_process(struct task_struct *tsk); @@ -13555,7 +13578,7 @@ index 9e39deaeddd6..769f2cf30963 100644 extern void wake_up_new_task(struct task_struct *tsk); #ifdef CONFIG_SMP extern void kick_process(struct task_struct *tsk); -@@ -2472,12 +2572,24 @@ extern struct mm_struct * mm_alloc(void); +@@ -2473,12 +2573,24 @@ /* mmdrop drops the mm and the page tables */ extern void __mmdrop(struct mm_struct *); @@ -13580,7 +13603,7 @@ index 9e39deaeddd6..769f2cf30963 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 */ -@@ -2789,6 +2901,43 @@ static inline int test_tsk_need_resched(struct task_struct *tsk) +@@ -2790,6 +2902,43 @@ return unlikely(test_tsk_thread_flag(tsk,TIF_NEED_RESCHED)); } @@ -13624,7 +13647,7 @@ index 9e39deaeddd6..769f2cf30963 100644 static inline int restart_syscall(void) { set_tsk_thread_flag(current, TIF_SIGPENDING); -@@ -2820,6 +2969,51 @@ static inline int signal_pending_state(long state, struct task_struct *p) +@@ -2821,6 +2970,51 @@ return (state & TASK_INTERRUPTIBLE) || __fatal_signal_pending(p); } @@ -13676,7 +13699,7 @@ index 9e39deaeddd6..769f2cf30963 100644 /* * cond_resched() and cond_resched_lock(): latency reduction via * explicit rescheduling in places that are safe. The return -@@ -2841,12 +3035,16 @@ extern int __cond_resched_lock(spinlock_t *lock); +@@ -2842,12 +3036,16 @@ __cond_resched_lock(lock); \ }) @@ -13693,7 +13716,7 @@ index 9e39deaeddd6..769f2cf30963 100644 static inline void cond_resched_rcu(void) { -@@ -3013,6 +3211,26 @@ static inline void set_task_cpu(struct task_struct *p, unsigned int cpu) +@@ -3014,6 +3212,26 @@ #endif /* CONFIG_SMP */ @@ -13720,11 +13743,10 @@ index 9e39deaeddd6..769f2cf30963 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 c07e3a536099..381bf3999617 100644 ---- a/include/linux/seqlock.h -+++ b/include/linux/seqlock.h -@@ -219,20 +219,30 @@ static inline int read_seqcount_retry(const seqcount_t *s, unsigned start) +diff -Nur linux-4.1.39.orig/include/linux/seqlock.h linux-4.1.39/include/linux/seqlock.h +--- linux-4.1.39.orig/include/linux/seqlock.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/seqlock.h 2017-04-18 17:56:30.609396976 +0200 +@@ -219,20 +219,30 @@ return __read_seqcount_retry(s, start); } @@ -13759,7 +13781,7 @@ index c07e3a536099..381bf3999617 100644 /* * raw_write_seqcount_latch - redirect readers to even/odd copy * @s: pointer to seqcount_t -@@ -305,10 +315,32 @@ typedef struct { +@@ -305,10 +315,32 @@ /* * Read side functions for starting and finalizing a read side section. */ @@ -13792,7 +13814,7 @@ index c07e3a536099..381bf3999617 100644 static inline unsigned read_seqretry(const seqlock_t *sl, unsigned start) { -@@ -323,36 +355,36 @@ static inline unsigned read_seqretry(const seqlock_t *sl, unsigned start) +@@ -323,36 +355,36 @@ static inline void write_seqlock(seqlock_t *sl) { spin_lock(&sl->lock); @@ -13835,7 +13857,7 @@ index c07e3a536099..381bf3999617 100644 spin_unlock_irq(&sl->lock); } -@@ -361,7 +393,7 @@ static inline unsigned long __write_seqlock_irqsave(seqlock_t *sl) +@@ -361,7 +393,7 @@ unsigned long flags; spin_lock_irqsave(&sl->lock, flags); @@ -13844,7 +13866,7 @@ index c07e3a536099..381bf3999617 100644 return flags; } -@@ -371,7 +403,7 @@ static inline unsigned long __write_seqlock_irqsave(seqlock_t *sl) +@@ -371,7 +403,7 @@ static inline void write_sequnlock_irqrestore(seqlock_t *sl, unsigned long flags) { @@ -13853,11 +13875,10 @@ index c07e3a536099..381bf3999617 100644 spin_unlock_irqrestore(&sl->lock, flags); } -diff --git a/include/linux/signal.h b/include/linux/signal.h -index 883ceb1439fa..6da98d067bad 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.1.39.orig/include/linux/signal.h linux-4.1.39/include/linux/signal.h +--- linux-4.1.39.orig/include/linux/signal.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/signal.h 2017-04-18 17:56:30.609396976 +0200 +@@ -233,6 +233,7 @@ } extern void flush_sigqueue(struct sigpending *queue); @@ -13865,11 +13886,10 @@ index 883ceb1439fa..6da98d067bad 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 ca2e26a486ee..ea41a11d3bc7 100644 ---- a/include/linux/skbuff.h -+++ b/include/linux/skbuff.h -@@ -187,6 +187,7 @@ struct sk_buff_head { +diff -Nur linux-4.1.39.orig/include/linux/skbuff.h linux-4.1.39/include/linux/skbuff.h +--- linux-4.1.39.orig/include/linux/skbuff.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/skbuff.h 2017-04-18 17:56:30.613397130 +0200 +@@ -187,6 +187,7 @@ __u32 qlen; spinlock_t lock; @@ -13877,7 +13897,7 @@ index ca2e26a486ee..ea41a11d3bc7 100644 }; struct sk_buff; -@@ -1337,6 +1338,12 @@ static inline void skb_queue_head_init(struct sk_buff_head *list) +@@ -1337,6 +1338,12 @@ __skb_queue_head_init(list); } @@ -13890,11 +13910,10 @@ index ca2e26a486ee..ea41a11d3bc7 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.1.39.orig/include/linux/smp.h linux-4.1.39/include/linux/smp.h +--- linux-4.1.39.orig/include/linux/smp.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/smp.h 2017-04-18 17:56:30.613397130 +0200 +@@ -185,6 +185,9 @@ #define get_cpu() ({ preempt_disable(); smp_processor_id(); }) #define put_cpu() preempt_enable() @@ -13904,11 +13923,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 3e18379dfa6f..28f4366fd495 100644 ---- a/include/linux/spinlock.h -+++ b/include/linux/spinlock.h -@@ -281,7 +281,11 @@ static inline void do_raw_spin_unlock(raw_spinlock_t *lock) __releases(lock) +diff -Nur linux-4.1.39.orig/include/linux/spinlock_api_smp.h linux-4.1.39/include/linux/spinlock_api_smp.h +--- linux-4.1.39.orig/include/linux/spinlock_api_smp.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/spinlock_api_smp.h 2017-04-18 17:56:30.613397130 +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.1.39.orig/include/linux/spinlock.h linux-4.1.39/include/linux/spinlock.h +--- linux-4.1.39.orig/include/linux/spinlock.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/spinlock.h 2017-04-18 17:56:30.613397130 +0200 +@@ -281,7 +281,11 @@ #define raw_spin_can_lock(lock) (!raw_spin_is_locked(lock)) /* Include rwlock functions */ @@ -13921,7 +13952,7 @@ index 3e18379dfa6f..28f4366fd495 100644 /* * Pull the _spin_*()/_read_*()/_write_*() functions/declarations: -@@ -292,6 +296,10 @@ static inline void do_raw_spin_unlock(raw_spinlock_t *lock) __releases(lock) +@@ -292,6 +296,10 @@ # include <linux/spinlock_api_up.h> #endif @@ -13932,32 +13963,16 @@ index 3e18379dfa6f..28f4366fd495 100644 /* * Map the spin_lock functions to the raw variants for PREEMPT_RT=n */ -@@ -426,4 +434,6 @@ extern int _atomic_dec_and_lock(atomic_t *atomic, spinlock_t *lock); +@@ -426,4 +434,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..f757096b230c ---- /dev/null -+++ b/include/linux/spinlock_rt.h +diff -Nur linux-4.1.39.orig/include/linux/spinlock_rt.h linux-4.1.39/include/linux/spinlock_rt.h +--- linux-4.1.39.orig/include/linux/spinlock_rt.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.39/include/linux/spinlock_rt.h 2017-04-18 17:56:30.613397130 +0200 @@ -0,0 +1,174 @@ +#ifndef __LINUX_SPINLOCK_RT_H +#define __LINUX_SPINLOCK_RT_H @@ -14133,10 +14148,9 @@ index 000000000000..f757096b230c + 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.1.39.orig/include/linux/spinlock_types.h linux-4.1.39/include/linux/spinlock_types.h +--- linux-4.1.39.orig/include/linux/spinlock_types.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/spinlock_types.h 2017-04-18 17:56:30.613397130 +0200 @@ -9,80 +9,15 @@ * Released under the General Public License (GPL). */ @@ -14225,11 +14239,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.1.39.orig/include/linux/spinlock_types_nort.h linux-4.1.39/include/linux/spinlock_types_nort.h +--- linux-4.1.39.orig/include/linux/spinlock_types_nort.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.39/include/linux/spinlock_types_nort.h 2017-04-18 17:56:30.613397130 +0200 @@ -0,0 +1,33 @@ +#ifndef __LINUX_SPINLOCK_TYPES_NORT_H +#define __LINUX_SPINLOCK_TYPES_NORT_H @@ -14264,11 +14276,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.1.39.orig/include/linux/spinlock_types_raw.h linux-4.1.39/include/linux/spinlock_types_raw.h +--- linux-4.1.39.orig/include/linux/spinlock_types_raw.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.39/include/linux/spinlock_types_raw.h 2017-04-18 17:56:30.613397130 +0200 @@ -0,0 +1,56 @@ +#ifndef __LINUX_SPINLOCK_TYPES_RAW_H +#define __LINUX_SPINLOCK_TYPES_RAW_H @@ -14326,11 +14336,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..9fd431967abc ---- /dev/null -+++ b/include/linux/spinlock_types_rt.h +diff -Nur linux-4.1.39.orig/include/linux/spinlock_types_rt.h linux-4.1.39/include/linux/spinlock_types_rt.h +--- linux-4.1.39.orig/include/linux/spinlock_types_rt.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.39/include/linux/spinlock_types_rt.h 2017-04-18 17:56:30.613397130 +0200 @@ -0,0 +1,51 @@ +#ifndef __LINUX_SPINLOCK_TYPES_RT_H +#define __LINUX_SPINLOCK_TYPES_RT_H @@ -14383,11 +14391,10 @@ index 000000000000..9fd431967abc + spinlock_t name __cacheline_aligned_in_smp = __SPIN_LOCK_UNLOCKED(name) + +#endif -diff --git a/include/linux/srcu.h b/include/linux/srcu.h -index bdeb4567b71e..a9c3c49cda5d 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.1.39.orig/include/linux/srcu.h linux-4.1.39/include/linux/srcu.h +--- linux-4.1.39.orig/include/linux/srcu.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/srcu.h 2017-04-18 17:56:30.613397130 +0200 +@@ -84,10 +84,10 @@ void process_srcu(struct work_struct *work); @@ -14400,7 +14407,7 @@ index bdeb4567b71e..a9c3c49cda5d 100644 .queue_lock = __SPIN_LOCK_UNLOCKED(name.queue_lock), \ .running = false, \ .batch_queue = RCU_BATCH_INIT(name.batch_queue), \ -@@ -104,7 +104,7 @@ void process_srcu(struct work_struct *work); +@@ -104,7 +104,7 @@ */ #define __DEFINE_SRCU(name, is_static) \ static DEFINE_PER_CPU(struct srcu_struct_array, name##_srcu_array);\ @@ -14409,10 +14416,9 @@ index bdeb4567b71e..a9c3c49cda5d 100644 #define DEFINE_SRCU(name) __DEFINE_SRCU(name, /* not static */) #define DEFINE_STATIC_SRCU(name) __DEFINE_SRCU(name, static) -diff --git a/include/linux/swap.h b/include/linux/swap.h -index cee108cbe2d5..4c07c12d2d82 100644 ---- a/include/linux/swap.h -+++ b/include/linux/swap.h +diff -Nur linux-4.1.39.orig/include/linux/swap.h linux-4.1.39/include/linux/swap.h +--- linux-4.1.39.orig/include/linux/swap.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/swap.h 2017-04-18 17:56:30.613397130 +0200 @@ -11,6 +11,7 @@ #include <linux/fs.h> #include <linux/atomic.h> @@ -14421,7 +14427,7 @@ index cee108cbe2d5..4c07c12d2d82 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); @@ -14431,7 +14437,7 @@ index cee108cbe2d5..4c07c12d2d82 100644 static inline unsigned int workingset_node_pages(struct radix_tree_node *node) { -@@ -296,6 +298,7 @@ extern unsigned long nr_free_pagecache_pages(void); +@@ -296,6 +298,7 @@ /* linux/mm/swap.c */ @@ -14439,11 +14445,10 @@ index cee108cbe2d5..4c07c12d2d82 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/thread_info.h b/include/linux/thread_info.h -index ff307b548ed3..be9f9dc6a4e1 100644 ---- a/include/linux/thread_info.h -+++ b/include/linux/thread_info.h -@@ -102,7 +102,17 @@ static inline int test_ti_thread_flag(struct thread_info *ti, int flag) +diff -Nur linux-4.1.39.orig/include/linux/thread_info.h linux-4.1.39/include/linux/thread_info.h +--- linux-4.1.39.orig/include/linux/thread_info.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/thread_info.h 2017-04-18 17:56:30.613397130 +0200 +@@ -102,7 +102,17 @@ #define test_thread_flag(flag) \ test_ti_thread_flag(current_thread_info(), flag) @@ -14462,11 +14467,10 @@ index ff307b548ed3..be9f9dc6a4e1 100644 #if defined TIF_RESTORE_SIGMASK && !defined HAVE_SET_RESTORE_SIGMASK /* -diff --git a/include/linux/timer.h b/include/linux/timer.h -index 8c5a197e1587..5fcd72c57ebe 100644 ---- a/include/linux/timer.h -+++ b/include/linux/timer.h -@@ -241,7 +241,7 @@ extern void add_timer(struct timer_list *timer); +diff -Nur linux-4.1.39.orig/include/linux/timer.h linux-4.1.39/include/linux/timer.h +--- linux-4.1.39.orig/include/linux/timer.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/timer.h 2017-04-18 17:56:30.613397130 +0200 +@@ -241,7 +241,7 @@ extern int try_to_del_timer_sync(struct timer_list *timer); @@ -14475,10 +14479,9 @@ index 8c5a197e1587..5fcd72c57ebe 100644 extern int del_timer_sync(struct timer_list *timer); #else # define del_timer_sync(t) del_timer(t) -diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h -index ecd3319dac33..941b2dab50cd 100644 ---- a/include/linux/uaccess.h -+++ b/include/linux/uaccess.h +diff -Nur linux-4.1.39.orig/include/linux/uaccess.h linux-4.1.39/include/linux/uaccess.h +--- linux-4.1.39.orig/include/linux/uaccess.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/uaccess.h 2017-04-18 17:56:30.613397130 +0200 @@ -1,21 +1,31 @@ #ifndef __LINUX_UACCESS_H__ #define __LINUX_UACCESS_H__ @@ -14519,7 +14522,7 @@ index ecd3319dac33..941b2dab50cd 100644 /* * make sure to have issued the store before a pagefault * can hit. -@@ -25,18 +35,32 @@ static inline void pagefault_disable(void) +@@ -25,18 +35,32 @@ static inline void pagefault_enable(void) { @@ -14557,10 +14560,9 @@ index ecd3319dac33..941b2dab50cd 100644 #ifndef ARCH_HAS_NOCACHE_UACCESS static inline unsigned long __copy_from_user_inatomic_nocache(void *to, -diff --git a/include/linux/uprobes.h b/include/linux/uprobes.h -index 60beb5dc7977..f5a644c649b4 100644 ---- a/include/linux/uprobes.h -+++ b/include/linux/uprobes.h +diff -Nur linux-4.1.39.orig/include/linux/uprobes.h linux-4.1.39/include/linux/uprobes.h +--- linux-4.1.39.orig/include/linux/uprobes.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/uprobes.h 2017-04-18 17:56:30.613397130 +0200 @@ -27,6 +27,7 @@ #include <linux/errno.h> #include <linux/rbtree.h> @@ -14569,11 +14571,10 @@ index 60beb5dc7977..f5a644c649b4 100644 struct vm_area_struct; struct mm_struct; -diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h -index 82e7db7f7100..3feaf770a8bd 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.1.39.orig/include/linux/vmstat.h linux-4.1.39/include/linux/vmstat.h +--- linux-4.1.39.orig/include/linux/vmstat.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/vmstat.h 2017-04-18 17:56:30.613397130 +0200 +@@ -33,7 +33,9 @@ */ static inline void __count_vm_event(enum vm_event_item item) { @@ -14583,7 +14584,7 @@ index 82e7db7f7100..3feaf770a8bd 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) { @@ -14593,11 +14594,20 @@ index 82e7db7f7100..3feaf770a8bd 100644 } static inline void count_vm_events(enum vm_event_item item, long delta) -diff --git a/include/linux/wait-simple.h b/include/linux/wait-simple.h -new file mode 100644 -index 000000000000..f86bca2c41d5 ---- /dev/null -+++ b/include/linux/wait-simple.h +diff -Nur linux-4.1.39.orig/include/linux/wait.h linux-4.1.39/include/linux/wait.h +--- linux-4.1.39.orig/include/linux/wait.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/linux/wait.h 2017-04-18 17:56:30.613397130 +0200 +@@ -8,6 +8,7 @@ + #include <linux/spinlock.h> + #include <asm/current.h> + #include <uapi/linux/wait.h> ++#include <linux/atomic.h> + + typedef struct __wait_queue wait_queue_t; + typedef int (*wait_queue_func_t)(wait_queue_t *wait, unsigned mode, int flags, void *key); +diff -Nur linux-4.1.39.orig/include/linux/wait-simple.h linux-4.1.39/include/linux/wait-simple.h +--- linux-4.1.39.orig/include/linux/wait-simple.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.39/include/linux/wait-simple.h 2017-04-18 17:56:30.613397130 +0200 @@ -0,0 +1,207 @@ +#ifndef _LINUX_WAIT_SIMPLE_H +#define _LINUX_WAIT_SIMPLE_H @@ -14806,23 +14816,9 @@ index 000000000000..f86bca2c41d5 +}) + +#endif -diff --git a/include/linux/wait.h b/include/linux/wait.h -index 2db83349865b..b3b54c26b6a0 100644 ---- a/include/linux/wait.h -+++ b/include/linux/wait.h -@@ -8,6 +8,7 @@ - #include <linux/spinlock.h> - #include <asm/current.h> - #include <uapi/linux/wait.h> -+#include <linux/atomic.h> - - 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/linux/work-simple.h b/include/linux/work-simple.h -new file mode 100644 -index 000000000000..f175fa9a6016 ---- /dev/null -+++ b/include/linux/work-simple.h +diff -Nur linux-4.1.39.orig/include/linux/work-simple.h linux-4.1.39/include/linux/work-simple.h +--- linux-4.1.39.orig/include/linux/work-simple.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.39/include/linux/work-simple.h 2017-04-18 17:56:30.613397130 +0200 @@ -0,0 +1,24 @@ +#ifndef _LINUX_SWORK_H +#define _LINUX_SWORK_H @@ -14848,11 +14844,10 @@ index 000000000000..f175fa9a6016 +void swork_put(void); + +#endif /* _LINUX_SWORK_H */ -diff --git a/include/net/dst.h b/include/net/dst.h -index 182b812d45e1..74baade721d6 100644 ---- a/include/net/dst.h -+++ b/include/net/dst.h -@@ -436,7 +436,7 @@ static inline void dst_confirm(struct dst_entry *dst) +diff -Nur linux-4.1.39.orig/include/net/dst.h linux-4.1.39/include/net/dst.h +--- linux-4.1.39.orig/include/net/dst.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/net/dst.h 2017-04-18 17:56:30.613397130 +0200 +@@ -436,7 +436,7 @@ static inline int dst_neigh_output(struct dst_entry *dst, struct neighbour *n, struct sk_buff *skb) { @@ -14861,11 +14856,10 @@ index 182b812d45e1..74baade721d6 100644 if (dst->pending_confirm) { unsigned long now = jiffies; -diff --git a/include/net/neighbour.h b/include/net/neighbour.h -index bd33e66f49aa..9c38018c6038 100644 ---- a/include/net/neighbour.h -+++ b/include/net/neighbour.h -@@ -445,7 +445,7 @@ static inline int neigh_hh_bridge(struct hh_cache *hh, struct sk_buff *skb) +diff -Nur linux-4.1.39.orig/include/net/neighbour.h linux-4.1.39/include/net/neighbour.h +--- linux-4.1.39.orig/include/net/neighbour.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/net/neighbour.h 2017-04-18 17:56:30.613397130 +0200 +@@ -445,7 +445,7 @@ } #endif @@ -14874,7 +14868,7 @@ index bd33e66f49aa..9c38018c6038 100644 { unsigned int seq; int hh_len; -@@ -500,7 +500,7 @@ struct neighbour_cb { +@@ -500,7 +500,7 @@ #define NEIGH_CB(skb) ((struct neighbour_cb *)(skb)->cb) @@ -14883,11 +14877,10 @@ index bd33e66f49aa..9c38018c6038 100644 const struct net_device *dev) { unsigned int seq; -diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h -index 614a49be68a9..b4bdbe10b77a 100644 ---- a/include/net/netns/ipv4.h -+++ b/include/net/netns/ipv4.h -@@ -69,6 +69,7 @@ struct netns_ipv4 { +diff -Nur linux-4.1.39.orig/include/net/netns/ipv4.h linux-4.1.39/include/net/netns/ipv4.h +--- linux-4.1.39.orig/include/net/netns/ipv4.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/net/netns/ipv4.h 2017-04-18 17:56:30.613397130 +0200 +@@ -69,6 +69,7 @@ int sysctl_icmp_echo_ignore_all; int sysctl_icmp_echo_ignore_broadcasts; @@ -14895,11 +14888,9 @@ index 614a49be68a9..b4bdbe10b77a 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..37f6eb8c9dc2 ---- /dev/null -+++ b/include/trace/events/hist.h +diff -Nur linux-4.1.39.orig/include/trace/events/hist.h linux-4.1.39/include/trace/events/hist.h +--- linux-4.1.39.orig/include/trace/events/hist.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.39/include/trace/events/hist.h 2017-04-18 17:56:30.613397130 +0200 @@ -0,0 +1,74 @@ +#undef TRACE_SYSTEM +#define TRACE_SYSTEM hist @@ -14975,11 +14966,9 @@ index 000000000000..37f6eb8c9dc2 + +/* 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.1.39.orig/include/trace/events/latency_hist.h linux-4.1.39/include/trace/events/latency_hist.h +--- linux-4.1.39.orig/include/trace/events/latency_hist.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.39/include/trace/events/latency_hist.h 2017-04-18 17:56:30.613397130 +0200 @@ -0,0 +1,29 @@ +#ifndef _LATENCY_HIST_H +#define _LATENCY_HIST_H @@ -15010,11 +14999,10 @@ index 000000000000..d3f2fbd560b1 +} + +#endif /* _LATENCY_HIST_H */ -diff --git a/include/trace/events/sched.h b/include/trace/events/sched.h -index 30fedaf3e56a..3b63828390a6 100644 ---- a/include/trace/events/sched.h -+++ b/include/trace/events/sched.h -@@ -55,9 +55,9 @@ TRACE_EVENT(sched_kthread_stop_ret, +diff -Nur linux-4.1.39.orig/include/trace/events/sched.h linux-4.1.39/include/trace/events/sched.h +--- linux-4.1.39.orig/include/trace/events/sched.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/include/trace/events/sched.h 2017-04-18 17:56:30.613397130 +0200 +@@ -55,9 +55,9 @@ */ DECLARE_EVENT_CLASS(sched_wakeup_template, @@ -15026,7 +15014,7 @@ index 30fedaf3e56a..3b63828390a6 100644 TP_STRUCT__entry( __array( char, comm, TASK_COMM_LEN ) -@@ -71,25 +71,37 @@ DECLARE_EVENT_CLASS(sched_wakeup_template, +@@ -71,25 +71,37 @@ memcpy(__entry->comm, p->comm, TASK_COMM_LEN); __entry->pid = p->pid; __entry->prio = p->prio; @@ -15071,11 +15059,10 @@ index 30fedaf3e56a..3b63828390a6 100644 #ifdef CREATE_TRACE_POINTS static inline long __trace_sched_switch_state(struct task_struct *p) -diff --git a/init/Kconfig b/init/Kconfig -index dc24dec60232..a70b5002df06 100644 ---- a/init/Kconfig -+++ b/init/Kconfig -@@ -637,7 +637,7 @@ config RCU_FANOUT_EXACT +diff -Nur linux-4.1.39.orig/init/Kconfig linux-4.1.39/init/Kconfig +--- linux-4.1.39.orig/init/Kconfig 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/init/Kconfig 2017-04-18 17:56:30.613397130 +0200 +@@ -637,7 +637,7 @@ config RCU_FAST_NO_HZ bool "Accelerate last non-dyntick-idle CPU's grace periods" @@ -15084,7 +15071,7 @@ index dc24dec60232..a70b5002df06 100644 default n help This option permits CPUs to enter dynticks-idle state even if -@@ -664,7 +664,7 @@ config TREE_RCU_TRACE +@@ -664,7 +664,7 @@ config RCU_BOOST bool "Enable RCU priority boosting" depends on RT_MUTEXES && PREEMPT_RCU @@ -15093,7 +15080,7 @@ index dc24dec60232..a70b5002df06 100644 help This option boosts the priority of preempted RCU readers that block the current preemptible RCU grace period for too long. -@@ -1101,6 +1101,7 @@ config CFS_BANDWIDTH +@@ -1101,6 +1101,7 @@ config RT_GROUP_SCHED bool "Group scheduling for SCHED_RR/FIFO" depends on CGROUP_SCHED @@ -15101,7 +15088,7 @@ index dc24dec60232..a70b5002df06 100644 default n help This feature lets you explicitly allocate real CPU bandwidth -@@ -1688,6 +1689,7 @@ choice +@@ -1688,6 +1689,7 @@ config SLAB bool "SLAB" @@ -15109,7 +15096,7 @@ index dc24dec60232..a70b5002df06 100644 help The regular slab allocator that is established and known to work well in all environments. It organizes cache hot objects in -@@ -1706,6 +1708,7 @@ config SLUB +@@ -1706,6 +1708,7 @@ config SLOB depends on EXPERT bool "SLOB (Simple Allocator)" @@ -15117,7 +15104,7 @@ index dc24dec60232..a70b5002df06 100644 help SLOB replaces the stock allocator with a drastically simpler allocator. SLOB is generally more space efficient but -@@ -1715,7 +1718,7 @@ endchoice +@@ -1715,7 +1718,7 @@ config SLUB_CPU_PARTIAL default y @@ -15126,21 +15113,10 @@ index dc24dec60232..a70b5002df06 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 @@ silent_chk_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 2a89545e0a5d..0486a8e11fc0 100644 ---- a/init/main.c -+++ b/init/main.c -@@ -525,6 +525,7 @@ asmlinkage __visible void __init start_kernel(void) +diff -Nur linux-4.1.39.orig/init/main.c linux-4.1.39/init/main.c +--- linux-4.1.39.orig/init/main.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/init/main.c 2017-04-18 17:56:30.617397286 +0200 +@@ -525,6 +525,7 @@ setup_command_line(command_line); setup_nr_cpu_ids(); setup_per_cpu_areas(); @@ -15148,10 +15124,18 @@ index 2a89545e0a5d..0486a8e11fc0 100644 smp_prepare_boot_cpu(); /* arch-specific boot-cpu hooks */ build_all_zonelists(NULL, NULL); -diff --git a/ipc/mqueue.c b/ipc/mqueue.c -index c3fc5c2b63f3..161a1807e6ef 100644 ---- a/ipc/mqueue.c -+++ b/ipc/mqueue.c +diff -Nur linux-4.1.39.orig/init/Makefile linux-4.1.39/init/Makefile +--- linux-4.1.39.orig/init/Makefile 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/init/Makefile 2017-04-18 17:56:30.613397130 +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.1.39.orig/ipc/mqueue.c linux-4.1.39/ipc/mqueue.c +--- linux-4.1.39.orig/ipc/mqueue.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/ipc/mqueue.c 2017-04-18 17:56:30.617397286 +0200 @@ -47,8 +47,7 @@ #define RECV 1 @@ -15162,7 +15146,7 @@ index c3fc5c2b63f3..161a1807e6ef 100644 struct posix_msg_tree_node { struct rb_node rb_node; -@@ -568,15 +567,12 @@ static int wq_sleep(struct mqueue_inode_info *info, int sr, +@@ -568,15 +567,12 @@ wq_add(info, sr, ewp); for (;;) { @@ -15179,7 +15163,7 @@ index c3fc5c2b63f3..161a1807e6ef 100644 if (ewp->state == STATE_READY) { retval = 0; goto out; -@@ -904,11 +900,15 @@ out_name: +@@ -904,11 +900,15 @@ * list of waiting receivers. A sender checks that list before adding the new * message into the message array. If there is a waiting receiver, then it * bypasses the message array and directly hands the message over to the @@ -15200,7 +15184,7 @@ index c3fc5c2b63f3..161a1807e6ef 100644 * * The same algorithm is used for senders. */ -@@ -916,21 +916,29 @@ out_name: +@@ -916,21 +916,29 @@ /* pipelined_send() - send a message directly to the task waiting in * sys_mq_timedreceive() (without inserting message into a queue). */ @@ -15235,7 +15219,7 @@ index c3fc5c2b63f3..161a1807e6ef 100644 { struct ext_wait_queue *sender = wq_get_first_waiter(info, SEND); -@@ -941,10 +949,9 @@ static inline void pipelined_receive(struct mqueue_inode_info *info) +@@ -941,10 +949,9 @@ } if (msg_insert(sender->msg, info)) return; @@ -15248,7 +15232,7 @@ index c3fc5c2b63f3..161a1807e6ef 100644 sender->state = STATE_READY; } -@@ -962,6 +969,7 @@ SYSCALL_DEFINE5(mq_timedsend, mqd_t, mqdes, const char __user *, u_msg_ptr, +@@ -962,6 +969,7 @@ struct timespec ts; struct posix_msg_tree_node *new_leaf = NULL; int ret = 0; @@ -15256,7 +15240,7 @@ index c3fc5c2b63f3..161a1807e6ef 100644 if (u_abs_timeout) { int res = prepare_timeout(u_abs_timeout, &expires, &ts); -@@ -1045,7 +1053,7 @@ SYSCALL_DEFINE5(mq_timedsend, mqd_t, mqdes, const char __user *, u_msg_ptr, +@@ -1045,7 +1053,7 @@ } else { receiver = wq_get_first_waiter(info, RECV); if (receiver) { @@ -15265,7 +15249,7 @@ index c3fc5c2b63f3..161a1807e6ef 100644 } else { /* adds message to the queue */ ret = msg_insert(msg_ptr, info); -@@ -1058,6 +1066,7 @@ SYSCALL_DEFINE5(mq_timedsend, mqd_t, mqdes, const char __user *, u_msg_ptr, +@@ -1058,6 +1066,7 @@ } out_unlock: spin_unlock(&info->lock); @@ -15273,7 +15257,7 @@ index c3fc5c2b63f3..161a1807e6ef 100644 out_free: if (ret) free_msg(msg_ptr); -@@ -1144,14 +1153,17 @@ SYSCALL_DEFINE5(mq_timedreceive, mqd_t, mqdes, char __user *, u_msg_ptr, +@@ -1144,14 +1153,17 @@ msg_ptr = wait.msg; } } else { @@ -15292,11 +15276,10 @@ index c3fc5c2b63f3..161a1807e6ef 100644 ret = 0; } if (ret == 0) { -diff --git a/ipc/msg.c b/ipc/msg.c -index 3b2b0f5149ab..a75e79ff05ee 100644 ---- a/ipc/msg.c -+++ b/ipc/msg.c -@@ -188,6 +188,12 @@ static void expunge_all(struct msg_queue *msq, int res) +diff -Nur linux-4.1.39.orig/ipc/msg.c linux-4.1.39/ipc/msg.c +--- linux-4.1.39.orig/ipc/msg.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/ipc/msg.c 2017-04-18 17:56:30.617397286 +0200 +@@ -188,6 +188,12 @@ struct msg_receiver *msr, *t; list_for_each_entry_safe(msr, t, &msq->q_receivers, r_list) { @@ -15309,7 +15292,7 @@ index 3b2b0f5149ab..a75e79ff05ee 100644 msr->r_msg = NULL; /* initialize expunge ordering */ wake_up_process(msr->r_tsk); /* -@@ -198,6 +204,8 @@ static void expunge_all(struct msg_queue *msq, int res) +@@ -198,6 +204,8 @@ */ smp_mb(); msr->r_msg = ERR_PTR(res); @@ -15318,7 +15301,7 @@ index 3b2b0f5149ab..a75e79ff05ee 100644 } } -@@ -574,6 +582,11 @@ static inline int pipelined_send(struct msg_queue *msq, struct msg_msg *msg) +@@ -574,6 +582,11 @@ if (testmsg(msg, msr->r_msgtype, msr->r_mode) && !security_msg_queue_msgrcv(msq, msg, msr->r_tsk, msr->r_msgtype, msr->r_mode)) { @@ -15330,7 +15313,7 @@ index 3b2b0f5149ab..a75e79ff05ee 100644 list_del(&msr->r_list); if (msr->r_maxsize < msg->m_ts) { -@@ -595,12 +608,13 @@ static inline int pipelined_send(struct msg_queue *msq, struct msg_msg *msg) +@@ -595,12 +608,13 @@ */ smp_mb(); msr->r_msg = msg; @@ -15345,11 +15328,10 @@ index 3b2b0f5149ab..a75e79ff05ee 100644 return 0; } -diff --git a/ipc/sem.c b/ipc/sem.c -index 534caee6bf33..fbfdb0b699e0 100644 ---- a/ipc/sem.c -+++ b/ipc/sem.c -@@ -690,6 +690,13 @@ undo: +diff -Nur linux-4.1.39.orig/ipc/sem.c linux-4.1.39/ipc/sem.c +--- linux-4.1.39.orig/ipc/sem.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/ipc/sem.c 2017-04-18 17:56:30.617397286 +0200 +@@ -690,6 +690,13 @@ static void wake_up_sem_queue_prepare(struct list_head *pt, struct sem_queue *q, int error) { @@ -15363,7 +15345,7 @@ index 534caee6bf33..fbfdb0b699e0 100644 if (list_empty(pt)) { /* * Hold preempt off so that we don't get preempted and have the -@@ -701,6 +708,7 @@ static void wake_up_sem_queue_prepare(struct list_head *pt, +@@ -701,6 +708,7 @@ q->pid = error; list_add_tail(&q->list, pt); @@ -15371,7 +15353,7 @@ index 534caee6bf33..fbfdb0b699e0 100644 } /** -@@ -714,6 +722,7 @@ static void wake_up_sem_queue_prepare(struct list_head *pt, +@@ -714,6 +722,7 @@ */ static void wake_up_sem_queue_do(struct list_head *pt) { @@ -15379,7 +15361,7 @@ index 534caee6bf33..fbfdb0b699e0 100644 struct sem_queue *q, *t; int did_something; -@@ -726,6 +735,7 @@ static void wake_up_sem_queue_do(struct list_head *pt) +@@ -726,6 +735,7 @@ } if (did_something) preempt_enable(); @@ -15387,84 +15369,9 @@ index 534caee6bf33..fbfdb0b699e0 100644 } static void unlink_queue(struct sem_array *sma, struct sem_queue *q) -diff --git a/kernel/Kconfig.locks b/kernel/Kconfig.locks -index 08561f1acd13..c61e9131ecec 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/bpf/hashtab.c b/kernel/bpf/hashtab.c -index 83c209d9b17a..972b76bf54b7 100644 ---- a/kernel/bpf/hashtab.c -+++ b/kernel/bpf/hashtab.c +diff -Nur linux-4.1.39.orig/kernel/bpf/hashtab.c linux-4.1.39/kernel/bpf/hashtab.c +--- linux-4.1.39.orig/kernel/bpf/hashtab.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/bpf/hashtab.c 2017-04-18 17:56:30.617397286 +0200 @@ -17,7 +17,7 @@ struct bpf_htab { struct bpf_map map; @@ -15474,7 +15381,7 @@ index 83c209d9b17a..972b76bf54b7 100644 u32 count; /* number of elements in this hashtable */ u32 n_buckets; /* number of hash buckets */ u32 elem_size; /* size of each element in bytes */ -@@ -82,7 +82,7 @@ static struct bpf_map *htab_map_alloc(union bpf_attr *attr) +@@ -82,7 +82,7 @@ for (i = 0; i < htab->n_buckets; i++) INIT_HLIST_HEAD(&htab->buckets[i]); @@ -15483,7 +15390,7 @@ index 83c209d9b17a..972b76bf54b7 100644 htab->count = 0; htab->elem_size = sizeof(struct htab_elem) + -@@ -230,7 +230,7 @@ static int htab_map_update_elem(struct bpf_map *map, void *key, void *value, +@@ -230,7 +230,7 @@ l_new->hash = htab_map_hash(l_new->key, key_size); /* bpf_map_update_elem() can be called in_irq() */ @@ -15492,7 +15399,7 @@ index 83c209d9b17a..972b76bf54b7 100644 head = select_bucket(htab, l_new->hash); -@@ -266,11 +266,11 @@ static int htab_map_update_elem(struct bpf_map *map, void *key, void *value, +@@ -266,11 +266,11 @@ } else { htab->count++; } @@ -15506,7 +15413,7 @@ index 83c209d9b17a..972b76bf54b7 100644 kfree(l_new); return ret; } -@@ -291,7 +291,7 @@ static int htab_map_delete_elem(struct bpf_map *map, void *key) +@@ -291,7 +291,7 @@ hash = htab_map_hash(key, key_size); @@ -15515,7 +15422,7 @@ index 83c209d9b17a..972b76bf54b7 100644 head = select_bucket(htab, hash); -@@ -304,7 +304,7 @@ static int htab_map_delete_elem(struct bpf_map *map, void *key) +@@ -304,7 +304,7 @@ ret = 0; } @@ -15524,11 +15431,10 @@ index 83c209d9b17a..972b76bf54b7 100644 return ret; } -diff --git a/kernel/cgroup.c b/kernel/cgroup.c -index 3abce1e0f910..d818976f1d62 100644 ---- a/kernel/cgroup.c -+++ b/kernel/cgroup.c -@@ -4423,10 +4423,10 @@ static void css_free_rcu_fn(struct rcu_head *rcu_head) +diff -Nur linux-4.1.39.orig/kernel/cgroup.c linux-4.1.39/kernel/cgroup.c +--- linux-4.1.39.orig/kernel/cgroup.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/cgroup.c 2017-04-18 17:56:30.617397286 +0200 +@@ -4423,10 +4423,10 @@ queue_work(cgroup_destroy_wq, &css->destroy_work); } @@ -15541,7 +15447,7 @@ index 3abce1e0f910..d818976f1d62 100644 struct cgroup_subsys *ss = css->ss; struct cgroup *cgrp = css->cgroup; -@@ -4465,8 +4465,8 @@ static void css_release(struct percpu_ref *ref) +@@ -4465,8 +4465,8 @@ struct cgroup_subsys_state *css = container_of(ref, struct cgroup_subsys_state, refcnt); @@ -15552,7 +15458,7 @@ index 3abce1e0f910..d818976f1d62 100644 } static void init_and_link_css(struct cgroup_subsys_state *css, -@@ -5080,6 +5080,7 @@ static int __init cgroup_wq_init(void) +@@ -5080,6 +5080,7 @@ */ cgroup_destroy_wq = alloc_workqueue("cgroup_destroy", 0, 1); BUG_ON(!cgroup_destroy_wq); @@ -15560,11 +15466,10 @@ index 3abce1e0f910..d818976f1d62 100644 /* * Used to destroy pidlists and separate to serve as flush domain. -diff --git a/kernel/cpu.c b/kernel/cpu.c -index 94bbe4695232..0351ac42263e 100644 ---- a/kernel/cpu.c -+++ b/kernel/cpu.c -@@ -74,8 +74,8 @@ static struct { +diff -Nur linux-4.1.39.orig/kernel/cpu.c linux-4.1.39/kernel/cpu.c +--- linux-4.1.39.orig/kernel/cpu.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/cpu.c 2017-04-18 17:56:30.617397286 +0200 +@@ -74,8 +74,8 @@ #endif } cpu_hotplug = { .active_writer = NULL, @@ -15574,7 +15479,7 @@ index 94bbe4695232..0351ac42263e 100644 #ifdef CONFIG_DEBUG_LOCK_ALLOC .dep_map = {.name = "cpu_hotplug.lock" }, #endif -@@ -88,6 +88,289 @@ static struct { +@@ -88,6 +88,289 @@ #define cpuhp_lock_acquire() lock_map_acquire(&cpu_hotplug.dep_map) #define cpuhp_lock_release() lock_map_release(&cpu_hotplug.dep_map) @@ -15864,7 +15769,7 @@ index 94bbe4695232..0351ac42263e 100644 void get_online_cpus(void) { -@@ -349,13 +632,15 @@ static int __ref take_cpu_down(void *_param) +@@ -349,13 +632,15 @@ /* Requires cpu_add_remove_lock to be held */ static int __ref _cpu_down(unsigned int cpu, int tasks_frozen) { @@ -15881,7 +15786,7 @@ index 94bbe4695232..0351ac42263e 100644 if (num_online_cpus() == 1) return -EBUSY; -@@ -363,7 +648,34 @@ static int __ref _cpu_down(unsigned int cpu, int tasks_frozen) +@@ -363,7 +648,34 @@ if (!cpu_online(cpu)) return -EINVAL; @@ -15916,7 +15821,7 @@ index 94bbe4695232..0351ac42263e 100644 err = __cpu_notify(CPU_DOWN_PREPARE | mod, hcpu, -1, &nr_calls); if (err) { -@@ -389,8 +701,12 @@ static int __ref _cpu_down(unsigned int cpu, int tasks_frozen) +@@ -389,8 +701,12 @@ #endif synchronize_rcu(); @@ -15929,7 +15834,7 @@ index 94bbe4695232..0351ac42263e 100644 /* * So now all preempt/rcu users must observe !cpu_active(). */ -@@ -427,9 +743,14 @@ static int __ref _cpu_down(unsigned int cpu, int tasks_frozen) +@@ -427,9 +743,14 @@ check_for_tasks(cpu); out_release: @@ -15944,11 +15849,247 @@ index 94bbe4695232..0351ac42263e 100644 return err; } -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.1.39.orig/kernel/cpuset.c linux-4.1.39/kernel/cpuset.c +--- linux-4.1.39.orig/kernel/cpuset.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/cpuset.c 2017-04-18 17:56:30.617397286 +0200 +@@ -284,7 +284,7 @@ + */ + + static DEFINE_MUTEX(cpuset_mutex); +-static DEFINE_SPINLOCK(callback_lock); ++static DEFINE_RAW_SPINLOCK(callback_lock); + + /* + * CPU / memory hotplug is handled asynchronously. +@@ -903,9 +903,9 @@ + continue; + rcu_read_unlock(); + +- spin_lock_irq(&callback_lock); ++ raw_spin_lock_irq(&callback_lock); + cpumask_copy(cp->effective_cpus, new_cpus); +- spin_unlock_irq(&callback_lock); ++ raw_spin_unlock_irq(&callback_lock); + + WARN_ON(!cgroup_on_dfl(cp->css.cgroup) && + !cpumask_equal(cp->cpus_allowed, cp->effective_cpus)); +@@ -970,9 +970,9 @@ + if (retval < 0) + return retval; + +- spin_lock_irq(&callback_lock); ++ raw_spin_lock_irq(&callback_lock); + cpumask_copy(cs->cpus_allowed, trialcs->cpus_allowed); +- spin_unlock_irq(&callback_lock); ++ raw_spin_unlock_irq(&callback_lock); + + /* use trialcs->cpus_allowed as a temp variable */ + update_cpumasks_hier(cs, trialcs->cpus_allowed); +@@ -1159,9 +1159,9 @@ + continue; + rcu_read_unlock(); + +- spin_lock_irq(&callback_lock); ++ raw_spin_lock_irq(&callback_lock); + cp->effective_mems = *new_mems; +- spin_unlock_irq(&callback_lock); ++ raw_spin_unlock_irq(&callback_lock); + + WARN_ON(!cgroup_on_dfl(cp->css.cgroup) && + !nodes_equal(cp->mems_allowed, cp->effective_mems)); +@@ -1229,9 +1229,9 @@ + if (retval < 0) + goto done; + +- spin_lock_irq(&callback_lock); ++ raw_spin_lock_irq(&callback_lock); + cs->mems_allowed = trialcs->mems_allowed; +- spin_unlock_irq(&callback_lock); ++ raw_spin_unlock_irq(&callback_lock); + + /* use trialcs->mems_allowed as a temp variable */ + update_nodemasks_hier(cs, &trialcs->mems_allowed); +@@ -1322,9 +1322,9 @@ + spread_flag_changed = ((is_spread_slab(cs) != is_spread_slab(trialcs)) + || (is_spread_page(cs) != is_spread_page(trialcs))); + +- spin_lock_irq(&callback_lock); ++ raw_spin_lock_irq(&callback_lock); + cs->flags = trialcs->flags; +- spin_unlock_irq(&callback_lock); ++ raw_spin_unlock_irq(&callback_lock); + + if (!cpumask_empty(trialcs->cpus_allowed) && balance_flag_changed) + rebuild_sched_domains_locked(); +@@ -1726,7 +1726,7 @@ + cpuset_filetype_t type = seq_cft(sf)->private; + int ret = 0; + +- spin_lock_irq(&callback_lock); ++ raw_spin_lock_irq(&callback_lock); + + switch (type) { + case FILE_CPULIST: +@@ -1745,7 +1745,7 @@ + ret = -EINVAL; + } + +- spin_unlock_irq(&callback_lock); ++ raw_spin_unlock_irq(&callback_lock); + return ret; + } + +@@ -1962,12 +1962,12 @@ + + cpuset_inc(); + +- spin_lock_irq(&callback_lock); ++ raw_spin_lock_irq(&callback_lock); + if (cgroup_on_dfl(cs->css.cgroup)) { + cpumask_copy(cs->effective_cpus, parent->effective_cpus); + cs->effective_mems = parent->effective_mems; + } +- spin_unlock_irq(&callback_lock); ++ raw_spin_unlock_irq(&callback_lock); + + if (!test_bit(CGRP_CPUSET_CLONE_CHILDREN, &css->cgroup->flags)) + goto out_unlock; +@@ -1994,12 +1994,12 @@ + } + rcu_read_unlock(); + +- spin_lock_irq(&callback_lock); ++ raw_spin_lock_irq(&callback_lock); + cs->mems_allowed = parent->mems_allowed; + cs->effective_mems = parent->mems_allowed; + cpumask_copy(cs->cpus_allowed, parent->cpus_allowed); + cpumask_copy(cs->effective_cpus, parent->cpus_allowed); +- spin_unlock_irq(&callback_lock); ++ raw_spin_unlock_irq(&callback_lock); + out_unlock: + mutex_unlock(&cpuset_mutex); + return 0; +@@ -2038,7 +2038,7 @@ + static void cpuset_bind(struct cgroup_subsys_state *root_css) + { + mutex_lock(&cpuset_mutex); +- spin_lock_irq(&callback_lock); ++ raw_spin_lock_irq(&callback_lock); + + if (cgroup_on_dfl(root_css->cgroup)) { + cpumask_copy(top_cpuset.cpus_allowed, cpu_possible_mask); +@@ -2049,7 +2049,7 @@ + top_cpuset.mems_allowed = top_cpuset.effective_mems; + } + +- spin_unlock_irq(&callback_lock); ++ raw_spin_unlock_irq(&callback_lock); + mutex_unlock(&cpuset_mutex); + } + +@@ -2149,12 +2149,12 @@ + { + bool is_empty; + +- spin_lock_irq(&callback_lock); ++ raw_spin_lock_irq(&callback_lock); + cpumask_copy(cs->cpus_allowed, new_cpus); + cpumask_copy(cs->effective_cpus, new_cpus); + cs->mems_allowed = *new_mems; + cs->effective_mems = *new_mems; +- spin_unlock_irq(&callback_lock); ++ raw_spin_unlock_irq(&callback_lock); + + /* + * Don't call update_tasks_cpumask() if the cpuset becomes empty, +@@ -2191,10 +2191,10 @@ + if (nodes_empty(*new_mems)) + *new_mems = parent_cs(cs)->effective_mems; + +- spin_lock_irq(&callback_lock); ++ raw_spin_lock_irq(&callback_lock); + cpumask_copy(cs->effective_cpus, new_cpus); + cs->effective_mems = *new_mems; +- spin_unlock_irq(&callback_lock); ++ raw_spin_unlock_irq(&callback_lock); + + if (cpus_updated) + update_tasks_cpumask(cs); +@@ -2280,21 +2280,21 @@ + + /* synchronize cpus_allowed to cpu_active_mask */ + if (cpus_updated) { +- spin_lock_irq(&callback_lock); ++ raw_spin_lock_irq(&callback_lock); + if (!on_dfl) + cpumask_copy(top_cpuset.cpus_allowed, &new_cpus); + cpumask_copy(top_cpuset.effective_cpus, &new_cpus); +- spin_unlock_irq(&callback_lock); ++ raw_spin_unlock_irq(&callback_lock); + /* we don't mess with cpumasks of tasks in top_cpuset */ + } + + /* synchronize mems_allowed to N_MEMORY */ + if (mems_updated) { +- spin_lock_irq(&callback_lock); ++ raw_spin_lock_irq(&callback_lock); + if (!on_dfl) + top_cpuset.mems_allowed = new_mems; + top_cpuset.effective_mems = new_mems; +- spin_unlock_irq(&callback_lock); ++ raw_spin_unlock_irq(&callback_lock); + update_tasks_nodemask(&top_cpuset); + } + +@@ -2389,11 +2389,11 @@ + { + unsigned long flags; + +- spin_lock_irqsave(&callback_lock, flags); ++ raw_spin_lock_irqsave(&callback_lock, flags); + rcu_read_lock(); + guarantee_online_cpus(task_cs(tsk), pmask); + rcu_read_unlock(); +- spin_unlock_irqrestore(&callback_lock, flags); ++ raw_spin_unlock_irqrestore(&callback_lock, flags); + } + + void cpuset_cpus_allowed_fallback(struct task_struct *tsk) +@@ -2441,11 +2441,11 @@ + nodemask_t mask; + unsigned long flags; + +- spin_lock_irqsave(&callback_lock, flags); ++ raw_spin_lock_irqsave(&callback_lock, flags); + rcu_read_lock(); + guarantee_online_mems(task_cs(tsk), &mask); + rcu_read_unlock(); +- spin_unlock_irqrestore(&callback_lock, flags); ++ raw_spin_unlock_irqrestore(&callback_lock, flags); + + return mask; + } +@@ -2537,14 +2537,14 @@ + return 1; + + /* Not hardwall and node outside mems_allowed: scan up cpusets */ +- spin_lock_irqsave(&callback_lock, flags); ++ raw_spin_lock_irqsave(&callback_lock, flags); + + rcu_read_lock(); + cs = nearest_hardwall_ancestor(task_cs(current)); + allowed = node_isset(node, cs->mems_allowed); + rcu_read_unlock(); + +- spin_unlock_irqrestore(&callback_lock, flags); ++ raw_spin_unlock_irqrestore(&callback_lock, flags); + return allowed; + } + +diff -Nur linux-4.1.39.orig/kernel/debug/kdb/kdb_io.c linux-4.1.39/kernel/debug/kdb/kdb_io.c +--- linux-4.1.39.orig/kernel/debug/kdb/kdb_io.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/debug/kdb/kdb_io.c 2017-04-18 17:56:30.617397286 +0200 +@@ -554,7 +554,6 @@ int linecount; int colcount; int logging, saved_loglevel = 0; @@ -15956,7 +16097,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(); @@ -15965,7 +16106,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 @@ kdb_print_out: +@@ -855,7 +852,6 @@ } else { __release(kdb_printf_lock); } @@ -15973,7 +16114,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; @@ -15985,11 +16126,10 @@ index fc1ef736253c..83c666537a7a 100644 return r; } -diff --git a/kernel/events/core.c b/kernel/events/core.c -index 6da64f0d0630..aa35b5850d36 100644 ---- a/kernel/events/core.c -+++ b/kernel/events/core.c -@@ -6925,6 +6925,7 @@ static void perf_swevent_init_hrtimer(struct perf_event *event) +diff -Nur linux-4.1.39.orig/kernel/events/core.c linux-4.1.39/kernel/events/core.c +--- linux-4.1.39.orig/kernel/events/core.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/events/core.c 2017-04-18 17:56:30.621397441 +0200 +@@ -6948,6 +6948,7 @@ hrtimer_init(&hwc->hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); hwc->hrtimer.function = perf_swevent_hrtimer; @@ -15997,11 +16137,10 @@ index 6da64f0d0630..aa35b5850d36 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 819f51ec4f55..44eb884773e0 100644 ---- a/kernel/exit.c -+++ b/kernel/exit.c -@@ -144,7 +144,7 @@ static void __exit_signal(struct task_struct *tsk) +diff -Nur linux-4.1.39.orig/kernel/exit.c linux-4.1.39/kernel/exit.c +--- linux-4.1.39.orig/kernel/exit.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/exit.c 2017-04-18 17:56:30.621397441 +0200 +@@ -144,7 +144,7 @@ * Do this under ->siglock, we can race with another thread * doing sigqueue_free() if we have SIGQUEUE_PREALLOC signals. */ @@ -16010,11 +16149,10 @@ index 819f51ec4f55..44eb884773e0 100644 tsk->sighand = NULL; spin_unlock(&sighand->siglock); -diff --git a/kernel/fork.c b/kernel/fork.c -index 8209fa2d36ef..8f8a0a13d212 100644 ---- a/kernel/fork.c -+++ b/kernel/fork.c -@@ -108,7 +108,7 @@ int max_threads; /* tunable limit on nr_threads */ +diff -Nur linux-4.1.39.orig/kernel/fork.c linux-4.1.39/kernel/fork.c +--- linux-4.1.39.orig/kernel/fork.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/fork.c 2017-04-18 17:56:30.621397441 +0200 +@@ -108,7 +108,7 @@ DEFINE_PER_CPU(unsigned long, process_counts) = 0; @@ -16023,7 +16161,7 @@ index 8209fa2d36ef..8f8a0a13d212 100644 #ifdef CONFIG_PROVE_RCU int lockdep_tasklist_lock_is_held(void) -@@ -244,7 +244,9 @@ static inline void put_signal_struct(struct signal_struct *sig) +@@ -244,7 +244,9 @@ if (atomic_dec_and_test(&sig->sigcnt)) free_signal_struct(sig); } @@ -16034,7 +16172,7 @@ index 8209fa2d36ef..8f8a0a13d212 100644 void __put_task_struct(struct task_struct *tsk) { WARN_ON(!tsk->exit_state); -@@ -260,7 +262,18 @@ void __put_task_struct(struct task_struct *tsk) +@@ -260,7 +262,18 @@ if (!profile_handoff_task(tsk)) free_task(tsk); } @@ -16053,7 +16191,7 @@ index 8209fa2d36ef..8f8a0a13d212 100644 void __init __weak arch_task_cache_init(void) { } -@@ -374,6 +387,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig) +@@ -374,6 +387,7 @@ #endif tsk->splice_pipe = NULL; tsk->task_frag.page = NULL; @@ -16061,7 +16199,7 @@ index 8209fa2d36ef..8f8a0a13d212 100644 account_kernel_stack(ti, 1); -@@ -680,6 +694,19 @@ void __mmdrop(struct mm_struct *mm) +@@ -680,6 +694,19 @@ } EXPORT_SYMBOL_GPL(__mmdrop); @@ -16081,7 +16219,7 @@ index 8209fa2d36ef..8f8a0a13d212 100644 /* * Decrement the use count and release all resources for an mm. */ -@@ -1214,6 +1241,9 @@ static void rt_mutex_init_task(struct task_struct *p) +@@ -1214,6 +1241,9 @@ */ static void posix_cpu_timers_init(struct task_struct *tsk) { @@ -16091,7 +16229,7 @@ index 8209fa2d36ef..8f8a0a13d212 100644 tsk->cputime_expires.prof_exp = 0; tsk->cputime_expires.virt_exp = 0; tsk->cputime_expires.sched_exp = 0; -@@ -1338,6 +1368,7 @@ static struct task_struct *copy_process(unsigned long clone_flags, +@@ -1338,6 +1368,7 @@ spin_lock_init(&p->alloc_lock); init_sigpending(&p->pending); @@ -16099,7 +16237,7 @@ index 8209fa2d36ef..8f8a0a13d212 100644 p->utime = p->stime = p->gtime = 0; p->utimescaled = p->stimescaled = 0; -@@ -1345,7 +1376,8 @@ static struct task_struct *copy_process(unsigned long clone_flags, +@@ -1345,7 +1376,8 @@ p->prev_cputime.utime = p->prev_cputime.stime = 0; #endif #ifdef CONFIG_VIRT_CPU_ACCOUNTING_GEN @@ -16109,7 +16247,7 @@ index 8209fa2d36ef..8f8a0a13d212 100644 p->vtime_snap = 0; p->vtime_snap_whence = VTIME_SLEEPING; #endif -@@ -1396,6 +1428,9 @@ static struct task_struct *copy_process(unsigned long clone_flags, +@@ -1396,6 +1428,9 @@ p->hardirq_context = 0; p->softirq_context = 0; #endif @@ -16119,11 +16257,10 @@ index 8209fa2d36ef..8f8a0a13d212 100644 #ifdef CONFIG_LOCKDEP p->lockdep_depth = 0; /* no locks held yet */ p->curr_chain_key = 0; -diff --git a/kernel/futex.c b/kernel/futex.c -index 2214b70f1910..70ba363359a5 100644 ---- a/kernel/futex.c -+++ b/kernel/futex.c -@@ -738,7 +738,9 @@ void exit_pi_state_list(struct task_struct *curr) +diff -Nur linux-4.1.39.orig/kernel/futex.c linux-4.1.39/kernel/futex.c +--- linux-4.1.39.orig/kernel/futex.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/futex.c 2017-04-18 17:56:30.621397441 +0200 +@@ -738,7 +738,9 @@ * task still owns the PI-state: */ if (head->next != next) { @@ -16133,7 +16270,7 @@ index 2214b70f1910..70ba363359a5 100644 continue; } -@@ -1090,9 +1092,11 @@ static void __unqueue_futex(struct futex_q *q) +@@ -1090,9 +1092,11 @@ /* * The hash bucket lock must be held when this is called. @@ -16147,7 +16284,7 @@ index 2214b70f1910..70ba363359a5 100644 { struct task_struct *p = q->task; -@@ -1100,14 +1104,10 @@ static void wake_futex(struct futex_q *q) +@@ -1100,14 +1104,10 @@ return; /* @@ -16165,7 +16302,7 @@ index 2214b70f1910..70ba363359a5 100644 __unqueue_futex(q); /* * The waiting task can free the futex_q as soon as -@@ -1117,16 +1117,15 @@ static void wake_futex(struct futex_q *q) +@@ -1117,16 +1117,15 @@ */ smp_wmb(); q->lock_ptr = NULL; @@ -16185,7 +16322,7 @@ index 2214b70f1910..70ba363359a5 100644 int ret = 0; if (!pi_state) -@@ -1188,7 +1187,17 @@ static int wake_futex_pi(u32 __user *uaddr, u32 uval, struct futex_q *this) +@@ -1188,7 +1187,17 @@ raw_spin_unlock_irq(&new_owner->pi_lock); raw_spin_unlock(&pi_state->pi_mutex.wait_lock); @@ -16204,7 +16341,7 @@ index 2214b70f1910..70ba363359a5 100644 return 0; } -@@ -1227,6 +1236,7 @@ futex_wake(u32 __user *uaddr, unsigned int flags, int nr_wake, u32 bitset) +@@ -1227,6 +1236,7 @@ struct futex_q *this, *next; union futex_key key = FUTEX_KEY_INIT; int ret; @@ -16212,7 +16349,7 @@ index 2214b70f1910..70ba363359a5 100644 if (!bitset) return -EINVAL; -@@ -1254,13 +1264,14 @@ futex_wake(u32 __user *uaddr, unsigned int flags, int nr_wake, u32 bitset) +@@ -1254,13 +1264,14 @@ if (!(this->bitset & bitset)) continue; @@ -16228,7 +16365,7 @@ index 2214b70f1910..70ba363359a5 100644 out_put_key: put_futex_key(&key); out: -@@ -1279,6 +1290,7 @@ futex_wake_op(u32 __user *uaddr1, unsigned int flags, u32 __user *uaddr2, +@@ -1279,6 +1290,7 @@ struct futex_hash_bucket *hb1, *hb2; struct futex_q *this, *next; int ret, op_ret; @@ -16236,7 +16373,7 @@ index 2214b70f1910..70ba363359a5 100644 retry: ret = get_futex_key(uaddr1, flags & FLAGS_SHARED, &key1, VERIFY_READ); -@@ -1330,7 +1342,7 @@ retry_private: +@@ -1330,7 +1342,7 @@ ret = -EINVAL; goto out_unlock; } @@ -16245,7 +16382,7 @@ index 2214b70f1910..70ba363359a5 100644 if (++ret >= nr_wake) break; } -@@ -1344,7 +1356,7 @@ retry_private: +@@ -1344,7 +1356,7 @@ ret = -EINVAL; goto out_unlock; } @@ -16254,7 +16391,7 @@ index 2214b70f1910..70ba363359a5 100644 if (++op_ret >= nr_wake2) break; } -@@ -1354,6 +1366,7 @@ retry_private: +@@ -1354,6 +1366,7 @@ out_unlock: double_unlock_hb(hb1, hb2); @@ -16262,7 +16399,7 @@ index 2214b70f1910..70ba363359a5 100644 out_put_keys: put_futex_key(&key2); out_put_key1: -@@ -1513,6 +1526,7 @@ static int futex_requeue(u32 __user *uaddr1, unsigned int flags, +@@ -1513,6 +1526,7 @@ struct futex_pi_state *pi_state = NULL; struct futex_hash_bucket *hb1, *hb2; struct futex_q *this, *next; @@ -16270,7 +16407,7 @@ index 2214b70f1910..70ba363359a5 100644 if (requeue_pi) { /* -@@ -1689,7 +1703,7 @@ retry_private: +@@ -1689,7 +1703,7 @@ * woken by futex_unlock_pi(). */ if (++task_count <= nr_wake && !requeue_pi) { @@ -16279,7 +16416,7 @@ index 2214b70f1910..70ba363359a5 100644 continue; } -@@ -1715,6 +1729,16 @@ retry_private: +@@ -1715,6 +1729,16 @@ requeue_pi_wake_futex(this, &key2, hb2); drop_count++; continue; @@ -16296,7 +16433,7 @@ index 2214b70f1910..70ba363359a5 100644 } else if (ret) { /* -EDEADLK */ this->pi_state = NULL; -@@ -1729,6 +1753,7 @@ retry_private: +@@ -1729,6 +1753,7 @@ out_unlock: free_pi_state(pi_state); double_unlock_hb(hb1, hb2); @@ -16304,7 +16441,7 @@ index 2214b70f1910..70ba363359a5 100644 hb_waiters_dec(hb2); /* -@@ -2422,13 +2447,22 @@ retry: +@@ -2422,13 +2447,22 @@ */ match = futex_top_waiter(hb, &key); if (match) { @@ -16328,7 +16465,7 @@ index 2214b70f1910..70ba363359a5 100644 /* * A unconditional UNLOCK_PI op raced against a waiter * setting the FUTEX_WAITERS bit. Try again. -@@ -2438,6 +2472,11 @@ retry: +@@ -2438,6 +2472,11 @@ put_futex_key(&key); goto retry; } @@ -16340,7 +16477,7 @@ index 2214b70f1910..70ba363359a5 100644 goto out_unlock; } -@@ -2458,6 +2497,7 @@ retry: +@@ -2458,6 +2497,7 @@ out_unlock: spin_unlock(&hb->lock); @@ -16348,7 +16485,7 @@ index 2214b70f1910..70ba363359a5 100644 put_futex_key(&key); return ret; -@@ -2568,7 +2608,7 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags, +@@ -2568,7 +2608,7 @@ struct hrtimer_sleeper timeout, *to = NULL; struct rt_mutex_waiter rt_waiter; struct rt_mutex *pi_mutex = NULL; @@ -16357,7 +16494,7 @@ index 2214b70f1910..70ba363359a5 100644 union futex_key key2 = FUTEX_KEY_INIT; struct futex_q q = futex_q_init; int res, ret; -@@ -2593,10 +2633,7 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags, +@@ -2593,10 +2633,7 @@ * The waiter is allocated on our stack, manipulated by the requeue * code while we sleep on uaddr. */ @@ -16369,7 +16506,7 @@ index 2214b70f1910..70ba363359a5 100644 ret = get_futex_key(uaddr2, flags & FLAGS_SHARED, &key2, VERIFY_WRITE); if (unlikely(ret != 0)) -@@ -2627,20 +2664,55 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags, +@@ -2627,20 +2664,55 @@ /* Queue the futex_q, drop the hb lock, wait for wakeup. */ futex_wait_queue_me(hb, &q, to); @@ -16436,7 +16573,7 @@ index 2214b70f1910..70ba363359a5 100644 /* Check if the requeue code acquired the second futex for us. */ if (!q.rt_waiter) { -@@ -2649,14 +2721,15 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags, +@@ -2649,14 +2721,15 @@ * did a lock-steal - fix up the PI-state in that case. */ if (q.pi_state && (q.pi_state->owner != current)) { @@ -16454,7 +16591,7 @@ index 2214b70f1910..70ba363359a5 100644 } } else { /* -@@ -2669,7 +2742,8 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags, +@@ -2669,7 +2742,8 @@ ret = rt_mutex_finish_proxy_lock(pi_mutex, to, &rt_waiter); debug_rt_mutex_free_waiter(&rt_waiter); @@ -16464,11 +16601,10 @@ index 2214b70f1910..70ba363359a5 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 635480270858..26a63672c263 100644 ---- a/kernel/irq/handle.c -+++ b/kernel/irq/handle.c -@@ -133,6 +133,8 @@ void __irq_wake_thread(struct irq_desc *desc, struct irqaction *action) +diff -Nur linux-4.1.39.orig/kernel/irq/handle.c linux-4.1.39/kernel/irq/handle.c +--- linux-4.1.39.orig/kernel/irq/handle.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/irq/handle.c 2017-04-18 17:56:30.621397441 +0200 +@@ -133,6 +133,8 @@ irqreturn_t handle_irq_event_percpu(struct irq_desc *desc, struct irqaction *action) { @@ -16477,7 +16613,7 @@ index 635480270858..26a63672c263 100644 irqreturn_t retval = IRQ_NONE; unsigned int flags = 0, irq = desc->irq_data.irq; -@@ -173,7 +175,11 @@ handle_irq_event_percpu(struct irq_desc *desc, struct irqaction *action) +@@ -173,7 +175,11 @@ action = action->next; } while (action); @@ -16490,10 +16626,9 @@ index 635480270858..26a63672c263 100644 if (!noirqdebug) note_interrupt(irq, desc, retval); -diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c -index e68932bb308e..79c55c26eaee 100644 ---- a/kernel/irq/manage.c -+++ b/kernel/irq/manage.c +diff -Nur linux-4.1.39.orig/kernel/irq/manage.c linux-4.1.39/kernel/irq/manage.c +--- linux-4.1.39.orig/kernel/irq/manage.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/irq/manage.c 2017-04-18 17:56:30.621397441 +0200 @@ -22,6 +22,7 @@ #include "internals.h" @@ -16502,7 +16637,7 @@ index e68932bb308e..79c55c26eaee 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); @@ -16510,7 +16645,7 @@ index e68932bb308e..79c55c26eaee 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 @@ -16573,7 +16708,7 @@ index e68932bb308e..79c55c26eaee 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); @@ -16591,7 +16726,7 @@ index e68932bb308e..79c55c26eaee 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); @@ -16603,7 +16738,7 @@ index e68932bb308e..79c55c26eaee 100644 struct irq_desc *desc = irq_to_desc(notify->irq); cpumask_var_t cpumask; unsigned long flags; -@@ -281,6 +347,13 @@ out: +@@ -281,6 +347,13 @@ kref_put(¬ify->kref, notify->release); } @@ -16617,7 +16752,7 @@ index e68932bb308e..79c55c26eaee 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(¬ify->kref); INIT_WORK(¬ify->work, irq_affinity_notify); @@ -16626,7 +16761,7 @@ index e68932bb308e..79c55c26eaee 100644 } raw_spin_lock_irqsave(&desc->lock, flags); -@@ -697,6 +772,12 @@ static irqreturn_t irq_nested_primary_handler(int irq, void *dev_id) +@@ -697,6 +772,12 @@ return IRQ_NONE; } @@ -16639,7 +16774,7 @@ index e68932bb308e..79c55c26eaee 100644 static int irq_wait_for_interrupt(struct irqaction *action) { set_current_state(TASK_INTERRUPTIBLE); -@@ -723,7 +804,8 @@ static int irq_wait_for_interrupt(struct irqaction *action) +@@ -723,7 +804,8 @@ static void irq_finalize_oneshot(struct irq_desc *desc, struct irqaction *action) { @@ -16649,7 +16784,7 @@ index e68932bb308e..79c55c26eaee 100644 return; again: chip_bus_lock(desc); -@@ -825,7 +907,15 @@ irq_forced_thread_fn(struct irq_desc *desc, struct irqaction *action) +@@ -825,7 +907,15 @@ local_bh_disable(); ret = action->thread_fn(action->irq, action->dev_id); irq_finalize_oneshot(desc, action); @@ -16666,7 +16801,7 @@ index e68932bb308e..79c55c26eaee 100644 return ret; } -@@ -877,6 +967,18 @@ static void irq_thread_dtor(struct callback_head *unused) +@@ -877,6 +967,18 @@ irq_finalize_oneshot(desc, action); } @@ -16685,14 +16820,13 @@ index e68932bb308e..79c55c26eaee 100644 /* * Interrupt handler thread */ -@@ -907,7 +1009,15 @@ static int irq_thread(void *data) +@@ -907,7 +1009,15 @@ action_ret = handler_fn(desc, action); if (action_ret == IRQ_HANDLED) atomic_inc(&desc->threads_handled); -- + if (action_ret == IRQ_WAKE_THREAD) + irq_wake_secondary(desc, action); -+ + +#ifdef CONFIG_PREEMPT_RT_FULL + migrate_disable(); + add_interrupt_randomness(action->irq, 0, @@ -16702,7 +16836,7 @@ index e68932bb308e..79c55c26eaee 100644 wake_threads_waitq(desc); } -@@ -951,20 +1061,36 @@ void irq_wake_thread(unsigned int irq, void *dev_id) +@@ -951,20 +1061,36 @@ } EXPORT_SYMBOL_GPL(irq_wake_thread); @@ -16722,6 +16856,7 @@ index e68932bb308e..79c55c26eaee 100644 - set_bit(IRQTF_FORCED_THREAD, &new->thread_flags); - new->thread_fn = new->handler; - new->handler = irq_default_primary_handler; +- } + /* + * Handle the case where we have a real primary handler and a + * thread handler. We force thread them as well by creating a @@ -16737,7 +16872,7 @@ index e68932bb308e..79c55c26eaee 100644 + new->secondary->dev_id = new->dev_id; + new->secondary->irq = new->irq; + new->secondary->name = new->name; - } ++ } + /* Deal with the primary handler */ + set_bit(IRQTF_FORCED_THREAD, &new->thread_flags); + new->thread_fn = new->handler; @@ -16746,7 +16881,7 @@ index e68932bb308e..79c55c26eaee 100644 } static int irq_request_resources(struct irq_desc *desc) -@@ -984,6 +1110,48 @@ static void irq_release_resources(struct irq_desc *desc) +@@ -984,6 +1110,48 @@ c->irq_release_resources(d); } @@ -16795,7 +16930,7 @@ index e68932bb308e..79c55c26eaee 100644 /* * Internal function to register an irqaction - typically used to * allocate special interrupts that are part of the architecture. -@@ -1004,6 +1172,8 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new) +@@ -1004,6 +1172,8 @@ if (!try_module_get(desc->owner)) return -ENODEV; @@ -16804,7 +16939,7 @@ index e68932bb308e..79c55c26eaee 100644 /* * Check whether the interrupt nests into another interrupt * thread. -@@ -1021,8 +1191,11 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new) +@@ -1021,8 +1191,11 @@ */ new->handler = irq_nested_primary_handler; } else { @@ -16818,7 +16953,7 @@ index e68932bb308e..79c55c26eaee 100644 } /* -@@ -1031,37 +1204,14 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new) +@@ -1031,37 +1204,14 @@ * thread. */ if (new->thread_fn && !nested) { @@ -16862,7 +16997,7 @@ index e68932bb308e..79c55c26eaee 100644 } if (!alloc_cpumask_var(&mask, GFP_KERNEL)) { -@@ -1221,6 +1371,9 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new) +@@ -1221,6 +1371,9 @@ irqd_set(&desc->irq_data, IRQD_NO_BALANCING); } @@ -16872,7 +17007,7 @@ index e68932bb308e..79c55c26eaee 100644 /* Set default affinity mask once everything is setup */ setup_affinity(irq, desc, mask); -@@ -1234,7 +1387,6 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new) +@@ -1234,7 +1387,6 @@ irq, nmsk, omsk); } @@ -16880,7 +17015,7 @@ index e68932bb308e..79c55c26eaee 100644 *old_ptr = new; irq_pm_install_action(desc, new); -@@ -1260,6 +1412,8 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new) +@@ -1260,6 +1412,8 @@ */ if (new->thread) wake_up_process(new->thread); @@ -16889,7 +17024,7 @@ index e68932bb308e..79c55c26eaee 100644 register_irq_proc(irq, desc); new->dir = NULL; -@@ -1290,6 +1444,13 @@ out_thread: +@@ -1290,6 +1444,13 @@ kthread_stop(t); put_task_struct(t); } @@ -16903,7 +17038,7 @@ index e68932bb308e..79c55c26eaee 100644 out_mput: module_put(desc->owner); return ret; -@@ -1397,9 +1558,14 @@ static struct irqaction *__free_irq(unsigned int irq, void *dev_id) +@@ -1397,9 +1558,14 @@ if (action->thread) { kthread_stop(action->thread); put_task_struct(action->thread); @@ -16918,7 +17053,7 @@ index e68932bb308e..79c55c26eaee 100644 return action; } -@@ -1543,8 +1709,10 @@ int request_threaded_irq(unsigned int irq, irq_handler_t handler, +@@ -1543,8 +1709,10 @@ retval = __setup_irq(irq, desc, action); chip_bus_sync_unlock(desc); @@ -16930,11 +17065,10 @@ index e68932bb308e..79c55c26eaee 100644 #ifdef CONFIG_DEBUG_SHIRQ_FIXME if (!retval && (irqflags & IRQF_SHARED)) { -diff --git a/kernel/irq/settings.h b/kernel/irq/settings.h -index 3320b84cc60f..34b803b89d41 100644 ---- a/kernel/irq/settings.h -+++ b/kernel/irq/settings.h -@@ -15,6 +15,7 @@ enum { +diff -Nur linux-4.1.39.orig/kernel/irq/settings.h linux-4.1.39/kernel/irq/settings.h +--- linux-4.1.39.orig/kernel/irq/settings.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/irq/settings.h 2017-04-18 17:56:30.621397441 +0200 +@@ -15,6 +15,7 @@ _IRQ_NESTED_THREAD = IRQ_NESTED_THREAD, _IRQ_PER_CPU_DEVID = IRQ_PER_CPU_DEVID, _IRQ_IS_POLLED = IRQ_IS_POLLED, @@ -16942,7 +17076,7 @@ index 3320b84cc60f..34b803b89d41 100644 _IRQF_MODIFY_MASK = IRQF_MODIFY_MASK, }; -@@ -28,6 +29,7 @@ enum { +@@ -28,6 +29,7 @@ #define IRQ_NESTED_THREAD GOT_YOU_MORON #define IRQ_PER_CPU_DEVID GOT_YOU_MORON #define IRQ_IS_POLLED GOT_YOU_MORON @@ -16950,7 +17084,7 @@ index 3320b84cc60f..34b803b89d41 100644 #undef IRQF_MODIFY_MASK #define IRQF_MODIFY_MASK GOT_YOU_MORON -@@ -38,6 +40,16 @@ irq_settings_clr_and_set(struct irq_desc *desc, u32 clr, u32 set) +@@ -38,6 +40,16 @@ desc->status_use_accessors |= (set & _IRQF_MODIFY_MASK); } @@ -16967,11 +17101,10 @@ index 3320b84cc60f..34b803b89d41 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 e2514b0e439e..903a69c45689 100644 ---- a/kernel/irq/spurious.c -+++ b/kernel/irq/spurious.c -@@ -444,6 +444,10 @@ MODULE_PARM_DESC(noirqdebug, "Disable irq lockup detection when true"); +diff -Nur linux-4.1.39.orig/kernel/irq/spurious.c linux-4.1.39/kernel/irq/spurious.c +--- linux-4.1.39.orig/kernel/irq/spurious.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/irq/spurious.c 2017-04-18 17:56:30.621397441 +0200 +@@ -444,6 +444,10 @@ static int __init irqfixup_setup(char *str) { @@ -16982,7 +17115,7 @@ index e2514b0e439e..903a69c45689 100644 irqfixup = 1; printk(KERN_WARNING "Misrouted IRQ fixup support enabled.\n"); printk(KERN_WARNING "This may impact system performance.\n"); -@@ -456,6 +460,10 @@ module_param(irqfixup, int, 0644); +@@ -456,6 +460,10 @@ static int __init irqpoll_setup(char *str) { @@ -16993,10 +17126,9 @@ index e2514b0e439e..903a69c45689 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 cbf9fb899d92..58cf46638ca0 100644 ---- a/kernel/irq_work.c -+++ b/kernel/irq_work.c +diff -Nur linux-4.1.39.orig/kernel/irq_work.c linux-4.1.39/kernel/irq_work.c +--- linux-4.1.39.orig/kernel/irq_work.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/irq_work.c 2017-04-18 17:56:30.621397441 +0200 @@ -17,6 +17,7 @@ #include <linux/cpu.h> #include <linux/notifier.h> @@ -17005,7 +17137,7 @@ index cbf9fb899d92..58cf46638ca0 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) { @@ -17014,7 +17146,7 @@ index cbf9fb899d92..58cf46638ca0 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; @@ -17028,7 +17160,7 @@ index cbf9fb899d92..58cf46638ca0 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) { @@ -17038,7 +17170,7 @@ index cbf9fb899d92..58cf46638ca0 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(); @@ -17061,7 +17193,7 @@ index cbf9fb899d92..58cf46638ca0 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); @@ -17073,7 +17205,7 @@ index cbf9fb899d92..58cf46638ca0 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; @@ -17082,7 +17214,7 @@ index cbf9fb899d92..58cf46638ca0 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)); @@ -17100,7 +17232,7 @@ index cbf9fb899d92..58cf46638ca0 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); @@ -17118,11 +17250,82 @@ index cbf9fb899d92..58cf46638ca0 100644 /* * Synchronize against the irq_work @entry, ensures the entry is not -diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c -index 6683ccef9fff..d6fc8eeaab8f 100644 ---- a/kernel/ksysfs.c -+++ b/kernel/ksysfs.c -@@ -136,6 +136,15 @@ KERNEL_ATTR_RO(vmcoreinfo); +diff -Nur linux-4.1.39.orig/kernel/Kconfig.locks linux-4.1.39/kernel/Kconfig.locks +--- linux-4.1.39.orig/kernel/Kconfig.locks 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/Kconfig.locks 2017-04-18 17:56:30.617397286 +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.1.39.orig/kernel/Kconfig.preempt linux-4.1.39/kernel/Kconfig.preempt +--- linux-4.1.39.orig/kernel/Kconfig.preempt 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/Kconfig.preempt 2017-04-18 17:56:30.617397286 +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.1.39.orig/kernel/ksysfs.c linux-4.1.39/kernel/ksysfs.c +--- linux-4.1.39.orig/kernel/ksysfs.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/ksysfs.c 2017-04-18 17:56:30.621397441 +0200 +@@ -136,6 +136,15 @@ #endif /* CONFIG_KEXEC */ @@ -17138,7 +17341,7 @@ index 6683ccef9fff..d6fc8eeaab8f 100644 /* whether file capabilities are enabled */ static ssize_t fscaps_show(struct kobject *kobj, struct kobj_attribute *attr, char *buf) -@@ -203,6 +212,9 @@ static struct attribute * kernel_attrs[] = { +@@ -203,6 +212,9 @@ &vmcoreinfo_attr.attr, #endif &rcu_expedited_attr.attr, @@ -17148,45 +17351,9 @@ index 6683ccef9fff..d6fc8eeaab8f 100644 NULL }; -diff --git a/kernel/locking/Makefile b/kernel/locking/Makefile -index de7a416cca2a..ab269cf0475a 100644 ---- a/kernel/locking/Makefile -+++ b/kernel/locking/Makefile -@@ -1,5 +1,5 @@ - --obj-y += mutex.o semaphore.o rwsem.o -+obj-y += semaphore.o - - ifdef CONFIG_FUNCTION_TRACER - CFLAGS_REMOVE_lockdep.o = $(CC_FLAGS_FTRACE) -@@ -8,7 +8,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 -@@ -22,8 +26,11 @@ obj-$(CONFIG_DEBUG_RT_MUTEXES) += rtmutex-debug.o - obj-$(CONFIG_RT_MUTEX_TESTER) += rtmutex-tester.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_PERCPU_RWSEM) += percpu-rwsem.o -+obj-$(CONFIG_PREEMPT_RT_FULL) += rt.o - obj-$(CONFIG_QUEUE_RWLOCK) += qrwlock.o - obj-$(CONFIG_LOCK_TORTURE_TEST) += locktorture.o -diff --git a/kernel/locking/lglock.c b/kernel/locking/lglock.c -index 86ae2aebf004..9397974b142f 100644 ---- a/kernel/locking/lglock.c -+++ b/kernel/locking/lglock.c +diff -Nur linux-4.1.39.orig/kernel/locking/lglock.c linux-4.1.39/kernel/locking/lglock.c +--- linux-4.1.39.orig/kernel/locking/lglock.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/locking/lglock.c 2017-04-18 17:56:30.621397441 +0200 @@ -4,6 +4,15 @@ #include <linux/cpu.h> #include <linux/string.h> @@ -17276,7 +17443,7 @@ index 86ae2aebf004..9397974b142f 100644 } EXPORT_SYMBOL(lg_local_unlock_cpu); -@@ -64,12 +82,12 @@ void lg_global_lock(struct lglock *lg) +@@ -64,12 +82,12 @@ { int i; @@ -17292,7 +17459,7 @@ index 86ae2aebf004..9397974b142f 100644 } } EXPORT_SYMBOL(lg_global_lock); -@@ -80,10 +98,35 @@ void lg_global_unlock(struct lglock *lg) +@@ -80,10 +98,35 @@ lock_release(&lg->lock_dep_map, 1, _RET_IP_); for_each_possible_cpu(i) { @@ -17331,11 +17498,87 @@ index 86ae2aebf004..9397974b142f 100644 + } +} +#endif -diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c -index aaeae885d9af..577f02617c63 100644 ---- a/kernel/locking/lockdep.c -+++ b/kernel/locking/lockdep.c -@@ -3563,6 +3563,7 @@ static void check_flags(unsigned long flags) +diff -Nur linux-4.1.39.orig/kernel/locking/lockdep.c linux-4.1.39/kernel/locking/lockdep.c +--- linux-4.1.39.orig/kernel/locking/lockdep.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/locking/lockdep.c 2017-04-18 17:56:30.621397441 +0200 +@@ -668,6 +668,7 @@ + struct lockdep_subclass_key *key; + struct list_head *hash_head; + struct lock_class *class; ++ bool is_static = false; + + #ifdef CONFIG_DEBUG_LOCKDEP + /* +@@ -695,10 +696,23 @@ + + /* + * Static locks do not have their class-keys yet - for them the key +- * is the lock object itself: +- */ +- if (unlikely(!lock->key)) +- lock->key = (void *)lock; ++ * is the lock object itself. If the lock is in the per cpu area, ++ * the canonical address of the lock (per cpu offset removed) is ++ * used. ++ */ ++ if (unlikely(!lock->key)) { ++ unsigned long can_addr, addr = (unsigned long)lock; ++ ++ if (__is_kernel_percpu_address(addr, &can_addr)) ++ lock->key = (void *)can_addr; ++ else if (__is_module_percpu_address(addr, &can_addr)) ++ lock->key = (void *)can_addr; ++ else if (static_obj(lock)) ++ lock->key = (void *)lock; ++ else ++ return ERR_PTR(-EINVAL); ++ is_static = true; ++ } + + /* + * NOTE: the class-key must be unique. For dynamic locks, a static +@@ -730,7 +744,7 @@ + } + } + +- return NULL; ++ return is_static || static_obj(lock->key) ? NULL : ERR_PTR(-EINVAL); + } + + /* +@@ -748,19 +762,18 @@ + DEBUG_LOCKS_WARN_ON(!irqs_disabled()); + + class = look_up_lock_class(lock, subclass); +- if (likely(class)) ++ if (likely(!IS_ERR_OR_NULL(class))) + goto out_set_class_cache; + + /* + * Debug-check: all keys must be persistent! +- */ +- if (!static_obj(lock->key)) { ++ */ ++ if (IS_ERR(class)) { + debug_locks_off(); + printk("INFO: trying to register non-static key.\n"); + printk("the code is fine but needs lockdep annotation.\n"); + printk("turning off the locking correctness validator.\n"); + dump_stack(); +- + return NULL; + } + +@@ -3297,7 +3310,7 @@ + * Clearly if the lock hasn't been acquired _ever_, we're not + * holding it either, so report failure. + */ +- if (!class) ++ if (IS_ERR_OR_NULL(class)) + return 0; + + /* +@@ -3563,6 +3576,7 @@ } } @@ -17343,7 +17586,7 @@ index aaeae885d9af..577f02617c63 100644 /* * We dont accurately track softirq state in e.g. * hardirq contexts (such as on 4KSTACKS), so only -@@ -3577,6 +3578,7 @@ static void check_flags(unsigned long flags) +@@ -3577,6 +3591,7 @@ DEBUG_LOCKS_WARN_ON(!current->softirqs_enabled); } } @@ -17351,10 +17594,18 @@ index aaeae885d9af..577f02617c63 100644 if (!debug_locks) print_irqtrace_events(current); -diff --git a/kernel/locking/locktorture.c b/kernel/locking/locktorture.c -index ec8cce259779..aa60d919e336 100644 ---- a/kernel/locking/locktorture.c -+++ b/kernel/locking/locktorture.c +@@ -3980,7 +3995,7 @@ + * If the class exists we look it up and zap it: + */ + class = look_up_lock_class(lock, j); +- if (class) ++ if (!IS_ERR_OR_NULL(class)) + zap_class(class); + } + /* +diff -Nur linux-4.1.39.orig/kernel/locking/locktorture.c linux-4.1.39/kernel/locking/locktorture.c +--- linux-4.1.39.orig/kernel/locking/locktorture.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/locking/locktorture.c 2017-04-18 17:56:30.621397441 +0200 @@ -24,7 +24,6 @@ #include <linux/module.h> #include <linux/kthread.h> @@ -17363,11 +17614,43 @@ index ec8cce259779..aa60d919e336 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..c236efa4834c ---- /dev/null -+++ b/kernel/locking/rt.c +diff -Nur linux-4.1.39.orig/kernel/locking/Makefile linux-4.1.39/kernel/locking/Makefile +--- linux-4.1.39.orig/kernel/locking/Makefile 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/locking/Makefile 2017-04-18 17:56:30.621397441 +0200 +@@ -1,5 +1,5 @@ + +-obj-y += mutex.o semaphore.o rwsem.o ++obj-y += semaphore.o + + ifdef CONFIG_FUNCTION_TRACER + CFLAGS_REMOVE_lockdep.o = $(CC_FLAGS_FTRACE) +@@ -8,7 +8,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 +@@ -22,8 +26,11 @@ + obj-$(CONFIG_RT_MUTEX_TESTER) += rtmutex-tester.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_PERCPU_RWSEM) += percpu-rwsem.o ++obj-$(CONFIG_PREEMPT_RT_FULL) += rt.o + obj-$(CONFIG_QUEUE_RWLOCK) += qrwlock.o + obj-$(CONFIG_LOCK_TORTURE_TEST) += locktorture.o +diff -Nur linux-4.1.39.orig/kernel/locking/rt.c linux-4.1.39/kernel/locking/rt.c +--- linux-4.1.39.orig/kernel/locking/rt.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.39/kernel/locking/rt.c 2017-04-18 17:56:30.621397441 +0200 @@ -0,0 +1,461 @@ +/* + * kernel/rt.c @@ -17830,10 +18113,9 @@ index 000000000000..c236efa4834c + return 1; +} +EXPORT_SYMBOL(atomic_dec_and_mutex_lock); -diff --git a/kernel/locking/rtmutex.c b/kernel/locking/rtmutex.c -index b025295f4966..e0b0d9b419b5 100644 ---- a/kernel/locking/rtmutex.c -+++ b/kernel/locking/rtmutex.c +diff -Nur linux-4.1.39.orig/kernel/locking/rtmutex.c linux-4.1.39/kernel/locking/rtmutex.c +--- linux-4.1.39.orig/kernel/locking/rtmutex.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/locking/rtmutex.c 2017-04-18 17:56:30.625397596 +0200 @@ -7,6 +7,11 @@ * Copyright (C) 2005-2006 Timesys Corp., Thomas Gleixner <tglx@timesys.com> * Copyright (C) 2005 Kihon Technologies Inc., Steven Rostedt @@ -17854,7 +18136,7 @@ index b025295f4966..e0b0d9b419b5 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); } @@ -17867,7 +18149,7 @@ index b025295f4966..e0b0d9b419b5 100644 /* * We can speed up the acquire/release, if the architecture * supports cmpxchg and if there's no debugging state to be set up -@@ -300,7 +312,7 @@ static void __rt_mutex_adjust_prio(struct task_struct *task) +@@ -300,7 +312,7 @@ * of task. We do not use the spin_xx_mutex() variants here as we are * outside of the debug path.) */ @@ -17876,7 +18158,7 @@ index b025295f4966..e0b0d9b419b5 100644 { unsigned long flags; -@@ -335,6 +347,14 @@ static bool rt_mutex_cond_detect_deadlock(struct rt_mutex_waiter *waiter, +@@ -335,6 +347,14 @@ return debug_rt_mutex_detect_deadlock(waiter, chwalk); } @@ -17891,7 +18173,7 @@ index b025295f4966..e0b0d9b419b5 100644 /* * Max number of times we'll walk the boosting chain: */ -@@ -342,7 +362,8 @@ int max_lock_depth = 1024; +@@ -342,7 +362,8 @@ static inline struct rt_mutex *task_blocked_on_lock(struct task_struct *p) { @@ -17901,7 +18183,7 @@ index b025295f4966..e0b0d9b419b5 100644 } /* -@@ -479,7 +500,7 @@ static int rt_mutex_adjust_prio_chain(struct task_struct *task, +@@ -479,7 +500,7 @@ * reached or the state of the chain has changed while we * dropped the locks. */ @@ -17910,7 +18192,7 @@ index b025295f4966..e0b0d9b419b5 100644 goto out_unlock_pi; /* -@@ -641,13 +662,16 @@ static int rt_mutex_adjust_prio_chain(struct task_struct *task, +@@ -641,13 +662,16 @@ * follow here. This is the end of the chain we are walking. */ if (!rt_mutex_owner(lock)) { @@ -17929,7 +18211,7 @@ index b025295f4966..e0b0d9b419b5 100644 raw_spin_unlock(&lock->wait_lock); return 0; } -@@ -740,6 +764,25 @@ static int rt_mutex_adjust_prio_chain(struct task_struct *task, +@@ -740,6 +764,25 @@ return ret; } @@ -17955,7 +18237,7 @@ index b025295f4966..e0b0d9b419b5 100644 /* * Try to take an rt-mutex * -@@ -750,8 +793,9 @@ static int rt_mutex_adjust_prio_chain(struct task_struct *task, +@@ -750,8 +793,9 @@ * @waiter: The waiter that is queued to the lock's wait list if the * callsite called task_blocked_on_lock(), otherwise NULL */ @@ -17967,7 +18249,7 @@ index b025295f4966..e0b0d9b419b5 100644 { unsigned long flags; -@@ -790,8 +834,10 @@ static int try_to_take_rt_mutex(struct rt_mutex *lock, struct task_struct *task, +@@ -790,8 +834,10 @@ * If waiter is not the highest priority waiter of * @lock, give up. */ @@ -17979,7 +18261,7 @@ index b025295f4966..e0b0d9b419b5 100644 /* * We can acquire the lock. Remove the waiter from the -@@ -809,14 +855,10 @@ static int try_to_take_rt_mutex(struct rt_mutex *lock, struct task_struct *task, +@@ -809,14 +855,10 @@ * not need to be dequeued. */ if (rt_mutex_has_waiters(lock)) { @@ -17997,7 +18279,7 @@ index b025295f4966..e0b0d9b419b5 100644 /* * The current top waiter stays enqueued. We * don't have to change anything in the lock -@@ -865,6 +907,347 @@ takeit: +@@ -865,6 +907,347 @@ return 1; } @@ -18345,7 +18627,7 @@ index b025295f4966..e0b0d9b419b5 100644 /* * Task blocks on lock. * -@@ -896,6 +1279,23 @@ static int task_blocks_on_rt_mutex(struct rt_mutex *lock, +@@ -896,6 +1279,23 @@ return -EDEADLK; raw_spin_lock_irqsave(&task->pi_lock, flags); @@ -18369,7 +18651,7 @@ index b025295f4966..e0b0d9b419b5 100644 __rt_mutex_adjust_prio(task); waiter->task = task; waiter->lock = lock; -@@ -919,7 +1319,7 @@ static int task_blocks_on_rt_mutex(struct rt_mutex *lock, +@@ -919,7 +1319,7 @@ rt_mutex_enqueue_pi(owner, waiter); __rt_mutex_adjust_prio(owner); @@ -18378,7 +18660,7 @@ index b025295f4966..e0b0d9b419b5 100644 chain_walk = 1; } else if (rt_mutex_cond_detect_deadlock(waiter, chwalk)) { chain_walk = 1; -@@ -957,8 +1357,9 @@ static int task_blocks_on_rt_mutex(struct rt_mutex *lock, +@@ -957,8 +1357,9 @@ /* * Wake up the next waiter on the lock. * @@ -18390,7 +18672,7 @@ index b025295f4966..e0b0d9b419b5 100644 * * Called with lock->wait_lock held. */ -@@ -996,7 +1397,7 @@ static void wakeup_next_waiter(struct rt_mutex *lock) +@@ -996,7 +1397,7 @@ * long as we hold lock->wait_lock. The waiter task needs to * acquire it in order to dequeue the waiter. */ @@ -18399,7 +18681,7 @@ index b025295f4966..e0b0d9b419b5 100644 } /* -@@ -1010,7 +1411,7 @@ static void remove_waiter(struct rt_mutex *lock, +@@ -1010,7 +1411,7 @@ { bool is_top_waiter = (waiter == rt_mutex_top_waiter(lock)); struct task_struct *owner = rt_mutex_owner(lock); @@ -18408,7 +18690,7 @@ index b025295f4966..e0b0d9b419b5 100644 unsigned long flags; raw_spin_lock_irqsave(¤t->pi_lock, flags); -@@ -1035,7 +1436,8 @@ static void remove_waiter(struct rt_mutex *lock, +@@ -1035,7 +1436,8 @@ __rt_mutex_adjust_prio(owner); /* Store the lock on which owner is blocked or NULL */ @@ -18418,7 +18700,7 @@ index b025295f4966..e0b0d9b419b5 100644 raw_spin_unlock_irqrestore(&owner->pi_lock, flags); -@@ -1071,17 +1473,17 @@ void rt_mutex_adjust_pi(struct task_struct *task) +@@ -1071,17 +1473,17 @@ raw_spin_lock_irqsave(&task->pi_lock, flags); waiter = task->pi_blocked_on; @@ -18438,7 +18720,7 @@ index b025295f4966..e0b0d9b419b5 100644 rt_mutex_adjust_prio_chain(task, RT_MUTEX_MIN_CHAINWALK, NULL, next_lock, NULL, task); } -@@ -1099,7 +1501,8 @@ void rt_mutex_adjust_pi(struct task_struct *task) +@@ -1099,7 +1501,8 @@ static int __sched __rt_mutex_slowlock(struct rt_mutex *lock, int state, struct hrtimer_sleeper *timeout, @@ -18448,7 +18730,7 @@ index b025295f4966..e0b0d9b419b5 100644 { int ret = 0; -@@ -1122,6 +1525,12 @@ __rt_mutex_slowlock(struct rt_mutex *lock, int state, +@@ -1122,6 +1525,12 @@ break; } @@ -18461,7 +18743,7 @@ index b025295f4966..e0b0d9b419b5 100644 raw_spin_unlock(&lock->wait_lock); debug_rt_mutex_print_deadlock(waiter); -@@ -1156,25 +1565,102 @@ static void rt_mutex_handle_deadlock(int res, int detect_deadlock, +@@ -1156,25 +1565,102 @@ } } @@ -18568,7 +18850,7 @@ index b025295f4966..e0b0d9b419b5 100644 raw_spin_unlock(&lock->wait_lock); return 0; } -@@ -1192,13 +1678,23 @@ rt_mutex_slowlock(struct rt_mutex *lock, int state, +@@ -1192,13 +1678,23 @@ if (likely(!ret)) /* sleep on the mutex */ @@ -18594,7 +18876,7 @@ index b025295f4966..e0b0d9b419b5 100644 } /* -@@ -1255,7 +1751,7 @@ static inline int rt_mutex_slowtrylock(struct rt_mutex *lock) +@@ -1255,7 +1751,7 @@ /* * Slow path to release a rt-mutex: */ @@ -18603,7 +18885,7 @@ index b025295f4966..e0b0d9b419b5 100644 rt_mutex_slowunlock(struct rt_mutex *lock) { raw_spin_lock(&lock->wait_lock); -@@ -1298,7 +1794,7 @@ rt_mutex_slowunlock(struct rt_mutex *lock) +@@ -1298,7 +1794,7 @@ while (!rt_mutex_has_waiters(lock)) { /* Drops lock->wait_lock ! */ if (unlock_rt_mutex_safe(lock) == true) @@ -18612,7 +18894,7 @@ index b025295f4966..e0b0d9b419b5 100644 /* Relock the rtmutex and try again */ raw_spin_lock(&lock->wait_lock); } -@@ -1311,8 +1807,7 @@ rt_mutex_slowunlock(struct rt_mutex *lock) +@@ -1311,8 +1807,7 @@ raw_spin_unlock(&lock->wait_lock); @@ -18622,7 +18904,7 @@ index b025295f4966..e0b0d9b419b5 100644 } /* -@@ -1323,31 +1818,36 @@ rt_mutex_slowunlock(struct rt_mutex *lock) +@@ -1323,31 +1818,36 @@ */ static inline int rt_mutex_fastlock(struct rt_mutex *lock, int state, @@ -18663,7 +18945,7 @@ index b025295f4966..e0b0d9b419b5 100644 } static inline int -@@ -1363,12 +1863,14 @@ rt_mutex_fasttrylock(struct rt_mutex *lock, +@@ -1363,12 +1863,14 @@ static inline void rt_mutex_fastunlock(struct rt_mutex *lock, @@ -18682,7 +18964,7 @@ index b025295f4966..e0b0d9b419b5 100644 } /** -@@ -1380,7 +1882,7 @@ void __sched rt_mutex_lock(struct rt_mutex *lock) +@@ -1380,7 +1882,7 @@ { might_sleep(); @@ -18691,7 +18973,7 @@ index b025295f4966..e0b0d9b419b5 100644 } EXPORT_SYMBOL_GPL(rt_mutex_lock); -@@ -1397,7 +1899,7 @@ int __sched rt_mutex_lock_interruptible(struct rt_mutex *lock) +@@ -1397,7 +1899,7 @@ { might_sleep(); @@ -18700,7 +18982,7 @@ index b025295f4966..e0b0d9b419b5 100644 } EXPORT_SYMBOL_GPL(rt_mutex_lock_interruptible); -@@ -1410,11 +1912,30 @@ int rt_mutex_timed_futex_lock(struct rt_mutex *lock, +@@ -1410,11 +1912,30 @@ might_sleep(); return rt_mutex_timed_fastlock(lock, TASK_INTERRUPTIBLE, timeout, @@ -18732,7 +19014,7 @@ index b025295f4966..e0b0d9b419b5 100644 * rt_mutex_timed_lock - lock a rt_mutex interruptible * the timeout structure is provided * by the caller -@@ -1434,6 +1955,7 @@ rt_mutex_timed_lock(struct rt_mutex *lock, struct hrtimer_sleeper *timeout) +@@ -1434,6 +1955,7 @@ return rt_mutex_timed_fastlock(lock, TASK_INTERRUPTIBLE, timeout, RT_MUTEX_MIN_CHAINWALK, @@ -18740,7 +19022,7 @@ index b025295f4966..e0b0d9b419b5 100644 rt_mutex_slowlock); } EXPORT_SYMBOL_GPL(rt_mutex_timed_lock); -@@ -1463,6 +1985,22 @@ void __sched rt_mutex_unlock(struct rt_mutex *lock) +@@ -1463,6 +1985,22 @@ EXPORT_SYMBOL_GPL(rt_mutex_unlock); /** @@ -18763,7 +19045,7 @@ index b025295f4966..e0b0d9b419b5 100644 * rt_mutex_destroy - mark a mutex unusable * @lock: the mutex to be destroyed * -@@ -1492,13 +2030,12 @@ EXPORT_SYMBOL_GPL(rt_mutex_destroy); +@@ -1492,13 +2030,12 @@ void __rt_mutex_init(struct rt_mutex *lock, const char *name) { lock->owner = NULL; @@ -18778,7 +19060,7 @@ index b025295f4966..e0b0d9b419b5 100644 /** * rt_mutex_init_proxy_locked - initialize and lock a rt_mutex on behalf of a -@@ -1513,7 +2050,7 @@ EXPORT_SYMBOL_GPL(__rt_mutex_init); +@@ -1513,7 +2050,7 @@ void rt_mutex_init_proxy_locked(struct rt_mutex *lock, struct task_struct *proxy_owner) { @@ -18787,7 +19069,7 @@ index b025295f4966..e0b0d9b419b5 100644 debug_rt_mutex_proxy_lock(lock, proxy_owner); rt_mutex_set_owner(lock, proxy_owner); rt_mutex_deadlock_account_lock(lock, proxy_owner); -@@ -1561,6 +2098,35 @@ int rt_mutex_start_proxy_lock(struct rt_mutex *lock, +@@ -1561,6 +2098,35 @@ return 1; } @@ -18823,7 +19105,7 @@ index b025295f4966..e0b0d9b419b5 100644 /* We enforce deadlock detection for futexes */ ret = task_blocks_on_rt_mutex(lock, waiter, task, RT_MUTEX_FULL_CHAINWALK); -@@ -1575,7 +2141,7 @@ int rt_mutex_start_proxy_lock(struct rt_mutex *lock, +@@ -1575,7 +2141,7 @@ ret = 0; } @@ -18832,7 +19114,7 @@ index b025295f4966..e0b0d9b419b5 100644 remove_waiter(lock, waiter); raw_spin_unlock(&lock->wait_lock); -@@ -1631,7 +2197,7 @@ int rt_mutex_finish_proxy_lock(struct rt_mutex *lock, +@@ -1631,7 +2197,7 @@ set_current_state(TASK_INTERRUPTIBLE); /* sleep on the mutex */ @@ -18841,7 +19123,7 @@ index b025295f4966..e0b0d9b419b5 100644 if (unlikely(ret)) remove_waiter(lock, waiter); -@@ -1646,3 +2212,89 @@ int rt_mutex_finish_proxy_lock(struct rt_mutex *lock, +@@ -1646,3 +2212,89 @@ return ret; } @@ -18931,11 +19213,10 @@ index b025295f4966..e0b0d9b419b5 100644 +} +EXPORT_SYMBOL(ww_mutex_unlock); +#endif -diff --git a/kernel/locking/rtmutex_common.h b/kernel/locking/rtmutex_common.h -index 855212501407..4d317e9a5d0f 100644 ---- a/kernel/locking/rtmutex_common.h -+++ b/kernel/locking/rtmutex_common.h -@@ -49,6 +49,7 @@ struct rt_mutex_waiter { +diff -Nur linux-4.1.39.orig/kernel/locking/rtmutex_common.h linux-4.1.39/kernel/locking/rtmutex_common.h +--- linux-4.1.39.orig/kernel/locking/rtmutex_common.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/locking/rtmutex_common.h 2017-04-18 17:56:30.625397596 +0200 +@@ -49,6 +49,7 @@ struct rb_node pi_tree_entry; struct task_struct *task; struct rt_mutex *lock; @@ -18943,7 +19224,7 @@ index 855212501407..4d317e9a5d0f 100644 #ifdef CONFIG_DEBUG_RT_MUTEXES unsigned long ip; struct pid *deadlock_task_pid; -@@ -119,6 +120,9 @@ enum rtmutex_chainwalk { +@@ -119,6 +120,9 @@ /* * PI-futex support (proxy locking functions, etc.): */ @@ -18953,7 +19234,7 @@ index 855212501407..4d317e9a5d0f 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); -@@ -132,10 +136,24 @@ extern int rt_mutex_finish_proxy_lock(struct rt_mutex *lock, +@@ -132,10 +136,24 @@ struct rt_mutex_waiter *waiter); extern int rt_mutex_timed_futex_lock(struct rt_mutex *l, struct hrtimer_sleeper *to); @@ -18978,11 +19259,10 @@ index 855212501407..4d317e9a5d0f 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.1.39.orig/kernel/locking/spinlock.c linux-4.1.39/kernel/locking/spinlock.c +--- linux-4.1.39.orig/kernel/locking/spinlock.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/locking/spinlock.c 2017-04-18 17:56:30.625397596 +0200 +@@ -124,8 +124,11 @@ * __[spin|read|write]_lock_bh() */ BUILD_LOCK_OPS(spin, raw_spinlock); @@ -18994,7 +19274,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 @@ -19003,7 +19283,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 @@ -19012,11 +19292,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.1.39.orig/kernel/locking/spinlock_debug.c linux-4.1.39/kernel/locking/spinlock_debug.c +--- linux-4.1.39.orig/kernel/locking/spinlock_debug.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/locking/spinlock_debug.c 2017-04-18 17:56:30.625397596 +0200 +@@ -31,6 +31,7 @@ EXPORT_SYMBOL(__raw_spin_lock_init); @@ -19024,7 +19303,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); @@ -19032,7 +19311,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); } @@ -19040,17 +19319,84 @@ 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 a4f7820f5930..cd91cec1f29a 100644 ---- a/kernel/panic.c -+++ b/kernel/panic.c -@@ -399,9 +399,11 @@ static u64 oops_id; +diff -Nur linux-4.1.39.orig/kernel/module.c linux-4.1.39/kernel/module.c +--- linux-4.1.39.orig/kernel/module.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/module.c 2017-04-18 17:56:30.625397596 +0200 +@@ -525,16 +525,7 @@ + memcpy(per_cpu_ptr(mod->percpu, cpu), from, size); + } + +-/** +- * is_module_percpu_address - test whether address is from module static percpu +- * @addr: address to test +- * +- * Test whether @addr belongs to module static percpu area. +- * +- * RETURNS: +- * %true if @addr is from module static percpu area +- */ +-bool is_module_percpu_address(unsigned long addr) ++bool __is_module_percpu_address(unsigned long addr, unsigned long *can_addr) + { + struct module *mod; + unsigned int cpu; +@@ -548,9 +539,11 @@ + continue; + for_each_possible_cpu(cpu) { + void *start = per_cpu_ptr(mod->percpu, cpu); ++ void *va = (void *)addr; + +- if ((void *)addr >= start && +- (void *)addr < start + mod->percpu_size) { ++ if (va >= start && va < start + mod->percpu_size) { ++ if (can_addr) ++ *can_addr = (unsigned long) (va - start); + preempt_enable(); + return true; + } +@@ -561,6 +554,20 @@ + return false; + } + ++/** ++ * is_module_percpu_address - test whether address is from module static percpu ++ * @addr: address to test ++ * ++ * Test whether @addr belongs to module static percpu area. ++ * ++ * RETURNS: ++ * %true if @addr is from module static percpu area ++ */ ++bool is_module_percpu_address(unsigned long addr) ++{ ++ return __is_module_percpu_address(addr, NULL); ++} ++ + #else /* ... !CONFIG_SMP */ + + static inline void __percpu *mod_percpu(struct module *mod) +@@ -591,6 +598,11 @@ + { + return false; + } ++ ++bool __is_module_percpu_address(unsigned long addr, unsigned long *can_addr) ++{ ++ return false; ++} + + #endif /* CONFIG_SMP */ + +diff -Nur linux-4.1.39.orig/kernel/panic.c linux-4.1.39/kernel/panic.c +--- linux-4.1.39.orig/kernel/panic.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/panic.c 2017-04-18 17:56:30.625397596 +0200 +@@ -399,9 +399,11 @@ static int init_oops_id(void) { @@ -19062,11 +19408,10 @@ index a4f7820f5930..cd91cec1f29a 100644 oops_id++; return 0; -diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c -index 2329daae5255..b8f41a3635fd 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.1.39.orig/kernel/power/hibernate.c linux-4.1.39/kernel/power/hibernate.c +--- linux-4.1.39.orig/kernel/power/hibernate.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/power/hibernate.c 2017-04-18 17:56:30.625397596 +0200 +@@ -285,6 +285,8 @@ local_irq_disable(); @@ -19075,7 +19420,7 @@ index 2329daae5255..b8f41a3635fd 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: @@ -19083,7 +19428,7 @@ index 2329daae5255..b8f41a3635fd 100644 local_irq_enable(); Enable_cpus: -@@ -437,6 +440,7 @@ static int resume_target_kernel(bool platform_mode) +@@ -437,6 +440,7 @@ goto Enable_cpus; local_irq_disable(); @@ -19091,7 +19436,7 @@ index 2329daae5255..b8f41a3635fd 100644 error = syscore_suspend(); if (error) -@@ -470,6 +474,7 @@ static int resume_target_kernel(bool platform_mode) +@@ -470,6 +474,7 @@ syscore_resume(); Enable_irqs: @@ -19099,7 +19444,7 @@ index 2329daae5255..b8f41a3635fd 100644 local_irq_enable(); Enable_cpus: -@@ -555,6 +560,7 @@ int hibernation_platform_enter(void) +@@ -555,6 +560,7 @@ goto Platform_finish; local_irq_disable(); @@ -19107,7 +19452,7 @@ index 2329daae5255..b8f41a3635fd 100644 syscore_suspend(); if (pm_wakeup_pending()) { error = -EAGAIN; -@@ -567,6 +573,7 @@ int hibernation_platform_enter(void) +@@ -567,6 +573,7 @@ Power_up: syscore_resume(); @@ -19115,11 +19460,10 @@ index 2329daae5255..b8f41a3635fd 100644 local_irq_enable(); enable_nonboot_cpus(); -diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c -index 8d7a1ef72758..db920b1704b1 100644 ---- a/kernel/power/suspend.c -+++ b/kernel/power/suspend.c -@@ -356,6 +356,8 @@ static int suspend_enter(suspend_state_t state, bool *wakeup) +diff -Nur linux-4.1.39.orig/kernel/power/suspend.c linux-4.1.39/kernel/power/suspend.c +--- linux-4.1.39.orig/kernel/power/suspend.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/power/suspend.c 2017-04-18 17:56:30.625397596 +0200 +@@ -356,6 +356,8 @@ arch_suspend_disable_irqs(); BUG_ON(!irqs_disabled()); @@ -19128,7 +19472,7 @@ index 8d7a1ef72758..db920b1704b1 100644 error = syscore_suspend(); if (!error) { *wakeup = pm_wakeup_pending(); -@@ -370,6 +372,8 @@ static int suspend_enter(suspend_state_t state, bool *wakeup) +@@ -370,6 +372,8 @@ syscore_resume(); } @@ -19137,11 +19481,10 @@ index 8d7a1ef72758..db920b1704b1 100644 arch_suspend_enable_irqs(); BUG_ON(irqs_disabled()); -diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c -index 3c1aca0c3543..398bf2bbd3bc 100644 ---- a/kernel/printk/printk.c -+++ b/kernel/printk/printk.c -@@ -1163,6 +1163,7 @@ static int syslog_print_all(char __user *buf, int size, bool clear) +diff -Nur linux-4.1.39.orig/kernel/printk/printk.c linux-4.1.39/kernel/printk/printk.c +--- linux-4.1.39.orig/kernel/printk/printk.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/printk/printk.c 2017-04-18 17:56:30.625397596 +0200 +@@ -1163,6 +1163,7 @@ { char *text; int len = 0; @@ -19149,7 +19492,7 @@ index 3c1aca0c3543..398bf2bbd3bc 100644 text = kmalloc(LOG_LINE_MAX + PREFIX_MAX, GFP_KERNEL); if (!text) -@@ -1174,7 +1175,14 @@ static int syslog_print_all(char __user *buf, int size, bool clear) +@@ -1174,7 +1175,14 @@ u64 seq; u32 idx; enum log_flags prev; @@ -19165,7 +19508,7 @@ index 3c1aca0c3543..398bf2bbd3bc 100644 if (clear_seq < log_first_seq) { /* messages are gone, move to first available one */ clear_seq = log_first_seq; -@@ -1195,6 +1203,14 @@ static int syslog_print_all(char __user *buf, int size, bool clear) +@@ -1195,6 +1203,14 @@ prev = msg->flags; idx = log_next(idx); seq++; @@ -19180,7 +19523,7 @@ index 3c1aca0c3543..398bf2bbd3bc 100644 } /* move first record forward until length fits into the buffer */ -@@ -1208,6 +1224,14 @@ static int syslog_print_all(char __user *buf, int size, bool clear) +@@ -1208,6 +1224,14 @@ prev = msg->flags; idx = log_next(idx); seq++; @@ -19195,7 +19538,7 @@ index 3c1aca0c3543..398bf2bbd3bc 100644 } /* last message fitting into this dump */ -@@ -1248,6 +1272,7 @@ static int syslog_print_all(char __user *buf, int size, bool clear) +@@ -1248,6 +1272,7 @@ clear_seq = log_next_seq; clear_idx = log_next_idx; } @@ -19203,7 +19546,7 @@ index 3c1aca0c3543..398bf2bbd3bc 100644 raw_spin_unlock_irq(&logbuf_lock); kfree(text); -@@ -1401,6 +1426,12 @@ static void call_console_drivers(int level, const char *text, size_t len) +@@ -1401,6 +1426,12 @@ if (!console_drivers) return; @@ -19216,7 +19559,7 @@ index 3c1aca0c3543..398bf2bbd3bc 100644 for_each_console(con) { if (exclusive_console && con != exclusive_console) continue; -@@ -1413,6 +1444,7 @@ static void call_console_drivers(int level, const char *text, size_t len) +@@ -1413,6 +1444,7 @@ continue; con->write(con, text, len); } @@ -19224,7 +19567,7 @@ index 3c1aca0c3543..398bf2bbd3bc 100644 } /* -@@ -1473,6 +1505,15 @@ static inline int can_use_console(unsigned int cpu) +@@ -1473,6 +1505,15 @@ static int console_trylock_for_printk(void) { unsigned int cpu = smp_processor_id(); @@ -19240,7 +19583,7 @@ index 3c1aca0c3543..398bf2bbd3bc 100644 if (!console_trylock()) return 0; -@@ -1607,6 +1648,62 @@ static size_t cont_print_text(char *text, size_t size) +@@ -1607,6 +1648,62 @@ return textlen; } @@ -19303,7 +19646,7 @@ index 3c1aca0c3543..398bf2bbd3bc 100644 asmlinkage int vprintk_emit(int facility, int level, const char *dict, size_t dictlen, const char *fmt, va_list args) -@@ -1623,6 +1720,13 @@ asmlinkage int vprintk_emit(int facility, int level, +@@ -1623,6 +1720,13 @@ /* cpu currently holding logbuf_lock in this function */ static unsigned int logbuf_cpu = UINT_MAX; @@ -19317,7 +19660,7 @@ index 3c1aca0c3543..398bf2bbd3bc 100644 if (level == LOGLEVEL_SCHED) { level = LOGLEVEL_DEFAULT; in_sched = true; -@@ -1764,8 +1868,7 @@ asmlinkage int vprintk_emit(int facility, int level, +@@ -1764,8 +1868,7 @@ * console_sem which would prevent anyone from printing to * console */ @@ -19327,7 +19670,7 @@ index 3c1aca0c3543..398bf2bbd3bc 100644 /* * Try to acquire and then immediately release the console * semaphore. The release will print out buffers and wake up -@@ -1773,7 +1876,7 @@ asmlinkage int vprintk_emit(int facility, int level, +@@ -1773,7 +1876,7 @@ */ if (console_trylock_for_printk()) console_unlock(); @@ -19336,7 +19679,7 @@ index 3c1aca0c3543..398bf2bbd3bc 100644 lockdep_on(); } -@@ -1902,26 +2005,6 @@ DEFINE_PER_CPU(printk_func_t, printk_func); +@@ -1902,26 +2005,6 @@ #endif /* CONFIG_PRINTK */ @@ -19363,7 +19706,7 @@ index 3c1aca0c3543..398bf2bbd3bc 100644 static int __add_preferred_console(char *name, int idx, char *options, char *brl_options) { -@@ -2143,11 +2226,16 @@ static void console_cont_flush(char *text, size_t size) +@@ -2143,11 +2226,16 @@ goto out; len = cont_print_text(text, size); @@ -19380,7 +19723,7 @@ index 3c1aca0c3543..398bf2bbd3bc 100644 return; out: raw_spin_unlock_irqrestore(&logbuf_lock, flags); -@@ -2246,12 +2334,17 @@ skip: +@@ -2246,12 +2334,17 @@ console_idx = log_next(console_idx); console_seq++; console_prev = msg->flags; @@ -19398,7 +19741,7 @@ index 3c1aca0c3543..398bf2bbd3bc 100644 if (do_cond_resched) cond_resched(); -@@ -2304,6 +2397,11 @@ void console_unblank(void) +@@ -2304,6 +2397,11 @@ { struct console *c; @@ -19410,11 +19753,10 @@ index 3c1aca0c3543..398bf2bbd3bc 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 261ee21e62db..e27549ebd299 100644 ---- a/kernel/ptrace.c -+++ b/kernel/ptrace.c -@@ -129,7 +129,14 @@ static bool ptrace_freeze_traced(struct task_struct *task) +diff -Nur linux-4.1.39.orig/kernel/ptrace.c linux-4.1.39/kernel/ptrace.c +--- linux-4.1.39.orig/kernel/ptrace.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/ptrace.c 2017-04-18 17:56:30.625397596 +0200 +@@ -137,7 +137,14 @@ spin_lock_irq(&task->sighand->siglock); if (task_is_traced(task) && !__fatal_signal_pending(task)) { @@ -19430,11 +19772,10 @@ index 261ee21e62db..e27549ebd299 100644 ret = true; } spin_unlock_irq(&task->sighand->siglock); -diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c -index 8dbe27611ec3..7b6170a46409 100644 ---- a/kernel/rcu/rcutorture.c -+++ b/kernel/rcu/rcutorture.c -@@ -389,6 +389,7 @@ static struct rcu_torture_ops rcu_ops = { +diff -Nur linux-4.1.39.orig/kernel/rcu/rcutorture.c linux-4.1.39/kernel/rcu/rcutorture.c +--- linux-4.1.39.orig/kernel/rcu/rcutorture.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/rcu/rcutorture.c 2017-04-18 17:56:30.625397596 +0200 +@@ -389,6 +389,7 @@ .name = "rcu" }; @@ -19442,7 +19783,7 @@ index 8dbe27611ec3..7b6170a46409 100644 /* * Definitions for rcu_bh torture testing. */ -@@ -428,6 +429,12 @@ static struct rcu_torture_ops rcu_bh_ops = { +@@ -428,6 +429,12 @@ .name = "rcu_bh" }; @@ -19455,10 +19796,9 @@ index 8dbe27611ec3..7b6170a46409 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 8cf7304b2867..965df22d96ad 100644 ---- a/kernel/rcu/tree.c -+++ b/kernel/rcu/tree.c +diff -Nur linux-4.1.39.orig/kernel/rcu/tree.c linux-4.1.39/kernel/rcu/tree.c +--- linux-4.1.39.orig/kernel/rcu/tree.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/rcu/tree.c 2017-04-18 17:56:30.625397596 +0200 @@ -56,6 +56,11 @@ #include <linux/random.h> #include <linux/ftrace_event.h> @@ -19471,7 +19811,7 @@ index 8cf7304b2867..965df22d96ad 100644 #include "tree.h" #include "rcu.h" -@@ -220,6 +225,19 @@ void rcu_sched_qs(void) +@@ -220,6 +225,19 @@ } } @@ -19491,7 +19831,7 @@ index 8cf7304b2867..965df22d96ad 100644 void rcu_bh_qs(void) { if (!__this_cpu_read(rcu_bh_data.passed_quiesce)) { -@@ -229,6 +247,7 @@ void rcu_bh_qs(void) +@@ -229,6 +247,7 @@ __this_cpu_write(rcu_bh_data.passed_quiesce, 1); } } @@ -19499,7 +19839,7 @@ index 8cf7304b2867..965df22d96ad 100644 static DEFINE_PER_CPU(int, rcu_sched_qs_mask); -@@ -404,6 +423,7 @@ unsigned long rcu_batches_completed_sched(void) +@@ -404,6 +423,7 @@ } EXPORT_SYMBOL_GPL(rcu_batches_completed_sched); @@ -19507,7 +19847,7 @@ index 8cf7304b2867..965df22d96ad 100644 /* * Return the number of RCU BH batches completed thus far for debug & stats. */ -@@ -431,6 +451,13 @@ void rcu_bh_force_quiescent_state(void) +@@ -431,6 +451,13 @@ } EXPORT_SYMBOL_GPL(rcu_bh_force_quiescent_state); @@ -19521,7 +19861,7 @@ index 8cf7304b2867..965df22d96ad 100644 /* * Force a quiescent state for RCU-sched. */ -@@ -1545,7 +1572,7 @@ static void rcu_gp_kthread_wake(struct rcu_state *rsp) +@@ -1545,7 +1572,7 @@ !ACCESS_ONCE(rsp->gp_flags) || !rsp->gp_kthread) return; @@ -19530,7 +19870,7 @@ index 8cf7304b2867..965df22d96ad 100644 } /* -@@ -1986,7 +2013,7 @@ static int __noreturn rcu_gp_kthread(void *arg) +@@ -1986,7 +2013,7 @@ ACCESS_ONCE(rsp->gpnum), TPS("reqwait")); rsp->gp_state = RCU_GP_WAIT_GPS; @@ -19539,7 +19879,7 @@ index 8cf7304b2867..965df22d96ad 100644 ACCESS_ONCE(rsp->gp_flags) & RCU_GP_FLAG_INIT); /* Locking provides needed memory barrier. */ -@@ -2015,7 +2042,7 @@ static int __noreturn rcu_gp_kthread(void *arg) +@@ -2015,7 +2042,7 @@ ACCESS_ONCE(rsp->gpnum), TPS("fqswait")); rsp->gp_state = RCU_GP_WAIT_FQS; @@ -19548,7 +19888,7 @@ index 8cf7304b2867..965df22d96ad 100644 ((gf = ACCESS_ONCE(rsp->gp_flags)) & RCU_GP_FLAG_FQS) || (!ACCESS_ONCE(rnp->qsmask) && -@@ -2860,18 +2887,17 @@ __rcu_process_callbacks(struct rcu_state *rsp) +@@ -2860,18 +2887,17 @@ /* * Do RCU core processing for the current CPU. */ @@ -19569,7 +19909,7 @@ index 8cf7304b2867..965df22d96ad 100644 /* * Schedule RCU callback invocation. If the specified type of RCU * does not support RCU priority boosting, just do a direct call, -@@ -2883,18 +2909,105 @@ static void invoke_rcu_callbacks(struct rcu_state *rsp, struct rcu_data *rdp) +@@ -2883,18 +2909,105 @@ { if (unlikely(!ACCESS_ONCE(rcu_scheduler_fully_active))) return; @@ -19681,7 +20021,7 @@ index 8cf7304b2867..965df22d96ad 100644 /* * Handle any core-RCU processing required by a call_rcu() invocation. -@@ -3040,6 +3153,7 @@ void call_rcu_sched(struct rcu_head *head, void (*func)(struct rcu_head *rcu)) +@@ -3040,6 +3153,7 @@ } EXPORT_SYMBOL_GPL(call_rcu_sched); @@ -19689,7 +20029,7 @@ index 8cf7304b2867..965df22d96ad 100644 /* * Queue an RCU callback for invocation after a quicker grace period. */ -@@ -3048,6 +3162,7 @@ void call_rcu_bh(struct rcu_head *head, void (*func)(struct rcu_head *rcu)) +@@ -3048,6 +3162,7 @@ __call_rcu(head, func, &rcu_bh_state, -1, 0); } EXPORT_SYMBOL_GPL(call_rcu_bh); @@ -19697,7 +20037,7 @@ index 8cf7304b2867..965df22d96ad 100644 /* * Queue an RCU callback for lazy invocation after a grace period. -@@ -3139,6 +3254,7 @@ void synchronize_sched(void) +@@ -3139,6 +3254,7 @@ } EXPORT_SYMBOL_GPL(synchronize_sched); @@ -19705,7 +20045,7 @@ index 8cf7304b2867..965df22d96ad 100644 /** * synchronize_rcu_bh - wait until an rcu_bh grace period has elapsed. * -@@ -3165,6 +3281,7 @@ void synchronize_rcu_bh(void) +@@ -3165,6 +3281,7 @@ wait_rcu_gp(call_rcu_bh); } EXPORT_SYMBOL_GPL(synchronize_rcu_bh); @@ -19713,7 +20053,7 @@ index 8cf7304b2867..965df22d96ad 100644 /** * get_state_synchronize_rcu - Snapshot current RCU state -@@ -3677,6 +3794,7 @@ static void _rcu_barrier(struct rcu_state *rsp) +@@ -3677,6 +3794,7 @@ mutex_unlock(&rsp->barrier_mutex); } @@ -19721,7 +20061,7 @@ index 8cf7304b2867..965df22d96ad 100644 /** * rcu_barrier_bh - Wait until all in-flight call_rcu_bh() callbacks complete. */ -@@ -3685,6 +3803,7 @@ void rcu_barrier_bh(void) +@@ -3685,6 +3803,7 @@ _rcu_barrier(&rcu_bh_state); } EXPORT_SYMBOL_GPL(rcu_barrier_bh); @@ -19729,7 +20069,7 @@ index 8cf7304b2867..965df22d96ad 100644 /** * rcu_barrier_sched - Wait for in-flight call_rcu_sched() callbacks. -@@ -4021,7 +4140,7 @@ static void __init rcu_init_one(struct rcu_state *rsp, +@@ -4021,7 +4140,7 @@ } } @@ -19738,7 +20078,7 @@ index 8cf7304b2867..965df22d96ad 100644 rnp = rsp->level[rcu_num_lvls - 1]; for_each_possible_cpu(i) { while (i > rnp->grphi) -@@ -4120,7 +4239,6 @@ void __init rcu_init(void) +@@ -4120,7 +4239,6 @@ rcu_init_one(&rcu_bh_state, &rcu_bh_data); rcu_init_one(&rcu_sched_state, &rcu_sched_data); __rcu_init_preempt(); @@ -19746,10 +20086,9 @@ index 8cf7304b2867..965df22d96ad 100644 /* * We don't need protection against CPU-hotplug here because -diff --git a/kernel/rcu/tree.h b/kernel/rcu/tree.h -index a69d3dab2ec4..8a9f0d3640de 100644 ---- a/kernel/rcu/tree.h -+++ b/kernel/rcu/tree.h +diff -Nur linux-4.1.39.orig/kernel/rcu/tree.h linux-4.1.39/kernel/rcu/tree.h +--- linux-4.1.39.orig/kernel/rcu/tree.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/rcu/tree.h 2017-04-18 17:56:30.629397751 +0200 @@ -27,6 +27,7 @@ #include <linux/threads.h> #include <linux/cpumask.h> @@ -19758,7 +20097,7 @@ index a69d3dab2ec4..8a9f0d3640de 100644 /* * Define shape of hierarchy based on NR_CPUS, CONFIG_RCU_FANOUT, and -@@ -210,7 +211,7 @@ struct rcu_node { +@@ -210,7 +211,7 @@ /* This can happen due to race conditions. */ #endif /* #ifdef CONFIG_RCU_BOOST */ #ifdef CONFIG_RCU_NOCB_CPU @@ -19767,7 +20106,7 @@ index a69d3dab2ec4..8a9f0d3640de 100644 /* Place for rcu_nocb_kthread() to wait GP. */ #endif /* #ifdef CONFIG_RCU_NOCB_CPU */ int need_future_gp[2]; -@@ -349,7 +350,7 @@ struct rcu_data { +@@ -349,7 +350,7 @@ atomic_long_t nocb_q_count_lazy; /* invocation (all stages). */ struct rcu_head *nocb_follower_head; /* CBs ready to invoke. */ struct rcu_head **nocb_follower_tail; @@ -19776,7 +20115,7 @@ index a69d3dab2ec4..8a9f0d3640de 100644 struct task_struct *nocb_kthread; int nocb_defer_wakeup; /* Defer wakeup of nocb_kthread. */ -@@ -438,7 +439,7 @@ struct rcu_state { +@@ -438,7 +439,7 @@ unsigned long gpnum; /* Current gp number. */ unsigned long completed; /* # of last completed gp. */ struct task_struct *gp_kthread; /* Task for grace periods. */ @@ -19785,7 +20124,7 @@ index a69d3dab2ec4..8a9f0d3640de 100644 short gp_flags; /* Commands for GP task. */ short gp_state; /* GP kthread sleep state. */ -@@ -529,12 +530,10 @@ extern struct rcu_state rcu_preempt_state; +@@ -529,12 +530,10 @@ DECLARE_PER_CPU(struct rcu_data, rcu_preempt_data); #endif /* #ifdef CONFIG_PREEMPT_RCU */ @@ -19798,7 +20137,7 @@ index a69d3dab2ec4..8a9f0d3640de 100644 #ifndef RCU_TREE_NONCORE -@@ -553,10 +552,9 @@ void call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu)); +@@ -553,10 +552,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); @@ -19810,10 +20149,9 @@ index a69d3dab2ec4..8a9f0d3640de 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 8c0ec0f5a027..54da8f44d586 100644 ---- a/kernel/rcu/tree_plugin.h -+++ b/kernel/rcu/tree_plugin.h +diff -Nur linux-4.1.39.orig/kernel/rcu/tree_plugin.h linux-4.1.39/kernel/rcu/tree_plugin.h +--- linux-4.1.39.orig/kernel/rcu/tree_plugin.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/rcu/tree_plugin.h 2017-04-18 17:56:30.629397751 +0200 @@ -24,27 +24,20 @@ * Paul E. McKenney <paulmck@linux.vnet.ibm.com> */ @@ -19844,7 +20182,7 @@ index 8c0ec0f5a027..54da8f44d586 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? */ -@@ -291,7 +284,7 @@ void rcu_read_unlock_special(struct task_struct *t) +@@ -291,7 +284,7 @@ } /* Hardware IRQ handlers cannot block, complain if they get here. */ @@ -19853,7 +20191,7 @@ index 8c0ec0f5a027..54da8f44d586 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, nq: %d)\n", -@@ -496,15 +489,6 @@ static void rcu_preempt_check_callbacks(void) +@@ -496,15 +489,6 @@ t->rcu_read_unlock_special.b.need_qs = true; } @@ -19869,7 +20207,7 @@ index 8c0ec0f5a027..54da8f44d586 100644 /* * Queue a preemptible-RCU callback for invocation after a grace period. */ -@@ -939,6 +923,19 @@ void exit_rcu(void) +@@ -939,6 +923,19 @@ #endif /* #else #ifdef CONFIG_PREEMPT_RCU */ @@ -19889,7 +20227,7 @@ index 8c0ec0f5a027..54da8f44d586 100644 #ifdef CONFIG_RCU_BOOST #include "../locking/rtmutex_common.h" -@@ -970,16 +967,6 @@ static void rcu_initiate_boost_trace(struct rcu_node *rnp) +@@ -970,16 +967,6 @@ #endif /* #else #ifdef CONFIG_RCU_TRACE */ @@ -19906,7 +20244,7 @@ index 8c0ec0f5a027..54da8f44d586 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 -@@ -1125,23 +1112,6 @@ static void rcu_initiate_boost(struct rcu_node *rnp, unsigned long flags) +@@ -1125,23 +1112,6 @@ } /* @@ -19930,7 +20268,7 @@ index 8c0ec0f5a027..54da8f44d586 100644 * Is the current CPU running the RCU-callbacks kthread? * Caller must have preemption disabled. */ -@@ -1196,67 +1166,6 @@ static int rcu_spawn_one_boost_kthread(struct rcu_state *rsp, +@@ -1196,67 +1166,6 @@ return 0; } @@ -19998,7 +20336,7 @@ index 8c0ec0f5a027..54da8f44d586 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 -@@ -1286,26 +1195,12 @@ static void rcu_boost_kthread_setaffinity(struct rcu_node *rnp, int outgoingcpu) +@@ -1286,26 +1195,12 @@ free_cpumask_var(cm); } @@ -20025,7 +20363,7 @@ index 8c0ec0f5a027..54da8f44d586 100644 rcu_for_each_leaf_node(rcu_state_p, rnp) (void)rcu_spawn_one_boost_kthread(rcu_state_p, rnp); } -@@ -1328,11 +1223,6 @@ static void rcu_initiate_boost(struct rcu_node *rnp, unsigned long flags) +@@ -1328,11 +1223,6 @@ raw_spin_unlock_irqrestore(&rnp->lock, flags); } @@ -20037,7 +20375,7 @@ index 8c0ec0f5a027..54da8f44d586 100644 static bool rcu_is_callbacks_kthread(void) { return false; -@@ -1356,7 +1246,7 @@ static void rcu_prepare_kthreads(int cpu) +@@ -1356,7 +1246,7 @@ #endif /* #else #ifdef CONFIG_RCU_BOOST */ @@ -20046,7 +20384,7 @@ index 8c0ec0f5a027..54da8f44d586 100644 /* * Check to see if any future RCU-related work will need to be done -@@ -1374,7 +1264,9 @@ int rcu_needs_cpu(unsigned long *delta_jiffies) +@@ -1374,7 +1264,9 @@ return rcu_cpu_has_callbacks(NULL); } #endif /* #ifndef CONFIG_RCU_NOCB_CPU_ALL */ @@ -20056,7 +20394,7 @@ index 8c0ec0f5a027..54da8f44d586 100644 /* * Because we do not have RCU_FAST_NO_HZ, don't bother cleaning up * after it. -@@ -1472,6 +1364,8 @@ static bool __maybe_unused rcu_try_advance_all_cbs(void) +@@ -1472,6 +1364,8 @@ return cbs_ready; } @@ -20065,7 +20403,7 @@ index 8c0ec0f5a027..54da8f44d586 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 -@@ -1512,7 +1406,7 @@ int rcu_needs_cpu(unsigned long *dj) +@@ -1512,7 +1406,7 @@ return 0; } #endif /* #ifndef CONFIG_RCU_NOCB_CPU_ALL */ @@ -20074,7 +20412,7 @@ index 8c0ec0f5a027..54da8f44d586 100644 /* * Prepare a CPU for idle from an RCU perspective. The first major task * is to sense whether nohz mode has been enabled or disabled via sysfs. -@@ -1859,7 +1753,7 @@ early_param("rcu_nocb_poll", parse_rcu_nocb_poll); +@@ -1859,7 +1753,7 @@ */ static void rcu_nocb_gp_cleanup(struct rcu_state *rsp, struct rcu_node *rnp) { @@ -20083,7 +20421,7 @@ index 8c0ec0f5a027..54da8f44d586 100644 } /* -@@ -1877,8 +1771,8 @@ static void rcu_nocb_gp_set(struct rcu_node *rnp, int nrq) +@@ -1877,8 +1771,8 @@ static void rcu_init_one_nocb(struct rcu_node *rnp) { @@ -20094,7 +20432,7 @@ index 8c0ec0f5a027..54da8f44d586 100644 } #ifndef CONFIG_RCU_NOCB_CPU_ALL -@@ -1903,7 +1797,7 @@ static void wake_nocb_leader(struct rcu_data *rdp, bool force) +@@ -1903,7 +1797,7 @@ if (ACCESS_ONCE(rdp_leader->nocb_leader_sleep) || force) { /* Prior smp_mb__after_atomic() orders against prior enqueue. */ ACCESS_ONCE(rdp_leader->nocb_leader_sleep) = false; @@ -20103,7 +20441,7 @@ index 8c0ec0f5a027..54da8f44d586 100644 } } -@@ -2116,7 +2010,7 @@ static void rcu_nocb_wait_gp(struct rcu_data *rdp) +@@ -2116,7 +2010,7 @@ */ trace_rcu_future_gp(rnp, rdp, c, TPS("StartWait")); for (;;) { @@ -20112,7 +20450,7 @@ index 8c0ec0f5a027..54da8f44d586 100644 rnp->nocb_gp_wq[c & 0x1], (d = ULONG_CMP_GE(ACCESS_ONCE(rnp->completed), c))); if (likely(d)) -@@ -2144,7 +2038,7 @@ wait_again: +@@ -2144,7 +2038,7 @@ /* Wait for callbacks to appear. */ if (!rcu_nocb_poll) { trace_rcu_nocb_wake(my_rdp->rsp->name, my_rdp->cpu, "Sleep"); @@ -20121,7 +20459,7 @@ index 8c0ec0f5a027..54da8f44d586 100644 !ACCESS_ONCE(my_rdp->nocb_leader_sleep)); /* Memory barrier handled by smp_mb() calls below and repoll. */ } else if (firsttime) { -@@ -2219,7 +2113,7 @@ wait_again: +@@ -2219,7 +2113,7 @@ * List was empty, wake up the follower. * Memory barriers supplied by atomic_long_add(). */ @@ -20130,7 +20468,7 @@ index 8c0ec0f5a027..54da8f44d586 100644 } } -@@ -2240,7 +2134,7 @@ static void nocb_follower_wait(struct rcu_data *rdp) +@@ -2240,7 +2134,7 @@ if (!rcu_nocb_poll) { trace_rcu_nocb_wake(rdp->rsp->name, rdp->cpu, "FollowerSleep"); @@ -20139,7 +20477,7 @@ index 8c0ec0f5a027..54da8f44d586 100644 ACCESS_ONCE(rdp->nocb_follower_head)); } else if (firsttime) { /* Don't drown trace log with "Poll"! */ -@@ -2399,7 +2293,7 @@ void __init rcu_init_nohz(void) +@@ -2399,7 +2293,7 @@ static void __init rcu_boot_init_nocb_percpu_data(struct rcu_data *rdp) { rdp->nocb_tail = &rdp->nocb_head; @@ -20148,11 +20486,10 @@ index 8c0ec0f5a027..54da8f44d586 100644 rdp->nocb_follower_tail = &rdp->nocb_follower_head; } -diff --git a/kernel/rcu/update.c b/kernel/rcu/update.c -index 1f133350da01..1718c4fe9bce 100644 ---- a/kernel/rcu/update.c -+++ b/kernel/rcu/update.c -@@ -227,6 +227,7 @@ int rcu_read_lock_held(void) +diff -Nur linux-4.1.39.orig/kernel/rcu/update.c linux-4.1.39/kernel/rcu/update.c +--- linux-4.1.39.orig/kernel/rcu/update.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/rcu/update.c 2017-04-18 17:56:30.629397751 +0200 +@@ -227,6 +227,7 @@ } EXPORT_SYMBOL_GPL(rcu_read_lock_held); @@ -20160,7 +20497,7 @@ index 1f133350da01..1718c4fe9bce 100644 /** * rcu_read_lock_bh_held() - might we be in RCU-bh read-side critical section? * -@@ -253,6 +254,7 @@ int rcu_read_lock_bh_held(void) +@@ -253,6 +254,7 @@ return in_softirq() || irqs_disabled(); } EXPORT_SYMBOL_GPL(rcu_read_lock_bh_held); @@ -20168,11 +20505,10 @@ index 1f133350da01..1718c4fe9bce 100644 #endif /* #ifdef CONFIG_DEBUG_LOCK_ALLOC */ -diff --git a/kernel/relay.c b/kernel/relay.c -index e9dbaeb8fd65..509f68fb91e8 100644 ---- a/kernel/relay.c -+++ b/kernel/relay.c -@@ -339,6 +339,10 @@ static void wakeup_readers(unsigned long data) +diff -Nur linux-4.1.39.orig/kernel/relay.c linux-4.1.39/kernel/relay.c +--- linux-4.1.39.orig/kernel/relay.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/relay.c 2017-04-18 17:56:30.629397751 +0200 +@@ -339,6 +339,10 @@ { struct rchan_buf *buf = (struct rchan_buf *)data; wake_up_interruptible(&buf->read_wait); @@ -20183,7 +20519,7 @@ index e9dbaeb8fd65..509f68fb91e8 100644 } /** -@@ -356,6 +360,7 @@ static void __relay_reset(struct rchan_buf *buf, unsigned int init) +@@ -356,6 +360,7 @@ init_waitqueue_head(&buf->read_wait); kref_init(&buf->kref); setup_timer(&buf->timer, wakeup_readers, (unsigned long)buf); @@ -20191,7 +20527,7 @@ index e9dbaeb8fd65..509f68fb91e8 100644 } else del_timer_sync(&buf->timer); -@@ -739,15 +744,6 @@ size_t relay_switch_subbuf(struct rchan_buf *buf, size_t length) +@@ -739,15 +744,6 @@ else buf->early_bytes += buf->chan->subbuf_size - buf->padding[old_subbuf]; @@ -20207,24 +20543,10 @@ index e9dbaeb8fd65..509f68fb91e8 100644 } old = buf->data; -diff --git a/kernel/sched/Makefile b/kernel/sched/Makefile -index 46be87024875..3944d32a044d 100644 ---- a/kernel/sched/Makefile -+++ b/kernel/sched/Makefile -@@ -13,7 +13,7 @@ endif - - obj-y += core.o proc.o clock.o cputime.o - obj-y += idle_task.o fair.o rt.o deadline.o stop_task.o --obj-y += wait.o completion.o idle.o -+obj-y += wait.o wait-simple.o work-simple.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..45ebcffd9feb 100644 ---- a/kernel/sched/completion.c -+++ b/kernel/sched/completion.c -@@ -30,10 +30,10 @@ void complete(struct completion *x) +diff -Nur linux-4.1.39.orig/kernel/sched/completion.c linux-4.1.39/kernel/sched/completion.c +--- linux-4.1.39.orig/kernel/sched/completion.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/sched/completion.c 2017-04-18 17:56:30.633397907 +0200 +@@ -30,10 +30,10 @@ { unsigned long flags; @@ -20238,7 +20560,7 @@ index 8d0f35debf35..45ebcffd9feb 100644 } EXPORT_SYMBOL(complete); -@@ -50,10 +50,10 @@ void complete_all(struct completion *x) +@@ -50,10 +50,10 @@ { unsigned long flags; @@ -20252,7 +20574,7 @@ index 8d0f35debf35..45ebcffd9feb 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) { @@ -20278,7 +20600,7 @@ index 8d0f35debf35..45ebcffd9feb 100644 if (!x->done) return timeout; } -@@ -89,9 +89,9 @@ __wait_for_common(struct completion *x, +@@ -89,9 +89,9 @@ { might_sleep(); @@ -20290,7 +20612,7 @@ index 8d0f35debf35..45ebcffd9feb 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; @@ -20305,7 +20627,7 @@ index 8d0f35debf35..45ebcffd9feb 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(); @@ -20314,11 +20636,10 @@ index 8d0f35debf35..45ebcffd9feb 100644 return true; } EXPORT_SYMBOL(completion_done); -diff --git a/kernel/sched/core.c b/kernel/sched/core.c -index 6cb5f00696f5..0d3a40b24304 100644 ---- a/kernel/sched/core.c -+++ b/kernel/sched/core.c -@@ -282,7 +282,11 @@ late_initcall(sched_init_debug); +diff -Nur linux-4.1.39.orig/kernel/sched/core.c linux-4.1.39/kernel/sched/core.c +--- linux-4.1.39.orig/kernel/sched/core.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/sched/core.c 2017-04-18 17:56:30.633397907 +0200 +@@ -282,7 +282,11 @@ * Number of tasks to iterate in a single balance run. * Limited because this is done with IRQs disabled. */ @@ -20330,7 +20651,7 @@ index 6cb5f00696f5..0d3a40b24304 100644 /* * period over which we average the RT time consumption, measured -@@ -461,6 +465,7 @@ static void init_rq_hrtick(struct rq *rq) +@@ -461,6 +465,7 @@ hrtimer_init(&rq->hrtick_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); rq->hrtick_timer.function = hrtick; @@ -20338,7 +20659,7 @@ index 6cb5f00696f5..0d3a40b24304 100644 } #else /* CONFIG_SCHED_HRTICK */ static inline void hrtick_clear(struct rq *rq) -@@ -541,6 +546,52 @@ static bool set_nr_if_polling(struct task_struct *p) +@@ -541,6 +546,52 @@ #endif #endif @@ -20391,7 +20712,7 @@ index 6cb5f00696f5..0d3a40b24304 100644 /* * resched_curr - mark rq's current task 'to be rescheduled now'. * -@@ -572,6 +623,38 @@ void resched_curr(struct rq *rq) +@@ -572,6 +623,38 @@ trace_sched_wake_idle_without_ipi(cpu); } @@ -20430,7 +20751,7 @@ index 6cb5f00696f5..0d3a40b24304 100644 void resched_cpu(int cpu) { struct rq *rq = cpu_rq(cpu); -@@ -595,12 +678,14 @@ void resched_cpu(int cpu) +@@ -595,12 +678,14 @@ */ int get_nohz_timer_target(int pinned) { @@ -20447,7 +20768,7 @@ index 6cb5f00696f5..0d3a40b24304 100644 rcu_read_lock(); for_each_domain(cpu, sd) { -@@ -613,6 +698,8 @@ int get_nohz_timer_target(int pinned) +@@ -613,6 +698,8 @@ } unlock: rcu_read_unlock(); @@ -20456,7 +20777,7 @@ index 6cb5f00696f5..0d3a40b24304 100644 return cpu; } /* -@@ -1164,6 +1251,18 @@ struct migration_arg { +@@ -1164,6 +1251,18 @@ static int migration_cpu_stop(void *data); @@ -20475,7 +20796,7 @@ index 6cb5f00696f5..0d3a40b24304 100644 /* * wait_task_inactive - wait for a thread to unschedule. * -@@ -1208,7 +1307,7 @@ unsigned long wait_task_inactive(struct task_struct *p, long match_state) +@@ -1208,7 +1307,7 @@ * is actually now running somewhere else! */ while (task_running(rq, p)) { @@ -20484,7 +20805,7 @@ index 6cb5f00696f5..0d3a40b24304 100644 return 0; cpu_relax(); } -@@ -1223,7 +1322,8 @@ unsigned long wait_task_inactive(struct task_struct *p, long match_state) +@@ -1223,7 +1322,8 @@ running = task_running(rq, p); queued = task_on_rq_queued(p); ncsw = 0; @@ -20494,7 +20815,7 @@ index 6cb5f00696f5..0d3a40b24304 100644 ncsw = p->nvcsw | LONG_MIN; /* sets MSB */ task_rq_unlock(rq, p, &flags); -@@ -1449,10 +1549,6 @@ static void ttwu_activate(struct rq *rq, struct task_struct *p, int en_flags) +@@ -1449,10 +1549,6 @@ { activate_task(rq, p, en_flags); p->on_rq = TASK_ON_RQ_QUEUED; @@ -20505,7 +20826,7 @@ index 6cb5f00696f5..0d3a40b24304 100644 } /* -@@ -1462,9 +1558,9 @@ static void +@@ -1462,9 +1558,9 @@ ttwu_do_wakeup(struct rq *rq, struct task_struct *p, int wake_flags) { check_preempt_curr(rq, p, wake_flags); @@ -20517,7 +20838,7 @@ index 6cb5f00696f5..0d3a40b24304 100644 #ifdef CONFIG_SMP if (p->sched_class->task_woken) p->sched_class->task_woken(rq, p); -@@ -1666,8 +1762,29 @@ try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags) +@@ -1666,8 +1762,29 @@ */ smp_mb__before_spinlock(); raw_spin_lock_irqsave(&p->pi_lock, flags); @@ -20548,7 +20869,7 @@ index 6cb5f00696f5..0d3a40b24304 100644 success = 1; /* we're going to change ->state */ cpu = task_cpu(p); -@@ -1732,42 +1849,6 @@ out: +@@ -1732,42 +1849,6 @@ } /** @@ -20591,7 +20912,7 @@ index 6cb5f00696f5..0d3a40b24304 100644 * wake_up_process - Wake up a specific process * @p: The process to be woken up. * -@@ -1781,11 +1862,23 @@ out: +@@ -1781,11 +1862,23 @@ */ int wake_up_process(struct task_struct *p) { @@ -20616,7 +20937,7 @@ index 6cb5f00696f5..0d3a40b24304 100644 int wake_up_state(struct task_struct *p, unsigned int state) { return try_to_wake_up(p, state, 0); -@@ -1981,6 +2074,9 @@ int sched_fork(unsigned long clone_flags, struct task_struct *p) +@@ -1981,6 +2074,9 @@ p->on_cpu = 0; #endif init_task_preempt_count(p); @@ -20626,7 +20947,7 @@ index 6cb5f00696f5..0d3a40b24304 100644 #ifdef CONFIG_SMP plist_node_init(&p->pushable_tasks, MAX_PRIO); RB_CLEAR_NODE(&p->pushable_dl_tasks); -@@ -2116,7 +2212,7 @@ void wake_up_new_task(struct task_struct *p) +@@ -2116,7 +2212,7 @@ rq = __task_rq_lock(p); activate_task(rq, p, 0); p->on_rq = TASK_ON_RQ_QUEUED; @@ -20635,7 +20956,7 @@ index 6cb5f00696f5..0d3a40b24304 100644 check_preempt_curr(rq, p, WF_FORK); #ifdef CONFIG_SMP if (p->sched_class->task_woken) -@@ -2253,8 +2349,12 @@ static struct rq *finish_task_switch(struct task_struct *prev) +@@ -2253,8 +2349,12 @@ finish_arch_post_lock_switch(); fire_sched_in_preempt_notifiers(current); @@ -20649,7 +20970,7 @@ index 6cb5f00696f5..0d3a40b24304 100644 if (unlikely(prev_state == TASK_DEAD)) { if (prev->sched_class->task_dead) prev->sched_class->task_dead(prev); -@@ -2565,16 +2665,6 @@ u64 scheduler_tick_max_deferment(void) +@@ -2565,16 +2665,6 @@ } #endif @@ -20666,7 +20987,7 @@ index 6cb5f00696f5..0d3a40b24304 100644 #if defined(CONFIG_PREEMPT) && (defined(CONFIG_DEBUG_PREEMPT) || \ defined(CONFIG_PREEMPT_TRACER)) -@@ -2596,7 +2686,7 @@ void preempt_count_add(int val) +@@ -2596,7 +2686,7 @@ PREEMPT_MASK - 10); #endif if (preempt_count() == val) { @@ -20675,7 +20996,7 @@ index 6cb5f00696f5..0d3a40b24304 100644 #ifdef CONFIG_DEBUG_PREEMPT current->preempt_disable_ip = ip; #endif -@@ -2623,7 +2713,7 @@ void preempt_count_sub(int val) +@@ -2623,7 +2713,7 @@ #endif if (preempt_count() == val) @@ -20684,7 +21005,7 @@ index 6cb5f00696f5..0d3a40b24304 100644 __preempt_count_sub(val); } EXPORT_SYMBOL(preempt_count_sub); -@@ -2679,6 +2769,133 @@ static inline void schedule_debug(struct task_struct *prev) +@@ -2679,6 +2769,133 @@ schedstat_inc(this_rq(), sched_count); } @@ -20818,7 +21139,7 @@ index 6cb5f00696f5..0d3a40b24304 100644 /* * Pick up the highest-prio task: */ -@@ -2785,6 +3002,8 @@ static void __sched __schedule(void) +@@ -2785,6 +3002,8 @@ smp_mb__before_spinlock(); raw_spin_lock_irq(&rq->lock); @@ -20827,7 +21148,7 @@ index 6cb5f00696f5..0d3a40b24304 100644 rq->clock_skip_update <<= 1; /* promote REQ to ACT */ switch_count = &prev->nivcsw; -@@ -2794,19 +3013,6 @@ static void __sched __schedule(void) +@@ -2794,19 +3013,6 @@ } else { deactivate_task(rq, prev, DEQUEUE_SLEEP); prev->on_rq = 0; @@ -20847,7 +21168,7 @@ index 6cb5f00696f5..0d3a40b24304 100644 } switch_count = &prev->nvcsw; } -@@ -2816,6 +3022,7 @@ static void __sched __schedule(void) +@@ -2816,6 +3022,7 @@ next = pick_next_task(rq, prev); clear_tsk_need_resched(prev); @@ -20855,7 +21176,7 @@ index 6cb5f00696f5..0d3a40b24304 100644 clear_preempt_need_resched(); rq->clock_skip_update = 0; -@@ -2836,8 +3043,19 @@ static void __sched __schedule(void) +@@ -2836,8 +3043,19 @@ static inline void sched_submit_work(struct task_struct *tsk) { @@ -20876,7 +21197,7 @@ index 6cb5f00696f5..0d3a40b24304 100644 /* * If we are going to sleep and we have plugged IO queued, * make sure to submit it to avoid deadlocks. -@@ -2846,6 +3064,12 @@ static inline void sched_submit_work(struct task_struct *tsk) +@@ -2846,6 +3064,12 @@ blk_schedule_flush_plug(tsk); } @@ -20889,7 +21210,7 @@ index 6cb5f00696f5..0d3a40b24304 100644 asmlinkage __visible void __sched schedule(void) { struct task_struct *tsk = current; -@@ -2854,6 +3078,7 @@ asmlinkage __visible void __sched schedule(void) +@@ -2854,6 +3078,7 @@ do { __schedule(); } while (need_resched()); @@ -20897,7 +21218,7 @@ index 6cb5f00696f5..0d3a40b24304 100644 } EXPORT_SYMBOL(schedule); -@@ -2903,6 +3128,30 @@ static void __sched notrace preempt_schedule_common(void) +@@ -2903,6 +3128,30 @@ } while (need_resched()); } @@ -20928,7 +21249,7 @@ index 6cb5f00696f5..0d3a40b24304 100644 #ifdef CONFIG_PREEMPT /* * this is the entry point to schedule() from in-kernel preemption -@@ -2917,6 +3166,8 @@ asmlinkage __visible void __sched notrace preempt_schedule(void) +@@ -2917,6 +3166,8 @@ */ if (likely(!preemptible())) return; @@ -20937,7 +21258,7 @@ index 6cb5f00696f5..0d3a40b24304 100644 preempt_schedule_common(); } -@@ -2944,6 +3195,8 @@ asmlinkage __visible void __sched notrace preempt_schedule_context(void) +@@ -2944,6 +3195,8 @@ if (likely(!preemptible())) return; @@ -20946,7 +21267,7 @@ index 6cb5f00696f5..0d3a40b24304 100644 do { __preempt_count_add(PREEMPT_ACTIVE); -@@ -2953,7 +3206,16 @@ asmlinkage __visible void __sched notrace preempt_schedule_context(void) +@@ -2953,7 +3206,16 @@ * an infinite recursion. */ prev_ctx = exception_enter(); @@ -20963,7 +21284,7 @@ index 6cb5f00696f5..0d3a40b24304 100644 exception_exit(prev_ctx); __preempt_count_sub(PREEMPT_ACTIVE); -@@ -4290,6 +4552,7 @@ int __cond_resched_lock(spinlock_t *lock) +@@ -4290,6 +4552,7 @@ } EXPORT_SYMBOL(__cond_resched_lock); @@ -20971,7 +21292,7 @@ index 6cb5f00696f5..0d3a40b24304 100644 int __sched __cond_resched_softirq(void) { BUG_ON(!in_softirq()); -@@ -4303,6 +4566,7 @@ int __sched __cond_resched_softirq(void) +@@ -4303,6 +4566,7 @@ return 0; } EXPORT_SYMBOL(__cond_resched_softirq); @@ -20979,7 +21300,7 @@ index 6cb5f00696f5..0d3a40b24304 100644 /** * yield - yield the current processor to other threads. -@@ -4659,7 +4923,9 @@ void init_idle(struct task_struct *idle, int cpu) +@@ -4659,7 +4923,9 @@ /* Set the preempt count _outside_ the spinlocks! */ init_idle_preempt_count(idle, cpu); @@ -20990,7 +21311,7 @@ index 6cb5f00696f5..0d3a40b24304 100644 /* * The idle tasks have their own, simple scheduling class: */ -@@ -4779,11 +5045,91 @@ static struct rq *move_queued_task(struct task_struct *p, int new_cpu) +@@ -4779,11 +5045,91 @@ void do_set_cpus_allowed(struct task_struct *p, const struct cpumask *new_mask) { @@ -21085,7 +21406,7 @@ index 6cb5f00696f5..0d3a40b24304 100644 } /* -@@ -4829,7 +5175,7 @@ int set_cpus_allowed_ptr(struct task_struct *p, const struct cpumask *new_mask) +@@ -4829,7 +5175,7 @@ do_set_cpus_allowed(p, new_mask); /* Can the task run on the task's current CPU? If so, we're done */ @@ -21094,7 +21415,7 @@ index 6cb5f00696f5..0d3a40b24304 100644 goto out; dest_cpu = cpumask_any_and(cpu_active_mask, new_mask); -@@ -4969,6 +5315,8 @@ static int migration_cpu_stop(void *data) +@@ -4969,6 +5315,8 @@ #ifdef CONFIG_HOTPLUG_CPU @@ -21103,7 +21424,7 @@ index 6cb5f00696f5..0d3a40b24304 100644 /* * Ensures that the idle task is using init_mm right before its cpu goes * offline. -@@ -4983,7 +5331,11 @@ void idle_task_exit(void) +@@ -4983,7 +5331,11 @@ switch_mm(mm, &init_mm, current); finish_arch_post_lock_switch(); } @@ -21116,7 +21437,7 @@ index 6cb5f00696f5..0d3a40b24304 100644 } /* -@@ -5326,6 +5678,10 @@ migration_call(struct notifier_block *nfb, unsigned long action, void *hcpu) +@@ -5326,6 +5678,10 @@ case CPU_DEAD: calc_load_migrate(rq); @@ -21127,7 +21448,7 @@ index 6cb5f00696f5..0d3a40b24304 100644 break; #endif } -@@ -7305,7 +7661,8 @@ void __init sched_init(void) +@@ -7305,7 +7661,8 @@ #ifdef CONFIG_DEBUG_ATOMIC_SLEEP static inline int preempt_count_equals(int preempt_offset) { @@ -21137,11 +21458,10 @@ index 6cb5f00696f5..0d3a40b24304 100644 return (nested == preempt_offset); } -diff --git a/kernel/sched/cputime.c b/kernel/sched/cputime.c -index 87b8576cbd50..2ee44eb30f2b 100644 ---- a/kernel/sched/cputime.c -+++ b/kernel/sched/cputime.c -@@ -675,37 +675,45 @@ static void __vtime_account_system(struct task_struct *tsk) +diff -Nur linux-4.1.39.orig/kernel/sched/cputime.c linux-4.1.39/kernel/sched/cputime.c +--- linux-4.1.39.orig/kernel/sched/cputime.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/sched/cputime.c 2017-04-18 17:56:30.633397907 +0200 +@@ -675,37 +675,45 @@ void vtime_account_system(struct task_struct *tsk) { @@ -21195,7 +21515,7 @@ index 87b8576cbd50..2ee44eb30f2b 100644 } void vtime_guest_enter(struct task_struct *tsk) -@@ -717,19 +725,23 @@ void vtime_guest_enter(struct task_struct *tsk) +@@ -717,19 +725,23 @@ * synchronization against the reader (task_gtime()) * that can thus safely catch up with a tickless delta. */ @@ -21223,7 +21543,7 @@ index 87b8576cbd50..2ee44eb30f2b 100644 } EXPORT_SYMBOL_GPL(vtime_guest_exit); -@@ -742,24 +754,30 @@ void vtime_account_idle(struct task_struct *tsk) +@@ -742,24 +754,30 @@ void arch_vtime_task_switch(struct task_struct *prev) { @@ -21260,7 +21580,7 @@ index 87b8576cbd50..2ee44eb30f2b 100644 } cputime_t task_gtime(struct task_struct *t) -@@ -768,13 +786,13 @@ cputime_t task_gtime(struct task_struct *t) +@@ -768,13 +786,13 @@ cputime_t gtime; do { @@ -21276,7 +21596,7 @@ index 87b8576cbd50..2ee44eb30f2b 100644 return gtime; } -@@ -797,7 +815,7 @@ fetch_task_cputime(struct task_struct *t, +@@ -797,7 +815,7 @@ *udelta = 0; *sdelta = 0; @@ -21285,7 +21605,7 @@ index 87b8576cbd50..2ee44eb30f2b 100644 if (u_dst) *u_dst = *u_src; -@@ -821,7 +839,7 @@ fetch_task_cputime(struct task_struct *t, +@@ -821,7 +839,7 @@ if (t->vtime_snap_whence == VTIME_SYS) *sdelta = delta; } @@ -21294,11 +21614,10 @@ index 87b8576cbd50..2ee44eb30f2b 100644 } -diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c -index 5e95145088fd..0c261c5114e0 100644 ---- a/kernel/sched/deadline.c -+++ b/kernel/sched/deadline.c -@@ -637,6 +637,7 @@ void init_dl_task_timer(struct sched_dl_entity *dl_se) +diff -Nur linux-4.1.39.orig/kernel/sched/deadline.c linux-4.1.39/kernel/sched/deadline.c +--- linux-4.1.39.orig/kernel/sched/deadline.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/sched/deadline.c 2017-04-18 17:56:30.633397907 +0200 +@@ -637,6 +637,7 @@ hrtimer_init(timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); timer->function = dl_task_timer; @@ -21306,11 +21625,10 @@ index 5e95145088fd..0c261c5114e0 100644 } static -diff --git a/kernel/sched/debug.c b/kernel/sched/debug.c -index a245c1fc6f0a..34b00001b00a 100644 ---- a/kernel/sched/debug.c -+++ b/kernel/sched/debug.c -@@ -260,6 +260,9 @@ void print_rt_rq(struct seq_file *m, int cpu, struct rt_rq *rt_rq) +diff -Nur linux-4.1.39.orig/kernel/sched/debug.c linux-4.1.39/kernel/sched/debug.c +--- linux-4.1.39.orig/kernel/sched/debug.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/sched/debug.c 2017-04-18 17:56:30.633397907 +0200 +@@ -260,6 +260,9 @@ P(rt_throttled); PN(rt_time); PN(rt_runtime); @@ -21320,7 +21638,7 @@ index a245c1fc6f0a..34b00001b00a 100644 #undef PN #undef P -@@ -648,6 +651,10 @@ void proc_sched_show_task(struct task_struct *p, struct seq_file *m) +@@ -648,6 +651,10 @@ #endif P(policy); P(prio); @@ -21331,11 +21649,10 @@ index a245c1fc6f0a..34b00001b00a 100644 #undef PN #undef __PN #undef P -diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c -index 77690b653ca9..7aae8d27611e 100644 ---- a/kernel/sched/fair.c -+++ b/kernel/sched/fair.c -@@ -3201,7 +3201,7 @@ check_preempt_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr) +diff -Nur linux-4.1.39.orig/kernel/sched/fair.c linux-4.1.39/kernel/sched/fair.c +--- linux-4.1.39.orig/kernel/sched/fair.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/sched/fair.c 2017-04-18 17:56:30.637398061 +0200 +@@ -3201,7 +3201,7 @@ ideal_runtime = sched_slice(cfs_rq, curr); delta_exec = curr->sum_exec_runtime - curr->prev_sum_exec_runtime; if (delta_exec > ideal_runtime) { @@ -21344,7 +21661,7 @@ index 77690b653ca9..7aae8d27611e 100644 /* * The current task ran long enough, ensure it doesn't get * re-elected due to buddy favours. -@@ -3225,7 +3225,7 @@ check_preempt_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr) +@@ -3225,7 +3225,7 @@ return; if (delta > ideal_runtime) @@ -21353,7 +21670,7 @@ index 77690b653ca9..7aae8d27611e 100644 } static void -@@ -3366,7 +3366,7 @@ entity_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr, int queued) +@@ -3366,7 +3366,7 @@ * validating it and just reschedule. */ if (queued) { @@ -21362,7 +21679,7 @@ index 77690b653ca9..7aae8d27611e 100644 return; } /* -@@ -3557,7 +3557,7 @@ static void __account_cfs_rq_runtime(struct cfs_rq *cfs_rq, u64 delta_exec) +@@ -3557,7 +3557,7 @@ * hierarchy can be throttled */ if (!assign_cfs_rq_runtime(cfs_rq) && likely(cfs_rq->curr)) @@ -21371,7 +21688,7 @@ index 77690b653ca9..7aae8d27611e 100644 } static __always_inline -@@ -4180,7 +4180,7 @@ static void hrtick_start_fair(struct rq *rq, struct task_struct *p) +@@ -4180,7 +4180,7 @@ if (delta < 0) { if (rq->curr == p) @@ -21380,7 +21697,7 @@ index 77690b653ca9..7aae8d27611e 100644 return; } hrtick_start(rq, delta); -@@ -5076,7 +5076,7 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_ +@@ -5076,7 +5076,7 @@ return; preempt: @@ -21389,7 +21706,7 @@ index 77690b653ca9..7aae8d27611e 100644 /* * Only set the backward buddy when the current task is still * on the rq. This can happen when a wakeup gets interleaved -@@ -7869,7 +7869,7 @@ static void task_fork_fair(struct task_struct *p) +@@ -7869,7 +7869,7 @@ * 'current' within the tree based on its new key value. */ swap(curr->vruntime, se->vruntime); @@ -21398,7 +21715,7 @@ index 77690b653ca9..7aae8d27611e 100644 } se->vruntime -= cfs_rq->min_vruntime; -@@ -7894,7 +7894,7 @@ prio_changed_fair(struct rq *rq, struct task_struct *p, int oldprio) +@@ -7894,7 +7894,7 @@ */ if (rq->curr == p) { if (p->prio > oldprio) @@ -21407,11 +21724,10 @@ index 77690b653ca9..7aae8d27611e 100644 } else check_preempt_curr(rq, p, 0); } -diff --git a/kernel/sched/features.h b/kernel/sched/features.h -index 91e33cd485f6..0ea4e37751d7 100644 ---- a/kernel/sched/features.h -+++ b/kernel/sched/features.h -@@ -50,11 +50,19 @@ SCHED_FEAT(LB_BIAS, true) +diff -Nur linux-4.1.39.orig/kernel/sched/features.h linux-4.1.39/kernel/sched/features.h +--- linux-4.1.39.orig/kernel/sched/features.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/sched/features.h 2017-04-18 17:56:30.637398061 +0200 +@@ -50,11 +50,19 @@ */ SCHED_FEAT(NONTASK_CAPACITY, true) @@ -21431,11 +21747,22 @@ index 91e33cd485f6..0ea4e37751d7 100644 #ifdef HAVE_RT_PUSH_IPI /* -diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c -index 575da76a3874..637aa208a58d 100644 ---- a/kernel/sched/rt.c -+++ b/kernel/sched/rt.c -@@ -44,6 +44,7 @@ void init_rt_bandwidth(struct rt_bandwidth *rt_b, u64 period, u64 runtime) +diff -Nur linux-4.1.39.orig/kernel/sched/Makefile linux-4.1.39/kernel/sched/Makefile +--- linux-4.1.39.orig/kernel/sched/Makefile 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/sched/Makefile 2017-04-18 17:56:30.633397907 +0200 +@@ -13,7 +13,7 @@ + + obj-y += core.o proc.o clock.o cputime.o + obj-y += idle_task.o fair.o rt.o deadline.o stop_task.o +-obj-y += wait.o completion.o idle.o ++obj-y += wait.o wait-simple.o work-simple.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.1.39.orig/kernel/sched/rt.c linux-4.1.39/kernel/sched/rt.c +--- linux-4.1.39.orig/kernel/sched/rt.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/sched/rt.c 2017-04-18 17:56:30.637398061 +0200 +@@ -44,6 +44,7 @@ hrtimer_init(&rt_b->rt_period_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); @@ -21443,7 +21770,7 @@ index 575da76a3874..637aa208a58d 100644 rt_b->rt_period_timer.function = sched_rt_period_timer; } -@@ -89,6 +90,7 @@ void init_rt_rq(struct rt_rq *rt_rq) +@@ -89,6 +90,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); @@ -21451,11 +21778,10 @@ index 575da76a3874..637aa208a58d 100644 #endif #endif /* CONFIG_SMP */ /* We start is dequeued state, because no RT tasks are queued */ -diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h -index aa1f059de4f7..1bdd1e5f056d 100644 ---- a/kernel/sched/sched.h -+++ b/kernel/sched/sched.h -@@ -1093,6 +1093,7 @@ static inline void finish_lock_switch(struct rq *rq, struct task_struct *prev) +diff -Nur linux-4.1.39.orig/kernel/sched/sched.h linux-4.1.39/kernel/sched/sched.h +--- linux-4.1.39.orig/kernel/sched/sched.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/sched/sched.h 2017-04-18 17:56:30.637398061 +0200 +@@ -1093,6 +1093,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 */ @@ -21463,7 +21789,7 @@ index aa1f059de4f7..1bdd1e5f056d 100644 /* * To aid in avoiding the subversion of "niceness" due to uneven distribution -@@ -1290,6 +1291,15 @@ extern void init_sched_dl_class(void); +@@ -1290,6 +1291,15 @@ extern void resched_curr(struct rq *rq); extern void resched_cpu(int cpu); @@ -21479,11 +21805,9 @@ index aa1f059de4f7..1bdd1e5f056d 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/wait-simple.c b/kernel/sched/wait-simple.c -new file mode 100644 -index 000000000000..7dfa86d1f654 ---- /dev/null -+++ b/kernel/sched/wait-simple.c +diff -Nur linux-4.1.39.orig/kernel/sched/wait-simple.c linux-4.1.39/kernel/sched/wait-simple.c +--- linux-4.1.39.orig/kernel/sched/wait-simple.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.39/kernel/sched/wait-simple.c 2017-04-18 17:56:30.637398061 +0200 @@ -0,0 +1,115 @@ +/* + * Simple waitqueues without fancy flags and callbacks @@ -21600,11 +21924,9 @@ index 000000000000..7dfa86d1f654 + return woken; +} +EXPORT_SYMBOL(__swait_wake); -diff --git a/kernel/sched/work-simple.c b/kernel/sched/work-simple.c -new file mode 100644 -index 000000000000..e57a0522573f ---- /dev/null -+++ b/kernel/sched/work-simple.c +diff -Nur linux-4.1.39.orig/kernel/sched/work-simple.c linux-4.1.39/kernel/sched/work-simple.c +--- linux-4.1.39.orig/kernel/sched/work-simple.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.39/kernel/sched/work-simple.c 2017-04-18 17:56:30.637398061 +0200 @@ -0,0 +1,173 @@ +/* + * Copyright (C) 2014 BMW Car IT GmbH, Daniel Wagner daniel.wagner@bmw-carit.de @@ -21779,10 +22101,9 @@ index 000000000000..e57a0522573f + mutex_unlock(&worker_mutex); +} +EXPORT_SYMBOL_GPL(swork_put); -diff --git a/kernel/signal.c b/kernel/signal.c -index 0206be728dac..1336e4c016ba 100644 ---- a/kernel/signal.c -+++ b/kernel/signal.c +diff -Nur linux-4.1.39.orig/kernel/signal.c linux-4.1.39/kernel/signal.c +--- linux-4.1.39.orig/kernel/signal.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/signal.c 2017-04-18 17:56:30.637398061 +0200 @@ -14,6 +14,7 @@ #include <linux/export.h> #include <linux/init.h> @@ -21791,7 +22112,7 @@ index 0206be728dac..1336e4c016ba 100644 #include <linux/fs.h> #include <linux/tty.h> #include <linux/binfmts.h> -@@ -352,13 +353,45 @@ static bool task_participate_group_stop(struct task_struct *task) +@@ -352,13 +353,45 @@ return false; } @@ -21838,7 +22159,7 @@ index 0206be728dac..1336e4c016ba 100644 { struct sigqueue *q = NULL; struct user_struct *user; -@@ -375,7 +408,10 @@ __sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimi +@@ -375,7 +408,10 @@ if (override_rlimit || atomic_read(&user->sigpending) <= task_rlimit(t, RLIMIT_SIGPENDING)) { @@ -21850,7 +22171,7 @@ index 0206be728dac..1336e4c016ba 100644 } else { print_dropped_signal(sig); } -@@ -392,6 +428,13 @@ __sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimi +@@ -392,6 +428,13 @@ return q; } @@ -21864,7 +22185,7 @@ index 0206be728dac..1336e4c016ba 100644 static void __sigqueue_free(struct sigqueue *q) { if (q->flags & SIGQUEUE_PREALLOC) -@@ -401,6 +444,21 @@ static void __sigqueue_free(struct sigqueue *q) +@@ -401,6 +444,21 @@ kmem_cache_free(sigqueue_cachep, q); } @@ -21886,7 +22207,7 @@ index 0206be728dac..1336e4c016ba 100644 void flush_sigqueue(struct sigpending *queue) { struct sigqueue *q; -@@ -414,6 +472,21 @@ void flush_sigqueue(struct sigpending *queue) +@@ -414,6 +472,21 @@ } /* @@ -21908,7 +22229,7 @@ index 0206be728dac..1336e4c016ba 100644 * Flush all pending signals for a task. */ void __flush_signals(struct task_struct *t) -@@ -565,7 +638,7 @@ static void collect_signal(int sig, struct sigpending *list, siginfo_t *info) +@@ -565,7 +638,7 @@ still_pending: list_del_init(&first->list); copy_siginfo(info, &first->info); @@ -21917,7 +22238,7 @@ index 0206be728dac..1336e4c016ba 100644 } else { /* * Ok, it wasn't in the queue. This must be -@@ -611,6 +684,8 @@ int dequeue_signal(struct task_struct *tsk, sigset_t *mask, siginfo_t *info) +@@ -611,6 +684,8 @@ { int signr; @@ -21926,7 +22247,7 @@ index 0206be728dac..1336e4c016ba 100644 /* We only dequeue private signals from ourselves, we don't let * signalfd steal them */ -@@ -1207,8 +1282,8 @@ int do_send_sig_info(int sig, struct siginfo *info, struct task_struct *p, +@@ -1207,8 +1282,8 @@ * We don't want to have recursive SIGSEGV's etc, for example, * that is why we also clear SIGNAL_UNKILLABLE. */ @@ -21937,7 +22258,7 @@ index 0206be728dac..1336e4c016ba 100644 { unsigned long int flags; int ret, blocked, ignored; -@@ -1233,6 +1308,39 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t) +@@ -1233,6 +1308,39 @@ return ret; } @@ -21977,7 +22298,7 @@ index 0206be728dac..1336e4c016ba 100644 /* * Nuke all other threads in the group. */ -@@ -1267,12 +1375,12 @@ struct sighand_struct *__lock_task_sighand(struct task_struct *tsk, +@@ -1267,12 +1375,12 @@ * Disable interrupts early to avoid deadlocks. * See rcu_read_unlock() comment header for details. */ @@ -21992,7 +22313,7 @@ index 0206be728dac..1336e4c016ba 100644 break; } /* -@@ -1293,7 +1401,7 @@ struct sighand_struct *__lock_task_sighand(struct task_struct *tsk, +@@ -1293,7 +1401,7 @@ } spin_unlock(&sighand->siglock); rcu_read_unlock(); @@ -22001,7 +22322,7 @@ index 0206be728dac..1336e4c016ba 100644 } return sighand; -@@ -1536,7 +1644,8 @@ EXPORT_SYMBOL(kill_pid); +@@ -1536,7 +1644,8 @@ */ struct sigqueue *sigqueue_alloc(void) { @@ -22011,7 +22332,7 @@ index 0206be728dac..1336e4c016ba 100644 if (q) q->flags |= SIGQUEUE_PREALLOC; -@@ -1897,15 +2006,7 @@ static void ptrace_stop(int exit_code, int why, int clear_code, siginfo_t *info) +@@ -1897,15 +2006,7 @@ if (gstop_done && ptrace_reparented(current)) do_notify_parent_cldstop(current, false, why); @@ -22027,10 +22348,9 @@ index 0206be728dac..1336e4c016ba 100644 freezable_schedule(); } else { /* -diff --git a/kernel/softirq.c b/kernel/softirq.c -index 479e4436f787..cb9c1d5dee10 100644 ---- a/kernel/softirq.c -+++ b/kernel/softirq.c +diff -Nur linux-4.1.39.orig/kernel/softirq.c linux-4.1.39/kernel/softirq.c +--- linux-4.1.39.orig/kernel/softirq.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/softirq.c 2017-04-18 17:56:30.637398061 +0200 @@ -21,10 +21,12 @@ #include <linux/freezer.h> #include <linux/kthread.h> @@ -22044,7 +22364,7 @@ index 479e4436f787..cb9c1d5dee10 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); @@ -22153,7 +22473,7 @@ index 479e4436f787..cb9c1d5dee10 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); } @@ -22233,7 +22553,7 @@ index 479e4436f787..cb9c1d5dee10 100644 /* * preempt_count and SOFTIRQ_OFFSET usage: * - preempt_count is changed by SOFTIRQ_OFFSET on entering or leaving -@@ -116,9 +287,9 @@ void __local_bh_disable_ip(unsigned long ip, unsigned int cnt) +@@ -116,9 +287,9 @@ if (preempt_count() == cnt) { #ifdef CONFIG_DEBUG_PREEMPT @@ -22245,7 +22565,7 @@ index 479e4436f787..cb9c1d5dee10 100644 } } EXPORT_SYMBOL(__local_bh_disable_ip); -@@ -232,10 +403,8 @@ asmlinkage __visible void __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; @@ -22256,7 +22576,7 @@ index 479e4436f787..cb9c1d5dee10 100644 /* * Mask out PF_MEMALLOC s current task context is borrowed for the -@@ -254,36 +423,7 @@ restart: +@@ -254,36 +423,7 @@ /* Reset the pending bitmask before enabling irqs */ set_softirq_pending(0); @@ -22294,7 +22614,7 @@ index 479e4436f787..cb9c1d5dee10 100644 pending = local_softirq_pending(); if (pending) { -@@ -320,6 +460,310 @@ asmlinkage __visible void do_softirq(void) +@@ -320,6 +460,310 @@ } /* @@ -22605,7 +22925,7 @@ index 479e4436f787..cb9c1d5dee10 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. */ @@ -22617,7 +22937,7 @@ index 479e4436f787..cb9c1d5dee10 100644 } __irq_enter(); -@@ -340,6 +784,7 @@ void irq_enter(void) +@@ -340,6 +784,7 @@ static inline void invoke_softirq(void) { @@ -22625,7 +22945,7 @@ index 479e4436f787..cb9c1d5dee10 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(); } @@ -22644,7 +22964,7 @@ index 479e4436f787..cb9c1d5dee10 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! */ } @@ -22671,7 +22991,7 @@ index 479e4436f787..cb9c1d5dee10 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); } @@ -22684,7 +23004,7 @@ index 479e4436f787..cb9c1d5dee10 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); @@ -22734,7 +23054,7 @@ index 479e4436f787..cb9c1d5dee10 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); @@ -22746,7 +23066,7 @@ index 479e4436f787..cb9c1d5dee10 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()); @@ -22918,7 +23238,7 @@ index 479e4436f787..cb9c1d5dee10 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 { @@ -22927,7 +23247,7 @@ index 479e4436f787..cb9c1d5dee10 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); } @@ -22969,7 +23289,7 @@ index 479e4436f787..cb9c1d5dee10 100644 } #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, @@ -23001,11 +23321,10 @@ index 479e4436f787..cb9c1d5dee10 100644 return 0; } -diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c -index 695f0c6cd169..d3ea2452e291 100644 ---- a/kernel/stop_machine.c -+++ b/kernel/stop_machine.c -@@ -35,7 +35,7 @@ struct cpu_stop_done { +diff -Nur linux-4.1.39.orig/kernel/stop_machine.c linux-4.1.39/kernel/stop_machine.c +--- linux-4.1.39.orig/kernel/stop_machine.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/stop_machine.c 2017-04-18 17:56:30.637398061 +0200 +@@ -35,7 +35,7 @@ /* the actual stopper, one per every possible cpu, enabled on online cpus */ struct cpu_stopper { @@ -23014,7 +23333,7 @@ index 695f0c6cd169..d3ea2452e291 100644 bool enabled; /* is this stopper enabled? */ struct list_head works; /* list of pending works */ }; -@@ -78,7 +78,7 @@ static void cpu_stop_queue_work(unsigned int cpu, struct cpu_stop_work *work) +@@ -78,7 +78,7 @@ unsigned long flags; @@ -23023,7 +23342,7 @@ index 695f0c6cd169..d3ea2452e291 100644 if (stopper->enabled) { list_add_tail(&work->list, &stopper->works); -@@ -86,7 +86,7 @@ static void cpu_stop_queue_work(unsigned int cpu, struct cpu_stop_work *work) +@@ -86,7 +86,7 @@ } else cpu_stop_signal_done(work->done, false); @@ -23032,7 +23351,7 @@ index 695f0c6cd169..d3ea2452e291 100644 } /** -@@ -248,7 +248,7 @@ int stop_two_cpus(unsigned int cpu1, unsigned int cpu2, cpu_stop_fn_t fn, void * +@@ -248,7 +248,7 @@ struct irq_cpu_stop_queue_work_info call_args; struct multi_stop_data msdata; @@ -23041,7 +23360,7 @@ index 695f0c6cd169..d3ea2452e291 100644 msdata = (struct multi_stop_data){ .fn = fn, .data = arg, -@@ -281,7 +281,7 @@ int stop_two_cpus(unsigned int cpu1, unsigned int cpu2, cpu_stop_fn_t fn, void * +@@ -281,7 +281,7 @@ * This relies on the stopper workqueues to be FIFO. */ if (!cpu_active(cpu1) || !cpu_active(cpu2)) { @@ -23050,7 +23369,7 @@ index 695f0c6cd169..d3ea2452e291 100644 return -ENOENT; } -@@ -295,7 +295,7 @@ int stop_two_cpus(unsigned int cpu1, unsigned int cpu2, cpu_stop_fn_t fn, void * +@@ -295,7 +295,7 @@ &irq_cpu_stop_queue_work, &call_args, 1); lg_local_unlock(&stop_cpus_lock); @@ -23059,7 +23378,7 @@ index 695f0c6cd169..d3ea2452e291 100644 wait_for_completion(&done.completion); -@@ -329,7 +329,7 @@ static DEFINE_PER_CPU(struct cpu_stop_work, stop_cpus_work); +@@ -329,7 +329,7 @@ static void queue_stop_cpus_work(const struct cpumask *cpumask, cpu_stop_fn_t fn, void *arg, @@ -23068,7 +23387,7 @@ index 695f0c6cd169..d3ea2452e291 100644 { struct cpu_stop_work *work; unsigned int cpu; -@@ -343,11 +343,13 @@ static void queue_stop_cpus_work(const struct cpumask *cpumask, +@@ -343,11 +343,13 @@ } /* @@ -23086,7 +23405,7 @@ index 695f0c6cd169..d3ea2452e291 100644 for_each_cpu(cpu, cpumask) cpu_stop_queue_work(cpu, &per_cpu(stop_cpus_work, cpu)); lg_global_unlock(&stop_cpus_lock); -@@ -359,7 +361,7 @@ static int __stop_cpus(const struct cpumask *cpumask, +@@ -359,7 +361,7 @@ struct cpu_stop_done done; cpu_stop_init_done(&done, cpumask_weight(cpumask)); @@ -23095,7 +23414,7 @@ index 695f0c6cd169..d3ea2452e291 100644 wait_for_completion(&done.completion); return done.executed ? done.ret : -ENOENT; } -@@ -439,9 +441,9 @@ static int cpu_stop_should_run(unsigned int cpu) +@@ -439,9 +441,9 @@ unsigned long flags; int run; @@ -23107,7 +23426,7 @@ index 695f0c6cd169..d3ea2452e291 100644 return run; } -@@ -453,13 +455,13 @@ static void cpu_stopper_thread(unsigned int cpu) +@@ -453,13 +455,13 @@ repeat: work = NULL; @@ -23123,7 +23442,7 @@ index 695f0c6cd169..d3ea2452e291 100644 if (work) { cpu_stop_fn_t fn = work->fn; -@@ -467,6 +469,16 @@ repeat: +@@ -467,6 +469,16 @@ struct cpu_stop_done *done = work->done; char ksym_buf[KSYM_NAME_LEN] __maybe_unused; @@ -23140,7 +23459,7 @@ index 695f0c6cd169..d3ea2452e291 100644 /* cpu stop callbacks are not allowed to sleep */ preempt_disable(); -@@ -500,20 +512,20 @@ static void cpu_stop_park(unsigned int cpu) +@@ -500,20 +512,20 @@ unsigned long flags; /* drain remaining works */ @@ -23165,7 +23484,7 @@ index 695f0c6cd169..d3ea2452e291 100644 } static struct smp_hotplug_thread cpu_stop_threads = { -@@ -535,10 +547,12 @@ static int __init cpu_stop_init(void) +@@ -535,10 +547,12 @@ for_each_possible_cpu(cpu) { struct cpu_stopper *stopper = &per_cpu(cpu_stopper, cpu); @@ -23179,7 +23498,7 @@ index 695f0c6cd169..d3ea2452e291 100644 BUG_ON(smpboot_register_percpu_thread(&cpu_stop_threads)); stop_machine_initialized = true; return 0; -@@ -634,7 +648,7 @@ int stop_machine_from_inactive_cpu(int (*fn)(void *), void *data, +@@ -634,7 +648,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, @@ -23188,10 +23507,9 @@ index 695f0c6cd169..d3ea2452e291 100644 ret = multi_cpu_stop(&msdata); /* Busy wait for completion. */ -diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c -index 93ef7190bdea..2c6be169bdc7 100644 ---- a/kernel/time/hrtimer.c -+++ b/kernel/time/hrtimer.c +diff -Nur linux-4.1.39.orig/kernel/time/hrtimer.c linux-4.1.39/kernel/time/hrtimer.c +--- linux-4.1.39.orig/kernel/time/hrtimer.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/time/hrtimer.c 2017-04-18 17:56:30.637398061 +0200 @@ -48,11 +48,13 @@ #include <linux/sched/rt.h> #include <linux/sched/deadline.h> @@ -23206,7 +23524,7 @@ index 93ef7190bdea..2c6be169bdc7 100644 #include "tick-internal.h" -@@ -576,8 +578,7 @@ static int hrtimer_reprogram(struct hrtimer *timer, +@@ -576,8 +578,7 @@ * When the callback is running, we do not reprogram the clock event * device. The timer callback is either running on a different CPU or * the callback is executed in the hrtimer_interrupt context. The @@ -23216,7 +23534,7 @@ index 93ef7190bdea..2c6be169bdc7 100644 */ if (hrtimer_callback_running(timer)) return 0; -@@ -621,6 +622,9 @@ static int hrtimer_reprogram(struct hrtimer *timer, +@@ -621,6 +622,9 @@ return res; } @@ -23226,7 +23544,7 @@ index 93ef7190bdea..2c6be169bdc7 100644 /* * Initialize the high resolution related parts of cpu_base */ -@@ -630,6 +634,21 @@ static inline void hrtimer_init_hres(struct hrtimer_cpu_base *base) +@@ -630,6 +634,21 @@ base->hres_active = 0; } @@ -23248,7 +23566,7 @@ index 93ef7190bdea..2c6be169bdc7 100644 static inline ktime_t hrtimer_update_base(struct hrtimer_cpu_base *base) { ktime_t *offs_real = &base->clock_base[HRTIMER_BASE_REALTIME].offset; -@@ -695,6 +714,44 @@ static void clock_was_set_work(struct work_struct *work) +@@ -695,6 +714,44 @@ static DECLARE_WORK(hrtimer_work, clock_was_set_work); @@ -23293,7 +23611,7 @@ index 93ef7190bdea..2c6be169bdc7 100644 /* * Called from timekeeping and resume code to reprogramm the hrtimer * interrupt device on all cpus. -@@ -703,6 +760,7 @@ void clock_was_set_delayed(void) +@@ -703,6 +760,7 @@ { schedule_work(&hrtimer_work); } @@ -23301,7 +23619,7 @@ index 93ef7190bdea..2c6be169bdc7 100644 #else -@@ -711,6 +769,13 @@ static inline int hrtimer_is_hres_enabled(void) { return 0; } +@@ -711,6 +769,13 @@ static inline int hrtimer_switch_to_hres(void) { return 0; } static inline void hrtimer_force_reprogram(struct hrtimer_cpu_base *base, int skip_equal) { } @@ -23315,7 +23633,7 @@ index 93ef7190bdea..2c6be169bdc7 100644 static inline int hrtimer_reprogram(struct hrtimer *timer, struct hrtimer_clock_base *base) { -@@ -718,7 +783,6 @@ static inline int hrtimer_reprogram(struct hrtimer *timer, +@@ -718,7 +783,6 @@ } static inline void hrtimer_init_hres(struct hrtimer_cpu_base *base) { } static inline void retrigger_next_event(void *arg) { } @@ -23323,7 +23641,7 @@ index 93ef7190bdea..2c6be169bdc7 100644 #endif /* CONFIG_HIGH_RES_TIMERS */ /* -@@ -836,6 +900,32 @@ u64 hrtimer_forward(struct hrtimer *timer, ktime_t now, ktime_t interval) +@@ -836,6 +900,32 @@ } EXPORT_SYMBOL_GPL(hrtimer_forward); @@ -23356,7 +23674,7 @@ index 93ef7190bdea..2c6be169bdc7 100644 /* * enqueue_hrtimer - internal function to (re)start a timer * -@@ -879,6 +969,11 @@ static void __remove_hrtimer(struct hrtimer *timer, +@@ -879,6 +969,11 @@ if (!(timer->state & HRTIMER_STATE_ENQUEUED)) goto out; @@ -23368,7 +23686,7 @@ index 93ef7190bdea..2c6be169bdc7 100644 next_timer = timerqueue_getnext(&base->active); timerqueue_del(&base->active, &timer->node); if (&timer->node == next_timer) { -@@ -966,7 +1061,16 @@ int __hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim, +@@ -966,7 +1061,16 @@ new_base = switch_hrtimer_base(timer, base, mode & HRTIMER_MODE_PINNED); timer_stats_hrtimer_set_start_info(timer); @@ -23385,7 +23703,7 @@ index 93ef7190bdea..2c6be169bdc7 100644 leftmost = enqueue_hrtimer(timer, new_base); if (!leftmost) { -@@ -980,15 +1084,26 @@ int __hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim, +@@ -980,15 +1084,26 @@ * on dynticks target. */ wake_up_nohz_cpu(new_base->cpu_base->cpu); @@ -23415,7 +23733,7 @@ index 93ef7190bdea..2c6be169bdc7 100644 /* * We need to drop cpu_base->lock to avoid a * lock ordering issue vs. rq->lock. -@@ -996,9 +1111,7 @@ int __hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim, +@@ -996,9 +1111,7 @@ raw_spin_unlock(&new_base->cpu_base->lock); raise_softirq_irqoff(HRTIMER_SOFTIRQ); local_irq_restore(flags); @@ -23426,7 +23744,7 @@ index 93ef7190bdea..2c6be169bdc7 100644 } } -@@ -1089,7 +1202,7 @@ int hrtimer_cancel(struct hrtimer *timer) +@@ -1089,7 +1202,7 @@ if (ret >= 0) return ret; @@ -23435,7 +23753,7 @@ index 93ef7190bdea..2c6be169bdc7 100644 } } EXPORT_SYMBOL_GPL(hrtimer_cancel); -@@ -1153,6 +1266,7 @@ static void __hrtimer_init(struct hrtimer *timer, clockid_t clock_id, +@@ -1153,6 +1266,7 @@ base = hrtimer_clockid_to_base(clock_id); timer->base = &cpu_base->clock_base[base]; @@ -23443,7 +23761,7 @@ index 93ef7190bdea..2c6be169bdc7 100644 timerqueue_init(&timer->node); #ifdef CONFIG_TIMER_STATS -@@ -1236,6 +1350,126 @@ static void __run_hrtimer(struct hrtimer *timer, ktime_t *now) +@@ -1236,6 +1350,126 @@ timer->state &= ~HRTIMER_STATE_CALLBACK; } @@ -23570,7 +23888,7 @@ index 93ef7190bdea..2c6be169bdc7 100644 #ifdef CONFIG_HIGH_RES_TIMERS /* -@@ -1246,7 +1480,7 @@ void hrtimer_interrupt(struct clock_event_device *dev) +@@ -1246,7 +1480,7 @@ { struct hrtimer_cpu_base *cpu_base = this_cpu_ptr(&hrtimer_bases); ktime_t expires_next, now, entry_time, delta; @@ -23579,7 +23897,7 @@ index 93ef7190bdea..2c6be169bdc7 100644 BUG_ON(!cpu_base->hres_active); cpu_base->nr_events++; -@@ -1281,6 +1515,15 @@ retry: +@@ -1281,6 +1515,15 @@ timer = container_of(node, struct hrtimer, node); @@ -23595,7 +23913,7 @@ index 93ef7190bdea..2c6be169bdc7 100644 /* * The immediate goal for using the softexpires is * minimizing wakeups, not running timers at the -@@ -1296,7 +1539,10 @@ retry: +@@ -1296,7 +1539,10 @@ if (basenow.tv64 < hrtimer_get_softexpires_tv64(timer)) break; @@ -23607,7 +23925,7 @@ index 93ef7190bdea..2c6be169bdc7 100644 } } /* Reevaluate the clock bases for the next expiry */ -@@ -1313,7 +1559,7 @@ retry: +@@ -1313,7 +1559,7 @@ if (expires_next.tv64 == KTIME_MAX || !tick_program_event(expires_next, 0)) { cpu_base->hang_detected = 0; @@ -23616,7 +23934,7 @@ index 93ef7190bdea..2c6be169bdc7 100644 } /* -@@ -1357,6 +1603,9 @@ retry: +@@ -1357,6 +1603,9 @@ tick_program_event(expires_next, 1); printk_once(KERN_WARNING "hrtimer: interrupt took %llu ns\n", ktime_to_ns(delta)); @@ -23626,7 +23944,7 @@ index 93ef7190bdea..2c6be169bdc7 100644 } /* -@@ -1392,18 +1641,18 @@ void hrtimer_peek_ahead_timers(void) +@@ -1392,18 +1641,18 @@ __hrtimer_peek_ahead_timers(); local_irq_restore(flags); } @@ -23651,7 +23969,7 @@ index 93ef7190bdea..2c6be169bdc7 100644 /* * Called from timer softirq every jiffy, expire hrtimers: * -@@ -1436,7 +1685,7 @@ void hrtimer_run_queues(void) +@@ -1436,7 +1685,7 @@ struct timerqueue_node *node; struct hrtimer_cpu_base *cpu_base = this_cpu_ptr(&hrtimer_bases); struct hrtimer_clock_base *base; @@ -23660,7 +23978,7 @@ index 93ef7190bdea..2c6be169bdc7 100644 if (hrtimer_hres_active()) return; -@@ -1461,10 +1710,16 @@ void hrtimer_run_queues(void) +@@ -1461,10 +1710,16 @@ hrtimer_get_expires_tv64(timer)) break; @@ -23678,7 +23996,7 @@ index 93ef7190bdea..2c6be169bdc7 100644 } /* -@@ -1486,16 +1741,18 @@ static enum hrtimer_restart hrtimer_wakeup(struct hrtimer *timer) +@@ -1486,16 +1741,18 @@ void hrtimer_init_sleeper(struct hrtimer_sleeper *sl, struct task_struct *task) { sl->timer.function = hrtimer_wakeup; @@ -23699,7 +24017,7 @@ index 93ef7190bdea..2c6be169bdc7 100644 hrtimer_start_expires(&t->timer, mode); if (!hrtimer_active(&t->timer)) t->task = NULL; -@@ -1539,7 +1796,8 @@ long __sched hrtimer_nanosleep_restart(struct restart_block *restart) +@@ -1539,7 +1796,8 @@ HRTIMER_MODE_ABS); hrtimer_set_expires_tv64(&t.timer, restart->nanosleep.expires); @@ -23709,7 +24027,7 @@ index 93ef7190bdea..2c6be169bdc7 100644 goto out; rmtp = restart->nanosleep.rmtp; -@@ -1556,8 +1814,10 @@ out: +@@ -1556,8 +1814,10 @@ return ret; } @@ -23722,7 +24040,7 @@ index 93ef7190bdea..2c6be169bdc7 100644 { struct restart_block *restart; struct hrtimer_sleeper t; -@@ -1570,7 +1830,7 @@ long hrtimer_nanosleep(struct timespec *rqtp, struct timespec __user *rmtp, +@@ -1570,7 +1830,7 @@ hrtimer_init_on_stack(&t.timer, clockid, mode); hrtimer_set_expires_range_ns(&t.timer, timespec_to_ktime(*rqtp), slack); @@ -23731,7 +24049,7 @@ index 93ef7190bdea..2c6be169bdc7 100644 goto out; /* Absolute timers do not update the rmtp value and restart: */ -@@ -1597,6 +1857,12 @@ out: +@@ -1597,6 +1857,12 @@ return ret; } @@ -23744,7 +24062,7 @@ index 93ef7190bdea..2c6be169bdc7 100644 SYSCALL_DEFINE2(nanosleep, struct timespec __user *, rqtp, struct timespec __user *, rmtp) { -@@ -1611,6 +1877,26 @@ SYSCALL_DEFINE2(nanosleep, struct timespec __user *, rqtp, +@@ -1611,6 +1877,26 @@ return hrtimer_nanosleep(&tu, rmtp, HRTIMER_MODE_REL, CLOCK_MONOTONIC); } @@ -23771,7 +24089,7 @@ index 93ef7190bdea..2c6be169bdc7 100644 /* * Functions related to boot-time initialization: */ -@@ -1622,10 +1908,14 @@ static void init_hrtimers_cpu(int cpu) +@@ -1622,10 +1908,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); @@ -23786,7 +24104,7 @@ index 93ef7190bdea..2c6be169bdc7 100644 } #ifdef CONFIG_HOTPLUG_CPU -@@ -1731,9 +2021,7 @@ void __init hrtimers_init(void) +@@ -1731,9 +2021,7 @@ hrtimer_cpu_notify(&hrtimers_nb, (unsigned long)CPU_UP_PREPARE, (void *)(long)smp_processor_id()); register_cpu_notifier(&hrtimers_nb); @@ -23796,11 +24114,10 @@ index 93ef7190bdea..2c6be169bdc7 100644 } /** -diff --git a/kernel/time/itimer.c b/kernel/time/itimer.c -index 8d262b467573..d0513909d663 100644 ---- a/kernel/time/itimer.c -+++ b/kernel/time/itimer.c -@@ -213,6 +213,7 @@ again: +diff -Nur linux-4.1.39.orig/kernel/time/itimer.c linux-4.1.39/kernel/time/itimer.c +--- linux-4.1.39.orig/kernel/time/itimer.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/time/itimer.c 2017-04-18 17:56:30.637398061 +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); @@ -23808,11 +24125,10 @@ index 8d262b467573..d0513909d663 100644 goto again; } expires = timeval_to_ktime(value->it_value); -diff --git a/kernel/time/jiffies.c b/kernel/time/jiffies.c -index 347fecf86a3f..2ede47408a3e 100644 ---- a/kernel/time/jiffies.c -+++ b/kernel/time/jiffies.c -@@ -74,7 +74,8 @@ static struct clocksource clocksource_jiffies = { +diff -Nur linux-4.1.39.orig/kernel/time/jiffies.c linux-4.1.39/kernel/time/jiffies.c +--- linux-4.1.39.orig/kernel/time/jiffies.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/time/jiffies.c 2017-04-18 17:56:30.637398061 +0200 +@@ -74,7 +74,8 @@ .max_cycles = 10, }; @@ -23822,7 +24138,7 @@ index 347fecf86a3f..2ede47408a3e 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 { @@ -23834,10 +24150,9 @@ index 347fecf86a3f..2ede47408a3e 100644 return ret; } EXPORT_SYMBOL(get_jiffies_64); -diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c -index 7a681003001c..bd9c53985d32 100644 ---- a/kernel/time/ntp.c -+++ b/kernel/time/ntp.c +diff -Nur linux-4.1.39.orig/kernel/time/ntp.c linux-4.1.39/kernel/time/ntp.c +--- linux-4.1.39.orig/kernel/time/ntp.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/time/ntp.c 2017-04-18 17:56:30.637398061 +0200 @@ -10,6 +10,7 @@ #include <linux/workqueue.h> #include <linux/hrtimer.h> @@ -23846,7 +24161,7 @@ index 7a681003001c..bd9c53985d32 100644 #include <linux/math64.h> #include <linux/timex.h> #include <linux/time.h> -@@ -529,10 +530,52 @@ static void sync_cmos_clock(struct work_struct *work) +@@ -529,10 +530,52 @@ &sync_cmos_work, timespec_to_jiffies(&next)); } @@ -23899,10 +24214,9 @@ index 7a681003001c..bd9c53985d32 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 57d1acb91c56..5b24aefef595 100644 ---- a/kernel/time/posix-cpu-timers.c -+++ b/kernel/time/posix-cpu-timers.c +diff -Nur linux-4.1.39.orig/kernel/time/posix-cpu-timers.c linux-4.1.39/kernel/time/posix-cpu-timers.c +--- linux-4.1.39.orig/kernel/time/posix-cpu-timers.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/time/posix-cpu-timers.c 2017-04-18 17:56:30.641398216 +0200 @@ -3,6 +3,7 @@ */ @@ -23911,7 +24225,7 @@ index 57d1acb91c56..5b24aefef595 100644 #include <linux/posix-timers.h> #include <linux/errno.h> #include <linux/math64.h> -@@ -626,7 +627,7 @@ static int posix_cpu_timer_set(struct k_itimer *timer, int timer_flags, +@@ -626,7 +627,7 @@ /* * Disarm any old timer after extracting its expiry time. */ @@ -23920,7 +24234,7 @@ index 57d1acb91c56..5b24aefef595 100644 ret = 0; old_incr = timer->it.cpu.incr; -@@ -1048,7 +1049,7 @@ void posix_cpu_timer_schedule(struct k_itimer *timer) +@@ -1048,7 +1049,7 @@ /* * Now re-arm for the new expiry time. */ @@ -23929,7 +24243,7 @@ index 57d1acb91c56..5b24aefef595 100644 arm_timer(timer); unlock_task_sighand(p, &flags); -@@ -1114,10 +1115,11 @@ static inline int fastpath_timer_check(struct task_struct *tsk) +@@ -1114,10 +1115,11 @@ sig = tsk->signal; if (sig->cputimer.running) { struct task_cputime group_sample; @@ -23943,7 +24257,7 @@ index 57d1acb91c56..5b24aefef595 100644 if (task_cputime_expired(&group_sample, &sig->cputime_expires)) return 1; -@@ -1131,13 +1133,13 @@ static inline int fastpath_timer_check(struct task_struct *tsk) +@@ -1131,13 +1133,13 @@ * already updated our counts. We need to check if any timers fire now. * Interrupts are disabled. */ @@ -23959,7 +24273,7 @@ index 57d1acb91c56..5b24aefef595 100644 /* * The fast path checks that there are no expired thread or thread -@@ -1195,6 +1197,190 @@ void run_posix_cpu_timers(struct task_struct *tsk) +@@ -1195,6 +1197,190 @@ } } @@ -24150,11 +24464,10 @@ index 57d1acb91c56..5b24aefef595 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 31ea01f42e1f..0f5d7eae61f0 100644 ---- a/kernel/time/posix-timers.c -+++ b/kernel/time/posix-timers.c -@@ -499,6 +499,7 @@ static enum hrtimer_restart posix_timer_fn(struct hrtimer *timer) +diff -Nur linux-4.1.39.orig/kernel/time/posix-timers.c linux-4.1.39/kernel/time/posix-timers.c +--- linux-4.1.39.orig/kernel/time/posix-timers.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/time/posix-timers.c 2017-04-18 17:56:30.641398216 +0200 +@@ -499,6 +499,7 @@ static struct pid *good_sigevent(sigevent_t * event) { struct task_struct *rtn = current->group_leader; @@ -24162,7 +24475,7 @@ index 31ea01f42e1f..0f5d7eae61f0 100644 if ((event->sigev_notify & SIGEV_THREAD_ID ) && (!(rtn = find_task_by_vpid(event->sigev_notify_thread_id)) || -@@ -507,7 +508,8 @@ static struct pid *good_sigevent(sigevent_t * event) +@@ -507,7 +508,8 @@ return NULL; if (((event->sigev_notify & ~SIGEV_THREAD_ID) != SIGEV_NONE) && @@ -24172,7 +24485,7 @@ index 31ea01f42e1f..0f5d7eae61f0 100644 return NULL; return task_pid(rtn); -@@ -819,6 +821,20 @@ SYSCALL_DEFINE1(timer_getoverrun, timer_t, timer_id) +@@ -819,6 +821,20 @@ return overrun; } @@ -24193,7 +24506,7 @@ index 31ea01f42e1f..0f5d7eae61f0 100644 /* Set a POSIX.1b interval timer. */ /* timr->it_lock is taken. */ static int -@@ -896,6 +912,7 @@ retry: +@@ -896,6 +912,7 @@ if (!timr) return -EINVAL; @@ -24201,7 +24514,7 @@ index 31ea01f42e1f..0f5d7eae61f0 100644 kc = clockid_to_kclock(timr->it_clock); if (WARN_ON_ONCE(!kc || !kc->timer_set)) error = -EINVAL; -@@ -904,9 +921,12 @@ retry: +@@ -904,9 +921,12 @@ unlock_timer(timr, flag); if (error == TIMER_RETRY) { @@ -24214,7 +24527,7 @@ index 31ea01f42e1f..0f5d7eae61f0 100644 if (old_setting && !error && copy_to_user(old_setting, &old_spec, sizeof (old_spec))) -@@ -944,10 +964,15 @@ retry_delete: +@@ -944,10 +964,15 @@ if (!timer) return -EINVAL; @@ -24230,7 +24543,7 @@ index 31ea01f42e1f..0f5d7eae61f0 100644 spin_lock(¤t->sighand->siglock); list_del(&timer->list); -@@ -973,8 +998,18 @@ static void itimer_delete(struct k_itimer *timer) +@@ -973,8 +998,18 @@ retry_delete: spin_lock_irqsave(&timer->it_lock, flags); @@ -24249,22 +24562,20 @@ index 31ea01f42e1f..0f5d7eae61f0 100644 goto retry_delete; } list_del(&timer->list); -diff --git a/kernel/time/tick-broadcast-hrtimer.c b/kernel/time/tick-broadcast-hrtimer.c -index 6aac4beedbbe..943c03395e46 100644 ---- a/kernel/time/tick-broadcast-hrtimer.c -+++ b/kernel/time/tick-broadcast-hrtimer.c -@@ -109,5 +109,6 @@ void tick_setup_hrtimer_broadcast(void) +diff -Nur linux-4.1.39.orig/kernel/time/tick-broadcast-hrtimer.c linux-4.1.39/kernel/time/tick-broadcast-hrtimer.c +--- linux-4.1.39.orig/kernel/time/tick-broadcast-hrtimer.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/time/tick-broadcast-hrtimer.c 2017-04-18 17:56:30.641398216 +0200 +@@ -109,5 +109,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 3ae6afa1eb98..14a10917c8a3 100644 ---- a/kernel/time/tick-common.c -+++ b/kernel/time/tick-common.c -@@ -78,13 +78,15 @@ int tick_is_oneshot_available(void) +diff -Nur linux-4.1.39.orig/kernel/time/tick-common.c linux-4.1.39/kernel/time/tick-common.c +--- linux-4.1.39.orig/kernel/time/tick-common.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/time/tick-common.c 2017-04-18 17:56:30.641398216 +0200 +@@ -78,13 +78,15 @@ static void tick_periodic(int cpu) { if (tick_do_timer_cpu == cpu) { @@ -24282,7 +24593,7 @@ index 3ae6afa1eb98..14a10917c8a3 100644 update_wall_time(); } -@@ -146,9 +148,9 @@ void tick_setup_periodic(struct clock_event_device *dev, int broadcast) +@@ -146,9 +148,9 @@ ktime_t next; do { @@ -24294,11 +24605,10 @@ index 3ae6afa1eb98..14a10917c8a3 100644 clockevents_set_state(dev, CLOCK_EVT_STATE_ONESHOT); -diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c -index 914259128145..b3841ba00c69 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.1.39.orig/kernel/time/tick-sched.c linux-4.1.39/kernel/time/tick-sched.c +--- linux-4.1.39.orig/kernel/time/tick-sched.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/time/tick-sched.c 2017-04-18 17:56:30.641398216 +0200 +@@ -62,7 +62,8 @@ return; /* Reevalute with jiffies_lock held */ @@ -24308,7 +24618,7 @@ index 914259128145..b3841ba00c69 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 { @@ -24323,7 +24633,7 @@ index 914259128145..b3841ba00c69 100644 update_wall_time(); } -@@ -99,12 +102,14 @@ static ktime_t tick_init_jiffy_update(void) +@@ -99,12 +102,14 @@ { ktime_t period; @@ -24340,7 +24650,7 @@ index 914259128145..b3841ba00c69 100644 return period; } -@@ -176,6 +181,11 @@ static bool can_stop_full_tick(void) +@@ -176,6 +181,11 @@ return false; } @@ -24352,7 +24662,7 @@ index 914259128145..b3841ba00c69 100644 /* sched_clock_tick() needs us? */ #ifdef CONFIG_HAVE_UNSTABLE_SCHED_CLOCK /* -@@ -222,6 +232,7 @@ static void nohz_full_kick_work_func(struct irq_work *work) +@@ -222,6 +232,7 @@ static DEFINE_PER_CPU(struct irq_work, nohz_full_kick_work) = { .func = nohz_full_kick_work_func, @@ -24360,7 +24670,7 @@ index 914259128145..b3841ba00c69 100644 }; /* -@@ -578,10 +589,10 @@ static ktime_t tick_nohz_stop_sched_tick(struct tick_sched *ts, +@@ -578,10 +589,10 @@ /* Read jiffies and the time when jiffies were updated last */ do { @@ -24373,7 +24683,7 @@ index 914259128145..b3841ba00c69 100644 if (rcu_needs_cpu(&rcu_delta_jiffies) || arch_needs_cpu() || irq_work_needs_cpu()) { -@@ -759,14 +770,7 @@ static bool can_stop_idle_tick(int cpu, struct tick_sched *ts) +@@ -759,14 +770,7 @@ return false; if (unlikely(local_softirq_pending() && cpu_online(cpu))) { @@ -24389,7 +24699,7 @@ index 914259128145..b3841ba00c69 100644 return false; } -@@ -1154,6 +1158,7 @@ void tick_setup_sched_timer(void) +@@ -1154,6 +1158,7 @@ * Emulate tick processing via per-CPU hrtimers: */ hrtimer_init(&ts->sched_timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS); @@ -24397,11 +24707,10 @@ index 914259128145..b3841ba00c69 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 d9f112bd42a7..7713b181ccfa 100644 ---- a/kernel/time/timekeeping.c -+++ b/kernel/time/timekeeping.c -@@ -2087,8 +2087,10 @@ EXPORT_SYMBOL(hardpps); +diff -Nur linux-4.1.39.orig/kernel/time/timekeeping.c linux-4.1.39/kernel/time/timekeeping.c +--- linux-4.1.39.orig/kernel/time/timekeeping.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/time/timekeeping.c 2017-04-18 17:56:30.641398216 +0200 +@@ -2087,8 +2087,10 @@ */ void xtime_update(unsigned long ticks) { @@ -24414,11 +24723,10 @@ index d9f112bd42a7..7713b181ccfa 100644 + raw_spin_unlock(&jiffies_lock); update_wall_time(); } -diff --git a/kernel/time/timekeeping.h b/kernel/time/timekeeping.h -index ead8794b9a4e..d7a9120a9f52 100644 ---- a/kernel/time/timekeeping.h -+++ b/kernel/time/timekeeping.h -@@ -22,7 +22,8 @@ extern void timekeeping_resume(void); +diff -Nur linux-4.1.39.orig/kernel/time/timekeeping.h linux-4.1.39/kernel/time/timekeeping.h +--- linux-4.1.39.orig/kernel/time/timekeeping.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/time/timekeeping.h 2017-04-18 17:56:30.641398216 +0200 +@@ -22,7 +22,8 @@ extern void do_timer(unsigned long ticks); extern void update_wall_time(void); @@ -24428,11 +24736,10 @@ index ead8794b9a4e..d7a9120a9f52 100644 #define CS_NAME_LEN 32 -diff --git a/kernel/time/timer.c b/kernel/time/timer.c -index 2ece3aa5069c..b1f9e6c5bec4 100644 ---- a/kernel/time/timer.c -+++ b/kernel/time/timer.c -@@ -78,6 +78,9 @@ struct tvec_root { +diff -Nur linux-4.1.39.orig/kernel/time/timer.c linux-4.1.39/kernel/time/timer.c +--- linux-4.1.39.orig/kernel/time/timer.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/time/timer.c 2017-04-18 17:56:30.641398216 +0200 +@@ -78,6 +78,9 @@ struct tvec_base { spinlock_t lock; struct timer_list *running_timer; @@ -24442,7 +24749,7 @@ index 2ece3aa5069c..b1f9e6c5bec4 100644 unsigned long timer_jiffies; unsigned long next_timer; unsigned long active_timers; -@@ -768,6 +771,36 @@ static struct tvec_base *lock_timer_base(struct timer_list *timer, +@@ -768,6 +771,36 @@ } } @@ -24479,7 +24786,7 @@ index 2ece3aa5069c..b1f9e6c5bec4 100644 static inline int __mod_timer(struct timer_list *timer, unsigned long expires, bool pending_only, int pinned) -@@ -798,14 +831,8 @@ __mod_timer(struct timer_list *timer, unsigned long expires, +@@ -798,14 +831,8 @@ * handler yet has not finished. This also guarantees that * the timer is serialized wrt itself. */ @@ -24496,7 +24803,7 @@ index 2ece3aa5069c..b1f9e6c5bec4 100644 } timer->expires = expires; -@@ -979,6 +1006,29 @@ void add_timer_on(struct timer_list *timer, int cpu) +@@ -979,6 +1006,29 @@ } EXPORT_SYMBOL_GPL(add_timer_on); @@ -24526,7 +24833,7 @@ index 2ece3aa5069c..b1f9e6c5bec4 100644 /** * del_timer - deactive a timer. * @timer: the timer to be deactivated -@@ -1036,7 +1086,7 @@ int try_to_del_timer_sync(struct timer_list *timer) +@@ -1036,7 +1086,7 @@ } EXPORT_SYMBOL(try_to_del_timer_sync); @@ -24535,7 +24842,7 @@ index 2ece3aa5069c..b1f9e6c5bec4 100644 static DEFINE_PER_CPU(struct tvec_base, __tvec_bases); /** -@@ -1098,7 +1148,7 @@ int del_timer_sync(struct timer_list *timer) +@@ -1098,7 +1148,7 @@ int ret = try_to_del_timer_sync(timer); if (ret >= 0) return ret; @@ -24544,7 +24851,7 @@ index 2ece3aa5069c..b1f9e6c5bec4 100644 } } EXPORT_SYMBOL(del_timer_sync); -@@ -1219,16 +1269,18 @@ static inline void __run_timers(struct tvec_base *base) +@@ -1219,16 +1269,18 @@ if (irqsafe) { spin_unlock(&base->lock); call_timer_fn(timer, fn, data); @@ -24564,7 +24871,7 @@ index 2ece3aa5069c..b1f9e6c5bec4 100644 } #ifdef CONFIG_NO_HZ_COMMON -@@ -1367,6 +1419,14 @@ unsigned long get_next_timer_interrupt(unsigned long now) +@@ -1367,6 +1419,14 @@ if (cpu_is_offline(smp_processor_id())) return expires; @@ -24579,7 +24886,7 @@ index 2ece3aa5069c..b1f9e6c5bec4 100644 spin_lock(&base->lock); if (base->active_timers) { if (time_before_eq(base->next_timer, base->timer_jiffies)) -@@ -1392,13 +1452,13 @@ void update_process_times(int user_tick) +@@ -1392,13 +1452,13 @@ /* Note: this timer irq context must be accounted for as well. */ account_process_tick(p, user_tick); @@ -24595,7 +24902,7 @@ index 2ece3aa5069c..b1f9e6c5bec4 100644 run_posix_cpu_timers(p); } -@@ -1411,6 +1471,8 @@ static void run_timer_softirq(struct softirq_action *h) +@@ -1411,6 +1471,8 @@ hrtimer_run_pending(); @@ -24604,7 +24911,7 @@ index 2ece3aa5069c..b1f9e6c5bec4 100644 if (time_after_eq(jiffies, base->timer_jiffies)) __run_timers(base); } -@@ -1566,7 +1628,7 @@ static void migrate_timers(int cpu) +@@ -1566,7 +1628,7 @@ BUG_ON(cpu_online(cpu)); old_base = per_cpu(tvec_bases, cpu); @@ -24613,7 +24920,7 @@ index 2ece3aa5069c..b1f9e6c5bec4 100644 /* * The caller is globally serialized and nobody else * takes two locks at once, deadlock is not possible. -@@ -1590,7 +1652,7 @@ static void migrate_timers(int cpu) +@@ -1590,7 +1652,7 @@ spin_unlock(&old_base->lock); spin_unlock_irq(&new_base->lock); @@ -24622,7 +24929,7 @@ index 2ece3aa5069c..b1f9e6c5bec4 100644 } static int timer_cpu_notify(struct notifier_block *self, -@@ -1625,6 +1687,9 @@ static void __init init_timer_cpu(struct tvec_base *base, int cpu) +@@ -1625,6 +1687,9 @@ base->cpu = cpu; per_cpu(tvec_bases, cpu) = base; spin_lock_init(&base->lock); @@ -24632,11 +24939,10 @@ index 2ece3aa5069c..b1f9e6c5bec4 100644 for (j = 0; j < TVN_SIZE; j++) { INIT_LIST_HEAD(base->tv5.vec + j); -diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig -index 3b9a48ae153a..ab3a277a3c20 100644 ---- a/kernel/trace/Kconfig -+++ b/kernel/trace/Kconfig -@@ -187,6 +187,24 @@ config IRQSOFF_TRACER +diff -Nur linux-4.1.39.orig/kernel/trace/Kconfig linux-4.1.39/kernel/trace/Kconfig +--- linux-4.1.39.orig/kernel/trace/Kconfig 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/trace/Kconfig 2017-04-18 17:56:30.641398216 +0200 +@@ -187,6 +187,24 @@ enabled. This option and the preempt-off timing option can be used together or separately.) @@ -24661,7 +24967,7 @@ index 3b9a48ae153a..ab3a277a3c20 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.) @@ -24686,7 +24992,7 @@ index 3b9a48ae153a..ab3a277a3c20 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. @@ -24761,26 +25067,9 @@ index 3b9a48ae153a..ab3a277a3c20 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..b6c1d14b71c4 ---- /dev/null -+++ b/kernel/trace/latency_hist.c +diff -Nur linux-4.1.39.orig/kernel/trace/latency_hist.c linux-4.1.39/kernel/trace/latency_hist.c +--- linux-4.1.39.orig/kernel/trace/latency_hist.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.1.39/kernel/trace/latency_hist.c 2017-04-18 17:56:30.641398216 +0200 @@ -0,0 +1,1178 @@ +/* + * kernel/trace/latency_hist.c @@ -25960,11 +26249,24 @@ index 000000000000..b6c1d14b71c4 +} + +device_initcall(latency_hist_init); -diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c -index 61ea7e8cdde5..af8b5e5469bf 100644 ---- a/kernel/trace/trace.c -+++ b/kernel/trace/trace.c -@@ -1630,6 +1630,7 @@ tracing_generic_entry_update(struct trace_entry *entry, unsigned long flags, +diff -Nur linux-4.1.39.orig/kernel/trace/Makefile linux-4.1.39/kernel/trace/Makefile +--- linux-4.1.39.orig/kernel/trace/Makefile 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/trace/Makefile 2017-04-18 17:56:30.641398216 +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.1.39.orig/kernel/trace/trace.c linux-4.1.39/kernel/trace/trace.c +--- linux-4.1.39.orig/kernel/trace/trace.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/trace/trace.c 2017-04-18 17:56:30.641398216 +0200 +@@ -1630,6 +1630,7 @@ struct task_struct *tsk = current; entry->preempt_count = pc & 0xff; @@ -25972,7 +26274,7 @@ index 61ea7e8cdde5..af8b5e5469bf 100644 entry->pid = (tsk) ? tsk->pid : 0; entry->flags = #ifdef CONFIG_TRACE_IRQFLAGS_SUPPORT -@@ -1639,8 +1640,11 @@ tracing_generic_entry_update(struct trace_entry *entry, unsigned long flags, +@@ -1639,8 +1640,11 @@ #endif ((pc & HARDIRQ_MASK) ? TRACE_FLAG_HARDIRQ : 0) | ((pc & SOFTIRQ_MASK) ? TRACE_FLAG_SOFTIRQ : 0) | @@ -25985,7 +26287,7 @@ index 61ea7e8cdde5..af8b5e5469bf 100644 } EXPORT_SYMBOL_GPL(tracing_generic_entry_update); -@@ -2558,14 +2562,17 @@ get_total_entries(struct trace_buffer *buf, +@@ -2558,14 +2562,17 @@ static void print_lat_help_header(struct seq_file *m) { @@ -25997,21 +26299,21 @@ index 61ea7e8cdde5..af8b5e5469bf 100644 - "# |||| / delay \n" - "# cmd pid ||||| time | caller \n" - "# \\ / ||||| \\ | / \n"); -+ seq_puts(m, "# _--------=> CPU# \n" -+ "# / _-------=> irqs-off \n" -+ "# | / _------=> need-resched \n" -+ "# || / _-----=> need-resched_lazy \n" -+ "# ||| / _----=> hardirq/softirq \n" -+ "# |||| / _---=> preempt-depth \n" -+ "# ||||| / _--=> preempt-lazy-depth\n" -+ "# |||||| / _-=> migrate-disable \n" -+ "# ||||||| / delay \n" -+ "# cmd pid |||||||| time | caller \n" -+ "# \\ / |||||||| \\ | / \n"); ++ seq_puts(m, "# _--------=> CPU# \n" ++ "# / _-------=> irqs-off \n" ++ "# | / _------=> need-resched \n" ++ "# || / _-----=> need-resched_lazy \n" ++ "# ||| / _----=> hardirq/softirq \n" ++ "# |||| / _---=> preempt-depth \n" ++ "# ||||| / _--=> preempt-lazy-depth\n" ++ "# |||||| / _-=> migrate-disable \n" ++ "# ||||||| / delay \n" ++ "# cmd pid |||||||| time | caller \n" ++ "# \\ / |||||||| \\ | / \n"); } static void print_event_info(struct trace_buffer *buf, struct seq_file *m) -@@ -2591,11 +2598,14 @@ static void print_func_help_header_irq(struct trace_buffer *buf, struct seq_file +@@ -2591,11 +2598,14 @@ print_event_info(buf, m); seq_puts(m, "# _-----=> irqs-off\n" "# / _----=> need-resched\n" @@ -26023,39 +26325,18 @@ index 61ea7e8cdde5..af8b5e5469bf 100644 + "# |/ _-----=> need-resched_lazy\n" + "# || / _---=> hardirq/softirq\n" + "# ||| / _--=> preempt-depth\n" -+ "# |||| /_--=> preempt-lazy-depth\n" -+ "# ||||| _-=> migrate-disable \n" -+ "# ||||| / delay\n" -+ "# TASK-PID CPU# |||||| TIMESTAMP FUNCTION\n" -+ "# | | | |||||| | |\n"); ++ "# |||| / _-=> preempt-lazy-depth\n" ++ "# ||||| / _-=> migrate-disable \n" ++ "# |||||| / delay\n" ++ "# TASK-PID CPU# ||||||| TIMESTAMP FUNCTION\n" ++ "# | | | ||||||| | |\n"); } void -diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h -index 921691c5cb04..c0f3c568cac8 100644 ---- a/kernel/trace/trace.h -+++ b/kernel/trace/trace.h -@@ -120,6 +120,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, -@@ -128,6 +129,7 @@ enum trace_flag_type { - TRACE_FLAG_HARDIRQ = 0x08, - TRACE_FLAG_SOFTIRQ = 0x10, - TRACE_FLAG_PREEMPT_RESCHED = 0x20, -+ TRACE_FLAG_NEED_RESCHED_LAZY = 0x40, - }; - - #define TRACE_BUF_SIZE 1024 -diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c -index 6459f77e2c72..b83d6a4d3912 100644 ---- a/kernel/trace/trace_events.c -+++ b/kernel/trace/trace_events.c -@@ -162,6 +162,8 @@ static int trace_define_common_fields(void) +diff -Nur linux-4.1.39.orig/kernel/trace/trace_events.c linux-4.1.39/kernel/trace/trace_events.c +--- linux-4.1.39.orig/kernel/trace/trace_events.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/trace/trace_events.c 2017-04-18 17:56:30.645398372 +0200 +@@ -162,6 +162,8 @@ __common_field(unsigned char, flags); __common_field(unsigned char, preempt_count); __common_field(int, pid); @@ -26064,7 +26345,7 @@ index 6459f77e2c72..b83d6a4d3912 100644 return ret; } -@@ -198,6 +200,14 @@ void *ftrace_event_buffer_reserve(struct ftrace_event_buffer *fbuffer, +@@ -198,6 +200,14 @@ local_save_flags(fbuffer->flags); fbuffer->pc = preempt_count(); @@ -26079,10 +26360,28 @@ index 6459f77e2c72..b83d6a4d3912 100644 fbuffer->ftrace_file = ftrace_file; fbuffer->event = -diff --git a/kernel/trace/trace_irqsoff.c b/kernel/trace/trace_irqsoff.c -index 8523ea345f2b..0f2d3e3545e8 100644 ---- a/kernel/trace/trace_irqsoff.c -+++ b/kernel/trace/trace_irqsoff.c +diff -Nur linux-4.1.39.orig/kernel/trace/trace.h linux-4.1.39/kernel/trace/trace.h +--- linux-4.1.39.orig/kernel/trace/trace.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/trace/trace.h 2017-04-18 17:56:30.641398216 +0200 +@@ -120,6 +120,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, +@@ -128,6 +129,7 @@ + TRACE_FLAG_HARDIRQ = 0x08, + TRACE_FLAG_SOFTIRQ = 0x10, + TRACE_FLAG_PREEMPT_RESCHED = 0x20, ++ TRACE_FLAG_NEED_RESCHED_LAZY = 0x40, + }; + + #define TRACE_BUF_SIZE 1024 +diff -Nur linux-4.1.39.orig/kernel/trace/trace_irqsoff.c linux-4.1.39/kernel/trace/trace_irqsoff.c +--- linux-4.1.39.orig/kernel/trace/trace_irqsoff.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/trace/trace_irqsoff.c 2017-04-18 17:56:30.645398372 +0200 @@ -13,6 +13,7 @@ #include <linux/uaccess.h> #include <linux/module.h> @@ -26091,7 +26390,7 @@ index 8523ea345f2b..0f2d3e3545e8 100644 #include "trace.h" -@@ -433,11 +434,13 @@ void start_critical_timings(void) +@@ -433,11 +434,13 @@ { if (preempt_trace() || irq_trace()) start_critical_timing(CALLER_ADDR0, CALLER_ADDR1); @@ -26105,7 +26404,7 @@ index 8523ea345f2b..0f2d3e3545e8 100644 if (preempt_trace() || irq_trace()) stop_critical_timing(CALLER_ADDR0, CALLER_ADDR1); } -@@ -447,6 +450,7 @@ EXPORT_SYMBOL_GPL(stop_critical_timings); +@@ -447,6 +450,7 @@ #ifdef CONFIG_PROVE_LOCKING void time_hardirqs_on(unsigned long a0, unsigned long a1) { @@ -26113,7 +26412,7 @@ index 8523ea345f2b..0f2d3e3545e8 100644 if (!preempt_trace() && irq_trace()) stop_critical_timing(a0, a1); } -@@ -455,6 +459,7 @@ void time_hardirqs_off(unsigned long a0, unsigned long a1) +@@ -455,6 +459,7 @@ { if (!preempt_trace() && irq_trace()) start_critical_timing(a0, a1); @@ -26121,7 +26420,7 @@ index 8523ea345f2b..0f2d3e3545e8 100644 } #else /* !CONFIG_PROVE_LOCKING */ -@@ -480,6 +485,7 @@ inline void print_irqtrace_events(struct task_struct *curr) +@@ -480,6 +485,7 @@ */ void trace_hardirqs_on(void) { @@ -26129,7 +26428,7 @@ index 8523ea345f2b..0f2d3e3545e8 100644 if (!preempt_trace() && irq_trace()) stop_critical_timing(CALLER_ADDR0, CALLER_ADDR1); } -@@ -489,11 +495,13 @@ void trace_hardirqs_off(void) +@@ -489,11 +495,13 @@ { if (!preempt_trace() && irq_trace()) start_critical_timing(CALLER_ADDR0, CALLER_ADDR1); @@ -26143,7 +26442,7 @@ index 8523ea345f2b..0f2d3e3545e8 100644 if (!preempt_trace() && irq_trace()) stop_critical_timing(CALLER_ADDR0, caller_addr); } -@@ -503,6 +511,7 @@ __visible void trace_hardirqs_off_caller(unsigned long caller_addr) +@@ -503,6 +511,7 @@ { if (!preempt_trace() && irq_trace()) start_critical_timing(CALLER_ADDR0, caller_addr); @@ -26151,7 +26450,7 @@ index 8523ea345f2b..0f2d3e3545e8 100644 } EXPORT_SYMBOL(trace_hardirqs_off_caller); -@@ -512,12 +521,14 @@ EXPORT_SYMBOL(trace_hardirqs_off_caller); +@@ -512,12 +521,14 @@ #ifdef CONFIG_PREEMPT_TRACER void trace_preempt_on(unsigned long a0, unsigned long a1) { @@ -26166,11 +26465,10 @@ index 8523ea345f2b..0f2d3e3545e8 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 25a086bcb700..c86bed27213f 100644 ---- a/kernel/trace/trace_output.c -+++ b/kernel/trace/trace_output.c -@@ -430,6 +430,7 @@ int trace_print_lat_fmt(struct trace_seq *s, struct trace_entry *entry) +diff -Nur linux-4.1.39.orig/kernel/trace/trace_output.c linux-4.1.39/kernel/trace/trace_output.c +--- linux-4.1.39.orig/kernel/trace/trace_output.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/trace/trace_output.c 2017-04-18 17:56:30.645398372 +0200 +@@ -430,6 +430,7 @@ { char hardsoft_irq; char need_resched; @@ -26178,7 +26476,7 @@ index 25a086bcb700..c86bed27213f 100644 char irqs_off; int hardirq; int softirq; -@@ -457,6 +458,8 @@ int trace_print_lat_fmt(struct trace_seq *s, struct trace_entry *entry) +@@ -457,6 +458,8 @@ need_resched = '.'; break; } @@ -26187,7 +26485,7 @@ index 25a086bcb700..c86bed27213f 100644 hardsoft_irq = (hardirq && softirq) ? 'H' : -@@ -464,14 +467,25 @@ int trace_print_lat_fmt(struct trace_seq *s, struct trace_entry *entry) +@@ -464,14 +467,25 @@ softirq ? 's' : '.'; @@ -26215,11 +26513,10 @@ index 25a086bcb700..c86bed27213f 100644 return !trace_seq_has_overflowed(s); } -diff --git a/kernel/trace/trace_sched_switch.c b/kernel/trace/trace_sched_switch.c -index 419ca37e72c9..f270088e9929 100644 ---- a/kernel/trace/trace_sched_switch.c -+++ b/kernel/trace/trace_sched_switch.c -@@ -26,7 +26,7 @@ probe_sched_switch(void *ignore, struct task_struct *prev, struct task_struct *n +diff -Nur linux-4.1.39.orig/kernel/trace/trace_sched_switch.c linux-4.1.39/kernel/trace/trace_sched_switch.c +--- linux-4.1.39.orig/kernel/trace/trace_sched_switch.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/trace/trace_sched_switch.c 2017-04-18 17:56:30.645398372 +0200 +@@ -26,7 +26,7 @@ } static void @@ -26228,11 +26525,10 @@ index 419ca37e72c9..f270088e9929 100644 { if (unlikely(!sched_ref)) return; -diff --git a/kernel/trace/trace_sched_wakeup.c b/kernel/trace/trace_sched_wakeup.c -index d6e1003724e9..79a2a5f7fc82 100644 ---- a/kernel/trace/trace_sched_wakeup.c -+++ b/kernel/trace/trace_sched_wakeup.c -@@ -514,7 +514,7 @@ static void wakeup_reset(struct trace_array *tr) +diff -Nur linux-4.1.39.orig/kernel/trace/trace_sched_wakeup.c linux-4.1.39/kernel/trace/trace_sched_wakeup.c +--- linux-4.1.39.orig/kernel/trace/trace_sched_wakeup.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/trace/trace_sched_wakeup.c 2017-04-18 17:56:30.645398372 +0200 +@@ -514,7 +514,7 @@ } static void @@ -26241,11 +26537,10 @@ index d6e1003724e9..79a2a5f7fc82 100644 { struct trace_array_cpu *data; int cpu = smp_processor_id(); -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.1.39.orig/kernel/user.c linux-4.1.39/kernel/user.c +--- linux-4.1.39.orig/kernel/user.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/user.c 2017-04-18 17:56:30.645398372 +0200 +@@ -161,11 +161,11 @@ if (!up) return; @@ -26259,11 +26554,10 @@ index b069ccbfb0b0..1a2e88e98b5e 100644 } struct user_struct *alloc_uid(kuid_t uid) -diff --git a/kernel/watchdog.c b/kernel/watchdog.c -index f89ea713213f..37dd3a5bf53f 100644 ---- a/kernel/watchdog.c -+++ b/kernel/watchdog.c -@@ -262,6 +262,8 @@ static int is_softlockup(unsigned long touch_ts) +diff -Nur linux-4.1.39.orig/kernel/watchdog.c linux-4.1.39/kernel/watchdog.c +--- linux-4.1.39.orig/kernel/watchdog.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/watchdog.c 2017-04-18 17:56:30.645398372 +0200 +@@ -262,6 +262,8 @@ #ifdef CONFIG_HARDLOCKUP_DETECTOR @@ -26272,7 +26566,7 @@ index f89ea713213f..37dd3a5bf53f 100644 static struct perf_event_attr wd_hw_attr = { .type = PERF_TYPE_HARDWARE, .config = PERF_COUNT_HW_CPU_CYCLES, -@@ -295,13 +297,21 @@ static void watchdog_overflow_callback(struct perf_event *event, +@@ -295,13 +297,21 @@ /* only print hardlockups once */ if (__this_cpu_read(hard_watchdog_warn) == true) return; @@ -26296,7 +26590,7 @@ index f89ea713213f..37dd3a5bf53f 100644 __this_cpu_write(hard_watchdog_warn, true); return; -@@ -444,6 +454,7 @@ static void watchdog_enable(unsigned int cpu) +@@ -444,6 +454,7 @@ /* kick off the timer for the hardlockup detector */ hrtimer_init(hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); hrtimer->function = watchdog_timer_fn; @@ -26304,10 +26598,9 @@ index f89ea713213f..37dd3a5bf53f 100644 /* Enable the perf event */ watchdog_nmi_enable(cpu); -diff --git a/kernel/workqueue.c b/kernel/workqueue.c -index d0efe9295a0e..80f3bb082136 100644 ---- a/kernel/workqueue.c -+++ b/kernel/workqueue.c +diff -Nur linux-4.1.39.orig/kernel/workqueue.c linux-4.1.39/kernel/workqueue.c +--- linux-4.1.39.orig/kernel/workqueue.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/workqueue.c 2017-04-18 17:56:30.645398372 +0200 @@ -48,6 +48,8 @@ #include <linux/nodemask.h> #include <linux/moduleparam.h> @@ -26317,7 +26610,7 @@ index d0efe9295a0e..80f3bb082136 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. * @@ -26335,7 +26628,7 @@ index d0efe9295a0e..80f3bb082136 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. * @@ -26344,7 +26637,7 @@ index d0efe9295a0e..80f3bb082136 100644 * * MD: wq_mayday_lock protected. */ -@@ -183,7 +190,7 @@ struct worker_pool { +@@ -183,7 +190,7 @@ atomic_t nr_running ____cacheline_aligned_in_smp; /* @@ -26353,7 +26646,7 @@ index d0efe9295a0e..80f3bb082136 100644 * from get_work_pool(). */ struct rcu_head rcu; -@@ -212,7 +219,7 @@ struct pool_workqueue { +@@ -212,7 +219,7 @@ /* * Release of unbound pwq is punted to system_wq. See put_pwq() * and pwq_unbound_release_workfn() for details. pool_workqueue @@ -26362,7 +26655,7 @@ index d0efe9295a0e..80f3bb082136 100644 * determined without grabbing wq->mutex. */ struct work_struct unbound_release_work; -@@ -334,6 +341,8 @@ EXPORT_SYMBOL_GPL(system_power_efficient_wq); +@@ -334,6 +341,8 @@ struct workqueue_struct *system_freezable_power_efficient_wq __read_mostly; EXPORT_SYMBOL_GPL(system_freezable_power_efficient_wq); @@ -26371,7 +26664,7 @@ index d0efe9295a0e..80f3bb082136 100644 static int worker_thread(void *__worker); static void copy_workqueue_attrs(struct workqueue_attrs *to, const struct workqueue_attrs *from); -@@ -343,14 +352,14 @@ static void workqueue_sysfs_unregister(struct workqueue_struct *wq); +@@ -343,14 +352,14 @@ #include <trace/events/workqueue.h> #define assert_rcu_or_pool_mutex() \ @@ -26390,7 +26683,7 @@ index d0efe9295a0e..80f3bb082136 100644 #define assert_rcu_or_wq_mutex_or_pool_mutex(wq) \ rcu_lockdep_assert(rcu_read_lock_sched_held() || \ -@@ -368,7 +377,7 @@ static void workqueue_sysfs_unregister(struct workqueue_struct *wq); +@@ -368,7 +377,7 @@ * @pool: iteration cursor * @pi: integer used for iteration * @@ -26399,7 +26692,7 @@ index d0efe9295a0e..80f3bb082136 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. * -@@ -400,7 +409,7 @@ static void workqueue_sysfs_unregister(struct workqueue_struct *wq); +@@ -400,7 +409,7 @@ * @pwq: iteration cursor * @wq: the target workqueue * @@ -26408,7 +26701,7 @@ index d0efe9295a0e..80f3bb082136 100644 * If the pwq needs to be used beyond the locking in effect, the caller is * responsible for guaranteeing that the pwq stays online. * -@@ -412,6 +421,31 @@ static void workqueue_sysfs_unregister(struct workqueue_struct *wq); +@@ -412,6 +421,31 @@ if (({ assert_rcu_or_wq_mutex(wq); false; })) { } \ else @@ -26440,7 +26733,7 @@ index d0efe9295a0e..80f3bb082136 100644 #ifdef CONFIG_DEBUG_OBJECTS_WORK static struct debug_obj_descr work_debug_descr; -@@ -562,8 +596,7 @@ static int worker_pool_assign_id(struct worker_pool *pool) +@@ -562,8 +596,7 @@ * @wq: the target workqueue * @node: the node ID * @@ -26450,7 +26743,7 @@ index d0efe9295a0e..80f3bb082136 100644 * If the pwq needs to be used beyond the locking in effect, the caller is * responsible for guaranteeing that the pwq stays online. * -@@ -706,8 +739,8 @@ static struct pool_workqueue *get_work_pwq(struct work_struct *work) +@@ -706,8 +739,8 @@ * @work: the work item of interest * * Pools are created and destroyed under wq_pool_mutex, and allows read @@ -26461,7 +26754,7 @@ index d0efe9295a0e..80f3bb082136 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 -@@ -844,51 +877,44 @@ static struct worker *first_idle_worker(struct worker_pool *pool) +@@ -844,51 +877,44 @@ */ static void wake_up_worker(struct worker_pool *pool) { @@ -26532,7 +26825,7 @@ index d0efe9295a0e..80f3bb082136 100644 struct worker_pool *pool; /* -@@ -897,29 +923,26 @@ struct task_struct *wq_worker_sleeping(struct task_struct *task, int cpu) +@@ -897,29 +923,26 @@ * checking NOT_RUNNING. */ if (worker->flags & WORKER_NOT_RUNNING) @@ -26572,7 +26865,7 @@ index d0efe9295a0e..80f3bb082136 100644 } /** -@@ -1113,12 +1136,12 @@ static void put_pwq_unlocked(struct pool_workqueue *pwq) +@@ -1113,12 +1136,14 @@ { if (pwq) { /* @@ -26581,14 +26874,16 @@ index d0efe9295a0e..80f3bb082136 100644 * following lock operations are safe. */ - spin_lock_irq(&pwq->pool->lock); ++ rcu_read_lock(); + local_spin_lock_irq(pendingb_lock, &pwq->pool->lock); put_pwq(pwq); - spin_unlock_irq(&pwq->pool->lock); + local_spin_unlock_irq(pendingb_lock, &pwq->pool->lock); ++ rcu_read_unlock(); } } -@@ -1220,7 +1243,7 @@ static int try_to_grab_pending(struct work_struct *work, bool is_dwork, +@@ -1220,7 +1245,7 @@ struct worker_pool *pool; struct pool_workqueue *pwq; @@ -26597,7 +26892,7 @@ index d0efe9295a0e..80f3bb082136 100644 /* try to steal the timer if it exists */ if (is_dwork) { -@@ -1239,6 +1262,7 @@ static int try_to_grab_pending(struct work_struct *work, bool is_dwork, +@@ -1239,6 +1264,7 @@ if (!test_and_set_bit(WORK_STRUCT_PENDING_BIT, work_data_bits(work))) return 0; @@ -26605,7 +26900,7 @@ index d0efe9295a0e..80f3bb082136 100644 /* * The queueing is in progress, or it is already queued. Try to * steal it from ->worklist without clearing WORK_STRUCT_PENDING. -@@ -1277,14 +1301,16 @@ static int try_to_grab_pending(struct work_struct *work, bool is_dwork, +@@ -1277,14 +1303,16 @@ set_work_pool_and_keep_pending(work, pool->id); spin_unlock(&pool->lock); @@ -26624,7 +26919,7 @@ index d0efe9295a0e..80f3bb082136 100644 return -EAGAIN; } -@@ -1353,7 +1379,7 @@ static void __queue_work(int cpu, struct workqueue_struct *wq, +@@ -1353,7 +1381,7 @@ * queued or lose PENDING. Grabbing PENDING and queueing should * happen with IRQ disabled. */ @@ -26633,7 +26928,7 @@ index d0efe9295a0e..80f3bb082136 100644 debug_work_activate(work); -@@ -1361,6 +1387,8 @@ static void __queue_work(int cpu, struct workqueue_struct *wq, +@@ -1361,6 +1389,8 @@ if (unlikely(wq->flags & __WQ_DRAINING) && WARN_ON_ONCE(!is_chained_work(wq))) return; @@ -26642,7 +26937,7 @@ index d0efe9295a0e..80f3bb082136 100644 retry: if (req_cpu == WORK_CPU_UNBOUND) cpu = raw_smp_processor_id(); -@@ -1417,10 +1445,8 @@ retry: +@@ -1417,10 +1447,8 @@ /* pwq determined, queue */ trace_workqueue_queue_work(req_cpu, pwq, work); @@ -26655,7 +26950,7 @@ index d0efe9295a0e..80f3bb082136 100644 pwq->nr_in_flight[pwq->work_color]++; work_flags = work_color_to_flags(pwq->work_color); -@@ -1436,7 +1462,9 @@ retry: +@@ -1436,7 +1464,9 @@ insert_work(pwq, work, worklist, work_flags); @@ -26665,7 +26960,7 @@ index d0efe9295a0e..80f3bb082136 100644 } /** -@@ -1456,14 +1484,14 @@ bool queue_work_on(int cpu, struct workqueue_struct *wq, +@@ -1456,14 +1486,14 @@ bool ret = false; unsigned long flags; @@ -26682,7 +26977,7 @@ index d0efe9295a0e..80f3bb082136 100644 return ret; } EXPORT_SYMBOL(queue_work_on); -@@ -1530,14 +1558,14 @@ bool queue_delayed_work_on(int cpu, struct workqueue_struct *wq, +@@ -1530,14 +1560,14 @@ unsigned long flags; /* read the comment in __queue_work() */ @@ -26699,7 +26994,7 @@ index d0efe9295a0e..80f3bb082136 100644 return ret; } EXPORT_SYMBOL(queue_delayed_work_on); -@@ -1572,7 +1600,7 @@ bool mod_delayed_work_on(int cpu, struct workqueue_struct *wq, +@@ -1572,7 +1602,7 @@ if (likely(ret >= 0)) { __queue_delayed_work(cpu, wq, dwork, delay); @@ -26708,7 +27003,7 @@ index d0efe9295a0e..80f3bb082136 100644 } /* -ENOENT from try_to_grab_pending() becomes %true */ -@@ -1605,7 +1633,9 @@ static void worker_enter_idle(struct worker *worker) +@@ -1605,7 +1635,9 @@ worker->last_active = jiffies; /* idle_list is LIFO */ @@ -26718,7 +27013,7 @@ index d0efe9295a0e..80f3bb082136 100644 if (too_many_workers(pool) && !timer_pending(&pool->idle_timer)) mod_timer(&pool->idle_timer, jiffies + IDLE_WORKER_TIMEOUT); -@@ -1638,7 +1668,9 @@ static void worker_leave_idle(struct worker *worker) +@@ -1638,7 +1670,9 @@ return; worker_clr_flags(worker, WORKER_IDLE); pool->nr_idle--; @@ -26728,7 +27023,7 @@ index d0efe9295a0e..80f3bb082136 100644 } static struct worker *alloc_worker(int node) -@@ -1806,7 +1838,9 @@ static void destroy_worker(struct worker *worker) +@@ -1806,7 +1840,9 @@ pool->nr_workers--; pool->nr_idle--; @@ -26738,7 +27033,7 @@ index d0efe9295a0e..80f3bb082136 100644 worker->flags |= WORKER_DIE; wake_up_process(worker->task); } -@@ -2723,14 +2757,14 @@ static bool start_flush_work(struct work_struct *work, struct wq_barrier *barr) +@@ -2723,14 +2759,14 @@ might_sleep(); @@ -26756,7 +27051,7 @@ index d0efe9295a0e..80f3bb082136 100644 /* see the comment in try_to_grab_pending() with the same code */ pwq = get_work_pwq(work); if (pwq) { -@@ -2757,10 +2791,11 @@ static bool start_flush_work(struct work_struct *work, struct wq_barrier *barr) +@@ -2757,10 +2793,11 @@ else lock_map_acquire_read(&pwq->wq->lockdep_map); lock_map_release(&pwq->wq->lockdep_map); @@ -26769,7 +27064,7 @@ index d0efe9295a0e..80f3bb082136 100644 return false; } -@@ -2847,7 +2882,7 @@ static bool __cancel_work_timer(struct work_struct *work, bool is_dwork) +@@ -2847,7 +2884,7 @@ /* tell other tasks trying to grab @work to back off */ mark_work_canceling(work); @@ -26778,7 +27073,7 @@ index d0efe9295a0e..80f3bb082136 100644 flush_work(work); clear_work_data(work); -@@ -2902,10 +2937,10 @@ EXPORT_SYMBOL_GPL(cancel_work_sync); +@@ -2902,10 +2939,10 @@ */ bool flush_delayed_work(struct delayed_work *dwork) { @@ -26791,7 +27086,7 @@ index d0efe9295a0e..80f3bb082136 100644 return flush_work(&dwork->work); } EXPORT_SYMBOL(flush_delayed_work); -@@ -2940,7 +2975,7 @@ bool cancel_delayed_work(struct delayed_work *dwork) +@@ -2940,7 +2977,7 @@ set_work_pool_and_clear_pending(&dwork->work, get_work_pool_id(&dwork->work)); @@ -26800,7 +27095,7 @@ index d0efe9295a0e..80f3bb082136 100644 return ret; } EXPORT_SYMBOL(cancel_delayed_work); -@@ -3198,7 +3233,7 @@ static void rcu_free_pool(struct rcu_head *rcu) +@@ -3198,7 +3235,7 @@ * put_unbound_pool - put a worker_pool * @pool: worker_pool to put * @@ -26809,7 +27104,7 @@ index d0efe9295a0e..80f3bb082136 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(). -@@ -3252,8 +3287,8 @@ static void put_unbound_pool(struct worker_pool *pool) +@@ -3252,8 +3289,8 @@ del_timer_sync(&pool->idle_timer); del_timer_sync(&pool->mayday_timer); @@ -26820,7 +27115,7 @@ index d0efe9295a0e..80f3bb082136 100644 } /** -@@ -3358,14 +3393,14 @@ static void pwq_unbound_release_workfn(struct work_struct *work) +@@ -3358,14 +3395,14 @@ put_unbound_pool(pool); mutex_unlock(&wq_pool_mutex); @@ -26837,7 +27132,7 @@ index d0efe9295a0e..80f3bb082136 100644 } /** -@@ -4003,7 +4038,7 @@ void destroy_workqueue(struct workqueue_struct *wq) +@@ -4003,7 +4040,7 @@ * The base ref is never dropped on per-cpu pwqs. Directly * schedule RCU free. */ @@ -26846,7 +27141,7 @@ index d0efe9295a0e..80f3bb082136 100644 } else { /* * We're the sole accessor of @wq at this point. Directly -@@ -4096,7 +4131,8 @@ bool workqueue_congested(int cpu, struct workqueue_struct *wq) +@@ -4096,7 +4133,8 @@ struct pool_workqueue *pwq; bool ret; @@ -26856,7 +27151,7 @@ index d0efe9295a0e..80f3bb082136 100644 if (cpu == WORK_CPU_UNBOUND) cpu = smp_processor_id(); -@@ -4107,7 +4143,8 @@ bool workqueue_congested(int cpu, struct workqueue_struct *wq) +@@ -4107,7 +4145,8 @@ pwq = unbound_pwq_by_node(wq, cpu_to_node(cpu)); ret = !list_empty(&pwq->delayed_works); @@ -26866,7 +27161,7 @@ index d0efe9295a0e..80f3bb082136 100644 return ret; } -@@ -4133,15 +4170,15 @@ unsigned int work_busy(struct work_struct *work) +@@ -4133,15 +4172,15 @@ if (work_pending(work)) ret |= WORK_BUSY_PENDING; @@ -26886,7 +27181,7 @@ index d0efe9295a0e..80f3bb082136 100644 return ret; } -@@ -4330,7 +4367,7 @@ void show_workqueue_state(void) +@@ -4330,7 +4369,7 @@ unsigned long flags; int pi; @@ -26895,7 +27190,7 @@ index d0efe9295a0e..80f3bb082136 100644 pr_info("Showing busy workqueues and worker pools:\n"); -@@ -4381,7 +4418,7 @@ void show_workqueue_state(void) +@@ -4381,7 +4420,7 @@ spin_unlock_irqrestore(&pool->lock, flags); } @@ -26904,7 +27199,7 @@ index d0efe9295a0e..80f3bb082136 100644 } /* -@@ -4742,16 +4779,16 @@ bool freeze_workqueues_busy(void) +@@ -4742,16 +4781,16 @@ * nr_active is monotonically decreasing. It's safe * to peek without lock. */ @@ -26924,7 +27219,7 @@ index d0efe9295a0e..80f3bb082136 100644 } out_unlock: mutex_unlock(&wq_pool_mutex); -@@ -4865,7 +4902,8 @@ static ssize_t wq_pool_ids_show(struct device *dev, +@@ -4865,7 +4904,8 @@ const char *delim = ""; int node, written = 0; @@ -26934,7 +27229,7 @@ index d0efe9295a0e..80f3bb082136 100644 for_each_node(node) { written += scnprintf(buf + written, PAGE_SIZE - written, "%s%d:%d", delim, node, -@@ -4873,7 +4911,8 @@ static ssize_t wq_pool_ids_show(struct device *dev, +@@ -4873,7 +4913,8 @@ delim = " "; } written += scnprintf(buf + written, PAGE_SIZE - written, "\n"); @@ -26944,11 +27239,10 @@ index d0efe9295a0e..80f3bb082136 100644 return written; } -diff --git a/kernel/workqueue_internal.h b/kernel/workqueue_internal.h -index 45215870ac6c..f000c4d6917e 100644 ---- a/kernel/workqueue_internal.h -+++ b/kernel/workqueue_internal.h -@@ -43,6 +43,7 @@ struct worker { +diff -Nur linux-4.1.39.orig/kernel/workqueue_internal.h linux-4.1.39/kernel/workqueue_internal.h +--- linux-4.1.39.orig/kernel/workqueue_internal.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/kernel/workqueue_internal.h 2017-04-18 17:56:30.645398372 +0200 +@@ -43,6 +43,7 @@ unsigned long last_active; /* L: last active timestamp */ unsigned int flags; /* X: flags */ int id; /* I: worker id */ @@ -26956,7 +27250,7 @@ index 45215870ac6c..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. */ @@ -26966,23 +27260,10 @@ index 45215870ac6c..f000c4d6917e 100644 +void wq_worker_sleeping(struct task_struct *task); #endif /* _KERNEL_WORKQUEUE_INTERNAL_H */ -diff --git a/lib/Kconfig b/lib/Kconfig -index 601965a948e8..8689649d5038 100644 ---- a/lib/Kconfig -+++ b/lib/Kconfig -@@ -391,6 +391,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 547f7f923dbc..8fcdbc2fc6d0 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.1.39.orig/lib/debugobjects.c linux-4.1.39/lib/debugobjects.c +--- linux-4.1.39.orig/lib/debugobjects.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/lib/debugobjects.c 2017-04-18 17:56:30.645398372 +0200 +@@ -309,7 +309,10 @@ struct debug_obj *obj; unsigned long flags; @@ -26994,10 +27275,9 @@ index 547f7f923dbc..8fcdbc2fc6d0 100644 db = get_bucket((unsigned long) addr); -diff --git a/lib/dump_stack.c b/lib/dump_stack.c -index c30d07e99dba..6f2484330b50 100644 ---- a/lib/dump_stack.c -+++ b/lib/dump_stack.c +diff -Nur linux-4.1.39.orig/lib/dump_stack.c linux-4.1.39/lib/dump_stack.c +--- linux-4.1.39.orig/lib/dump_stack.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/lib/dump_stack.c 2017-04-18 17:56:30.645398372 +0200 @@ -8,6 +8,7 @@ #include <linux/sched.h> #include <linux/smp.h> @@ -27006,10 +27286,9 @@ index c30d07e99dba..6f2484330b50 100644 static void __dump_stack(void) { -diff --git a/lib/idr.c b/lib/idr.c -index 5335c43adf46..d0681a357e69 100644 ---- a/lib/idr.c -+++ b/lib/idr.c +diff -Nur linux-4.1.39.orig/lib/idr.c linux-4.1.39/lib/idr.c +--- linux-4.1.39.orig/lib/idr.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/lib/idr.c 2017-04-18 17:56:30.645398372 +0200 @@ -30,6 +30,7 @@ #include <linux/idr.h> #include <linux/spinlock.h> @@ -27018,7 +27297,7 @@ index 5335c43adf46..d0681a357e69 100644 #define MAX_IDR_SHIFT (sizeof(int) * 8 - 1) #define MAX_IDR_BIT (1U << MAX_IDR_SHIFT) -@@ -366,6 +367,35 @@ static void idr_fill_slot(struct idr *idr, void *ptr, int id, +@@ -366,6 +367,35 @@ idr_mark_full(pa, id); } @@ -27054,7 +27333,7 @@ index 5335c43adf46..d0681a357e69 100644 /** * idr_preload - preload for idr_alloc() -@@ -401,7 +431,7 @@ void idr_preload(gfp_t gfp_mask) +@@ -401,7 +431,7 @@ WARN_ON_ONCE(in_interrupt()); might_sleep_if(gfp_mask & __GFP_WAIT); @@ -27063,7 +27342,7 @@ index 5335c43adf46..d0681a357e69 100644 /* * idr_alloc() is likely to succeed w/o full idr_layer buffer and -@@ -413,9 +443,9 @@ void idr_preload(gfp_t gfp_mask) +@@ -413,9 +443,9 @@ while (__this_cpu_read(idr_preload_cnt) < MAX_IDR_FREE) { struct idr_layer *new; @@ -27075,11 +27354,21 @@ index 5335c43adf46..d0681a357e69 100644 if (!new) break; -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.1.39.orig/lib/Kconfig linux-4.1.39/lib/Kconfig +--- linux-4.1.39.orig/lib/Kconfig 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/lib/Kconfig 2017-04-18 17:56:30.645398372 +0200 +@@ -391,6 +391,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.1.39.orig/lib/locking-selftest.c linux-4.1.39/lib/locking-selftest.c +--- linux-4.1.39.orig/lib/locking-selftest.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/lib/locking-selftest.c 2017-04-18 17:56:30.645398372 +0200 +@@ -590,6 +590,8 @@ #include "locking-selftest-spin-hardirq.h" GENERATE_PERMUTATIONS_2_EVENTS(irqsafe1_hard_spin) @@ -27088,7 +27377,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) @@ -27101,7 +27390,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 @@ -27110,7 +27399,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) @@ -27119,7 +27408,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) @@ -27128,7 +27417,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) @@ -27137,7 +27426,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) @@ -27146,7 +27435,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) @@ -27155,7 +27444,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) @@ -27170,7 +27459,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 @@ -27181,7 +27470,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 @@ -27190,7 +27479,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"); @@ -27198,7 +27487,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); @@ -27227,10 +27516,9 @@ index 872a15a2a637..b93a6103fa4d 100644 ww_tests(); -diff --git a/lib/percpu_ida.c b/lib/percpu_ida.c -index f75715131f20..b1529f40865d 100644 ---- a/lib/percpu_ida.c -+++ b/lib/percpu_ida.c +diff -Nur linux-4.1.39.orig/lib/percpu_ida.c linux-4.1.39/lib/percpu_ida.c +--- linux-4.1.39.orig/lib/percpu_ida.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/lib/percpu_ida.c 2017-04-18 17:56:30.645398372 +0200 @@ -26,6 +26,9 @@ #include <linux/string.h> #include <linux/spinlock.h> @@ -27241,7 +27529,7 @@ index f75715131f20..b1529f40865d 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; @@ -27257,7 +27545,7 @@ index f75715131f20..b1529f40865d 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); @@ -27265,7 +27553,7 @@ index f75715131f20..b1529f40865d 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); @@ -27274,7 +27562,7 @@ index f75715131f20..b1529f40865d 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(); @@ -27283,7 +27571,7 @@ index f75715131f20..b1529f40865d 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); @@ -27292,7 +27580,7 @@ index f75715131f20..b1529f40865d 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); } @@ -27301,7 +27589,7 @@ index f75715131f20..b1529f40865d 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; @@ -27310,7 +27598,7 @@ index f75715131f20..b1529f40865d 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: @@ -27319,46 +27607,81 @@ index f75715131f20..b1529f40865d 100644 return err; } EXPORT_SYMBOL_GPL(percpu_ida_for_each_free); -diff --git a/lib/radix-tree.c b/lib/radix-tree.c -index 8399002aa0f0..19713243e698 100644 ---- a/lib/radix-tree.c -+++ b/lib/radix-tree.c -@@ -195,12 +195,13 @@ radix_tree_node_alloc(struct radix_tree_root *root) +diff -Nur linux-4.1.39.orig/lib/radix-tree.c linux-4.1.39/lib/radix-tree.c +--- linux-4.1.39.orig/lib/radix-tree.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/lib/radix-tree.c 2017-04-18 17:56:30.645398372 +0200 +@@ -34,6 +34,7 @@ + #include <linux/bitops.h> + #include <linux/rcupdate.h> + #include <linux/preempt_mask.h> /* in_interrupt() */ ++#include <linux/locallock.h> + + + /* +@@ -68,6 +69,7 @@ + struct radix_tree_node *nodes[RADIX_TREE_PRELOAD_SIZE]; + }; + static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads) = { 0, }; ++static DEFINE_LOCAL_IRQ_LOCK(radix_tree_preloads_lock); + + static inline void *ptr_to_indirect(void *ptr) + { +@@ -195,12 +197,13 @@ * succeed in getting a node here (and never reach * kmem_cache_alloc) */ - rtp = this_cpu_ptr(&radix_tree_preloads); -+ rtp = &get_cpu_var(radix_tree_preloads); ++ rtp = &get_locked_var(radix_tree_preloads_lock, radix_tree_preloads); if (rtp->nr) { ret = rtp->nodes[rtp->nr - 1]; rtp->nodes[rtp->nr - 1] = NULL; rtp->nr--; } -+ put_cpu_var(radix_tree_preloads); ++ put_locked_var(radix_tree_preloads_lock, radix_tree_preloads); /* * Update the allocation stack trace as this is more useful * for debugging. -@@ -240,6 +241,7 @@ radix_tree_node_free(struct radix_tree_node *node) - call_rcu(&node->rcu_head, radix_tree_node_rcu_free); - } +@@ -255,14 +258,14 @@ + struct radix_tree_node *node; + int ret = -ENOMEM; -+#ifndef CONFIG_PREEMPT_RT_FULL - /* - * 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 -@@ -305,6 +307,7 @@ int radix_tree_maybe_preload(gfp_t gfp_mask) +- preempt_disable(); ++ local_lock(radix_tree_preloads_lock); + rtp = this_cpu_ptr(&radix_tree_preloads); + while (rtp->nr < ARRAY_SIZE(rtp->nodes)) { +- preempt_enable(); ++ local_unlock(radix_tree_preloads_lock); + node = kmem_cache_alloc(radix_tree_node_cachep, gfp_mask); + if (node == NULL) + goto out; +- preempt_disable(); ++ local_lock(radix_tree_preloads_lock); + rtp = this_cpu_ptr(&radix_tree_preloads); + if (rtp->nr < ARRAY_SIZE(rtp->nodes)) + rtp->nodes[rtp->nr++] = node; +@@ -301,11 +304,17 @@ + if (gfp_mask & __GFP_WAIT) + return __radix_tree_preload(gfp_mask); + /* Preloading doesn't help anything with this gfp mask, skip it */ +- preempt_disable(); ++ local_lock(radix_tree_preloads_lock); return 0; } EXPORT_SYMBOL(radix_tree_maybe_preload); -+#endif ++void radix_tree_preload_end(void) ++{ ++ local_unlock(radix_tree_preloads_lock); ++} ++EXPORT_SYMBOL(radix_tree_preload_end); ++ /* * Return the maximum key which can be store into a -diff --git a/lib/scatterlist.c b/lib/scatterlist.c -index c9f2e8c6ccc9..f6d1f8899dca 100644 ---- a/lib/scatterlist.c -+++ b/lib/scatterlist.c -@@ -592,7 +592,7 @@ void sg_miter_stop(struct sg_mapping_iter *miter) + * radix tree with height HEIGHT. +diff -Nur linux-4.1.39.orig/lib/scatterlist.c linux-4.1.39/lib/scatterlist.c +--- linux-4.1.39.orig/lib/scatterlist.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/lib/scatterlist.c 2017-04-18 17:56:30.645398372 +0200 +@@ -592,7 +592,7 @@ flush_kernel_dcache_page(miter->page); if (miter->__flags & SG_MITER_ATOMIC) { @@ -27367,7 +27690,7 @@ index c9f2e8c6ccc9..f6d1f8899dca 100644 kunmap_atomic(miter->addr); } else kunmap(miter->page); -@@ -637,7 +637,7 @@ static size_t sg_copy_buffer(struct scatterlist *sgl, unsigned int nents, +@@ -637,7 +637,7 @@ if (!sg_miter_skip(&miter, skip)) return false; @@ -27376,7 +27699,7 @@ index c9f2e8c6ccc9..f6d1f8899dca 100644 while (sg_miter_next(&miter) && offset < buflen) { unsigned int len; -@@ -654,7 +654,7 @@ static size_t sg_copy_buffer(struct scatterlist *sgl, unsigned int nents, +@@ -654,7 +654,7 @@ sg_miter_stop(&miter); @@ -27385,11 +27708,10 @@ index c9f2e8c6ccc9..f6d1f8899dca 100644 return offset; } -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.1.39.orig/lib/smp_processor_id.c linux-4.1.39/lib/smp_processor_id.c +--- linux-4.1.39.orig/lib/smp_processor_id.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/lib/smp_processor_id.c 2017-04-18 17:56:30.645398372 +0200 +@@ -39,8 +39,9 @@ if (!printk_ratelimit()) goto out_enable; @@ -27401,11 +27723,10 @@ index 1afec32de6f2..11fa431046a8 100644 print_symbol("caller is %s\n", (long)__builtin_return_address(0)); dump_stack(); -diff --git a/lib/strnlen_user.c b/lib/strnlen_user.c -index fe9a32591c24..3a5f2b366d84 100644 ---- a/lib/strnlen_user.c -+++ b/lib/strnlen_user.c -@@ -85,7 +85,8 @@ static inline long do_strnlen_user(const char __user *src, unsigned long count, +diff -Nur linux-4.1.39.orig/lib/strnlen_user.c linux-4.1.39/lib/strnlen_user.c +--- linux-4.1.39.orig/lib/strnlen_user.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/lib/strnlen_user.c 2017-04-18 17:56:30.649398527 +0200 +@@ -85,7 +85,8 @@ * @str: The string to measure. * @count: Maximum count (including NUL character) * @@ -27415,7 +27736,7 @@ index fe9a32591c24..3a5f2b366d84 100644 * * Get the size of a NUL-terminated string in user space. * -@@ -121,7 +122,8 @@ EXPORT_SYMBOL(strnlen_user); +@@ -121,7 +122,8 @@ * strlen_user: - Get the size of a user string INCLUDING final NUL. * @str: The string to measure. * @@ -27425,24 +27746,22 @@ index fe9a32591c24..3a5f2b366d84 100644 * * Get the size of a NUL-terminated string in user space. * -diff --git a/mm/Kconfig b/mm/Kconfig -index 390214da4546..0cc45370563a 100644 ---- a/mm/Kconfig -+++ b/mm/Kconfig -@@ -409,7 +409,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/compaction.c b/mm/compaction.c -index f93ada7403bf..1504b589905e 100644 ---- a/mm/compaction.c -+++ b/mm/compaction.c -@@ -1423,10 +1423,12 @@ check_drain: +diff -Nur linux-4.1.39.orig/Makefile linux-4.1.39/Makefile +--- linux-4.1.39.orig/Makefile 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/Makefile 2017-04-18 17:56:30.545394493 +0200 +@@ -400,7 +400,7 @@ + KBUILD_CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \ + -fno-strict-aliasing -fno-common \ + -Werror-implicit-function-declaration \ +- -Wno-format-security \ ++ -Wno-format-security -fno-PIE \ + -std=gnu89 + + KBUILD_AFLAGS_KERNEL := +diff -Nur linux-4.1.39.orig/mm/compaction.c linux-4.1.39/mm/compaction.c +--- linux-4.1.39.orig/mm/compaction.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/mm/compaction.c 2017-04-18 17:56:30.649398527 +0200 +@@ -1423,10 +1423,12 @@ cc->migrate_pfn & ~((1UL << cc->order) - 1); if (last_migrated_pfn < current_block_start) { @@ -27457,11 +27776,10 @@ index f93ada7403bf..1504b589905e 100644 /* No more flushing until we migrate again */ last_migrated_pfn = 0; } -diff --git a/mm/filemap.c b/mm/filemap.c -index 1ffef05f1c1f..7d4fa2bf6ac2 100644 ---- a/mm/filemap.c -+++ b/mm/filemap.c -@@ -167,7 +167,9 @@ static void page_cache_tree_delete(struct address_space *mapping, +diff -Nur linux-4.1.39.orig/mm/filemap.c linux-4.1.39/mm/filemap.c +--- linux-4.1.39.orig/mm/filemap.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/mm/filemap.c 2017-04-18 17:56:30.649398527 +0200 +@@ -167,7 +167,9 @@ if (!workingset_node_pages(node) && list_empty(&node->private_list)) { node->private_data = mapping; @@ -27472,7 +27790,7 @@ index 1ffef05f1c1f..7d4fa2bf6ac2 100644 } } -@@ -533,9 +535,12 @@ static int page_cache_tree_insert(struct address_space *mapping, +@@ -533,9 +535,12 @@ * node->private_list is protected by * mapping->tree_lock. */ @@ -27487,10 +27805,9 @@ index 1ffef05f1c1f..7d4fa2bf6ac2 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.1.39.orig/mm/highmem.c linux-4.1.39/mm/highmem.c +--- linux-4.1.39.orig/mm/highmem.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/mm/highmem.c 2017-04-18 17:56:30.649398527 +0200 @@ -29,10 +29,11 @@ #include <linux/kgdb.h> #include <asm/tlbflush.h> @@ -27504,7 +27821,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); @@ -27515,10 +27832,21 @@ index 123bcd3ed4f2..16e8cf26d38a 100644 unsigned int nr_free_highpages (void) { -diff --git a/mm/memcontrol.c b/mm/memcontrol.c -index 221762e24a68..cefa875a4320 100644 ---- a/mm/memcontrol.c -+++ b/mm/memcontrol.c +diff -Nur linux-4.1.39.orig/mm/Kconfig linux-4.1.39/mm/Kconfig +--- linux-4.1.39.orig/mm/Kconfig 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/mm/Kconfig 2017-04-18 17:56:30.649398527 +0200 +@@ -409,7 +409,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.1.39.orig/mm/memcontrol.c linux-4.1.39/mm/memcontrol.c +--- linux-4.1.39.orig/mm/memcontrol.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/mm/memcontrol.c 2017-04-18 17:56:30.649398527 +0200 @@ -66,6 +66,8 @@ #include <net/sock.h> #include <net/ip.h> @@ -27528,7 +27856,7 @@ index 221762e24a68..cefa875a4320 100644 #include "slab.h" #include <asm/uaccess.h> -@@ -85,6 +87,7 @@ int do_swap_account __read_mostly; +@@ -85,6 +87,7 @@ #define do_swap_account 0 #endif @@ -27536,7 +27864,7 @@ index 221762e24a68..cefa875a4320 100644 static const char * const mem_cgroup_stat_names[] = { "cache", "rss", -@@ -2124,14 +2127,17 @@ static void drain_local_stock(struct work_struct *dummy) +@@ -2124,14 +2127,17 @@ */ static void refill_stock(struct mem_cgroup *memcg, unsigned int nr_pages) { @@ -27556,7 +27884,7 @@ index 221762e24a68..cefa875a4320 100644 } /* -@@ -2147,7 +2153,7 @@ static void drain_all_stock(struct mem_cgroup *root_memcg) +@@ -2147,7 +2153,7 @@ return; /* Notify other cpus that system-wide "drain" is running */ get_online_cpus(); @@ -27565,7 +27893,7 @@ index 221762e24a68..cefa875a4320 100644 for_each_online_cpu(cpu) { struct memcg_stock_pcp *stock = &per_cpu(memcg_stock, cpu); struct mem_cgroup *memcg; -@@ -2164,7 +2170,7 @@ static void drain_all_stock(struct mem_cgroup *root_memcg) +@@ -2164,7 +2170,7 @@ schedule_work_on(cpu, &stock->work); } } @@ -27574,7 +27902,7 @@ index 221762e24a68..cefa875a4320 100644 put_online_cpus(); mutex_unlock(&percpu_charge_mutex); } -@@ -4803,12 +4809,12 @@ static int mem_cgroup_move_account(struct page *page, +@@ -4803,12 +4809,12 @@ ret = 0; @@ -27589,7 +27917,7 @@ index 221762e24a68..cefa875a4320 100644 out_unlock: unlock_page(page); out: -@@ -5551,10 +5557,10 @@ void mem_cgroup_commit_charge(struct page *page, struct mem_cgroup *memcg, +@@ -5551,10 +5557,10 @@ VM_BUG_ON_PAGE(!PageTransHuge(page), page); } @@ -27602,7 +27930,7 @@ index 221762e24a68..cefa875a4320 100644 if (do_swap_account && PageSwapCache(page)) { swp_entry_t entry = { .val = page_private(page) }; -@@ -5610,14 +5616,14 @@ static void uncharge_batch(struct mem_cgroup *memcg, unsigned long pgpgout, +@@ -5610,14 +5616,14 @@ memcg_oom_recover(memcg); } @@ -27619,7 +27947,7 @@ index 221762e24a68..cefa875a4320 100644 if (!mem_cgroup_is_root(memcg)) css_put_many(&memcg->css, nr_pages); -@@ -5821,6 +5827,7 @@ void mem_cgroup_swapout(struct page *page, swp_entry_t entry) +@@ -5821,6 +5827,7 @@ { struct mem_cgroup *memcg; unsigned short oldid; @@ -27627,7 +27955,7 @@ index 221762e24a68..cefa875a4320 100644 VM_BUG_ON_PAGE(PageLRU(page), page); VM_BUG_ON_PAGE(page_count(page), page); -@@ -5843,9 +5850,11 @@ void mem_cgroup_swapout(struct page *page, swp_entry_t entry) +@@ -5843,9 +5850,11 @@ if (!mem_cgroup_is_root(memcg)) page_counter_uncharge(&memcg->memory, 1); @@ -27639,11 +27967,10 @@ index 221762e24a68..cefa875a4320 100644 } /** -diff --git a/mm/memory.c b/mm/memory.c -index 701d9ad45c46..3456e24cce4f 100644 ---- a/mm/memory.c -+++ b/mm/memory.c -@@ -3753,7 +3753,7 @@ void print_vma_addr(char *prefix, unsigned long ip) +diff -Nur linux-4.1.39.orig/mm/memory.c linux-4.1.39/mm/memory.c +--- linux-4.1.39.orig/mm/memory.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/mm/memory.c 2017-04-18 17:56:30.649398527 +0200 +@@ -3753,7 +3753,7 @@ } #if defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_DEBUG_ATOMIC_SLEEP) @@ -27652,7 +27979,7 @@ index 701d9ad45c46..3456e24cce4f 100644 { /* * Some code (nfs/sunrpc) uses socket ops on kernel memory while -@@ -3763,21 +3763,15 @@ void might_fault(void) +@@ -3763,21 +3763,15 @@ */ if (segment_eq(get_fs(), KERNEL_DS)) return; @@ -27679,11 +28006,10 @@ index 701d9ad45c46..3456e24cce4f 100644 #endif #if defined(CONFIG_TRANSPARENT_HUGEPAGE) || defined(CONFIG_HUGETLBFS) -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.1.39.orig/mm/mmu_context.c linux-4.1.39/mm/mmu_context.c +--- linux-4.1.39.orig/mm/mmu_context.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/mm/mmu_context.c 2017-04-18 17:56:30.649398527 +0200 +@@ -23,6 +23,7 @@ struct task_struct *tsk = current; task_lock(tsk); @@ -27691,7 +28017,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); @@ -27699,10 +28025,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 f6f6831cec52..c6f829a374c1 100644 ---- a/mm/page_alloc.c -+++ b/mm/page_alloc.c +diff -Nur linux-4.1.39.orig/mm/page_alloc.c linux-4.1.39/mm/page_alloc.c +--- linux-4.1.39.orig/mm/page_alloc.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/mm/page_alloc.c 2017-04-18 17:56:30.649398527 +0200 @@ -60,6 +60,7 @@ #include <linux/page_ext.h> #include <linux/hugetlb.h> @@ -27711,7 +28036,7 @@ index f6f6831cec52..c6f829a374c1 100644 #include <linux/page_owner.h> #include <asm/sections.h> -@@ -233,6 +234,18 @@ EXPORT_SYMBOL(nr_node_ids); +@@ -233,6 +234,18 @@ EXPORT_SYMBOL(nr_online_nodes); #endif @@ -27730,7 +28055,7 @@ index f6f6831cec52..c6f829a374c1 100644 int page_group_by_mobility_disabled __read_mostly; void set_pageblock_migratetype(struct page *page, int migratetype) -@@ -701,7 +714,7 @@ static inline int free_pages_check(struct page *page) +@@ -701,7 +714,7 @@ } /* @@ -27739,7 +28064,7 @@ index f6f6831cec52..c6f829a374c1 100644 * Assumes all pages on list are in same zone, and of same order. * count is the number of pages to free. * -@@ -712,18 +725,51 @@ static inline int free_pages_check(struct page *page) +@@ -712,18 +725,51 @@ * pinned" detection logic. */ static void free_pcppages_bulk(struct zone *zone, int count, @@ -27795,7 +28120,7 @@ index f6f6831cec52..c6f829a374c1 100644 while (to_free) { struct page *page; struct list_head *list; -@@ -739,7 +785,7 @@ static void free_pcppages_bulk(struct zone *zone, int count, +@@ -739,7 +785,7 @@ batch_free++; if (++migratetype == MIGRATE_PCPTYPES) migratetype = 0; @@ -27804,7 +28129,7 @@ index f6f6831cec52..c6f829a374c1 100644 } while (list_empty(list)); /* This is the only non-empty list. Free them all. */ -@@ -747,21 +793,11 @@ static void free_pcppages_bulk(struct zone *zone, int count, +@@ -747,21 +793,11 @@ batch_free = to_free; do { @@ -27828,7 +28153,7 @@ index f6f6831cec52..c6f829a374c1 100644 } static void free_one_page(struct zone *zone, -@@ -770,7 +806,9 @@ static void free_one_page(struct zone *zone, +@@ -770,7 +806,9 @@ int migratetype) { unsigned long nr_scanned; @@ -27839,7 +28164,7 @@ index f6f6831cec52..c6f829a374c1 100644 nr_scanned = zone_page_state(zone, NR_PAGES_SCANNED); if (nr_scanned) __mod_zone_page_state(zone, NR_PAGES_SCANNED, -nr_scanned); -@@ -780,7 +818,7 @@ static void free_one_page(struct zone *zone, +@@ -780,7 +818,7 @@ migratetype = get_pfnblock_migratetype(page, pfn); } __free_one_page(page, pfn, zone, order, migratetype); @@ -27848,7 +28173,7 @@ index f6f6831cec52..c6f829a374c1 100644 } static int free_tail_pages_check(struct page *head_page, struct page *page) -@@ -845,11 +883,11 @@ static void __free_pages_ok(struct page *page, unsigned int order) +@@ -845,11 +883,11 @@ return; migratetype = get_pfnblock_migratetype(page, pfn); @@ -27862,7 +28187,7 @@ index f6f6831cec52..c6f829a374c1 100644 } void __init __free_pages_bootmem(struct page *page, unsigned long pfn, -@@ -1396,16 +1434,18 @@ static int rmqueue_bulk(struct zone *zone, unsigned int order, +@@ -1396,16 +1434,18 @@ void drain_zone_pages(struct zone *zone, struct per_cpu_pages *pcp) { unsigned long flags; @@ -27884,7 +28209,7 @@ index f6f6831cec52..c6f829a374c1 100644 } #endif -@@ -1421,16 +1461,21 @@ static void drain_pages_zone(unsigned int cpu, struct zone *zone) +@@ -1421,16 +1461,21 @@ unsigned long flags; struct per_cpu_pageset *pset; struct per_cpu_pages *pcp; @@ -27910,7 +28235,7 @@ index f6f6831cec52..c6f829a374c1 100644 } /* -@@ -1516,8 +1561,17 @@ void drain_all_pages(struct zone *zone) +@@ -1516,8 +1561,17 @@ else cpumask_clear_cpu(cpu, &cpus_with_pcps); } @@ -27928,7 +28253,7 @@ index f6f6831cec52..c6f829a374c1 100644 } #ifdef CONFIG_HIBERNATION -@@ -1573,7 +1627,7 @@ void free_hot_cold_page(struct page *page, bool cold) +@@ -1573,7 +1627,7 @@ migratetype = get_pfnblock_migratetype(page, pfn); set_freepage_migratetype(page, migratetype); @@ -27937,7 +28262,7 @@ index f6f6831cec52..c6f829a374c1 100644 __count_vm_event(PGFREE); /* -@@ -1599,12 +1653,17 @@ void free_hot_cold_page(struct page *page, bool cold) +@@ -1599,12 +1653,17 @@ pcp->count++; if (pcp->count >= pcp->high) { unsigned long batch = READ_ONCE(pcp->batch); @@ -27957,7 +28282,7 @@ index f6f6831cec52..c6f829a374c1 100644 } /* -@@ -1735,7 +1794,7 @@ struct page *buffered_rmqueue(struct zone *preferred_zone, +@@ -1735,7 +1794,7 @@ struct per_cpu_pages *pcp; struct list_head *list; @@ -27966,7 +28291,7 @@ index f6f6831cec52..c6f829a374c1 100644 pcp = &this_cpu_ptr(zone->pageset)->pcp; list = &pcp->lists[migratetype]; if (list_empty(list)) { -@@ -1767,13 +1826,15 @@ struct page *buffered_rmqueue(struct zone *preferred_zone, +@@ -1767,13 +1826,15 @@ */ WARN_ON_ONCE(order > 1); } @@ -27985,7 +28310,7 @@ index f6f6831cec52..c6f829a374c1 100644 } __mod_zone_page_state(zone, NR_ALLOC_BATCH, -(1 << order)); -@@ -1783,13 +1844,13 @@ struct page *buffered_rmqueue(struct zone *preferred_zone, +@@ -1783,13 +1844,13 @@ __count_zone_vm_events(PGALLOC, zone, 1 << order); zone_statistics(preferred_zone, zone, gfp_flags); @@ -28001,7 +28326,7 @@ index f6f6831cec52..c6f829a374c1 100644 return NULL; } -@@ -5680,6 +5741,7 @@ static int page_alloc_cpu_notify(struct notifier_block *self, +@@ -5680,6 +5741,7 @@ void __init page_alloc_init(void) { hotcpu_notifier(page_alloc_cpu_notify, 0); @@ -28009,7 +28334,7 @@ index f6f6831cec52..c6f829a374c1 100644 } /* -@@ -6575,7 +6637,7 @@ void zone_pcp_reset(struct zone *zone) +@@ -6575,7 +6637,7 @@ struct per_cpu_pageset *pset; /* avoid races with drain_pages() */ @@ -28018,7 +28343,7 @@ index f6f6831cec52..c6f829a374c1 100644 if (zone->pageset != &boot_pageset) { for_each_online_cpu(cpu) { pset = per_cpu_ptr(zone->pageset, cpu); -@@ -6584,7 +6646,7 @@ void zone_pcp_reset(struct zone *zone) +@@ -6584,7 +6646,7 @@ free_percpu(zone->pageset); zone->pageset = &boot_pageset; } @@ -28027,11 +28352,72 @@ index f6f6831cec52..c6f829a374c1 100644 } #ifdef CONFIG_MEMORY_HOTREMOVE -diff --git a/mm/slab.h b/mm/slab.h -index 4c3ac12dd644..0c9bda0eb0c1 100644 ---- a/mm/slab.h -+++ b/mm/slab.h -@@ -330,7 +330,11 @@ static inline struct kmem_cache *cache_from_obj(struct kmem_cache *s, void *x) +diff -Nur linux-4.1.39.orig/mm/percpu.c linux-4.1.39/mm/percpu.c +--- linux-4.1.39.orig/mm/percpu.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/mm/percpu.c 2017-04-18 17:56:30.649398527 +0200 +@@ -1282,18 +1282,7 @@ + } + EXPORT_SYMBOL_GPL(free_percpu); + +-/** +- * is_kernel_percpu_address - test whether address is from static percpu area +- * @addr: address to test +- * +- * Test whether @addr belongs to in-kernel static percpu area. Module +- * static percpu areas are not considered. For those, use +- * is_module_percpu_address(). +- * +- * RETURNS: +- * %true if @addr is from in-kernel static percpu area, %false otherwise. +- */ +-bool is_kernel_percpu_address(unsigned long addr) ++bool __is_kernel_percpu_address(unsigned long addr, unsigned long *can_addr) + { + #ifdef CONFIG_SMP + const size_t static_size = __per_cpu_end - __per_cpu_start; +@@ -1302,16 +1291,36 @@ + + for_each_possible_cpu(cpu) { + void *start = per_cpu_ptr(base, cpu); ++ void *va = (void *)addr; + +- if ((void *)addr >= start && (void *)addr < start + static_size) ++ if (va >= start && va < start + static_size) { ++ if (can_addr) ++ *can_addr = (unsigned long) (va - start); + return true; +- } ++ } ++ } + #endif + /* on UP, can't distinguish from other static vars, always false */ + return false; + } + + /** ++ * is_kernel_percpu_address - test whether address is from static percpu area ++ * @addr: address to test ++ * ++ * Test whether @addr belongs to in-kernel static percpu area. Module ++ * static percpu areas are not considered. For those, use ++ * is_module_percpu_address(). ++ * ++ * RETURNS: ++ * %true if @addr is from in-kernel static percpu area, %false otherwise. ++ */ ++bool is_kernel_percpu_address(unsigned long addr) ++{ ++ return __is_kernel_percpu_address(addr, NULL); ++} ++ ++/** + * per_cpu_ptr_to_phys - convert translated percpu address to physical address + * @addr: the address to be converted to physical address + * +diff -Nur linux-4.1.39.orig/mm/slab.h linux-4.1.39/mm/slab.h +--- linux-4.1.39.orig/mm/slab.h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/mm/slab.h 2017-04-18 17:56:30.649398527 +0200 +@@ -330,7 +330,11 @@ * The slab lists for all objects. */ struct kmem_cache_node { @@ -28043,11 +28429,10 @@ index 4c3ac12dd644..0c9bda0eb0c1 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 08342c523a85..905e283d7829 100644 ---- a/mm/slub.c -+++ b/mm/slub.c -@@ -1069,7 +1069,7 @@ static noinline struct kmem_cache_node *free_debug_processing( +diff -Nur linux-4.1.39.orig/mm/slub.c linux-4.1.39/mm/slub.c +--- linux-4.1.39.orig/mm/slub.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/mm/slub.c 2017-04-18 17:56:30.653398681 +0200 +@@ -1069,7 +1069,7 @@ { struct kmem_cache_node *n = get_node(s, page_to_nid(page)); @@ -28056,7 +28441,7 @@ index 08342c523a85..905e283d7829 100644 slab_lock(page); if (!check_slab(s, page)) -@@ -1116,7 +1116,7 @@ out: +@@ -1116,7 +1116,7 @@ fail: slab_unlock(page); @@ -28065,7 +28450,7 @@ index 08342c523a85..905e283d7829 100644 slab_fix(s, "Object at 0x%p not freed", object); return NULL; } -@@ -1242,6 +1242,12 @@ static inline void dec_slabs_node(struct kmem_cache *s, int node, +@@ -1242,6 +1242,12 @@ #endif /* CONFIG_SLUB_DEBUG */ @@ -28078,7 +28463,7 @@ index 08342c523a85..905e283d7829 100644 /* * Hooks for other subsystems that check memory allocations. In a typical * production configuration these hooks all should produce no code at all. -@@ -1306,6 +1312,17 @@ static inline void slab_free_hook(struct kmem_cache *s, void *x) +@@ -1306,6 +1312,17 @@ kasan_slab_free(s, x); } @@ -28096,7 +28481,7 @@ index 08342c523a85..905e283d7829 100644 /* * Slab allocation and freeing */ -@@ -1336,10 +1353,17 @@ static struct page *allocate_slab(struct kmem_cache *s, gfp_t flags, int node) +@@ -1336,10 +1353,17 @@ struct page *page; struct kmem_cache_order_objects oo = s->oo; gfp_t alloc_gfp; @@ -28115,7 +28500,7 @@ index 08342c523a85..905e283d7829 100644 local_irq_enable(); flags |= s->allocflags; -@@ -1359,13 +1383,13 @@ static struct page *allocate_slab(struct kmem_cache *s, gfp_t flags, int node) +@@ -1359,13 +1383,13 @@ * Try a lower order alloc if possible */ page = alloc_slab_page(s, alloc_gfp, node, oo); @@ -28134,7 +28519,7 @@ index 08342c523a85..905e283d7829 100644 int pages = 1 << oo_order(oo); kmemcheck_alloc_shadow(page, oo_order(oo), alloc_gfp, node); -@@ -1380,51 +1404,9 @@ static struct page *allocate_slab(struct kmem_cache *s, gfp_t flags, int node) +@@ -1380,51 +1404,9 @@ kmemcheck_mark_unallocated_pages(page, pages); } @@ -28186,7 +28571,7 @@ index 08342c523a85..905e283d7829 100644 page->slab_cache = s; __SetPageSlab(page); if (page_is_pfmemalloc(page)) -@@ -1448,10 +1430,34 @@ static struct page *new_slab(struct kmem_cache *s, gfp_t flags, int node) +@@ -1448,10 +1430,34 @@ page->freelist = start; page->inuse = page->objects; page->frozen = 1; @@ -28221,7 +28606,7 @@ index 08342c523a85..905e283d7829 100644 static void __free_slab(struct kmem_cache *s, struct page *page) { int order = compound_order(page); -@@ -1483,6 +1489,16 @@ static void __free_slab(struct kmem_cache *s, struct page *page) +@@ -1483,6 +1489,16 @@ memcg_uncharge_slab(s, order); } @@ -28238,7 +28623,7 @@ index 08342c523a85..905e283d7829 100644 #define need_reserve_slab_rcu \ (sizeof(((struct page *)NULL)->lru) < sizeof(struct rcu_head)) -@@ -1517,6 +1533,12 @@ static void free_slab(struct kmem_cache *s, struct page *page) +@@ -1517,6 +1533,12 @@ } call_rcu(head, rcu_free_slab); @@ -28251,7 +28636,7 @@ index 08342c523a85..905e283d7829 100644 } else __free_slab(s, page); } -@@ -1630,7 +1652,7 @@ static void *get_partial_node(struct kmem_cache *s, struct kmem_cache_node *n, +@@ -1630,7 +1652,7 @@ if (!n || !n->nr_partial) return NULL; @@ -28260,7 +28645,7 @@ index 08342c523a85..905e283d7829 100644 list_for_each_entry_safe(page, page2, &n->partial, lru) { void *t; -@@ -1655,7 +1677,7 @@ static void *get_partial_node(struct kmem_cache *s, struct kmem_cache_node *n, +@@ -1655,7 +1677,7 @@ break; } @@ -28269,7 +28654,7 @@ index 08342c523a85..905e283d7829 100644 return object; } -@@ -1901,7 +1923,7 @@ redo: +@@ -1901,7 +1923,7 @@ * that acquire_slab() will see a slab page that * is frozen */ @@ -28278,7 +28663,7 @@ index 08342c523a85..905e283d7829 100644 } } else { m = M_FULL; -@@ -1912,7 +1934,7 @@ redo: +@@ -1912,7 +1934,7 @@ * slabs from diagnostic functions will not see * any frozen slabs. */ @@ -28287,7 +28672,7 @@ index 08342c523a85..905e283d7829 100644 } } -@@ -1947,7 +1969,7 @@ redo: +@@ -1947,7 +1969,7 @@ goto redo; if (lock) @@ -28296,7 +28681,7 @@ index 08342c523a85..905e283d7829 100644 if (m == M_FREE) { stat(s, DEACTIVATE_EMPTY); -@@ -1979,10 +2001,10 @@ static void unfreeze_partials(struct kmem_cache *s, +@@ -1979,10 +2001,10 @@ n2 = get_node(s, page_to_nid(page)); if (n != n2) { if (n) @@ -28309,7 +28694,7 @@ index 08342c523a85..905e283d7829 100644 } do { -@@ -2011,7 +2033,7 @@ static void unfreeze_partials(struct kmem_cache *s, +@@ -2011,7 +2033,7 @@ } if (n) @@ -28318,7 +28703,7 @@ index 08342c523a85..905e283d7829 100644 while (discard_page) { page = discard_page; -@@ -2050,14 +2072,21 @@ static void put_cpu_partial(struct kmem_cache *s, struct page *page, int drain) +@@ -2050,14 +2072,21 @@ pobjects = oldpage->pobjects; pages = oldpage->pages; if (drain && pobjects > s->cpu_partial) { @@ -28340,7 +28725,7 @@ index 08342c523a85..905e283d7829 100644 oldpage = NULL; pobjects = 0; pages = 0; -@@ -2129,7 +2158,22 @@ static bool has_cpu_slab(int cpu, void *info) +@@ -2129,7 +2158,22 @@ static void flush_all(struct kmem_cache *s) { @@ -28363,7 +28748,7 @@ index 08342c523a85..905e283d7829 100644 } /* -@@ -2165,10 +2209,10 @@ static unsigned long count_partial(struct kmem_cache_node *n, +@@ -2165,10 +2209,10 @@ unsigned long x = 0; struct page *page; @@ -28376,7 +28761,7 @@ index 08342c523a85..905e283d7829 100644 return x; } #endif /* CONFIG_SLUB_DEBUG || CONFIG_SYSFS */ -@@ -2305,9 +2349,11 @@ static inline void *get_freelist(struct kmem_cache *s, struct page *page) +@@ -2305,9 +2349,11 @@ static void *__slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node, unsigned long addr, struct kmem_cache_cpu *c) { @@ -28388,7 +28773,7 @@ index 08342c523a85..905e283d7829 100644 local_irq_save(flags); #ifdef CONFIG_PREEMPT -@@ -2375,7 +2421,13 @@ load_freelist: +@@ -2375,7 +2421,13 @@ VM_BUG_ON(!c->page->frozen); c->freelist = get_freepointer(s, freelist); c->tid = next_tid(c->tid); @@ -28402,7 +28787,7 @@ index 08342c523a85..905e283d7829 100644 return freelist; new_slab: -@@ -2392,8 +2444,7 @@ new_slab: +@@ -2392,8 +2444,7 @@ if (unlikely(!freelist)) { slab_out_of_memory(s, gfpflags, node); @@ -28412,7 +28797,7 @@ index 08342c523a85..905e283d7829 100644 } page = c->page; -@@ -2408,8 +2459,7 @@ new_slab: +@@ -2408,8 +2459,7 @@ deactivate_slab(s, page, get_freepointer(s, freelist)); c->page = NULL; c->freelist = NULL; @@ -28422,7 +28807,7 @@ index 08342c523a85..905e283d7829 100644 } /* -@@ -2593,7 +2643,7 @@ static void __slab_free(struct kmem_cache *s, struct page *page, +@@ -2593,7 +2643,7 @@ do { if (unlikely(n)) { @@ -28431,7 +28816,7 @@ index 08342c523a85..905e283d7829 100644 n = NULL; } prior = page->freelist; -@@ -2625,7 +2675,7 @@ static void __slab_free(struct kmem_cache *s, struct page *page, +@@ -2625,7 +2675,7 @@ * Otherwise the list_lock will synchronize with * other processors updating the list of slabs. */ @@ -28440,7 +28825,7 @@ index 08342c523a85..905e283d7829 100644 } } -@@ -2667,7 +2717,7 @@ static void __slab_free(struct kmem_cache *s, struct page *page, +@@ -2667,7 +2717,7 @@ add_partial(n, page, DEACTIVATE_TO_TAIL); stat(s, FREE_ADD_PARTIAL); } @@ -28449,7 +28834,7 @@ index 08342c523a85..905e283d7829 100644 return; slab_empty: -@@ -2682,7 +2732,7 @@ slab_empty: +@@ -2682,7 +2732,7 @@ remove_full(s, n, page); } @@ -28458,7 +28843,7 @@ index 08342c523a85..905e283d7829 100644 stat(s, FREE_SLAB); discard_slab(s, page); } -@@ -2881,7 +2931,7 @@ static void +@@ -2881,7 +2931,7 @@ init_kmem_cache_node(struct kmem_cache_node *n) { n->nr_partial = 0; @@ -28467,7 +28852,7 @@ index 08342c523a85..905e283d7829 100644 INIT_LIST_HEAD(&n->partial); #ifdef CONFIG_SLUB_DEBUG atomic_long_set(&n->nr_slabs, 0); -@@ -3463,7 +3513,7 @@ int __kmem_cache_shrink(struct kmem_cache *s, bool deactivate) +@@ -3463,7 +3513,7 @@ for (i = 0; i < SHRINK_PROMOTE_MAX; i++) INIT_LIST_HEAD(promote + i); @@ -28476,7 +28861,7 @@ index 08342c523a85..905e283d7829 100644 /* * Build lists of slabs to discard or promote. -@@ -3494,7 +3544,7 @@ int __kmem_cache_shrink(struct kmem_cache *s, bool deactivate) +@@ -3494,7 +3544,7 @@ for (i = SHRINK_PROMOTE_MAX - 1; i >= 0; i--) list_splice(promote + i, &n->partial); @@ -28485,7 +28870,7 @@ index 08342c523a85..905e283d7829 100644 /* Release empty slabs */ list_for_each_entry_safe(page, t, &discard, lru) -@@ -3670,6 +3720,12 @@ void __init kmem_cache_init(void) +@@ -3670,6 +3720,12 @@ { static __initdata struct kmem_cache boot_kmem_cache, boot_kmem_cache_node; @@ -28498,7 +28883,7 @@ index 08342c523a85..905e283d7829 100644 if (debug_guardpage_minorder()) slub_max_order = 0; -@@ -3912,7 +3968,7 @@ static int validate_slab_node(struct kmem_cache *s, +@@ -3912,7 +3968,7 @@ struct page *page; unsigned long flags; @@ -28507,7 +28892,7 @@ index 08342c523a85..905e283d7829 100644 list_for_each_entry(page, &n->partial, lru) { validate_slab_slab(s, page, map); -@@ -3934,7 +3990,7 @@ static int validate_slab_node(struct kmem_cache *s, +@@ -3934,7 +3990,7 @@ s->name, count, atomic_long_read(&n->nr_slabs)); out: @@ -28516,7 +28901,7 @@ index 08342c523a85..905e283d7829 100644 return count; } -@@ -4122,12 +4178,12 @@ static int list_locations(struct kmem_cache *s, char *buf, +@@ -4122,12 +4178,12 @@ if (!atomic_long_read(&n->nr_slabs)) continue; @@ -28531,10 +28916,9 @@ index 08342c523a85..905e283d7829 100644 } for (i = 0; i < t.count; i++) { -diff --git a/mm/swap.c b/mm/swap.c -index ab3b9c2dd783..b433019229f8 100644 ---- a/mm/swap.c -+++ b/mm/swap.c +diff -Nur linux-4.1.39.orig/mm/swap.c linux-4.1.39/mm/swap.c +--- linux-4.1.39.orig/mm/swap.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/mm/swap.c 2017-04-18 17:56:30.653398681 +0200 @@ -32,6 +32,7 @@ #include <linux/gfp.h> #include <linux/uio.h> @@ -28543,7 +28927,7 @@ index ab3b9c2dd783..b433019229f8 100644 #include "internal.h" -@@ -45,6 +46,9 @@ static DEFINE_PER_CPU(struct pagevec, lru_add_pvec); +@@ -45,6 +46,9 @@ static DEFINE_PER_CPU(struct pagevec, lru_rotate_pvecs); static DEFINE_PER_CPU(struct pagevec, lru_deactivate_file_pvecs); @@ -28553,7 +28937,7 @@ index ab3b9c2dd783..b433019229f8 100644 /* * This path almost never happens for VM activity - pages are normally * freed via pagevecs. But it gets used by networking. -@@ -481,11 +485,11 @@ void rotate_reclaimable_page(struct page *page) +@@ -481,11 +485,11 @@ unsigned long flags; page_cache_get(page); @@ -28567,7 +28951,7 @@ index ab3b9c2dd783..b433019229f8 100644 } } -@@ -536,12 +540,13 @@ static bool need_activate_page_drain(int cpu) +@@ -536,12 +540,13 @@ void activate_page(struct page *page) { if (PageLRU(page) && !PageActive(page) && !PageUnevictable(page)) { @@ -28583,7 +28967,7 @@ index ab3b9c2dd783..b433019229f8 100644 } } -@@ -567,7 +572,7 @@ void activate_page(struct page *page) +@@ -567,7 +572,7 @@ static void __lru_cache_activate_page(struct page *page) { @@ -28592,7 +28976,7 @@ index ab3b9c2dd783..b433019229f8 100644 int i; /* -@@ -589,7 +594,7 @@ static void __lru_cache_activate_page(struct page *page) +@@ -589,7 +594,7 @@ } } @@ -28601,7 +28985,7 @@ index ab3b9c2dd783..b433019229f8 100644 } /* -@@ -628,12 +633,12 @@ EXPORT_SYMBOL(mark_page_accessed); +@@ -628,12 +633,12 @@ static void __lru_cache_add(struct page *page) { @@ -28616,7 +29000,7 @@ index ab3b9c2dd783..b433019229f8 100644 } /** -@@ -813,9 +818,15 @@ void lru_add_drain_cpu(int cpu) +@@ -813,9 +818,15 @@ unsigned long flags; /* No harm done if a racing interrupt already did this */ @@ -28634,7 +29018,7 @@ index ab3b9c2dd783..b433019229f8 100644 } pvec = &per_cpu(lru_deactivate_file_pvecs, cpu); -@@ -843,26 +854,47 @@ void deactivate_file_page(struct page *page) +@@ -843,26 +854,47 @@ return; if (likely(get_page_unless_zero(page))) { @@ -28686,7 +29070,7 @@ index ab3b9c2dd783..b433019229f8 100644 void lru_add_drain_all(void) { -@@ -875,20 +907,17 @@ void lru_add_drain_all(void) +@@ -875,20 +907,17 @@ cpumask_clear(&has_work); for_each_online_cpu(cpu) { @@ -28711,11 +29095,10 @@ index ab3b9c2dd783..b433019229f8 100644 put_online_cpus(); mutex_unlock(&lock); -diff --git a/mm/truncate.c b/mm/truncate.c -index 66af9031fae8..09598db42681 100644 ---- a/mm/truncate.c -+++ b/mm/truncate.c -@@ -56,8 +56,11 @@ static void clear_exceptional_entry(struct address_space *mapping, +diff -Nur linux-4.1.39.orig/mm/truncate.c linux-4.1.39/mm/truncate.c +--- linux-4.1.39.orig/mm/truncate.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/mm/truncate.c 2017-04-18 17:56:30.653398681 +0200 +@@ -56,8 +56,11 @@ * protected by mapping->tree_lock. */ if (!workingset_node_shadows(node) && @@ -28729,11 +29112,10 @@ index 66af9031fae8..09598db42681 100644 __radix_tree_delete_node(&mapping->page_tree, node); unlock: spin_unlock_irq(&mapping->tree_lock); -diff --git a/mm/vmalloc.c b/mm/vmalloc.c -index 2faaa2976447..f87a29f1e718 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.1.39.orig/mm/vmalloc.c linux-4.1.39/mm/vmalloc.c +--- linux-4.1.39.orig/mm/vmalloc.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/mm/vmalloc.c 2017-04-18 17:56:30.653398681 +0200 +@@ -819,7 +819,7 @@ struct vmap_block *vb; struct vmap_area *va; unsigned long vb_idx; @@ -28742,7 +29124,7 @@ index 2faaa2976447..f87a29f1e718 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(); @@ -28757,7 +29139,7 @@ index 2faaa2976447..f87a29f1e718 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; @@ -28765,7 +29147,7 @@ index 2faaa2976447..f87a29f1e718 100644 BUG_ON(size & ~PAGE_MASK); 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(); @@ -28775,7 +29157,7 @@ index 2faaa2976447..f87a29f1e718 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; } @@ -28784,11 +29166,10 @@ index 2faaa2976447..f87a29f1e718 100644 rcu_read_unlock(); /* Allocate new block if nothing was found */ -diff --git a/mm/vmstat.c b/mm/vmstat.c -index 4f5cd974e11a..86f0e2e3f677 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.1.39.orig/mm/vmstat.c linux-4.1.39/mm/vmstat.c +--- linux-4.1.39.orig/mm/vmstat.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/mm/vmstat.c 2017-04-18 17:56:30.653398681 +0200 +@@ -226,6 +226,7 @@ long x; long t; @@ -28796,7 +29177,7 @@ index 4f5cd974e11a..86f0e2e3f677 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); @@ -28804,7 +29185,7 @@ index 4f5cd974e11a..86f0e2e3f677 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; @@ -28812,7 +29193,7 @@ index 4f5cd974e11a..86f0e2e3f677 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); } @@ -28820,7 +29201,7 @@ index 4f5cd974e11a..86f0e2e3f677 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; @@ -28828,7 +29209,7 @@ index 4f5cd974e11a..86f0e2e3f677 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); } @@ -28836,11 +29217,10 @@ index 4f5cd974e11a..86f0e2e3f677 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 aa017133744b..263d0194734a 100644 ---- a/mm/workingset.c -+++ b/mm/workingset.c -@@ -264,7 +264,8 @@ void workingset_activation(struct page *page) +diff -Nur linux-4.1.39.orig/mm/workingset.c linux-4.1.39/mm/workingset.c +--- linux-4.1.39.orig/mm/workingset.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/mm/workingset.c 2017-04-18 17:56:30.653398681 +0200 +@@ -264,7 +264,8 @@ * point where they would still be useful. */ @@ -28850,7 +29230,7 @@ index aa017133744b..263d0194734a 100644 static unsigned long count_shadow_nodes(struct shrinker *shrinker, struct shrink_control *sc) -@@ -274,9 +275,9 @@ static unsigned long count_shadow_nodes(struct shrinker *shrinker, +@@ -274,9 +275,9 @@ unsigned long pages; /* list_lru lock nests inside IRQ-safe mapping->tree_lock */ @@ -28863,7 +29243,7 @@ index aa017133744b..263d0194734a 100644 pages = node_present_pages(sc->nid); /* -@@ -363,9 +364,9 @@ static enum lru_status shadow_lru_isolate(struct list_head *item, +@@ -363,9 +364,9 @@ spin_unlock(&mapping->tree_lock); ret = LRU_REMOVED_RETRY; out: @@ -28875,7 +29255,7 @@ index aa017133744b..263d0194734a 100644 spin_lock(lru_lock); return ret; } -@@ -376,10 +377,10 @@ static unsigned long scan_shadow_nodes(struct shrinker *shrinker, +@@ -376,10 +377,10 @@ unsigned long ret; /* list_lru lock nests inside IRQ-safe mapping->tree_lock */ @@ -28889,7 +29269,7 @@ index aa017133744b..263d0194734a 100644 return ret; } -@@ -400,7 +401,7 @@ static int __init workingset_init(void) +@@ -400,7 +401,7 @@ { int ret; @@ -28898,7 +29278,7 @@ index aa017133744b..263d0194734a 100644 if (ret) goto err; ret = register_shrinker(&workingset_shadow_shrinker); -@@ -408,7 +409,7 @@ static int __init workingset_init(void) +@@ -408,7 +409,7 @@ goto err_list_lru; return 0; err_list_lru: @@ -28907,33 +29287,47 @@ index aa017133744b..263d0194734a 100644 err: return ret; } -diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c -index fb1ec10ce449..e819dffd142c 100644 ---- a/mm/zsmalloc.c -+++ b/mm/zsmalloc.c -@@ -1289,7 +1289,7 @@ void *zs_map_object(struct zs_pool *pool, unsigned long handle, +diff -Nur linux-4.1.39.orig/mm/zsmalloc.c linux-4.1.39/mm/zsmalloc.c +--- linux-4.1.39.orig/mm/zsmalloc.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/mm/zsmalloc.c 2017-04-18 17:56:30.653398681 +0200 +@@ -68,6 +68,7 @@ + #include <linux/debugfs.h> + #include <linux/zsmalloc.h> + #include <linux/zpool.h> ++#include <linux/locallock.h> + + /* + * This must be power of 2 and greater than of equal to sizeof(link_free). +@@ -398,6 +399,7 @@ + + /* per-cpu VM mapping areas for zspage accesses that cross page boundaries */ + static DEFINE_PER_CPU(struct mapping_area, zs_map_area); ++static DEFINE_LOCAL_IRQ_LOCK(zs_map_area_lock); + + static int is_first_page(struct page *page) + { +@@ -1289,7 +1291,7 @@ class = pool->size_class[class_idx]; off = obj_idx_to_offset(page, obj_idx, class->size); - area = &get_cpu_var(zs_map_area); -+ area = per_cpu_ptr(&zs_map_area, get_cpu_light()); ++ area = &get_locked_var(zs_map_area_lock, zs_map_area); area->vm_mm = mm; if (off + class->size <= PAGE_SIZE) { /* this object is contained entirely within a page */ -@@ -1342,7 +1342,7 @@ void zs_unmap_object(struct zs_pool *pool, unsigned long handle) +@@ -1342,7 +1344,7 @@ __zs_unmap_object(area, pages, off, class->size); } - put_cpu_var(zs_map_area); -+ put_cpu_light(); ++ put_locked_var(zs_map_area_lock, zs_map_area); unpin_tag(handle); } EXPORT_SYMBOL_GPL(zs_unmap_object); -diff --git a/net/core/dev.c b/net/core/dev.c -index 185a3398c651..78912da59fc1 100644 ---- a/net/core/dev.c -+++ b/net/core/dev.c -@@ -184,6 +184,7 @@ static unsigned int napi_gen_id; +diff -Nur linux-4.1.39.orig/net/core/dev.c linux-4.1.39/net/core/dev.c +--- linux-4.1.39.orig/net/core/dev.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/net/core/dev.c 2017-04-18 17:56:30.653398681 +0200 +@@ -184,6 +184,7 @@ static DEFINE_HASHTABLE(napi_hash, 8); static seqcount_t devnet_rename_seq; @@ -28941,7 +29335,7 @@ index 185a3398c651..78912da59fc1 100644 static inline void dev_base_seq_inc(struct net *net) { -@@ -205,14 +206,14 @@ static inline struct hlist_head *dev_index_hash(struct net *net, int ifindex) +@@ -205,14 +206,14 @@ static inline void rps_lock(struct softnet_data *sd) { #ifdef CONFIG_RPS @@ -28958,7 +29352,7 @@ index 185a3398c651..78912da59fc1 100644 #endif } -@@ -852,7 +853,8 @@ retry: +@@ -852,7 +853,8 @@ strcpy(name, dev->name); rcu_read_unlock(); if (read_seqcount_retry(&devnet_rename_seq, seq)) { @@ -28968,7 +29362,7 @@ index 185a3398c651..78912da59fc1 100644 goto retry; } -@@ -1121,20 +1123,17 @@ int dev_change_name(struct net_device *dev, const char *newname) +@@ -1121,20 +1123,17 @@ if (dev->flags & IFF_UP) return -EBUSY; @@ -28995,7 +29389,7 @@ index 185a3398c651..78912da59fc1 100644 if (oldname[0] && !strchr(oldname, '%')) netdev_info(dev, "renamed from %s\n", oldname); -@@ -1147,11 +1146,12 @@ rollback: +@@ -1147,11 +1146,12 @@ if (ret) { memcpy(dev->name, oldname, IFNAMSIZ); dev->name_assign_type = old_assign_type; @@ -29011,7 +29405,7 @@ index 185a3398c651..78912da59fc1 100644 netdev_adjacent_rename_links(dev, oldname); -@@ -1172,7 +1172,8 @@ rollback: +@@ -1172,7 +1172,8 @@ /* err >= 0 after dev_alloc_name() or stores the first errno */ if (err >= 0) { err = ret; @@ -29021,7 +29415,7 @@ index 185a3398c651..78912da59fc1 100644 memcpy(dev->name, oldname, IFNAMSIZ); memcpy(oldname, newname, IFNAMSIZ); dev->name_assign_type = old_assign_type; -@@ -1185,6 +1186,11 @@ rollback: +@@ -1185,6 +1186,11 @@ } return err; @@ -29033,7 +29427,7 @@ index 185a3398c651..78912da59fc1 100644 } /** -@@ -2214,6 +2220,7 @@ static inline void __netif_reschedule(struct Qdisc *q) +@@ -2214,6 +2220,7 @@ sd->output_queue_tailp = &q->next_sched; raise_softirq_irqoff(NET_TX_SOFTIRQ); local_irq_restore(flags); @@ -29041,7 +29435,7 @@ index 185a3398c651..78912da59fc1 100644 } void __netif_schedule(struct Qdisc *q) -@@ -2295,6 +2302,7 @@ void __dev_kfree_skb_irq(struct sk_buff *skb, enum skb_free_reason reason) +@@ -2295,6 +2302,7 @@ __this_cpu_write(softnet_data.completion_queue, skb); raise_softirq_irqoff(NET_TX_SOFTIRQ); local_irq_restore(flags); @@ -29049,7 +29443,7 @@ index 185a3398c651..78912da59fc1 100644 } EXPORT_SYMBOL(__dev_kfree_skb_irq); -@@ -2820,7 +2828,11 @@ static inline int __dev_xmit_skb(struct sk_buff *skb, struct Qdisc *q, +@@ -2820,7 +2828,11 @@ * This permits __QDISC___STATE_RUNNING owner to get the lock more * often and dequeue packets faster. */ @@ -29061,7 +29455,7 @@ index 185a3398c651..78912da59fc1 100644 if (unlikely(contended)) spin_lock(&q->busylock); -@@ -2880,9 +2892,44 @@ static void skb_update_prio(struct sk_buff *skb) +@@ -2880,9 +2892,44 @@ #define skb_update_prio(skb) #endif @@ -29106,7 +29500,7 @@ index 185a3398c651..78912da59fc1 100644 #define RECURSION_LIMIT 10 /** -@@ -2984,7 +3031,7 @@ static int __dev_queue_xmit(struct sk_buff *skb, void *accel_priv) +@@ -2984,7 +3031,7 @@ if (txq->xmit_lock_owner != cpu) { @@ -29115,7 +29509,7 @@ index 185a3398c651..78912da59fc1 100644 goto recursion_alert; skb = validate_xmit_skb(skb, dev); -@@ -2994,9 +3041,9 @@ static int __dev_queue_xmit(struct sk_buff *skb, void *accel_priv) +@@ -2994,9 +3041,9 @@ HARD_TX_LOCK(dev, txq, cpu); if (!netif_xmit_stopped(txq)) { @@ -29127,7 +29521,7 @@ index 185a3398c651..78912da59fc1 100644 if (dev_xmit_complete(rc)) { HARD_TX_UNLOCK(dev, txq); goto out; -@@ -3370,6 +3417,7 @@ drop: +@@ -3370,6 +3417,7 @@ rps_unlock(sd); local_irq_restore(flags); @@ -29135,7 +29529,7 @@ index 185a3398c651..78912da59fc1 100644 atomic_long_inc(&skb->dev->rx_dropped); kfree_skb(skb); -@@ -3388,7 +3436,7 @@ static int netif_rx_internal(struct sk_buff *skb) +@@ -3388,7 +3436,7 @@ struct rps_dev_flow voidflow, *rflow = &voidflow; int cpu; @@ -29144,7 +29538,7 @@ index 185a3398c651..78912da59fc1 100644 rcu_read_lock(); cpu = get_rps_cpu(skb->dev, skb, &rflow); -@@ -3398,13 +3446,13 @@ static int netif_rx_internal(struct sk_buff *skb) +@@ -3398,13 +3446,13 @@ ret = enqueue_to_backlog(skb, cpu, &rflow->last_qtail); rcu_read_unlock(); @@ -29161,7 +29555,7 @@ index 185a3398c651..78912da59fc1 100644 } return ret; } -@@ -3438,16 +3486,44 @@ int netif_rx_ni(struct sk_buff *skb) +@@ -3438,16 +3486,44 @@ trace_netif_rx_ni_entry(skb); @@ -29210,7 +29604,7 @@ index 185a3398c651..78912da59fc1 100644 static void net_tx_action(struct softirq_action *h) { struct softnet_data *sd = this_cpu_ptr(&softnet_data); -@@ -3489,7 +3565,7 @@ static void net_tx_action(struct softirq_action *h) +@@ -3489,7 +3565,7 @@ head = head->next_sched; root_lock = qdisc_lock(q); @@ -29219,7 +29613,7 @@ index 185a3398c651..78912da59fc1 100644 smp_mb__before_atomic(); clear_bit(__QDISC_STATE_SCHED, &q->state); -@@ -3886,7 +3962,7 @@ static void flush_backlog(void *arg) +@@ -3886,7 +3962,7 @@ skb_queue_walk_safe(&sd->input_pkt_queue, skb, tmp) { if (skb->dev == dev) { __skb_unlink(skb, &sd->input_pkt_queue); @@ -29228,7 +29622,7 @@ index 185a3398c651..78912da59fc1 100644 input_queue_head_incr(sd); } } -@@ -3895,10 +3971,13 @@ static void flush_backlog(void *arg) +@@ -3895,10 +3971,13 @@ skb_queue_walk_safe(&sd->process_queue, skb, tmp) { if (skb->dev == dev) { __skb_unlink(skb, &sd->process_queue); @@ -29243,7 +29637,7 @@ index 185a3398c651..78912da59fc1 100644 } static int napi_gro_complete(struct sk_buff *skb) -@@ -4349,6 +4428,7 @@ static void net_rps_action_and_irq_enable(struct softnet_data *sd) +@@ -4350,6 +4429,7 @@ sd->rps_ipi_list = NULL; local_irq_enable(); @@ -29251,7 +29645,7 @@ index 185a3398c651..78912da59fc1 100644 /* Send pending IPI's to kick RPS processing on remote cpus. */ while (remsd) { -@@ -4362,6 +4442,7 @@ static void net_rps_action_and_irq_enable(struct softnet_data *sd) +@@ -4363,6 +4443,7 @@ } else #endif local_irq_enable(); @@ -29259,7 +29653,7 @@ index 185a3398c651..78912da59fc1 100644 } static bool sd_has_rps_ipi_waiting(struct softnet_data *sd) -@@ -4443,6 +4524,7 @@ void __napi_schedule(struct napi_struct *n) +@@ -4444,9 +4525,11 @@ local_irq_save(flags); ____napi_schedule(this_cpu_ptr(&softnet_data), n); local_irq_restore(flags); @@ -29267,7 +29661,41 @@ index 185a3398c651..78912da59fc1 100644 } EXPORT_SYMBOL(__napi_schedule); -@@ -4717,7 +4799,7 @@ static void net_rx_action(struct softirq_action *h) ++#ifndef CONFIG_PREEMPT_RT_FULL + /** + * __napi_schedule_irqoff - schedule for receive + * @n: entry to schedule +@@ -4458,6 +4541,7 @@ + ____napi_schedule(this_cpu_ptr(&softnet_data), n); + } + EXPORT_SYMBOL(__napi_schedule_irqoff); ++#endif + + void __napi_complete(struct napi_struct *n) + { +@@ -4682,13 +4766,21 @@ + struct softnet_data *sd = this_cpu_ptr(&softnet_data); + unsigned long time_limit = jiffies + 2; + int budget = netdev_budget; ++ struct sk_buff_head tofree_q; ++ struct sk_buff *skb; + LIST_HEAD(list); + LIST_HEAD(repoll); + ++ __skb_queue_head_init(&tofree_q); ++ + local_irq_disable(); ++ skb_queue_splice_init(&sd->tofree_queue, &tofree_q); + list_splice_init(&sd->poll_list, &list); + local_irq_enable(); + ++ while ((skb = __skb_dequeue(&tofree_q))) ++ kfree_skb(skb); ++ + for (;;) { + struct napi_struct *n; + +@@ -4718,7 +4810,7 @@ list_splice_tail(&repoll, &list); list_splice(&list, &sd->poll_list); if (!list_empty(&sd->poll_list)) @@ -29276,7 +29704,7 @@ index 185a3398c651..78912da59fc1 100644 net_rps_action_and_irq_enable(sd); } -@@ -6931,7 +7013,7 @@ EXPORT_SYMBOL(free_netdev); +@@ -6932,7 +7024,7 @@ void synchronize_net(void) { might_sleep(); @@ -29285,7 +29713,7 @@ index 185a3398c651..78912da59fc1 100644 synchronize_rcu_expedited(); else synchronize_rcu(); -@@ -7172,16 +7254,20 @@ static int dev_cpu_callback(struct notifier_block *nfb, +@@ -7173,16 +7265,20 @@ raise_softirq_irqoff(NET_TX_SOFTIRQ); local_irq_enable(); @@ -29307,7 +29735,7 @@ index 185a3398c651..78912da59fc1 100644 return NOTIFY_OK; } -@@ -7483,8 +7569,9 @@ static int __init net_dev_init(void) +@@ -7484,8 +7580,9 @@ for_each_possible_cpu(i) { struct softnet_data *sd = &per_cpu(softnet_data, i); @@ -29319,10 +29747,9 @@ index 185a3398c651..78912da59fc1 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 c9793c6c5005..d4516d7d58aa 100644 ---- a/net/core/skbuff.c -+++ b/net/core/skbuff.c +diff -Nur linux-4.1.39.orig/net/core/skbuff.c linux-4.1.39/net/core/skbuff.c +--- linux-4.1.39.orig/net/core/skbuff.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/net/core/skbuff.c 2017-04-18 17:56:30.657398836 +0200 @@ -63,6 +63,7 @@ #include <linux/errqueue.h> #include <linux/prefetch.h> @@ -29331,7 +29758,7 @@ index c9793c6c5005..d4516d7d58aa 100644 #include <net/protocol.h> #include <net/dst.h> -@@ -358,6 +359,8 @@ struct netdev_alloc_cache { +@@ -358,6 +359,8 @@ }; static DEFINE_PER_CPU(struct netdev_alloc_cache, netdev_alloc_cache); static DEFINE_PER_CPU(struct netdev_alloc_cache, napi_alloc_cache); @@ -29340,7 +29767,7 @@ index c9793c6c5005..d4516d7d58aa 100644 static struct page *__page_frag_refill(struct netdev_alloc_cache *nc, gfp_t gfp_mask) -@@ -435,9 +438,9 @@ static void *__netdev_alloc_frag(unsigned int fragsz, gfp_t gfp_mask) +@@ -435,9 +438,9 @@ unsigned long flags; void *data; @@ -29352,7 +29779,7 @@ index c9793c6c5005..d4516d7d58aa 100644 return data; } -@@ -456,7 +459,12 @@ EXPORT_SYMBOL(netdev_alloc_frag); +@@ -456,7 +459,12 @@ static void *__napi_alloc_frag(unsigned int fragsz, gfp_t gfp_mask) { @@ -29366,11 +29793,10 @@ index c9793c6c5005..d4516d7d58aa 100644 } void *napi_alloc_frag(unsigned int fragsz) -diff --git a/net/core/sock.c b/net/core/sock.c -index 47fc8bb3b946..23a1423f78ca 100644 ---- a/net/core/sock.c -+++ b/net/core/sock.c -@@ -2369,12 +2369,11 @@ void lock_sock_nested(struct sock *sk, int subclass) +diff -Nur linux-4.1.39.orig/net/core/sock.c linux-4.1.39/net/core/sock.c +--- linux-4.1.39.orig/net/core/sock.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/net/core/sock.c 2017-04-18 17:56:30.657398836 +0200 +@@ -2369,12 +2369,11 @@ if (sk->sk_lock.owned) __lock_sock(sk); sk->sk_lock.owned = 1; @@ -29384,10 +29810,9 @@ index 47fc8bb3b946..23a1423f78ca 100644 } EXPORT_SYMBOL(lock_sock_nested); -diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c -index f5203fba6236..d7358c1ac63c 100644 ---- a/net/ipv4/icmp.c -+++ b/net/ipv4/icmp.c +diff -Nur linux-4.1.39.orig/net/ipv4/icmp.c linux-4.1.39/net/ipv4/icmp.c +--- linux-4.1.39.orig/net/ipv4/icmp.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/net/ipv4/icmp.c 2017-04-18 17:56:30.657398836 +0200 @@ -69,6 +69,7 @@ #include <linux/jiffies.h> #include <linux/kernel.h> @@ -29404,7 +29829,7 @@ index f5203fba6236..d7358c1ac63c 100644 #include <net/snmp.h> #include <net/ip.h> #include <net/route.h> -@@ -203,6 +205,8 @@ static const struct icmp_control icmp_pointers[NR_ICMP_TYPES+1]; +@@ -203,6 +205,8 @@ * * On SMP we have one ICMP socket per-cpu. */ @@ -29413,7 +29838,7 @@ index f5203fba6236..d7358c1ac63c 100644 static struct sock *icmp_sk(struct net *net) { return *this_cpu_ptr(net->ipv4.icmp_sk); -@@ -214,12 +218,14 @@ static inline struct sock *icmp_xmit_lock(struct net *net) +@@ -214,12 +218,14 @@ local_bh_disable(); @@ -29428,7 +29853,7 @@ index f5203fba6236..d7358c1ac63c 100644 local_bh_enable(); return NULL; } -@@ -229,6 +235,7 @@ static inline struct sock *icmp_xmit_lock(struct net *net) +@@ -229,6 +235,7 @@ static inline void icmp_xmit_unlock(struct sock *sk) { spin_unlock_bh(&sk->sk_lock.slock); @@ -29436,7 +29861,7 @@ index f5203fba6236..d7358c1ac63c 100644 } int sysctl_icmp_msgs_per_sec __read_mostly = 1000; -@@ -356,6 +363,7 @@ static void icmp_push_reply(struct icmp_bxm *icmp_param, +@@ -356,6 +363,7 @@ struct sock *sk; struct sk_buff *skb; @@ -29444,7 +29869,7 @@ index f5203fba6236..d7358c1ac63c 100644 sk = icmp_sk(dev_net((*rt)->dst.dev)); if (ip_append_data(sk, fl4, icmp_glue_bits, icmp_param, icmp_param->data_len+icmp_param->head_len, -@@ -378,6 +386,7 @@ static void icmp_push_reply(struct icmp_bxm *icmp_param, +@@ -378,6 +386,7 @@ skb->ip_summed = CHECKSUM_NONE; ip_push_pending_frames(sk, fl4); } @@ -29452,7 +29877,7 @@ index f5203fba6236..d7358c1ac63c 100644 } /* -@@ -867,6 +876,30 @@ static bool icmp_redirect(struct sk_buff *skb) +@@ -867,6 +876,30 @@ } /* @@ -29483,7 +29908,7 @@ index f5203fba6236..d7358c1ac63c 100644 * Handle ICMP_ECHO ("ping") requests. * * RFC 1122: 3.2.2.6 MUST have an echo server that answers ICMP echo -@@ -893,6 +926,11 @@ static bool icmp_echo(struct sk_buff *skb) +@@ -893,6 +926,11 @@ icmp_param.data_len = skb->len; icmp_param.head_len = sizeof(struct icmphdr); icmp_reply(&icmp_param, skb); @@ -29495,11 +29920,10 @@ index f5203fba6236..d7358c1ac63c 100644 } /* should there be an ICMP stat for ignored echos? */ return true; -diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c -index f0e829735968..aff60d4abd7c 100644 ---- a/net/ipv4/sysctl_net_ipv4.c -+++ b/net/ipv4/sysctl_net_ipv4.c -@@ -779,6 +779,13 @@ static struct ctl_table ipv4_net_table[] = { +diff -Nur linux-4.1.39.orig/net/ipv4/sysctl_net_ipv4.c linux-4.1.39/net/ipv4/sysctl_net_ipv4.c +--- linux-4.1.39.orig/net/ipv4/sysctl_net_ipv4.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/net/ipv4/sysctl_net_ipv4.c 2017-04-18 17:56:30.657398836 +0200 +@@ -779,6 +779,13 @@ .proc_handler = proc_dointvec }, { @@ -29513,10 +29937,9 @@ index f0e829735968..aff60d4abd7c 100644 .procname = "icmp_ignore_bogus_error_responses", .data = &init_net.ipv4.sysctl_icmp_ignore_bogus_error_responses, .maxlen = sizeof(int), -diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c -index 13b92d595138..6bfa68fb5f21 100644 ---- a/net/ipv4/tcp_ipv4.c -+++ b/net/ipv4/tcp_ipv4.c +diff -Nur linux-4.1.39.orig/net/ipv4/tcp_ipv4.c linux-4.1.39/net/ipv4/tcp_ipv4.c +--- linux-4.1.39.orig/net/ipv4/tcp_ipv4.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/net/ipv4/tcp_ipv4.c 2017-04-18 17:56:30.657398836 +0200 @@ -62,6 +62,7 @@ #include <linux/init.h> #include <linux/times.h> @@ -29525,7 +29948,7 @@ index 13b92d595138..6bfa68fb5f21 100644 #include <net/net_namespace.h> #include <net/icmp.h> -@@ -563,6 +564,7 @@ void tcp_v4_send_check(struct sock *sk, struct sk_buff *skb) +@@ -563,6 +564,7 @@ } EXPORT_SYMBOL(tcp_v4_send_check); @@ -29533,7 +29956,7 @@ index 13b92d595138..6bfa68fb5f21 100644 /* * This routine will send an RST to the other tcp. * -@@ -684,10 +686,13 @@ static void tcp_v4_send_reset(struct sock *sk, struct sk_buff *skb) +@@ -684,10 +686,13 @@ arg.bound_dev_if = sk->sk_bound_dev_if; arg.tos = ip_hdr(skb)->tos; @@ -29547,7 +29970,7 @@ index 13b92d595138..6bfa68fb5f21 100644 TCP_INC_STATS_BH(net, TCP_MIB_OUTSEGS); TCP_INC_STATS_BH(net, TCP_MIB_OUTRSTS); -@@ -769,10 +774,12 @@ static void tcp_v4_send_ack(struct net *net, +@@ -769,10 +774,12 @@ if (oif) arg.bound_dev_if = oif; arg.tos = tos; @@ -29560,11 +29983,10 @@ index 13b92d595138..6bfa68fb5f21 100644 TCP_INC_STATS_BH(net, TCP_MIB_OUTSEGS); } -diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c -index 3073164a6fcf..d294ec1530b6 100644 ---- a/net/mac80211/rx.c -+++ b/net/mac80211/rx.c -@@ -3574,7 +3574,7 @@ void ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb) +diff -Nur linux-4.1.39.orig/net/mac80211/rx.c linux-4.1.39/net/mac80211/rx.c +--- linux-4.1.39.orig/net/mac80211/rx.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/net/mac80211/rx.c 2017-04-18 17:56:30.657398836 +0200 +@@ -3580,7 +3580,7 @@ struct ieee80211_supported_band *sband; struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb); @@ -29573,10 +29995,9 @@ index 3073164a6fcf..d294ec1530b6 100644 if (WARN_ON(status->band >= IEEE80211_NUM_BANDS)) goto drop; -diff --git a/net/netfilter/core.c b/net/netfilter/core.c -index 5d0c6fd59475..e81489741143 100644 ---- a/net/netfilter/core.c -+++ b/net/netfilter/core.c +diff -Nur linux-4.1.39.orig/net/netfilter/core.c linux-4.1.39/net/netfilter/core.c +--- linux-4.1.39.orig/net/netfilter/core.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/net/netfilter/core.c 2017-04-18 17:56:30.657398836 +0200 @@ -22,11 +22,17 @@ #include <linux/proc_fs.h> #include <linux/mutex.h> @@ -29595,10 +30016,9 @@ index 5d0c6fd59475..e81489741143 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 a3654d929814..7c1054d808fc 100644 ---- a/net/packet/af_packet.c -+++ b/net/packet/af_packet.c +diff -Nur linux-4.1.39.orig/net/packet/af_packet.c linux-4.1.39/net/packet/af_packet.c +--- linux-4.1.39.orig/net/packet/af_packet.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/net/packet/af_packet.c 2017-04-18 17:56:30.657398836 +0200 @@ -63,6 +63,7 @@ #include <linux/if_packet.h> #include <linux/wireless.h> @@ -29607,7 +30027,7 @@ index a3654d929814..7c1054d808fc 100644 #include <linux/kmod.h> #include <linux/slab.h> #include <linux/vmalloc.h> -@@ -698,7 +699,7 @@ static void prb_retire_rx_blk_timer_expired(unsigned long data) +@@ -698,7 +699,7 @@ if (BLOCK_NUM_PKTS(pbd)) { while (atomic_read(&pkc->blk_fill_in_prog)) { /* Waiting for skb_copy_bits to finish... */ @@ -29616,7 +30036,7 @@ index a3654d929814..7c1054d808fc 100644 } } -@@ -960,7 +961,7 @@ static void prb_retire_current_block(struct tpacket_kbdq_core *pkc, +@@ -960,7 +961,7 @@ if (!(status & TP_STATUS_BLK_TMO)) { while (atomic_read(&pkc->blk_fill_in_prog)) { /* Waiting for skb_copy_bits to finish... */ @@ -29625,10 +30045,9 @@ index a3654d929814..7c1054d808fc 100644 } } prb_close_block(pkc, pbd, po, status); -diff --git a/net/rds/ib_rdma.c b/net/rds/ib_rdma.c -index 657ba9f5d308..c8faaf36423a 100644 ---- a/net/rds/ib_rdma.c -+++ b/net/rds/ib_rdma.c +diff -Nur linux-4.1.39.orig/net/rds/ib_rdma.c linux-4.1.39/net/rds/ib_rdma.c +--- linux-4.1.39.orig/net/rds/ib_rdma.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/net/rds/ib_rdma.c 2017-04-18 17:56:30.657398836 +0200 @@ -34,6 +34,7 @@ #include <linux/slab.h> #include <linux/rculist.h> @@ -29637,7 +30056,7 @@ index 657ba9f5d308..c8faaf36423a 100644 #include "rds.h" #include "ib.h" -@@ -286,7 +287,7 @@ static inline void wait_clean_list_grace(void) +@@ -286,7 +287,7 @@ for_each_online_cpu(cpu) { flag = &per_cpu(clean_list_grace, cpu); while (test_bit(CLEAN_LIST_BUSY_BIT, flag)) @@ -29646,11 +30065,10 @@ index 657ba9f5d308..c8faaf36423a 100644 } } -diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c -index 9821e6d641bb..c6bf6ea6d1d5 100644 ---- a/net/sched/sch_generic.c -+++ b/net/sched/sch_generic.c -@@ -899,7 +899,7 @@ void dev_deactivate_many(struct list_head *head) +diff -Nur linux-4.1.39.orig/net/sched/sch_generic.c linux-4.1.39/net/sched/sch_generic.c +--- linux-4.1.39.orig/net/sched/sch_generic.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/net/sched/sch_generic.c 2017-04-18 17:56:30.657398836 +0200 +@@ -899,7 +899,7 @@ /* Wait for outstanding qdisc_run calls. */ list_for_each_entry(dev, head, close_list) while (some_qdisc_is_busy(dev)) @@ -29659,11 +30077,10 @@ index 9821e6d641bb..c6bf6ea6d1d5 100644 } void dev_deactivate(struct net_device *dev) -diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c -index 163ac45c3639..ba2313cd4e36 100644 ---- a/net/sunrpc/svc_xprt.c -+++ b/net/sunrpc/svc_xprt.c -@@ -341,7 +341,7 @@ static void svc_xprt_do_enqueue(struct svc_xprt *xprt) +diff -Nur linux-4.1.39.orig/net/sunrpc/svc_xprt.c linux-4.1.39/net/sunrpc/svc_xprt.c +--- linux-4.1.39.orig/net/sunrpc/svc_xprt.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/net/sunrpc/svc_xprt.c 2017-04-18 17:56:30.657398836 +0200 +@@ -341,7 +341,7 @@ goto out; } @@ -29672,7 +30089,7 @@ index 163ac45c3639..ba2313cd4e36 100644 pool = svc_pool_for_cpu(xprt->xpt_server, cpu); atomic_long_inc(&pool->sp_stats.packets); -@@ -377,7 +377,7 @@ redo_search: +@@ -377,7 +377,7 @@ atomic_long_inc(&pool->sp_stats.threads_woken); wake_up_process(rqstp->rq_task); @@ -29681,7 +30098,7 @@ index 163ac45c3639..ba2313cd4e36 100644 goto out; } rcu_read_unlock(); -@@ -398,7 +398,7 @@ redo_search: +@@ -398,7 +398,7 @@ goto redo_search; } rqstp = NULL; @@ -29690,11 +30107,10 @@ index 163ac45c3639..ba2313cd4e36 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.1.39.orig/scripts/mkcompile_h linux-4.1.39/scripts/mkcompile_h +--- linux-4.1.39.orig/scripts/mkcompile_h 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/scripts/mkcompile_h 2017-04-18 17:56:30.657398836 +0200 +@@ -4,7 +4,8 @@ ARCH=$2 SMP=$3 PREEMPT=$4 @@ -29704,7 +30120,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 @@ -29712,11 +30128,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 aa999e747c94..8195f789c680 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.1.39.orig/sound/core/pcm_native.c linux-4.1.39/sound/core/pcm_native.c +--- linux-4.1.39.orig/sound/core/pcm_native.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/sound/core/pcm_native.c 2017-04-18 17:56:30.661398992 +0200 +@@ -135,7 +135,7 @@ void snd_pcm_stream_lock_irq(struct snd_pcm_substream *substream) { if (!substream->pcm->nonatomic) @@ -29725,7 +30140,7 @@ index aa999e747c94..8195f789c680 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) @@ -29734,7 +30149,7 @@ index aa999e747c94..8195f789c680 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) @@ -29743,7 +30158,7 @@ index aa999e747c94..8195f789c680 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) @@ -29752,11 +30167,10 @@ index aa999e747c94..8195f789c680 100644 } EXPORT_SYMBOL_GPL(snd_pcm_stream_unlock_irqrestore); -diff --git a/sound/soc/intel/atom/sst/sst.c b/sound/soc/intel/atom/sst/sst.c -index 96c2e420cce6..a4b458e77089 100644 ---- a/sound/soc/intel/atom/sst/sst.c -+++ b/sound/soc/intel/atom/sst/sst.c -@@ -368,8 +368,8 @@ static inline void sst_restore_shim64(struct intel_sst_drv *ctx, +diff -Nur linux-4.1.39.orig/sound/soc/intel/atom/sst/sst.c linux-4.1.39/sound/soc/intel/atom/sst/sst.c +--- linux-4.1.39.orig/sound/soc/intel/atom/sst/sst.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/sound/soc/intel/atom/sst/sst.c 2017-04-18 17:56:30.661398992 +0200 +@@ -368,8 +368,8 @@ * initialize by FW or driver when firmware is loaded */ spin_lock_irqsave(&ctx->ipc_spin_lock, irq_flags); @@ -29767,11 +30181,10 @@ index 96c2e420cce6..a4b458e77089 100644 spin_unlock_irqrestore(&ctx->ipc_spin_lock, irq_flags); } -diff --git a/virt/kvm/async_pf.c b/virt/kvm/async_pf.c -index f84f5856520a..9b0cd1b03222 100644 ---- a/virt/kvm/async_pf.c -+++ b/virt/kvm/async_pf.c -@@ -94,8 +94,8 @@ static void async_pf_execute(struct work_struct *work) +diff -Nur linux-4.1.39.orig/virt/kvm/async_pf.c linux-4.1.39/virt/kvm/async_pf.c +--- linux-4.1.39.orig/virt/kvm/async_pf.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/virt/kvm/async_pf.c 2017-04-18 17:56:30.661398992 +0200 +@@ -94,8 +94,8 @@ trace_kvm_async_pf_completed(addr, gva); @@ -29782,11 +30195,10 @@ index f84f5856520a..9b0cd1b03222 100644 mmput(mm); kvm_put_kvm(vcpu->kvm); -diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c -index f9746f29f870..3424e7fe6678 100644 ---- a/virt/kvm/kvm_main.c -+++ b/virt/kvm/kvm_main.c -@@ -220,7 +220,7 @@ int kvm_vcpu_init(struct kvm_vcpu *vcpu, struct kvm *kvm, unsigned id) +diff -Nur linux-4.1.39.orig/virt/kvm/kvm_main.c linux-4.1.39/virt/kvm/kvm_main.c +--- linux-4.1.39.orig/virt/kvm/kvm_main.c 2017-03-13 21:04:36.000000000 +0100 ++++ linux-4.1.39/virt/kvm/kvm_main.c 2017-04-18 17:56:30.661398992 +0200 +@@ -220,7 +220,7 @@ vcpu->kvm = kvm; vcpu->vcpu_id = id; vcpu->pid = NULL; @@ -29795,7 +30207,7 @@ index f9746f29f870..3424e7fe6678 100644 kvm_async_pf_vcpu_init(vcpu); page = alloc_page(GFP_KERNEL | __GFP_ZERO); -@@ -1782,7 +1782,7 @@ static int kvm_vcpu_check_block(struct kvm_vcpu *vcpu) +@@ -1782,7 +1782,7 @@ void kvm_vcpu_block(struct kvm_vcpu *vcpu) { ktime_t start, cur; @@ -29804,7 +30216,7 @@ index f9746f29f870..3424e7fe6678 100644 bool waited = false; start = cur = ktime_get(); -@@ -1803,7 +1803,7 @@ void kvm_vcpu_block(struct kvm_vcpu *vcpu) +@@ -1803,7 +1803,7 @@ } for (;;) { @@ -29813,7 +30225,7 @@ index f9746f29f870..3424e7fe6678 100644 if (kvm_vcpu_check_block(vcpu) < 0) break; -@@ -1812,7 +1812,7 @@ void kvm_vcpu_block(struct kvm_vcpu *vcpu) +@@ -1812,7 +1812,7 @@ schedule(); } @@ -29822,7 +30234,7 @@ index f9746f29f870..3424e7fe6678 100644 cur = ktime_get(); out: -@@ -1828,11 +1828,11 @@ void kvm_vcpu_kick(struct kvm_vcpu *vcpu) +@@ -1828,11 +1828,11 @@ { int me; int cpu = vcpu->cpu; @@ -29837,7 +30249,7 @@ index f9746f29f870..3424e7fe6678 100644 ++vcpu->stat.halt_wakeup; } -@@ -1933,7 +1933,7 @@ void kvm_vcpu_on_spin(struct kvm_vcpu *me) +@@ -1933,7 +1933,7 @@ continue; if (vcpu == me) continue; diff --git a/target/linux/patches/4.1.35/regmap-default-on.patch b/target/linux/patches/4.1.39/regmap-default-on.patch index 8d72224bf..8d72224bf 100644 --- a/target/linux/patches/4.1.35/regmap-default-on.patch +++ b/target/linux/patches/4.1.39/regmap-default-on.patch diff --git a/target/linux/patches/4.1.35/remove-warn.patch b/target/linux/patches/4.1.39/remove-warn.patch index 1f89c710d..1f89c710d 100644 --- a/target/linux/patches/4.1.35/remove-warn.patch +++ b/target/linux/patches/4.1.39/remove-warn.patch diff --git a/target/linux/patches/4.1.35/startup.patch b/target/linux/patches/4.1.39/startup.patch index d396b75e4..d396b75e4 100644 --- a/target/linux/patches/4.1.35/startup.patch +++ b/target/linux/patches/4.1.39/startup.patch diff --git a/target/linux/patches/4.1.35/use-gawk.patch b/target/linux/patches/4.1.39/use-gawk.patch index 5b312589d..5b312589d 100644 --- a/target/linux/patches/4.1.35/use-gawk.patch +++ b/target/linux/patches/4.1.39/use-gawk.patch diff --git a/target/linux/patches/4.1.35/use-libgcc-for-sh.patch b/target/linux/patches/4.1.39/use-libgcc-for-sh.patch index 6420219b0..6420219b0 100644 --- a/target/linux/patches/4.1.35/use-libgcc-for-sh.patch +++ b/target/linux/patches/4.1.39/use-libgcc-for-sh.patch |