diff options
Diffstat (limited to 'target/linux/patches/4.1.35/patch-realtime')
| -rw-r--r-- | target/linux/patches/4.1.35/patch-realtime | 8564 |
1 files changed, 5025 insertions, 3539 deletions
diff --git a/target/linux/patches/4.1.35/patch-realtime b/target/linux/patches/4.1.35/patch-realtime index 6ecf019b9..94d6fe355 100644 --- a/target/linux/patches/4.1.35/patch-realtime +++ b/target/linux/patches/4.1.35/patch-realtime @@ -1,6 +1,313 @@ -diff -Nur linux-4.1.26.orig/arch/alpha/mm/fault.c linux-4.1.26/arch/alpha/mm/fault.c ---- linux-4.1.26.orig/arch/alpha/mm/fault.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/alpha/mm/fault.c 2016-06-19 15:30:54.915151887 +0200 +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 @@ -23,8 +23,7 @@ #include <linux/smp.h> #include <linux/interrupt.h> @@ -11,7 +318,7 @@ diff -Nur linux-4.1.26.orig/arch/alpha/mm/fault.c linux-4.1.26/arch/alpha/mm/fau extern void die_if_kernel(char *,struct pt_regs *,long, unsigned long *); -@@ -107,7 +106,7 @@ +@@ -107,7 +106,7 @@ do_page_fault(unsigned long address, unsigned long mmcsr, /* If we're in an interrupt context, or have no user context, we must not take the fault. */ @@ -20,10 +327,11 @@ diff -Nur linux-4.1.26.orig/arch/alpha/mm/fault.c linux-4.1.26/arch/alpha/mm/fau goto no_context; #ifdef CONFIG_ALPHA_LARGE_VMALLOC -diff -Nur linux-4.1.26.orig/arch/arc/include/asm/futex.h linux-4.1.26/arch/arc/include/asm/futex.h ---- linux-4.1.26.orig/arch/arc/include/asm/futex.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/arc/include/asm/futex.h 2016-06-19 15:30:54.915151887 +0200 -@@ -53,7 +53,7 @@ +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) if (!access_ok(VERIFY_WRITE, uaddr, sizeof(int))) return -EFAULT; @@ -32,7 +340,7 @@ diff -Nur linux-4.1.26.orig/arch/arc/include/asm/futex.h linux-4.1.26/arch/arc/i switch (op) { case FUTEX_OP_SET: -@@ -75,7 +75,7 @@ +@@ -75,7 +75,7 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr) ret = -ENOSYS; } @@ -41,7 +349,7 @@ diff -Nur linux-4.1.26.orig/arch/arc/include/asm/futex.h linux-4.1.26/arch/arc/i if (!ret) { switch (cmp) { -@@ -104,7 +104,7 @@ +@@ -104,7 +104,7 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr) return ret; } @@ -50,7 +358,7 @@ diff -Nur linux-4.1.26.orig/arch/arc/include/asm/futex.h linux-4.1.26/arch/arc/i * Notes: * -Best-Effort: Exchg happens only if compare succeeds. * If compare fails, returns; leaving retry/looping to upper layers -@@ -121,7 +121,7 @@ +@@ -121,7 +121,7 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, u32 oldval, if (!access_ok(VERIFY_WRITE, uaddr, sizeof(int))) return -EFAULT; @@ -59,7 +367,7 @@ diff -Nur linux-4.1.26.orig/arch/arc/include/asm/futex.h linux-4.1.26/arch/arc/i /* TBD : can use llock/scond */ __asm__ __volatile__( -@@ -142,7 +142,7 @@ +@@ -142,7 +142,7 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, u32 oldval, : "r"(oldval), "r"(newval), "r"(uaddr), "ir"(-EFAULT) : "cc", "memory"); @@ -68,10 +376,11 @@ diff -Nur linux-4.1.26.orig/arch/arc/include/asm/futex.h linux-4.1.26/arch/arc/i *uval = val; return val; -diff -Nur linux-4.1.26.orig/arch/arc/mm/fault.c linux-4.1.26/arch/arc/mm/fault.c ---- linux-4.1.26.orig/arch/arc/mm/fault.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/arc/mm/fault.c 2016-06-19 15:30:54.915151887 +0200 -@@ -86,7 +86,7 @@ +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) * If we're in an interrupt or have no user * context, we must not take the fault.. */ @@ -80,10 +389,32 @@ diff -Nur linux-4.1.26.orig/arch/arc/mm/fault.c linux-4.1.26/arch/arc/mm/fault.c goto no_context; if (user_mode(regs)) -diff -Nur linux-4.1.26.orig/arch/arm/include/asm/cmpxchg.h linux-4.1.26/arch/arm/include/asm/cmpxchg.h ---- linux-4.1.26.orig/arch/arm/include/asm/cmpxchg.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/arm/include/asm/cmpxchg.h 2016-06-19 15:30:54.919152041 +0200 -@@ -129,6 +129,8 @@ +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 #else /* min ARCH >= ARMv6 */ @@ -92,10 +423,11 @@ diff -Nur linux-4.1.26.orig/arch/arm/include/asm/cmpxchg.h linux-4.1.26/arch/arm extern void __bad_cmpxchg(volatile void *ptr, int size); /* -diff -Nur linux-4.1.26.orig/arch/arm/include/asm/futex.h linux-4.1.26/arch/arm/include/asm/futex.h ---- linux-4.1.26.orig/arch/arm/include/asm/futex.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/arm/include/asm/futex.h 2016-06-19 15:30:54.919152041 +0200 -@@ -93,6 +93,7 @@ +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, if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32))) return -EFAULT; @@ -103,7 +435,7 @@ diff -Nur linux-4.1.26.orig/arch/arm/include/asm/futex.h linux-4.1.26/arch/arm/i __asm__ __volatile__("@futex_atomic_cmpxchg_inatomic\n" "1: " TUSER(ldr) " %1, [%4]\n" " teq %1, %2\n" -@@ -104,6 +105,8 @@ +@@ -104,6 +105,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, : "cc", "memory"); *uval = val; @@ -112,7 +444,7 @@ diff -Nur linux-4.1.26.orig/arch/arm/include/asm/futex.h linux-4.1.26/arch/arm/i return ret; } -@@ -124,7 +127,10 @@ +@@ -124,7 +127,10 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr) if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32))) return -EFAULT; @@ -124,7 +456,7 @@ diff -Nur linux-4.1.26.orig/arch/arm/include/asm/futex.h linux-4.1.26/arch/arm/i switch (op) { case FUTEX_OP_SET: -@@ -146,7 +152,10 @@ +@@ -146,7 +152,10 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr) ret = -ENOSYS; } @@ -136,9 +468,10 @@ diff -Nur linux-4.1.26.orig/arch/arm/include/asm/futex.h linux-4.1.26/arch/arm/i if (!ret) { switch (cmp) { -diff -Nur linux-4.1.26.orig/arch/arm/include/asm/switch_to.h linux-4.1.26/arch/arm/include/asm/switch_to.h ---- linux-4.1.26.orig/arch/arm/include/asm/switch_to.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/arm/include/asm/switch_to.h 2016-06-19 15:30:54.919152041 +0200 +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 @@ -3,6 +3,13 @@ #include <linux/thread_info.h> @@ -153,7 +486,7 @@ diff -Nur linux-4.1.26.orig/arch/arm/include/asm/switch_to.h linux-4.1.26/arch/a /* * 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 @@ +@@ -22,6 +29,7 @@ extern struct task_struct *__switch_to(struct task_struct *, struct thread_info #define switch_to(prev,next,last) \ do { \ @@ -161,10 +494,11 @@ diff -Nur linux-4.1.26.orig/arch/arm/include/asm/switch_to.h linux-4.1.26/arch/a last = __switch_to(prev,task_thread_info(prev), task_thread_info(next)); \ } while (0) -diff -Nur linux-4.1.26.orig/arch/arm/include/asm/thread_info.h linux-4.1.26/arch/arm/include/asm/thread_info.h ---- linux-4.1.26.orig/arch/arm/include/asm/thread_info.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/arm/include/asm/thread_info.h 2016-06-19 15:30:54.919152041 +0200 -@@ -50,6 +50,7 @@ +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 { struct thread_info { unsigned long flags; /* low level flags */ int preempt_count; /* 0 => preemptable, <0 => bug */ @@ -172,7 +506,7 @@ diff -Nur linux-4.1.26.orig/arch/arm/include/asm/thread_info.h linux-4.1.26/arch mm_segment_t addr_limit; /* address limit */ struct task_struct *task; /* main task structure */ __u32 cpu; /* cpu */ -@@ -147,6 +148,7 @@ +@@ -147,6 +148,7 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *, #define TIF_SIGPENDING 0 #define TIF_NEED_RESCHED 1 #define TIF_NOTIFY_RESUME 2 /* callback before returning to user */ @@ -180,7 +514,7 @@ diff -Nur linux-4.1.26.orig/arch/arm/include/asm/thread_info.h linux-4.1.26/arch #define TIF_UPROBE 7 #define TIF_SYSCALL_TRACE 8 #define TIF_SYSCALL_AUDIT 9 -@@ -160,6 +162,7 @@ +@@ -160,6 +162,7 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *, #define _TIF_SIGPENDING (1 << TIF_SIGPENDING) #define _TIF_NEED_RESCHED (1 << TIF_NEED_RESCHED) #define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME) @@ -188,30 +522,11 @@ diff -Nur linux-4.1.26.orig/arch/arm/include/asm/thread_info.h linux-4.1.26/arch #define _TIF_UPROBE (1 << TIF_UPROBE) #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE) #define _TIF_SYSCALL_AUDIT (1 << TIF_SYSCALL_AUDIT) -diff -Nur linux-4.1.26.orig/arch/arm/Kconfig linux-4.1.26/arch/arm/Kconfig ---- linux-4.1.26.orig/arch/arm/Kconfig 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/arm/Kconfig 2016-06-19 15:30:54.919152041 +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.26.orig/arch/arm/kernel/asm-offsets.c linux-4.1.26/arch/arm/kernel/asm-offsets.c ---- linux-4.1.26.orig/arch/arm/kernel/asm-offsets.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/arm/kernel/asm-offsets.c 2016-06-19 15:30:54.919152041 +0200 -@@ -65,6 +65,7 @@ +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) BLANK(); DEFINE(TI_FLAGS, offsetof(struct thread_info, flags)); DEFINE(TI_PREEMPT, offsetof(struct thread_info, preempt_count)); @@ -219,10 +534,11 @@ diff -Nur linux-4.1.26.orig/arch/arm/kernel/asm-offsets.c linux-4.1.26/arch/arm/ 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 -Nur linux-4.1.26.orig/arch/arm/kernel/entry-armv.S linux-4.1.26/arch/arm/kernel/entry-armv.S ---- linux-4.1.26.orig/arch/arm/kernel/entry-armv.S 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/arm/kernel/entry-armv.S 2016-06-19 15:30:54.919152041 +0200 -@@ -208,11 +208,18 @@ +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: #ifdef CONFIG_PREEMPT get_thread_info tsk ldr r8, [tsk, #TI_PREEMPT] @ get preempt count @@ -243,19 +559,27 @@ diff -Nur linux-4.1.26.orig/arch/arm/kernel/entry-armv.S linux-4.1.26/arch/arm/k #endif svc_exit r5, irq = 1 @ return from exception -@@ -227,6 +234,8 @@ +@@ -227,8 +234,14 @@ svc_preempt: 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 + bne 1b + tst r0, #_TIF_NEED_RESCHED_LAZY reteq r8 @ go again - b 1b +- b 1b ++ ldr r0, [tsk, #TI_PREEMPT_LAZY] @ get preempt lazy count ++ teq r0, #0 @ if preempt lazy count != 0 ++ beq 1b ++ ret r8 @ go again ++ #endif -diff -Nur linux-4.1.26.orig/arch/arm/kernel/process.c linux-4.1.26/arch/arm/kernel/process.c ---- linux-4.1.26.orig/arch/arm/kernel/process.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/arm/kernel/process.c 2016-06-19 15:30:54.919152041 +0200 -@@ -290,6 +290,30 @@ + + __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) } #ifdef CONFIG_MMU @@ -286,10 +610,11 @@ diff -Nur linux-4.1.26.orig/arch/arm/kernel/process.c linux-4.1.26/arch/arm/kern #ifdef CONFIG_KUSER_HELPERS /* * The vectors page is always readable from user space for the -diff -Nur linux-4.1.26.orig/arch/arm/kernel/signal.c linux-4.1.26/arch/arm/kernel/signal.c ---- linux-4.1.26.orig/arch/arm/kernel/signal.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/arm/kernel/signal.c 2016-06-19 15:30:54.919152041 +0200 -@@ -568,7 +568,8 @@ +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 do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall) { do { @@ -299,10 +624,11 @@ diff -Nur linux-4.1.26.orig/arch/arm/kernel/signal.c linux-4.1.26/arch/arm/kerne schedule(); } else { if (unlikely(!user_mode(regs))) -diff -Nur linux-4.1.26.orig/arch/arm/kernel/smp.c linux-4.1.26/arch/arm/kernel/smp.c ---- linux-4.1.26.orig/arch/arm/kernel/smp.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/arm/kernel/smp.c 2016-06-19 15:30:54.919152041 +0200 -@@ -213,8 +213,6 @@ +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) flush_cache_louis(); local_flush_tlb_all(); @@ -311,7 +637,7 @@ diff -Nur linux-4.1.26.orig/arch/arm/kernel/smp.c linux-4.1.26/arch/arm/kernel/s return 0; } -@@ -230,6 +228,9 @@ +@@ -230,6 +228,9 @@ void __cpu_die(unsigned int cpu) pr_err("CPU%u: cpu didn't die\n", cpu); return; } @@ -321,10 +647,11 @@ diff -Nur linux-4.1.26.orig/arch/arm/kernel/smp.c linux-4.1.26/arch/arm/kernel/s pr_notice("CPU%u: shutdown\n", cpu); /* -diff -Nur linux-4.1.26.orig/arch/arm/kernel/unwind.c linux-4.1.26/arch/arm/kernel/unwind.c ---- linux-4.1.26.orig/arch/arm/kernel/unwind.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/arm/kernel/unwind.c 2016-06-19 15:30:54.919152041 +0200 -@@ -93,7 +93,7 @@ +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[]; static const struct unwind_idx *__origin_unwind_idx; extern const struct unwind_idx __stop_unwind_idx[]; @@ -333,7 +660,7 @@ diff -Nur linux-4.1.26.orig/arch/arm/kernel/unwind.c linux-4.1.26/arch/arm/kerne static LIST_HEAD(unwind_tables); /* Convert a prel31 symbol to an absolute address */ -@@ -201,7 +201,7 @@ +@@ -201,7 +201,7 @@ static const struct unwind_idx *unwind_find_idx(unsigned long addr) /* module unwind tables */ struct unwind_table *table; @@ -342,7 +669,7 @@ diff -Nur linux-4.1.26.orig/arch/arm/kernel/unwind.c linux-4.1.26/arch/arm/kerne list_for_each_entry(table, &unwind_tables, list) { if (addr >= table->begin_addr && addr < table->end_addr) { -@@ -213,7 +213,7 @@ +@@ -213,7 +213,7 @@ static const struct unwind_idx *unwind_find_idx(unsigned long addr) break; } } @@ -351,7 +678,7 @@ diff -Nur linux-4.1.26.orig/arch/arm/kernel/unwind.c linux-4.1.26/arch/arm/kerne } pr_debug("%s: idx = %p\n", __func__, idx); -@@ -529,9 +529,9 @@ +@@ -529,9 +529,9 @@ struct unwind_table *unwind_table_add(unsigned long start, unsigned long size, tab->begin_addr = text_addr; tab->end_addr = text_addr + text_size; @@ -363,7 +690,7 @@ diff -Nur linux-4.1.26.orig/arch/arm/kernel/unwind.c linux-4.1.26/arch/arm/kerne return tab; } -@@ -543,9 +543,9 @@ +@@ -543,9 +543,9 @@ void unwind_table_del(struct unwind_table *tab) if (!tab) return; @@ -375,10 +702,11 @@ diff -Nur linux-4.1.26.orig/arch/arm/kernel/unwind.c linux-4.1.26/arch/arm/kerne kfree(tab); } -diff -Nur linux-4.1.26.orig/arch/arm/kvm/arm.c linux-4.1.26/arch/arm/kvm/arm.c ---- linux-4.1.26.orig/arch/arm/kvm/arm.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/arm/kvm/arm.c 2016-06-19 15:30:54.919152041 +0200 -@@ -474,9 +474,9 @@ +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) static void vcpu_pause(struct kvm_vcpu *vcpu) { @@ -390,10 +718,11 @@ diff -Nur linux-4.1.26.orig/arch/arm/kvm/arm.c linux-4.1.26/arch/arm/kvm/arm.c } static int kvm_vcpu_initialized(struct kvm_vcpu *vcpu) -diff -Nur linux-4.1.26.orig/arch/arm/kvm/psci.c linux-4.1.26/arch/arm/kvm/psci.c ---- linux-4.1.26.orig/arch/arm/kvm/psci.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/arm/kvm/psci.c 2016-06-19 15:30:54.919152041 +0200 -@@ -68,7 +68,7 @@ +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) { struct kvm *kvm = source_vcpu->kvm; struct kvm_vcpu *vcpu = NULL; @@ -402,7 +731,7 @@ diff -Nur linux-4.1.26.orig/arch/arm/kvm/psci.c linux-4.1.26/arch/arm/kvm/psci.c unsigned long cpu_id; unsigned long context_id; phys_addr_t target_pc; -@@ -117,7 +117,7 @@ +@@ -117,7 +117,7 @@ static unsigned long kvm_psci_vcpu_on(struct kvm_vcpu *source_vcpu) smp_mb(); /* Make sure the above is visible */ wq = kvm_arch_vcpu_wq(vcpu); @@ -411,10 +740,242 @@ diff -Nur linux-4.1.26.orig/arch/arm/kvm/psci.c linux-4.1.26/arch/arm/kvm/psci.c return PSCI_RET_SUCCESS; } -diff -Nur linux-4.1.26.orig/arch/arm/mach-exynos/platsmp.c linux-4.1.26/arch/arm/mach-exynos/platsmp.c ---- linux-4.1.26.orig/arch/arm/mach-exynos/platsmp.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/arm/mach-exynos/platsmp.c 2016-06-19 15:30:54.919152041 +0200 -@@ -231,7 +231,7 @@ +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 +@@ -13,7 +13,6 @@ + #include <linux/of_platform.h> + + #include <asm/mach/arch.h> +-#include <asm/system_misc.h> + + #include "generic.h" + #include "soc.h" +@@ -34,7 +33,6 @@ static void __init at91rm9200_dt_device_init(void) + + of_platform_populate(NULL, of_default_bus_match_table, NULL, soc_dev); + +- arm_pm_idle = at91rm9200_idle; + 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) + soc_dev = soc_device_to_device(soc); + + of_platform_populate(NULL, of_default_bus_match_table, NULL, soc_dev); +- +- arm_pm_idle = at91sam9_idle; + } + + 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 +@@ -11,27 +11,18 @@ + #ifndef _AT91_GENERIC_H + #define _AT91_GENERIC_H + +-#include <linux/of.h> +-#include <linux/reboot.h> +- +- /* Map io */ +-extern void __init at91_map_io(void); +-extern void __init at91_alt_map_io(void); +- +-/* idle */ +-extern void at91rm9200_idle(void); +-extern void at91sam9_idle(void); +- + #ifdef CONFIG_PM + extern void __init at91rm9200_pm_init(void); + extern void __init at91sam9260_pm_init(void); + extern void __init at91sam9g45_pm_init(void); + extern void __init at91sam9x5_pm_init(void); ++extern void __init sama5_pm_init(void); + #else + static inline void __init at91rm9200_pm_init(void) { } + static inline void __init at91sam9260_pm_init(void) { } + static inline void __init at91sam9g45_pm_init(void) { } + static inline void __init at91sam9x5_pm_init(void) { } ++static inline void __init sama5_pm_init(void) { } + #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 +@@ -31,10 +31,13 @@ + #include <asm/mach/irq.h> + #include <asm/fncpy.h> + #include <asm/cacheflush.h> ++#include <asm/system_misc.h> + + #include "generic.h" + #include "pm.h" + ++static void __iomem *pmc; ++ + /* + * 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) + unsigned long scsr; + int i; + +- scsr = at91_pmc_read(AT91_PMC_SCSR); ++ scsr = readl(pmc + AT91_PMC_SCSR); + + /* 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) + + if ((scsr & (AT91_PMC_PCK0 << i)) == 0) + continue; +- +- css = at91_pmc_read(AT91_PMC_PCKR(i)) & AT91_PMC_CSS; ++ css = readl(pmc + AT91_PMC_PCKR(i)) & AT91_PMC_CSS; + 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) + flush_cache_all(); + outer_disable(); + +- at91_suspend_sram_fn(at91_pmc_base, at91_ramc_base[0], +- at91_ramc_base[1], pm_data); ++ at91_suspend_sram_fn(pmc, at91_ramc_base[0], ++ at91_ramc_base[1], pm_data); + + outer_resume(); + } +@@ -348,6 +350,21 @@ static __init void at91_dt_ramc(void) + at91_pm_set_standby(standby); + } + ++void at91rm9200_idle(void) ++{ ++ /* ++ * Disable the processor clock. The processor will be automatically ++ * re-enabled by an interrupt or by a reset. ++ */ ++ writel(AT91_PMC_PCK, pmc + AT91_PMC_SCDR); ++} ++ ++void at91sam9_idle(void) ++{ ++ writel(AT91_PMC_PCK, pmc + AT91_PMC_SCDR); ++ cpu_do_idle(); ++} ++ + 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) + &at91_pm_suspend_in_sram, at91_pm_suspend_in_sram_sz); + } + +-static void __init at91_pm_init(void) ++static const struct of_device_id atmel_pmc_ids[] __initconst = { ++ { .compatible = "atmel,at91rm9200-pmc" }, ++ { .compatible = "atmel,at91sam9260-pmc" }, ++ { .compatible = "atmel,at91sam9g45-pmc" }, ++ { .compatible = "atmel,at91sam9n12-pmc" }, ++ { .compatible = "atmel,at91sam9x5-pmc" }, ++ { .compatible = "atmel,sama5d3-pmc" }, ++ { .compatible = "atmel,sama5d2-pmc" }, ++ { /* sentinel */ }, ++}; ++ ++static void __init at91_pm_init(void (*pm_idle)(void)) + { +- at91_pm_sram_init(); ++ struct device_node *pmc_np; + + if (at91_cpuidle_device.dev.platform_data) + platform_device_register(&at91_cpuidle_device); + ++ pmc_np = of_find_matching_node(NULL, atmel_pmc_ids); ++ pmc = of_iomap(pmc_np, 0); ++ if (!pmc) { ++ pr_err("AT91: PM not supported, PMC not found\n"); ++ return; ++ } ++ ++ if (pm_idle) ++ arm_pm_idle = pm_idle; ++ ++ at91_pm_sram_init(); ++ + if (at91_suspend_sram_fn) + suspend_set_ops(&at91_pm_ops); + else +@@ -419,7 +459,7 @@ void __init at91rm9200_pm_init(void) + at91_pm_data.uhp_udp_mask = AT91RM9200_PMC_UHP | AT91RM9200_PMC_UDP; + at91_pm_data.memctrl = AT91_MEMCTRL_MC; + +- at91_pm_init(); ++ at91_pm_init(at91rm9200_idle); + } + + void __init at91sam9260_pm_init(void) +@@ -427,7 +467,7 @@ void __init at91sam9260_pm_init(void) + at91_dt_ramc(); + at91_pm_data.memctrl = AT91_MEMCTRL_SDRAMC; + at91_pm_data.uhp_udp_mask = AT91SAM926x_PMC_UHP | AT91SAM926x_PMC_UDP; +- return at91_pm_init(); ++ at91_pm_init(at91sam9_idle); + } + + void __init at91sam9g45_pm_init(void) +@@ -435,7 +475,7 @@ void __init at91sam9g45_pm_init(void) + at91_dt_ramc(); + at91_pm_data.uhp_udp_mask = AT91SAM926x_PMC_UHP; + at91_pm_data.memctrl = AT91_MEMCTRL_DDRSDR; +- return at91_pm_init(); ++ at91_pm_init(at91sam9_idle); + } + + void __init at91sam9x5_pm_init(void) +@@ -443,5 +483,13 @@ void __init at91sam9x5_pm_init(void) + at91_dt_ramc(); + at91_pm_data.uhp_udp_mask = AT91SAM926x_PMC_UHP | AT91SAM926x_PMC_UDP; + at91_pm_data.memctrl = AT91_MEMCTRL_DDRSDR; +- return at91_pm_init(); ++ at91_pm_init(at91sam9_idle); ++} ++ ++void __init sama5_pm_init(void) ++{ ++ at91_dt_ramc(); ++ at91_pm_data.uhp_udp_mask = AT91SAM926x_PMC_UHP | AT91SAM926x_PMC_UDP; ++ 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) + soc_dev = soc_device_to_device(soc); + + of_platform_populate(NULL, of_default_bus_match_table, NULL, soc_dev); +- at91sam9x5_pm_init(); ++ sama5_pm_init(); + } + + 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) return (void __iomem *)(S5P_VA_SCU); } @@ -423,7 +984,7 @@ diff -Nur linux-4.1.26.orig/arch/arm/mach-exynos/platsmp.c linux-4.1.26/arch/arm static void exynos_secondary_init(unsigned int cpu) { -@@ -244,8 +244,8 @@ +@@ -244,8 +244,8 @@ static void exynos_secondary_init(unsigned int cpu) /* * Synchronise with the boot thread. */ @@ -434,7 +995,7 @@ diff -Nur linux-4.1.26.orig/arch/arm/mach-exynos/platsmp.c linux-4.1.26/arch/arm } static int exynos_boot_secondary(unsigned int cpu, struct task_struct *idle) -@@ -259,7 +259,7 @@ +@@ -259,7 +259,7 @@ static int exynos_boot_secondary(unsigned int cpu, struct task_struct *idle) * Set synchronisation state between this boot processor * and the secondary one */ @@ -443,7 +1004,7 @@ diff -Nur linux-4.1.26.orig/arch/arm/mach-exynos/platsmp.c linux-4.1.26/arch/arm /* * The secondary processor is waiting to be released from -@@ -286,7 +286,7 @@ +@@ -286,7 +286,7 @@ static int exynos_boot_secondary(unsigned int cpu, struct task_struct *idle) if (timeout == 0) { printk(KERN_ERR "cpu1 power enable failed"); @@ -452,7 +1013,7 @@ diff -Nur linux-4.1.26.orig/arch/arm/mach-exynos/platsmp.c linux-4.1.26/arch/arm return -ETIMEDOUT; } } -@@ -342,7 +342,7 @@ +@@ -342,7 +342,7 @@ static int exynos_boot_secondary(unsigned int cpu, struct task_struct *idle) * calibrations, then wait for it to finish */ fail: @@ -461,9 +1022,10 @@ diff -Nur linux-4.1.26.orig/arch/arm/mach-exynos/platsmp.c linux-4.1.26/arch/arm return pen_release != -1 ? ret : 0; } -diff -Nur linux-4.1.26.orig/arch/arm/mach-hisi/platmcpm.c linux-4.1.26/arch/arm/mach-hisi/platmcpm.c ---- linux-4.1.26.orig/arch/arm/mach-hisi/platmcpm.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/arm/mach-hisi/platmcpm.c 2016-06-19 15:30:54.923152195 +0200 +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 @@ -57,7 +57,7 @@ static void __iomem *sysctrl, *fabric; @@ -473,7 +1035,7 @@ diff -Nur linux-4.1.26.orig/arch/arm/mach-hisi/platmcpm.c linux-4.1.26/arch/arm/ static u32 fabric_phys_addr; /* * [0]: bootwrapper physical address -@@ -104,7 +104,7 @@ +@@ -104,7 +104,7 @@ static int hip04_mcpm_power_up(unsigned int cpu, unsigned int cluster) if (cluster >= HIP04_MAX_CLUSTERS || cpu >= HIP04_MAX_CPUS_PER_CLUSTER) return -EINVAL; @@ -482,7 +1044,7 @@ diff -Nur linux-4.1.26.orig/arch/arm/mach-hisi/platmcpm.c linux-4.1.26/arch/arm/ if (hip04_cpu_table[cluster][cpu]) goto out; -@@ -133,7 +133,7 @@ +@@ -133,7 +133,7 @@ static int hip04_mcpm_power_up(unsigned int cpu, unsigned int cluster) udelay(20); out: hip04_cpu_table[cluster][cpu]++; @@ -491,7 +1053,7 @@ diff -Nur linux-4.1.26.orig/arch/arm/mach-hisi/platmcpm.c linux-4.1.26/arch/arm/ return 0; } -@@ -149,7 +149,7 @@ +@@ -149,7 +149,7 @@ static void hip04_mcpm_power_down(void) __mcpm_cpu_going_down(cpu, cluster); @@ -500,7 +1062,7 @@ diff -Nur linux-4.1.26.orig/arch/arm/mach-hisi/platmcpm.c linux-4.1.26/arch/arm/ BUG_ON(__mcpm_cluster_state(cluster) != CLUSTER_UP); hip04_cpu_table[cluster][cpu]--; if (hip04_cpu_table[cluster][cpu] == 1) { -@@ -162,7 +162,7 @@ +@@ -162,7 +162,7 @@ static void hip04_mcpm_power_down(void) last_man = hip04_cluster_is_down(cluster); if (last_man && __mcpm_outbound_enter_critical(cpu, cluster)) { @@ -509,7 +1071,7 @@ diff -Nur linux-4.1.26.orig/arch/arm/mach-hisi/platmcpm.c linux-4.1.26/arch/arm/ /* Since it's Cortex A15, disable L2 prefetching. */ asm volatile( "mcr p15, 1, %0, c15, c0, 3 \n\t" -@@ -173,7 +173,7 @@ +@@ -173,7 +173,7 @@ static void hip04_mcpm_power_down(void) hip04_set_snoop_filter(cluster, 0); __mcpm_outbound_leave_critical(cluster, CLUSTER_DOWN); } else { @@ -518,7 +1080,7 @@ diff -Nur linux-4.1.26.orig/arch/arm/mach-hisi/platmcpm.c linux-4.1.26/arch/arm/ v7_exit_coherency_flush(louis); } -@@ -192,7 +192,7 @@ +@@ -192,7 +192,7 @@ static int hip04_mcpm_wait_for_powerdown(unsigned int cpu, unsigned int cluster) cpu >= HIP04_MAX_CPUS_PER_CLUSTER); count = TIMEOUT_MSEC / POLL_MSEC; @@ -527,7 +1089,7 @@ diff -Nur linux-4.1.26.orig/arch/arm/mach-hisi/platmcpm.c linux-4.1.26/arch/arm/ for (tries = 0; tries < count; tries++) { if (hip04_cpu_table[cluster][cpu]) { ret = -EBUSY; -@@ -202,10 +202,10 @@ +@@ -202,10 +202,10 @@ static int hip04_mcpm_wait_for_powerdown(unsigned int cpu, unsigned int cluster) data = readl_relaxed(sysctrl + SC_CPU_RESET_STATUS(cluster)); if (data & CORE_WFI_STATUS(cpu)) break; @@ -540,7 +1102,7 @@ diff -Nur linux-4.1.26.orig/arch/arm/mach-hisi/platmcpm.c linux-4.1.26/arch/arm/ } if (tries >= count) goto err; -@@ -220,10 +220,10 @@ +@@ -220,10 +220,10 @@ static int hip04_mcpm_wait_for_powerdown(unsigned int cpu, unsigned int cluster) } if (tries >= count) goto err; @@ -553,7 +1115,7 @@ diff -Nur linux-4.1.26.orig/arch/arm/mach-hisi/platmcpm.c linux-4.1.26/arch/arm/ return ret; } -@@ -235,10 +235,10 @@ +@@ -235,10 +235,10 @@ static void hip04_mcpm_powered_up(void) cpu = MPIDR_AFFINITY_LEVEL(mpidr, 0); cluster = MPIDR_AFFINITY_LEVEL(mpidr, 1); @@ -566,10 +1128,11 @@ diff -Nur linux-4.1.26.orig/arch/arm/mach-hisi/platmcpm.c linux-4.1.26/arch/arm/ } static void __naked hip04_mcpm_power_up_setup(unsigned int affinity_level) -diff -Nur linux-4.1.26.orig/arch/arm/mach-omap2/gpio.c linux-4.1.26/arch/arm/mach-omap2/gpio.c ---- linux-4.1.26.orig/arch/arm/mach-omap2/gpio.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/arm/mach-omap2/gpio.c 2016-06-19 15:30:54.923152195 +0200 -@@ -130,7 +130,6 @@ +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) } pwrdm = omap_hwmod_get_pwrdm(oh); @@ -577,9 +1140,10 @@ diff -Nur linux-4.1.26.orig/arch/arm/mach-omap2/gpio.c linux-4.1.26/arch/arm/mac pdev = omap_device_build(name, id - 1, oh, pdata, sizeof(*pdata)); kfree(pdata); -diff -Nur linux-4.1.26.orig/arch/arm/mach-omap2/omap-smp.c linux-4.1.26/arch/arm/mach-omap2/omap-smp.c ---- linux-4.1.26.orig/arch/arm/mach-omap2/omap-smp.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/arm/mach-omap2/omap-smp.c 2016-06-19 15:30:54.923152195 +0200 +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 @@ -43,7 +43,7 @@ /* SCU base address */ static void __iomem *scu_base; @@ -589,7 +1153,7 @@ diff -Nur linux-4.1.26.orig/arch/arm/mach-omap2/omap-smp.c linux-4.1.26/arch/arm void __iomem *omap4_get_scu_base(void) { -@@ -74,8 +74,8 @@ +@@ -74,8 +74,8 @@ static void omap4_secondary_init(unsigned int cpu) /* * Synchronise with the boot thread. */ @@ -600,7 +1164,7 @@ diff -Nur linux-4.1.26.orig/arch/arm/mach-omap2/omap-smp.c linux-4.1.26/arch/arm } static int omap4_boot_secondary(unsigned int cpu, struct task_struct *idle) -@@ -89,7 +89,7 @@ +@@ -89,7 +89,7 @@ static int omap4_boot_secondary(unsigned int cpu, struct task_struct *idle) * Set synchronisation state between this boot processor * and the secondary one */ @@ -609,7 +1173,7 @@ diff -Nur linux-4.1.26.orig/arch/arm/mach-omap2/omap-smp.c linux-4.1.26/arch/arm /* * Update the AuxCoreBoot0 with boot state for secondary core. -@@ -166,7 +166,7 @@ +@@ -166,7 +166,7 @@ static int omap4_boot_secondary(unsigned int cpu, struct task_struct *idle) * Now the secondary core is starting up let it run its * calibrations, then wait for it to finish */ @@ -618,10 +1182,11 @@ diff -Nur linux-4.1.26.orig/arch/arm/mach-omap2/omap-smp.c linux-4.1.26/arch/arm return 0; } -diff -Nur linux-4.1.26.orig/arch/arm/mach-omap2/powerdomain.c linux-4.1.26/arch/arm/mach-omap2/powerdomain.c ---- linux-4.1.26.orig/arch/arm/mach-omap2/powerdomain.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/arm/mach-omap2/powerdomain.c 2016-06-19 15:30:54.923152195 +0200 -@@ -1166,43 +1166,3 @@ +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) return count; } @@ -665,10 +1230,11 @@ diff -Nur linux-4.1.26.orig/arch/arm/mach-omap2/powerdomain.c linux-4.1.26/arch/ - - return 0; -} -diff -Nur linux-4.1.26.orig/arch/arm/mach-omap2/powerdomain.h linux-4.1.26/arch/arm/mach-omap2/powerdomain.h ---- linux-4.1.26.orig/arch/arm/mach-omap2/powerdomain.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/arm/mach-omap2/powerdomain.h 2016-06-19 15:30:54.923152195 +0200 -@@ -244,7 +244,6 @@ +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); int pwrdm_pre_transition(struct powerdomain *pwrdm); int pwrdm_post_transition(struct powerdomain *pwrdm); int pwrdm_get_context_loss_count(struct powerdomain *pwrdm); @@ -676,9 +1242,10 @@ diff -Nur linux-4.1.26.orig/arch/arm/mach-omap2/powerdomain.h linux-4.1.26/arch/ extern int omap_set_pwrdm_state(struct powerdomain *pwrdm, u8 state); -diff -Nur linux-4.1.26.orig/arch/arm/mach-prima2/platsmp.c linux-4.1.26/arch/arm/mach-prima2/platsmp.c ---- linux-4.1.26.orig/arch/arm/mach-prima2/platsmp.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/arm/mach-prima2/platsmp.c 2016-06-19 15:30:54.923152195 +0200 +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 @@ -22,7 +22,7 @@ static void __iomem *clk_base; @@ -688,7 +1255,7 @@ diff -Nur linux-4.1.26.orig/arch/arm/mach-prima2/platsmp.c linux-4.1.26/arch/arm static void sirfsoc_secondary_init(unsigned int cpu) { -@@ -36,8 +36,8 @@ +@@ -36,8 +36,8 @@ static void sirfsoc_secondary_init(unsigned int cpu) /* * Synchronise with the boot thread. */ @@ -699,7 +1266,7 @@ diff -Nur linux-4.1.26.orig/arch/arm/mach-prima2/platsmp.c linux-4.1.26/arch/arm } static const struct of_device_id clk_ids[] = { -@@ -75,7 +75,7 @@ +@@ -75,7 +75,7 @@ static int sirfsoc_boot_secondary(unsigned int cpu, struct task_struct *idle) /* make sure write buffer is drained */ mb(); @@ -708,7 +1275,7 @@ diff -Nur linux-4.1.26.orig/arch/arm/mach-prima2/platsmp.c linux-4.1.26/arch/arm /* * The secondary processor is waiting to be released from -@@ -107,7 +107,7 @@ +@@ -107,7 +107,7 @@ static int sirfsoc_boot_secondary(unsigned int cpu, struct task_struct *idle) * now the secondary core is starting up let it run its * calibrations, then wait for it to finish */ @@ -717,9 +1284,10 @@ diff -Nur linux-4.1.26.orig/arch/arm/mach-prima2/platsmp.c linux-4.1.26/arch/arm return pen_release != -1 ? -ENOSYS : 0; } -diff -Nur linux-4.1.26.orig/arch/arm/mach-qcom/platsmp.c linux-4.1.26/arch/arm/mach-qcom/platsmp.c ---- linux-4.1.26.orig/arch/arm/mach-qcom/platsmp.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/arm/mach-qcom/platsmp.c 2016-06-19 15:30:54.923152195 +0200 +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 @@ -46,7 +46,7 @@ extern void secondary_startup_arm(void); @@ -729,7 +1297,7 @@ diff -Nur linux-4.1.26.orig/arch/arm/mach-qcom/platsmp.c linux-4.1.26/arch/arm/m #ifdef CONFIG_HOTPLUG_CPU static void __ref qcom_cpu_die(unsigned int cpu) -@@ -60,8 +60,8 @@ +@@ -60,8 +60,8 @@ static void qcom_secondary_init(unsigned int cpu) /* * Synchronise with the boot thread. */ @@ -740,7 +1308,7 @@ diff -Nur linux-4.1.26.orig/arch/arm/mach-qcom/platsmp.c linux-4.1.26/arch/arm/m } static int scss_release_secondary(unsigned int cpu) -@@ -284,7 +284,7 @@ +@@ -284,7 +284,7 @@ static int qcom_boot_secondary(unsigned int cpu, int (*func)(unsigned int)) * set synchronisation state between this boot processor * and the secondary one */ @@ -749,7 +1317,7 @@ diff -Nur linux-4.1.26.orig/arch/arm/mach-qcom/platsmp.c linux-4.1.26/arch/arm/m /* * Send the secondary CPU a soft interrupt, thereby causing -@@ -297,7 +297,7 @@ +@@ -297,7 +297,7 @@ static int qcom_boot_secondary(unsigned int cpu, int (*func)(unsigned int)) * now the secondary core is starting up let it run its * calibrations, then wait for it to finish */ @@ -758,10 +1326,11 @@ diff -Nur linux-4.1.26.orig/arch/arm/mach-qcom/platsmp.c linux-4.1.26/arch/arm/m return ret; } -diff -Nur linux-4.1.26.orig/arch/arm/mach-spear/platsmp.c linux-4.1.26/arch/arm/mach-spear/platsmp.c ---- linux-4.1.26.orig/arch/arm/mach-spear/platsmp.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/arm/mach-spear/platsmp.c 2016-06-19 15:30:54.923152195 +0200 -@@ -32,7 +32,7 @@ +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) sync_cache_w(&pen_release); } @@ -770,7 +1339,7 @@ diff -Nur linux-4.1.26.orig/arch/arm/mach-spear/platsmp.c linux-4.1.26/arch/arm/ static void __iomem *scu_base = IOMEM(VA_SCU_BASE); -@@ -47,8 +47,8 @@ +@@ -47,8 +47,8 @@ static void spear13xx_secondary_init(unsigned int cpu) /* * Synchronise with the boot thread. */ @@ -781,7 +1350,7 @@ diff -Nur linux-4.1.26.orig/arch/arm/mach-spear/platsmp.c linux-4.1.26/arch/arm/ } static int spear13xx_boot_secondary(unsigned int cpu, struct task_struct *idle) -@@ -59,7 +59,7 @@ +@@ -59,7 +59,7 @@ static int spear13xx_boot_secondary(unsigned int cpu, struct task_struct *idle) * set synchronisation state between this boot processor * and the secondary one */ @@ -790,7 +1359,7 @@ diff -Nur linux-4.1.26.orig/arch/arm/mach-spear/platsmp.c linux-4.1.26/arch/arm/ /* * The secondary processor is waiting to be released from -@@ -84,7 +84,7 @@ +@@ -84,7 +84,7 @@ static int spear13xx_boot_secondary(unsigned int cpu, struct task_struct *idle) * now the secondary core is starting up let it run its * calibrations, then wait for it to finish */ @@ -799,10 +1368,11 @@ diff -Nur linux-4.1.26.orig/arch/arm/mach-spear/platsmp.c linux-4.1.26/arch/arm/ return pen_release != -1 ? -ENOSYS : 0; } -diff -Nur linux-4.1.26.orig/arch/arm/mach-sti/platsmp.c linux-4.1.26/arch/arm/mach-sti/platsmp.c ---- linux-4.1.26.orig/arch/arm/mach-sti/platsmp.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/arm/mach-sti/platsmp.c 2016-06-19 15:30:54.923152195 +0200 -@@ -34,7 +34,7 @@ +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) sync_cache_w(&pen_release); } @@ -811,7 +1381,7 @@ diff -Nur linux-4.1.26.orig/arch/arm/mach-sti/platsmp.c linux-4.1.26/arch/arm/ma static void sti_secondary_init(unsigned int cpu) { -@@ -49,8 +49,8 @@ +@@ -49,8 +49,8 @@ static void sti_secondary_init(unsigned int cpu) /* * Synchronise with the boot thread. */ @@ -822,7 +1392,7 @@ diff -Nur linux-4.1.26.orig/arch/arm/mach-sti/platsmp.c linux-4.1.26/arch/arm/ma } static int sti_boot_secondary(unsigned int cpu, struct task_struct *idle) -@@ -61,7 +61,7 @@ +@@ -61,7 +61,7 @@ static int sti_boot_secondary(unsigned int cpu, struct task_struct *idle) * set synchronisation state between this boot processor * and the secondary one */ @@ -831,7 +1401,7 @@ diff -Nur linux-4.1.26.orig/arch/arm/mach-sti/platsmp.c linux-4.1.26/arch/arm/ma /* * The secondary processor is waiting to be released from -@@ -92,7 +92,7 @@ +@@ -92,7 +92,7 @@ static int sti_boot_secondary(unsigned int cpu, struct task_struct *idle) * now the secondary core is starting up let it run its * calibrations, then wait for it to finish */ @@ -840,10 +1410,11 @@ diff -Nur linux-4.1.26.orig/arch/arm/mach-sti/platsmp.c linux-4.1.26/arch/arm/ma return pen_release != -1 ? -ENOSYS : 0; } -diff -Nur linux-4.1.26.orig/arch/arm/mach-ux500/platsmp.c linux-4.1.26/arch/arm/mach-ux500/platsmp.c ---- linux-4.1.26.orig/arch/arm/mach-ux500/platsmp.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/arm/mach-ux500/platsmp.c 2016-06-19 15:30:54.923152195 +0200 -@@ -51,7 +51,7 @@ +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) return NULL; } @@ -852,7 +1423,7 @@ diff -Nur linux-4.1.26.orig/arch/arm/mach-ux500/platsmp.c linux-4.1.26/arch/arm/ static void ux500_secondary_init(unsigned int cpu) { -@@ -64,8 +64,8 @@ +@@ -64,8 +64,8 @@ static void ux500_secondary_init(unsigned int cpu) /* * Synchronise with the boot thread. */ @@ -863,7 +1434,7 @@ diff -Nur linux-4.1.26.orig/arch/arm/mach-ux500/platsmp.c linux-4.1.26/arch/arm/ } static int ux500_boot_secondary(unsigned int cpu, struct task_struct *idle) -@@ -76,7 +76,7 @@ +@@ -76,7 +76,7 @@ static int ux500_boot_secondary(unsigned int cpu, struct task_struct *idle) * set synchronisation state between this boot processor * and the secondary one */ @@ -872,7 +1443,7 @@ diff -Nur linux-4.1.26.orig/arch/arm/mach-ux500/platsmp.c linux-4.1.26/arch/arm/ /* * The secondary processor is waiting to be released from -@@ -97,7 +97,7 @@ +@@ -97,7 +97,7 @@ static int ux500_boot_secondary(unsigned int cpu, struct task_struct *idle) * now the secondary core is starting up let it run its * calibrations, then wait for it to finish */ @@ -881,10 +1452,11 @@ diff -Nur linux-4.1.26.orig/arch/arm/mach-ux500/platsmp.c linux-4.1.26/arch/arm/ return pen_release != -1 ? -ENOSYS : 0; } -diff -Nur linux-4.1.26.orig/arch/arm/mm/fault.c linux-4.1.26/arch/arm/mm/fault.c ---- linux-4.1.26.orig/arch/arm/mm/fault.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/arm/mm/fault.c 2016-06-19 15:30:54.923152195 +0200 -@@ -276,7 +276,7 @@ +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) * If we're in an interrupt or have no user * context, we must not take the fault.. */ @@ -893,7 +1465,7 @@ diff -Nur linux-4.1.26.orig/arch/arm/mm/fault.c linux-4.1.26/arch/arm/mm/fault.c goto no_context; if (user_mode(regs)) -@@ -430,6 +430,9 @@ +@@ -430,6 +430,9 @@ do_translation_fault(unsigned long addr, unsigned int fsr, if (addr < TASK_SIZE) return do_page_fault(addr, fsr, regs); @@ -903,7 +1475,7 @@ diff -Nur linux-4.1.26.orig/arch/arm/mm/fault.c linux-4.1.26/arch/arm/mm/fault.c if (user_mode(regs)) goto bad_area; -@@ -497,6 +500,9 @@ +@@ -497,6 +500,9 @@ do_translation_fault(unsigned long addr, unsigned int fsr, static int do_sect_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs) { @@ -913,10 +1485,11 @@ diff -Nur linux-4.1.26.orig/arch/arm/mm/fault.c linux-4.1.26/arch/arm/mm/fault.c do_bad_area(addr, fsr, regs); return 0; } -diff -Nur linux-4.1.26.orig/arch/arm/mm/highmem.c linux-4.1.26/arch/arm/mm/highmem.c ---- linux-4.1.26.orig/arch/arm/mm/highmem.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/arm/mm/highmem.c 2016-06-19 15:30:54.923152195 +0200 -@@ -54,11 +54,13 @@ +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); void *kmap_atomic(struct page *page) { @@ -930,7 +1503,7 @@ diff -Nur linux-4.1.26.orig/arch/arm/mm/highmem.c linux-4.1.26/arch/arm/mm/highm pagefault_disable(); if (!PageHighMem(page)) return page_address(page); -@@ -92,7 +94,10 @@ +@@ -92,7 +94,10 @@ void *kmap_atomic(struct page *page) * in place, so the contained TLB flush ensures the TLB is updated * with the new mapping. */ @@ -942,7 +1515,7 @@ diff -Nur linux-4.1.26.orig/arch/arm/mm/highmem.c linux-4.1.26/arch/arm/mm/highm return (void *)vaddr; } -@@ -109,27 +114,33 @@ +@@ -109,27 +114,33 @@ void __kunmap_atomic(void *kvaddr) if (cache_is_vivt()) __cpuc_flush_dcache_area((void *)vaddr, PAGE_SIZE); @@ -977,7 +1550,7 @@ diff -Nur linux-4.1.26.orig/arch/arm/mm/highmem.c linux-4.1.26/arch/arm/mm/highm pagefault_disable(); if (!PageHighMem(page)) return page_address(page); -@@ -140,7 +151,10 @@ +@@ -140,7 +151,10 @@ void *kmap_atomic_pfn(unsigned long pfn) #ifdef CONFIG_DEBUG_HIGHMEM BUG_ON(!pte_none(get_fixmap_pte(vaddr))); #endif @@ -989,7 +1562,7 @@ diff -Nur linux-4.1.26.orig/arch/arm/mm/highmem.c linux-4.1.26/arch/arm/mm/highm return (void *)vaddr; } -@@ -154,3 +168,28 @@ +@@ -154,3 +168,28 @@ struct page *kmap_atomic_to_page(const void *ptr) return pte_page(get_fixmap_pte(vaddr)); } @@ -1018,10 +1591,11 @@ diff -Nur linux-4.1.26.orig/arch/arm/mm/highmem.c linux-4.1.26/arch/arm/mm/highm + } +} +#endif -diff -Nur linux-4.1.26.orig/arch/arm/plat-versatile/platsmp.c linux-4.1.26/arch/arm/plat-versatile/platsmp.c ---- linux-4.1.26.orig/arch/arm/plat-versatile/platsmp.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/arm/plat-versatile/platsmp.c 2016-06-19 15:30:54.923152195 +0200 -@@ -30,7 +30,7 @@ +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) sync_cache_w(&pen_release); } @@ -1030,7 +1604,7 @@ diff -Nur linux-4.1.26.orig/arch/arm/plat-versatile/platsmp.c linux-4.1.26/arch/ void versatile_secondary_init(unsigned int cpu) { -@@ -43,8 +43,8 @@ +@@ -43,8 +43,8 @@ void versatile_secondary_init(unsigned int cpu) /* * Synchronise with the boot thread. */ @@ -1041,7 +1615,7 @@ diff -Nur linux-4.1.26.orig/arch/arm/plat-versatile/platsmp.c linux-4.1.26/arch/ } int versatile_boot_secondary(unsigned int cpu, struct task_struct *idle) -@@ -55,7 +55,7 @@ +@@ -55,7 +55,7 @@ int versatile_boot_secondary(unsigned int cpu, struct task_struct *idle) * Set synchronisation state between this boot processor * and the secondary one */ @@ -1050,7 +1624,7 @@ diff -Nur linux-4.1.26.orig/arch/arm/plat-versatile/platsmp.c linux-4.1.26/arch/ /* * This is really belt and braces; we hold unintended secondary -@@ -85,7 +85,7 @@ +@@ -85,7 +85,7 @@ int versatile_boot_secondary(unsigned int cpu, struct task_struct *idle) * now the secondary core is starting up let it run its * calibrations, then wait for it to finish */ @@ -1059,10 +1633,35 @@ diff -Nur linux-4.1.26.orig/arch/arm/plat-versatile/platsmp.c linux-4.1.26/arch/ return pen_release != -1 ? -ENOSYS : 0; } -diff -Nur linux-4.1.26.orig/arch/arm64/include/asm/futex.h linux-4.1.26/arch/arm64/include/asm/futex.h ---- linux-4.1.26.orig/arch/arm64/include/asm/futex.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/arm64/include/asm/futex.h 2016-06-19 15:30:54.923152195 +0200 -@@ -58,7 +58,7 @@ +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) if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32))) return -EFAULT; @@ -1071,7 +1670,7 @@ diff -Nur linux-4.1.26.orig/arch/arm64/include/asm/futex.h linux-4.1.26/arch/arm switch (op) { case FUTEX_OP_SET: -@@ -85,7 +85,7 @@ +@@ -85,7 +85,7 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr) ret = -ENOSYS; } @@ -1080,10 +1679,11 @@ diff -Nur linux-4.1.26.orig/arch/arm64/include/asm/futex.h linux-4.1.26/arch/arm if (!ret) { switch (cmp) { -diff -Nur linux-4.1.26.orig/arch/arm64/include/asm/thread_info.h linux-4.1.26/arch/arm64/include/asm/thread_info.h ---- linux-4.1.26.orig/arch/arm64/include/asm/thread_info.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/arm64/include/asm/thread_info.h 2016-06-19 15:30:54.923152195 +0200 -@@ -47,6 +47,7 @@ +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 { mm_segment_t addr_limit; /* address limit */ struct task_struct *task; /* main task structure */ int preempt_count; /* 0 => preemptable, <0 => bug */ @@ -1091,7 +1691,7 @@ diff -Nur linux-4.1.26.orig/arch/arm64/include/asm/thread_info.h linux-4.1.26/ar int cpu; /* cpu */ }; -@@ -101,6 +102,7 @@ +@@ -101,6 +102,7 @@ static inline struct thread_info *current_thread_info(void) #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 */ @@ -1099,7 +1699,7 @@ diff -Nur linux-4.1.26.orig/arch/arm64/include/asm/thread_info.h linux-4.1.26/ar #define TIF_NOHZ 7 #define TIF_SYSCALL_TRACE 8 #define TIF_SYSCALL_AUDIT 9 -@@ -117,6 +119,7 @@ +@@ -117,6 +119,7 @@ static inline struct thread_info *current_thread_info(void) #define _TIF_NEED_RESCHED (1 << TIF_NEED_RESCHED) #define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME) #define _TIF_FOREIGN_FPSTATE (1 << TIF_FOREIGN_FPSTATE) @@ -1107,33 +1707,11 @@ diff -Nur linux-4.1.26.orig/arch/arm64/include/asm/thread_info.h linux-4.1.26/ar #define _TIF_NOHZ (1 << TIF_NOHZ) #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE) #define _TIF_SYSCALL_AUDIT (1 << TIF_SYSCALL_AUDIT) -diff -Nur linux-4.1.26.orig/arch/arm64/Kconfig linux-4.1.26/arch/arm64/Kconfig ---- linux-4.1.26.orig/arch/arm64/Kconfig 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/arm64/Kconfig 2016-06-19 15:30:54.923152195 +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.26.orig/arch/arm64/kernel/asm-offsets.c linux-4.1.26/arch/arm64/kernel/asm-offsets.c ---- linux-4.1.26.orig/arch/arm64/kernel/asm-offsets.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/arm64/kernel/asm-offsets.c 2016-06-19 15:30:54.923152195 +0200 -@@ -35,6 +35,7 @@ +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) BLANK(); DEFINE(TI_FLAGS, offsetof(struct thread_info, flags)); DEFINE(TI_PREEMPT, offsetof(struct thread_info, preempt_count)); @@ -1141,10 +1719,11 @@ diff -Nur linux-4.1.26.orig/arch/arm64/kernel/asm-offsets.c linux-4.1.26/arch/ar 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 -Nur linux-4.1.26.orig/arch/arm64/kernel/entry.S linux-4.1.26/arch/arm64/kernel/entry.S ---- linux-4.1.26.orig/arch/arm64/kernel/entry.S 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/arm64/kernel/entry.S 2016-06-19 15:30:58.591293647 +0200 -@@ -367,11 +367,16 @@ +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: #ifdef CONFIG_PREEMPT get_thread_info tsk ldr w24, [tsk, #TI_PREEMPT] // get preempt count @@ -1164,7 +1743,7 @@ diff -Nur linux-4.1.26.orig/arch/arm64/kernel/entry.S linux-4.1.26/arch/arm64/ke #endif #ifdef CONFIG_TRACE_IRQFLAGS bl trace_hardirqs_on -@@ -385,6 +390,7 @@ +@@ -398,6 +403,7 @@ el1_preempt: 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? @@ -1172,7 +1751,7 @@ diff -Nur linux-4.1.26.orig/arch/arm64/kernel/entry.S linux-4.1.26/arch/arm64/ke ret x24 #endif -@@ -622,6 +628,7 @@ +@@ -635,6 +641,7 @@ fast_work_pending: str x0, [sp, #S_X0] // returned x0 work_pending: tbnz x1, #TIF_NEED_RESCHED, work_resched @@ -1180,10 +1759,11 @@ diff -Nur linux-4.1.26.orig/arch/arm64/kernel/entry.S linux-4.1.26/arch/arm64/ke /* TIF_SIGPENDING, TIF_NOTIFY_RESUME or TIF_FOREIGN_FPSTATE case */ ldr x2, [sp, #S_PSTATE] mov x0, sp // 'regs' -diff -Nur linux-4.1.26.orig/arch/arm64/kernel/insn.c linux-4.1.26/arch/arm64/kernel/insn.c ---- linux-4.1.26.orig/arch/arm64/kernel/insn.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/arm64/kernel/insn.c 2016-06-19 15:30:58.595293802 +0200 -@@ -77,7 +77,7 @@ +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) } } @@ -1192,7 +1772,7 @@ diff -Nur linux-4.1.26.orig/arch/arm64/kernel/insn.c linux-4.1.26/arch/arm64/ker static void __kprobes *patch_map(void *addr, int fixmap) { -@@ -124,13 +124,13 @@ +@@ -124,13 +124,13 @@ static int __kprobes __aarch64_insn_write(void *addr, u32 insn) unsigned long flags = 0; int ret; @@ -1208,10 +1788,11 @@ diff -Nur linux-4.1.26.orig/arch/arm64/kernel/insn.c linux-4.1.26/arch/arm64/ker return ret; } -diff -Nur linux-4.1.26.orig/arch/arm64/kernel/perf_event.c linux-4.1.26/arch/arm64/kernel/perf_event.c ---- linux-4.1.26.orig/arch/arm64/kernel/perf_event.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/arm64/kernel/perf_event.c 2016-06-19 15:30:58.595293802 +0200 -@@ -488,7 +488,7 @@ +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) } err = request_irq(irq, armpmu->handle_irq, @@ -1220,10 +1801,11 @@ diff -Nur linux-4.1.26.orig/arch/arm64/kernel/perf_event.c linux-4.1.26/arch/arm "arm-pmu", armpmu); if (err) { pr_err("unable to request IRQ%d for ARM PMU counters\n", -diff -Nur linux-4.1.26.orig/arch/arm64/mm/fault.c linux-4.1.26/arch/arm64/mm/fault.c ---- linux-4.1.26.orig/arch/arm64/mm/fault.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/arm64/mm/fault.c 2016-06-19 15:30:58.595293802 +0200 -@@ -211,7 +211,7 @@ +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, * If we're in an interrupt or have no user context, we must not take * the fault. */ @@ -1232,10 +1814,11 @@ diff -Nur linux-4.1.26.orig/arch/arm64/mm/fault.c linux-4.1.26/arch/arm64/mm/fau goto no_context; if (user_mode(regs)) -diff -Nur linux-4.1.26.orig/arch/avr32/include/asm/uaccess.h linux-4.1.26/arch/avr32/include/asm/uaccess.h ---- linux-4.1.26.orig/arch/avr32/include/asm/uaccess.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/avr32/include/asm/uaccess.h 2016-06-19 15:30:58.595293802 +0200 -@@ -97,7 +97,8 @@ +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, * @x: Value to copy to user space. * @ptr: Destination address, in user space. * @@ -1245,7 +1828,7 @@ diff -Nur linux-4.1.26.orig/arch/avr32/include/asm/uaccess.h linux-4.1.26/arch/a * * This macro copies a single simple value from kernel space to user * space. It supports simple types like char and int, but not larger -@@ -116,7 +117,8 @@ +@@ -125,7 +126,8 @@ static inline __kernel_size_t copy_from_user(void *to, * @x: Variable to store result. * @ptr: Source address, in user space. * @@ -1255,7 +1838,7 @@ diff -Nur linux-4.1.26.orig/arch/avr32/include/asm/uaccess.h linux-4.1.26/arch/a * * This macro copies a single simple variable from user space to kernel * space. It supports simple types like char and int, but not larger -@@ -136,7 +138,8 @@ +@@ -145,7 +147,8 @@ static inline __kernel_size_t copy_from_user(void *to, * @x: Value to copy to user space. * @ptr: Destination address, in user space. * @@ -1265,7 +1848,7 @@ diff -Nur linux-4.1.26.orig/arch/avr32/include/asm/uaccess.h linux-4.1.26/arch/a * * 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 +161,8 @@ +@@ -167,7 +170,8 @@ static inline __kernel_size_t copy_from_user(void *to, * @x: Variable to store result. * @ptr: Source address, in user space. * @@ -1275,9 +1858,10 @@ diff -Nur linux-4.1.26.orig/arch/avr32/include/asm/uaccess.h linux-4.1.26/arch/a * * 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 -Nur linux-4.1.26.orig/arch/avr32/mm/fault.c linux-4.1.26/arch/avr32/mm/fault.c ---- linux-4.1.26.orig/arch/avr32/mm/fault.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/avr32/mm/fault.c 2016-06-19 15:30:58.595293802 +0200 +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 @@ -14,11 +14,11 @@ #include <linux/pagemap.h> #include <linux/kdebug.h> @@ -1291,7 +1875,7 @@ diff -Nur linux-4.1.26.orig/arch/avr32/mm/fault.c linux-4.1.26/arch/avr32/mm/fau #ifdef CONFIG_KPROBES static inline int notify_page_fault(struct pt_regs *regs, int trap) -@@ -81,7 +81,7 @@ +@@ -81,7 +81,7 @@ asmlinkage void do_page_fault(unsigned long ecr, struct pt_regs *regs) * If we're in an interrupt or have no user context, we must * not take the fault... */ @@ -1300,9 +1884,10 @@ diff -Nur linux-4.1.26.orig/arch/avr32/mm/fault.c linux-4.1.26/arch/avr32/mm/fau goto no_context; local_irq_enable(); -diff -Nur linux-4.1.26.orig/arch/cris/mm/fault.c linux-4.1.26/arch/cris/mm/fault.c ---- linux-4.1.26.orig/arch/cris/mm/fault.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/cris/mm/fault.c 2016-06-19 15:30:58.595293802 +0200 +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 @@ -8,7 +8,7 @@ #include <linux/interrupt.h> #include <linux/module.h> @@ -1312,7 +1897,7 @@ diff -Nur linux-4.1.26.orig/arch/cris/mm/fault.c linux-4.1.26/arch/cris/mm/fault #include <arch/system.h> extern int find_fixup_code(struct pt_regs *); -@@ -109,11 +109,11 @@ +@@ -109,11 +109,11 @@ do_page_fault(unsigned long address, struct pt_regs *regs, info.si_code = SEGV_MAPERR; /* @@ -1326,9 +1911,10 @@ diff -Nur linux-4.1.26.orig/arch/cris/mm/fault.c linux-4.1.26/arch/cris/mm/fault goto no_context; if (user_mode(regs)) -diff -Nur linux-4.1.26.orig/arch/frv/mm/fault.c linux-4.1.26/arch/frv/mm/fault.c ---- linux-4.1.26.orig/arch/frv/mm/fault.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/frv/mm/fault.c 2016-06-19 15:30:58.595293802 +0200 +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 @@ -19,9 +19,9 @@ #include <linux/kernel.h> #include <linux/ptrace.h> @@ -1340,7 +1926,7 @@ diff -Nur linux-4.1.26.orig/arch/frv/mm/fault.c linux-4.1.26/arch/frv/mm/fault.c #include <asm/gdb-stub.h> /*****************************************************************************/ -@@ -78,7 +78,7 @@ +@@ -78,7 +78,7 @@ asmlinkage void do_page_fault(int datammu, unsigned long esr0, unsigned long ear * If we're in an interrupt or have no user * context, we must not take the fault.. */ @@ -1349,10 +1935,11 @@ diff -Nur linux-4.1.26.orig/arch/frv/mm/fault.c linux-4.1.26/arch/frv/mm/fault.c goto no_context; if (user_mode(__frame)) -diff -Nur linux-4.1.26.orig/arch/frv/mm/highmem.c linux-4.1.26/arch/frv/mm/highmem.c ---- linux-4.1.26.orig/arch/frv/mm/highmem.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/frv/mm/highmem.c 2016-06-19 15:30:58.595293802 +0200 -@@ -42,6 +42,7 @@ +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) unsigned long paddr; int type; @@ -1360,16 +1947,17 @@ diff -Nur linux-4.1.26.orig/arch/frv/mm/highmem.c linux-4.1.26/arch/frv/mm/highm pagefault_disable(); type = kmap_atomic_idx_push(); paddr = page_to_phys(page); -@@ -85,5 +86,6 @@ +@@ -85,5 +86,6 @@ void __kunmap_atomic(void *kvaddr) } kmap_atomic_idx_pop(); pagefault_enable(); + preempt_enable(); } EXPORT_SYMBOL(__kunmap_atomic); -diff -Nur linux-4.1.26.orig/arch/hexagon/include/asm/uaccess.h linux-4.1.26/arch/hexagon/include/asm/uaccess.h ---- linux-4.1.26.orig/arch/hexagon/include/asm/uaccess.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/hexagon/include/asm/uaccess.h 2016-06-19 15:30:58.595293802 +0200 +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 @@ -36,7 +36,8 @@ * @addr: User space pointer to start of block to check * @size: Size of block to check @@ -1380,9 +1968,10 @@ diff -Nur linux-4.1.26.orig/arch/hexagon/include/asm/uaccess.h linux-4.1.26/arch * * Checks if a pointer to a block of memory in user space is valid. * -diff -Nur linux-4.1.26.orig/arch/ia64/mm/fault.c linux-4.1.26/arch/ia64/mm/fault.c ---- linux-4.1.26.orig/arch/ia64/mm/fault.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/ia64/mm/fault.c 2016-06-19 15:30:58.595293802 +0200 +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 @@ -11,10 +11,10 @@ #include <linux/kprobes.h> #include <linux/kdebug.h> @@ -1395,7 +1984,7 @@ diff -Nur linux-4.1.26.orig/arch/ia64/mm/fault.c linux-4.1.26/arch/ia64/mm/fault extern int die(char *, struct pt_regs *, long); -@@ -96,7 +96,7 @@ +@@ -96,7 +96,7 @@ ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *re /* * If we're in an interrupt or have no user context, we must not take the fault.. */ @@ -1404,29 +1993,11 @@ diff -Nur linux-4.1.26.orig/arch/ia64/mm/fault.c linux-4.1.26/arch/ia64/mm/fault goto no_context; #ifdef CONFIG_VIRTUAL_MEM_MAP -diff -Nur linux-4.1.26.orig/arch/Kconfig linux-4.1.26/arch/Kconfig ---- linux-4.1.26.orig/arch/Kconfig 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/Kconfig 2016-06-19 15:30:54.915151887 +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.26.orig/arch/m32r/include/asm/uaccess.h linux-4.1.26/arch/m32r/include/asm/uaccess.h ---- linux-4.1.26.orig/arch/m32r/include/asm/uaccess.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/m32r/include/asm/uaccess.h 2016-06-19 15:30:58.595293802 +0200 -@@ -91,7 +91,8 @@ +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) * @addr: User space pointer to start of block to check * @size: Size of block to check * @@ -1436,7 +2007,7 @@ diff -Nur linux-4.1.26.orig/arch/m32r/include/asm/uaccess.h linux-4.1.26/arch/m3 * * Checks if a pointer to a block of memory in user space is valid. * -@@ -155,7 +156,8 @@ +@@ -155,7 +156,8 @@ extern int fixup_exception(struct pt_regs *regs); * @x: Variable to store result. * @ptr: Source address, in user space. * @@ -1446,7 +2017,7 @@ diff -Nur linux-4.1.26.orig/arch/m32r/include/asm/uaccess.h linux-4.1.26/arch/m3 * * 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 @@ +@@ -175,7 +177,8 @@ extern int fixup_exception(struct pt_regs *regs); * @x: Value to copy to user space. * @ptr: Destination address, in user space. * @@ -1456,7 +2027,7 @@ diff -Nur linux-4.1.26.orig/arch/m32r/include/asm/uaccess.h linux-4.1.26/arch/m3 * * 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 @@ +@@ -194,7 +197,8 @@ extern int fixup_exception(struct pt_regs *regs); * @x: Variable to store result. * @ptr: Source address, in user space. * @@ -1466,7 +2037,7 @@ diff -Nur linux-4.1.26.orig/arch/m32r/include/asm/uaccess.h linux-4.1.26/arch/m3 * * 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 @@ +@@ -274,7 +278,8 @@ do { \ * @x: Value to copy to user space. * @ptr: Destination address, in user space. * @@ -1476,7 +2047,7 @@ diff -Nur linux-4.1.26.orig/arch/m32r/include/asm/uaccess.h linux-4.1.26/arch/m3 * * 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 @@ +@@ -568,7 +573,8 @@ unsigned long __generic_copy_from_user(void *, const void __user *, unsigned lon * @from: Source address, in kernel space. * @n: Number of bytes to copy. * @@ -1486,7 +2057,7 @@ diff -Nur linux-4.1.26.orig/arch/m32r/include/asm/uaccess.h linux-4.1.26/arch/m3 * * 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 @@ +@@ -588,7 +594,8 @@ unsigned long __generic_copy_from_user(void *, const void __user *, unsigned lon * @from: Source address, in kernel space. * @n: Number of bytes to copy. * @@ -1496,7 +2067,7 @@ diff -Nur linux-4.1.26.orig/arch/m32r/include/asm/uaccess.h linux-4.1.26/arch/m3 * * Copy data from kernel space to user space. * -@@ -606,7 +613,8 @@ +@@ -606,7 +613,8 @@ unsigned long __generic_copy_from_user(void *, const void __user *, unsigned lon * @from: Source address, in user space. * @n: Number of bytes to copy. * @@ -1506,7 +2077,7 @@ diff -Nur linux-4.1.26.orig/arch/m32r/include/asm/uaccess.h linux-4.1.26/arch/m3 * * 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 @@ +@@ -626,7 +634,8 @@ unsigned long __generic_copy_from_user(void *, const void __user *, unsigned lon * @from: Source address, in user space. * @n: Number of bytes to copy. * @@ -1516,7 +2087,7 @@ diff -Nur linux-4.1.26.orig/arch/m32r/include/asm/uaccess.h linux-4.1.26/arch/m3 * * Copy data from user space to kernel space. * -@@ -677,7 +686,8 @@ +@@ -677,7 +686,8 @@ unsigned long clear_user(void __user *mem, unsigned long len); * strlen_user: - Get the size of a string in user space. * @str: The string to measure. * @@ -1526,9 +2097,10 @@ diff -Nur linux-4.1.26.orig/arch/m32r/include/asm/uaccess.h linux-4.1.26/arch/m3 * * Get the size of a NUL-terminated string in user space. * -diff -Nur linux-4.1.26.orig/arch/m32r/mm/fault.c linux-4.1.26/arch/m32r/mm/fault.c ---- linux-4.1.26.orig/arch/m32r/mm/fault.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/m32r/mm/fault.c 2016-06-19 15:30:58.595293802 +0200 +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 @@ -24,9 +24,9 @@ #include <linux/vt_kern.h> /* For unblank_screen() */ #include <linux/highmem.h> @@ -1540,7 +2112,7 @@ diff -Nur linux-4.1.26.orig/arch/m32r/mm/fault.c linux-4.1.26/arch/m32r/mm/fault #include <asm/hardirq.h> #include <asm/mmu_context.h> #include <asm/tlbflush.h> -@@ -111,10 +111,10 @@ +@@ -111,10 +111,10 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long error_code, mm = tsk->mm; /* @@ -1554,9 +2126,10 @@ diff -Nur linux-4.1.26.orig/arch/m32r/mm/fault.c linux-4.1.26/arch/m32r/mm/fault goto bad_area_nosemaphore; if (error_code & ACE_USERMODE) -diff -Nur linux-4.1.26.orig/arch/m68k/mm/fault.c linux-4.1.26/arch/m68k/mm/fault.c ---- linux-4.1.26.orig/arch/m68k/mm/fault.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/m68k/mm/fault.c 2016-06-19 15:30:58.595293802 +0200 +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 @@ -10,10 +10,10 @@ #include <linux/ptrace.h> #include <linux/interrupt.h> @@ -1569,7 +2142,7 @@ diff -Nur linux-4.1.26.orig/arch/m68k/mm/fault.c linux-4.1.26/arch/m68k/mm/fault #include <asm/pgalloc.h> extern void die_if_kernel(char *, struct pt_regs *, long); -@@ -81,7 +81,7 @@ +@@ -81,7 +81,7 @@ int do_page_fault(struct pt_regs *regs, unsigned long address, * If we're in an interrupt or have no user * context, we must not take the fault.. */ @@ -1578,10 +2151,11 @@ diff -Nur linux-4.1.26.orig/arch/m68k/mm/fault.c linux-4.1.26/arch/m68k/mm/fault goto no_context; if (user_mode(regs)) -diff -Nur linux-4.1.26.orig/arch/metag/mm/fault.c linux-4.1.26/arch/metag/mm/fault.c ---- linux-4.1.26.orig/arch/metag/mm/fault.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/metag/mm/fault.c 2016-06-19 15:30:58.595293802 +0200 -@@ -105,7 +105,7 @@ +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, mm = tsk->mm; @@ -1590,10 +2164,11 @@ diff -Nur linux-4.1.26.orig/arch/metag/mm/fault.c linux-4.1.26/arch/metag/mm/fau goto no_context; if (user_mode(regs)) -diff -Nur linux-4.1.26.orig/arch/metag/mm/highmem.c linux-4.1.26/arch/metag/mm/highmem.c ---- linux-4.1.26.orig/arch/metag/mm/highmem.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/metag/mm/highmem.c 2016-06-19 15:30:58.595293802 +0200 -@@ -43,7 +43,7 @@ +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) unsigned long vaddr; int type; @@ -1602,7 +2177,7 @@ diff -Nur linux-4.1.26.orig/arch/metag/mm/highmem.c linux-4.1.26/arch/metag/mm/h pagefault_disable(); if (!PageHighMem(page)) return page_address(page); -@@ -82,6 +82,7 @@ +@@ -82,6 +82,7 @@ void __kunmap_atomic(void *kvaddr) } pagefault_enable(); @@ -1610,7 +2185,7 @@ diff -Nur linux-4.1.26.orig/arch/metag/mm/highmem.c linux-4.1.26/arch/metag/mm/h } EXPORT_SYMBOL(__kunmap_atomic); -@@ -95,6 +96,7 @@ +@@ -95,6 +96,7 @@ void *kmap_atomic_pfn(unsigned long pfn) unsigned long vaddr; int type; @@ -1618,10 +2193,11 @@ diff -Nur linux-4.1.26.orig/arch/metag/mm/highmem.c linux-4.1.26/arch/metag/mm/h pagefault_disable(); type = kmap_atomic_idx_push(); -diff -Nur linux-4.1.26.orig/arch/microblaze/include/asm/uaccess.h linux-4.1.26/arch/microblaze/include/asm/uaccess.h ---- linux-4.1.26.orig/arch/microblaze/include/asm/uaccess.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/microblaze/include/asm/uaccess.h 2016-06-19 15:30:58.595293802 +0200 -@@ -178,7 +178,8 @@ +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); * @x: Variable to store result. * @ptr: Source address, in user space. * @@ -1631,7 +2207,7 @@ diff -Nur linux-4.1.26.orig/arch/microblaze/include/asm/uaccess.h linux-4.1.26/a * * 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 @@ +@@ -290,7 +291,8 @@ extern long __user_bad(void); * @x: Value to copy to user space. * @ptr: Destination address, in user space. * @@ -1641,10 +2217,11 @@ diff -Nur linux-4.1.26.orig/arch/microblaze/include/asm/uaccess.h linux-4.1.26/a * * 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 -Nur linux-4.1.26.orig/arch/microblaze/mm/fault.c linux-4.1.26/arch/microblaze/mm/fault.c ---- linux-4.1.26.orig/arch/microblaze/mm/fault.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/microblaze/mm/fault.c 2016-06-19 15:30:58.595293802 +0200 -@@ -107,14 +107,14 @@ +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, if ((error_code & 0x13) == 0x13 || (error_code & 0x11) == 0x11) is_write = 0; @@ -1663,10 +2240,11 @@ diff -Nur linux-4.1.26.orig/arch/microblaze/mm/fault.c linux-4.1.26/arch/microbl pr_emerg("r15 = %lx MSR = %lx\n", regs->r15, regs->msr); die("Weird page fault", regs, SIGSEGV); -diff -Nur linux-4.1.26.orig/arch/microblaze/mm/highmem.c linux-4.1.26/arch/microblaze/mm/highmem.c ---- linux-4.1.26.orig/arch/microblaze/mm/highmem.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/microblaze/mm/highmem.c 2016-06-19 15:30:58.599293956 +0200 -@@ -37,7 +37,7 @@ +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) unsigned long vaddr; int idx, type; @@ -1675,7 +2253,7 @@ diff -Nur linux-4.1.26.orig/arch/microblaze/mm/highmem.c linux-4.1.26/arch/micro pagefault_disable(); if (!PageHighMem(page)) return page_address(page); -@@ -63,6 +63,7 @@ +@@ -63,6 +63,7 @@ void __kunmap_atomic(void *kvaddr) if (vaddr < __fix_to_virt(FIX_KMAP_END)) { pagefault_enable(); @@ -1683,17 +2261,31 @@ diff -Nur linux-4.1.26.orig/arch/microblaze/mm/highmem.c linux-4.1.26/arch/micro return; } -@@ -84,5 +85,6 @@ +@@ -84,5 +85,6 @@ void __kunmap_atomic(void *kvaddr) #endif kmap_atomic_idx_pop(); pagefault_enable(); + preempt_enable(); } EXPORT_SYMBOL(__kunmap_atomic); -diff -Nur linux-4.1.26.orig/arch/mips/include/asm/uaccess.h linux-4.1.26/arch/mips/include/asm/uaccess.h ---- linux-4.1.26.orig/arch/mips/include/asm/uaccess.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/mips/include/asm/uaccess.h 2016-06-19 15:30:58.599293956 +0200 -@@ -103,7 +103,8 @@ +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; * @addr: User space pointer to start of block to check * @size: Size of block to check * @@ -1703,7 +2295,7 @@ diff -Nur linux-4.1.26.orig/arch/mips/include/asm/uaccess.h linux-4.1.26/arch/mi * * Checks if a pointer to a block of memory in user space is valid. * -@@ -138,7 +139,8 @@ +@@ -139,7 +140,8 @@ extern u64 __ua_limit; * @x: Value to copy to user space. * @ptr: Destination address, in user space. * @@ -1713,7 +2305,7 @@ diff -Nur linux-4.1.26.orig/arch/mips/include/asm/uaccess.h linux-4.1.26/arch/mi * * This macro copies a single simple value from kernel space to user * space. It supports simple types like char and int, but not larger -@@ -157,7 +159,8 @@ +@@ -158,7 +160,8 @@ extern u64 __ua_limit; * @x: Variable to store result. * @ptr: Source address, in user space. * @@ -1723,7 +2315,7 @@ diff -Nur linux-4.1.26.orig/arch/mips/include/asm/uaccess.h linux-4.1.26/arch/mi * * This macro copies a single simple variable from user space to kernel * space. It supports simple types like char and int, but not larger -@@ -177,7 +180,8 @@ +@@ -178,7 +181,8 @@ extern u64 __ua_limit; * @x: Value to copy to user space. * @ptr: Destination address, in user space. * @@ -1733,7 +2325,7 @@ diff -Nur linux-4.1.26.orig/arch/mips/include/asm/uaccess.h linux-4.1.26/arch/mi * * This macro copies a single simple value from kernel space to user * space. It supports simple types like char and int, but not larger -@@ -199,7 +203,8 @@ +@@ -200,7 +204,8 @@ extern u64 __ua_limit; * @x: Variable to store result. * @ptr: Source address, in user space. * @@ -1743,7 +2335,7 @@ diff -Nur linux-4.1.26.orig/arch/mips/include/asm/uaccess.h linux-4.1.26/arch/mi * * This macro copies a single simple variable from user space to kernel * space. It supports simple types like char and int, but not larger -@@ -498,7 +503,8 @@ +@@ -499,7 +504,8 @@ extern void __put_user_unknown(void); * @x: Value to copy to user space. * @ptr: Destination address, in user space. * @@ -1753,7 +2345,7 @@ diff -Nur linux-4.1.26.orig/arch/mips/include/asm/uaccess.h linux-4.1.26/arch/mi * * This macro copies a single simple value from kernel space to user * space. It supports simple types like char and int, but not larger -@@ -517,7 +523,8 @@ +@@ -518,7 +524,8 @@ extern void __put_user_unknown(void); * @x: Variable to store result. * @ptr: Source address, in user space. * @@ -1763,7 +2355,7 @@ diff -Nur linux-4.1.26.orig/arch/mips/include/asm/uaccess.h linux-4.1.26/arch/mi * * This macro copies a single simple variable from user space to kernel * space. It supports simple types like char and int, but not larger -@@ -537,7 +544,8 @@ +@@ -538,7 +545,8 @@ extern void __put_user_unknown(void); * @x: Value to copy to user space. * @ptr: Destination address, in user space. * @@ -1773,7 +2365,7 @@ diff -Nur linux-4.1.26.orig/arch/mips/include/asm/uaccess.h linux-4.1.26/arch/mi * * This macro copies a single simple value from kernel space to user * space. It supports simple types like char and int, but not larger -@@ -559,7 +567,8 @@ +@@ -560,7 +568,8 @@ extern void __put_user_unknown(void); * @x: Variable to store result. * @ptr: Source address, in user space. * @@ -1783,7 +2375,7 @@ diff -Nur linux-4.1.26.orig/arch/mips/include/asm/uaccess.h linux-4.1.26/arch/mi * * This macro copies a single simple variable from user space to kernel * space. It supports simple types like char and int, but not larger -@@ -815,7 +824,8 @@ +@@ -816,7 +825,8 @@ extern size_t __copy_user(void *__to, const void *__from, size_t __n); * @from: Source address, in kernel space. * @n: Number of bytes to copy. * @@ -1793,7 +2385,7 @@ diff -Nur linux-4.1.26.orig/arch/mips/include/asm/uaccess.h linux-4.1.26/arch/mi * * Copy data from kernel space to user space. Caller must check * the specified block with access_ok() before calling this function. -@@ -888,7 +898,8 @@ +@@ -889,7 +899,8 @@ extern size_t __copy_user_inatomic(void *__to, const void *__from, size_t __n); * @from: Source address, in kernel space. * @n: Number of bytes to copy. * @@ -1803,7 +2395,7 @@ diff -Nur linux-4.1.26.orig/arch/mips/include/asm/uaccess.h linux-4.1.26/arch/mi * * Copy data from kernel space to user space. * -@@ -1075,7 +1086,8 @@ +@@ -1076,7 +1087,8 @@ extern size_t __copy_in_user_eva(void *__to, const void *__from, size_t __n); * @from: Source address, in user space. * @n: Number of bytes to copy. * @@ -1813,7 +2405,7 @@ diff -Nur linux-4.1.26.orig/arch/mips/include/asm/uaccess.h linux-4.1.26/arch/mi * * Copy data from user space to kernel space. Caller must check * the specified block with access_ok() before calling this function. -@@ -1107,7 +1119,8 @@ +@@ -1108,7 +1120,8 @@ extern size_t __copy_in_user_eva(void *__to, const void *__from, size_t __n); * @from: Source address, in user space. * @n: Number of bytes to copy. * @@ -1823,7 +2415,7 @@ diff -Nur linux-4.1.26.orig/arch/mips/include/asm/uaccess.h linux-4.1.26/arch/mi * * Copy data from user space to kernel space. * -@@ -1329,7 +1342,8 @@ +@@ -1332,7 +1345,8 @@ strncpy_from_user(char *__to, const char __user *__from, long __len) * strlen_user: - Get the size of a string in user space. * @str: The string to measure. * @@ -1833,7 +2425,7 @@ diff -Nur linux-4.1.26.orig/arch/mips/include/asm/uaccess.h linux-4.1.26/arch/mi * * Get the size of a NUL-terminated string in user space. * -@@ -1398,7 +1412,8 @@ +@@ -1401,7 +1415,8 @@ static inline long __strnlen_user(const char __user *s, long n) * strnlen_user: - Get the size of a string in user space. * @str: The string to measure. * @@ -1843,22 +2435,11 @@ diff -Nur linux-4.1.26.orig/arch/mips/include/asm/uaccess.h linux-4.1.26/arch/mi * * Get the size of a NUL-terminated string in user space. * -diff -Nur linux-4.1.26.orig/arch/mips/Kconfig linux-4.1.26/arch/mips/Kconfig ---- linux-4.1.26.orig/arch/mips/Kconfig 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/mips/Kconfig 2016-06-19 15:30:58.599293956 +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.26.orig/arch/mips/kernel/signal-common.h linux-4.1.26/arch/mips/kernel/signal-common.h ---- linux-4.1.26.orig/arch/mips/kernel/signal-common.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/mips/kernel/signal-common.h 2016-06-19 15:30:58.599293956 +0200 -@@ -28,12 +28,7 @@ +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, extern int fpcsr_pending(unsigned int __user *fpcsr); /* Make sure we will not lose FPU ownership */ @@ -1873,9 +2454,10 @@ diff -Nur linux-4.1.26.orig/arch/mips/kernel/signal-common.h linux-4.1.26/arch/m +#define unlock_fpu_owner() ({ pagefault_enable(); preempt_enable(); }) #endif /* __SIGNAL_COMMON_H */ -diff -Nur linux-4.1.26.orig/arch/mips/mm/fault.c linux-4.1.26/arch/mips/mm/fault.c ---- linux-4.1.26.orig/arch/mips/mm/fault.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/mips/mm/fault.c 2016-06-19 15:30:58.599293956 +0200 +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 @@ -21,10 +21,10 @@ #include <linux/module.h> #include <linux/kprobes.h> @@ -1888,7 +2470,7 @@ diff -Nur linux-4.1.26.orig/arch/mips/mm/fault.c linux-4.1.26/arch/mips/mm/fault #include <asm/ptrace.h> #include <asm/highmem.h> /* For VMALLOC_END */ #include <linux/kdebug.h> -@@ -94,7 +94,7 @@ +@@ -94,7 +94,7 @@ static void __kprobes __do_page_fault(struct pt_regs *regs, unsigned long write, * If we're in an interrupt or have no user * context, we must not take the fault.. */ @@ -1897,10 +2479,11 @@ diff -Nur linux-4.1.26.orig/arch/mips/mm/fault.c linux-4.1.26/arch/mips/mm/fault goto bad_area_nosemaphore; if (user_mode(regs)) -diff -Nur linux-4.1.26.orig/arch/mips/mm/highmem.c linux-4.1.26/arch/mips/mm/highmem.c ---- linux-4.1.26.orig/arch/mips/mm/highmem.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/mips/mm/highmem.c 2016-06-19 15:30:58.599293956 +0200 -@@ -47,7 +47,7 @@ +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) unsigned long vaddr; int idx, type; @@ -1909,7 +2492,7 @@ diff -Nur linux-4.1.26.orig/arch/mips/mm/highmem.c linux-4.1.26/arch/mips/mm/hig pagefault_disable(); if (!PageHighMem(page)) return page_address(page); -@@ -72,6 +72,7 @@ +@@ -72,6 +72,7 @@ void __kunmap_atomic(void *kvaddr) if (vaddr < FIXADDR_START) { // FIXME pagefault_enable(); @@ -1917,7 +2500,7 @@ diff -Nur linux-4.1.26.orig/arch/mips/mm/highmem.c linux-4.1.26/arch/mips/mm/hig return; } -@@ -92,6 +93,7 @@ +@@ -92,6 +93,7 @@ void __kunmap_atomic(void *kvaddr) #endif kmap_atomic_idx_pop(); pagefault_enable(); @@ -1925,7 +2508,7 @@ diff -Nur linux-4.1.26.orig/arch/mips/mm/highmem.c linux-4.1.26/arch/mips/mm/hig } EXPORT_SYMBOL(__kunmap_atomic); -@@ -104,6 +106,7 @@ +@@ -104,6 +106,7 @@ void *kmap_atomic_pfn(unsigned long pfn) unsigned long vaddr; int idx, type; @@ -1933,10 +2516,11 @@ diff -Nur linux-4.1.26.orig/arch/mips/mm/highmem.c linux-4.1.26/arch/mips/mm/hig pagefault_disable(); type = kmap_atomic_idx_push(); -diff -Nur linux-4.1.26.orig/arch/mips/mm/init.c linux-4.1.26/arch/mips/mm/init.c ---- linux-4.1.26.orig/arch/mips/mm/init.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/mips/mm/init.c 2016-06-19 15:30:58.599293956 +0200 -@@ -90,6 +90,7 @@ +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) BUG_ON(Page_dcache_dirty(page)); @@ -1944,7 +2528,7 @@ diff -Nur linux-4.1.26.orig/arch/mips/mm/init.c linux-4.1.26/arch/mips/mm/init.c pagefault_disable(); idx = (addr >> PAGE_SHIFT) & (FIX_N_COLOURS - 1); idx += in_interrupt() ? FIX_N_COLOURS : 0; -@@ -152,6 +153,7 @@ +@@ -152,6 +153,7 @@ void kunmap_coherent(void) write_c0_entryhi(old_ctx); local_irq_restore(flags); pagefault_enable(); @@ -1952,10 +2536,11 @@ diff -Nur linux-4.1.26.orig/arch/mips/mm/init.c linux-4.1.26/arch/mips/mm/init.c } void copy_user_highpage(struct page *to, struct page *from, -diff -Nur linux-4.1.26.orig/arch/mn10300/include/asm/highmem.h linux-4.1.26/arch/mn10300/include/asm/highmem.h ---- linux-4.1.26.orig/arch/mn10300/include/asm/highmem.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/mn10300/include/asm/highmem.h 2016-06-19 15:30:58.599293956 +0200 -@@ -75,6 +75,7 @@ +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) unsigned long vaddr; int idx, type; @@ -1963,7 +2548,7 @@ diff -Nur linux-4.1.26.orig/arch/mn10300/include/asm/highmem.h linux-4.1.26/arch pagefault_disable(); if (page < highmem_start_page) return page_address(page); -@@ -98,6 +99,7 @@ +@@ -98,6 +99,7 @@ static inline void __kunmap_atomic(unsigned long vaddr) if (vaddr < FIXADDR_START) { /* FIXME */ pagefault_enable(); @@ -1971,7 +2556,7 @@ diff -Nur linux-4.1.26.orig/arch/mn10300/include/asm/highmem.h linux-4.1.26/arch return; } -@@ -122,6 +124,7 @@ +@@ -122,6 +124,7 @@ static inline void __kunmap_atomic(unsigned long vaddr) kmap_atomic_idx_pop(); pagefault_enable(); @@ -1979,9 +2564,10 @@ diff -Nur linux-4.1.26.orig/arch/mn10300/include/asm/highmem.h linux-4.1.26/arch } #endif /* __KERNEL__ */ -diff -Nur linux-4.1.26.orig/arch/mn10300/mm/fault.c linux-4.1.26/arch/mn10300/mm/fault.c ---- linux-4.1.26.orig/arch/mn10300/mm/fault.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/mn10300/mm/fault.c 2016-06-19 15:30:58.599293956 +0200 +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 @@ -23,8 +23,8 @@ #include <linux/interrupt.h> #include <linux/init.h> @@ -1992,7 +2578,7 @@ diff -Nur linux-4.1.26.orig/arch/mn10300/mm/fault.c linux-4.1.26/arch/mn10300/mm #include <asm/pgalloc.h> #include <asm/hardirq.h> #include <asm/cpu-regs.h> -@@ -168,7 +168,7 @@ +@@ -168,7 +168,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long fault_code, * If we're in an interrupt or have no user * context, we must not take the fault.. */ @@ -2001,10 +2587,11 @@ diff -Nur linux-4.1.26.orig/arch/mn10300/mm/fault.c linux-4.1.26/arch/mn10300/mm goto no_context; if ((fault_code & MMUFCR_xFC_ACCESS) == MMUFCR_xFC_ACCESS_USR) -diff -Nur linux-4.1.26.orig/arch/nios2/mm/fault.c linux-4.1.26/arch/nios2/mm/fault.c ---- linux-4.1.26.orig/arch/nios2/mm/fault.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/nios2/mm/fault.c 2016-06-19 15:30:58.599293956 +0200 -@@ -77,7 +77,7 @@ +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, * If we're in an interrupt or have no user * context, we must not take the fault.. */ @@ -2013,10 +2600,11 @@ diff -Nur linux-4.1.26.orig/arch/nios2/mm/fault.c linux-4.1.26/arch/nios2/mm/fau goto bad_area_nosemaphore; if (user_mode(regs)) -diff -Nur linux-4.1.26.orig/arch/parisc/include/asm/cacheflush.h linux-4.1.26/arch/parisc/include/asm/cacheflush.h ---- linux-4.1.26.orig/arch/parisc/include/asm/cacheflush.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/parisc/include/asm/cacheflush.h 2016-06-19 15:30:58.599293956 +0200 -@@ -142,6 +142,7 @@ +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) static inline void *kmap_atomic(struct page *page) { @@ -2024,7 +2612,7 @@ diff -Nur linux-4.1.26.orig/arch/parisc/include/asm/cacheflush.h linux-4.1.26/ar pagefault_disable(); return page_address(page); } -@@ -150,6 +151,7 @@ +@@ -150,6 +151,7 @@ static inline void __kunmap_atomic(void *addr) { flush_kernel_dcache_page_addr(addr); pagefault_enable(); @@ -2032,9 +2620,10 @@ diff -Nur linux-4.1.26.orig/arch/parisc/include/asm/cacheflush.h linux-4.1.26/ar } #define kmap_atomic_prot(page, prot) kmap_atomic(page) -diff -Nur linux-4.1.26.orig/arch/parisc/kernel/traps.c linux-4.1.26/arch/parisc/kernel/traps.c ---- linux-4.1.26.orig/arch/parisc/kernel/traps.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/parisc/kernel/traps.c 2016-06-19 15:30:58.599293956 +0200 +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 @@ -26,9 +26,9 @@ #include <linux/console.h> #include <linux/bug.h> @@ -2046,7 +2635,7 @@ diff -Nur linux-4.1.26.orig/arch/parisc/kernel/traps.c linux-4.1.26/arch/parisc/ #include <asm/io.h> #include <asm/irq.h> #include <asm/traps.h> -@@ -796,7 +796,7 @@ +@@ -796,7 +796,7 @@ void notrace handle_interruption(int code, struct pt_regs *regs) * unless pagefault_disable() was called before. */ @@ -2055,9 +2644,10 @@ diff -Nur linux-4.1.26.orig/arch/parisc/kernel/traps.c linux-4.1.26/arch/parisc/ { /* Clean up and return if in exception table. */ if (fixup_exception(regs)) -diff -Nur linux-4.1.26.orig/arch/parisc/mm/fault.c linux-4.1.26/arch/parisc/mm/fault.c ---- linux-4.1.26.orig/arch/parisc/mm/fault.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/parisc/mm/fault.c 2016-06-19 15:30:58.599293956 +0200 +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 @@ -15,8 +15,8 @@ #include <linux/sched.h> #include <linux/interrupt.h> @@ -2068,7 +2658,7 @@ diff -Nur linux-4.1.26.orig/arch/parisc/mm/fault.c linux-4.1.26/arch/parisc/mm/f #include <asm/traps.h> /* Various important other fields */ -@@ -208,7 +208,7 @@ +@@ -208,7 +208,7 @@ void do_page_fault(struct pt_regs *regs, unsigned long code, int fault; unsigned int flags; @@ -2077,10 +2667,45 @@ diff -Nur linux-4.1.26.orig/arch/parisc/mm/fault.c linux-4.1.26/arch/parisc/mm/f goto no_context; tsk = current; -diff -Nur linux-4.1.26.orig/arch/powerpc/include/asm/kvm_host.h linux-4.1.26/arch/powerpc/include/asm/kvm_host.h ---- linux-4.1.26.orig/arch/powerpc/include/asm/kvm_host.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/powerpc/include/asm/kvm_host.h 2016-06-19 15:30:58.599293956 +0200 -@@ -280,7 +280,7 @@ +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 { u8 in_guest; struct list_head runnable_threads; spinlock_t lock; @@ -2089,7 +2714,7 @@ diff -Nur linux-4.1.26.orig/arch/powerpc/include/asm/kvm_host.h linux-4.1.26/arc spinlock_t stoltb_lock; /* protects stolen_tb and preempt_tb */ u64 stolen_tb; u64 preempt_tb; -@@ -613,7 +613,7 @@ +@@ -613,7 +613,7 @@ struct kvm_vcpu_arch { u8 prodded; u32 last_inst; @@ -2098,10 +2723,11 @@ diff -Nur linux-4.1.26.orig/arch/powerpc/include/asm/kvm_host.h linux-4.1.26/arc struct kvmppc_vcore *vcore; int ret; int trap; -diff -Nur linux-4.1.26.orig/arch/powerpc/include/asm/thread_info.h linux-4.1.26/arch/powerpc/include/asm/thread_info.h ---- linux-4.1.26.orig/arch/powerpc/include/asm/thread_info.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/powerpc/include/asm/thread_info.h 2016-06-19 15:30:58.603294110 +0200 -@@ -42,6 +42,8 @@ +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 { int cpu; /* cpu we're on */ int preempt_count; /* 0 => preemptable, <0 => BUG */ @@ -2110,7 +2736,7 @@ diff -Nur linux-4.1.26.orig/arch/powerpc/include/asm/thread_info.h linux-4.1.26/ unsigned long local_flags; /* private flags for thread */ /* low level flags - has atomic operations done on it */ -@@ -82,8 +84,7 @@ +@@ -82,8 +84,7 @@ static inline struct thread_info *current_thread_info(void) #define TIF_SYSCALL_TRACE 0 /* syscall trace active */ #define TIF_SIGPENDING 1 /* signal pending */ #define TIF_NEED_RESCHED 2 /* rescheduling necessary */ @@ -2120,7 +2746,7 @@ diff -Nur linux-4.1.26.orig/arch/powerpc/include/asm/thread_info.h linux-4.1.26/ #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 @@ +@@ -101,6 +102,8 @@ static inline struct thread_info *current_thread_info(void) #if defined(CONFIG_PPC64) #define TIF_ELF2ABI 18 /* function descriptors must die! */ #endif @@ -2129,7 +2755,7 @@ diff -Nur linux-4.1.26.orig/arch/powerpc/include/asm/thread_info.h linux-4.1.26/ /* as above, but as bit values */ #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE) -@@ -119,14 +122,16 @@ +@@ -119,14 +122,16 @@ static inline struct thread_info *current_thread_info(void) #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT) #define _TIF_EMULATE_STACK_STORE (1<<TIF_EMULATE_STACK_STORE) #define _TIF_NOHZ (1<<TIF_NOHZ) @@ -2147,43 +2773,11 @@ diff -Nur linux-4.1.26.orig/arch/powerpc/include/asm/thread_info.h linux-4.1.26/ /* Bits in local_flags */ /* Don't move TLF_NAPPING without adjusting the code in entry_32.S */ -diff -Nur linux-4.1.26.orig/arch/powerpc/Kconfig linux-4.1.26/arch/powerpc/Kconfig ---- linux-4.1.26.orig/arch/powerpc/Kconfig 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/powerpc/Kconfig 2016-06-19 15:30:58.599293956 +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.26.orig/arch/powerpc/kernel/asm-offsets.c linux-4.1.26/arch/powerpc/kernel/asm-offsets.c ---- linux-4.1.26.orig/arch/powerpc/kernel/asm-offsets.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/powerpc/kernel/asm-offsets.c 2016-06-19 15:30:58.603294110 +0200 -@@ -160,6 +160,7 @@ +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) 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)); @@ -2191,10 +2785,11 @@ diff -Nur linux-4.1.26.orig/arch/powerpc/kernel/asm-offsets.c linux-4.1.26/arch/ DEFINE(TI_TASK, offsetof(struct thread_info, task)); DEFINE(TI_CPU, offsetof(struct thread_info, cpu)); -diff -Nur linux-4.1.26.orig/arch/powerpc/kernel/entry_32.S linux-4.1.26/arch/powerpc/kernel/entry_32.S ---- linux-4.1.26.orig/arch/powerpc/kernel/entry_32.S 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/powerpc/kernel/entry_32.S 2016-06-19 15:30:58.603294110 +0200 -@@ -813,7 +813,14 @@ +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: cmpwi 0,r0,0 /* if non-zero, just restore regs and return */ bne restore andi. r8,r8,_TIF_NEED_RESCHED @@ -2209,7 +2804,7 @@ diff -Nur linux-4.1.26.orig/arch/powerpc/kernel/entry_32.S linux-4.1.26/arch/pow lwz r3,_MSR(r1) andi. r0,r3,MSR_EE /* interrupts off? */ beq restore /* don't schedule if so */ -@@ -824,11 +831,11 @@ +@@ -824,11 +831,11 @@ resume_kernel: */ bl trace_hardirqs_off #endif @@ -2224,7 +2819,7 @@ diff -Nur linux-4.1.26.orig/arch/powerpc/kernel/entry_32.S linux-4.1.26/arch/pow #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 @@ +@@ -1149,7 +1156,7 @@ global_dbcr0: #endif /* !(CONFIG_4xx || CONFIG_BOOKE) */ do_work: /* r10 contains MSR_KERNEL here */ @@ -2233,7 +2828,7 @@ diff -Nur linux-4.1.26.orig/arch/powerpc/kernel/entry_32.S linux-4.1.26/arch/pow beq do_user_signal do_resched: /* r10 contains MSR_KERNEL here */ -@@ -1170,7 +1177,7 @@ +@@ -1170,7 +1177,7 @@ recheck: MTMSRD(r10) /* disable interrupts */ CURRENT_THREAD_INFO(r9, r1) lwz r9,TI_FLAGS(r9) @@ -2242,10 +2837,11 @@ diff -Nur linux-4.1.26.orig/arch/powerpc/kernel/entry_32.S linux-4.1.26/arch/pow bne- do_resched andi. r0,r9,_TIF_USER_WORK_MASK beq restore_user -diff -Nur linux-4.1.26.orig/arch/powerpc/kernel/entry_64.S linux-4.1.26/arch/powerpc/kernel/entry_64.S ---- linux-4.1.26.orig/arch/powerpc/kernel/entry_64.S 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/powerpc/kernel/entry_64.S 2016-06-19 15:30:58.603294110 +0200 -@@ -636,7 +636,7 @@ +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) #else beq restore #endif @@ -2254,7 +2850,7 @@ diff -Nur linux-4.1.26.orig/arch/powerpc/kernel/entry_64.S linux-4.1.26/arch/pow beq 2f bl restore_interrupts SCHEDULE_USER -@@ -698,10 +698,18 @@ +@@ -698,10 +698,18 @@ resume_kernel: #ifdef CONFIG_PREEMPT /* Check if we need to preempt */ @@ -2274,7 +2870,7 @@ diff -Nur linux-4.1.26.orig/arch/powerpc/kernel/entry_64.S linux-4.1.26/arch/pow cmpwi cr1,r8,0 ld r0,SOFTE(r1) cmpdi r0,0 -@@ -718,7 +726,7 @@ +@@ -718,7 +726,7 @@ resume_kernel: /* Re-test flags and eventually loop */ CURRENT_THREAD_INFO(r9, r1) ld r4,TI_FLAGS(r9) @@ -2283,10 +2879,11 @@ diff -Nur linux-4.1.26.orig/arch/powerpc/kernel/entry_64.S linux-4.1.26/arch/pow bne 1b /* -diff -Nur linux-4.1.26.orig/arch/powerpc/kernel/irq.c linux-4.1.26/arch/powerpc/kernel/irq.c ---- linux-4.1.26.orig/arch/powerpc/kernel/irq.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/powerpc/kernel/irq.c 2016-06-19 15:30:58.603294110 +0200 -@@ -614,6 +614,7 @@ +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) } } @@ -2294,7 +2891,7 @@ diff -Nur linux-4.1.26.orig/arch/powerpc/kernel/irq.c linux-4.1.26/arch/powerpc/ void do_softirq_own_stack(void) { struct thread_info *curtp, *irqtp; -@@ -631,6 +632,7 @@ +@@ -631,6 +632,7 @@ void do_softirq_own_stack(void) if (irqtp->flags) set_bits(irqtp->flags, &curtp->flags); } @@ -2302,9 +2899,10 @@ diff -Nur linux-4.1.26.orig/arch/powerpc/kernel/irq.c linux-4.1.26/arch/powerpc/ irq_hw_number_t virq_to_hw(unsigned int virq) { -diff -Nur linux-4.1.26.orig/arch/powerpc/kernel/misc_32.S linux-4.1.26/arch/powerpc/kernel/misc_32.S ---- linux-4.1.26.orig/arch/powerpc/kernel/misc_32.S 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/powerpc/kernel/misc_32.S 2016-06-19 15:30:58.603294110 +0200 +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 @@ -40,6 +40,7 @@ * We store the saved ksp_limit in the unused part * of the STACK_FRAME_OVERHEAD @@ -2313,7 +2911,7 @@ diff -Nur linux-4.1.26.orig/arch/powerpc/kernel/misc_32.S linux-4.1.26/arch/powe _GLOBAL(call_do_softirq) mflr r0 stw r0,4(r1) -@@ -56,6 +57,7 @@ +@@ -56,6 +57,7 @@ _GLOBAL(call_do_softirq) stw r10,THREAD+KSP_LIMIT(r2) mtlr r0 blr @@ -2321,9 +2919,10 @@ diff -Nur linux-4.1.26.orig/arch/powerpc/kernel/misc_32.S linux-4.1.26/arch/powe /* * void call_do_irq(struct pt_regs *regs, struct thread_info *irqtp); -diff -Nur linux-4.1.26.orig/arch/powerpc/kernel/misc_64.S linux-4.1.26/arch/powerpc/kernel/misc_64.S ---- linux-4.1.26.orig/arch/powerpc/kernel/misc_64.S 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/powerpc/kernel/misc_64.S 2016-06-19 15:30:58.603294110 +0200 +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 @@ -29,6 +29,7 @@ .text @@ -2332,7 +2931,7 @@ diff -Nur linux-4.1.26.orig/arch/powerpc/kernel/misc_64.S linux-4.1.26/arch/powe _GLOBAL(call_do_softirq) mflr r0 std r0,16(r1) -@@ -39,6 +40,7 @@ +@@ -39,6 +40,7 @@ _GLOBAL(call_do_softirq) ld r0,16(r1) mtlr r0 blr @@ -2340,10 +2939,23 @@ diff -Nur linux-4.1.26.orig/arch/powerpc/kernel/misc_64.S linux-4.1.26/arch/powe _GLOBAL(call_do_irq) mflr r0 -diff -Nur linux-4.1.26.orig/arch/powerpc/kvm/book3s_hv.c linux-4.1.26/arch/powerpc/kvm/book3s_hv.c ---- linux-4.1.26.orig/arch/powerpc/kvm/book3s_hv.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/powerpc/kvm/book3s_hv.c 2016-06-19 15:30:58.603294110 +0200 -@@ -115,11 +115,11 @@ +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) static void kvmppc_fast_vcpu_kick_hv(struct kvm_vcpu *vcpu) { int cpu = vcpu->cpu; @@ -2358,7 +2970,7 @@ diff -Nur linux-4.1.26.orig/arch/powerpc/kvm/book3s_hv.c linux-4.1.26/arch/power ++vcpu->stat.halt_wakeup; } -@@ -692,8 +692,8 @@ +@@ -692,8 +692,8 @@ int kvmppc_pseries_do_hcall(struct kvm_vcpu *vcpu) tvcpu->arch.prodded = 1; smp_mb(); if (vcpu->arch.ceded) { @@ -2369,7 +2981,7 @@ diff -Nur linux-4.1.26.orig/arch/powerpc/kvm/book3s_hv.c linux-4.1.26/arch/power vcpu->stat.halt_wakeup++; } } -@@ -1432,7 +1432,7 @@ +@@ -1432,7 +1432,7 @@ static struct kvmppc_vcore *kvmppc_vcore_create(struct kvm *kvm, int core) INIT_LIST_HEAD(&vcore->runnable_threads); spin_lock_init(&vcore->lock); spin_lock_init(&vcore->stoltb_lock); @@ -2378,7 +2990,7 @@ diff -Nur linux-4.1.26.orig/arch/powerpc/kvm/book3s_hv.c linux-4.1.26/arch/power vcore->preempt_tb = TB_NIL; vcore->lpcr = kvm->arch.lpcr; vcore->first_vcpuid = core * threads_per_subcore; -@@ -2079,10 +2079,9 @@ +@@ -2079,10 +2079,9 @@ static void kvmppc_vcore_blocked(struct kvmppc_vcore *vc) { struct kvm_vcpu *vcpu; int do_sleep = 1; @@ -2391,7 +3003,7 @@ diff -Nur linux-4.1.26.orig/arch/powerpc/kvm/book3s_hv.c linux-4.1.26/arch/power /* * Check one last time for pending exceptions and ceded state after -@@ -2096,7 +2095,7 @@ +@@ -2096,7 +2095,7 @@ static void kvmppc_vcore_blocked(struct kvmppc_vcore *vc) } if (!do_sleep) { @@ -2400,7 +3012,7 @@ diff -Nur linux-4.1.26.orig/arch/powerpc/kvm/book3s_hv.c linux-4.1.26/arch/power return; } -@@ -2104,7 +2103,7 @@ +@@ -2104,7 +2103,7 @@ static void kvmppc_vcore_blocked(struct kvmppc_vcore *vc) trace_kvmppc_vcore_blocked(vc, 0); spin_unlock(&vc->lock); schedule(); @@ -2409,7 +3021,7 @@ diff -Nur linux-4.1.26.orig/arch/powerpc/kvm/book3s_hv.c linux-4.1.26/arch/power spin_lock(&vc->lock); vc->vcore_state = VCORE_INACTIVE; trace_kvmppc_vcore_blocked(vc, 1); -@@ -2148,7 +2147,7 @@ +@@ -2148,7 +2147,7 @@ static int kvmppc_run_vcpu(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu) kvmppc_start_thread(vcpu); trace_kvm_guest_enter(vcpu); } else if (vc->vcore_state == VCORE_SLEEPING) { @@ -2418,20 +3030,10 @@ diff -Nur linux-4.1.26.orig/arch/powerpc/kvm/book3s_hv.c linux-4.1.26/arch/power } } -diff -Nur linux-4.1.26.orig/arch/powerpc/kvm/Kconfig linux-4.1.26/arch/powerpc/kvm/Kconfig ---- linux-4.1.26.orig/arch/powerpc/kvm/Kconfig 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/powerpc/kvm/Kconfig 2016-06-19 15:30:58.603294110 +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.26.orig/arch/powerpc/mm/fault.c linux-4.1.26/arch/powerpc/mm/fault.c ---- linux-4.1.26.orig/arch/powerpc/mm/fault.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/powerpc/mm/fault.c 2016-06-19 15:30:58.603294110 +0200 +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 @@ -33,13 +33,13 @@ #include <linux/ratelimit.h> #include <linux/context_tracking.h> @@ -2447,7 +3049,7 @@ diff -Nur linux-4.1.26.orig/arch/powerpc/mm/fault.c linux-4.1.26/arch/powerpc/mm #include <asm/tlbflush.h> #include <asm/siginfo.h> #include <asm/debug.h> -@@ -272,15 +272,16 @@ +@@ -272,15 +272,16 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address, if (!arch_irq_disabled_regs(regs)) local_irq_enable(); @@ -2467,10 +3069,11 @@ diff -Nur linux-4.1.26.orig/arch/powerpc/mm/fault.c linux-4.1.26/arch/powerpc/mm printk(KERN_EMERG "NIP = %lx MSR = %lx\n", regs->nip, regs->msr); die("Weird page fault", regs, SIGSEGV); -diff -Nur linux-4.1.26.orig/arch/powerpc/mm/highmem.c linux-4.1.26/arch/powerpc/mm/highmem.c ---- linux-4.1.26.orig/arch/powerpc/mm/highmem.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/powerpc/mm/highmem.c 2016-06-19 15:30:58.603294110 +0200 -@@ -34,7 +34,7 @@ +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) unsigned long vaddr; int idx, type; @@ -2479,7 +3082,7 @@ diff -Nur linux-4.1.26.orig/arch/powerpc/mm/highmem.c linux-4.1.26/arch/powerpc/ pagefault_disable(); if (!PageHighMem(page)) return page_address(page); -@@ -59,6 +59,7 @@ +@@ -59,6 +59,7 @@ void __kunmap_atomic(void *kvaddr) if (vaddr < __fix_to_virt(FIX_KMAP_END)) { pagefault_enable(); @@ -2487,17 +3090,18 @@ diff -Nur linux-4.1.26.orig/arch/powerpc/mm/highmem.c linux-4.1.26/arch/powerpc/ return; } -@@ -82,5 +83,6 @@ +@@ -82,5 +83,6 @@ void __kunmap_atomic(void *kvaddr) kmap_atomic_idx_pop(); pagefault_enable(); + preempt_enable(); } EXPORT_SYMBOL(__kunmap_atomic); -diff -Nur linux-4.1.26.orig/arch/powerpc/platforms/ps3/device-init.c linux-4.1.26/arch/powerpc/platforms/ps3/device-init.c ---- linux-4.1.26.orig/arch/powerpc/platforms/ps3/device-init.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/powerpc/platforms/ps3/device-init.c 2016-06-19 15:30:58.603294110 +0200 -@@ -752,7 +752,7 @@ +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, } pr_debug("%s:%u: notification %s issued\n", __func__, __LINE__, op); @@ -2506,10 +3110,11 @@ diff -Nur linux-4.1.26.orig/arch/powerpc/platforms/ps3/device-init.c linux-4.1.2 dev->done.done || kthread_should_stop()); if (kthread_should_stop()) res = -EINTR; -diff -Nur linux-4.1.26.orig/arch/s390/include/asm/kvm_host.h linux-4.1.26/arch/s390/include/asm/kvm_host.h ---- linux-4.1.26.orig/arch/s390/include/asm/kvm_host.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/s390/include/asm/kvm_host.h 2016-06-19 15:30:58.603294110 +0200 -@@ -419,7 +419,7 @@ +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 { struct kvm_s390_local_interrupt { spinlock_t lock; struct kvm_s390_float_interrupt *float_int; @@ -2518,10 +3123,11 @@ diff -Nur linux-4.1.26.orig/arch/s390/include/asm/kvm_host.h linux-4.1.26/arch/s atomic_t *cpuflags; DECLARE_BITMAP(sigp_emerg_pending, KVM_MAX_VCPUS); struct kvm_s390_irq_payload irq; -diff -Nur linux-4.1.26.orig/arch/s390/include/asm/uaccess.h linux-4.1.26/arch/s390/include/asm/uaccess.h ---- linux-4.1.26.orig/arch/s390/include/asm/uaccess.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/s390/include/asm/uaccess.h 2016-06-19 15:30:58.603294110 +0200 -@@ -98,7 +98,8 @@ +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) * @from: Source address, in user space. * @n: Number of bytes to copy. * @@ -2531,7 +3137,7 @@ diff -Nur linux-4.1.26.orig/arch/s390/include/asm/uaccess.h linux-4.1.26/arch/s3 * * 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 @@ +@@ -118,7 +119,8 @@ unsigned long __must_check __copy_from_user(void *to, const void __user *from, * @from: Source address, in kernel space. * @n: Number of bytes to copy. * @@ -2541,7 +3147,7 @@ diff -Nur linux-4.1.26.orig/arch/s390/include/asm/uaccess.h linux-4.1.26/arch/s3 * * 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 @@ +@@ -264,7 +266,8 @@ int __get_user_bad(void) __attribute__((noreturn)); * @from: Source address, in kernel space. * @n: Number of bytes to copy. * @@ -2551,7 +3157,7 @@ diff -Nur linux-4.1.26.orig/arch/s390/include/asm/uaccess.h linux-4.1.26/arch/s3 * * Copy data from kernel space to user space. * -@@ -290,7 +293,8 @@ +@@ -290,7 +293,8 @@ __compiletime_warning("copy_from_user() buffer size is not provably correct") * @from: Source address, in user space. * @n: Number of bytes to copy. * @@ -2561,7 +3167,7 @@ diff -Nur linux-4.1.26.orig/arch/s390/include/asm/uaccess.h linux-4.1.26/arch/s3 * * Copy data from user space to kernel space. * -@@ -348,7 +352,8 @@ +@@ -348,7 +352,8 @@ static inline unsigned long strnlen_user(const char __user *src, unsigned long n * strlen_user: - Get the size of a string in user space. * @str: The string to measure. * @@ -2571,10 +3177,11 @@ diff -Nur linux-4.1.26.orig/arch/s390/include/asm/uaccess.h linux-4.1.26/arch/s3 * * Get the size of a NUL-terminated string in user space. * -diff -Nur linux-4.1.26.orig/arch/s390/kvm/interrupt.c linux-4.1.26/arch/s390/kvm/interrupt.c ---- linux-4.1.26.orig/arch/s390/kvm/interrupt.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/s390/kvm/interrupt.c 2016-06-19 15:30:58.607294264 +0200 -@@ -875,13 +875,13 @@ +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: void kvm_s390_vcpu_wakeup(struct kvm_vcpu *vcpu) { @@ -2590,7 +3197,7 @@ diff -Nur linux-4.1.26.orig/arch/s390/kvm/interrupt.c linux-4.1.26/arch/s390/kvm vcpu->stat.halt_wakeup++; } } -@@ -987,7 +987,7 @@ +@@ -987,7 +987,7 @@ int kvm_s390_inject_program_int(struct kvm_vcpu *vcpu, u16 code) spin_lock(&li->lock); irq.u.pgm.code = code; __inject_prog(vcpu, &irq); @@ -2599,7 +3206,7 @@ diff -Nur linux-4.1.26.orig/arch/s390/kvm/interrupt.c linux-4.1.26/arch/s390/kvm spin_unlock(&li->lock); return 0; } -@@ -1006,7 +1006,7 @@ +@@ -1006,7 +1006,7 @@ int kvm_s390_inject_prog_irq(struct kvm_vcpu *vcpu, spin_lock(&li->lock); irq.u.pgm = *pgm_info; rc = __inject_prog(vcpu, &irq); @@ -2608,10 +3215,11 @@ diff -Nur linux-4.1.26.orig/arch/s390/kvm/interrupt.c linux-4.1.26/arch/s390/kvm spin_unlock(&li->lock); return rc; } -diff -Nur linux-4.1.26.orig/arch/s390/mm/fault.c linux-4.1.26/arch/s390/mm/fault.c ---- linux-4.1.26.orig/arch/s390/mm/fault.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/s390/mm/fault.c 2016-06-19 15:30:58.607294264 +0200 -@@ -399,7 +399,7 @@ +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) * user context. */ fault = VM_FAULT_BADCONTEXT; @@ -2620,9 +3228,10 @@ diff -Nur linux-4.1.26.orig/arch/s390/mm/fault.c linux-4.1.26/arch/s390/mm/fault goto out; address = trans_exc_code & __FAIL_ADDR_MASK; -diff -Nur linux-4.1.26.orig/arch/score/include/asm/uaccess.h linux-4.1.26/arch/score/include/asm/uaccess.h ---- linux-4.1.26.orig/arch/score/include/asm/uaccess.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/score/include/asm/uaccess.h 2016-06-19 15:30:58.607294264 +0200 +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 @@ -36,7 +36,8 @@ * @addr: User space pointer to start of block to check * @size: Size of block to check @@ -2673,9 +3282,10 @@ diff -Nur linux-4.1.26.orig/arch/score/include/asm/uaccess.h linux-4.1.26/arch/s * * 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 -Nur linux-4.1.26.orig/arch/score/mm/fault.c linux-4.1.26/arch/score/mm/fault.c ---- linux-4.1.26.orig/arch/score/mm/fault.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/score/mm/fault.c 2016-06-19 15:30:58.607294264 +0200 +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 @@ -34,6 +34,7 @@ #include <linux/string.h> #include <linux/types.h> @@ -2684,7 +3294,7 @@ diff -Nur linux-4.1.26.orig/arch/score/mm/fault.c linux-4.1.26/arch/score/mm/fau /* * This routine handles page faults. It determines the address, -@@ -73,7 +74,7 @@ +@@ -73,7 +74,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long write, * If we're in an interrupt or have no user * context, we must not take the fault.. */ @@ -2693,10 +3303,11 @@ diff -Nur linux-4.1.26.orig/arch/score/mm/fault.c linux-4.1.26/arch/score/mm/fau goto bad_area_nosemaphore; if (user_mode(regs)) -diff -Nur linux-4.1.26.orig/arch/sh/kernel/irq.c linux-4.1.26/arch/sh/kernel/irq.c ---- linux-4.1.26.orig/arch/sh/kernel/irq.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/sh/kernel/irq.c 2016-06-19 15:30:58.607294264 +0200 -@@ -147,6 +147,7 @@ +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) hardirq_ctx[cpu] = NULL; } @@ -2704,7 +3315,7 @@ diff -Nur linux-4.1.26.orig/arch/sh/kernel/irq.c linux-4.1.26/arch/sh/kernel/irq void do_softirq_own_stack(void) { struct thread_info *curctx; -@@ -174,6 +175,7 @@ +@@ -174,6 +175,7 @@ void do_softirq_own_stack(void) "r5", "r6", "r7", "r8", "r9", "r15", "t", "pr" ); } @@ -2712,9 +3323,10 @@ diff -Nur linux-4.1.26.orig/arch/sh/kernel/irq.c linux-4.1.26/arch/sh/kernel/irq #else static inline void handle_one_irq(unsigned int irq) { -diff -Nur linux-4.1.26.orig/arch/sh/mm/fault.c linux-4.1.26/arch/sh/mm/fault.c ---- linux-4.1.26.orig/arch/sh/mm/fault.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/sh/mm/fault.c 2016-06-19 15:30:58.607294264 +0200 +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 @@ -17,6 +17,7 @@ #include <linux/kprobes.h> #include <linux/perf_event.h> @@ -2723,7 +3335,7 @@ diff -Nur linux-4.1.26.orig/arch/sh/mm/fault.c linux-4.1.26/arch/sh/mm/fault.c #include <asm/io_trapped.h> #include <asm/mmu_context.h> #include <asm/tlbflush.h> -@@ -438,9 +439,9 @@ +@@ -438,9 +439,9 @@ asmlinkage void __kprobes do_page_fault(struct pt_regs *regs, /* * If we're in an interrupt, have no user context or are running @@ -2735,10 +3347,11 @@ diff -Nur linux-4.1.26.orig/arch/sh/mm/fault.c linux-4.1.26/arch/sh/mm/fault.c bad_area_nosemaphore(regs, error_code, address); return; } -diff -Nur linux-4.1.26.orig/arch/sparc/Kconfig linux-4.1.26/arch/sparc/Kconfig ---- linux-4.1.26.orig/arch/sparc/Kconfig 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/sparc/Kconfig 2016-06-19 15:30:58.607294264 +0200 -@@ -189,12 +189,10 @@ +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 source kernel/Kconfig.hz config RWSEM_GENERIC_SPINLOCK @@ -2753,10 +3366,11 @@ diff -Nur linux-4.1.26.orig/arch/sparc/Kconfig linux-4.1.26/arch/sparc/Kconfig config GENERIC_HWEIGHT bool -diff -Nur linux-4.1.26.orig/arch/sparc/kernel/irq_64.c linux-4.1.26/arch/sparc/kernel/irq_64.c ---- linux-4.1.26.orig/arch/sparc/kernel/irq_64.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/sparc/kernel/irq_64.c 2016-06-19 15:30:58.607294264 +0200 -@@ -849,6 +849,7 @@ +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) set_irq_regs(old_regs); } @@ -2764,7 +3378,7 @@ diff -Nur linux-4.1.26.orig/arch/sparc/kernel/irq_64.c linux-4.1.26/arch/sparc/k void do_softirq_own_stack(void) { void *orig_sp, *sp = softirq_stack[smp_processor_id()]; -@@ -863,6 +864,7 @@ +@@ -863,6 +864,7 @@ void do_softirq_own_stack(void) __asm__ __volatile__("mov %0, %%sp" : : "r" (orig_sp)); } @@ -2772,9 +3386,10 @@ diff -Nur linux-4.1.26.orig/arch/sparc/kernel/irq_64.c linux-4.1.26/arch/sparc/k #ifdef CONFIG_HOTPLUG_CPU void fixup_irqs(void) -diff -Nur linux-4.1.26.orig/arch/sparc/mm/fault_32.c linux-4.1.26/arch/sparc/mm/fault_32.c ---- linux-4.1.26.orig/arch/sparc/mm/fault_32.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/sparc/mm/fault_32.c 2016-06-19 15:30:58.607294264 +0200 +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 @@ -21,6 +21,7 @@ #include <linux/perf_event.h> #include <linux/interrupt.h> @@ -2791,7 +3406,7 @@ diff -Nur linux-4.1.26.orig/arch/sparc/mm/fault_32.c linux-4.1.26/arch/sparc/mm/ #include "mm_32.h" -@@ -196,7 +196,7 @@ +@@ -196,7 +196,7 @@ asmlinkage void do_sparc_fault(struct pt_regs *regs, int text_fault, int write, * If we're in an interrupt or have no user * context, we must not take the fault.. */ @@ -2800,9 +3415,10 @@ diff -Nur linux-4.1.26.orig/arch/sparc/mm/fault_32.c linux-4.1.26/arch/sparc/mm/ goto no_context; perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, address); -diff -Nur linux-4.1.26.orig/arch/sparc/mm/fault_64.c linux-4.1.26/arch/sparc/mm/fault_64.c ---- linux-4.1.26.orig/arch/sparc/mm/fault_64.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/sparc/mm/fault_64.c 2016-06-19 15:30:58.607294264 +0200 +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 @@ -22,12 +22,12 @@ #include <linux/kdebug.h> #include <linux/percpu.h> @@ -2817,7 +3433,7 @@ diff -Nur linux-4.1.26.orig/arch/sparc/mm/fault_64.c linux-4.1.26/arch/sparc/mm/ #include <asm/asi.h> #include <asm/lsu.h> #include <asm/sections.h> -@@ -330,7 +330,7 @@ +@@ -330,7 +330,7 @@ asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs) * If we're in an interrupt or have no user * context, we must not take the fault.. */ @@ -2826,10 +3442,11 @@ diff -Nur linux-4.1.26.orig/arch/sparc/mm/fault_64.c linux-4.1.26/arch/sparc/mm/ goto intr_or_no_mm; perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, address); -diff -Nur linux-4.1.26.orig/arch/sparc/mm/highmem.c linux-4.1.26/arch/sparc/mm/highmem.c ---- linux-4.1.26.orig/arch/sparc/mm/highmem.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/sparc/mm/highmem.c 2016-06-19 15:30:58.607294264 +0200 -@@ -53,7 +53,7 @@ +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) unsigned long vaddr; long idx, type; @@ -2838,7 +3455,7 @@ diff -Nur linux-4.1.26.orig/arch/sparc/mm/highmem.c linux-4.1.26/arch/sparc/mm/h pagefault_disable(); if (!PageHighMem(page)) return page_address(page); -@@ -91,6 +91,7 @@ +@@ -91,6 +91,7 @@ void __kunmap_atomic(void *kvaddr) if (vaddr < FIXADDR_START) { // FIXME pagefault_enable(); @@ -2846,17 +3463,18 @@ diff -Nur linux-4.1.26.orig/arch/sparc/mm/highmem.c linux-4.1.26/arch/sparc/mm/h return; } -@@ -126,5 +127,6 @@ +@@ -126,5 +127,6 @@ void __kunmap_atomic(void *kvaddr) kmap_atomic_idx_pop(); pagefault_enable(); + preempt_enable(); } EXPORT_SYMBOL(__kunmap_atomic); -diff -Nur linux-4.1.26.orig/arch/sparc/mm/init_64.c linux-4.1.26/arch/sparc/mm/init_64.c ---- linux-4.1.26.orig/arch/sparc/mm/init_64.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/sparc/mm/init_64.c 2016-06-19 15:30:58.607294264 +0200 -@@ -2738,7 +2738,7 @@ +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) struct mm_struct *mm = current->mm; struct tsb_config *tp; @@ -2865,10 +3483,11 @@ diff -Nur linux-4.1.26.orig/arch/sparc/mm/init_64.c linux-4.1.26/arch/sparc/mm/i const struct exception_table_entry *entry; entry = search_exception_tables(regs->tpc); -diff -Nur linux-4.1.26.orig/arch/tile/include/asm/uaccess.h linux-4.1.26/arch/tile/include/asm/uaccess.h ---- linux-4.1.26.orig/arch/tile/include/asm/uaccess.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/tile/include/asm/uaccess.h 2016-06-19 15:30:58.611294419 +0200 -@@ -78,7 +78,8 @@ +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); * @addr: User space pointer to start of block to check * @size: Size of block to check * @@ -2878,7 +3497,7 @@ diff -Nur linux-4.1.26.orig/arch/tile/include/asm/uaccess.h linux-4.1.26/arch/ti * * Checks if a pointer to a block of memory in user space is valid. * -@@ -192,7 +193,8 @@ +@@ -192,7 +193,8 @@ extern int __get_user_bad(void) * @x: Variable to store result. * @ptr: Source address, in user space. * @@ -2888,7 +3507,7 @@ diff -Nur linux-4.1.26.orig/arch/tile/include/asm/uaccess.h linux-4.1.26/arch/ti * * 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 @@ +@@ -274,7 +276,8 @@ extern int __put_user_bad(void) * @x: Value to copy to user space. * @ptr: Destination address, in user space. * @@ -2898,7 +3517,7 @@ diff -Nur linux-4.1.26.orig/arch/tile/include/asm/uaccess.h linux-4.1.26/arch/ti * * 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 @@ +@@ -330,7 +333,8 @@ extern int __put_user_bad(void) * @from: Source address, in kernel space. * @n: Number of bytes to copy. * @@ -2908,7 +3527,7 @@ diff -Nur linux-4.1.26.orig/arch/tile/include/asm/uaccess.h linux-4.1.26/arch/ti * * 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 @@ +@@ -366,7 +370,8 @@ copy_to_user(void __user *to, const void *from, unsigned long n) * @from: Source address, in user space. * @n: Number of bytes to copy. * @@ -2918,7 +3537,7 @@ diff -Nur linux-4.1.26.orig/arch/tile/include/asm/uaccess.h linux-4.1.26/arch/ti * * 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 @@ +@@ -437,7 +442,8 @@ static inline unsigned long __must_check copy_from_user(void *to, * @from: Source address, in user space. * @n: Number of bytes to copy. * @@ -2928,10 +3547,11 @@ diff -Nur linux-4.1.26.orig/arch/tile/include/asm/uaccess.h linux-4.1.26/arch/ti * * Copy data from user space to user space. Caller must check * the specified blocks with access_ok() before calling this function. -diff -Nur linux-4.1.26.orig/arch/tile/mm/fault.c linux-4.1.26/arch/tile/mm/fault.c ---- linux-4.1.26.orig/arch/tile/mm/fault.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/tile/mm/fault.c 2016-06-19 15:30:58.611294419 +0200 -@@ -354,9 +354,9 @@ +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, /* * If we're in an interrupt, have no user context or are running in an @@ -2943,10 +3563,11 @@ diff -Nur linux-4.1.26.orig/arch/tile/mm/fault.c linux-4.1.26/arch/tile/mm/fault vma = NULL; /* happy compiler */ goto bad_area_nosemaphore; } -diff -Nur linux-4.1.26.orig/arch/tile/mm/highmem.c linux-4.1.26/arch/tile/mm/highmem.c ---- linux-4.1.26.orig/arch/tile/mm/highmem.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/tile/mm/highmem.c 2016-06-19 15:30:58.611294419 +0200 -@@ -201,7 +201,7 @@ +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) int idx, type; pte_t *pte; @@ -2955,7 +3576,7 @@ diff -Nur linux-4.1.26.orig/arch/tile/mm/highmem.c linux-4.1.26/arch/tile/mm/hig pagefault_disable(); /* Avoid icache flushes by disallowing atomic executable mappings. */ -@@ -259,6 +259,7 @@ +@@ -259,6 +259,7 @@ void __kunmap_atomic(void *kvaddr) } pagefault_enable(); @@ -2963,10 +3584,11 @@ diff -Nur linux-4.1.26.orig/arch/tile/mm/highmem.c linux-4.1.26/arch/tile/mm/hig } EXPORT_SYMBOL(__kunmap_atomic); -diff -Nur linux-4.1.26.orig/arch/um/kernel/trap.c linux-4.1.26/arch/um/kernel/trap.c ---- linux-4.1.26.orig/arch/um/kernel/trap.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/um/kernel/trap.c 2016-06-19 15:30:58.611294419 +0200 -@@ -35,10 +35,10 @@ +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, *code_out = SEGV_MAPERR; /* @@ -2979,10 +3601,11 @@ diff -Nur linux-4.1.26.orig/arch/um/kernel/trap.c linux-4.1.26/arch/um/kernel/tr goto out_nosemaphore; if (is_user) -diff -Nur linux-4.1.26.orig/arch/unicore32/mm/fault.c linux-4.1.26/arch/unicore32/mm/fault.c ---- linux-4.1.26.orig/arch/unicore32/mm/fault.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/unicore32/mm/fault.c 2016-06-19 15:30:58.611294419 +0200 -@@ -218,7 +218,7 @@ +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) * If we're in an interrupt or have no user * context, we must not take the fault.. */ @@ -2991,10 +3614,45 @@ diff -Nur linux-4.1.26.orig/arch/unicore32/mm/fault.c linux-4.1.26/arch/unicore3 goto no_context; if (user_mode(regs)) -diff -Nur linux-4.1.26.orig/arch/x86/crypto/aesni-intel_glue.c linux-4.1.26/arch/x86/crypto/aesni-intel_glue.c ---- linux-4.1.26.orig/arch/x86/crypto/aesni-intel_glue.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/x86/crypto/aesni-intel_glue.c 2016-06-19 15:30:58.611294419 +0200 -@@ -382,14 +382,14 @@ +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, err = blkcipher_walk_virt(desc, &walk); desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP; @@ -3012,7 +3670,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/crypto/aesni-intel_glue.c linux-4.1.26/arch return err; } -@@ -406,14 +406,14 @@ +@@ -406,14 +406,14 @@ static int ecb_decrypt(struct blkcipher_desc *desc, err = blkcipher_walk_virt(desc, &walk); desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP; @@ -3029,7 +3687,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/crypto/aesni-intel_glue.c linux-4.1.26/arch return err; } -@@ -430,14 +430,14 @@ +@@ -430,14 +430,14 @@ static int cbc_encrypt(struct blkcipher_desc *desc, err = blkcipher_walk_virt(desc, &walk); desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP; @@ -3046,7 +3704,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/crypto/aesni-intel_glue.c linux-4.1.26/arch return err; } -@@ -454,14 +454,14 @@ +@@ -454,14 +454,14 @@ static int cbc_decrypt(struct blkcipher_desc *desc, err = blkcipher_walk_virt(desc, &walk); desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP; @@ -3063,7 +3721,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/crypto/aesni-intel_glue.c linux-4.1.26/arch return err; } -@@ -513,18 +513,20 @@ +@@ -513,18 +513,20 @@ static int ctr_crypt(struct blkcipher_desc *desc, err = blkcipher_walk_virt_block(desc, &walk, AES_BLOCK_SIZE); desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP; @@ -3086,10 +3744,11 @@ diff -Nur linux-4.1.26.orig/arch/x86/crypto/aesni-intel_glue.c linux-4.1.26/arch return err; } -diff -Nur linux-4.1.26.orig/arch/x86/crypto/cast5_avx_glue.c linux-4.1.26/arch/x86/crypto/cast5_avx_glue.c ---- linux-4.1.26.orig/arch/x86/crypto/cast5_avx_glue.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/x86/crypto/cast5_avx_glue.c 2016-06-19 15:30:58.611294419 +0200 -@@ -60,7 +60,7 @@ +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) static int ecb_crypt(struct blkcipher_desc *desc, struct blkcipher_walk *walk, bool enc) { @@ -3098,7 +3757,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/crypto/cast5_avx_glue.c linux-4.1.26/arch/x struct cast5_ctx *ctx = crypto_blkcipher_ctx(desc->tfm); const unsigned int bsize = CAST5_BLOCK_SIZE; unsigned int nbytes; -@@ -76,7 +76,7 @@ +@@ -76,7 +76,7 @@ static int ecb_crypt(struct blkcipher_desc *desc, struct blkcipher_walk *walk, u8 *wsrc = walk->src.virt.addr; u8 *wdst = walk->dst.virt.addr; @@ -3107,7 +3766,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/crypto/cast5_avx_glue.c linux-4.1.26/arch/x /* Process multi-block batch */ if (nbytes >= bsize * CAST5_PARALLEL_BLOCKS) { -@@ -104,10 +104,9 @@ +@@ -104,10 +104,9 @@ static int ecb_crypt(struct blkcipher_desc *desc, struct blkcipher_walk *walk, } while (nbytes >= bsize); done: @@ -3119,7 +3778,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/crypto/cast5_avx_glue.c linux-4.1.26/arch/x return err; } -@@ -228,7 +227,7 @@ +@@ -228,7 +227,7 @@ done: static int cbc_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst, struct scatterlist *src, unsigned int nbytes) { @@ -3128,7 +3787,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/crypto/cast5_avx_glue.c linux-4.1.26/arch/x struct blkcipher_walk walk; int err; -@@ -237,12 +236,11 @@ +@@ -237,12 +236,11 @@ static int cbc_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst, desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP; while ((nbytes = walk.nbytes)) { @@ -3143,7 +3802,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/crypto/cast5_avx_glue.c linux-4.1.26/arch/x return err; } -@@ -312,7 +310,7 @@ +@@ -312,7 +310,7 @@ done: static int ctr_crypt(struct blkcipher_desc *desc, struct scatterlist *dst, struct scatterlist *src, unsigned int nbytes) { @@ -3152,7 +3811,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/crypto/cast5_avx_glue.c linux-4.1.26/arch/x struct blkcipher_walk walk; int err; -@@ -321,13 +319,12 @@ +@@ -321,13 +319,12 @@ static int ctr_crypt(struct blkcipher_desc *desc, struct scatterlist *dst, desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP; while ((nbytes = walk.nbytes) >= CAST5_BLOCK_SIZE) { @@ -3168,10 +3827,11 @@ diff -Nur linux-4.1.26.orig/arch/x86/crypto/cast5_avx_glue.c linux-4.1.26/arch/x if (walk.nbytes) { ctr_crypt_final(desc, &walk); err = blkcipher_walk_done(desc, &walk, 0); -diff -Nur linux-4.1.26.orig/arch/x86/crypto/glue_helper.c linux-4.1.26/arch/x86/crypto/glue_helper.c ---- linux-4.1.26.orig/arch/x86/crypto/glue_helper.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/x86/crypto/glue_helper.c 2016-06-19 15:30:58.611294419 +0200 -@@ -39,7 +39,7 @@ +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, void *ctx = crypto_blkcipher_ctx(desc->tfm); const unsigned int bsize = 128 / 8; unsigned int nbytes, i, func_bytes; @@ -3180,7 +3840,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/crypto/glue_helper.c linux-4.1.26/arch/x86/ int err; err = blkcipher_walk_virt(desc, walk); -@@ -49,7 +49,7 @@ +@@ -49,7 +49,7 @@ static int __glue_ecb_crypt_128bit(const struct common_glue_ctx *gctx, u8 *wdst = walk->dst.virt.addr; fpu_enabled = glue_fpu_begin(bsize, gctx->fpu_blocks_limit, @@ -3189,7 +3849,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/crypto/glue_helper.c linux-4.1.26/arch/x86/ for (i = 0; i < gctx->num_funcs; i++) { func_bytes = bsize * gctx->funcs[i].num_blocks; -@@ -71,10 +71,10 @@ +@@ -71,10 +71,10 @@ static int __glue_ecb_crypt_128bit(const struct common_glue_ctx *gctx, } done: @@ -3201,7 +3861,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/crypto/glue_helper.c linux-4.1.26/arch/x86/ return err; } -@@ -194,7 +194,7 @@ +@@ -194,7 +194,7 @@ int glue_cbc_decrypt_128bit(const struct common_glue_ctx *gctx, struct scatterlist *src, unsigned int nbytes) { const unsigned int bsize = 128 / 8; @@ -3210,7 +3870,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/crypto/glue_helper.c linux-4.1.26/arch/x86/ struct blkcipher_walk walk; int err; -@@ -203,12 +203,12 @@ +@@ -203,12 +203,12 @@ int glue_cbc_decrypt_128bit(const struct common_glue_ctx *gctx, while ((nbytes = walk.nbytes)) { fpu_enabled = glue_fpu_begin(bsize, gctx->fpu_blocks_limit, @@ -3225,7 +3885,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/crypto/glue_helper.c linux-4.1.26/arch/x86/ return err; } EXPORT_SYMBOL_GPL(glue_cbc_decrypt_128bit); -@@ -277,7 +277,7 @@ +@@ -277,7 +277,7 @@ int glue_ctr_crypt_128bit(const struct common_glue_ctx *gctx, struct scatterlist *src, unsigned int nbytes) { const unsigned int bsize = 128 / 8; @@ -3234,7 +3894,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/crypto/glue_helper.c linux-4.1.26/arch/x86/ struct blkcipher_walk walk; int err; -@@ -286,13 +286,12 @@ +@@ -286,13 +286,12 @@ int glue_ctr_crypt_128bit(const struct common_glue_ctx *gctx, while ((nbytes = walk.nbytes) >= bsize) { fpu_enabled = glue_fpu_begin(bsize, gctx->fpu_blocks_limit, @@ -3250,7 +3910,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/crypto/glue_helper.c linux-4.1.26/arch/x86/ if (walk.nbytes) { glue_ctr_crypt_final_128bit( gctx->funcs[gctx->num_funcs - 1].fn_u.ctr, desc, &walk); -@@ -347,7 +346,7 @@ +@@ -347,7 +346,7 @@ int glue_xts_crypt_128bit(const struct common_glue_ctx *gctx, void *tweak_ctx, void *crypt_ctx) { const unsigned int bsize = 128 / 8; @@ -3259,7 +3919,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/crypto/glue_helper.c linux-4.1.26/arch/x86/ struct blkcipher_walk walk; int err; -@@ -360,21 +359,21 @@ +@@ -360,21 +359,21 @@ int glue_xts_crypt_128bit(const struct common_glue_ctx *gctx, /* set minimum length to bsize, for tweak_fn */ fpu_enabled = glue_fpu_begin(bsize, gctx->fpu_blocks_limit, @@ -3286,10 +3946,11 @@ diff -Nur linux-4.1.26.orig/arch/x86/crypto/glue_helper.c linux-4.1.26/arch/x86/ return err; } EXPORT_SYMBOL_GPL(glue_xts_crypt_128bit); -diff -Nur linux-4.1.26.orig/arch/x86/include/asm/preempt.h linux-4.1.26/arch/x86/include/asm/preempt.h ---- linux-4.1.26.orig/arch/x86/include/asm/preempt.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/x86/include/asm/preempt.h 2016-06-19 15:30:58.611294419 +0200 -@@ -82,17 +82,33 @@ +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) * a decrement which hits zero means we have no preempt_count and should * reschedule. */ @@ -3304,6 +3965,8 @@ diff -Nur linux-4.1.26.orig/arch/x86/include/asm/preempt.h linux-4.1.26/arch/x86 + if (____preempt_count_dec_and_test()) + return true; +#ifdef CONFIG_PREEMPT_LAZY ++ if (current_thread_info()->preempt_lazy_count) ++ return false; + return test_thread_flag(TIF_NEED_RESCHED_LAZY); +#else + return false; @@ -3316,18 +3979,30 @@ diff -Nur linux-4.1.26.orig/arch/x86/include/asm/preempt.h linux-4.1.26/arch/x86 static __always_inline bool should_resched(int preempt_offset) { +#ifdef CONFIG_PREEMPT_LAZY -+ return unlikely(raw_cpu_read_4(__preempt_count) == preempt_offset || -+ test_thread_flag(TIF_NEED_RESCHED_LAZY)); ++ u32 tmp; ++ ++ tmp = raw_cpu_read_4(__preempt_count); ++ if (tmp == preempt_offset) ++ return true; ++ ++ /* preempt count == 0 ? */ ++ tmp &= ~PREEMPT_NEED_RESCHED; ++ if (tmp) ++ return false; ++ if (current_thread_info()->preempt_lazy_count) ++ return false; ++ return test_thread_flag(TIF_NEED_RESCHED_LAZY); +#else return unlikely(raw_cpu_read_4(__preempt_count) == preempt_offset); +#endif } #ifdef CONFIG_PREEMPT -diff -Nur linux-4.1.26.orig/arch/x86/include/asm/signal.h linux-4.1.26/arch/x86/include/asm/signal.h ---- linux-4.1.26.orig/arch/x86/include/asm/signal.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/x86/include/asm/signal.h 2016-06-19 15:30:58.611294419 +0200 -@@ -23,6 +23,19 @@ +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 { unsigned long sig[_NSIG_WORDS]; } sigset_t; @@ -3347,9 +4022,10 @@ diff -Nur linux-4.1.26.orig/arch/x86/include/asm/signal.h linux-4.1.26/arch/x86/ #ifndef CONFIG_COMPAT typedef sigset_t compat_sigset_t; #endif -diff -Nur linux-4.1.26.orig/arch/x86/include/asm/stackprotector.h linux-4.1.26/arch/x86/include/asm/stackprotector.h ---- linux-4.1.26.orig/arch/x86/include/asm/stackprotector.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/x86/include/asm/stackprotector.h 2016-06-19 15:30:58.611294419 +0200 +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 @@ -57,7 +57,7 @@ */ static __always_inline void boot_init_stack_canary(void) @@ -3359,7 +4035,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/include/asm/stackprotector.h linux-4.1.26/a u64 tsc; #ifdef CONFIG_X86_64 -@@ -68,8 +68,16 @@ +@@ -68,8 +68,16 @@ static __always_inline void boot_init_stack_canary(void) * 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. @@ -3376,10 +4052,11 @@ diff -Nur linux-4.1.26.orig/arch/x86/include/asm/stackprotector.h linux-4.1.26/a tsc = __native_read_tsc(); canary += tsc + (tsc << 32UL); -diff -Nur linux-4.1.26.orig/arch/x86/include/asm/thread_info.h linux-4.1.26/arch/x86/include/asm/thread_info.h ---- linux-4.1.26.orig/arch/x86/include/asm/thread_info.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/x86/include/asm/thread_info.h 2016-06-19 15:30:58.611294419 +0200 -@@ -55,6 +55,8 @@ +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 { __u32 status; /* thread synchronous flags */ __u32 cpu; /* current CPU */ int saved_preempt_count; @@ -3388,7 +4065,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/include/asm/thread_info.h linux-4.1.26/arch mm_segment_t addr_limit; void __user *sysenter_return; unsigned int sig_on_uaccess_error:1; -@@ -95,6 +97,7 @@ +@@ -95,6 +97,7 @@ struct thread_info { #define TIF_SYSCALL_EMU 6 /* syscall emulation active */ #define TIF_SYSCALL_AUDIT 7 /* syscall auditing active */ #define TIF_SECCOMP 8 /* secure computing */ @@ -3396,7 +4073,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/include/asm/thread_info.h linux-4.1.26/arch #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 @@ +@@ -119,6 +122,7 @@ struct thread_info { #define _TIF_SYSCALL_EMU (1 << TIF_SYSCALL_EMU) #define _TIF_SYSCALL_AUDIT (1 << TIF_SYSCALL_AUDIT) #define _TIF_SECCOMP (1 << TIF_SECCOMP) @@ -3404,7 +4081,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/include/asm/thread_info.h linux-4.1.26/arch #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 @@ +@@ -168,6 +172,8 @@ struct thread_info { #define _TIF_WORK_CTXSW_PREV (_TIF_WORK_CTXSW|_TIF_USER_RETURN_NOTIFY) #define _TIF_WORK_CTXSW_NEXT (_TIF_WORK_CTXSW) @@ -3413,33 +4090,11 @@ diff -Nur linux-4.1.26.orig/arch/x86/include/asm/thread_info.h linux-4.1.26/arch #define STACK_WARN (THREAD_SIZE/8) /* -diff -Nur linux-4.1.26.orig/arch/x86/include/asm/uaccess_32.h linux-4.1.26/arch/x86/include/asm/uaccess_32.h ---- linux-4.1.26.orig/arch/x86/include/asm/uaccess_32.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/x86/include/asm/uaccess_32.h 2016-06-19 15:30:58.615294573 +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.26.orig/arch/x86/include/asm/uaccess.h linux-4.1.26/arch/x86/include/asm/uaccess.h ---- linux-4.1.26.orig/arch/x86/include/asm/uaccess.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/x86/include/asm/uaccess.h 2016-06-19 15:30:58.611294419 +0200 -@@ -74,7 +74,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 * @addr: User space pointer to start of block to check * @size: Size of block to check * @@ -3449,7 +4104,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/include/asm/uaccess.h linux-4.1.26/arch/x86 * * Checks if a pointer to a block of memory in user space is valid. * -@@ -145,7 +146,8 @@ +@@ -145,7 +146,8 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL)) * @x: Variable to store result. * @ptr: Source address, in user space. * @@ -3459,7 +4114,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/include/asm/uaccess.h linux-4.1.26/arch/x86 * * 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 @@ +@@ -240,7 +242,8 @@ extern void __put_user_8(void); * @x: Value to copy to user space. * @ptr: Destination address, in user space. * @@ -3469,7 +4124,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/include/asm/uaccess.h linux-4.1.26/arch/x86 * * This macro copies a single simple value from kernel space to user * space. It supports simple types like char and int, but not larger -@@ -455,7 +458,8 @@ +@@ -459,7 +462,8 @@ struct __large_struct { unsigned long buf[100]; }; * @x: Variable to store result. * @ptr: Source address, in user space. * @@ -3479,7 +4134,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/include/asm/uaccess.h linux-4.1.26/arch/x86 * * This macro copies a single simple variable from user space to kernel * space. It supports simple types like char and int, but not larger -@@ -479,7 +483,8 @@ +@@ -483,7 +487,8 @@ struct __large_struct { unsigned long buf[100]; }; * @x: Value to copy to user space. * @ptr: Destination address, in user space. * @@ -3489,10 +4144,35 @@ diff -Nur linux-4.1.26.orig/arch/x86/include/asm/uaccess.h linux-4.1.26/arch/x86 * * 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 -Nur linux-4.1.26.orig/arch/x86/include/asm/uv/uv_bau.h linux-4.1.26/arch/x86/include/asm/uv/uv_bau.h ---- linux-4.1.26.orig/arch/x86/include/asm/uv/uv_bau.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/x86/include/asm/uv/uv_bau.h 2016-06-19 15:30:58.615294573 +0200 -@@ -615,9 +615,9 @@ +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 { cycles_t send_message; cycles_t period_end; cycles_t period_time; @@ -3505,7 +4185,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/include/asm/uv/uv_bau.h linux-4.1.26/arch/x /* tunables */ int max_concurr; int max_concurr_const; -@@ -776,15 +776,15 @@ +@@ -776,15 +776,15 @@ static inline int atom_asr(short i, struct atomic_short *v) * to be lowered below the current 'v'. atomic_add_unless can only stop * on equal. */ @@ -3525,10 +4205,11 @@ diff -Nur linux-4.1.26.orig/arch/x86/include/asm/uv/uv_bau.h linux-4.1.26/arch/x return 1; } -diff -Nur linux-4.1.26.orig/arch/x86/include/asm/uv/uv_hub.h linux-4.1.26/arch/x86/include/asm/uv/uv_hub.h ---- linux-4.1.26.orig/arch/x86/include/asm/uv/uv_hub.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/x86/include/asm/uv/uv_hub.h 2016-06-19 15:30:58.615294573 +0200 -@@ -492,7 +492,7 @@ +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 { unsigned short nr_online_cpus; unsigned short pnode; short memory_nid; @@ -3537,43 +4218,11 @@ diff -Nur linux-4.1.26.orig/arch/x86/include/asm/uv/uv_hub.h linux-4.1.26/arch/x unsigned long nmi_count; /* obsolete, see uv_hub_nmi */ }; extern struct uv_blade_info *uv_blade_info; -diff -Nur linux-4.1.26.orig/arch/x86/Kconfig linux-4.1.26/arch/x86/Kconfig ---- linux-4.1.26.orig/arch/x86/Kconfig 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/x86/Kconfig 2016-06-19 15:30:58.611294419 +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.26.orig/arch/x86/kernel/apic/io_apic.c linux-4.1.26/arch/x86/kernel/apic/io_apic.c ---- linux-4.1.26.orig/arch/x86/kernel/apic/io_apic.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/x86/kernel/apic/io_apic.c 2016-06-19 15:30:58.615294573 +0200 -@@ -1891,7 +1891,8 @@ +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) 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 */ @@ -3583,10 +4232,11 @@ diff -Nur linux-4.1.26.orig/arch/x86/kernel/apic/io_apic.c linux-4.1.26/arch/x86 mask_ioapic(cfg); return true; } -diff -Nur linux-4.1.26.orig/arch/x86/kernel/apic/x2apic_uv_x.c linux-4.1.26/arch/x86/kernel/apic/x2apic_uv_x.c ---- linux-4.1.26.orig/arch/x86/kernel/apic/x2apic_uv_x.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/x86/kernel/apic/x2apic_uv_x.c 2016-06-19 15:30:58.615294573 +0200 -@@ -949,7 +949,7 @@ +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) uv_blade_info[blade].pnode = pnode; uv_blade_info[blade].nr_possible_cpus = 0; uv_blade_info[blade].nr_online_cpus = 0; @@ -3595,10 +4245,11 @@ diff -Nur linux-4.1.26.orig/arch/x86/kernel/apic/x2apic_uv_x.c linux-4.1.26/arch min_pnode = min(pnode, min_pnode); max_pnode = max(pnode, max_pnode); blade++; -diff -Nur linux-4.1.26.orig/arch/x86/kernel/asm-offsets.c linux-4.1.26/arch/x86/kernel/asm-offsets.c ---- linux-4.1.26.orig/arch/x86/kernel/asm-offsets.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/x86/kernel/asm-offsets.c 2016-06-19 15:30:58.615294573 +0200 -@@ -32,6 +32,7 @@ +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) { OFFSET(TI_flags, thread_info, flags); OFFSET(TI_status, thread_info, status); OFFSET(TI_addr_limit, thread_info, addr_limit); @@ -3606,15 +4257,16 @@ diff -Nur linux-4.1.26.orig/arch/x86/kernel/asm-offsets.c linux-4.1.26/arch/x86/ BLANK(); OFFSET(crypto_tfm_ctx_offset, crypto_tfm, __crt_ctx); -@@ -71,4 +72,5 @@ +@@ -71,4 +72,5 @@ void common(void) { BLANK(); DEFINE(PTREGS_SIZE, sizeof(struct pt_regs)); + DEFINE(_PREEMPT_ENABLED, PREEMPT_ENABLED); } -diff -Nur linux-4.1.26.orig/arch/x86/kernel/cpu/mcheck/mce.c linux-4.1.26/arch/x86/kernel/cpu/mcheck/mce.c ---- linux-4.1.26.orig/arch/x86/kernel/cpu/mcheck/mce.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/x86/kernel/cpu/mcheck/mce.c 2016-06-19 15:30:58.615294573 +0200 +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 @@ -41,6 +41,8 @@ #include <linux/debugfs.h> #include <linux/irq_work.h> @@ -3624,7 +4276,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/kernel/cpu/mcheck/mce.c linux-4.1.26/arch/x #include <asm/processor.h> #include <asm/traps.h> -@@ -1267,7 +1269,7 @@ +@@ -1267,7 +1269,7 @@ void mce_log_therm_throt_event(__u64 status) static unsigned long check_interval = INITIAL_CHECK_INTERVAL; static DEFINE_PER_CPU(unsigned long, mce_next_interval); /* in jiffies */ @@ -3633,7 +4285,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/kernel/cpu/mcheck/mce.c linux-4.1.26/arch/x static unsigned long mce_adjust_timer_default(unsigned long interval) { -@@ -1276,32 +1278,18 @@ +@@ -1276,32 +1278,18 @@ static unsigned long mce_adjust_timer_default(unsigned long interval) static unsigned long (*mce_adjust_timer)(unsigned long interval) = mce_adjust_timer_default; @@ -3672,7 +4324,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/kernel/cpu/mcheck/mce.c linux-4.1.26/arch/x iv = __this_cpu_read(mce_next_interval); if (mce_available(this_cpu_ptr(&cpu_info))) { -@@ -1324,7 +1312,7 @@ +@@ -1324,7 +1312,7 @@ static void mce_timer_fn(unsigned long data) done: __this_cpu_write(mce_next_interval, iv); @@ -3681,7 +4333,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/kernel/cpu/mcheck/mce.c linux-4.1.26/arch/x } /* -@@ -1332,7 +1320,7 @@ +@@ -1332,7 +1320,7 @@ done: */ void mce_timer_kick(unsigned long interval) { @@ -3690,7 +4342,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/kernel/cpu/mcheck/mce.c linux-4.1.26/arch/x unsigned long iv = __this_cpu_read(mce_next_interval); __restart_timer(t, interval); -@@ -1347,7 +1335,7 @@ +@@ -1347,7 +1335,7 @@ static void mce_timer_delete_all(void) int cpu; for_each_online_cpu(cpu) @@ -3699,7 +4351,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/kernel/cpu/mcheck/mce.c linux-4.1.26/arch/x } static void mce_do_trigger(struct work_struct *work) -@@ -1357,6 +1345,56 @@ +@@ -1357,6 +1345,56 @@ static void mce_do_trigger(struct work_struct *work) static DECLARE_WORK(mce_trigger_work, mce_do_trigger); @@ -3756,7 +4408,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/kernel/cpu/mcheck/mce.c linux-4.1.26/arch/x /* * 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 @@ +@@ -1364,19 +1402,8 @@ static DECLARE_WORK(mce_trigger_work, mce_do_trigger); */ int mce_notify_irq(void) { @@ -3777,7 +4429,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/kernel/cpu/mcheck/mce.c linux-4.1.26/arch/x return 1; } return 0; -@@ -1649,7 +1676,7 @@ +@@ -1649,7 +1676,7 @@ static void __mcheck_cpu_init_vendor(struct cpuinfo_x86 *c) } } @@ -3786,7 +4438,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/kernel/cpu/mcheck/mce.c linux-4.1.26/arch/x { unsigned long iv = check_interval * HZ; -@@ -1658,16 +1685,17 @@ +@@ -1658,16 +1685,17 @@ static void mce_start_timer(unsigned int cpu, struct timer_list *t) per_cpu(mce_next_interval, cpu) = iv; @@ -3808,7 +4460,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/kernel/cpu/mcheck/mce.c linux-4.1.26/arch/x mce_start_timer(cpu, t); } -@@ -2345,6 +2373,8 @@ +@@ -2345,6 +2373,8 @@ static void mce_disable_cpu(void *h) if (!mce_available(raw_cpu_ptr(&cpu_info))) return; @@ -3817,7 +4469,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/kernel/cpu/mcheck/mce.c linux-4.1.26/arch/x if (!(action & CPU_TASKS_FROZEN)) cmci_clear(); for (i = 0; i < mca_cfg.banks; i++) { -@@ -2371,6 +2401,7 @@ +@@ -2371,6 +2401,7 @@ static void mce_reenable_cpu(void *h) if (b->init) wrmsrl(MSR_IA32_MCx_CTL(i), b->ctl); } @@ -3825,7 +4477,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/kernel/cpu/mcheck/mce.c linux-4.1.26/arch/x } /* Get notified when a cpu comes on/off. Be hotplug friendly. */ -@@ -2378,7 +2409,6 @@ +@@ -2378,7 +2409,6 @@ static int mce_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu) { unsigned int cpu = (unsigned long)hcpu; @@ -3833,7 +4485,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/kernel/cpu/mcheck/mce.c linux-4.1.26/arch/x switch (action & ~CPU_TASKS_FROZEN) { case CPU_ONLINE: -@@ -2398,11 +2428,9 @@ +@@ -2398,11 +2428,9 @@ mce_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu) break; case CPU_DOWN_PREPARE: smp_call_function_single(cpu, mce_disable_cpu, &action, 1); @@ -3845,7 +4497,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/kernel/cpu/mcheck/mce.c linux-4.1.26/arch/x break; } -@@ -2441,6 +2469,10 @@ +@@ -2441,6 +2469,10 @@ static __init int mcheck_init_device(void) goto err_out; } @@ -3856,10 +4508,96 @@ diff -Nur linux-4.1.26.orig/arch/x86/kernel/cpu/mcheck/mce.c linux-4.1.26/arch/x if (!zalloc_cpumask_var(&mce_device_initialized, GFP_KERNEL)) { err = -ENOMEM; goto err_out; -diff -Nur linux-4.1.26.orig/arch/x86/kernel/dumpstack_32.c linux-4.1.26/arch/x86/kernel/dumpstack_32.c ---- linux-4.1.26.orig/arch/x86/kernel/dumpstack_32.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/x86/kernel/dumpstack_32.c 2016-06-19 15:30:58.615294573 +0200 -@@ -42,7 +42,7 @@ +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 = { \ + }; + + struct rapl_pmu { +- spinlock_t lock; ++ raw_spinlock_t lock; + 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) + if (!pmu->n_active) + return HRTIMER_NORESTART; + +- spin_lock_irqsave(&pmu->lock, flags); ++ raw_spin_lock_irqsave(&pmu->lock, flags); + + list_for_each_entry(event, &pmu->active_list, active_entry) { + rapl_event_update(event); + } + +- spin_unlock_irqrestore(&pmu->lock, flags); ++ raw_spin_unlock_irqrestore(&pmu->lock, flags); + + hrtimer_forward_now(hrtimer, pmu->timer_interval); + +@@ -266,9 +266,9 @@ static void rapl_pmu_event_start(struct perf_event *event, int mode) + struct rapl_pmu *pmu = __this_cpu_read(rapl_pmu); + unsigned long flags; + +- spin_lock_irqsave(&pmu->lock, flags); ++ raw_spin_lock_irqsave(&pmu->lock, flags); + __rapl_pmu_event_start(pmu, event); +- spin_unlock_irqrestore(&pmu->lock, flags); ++ raw_spin_unlock_irqrestore(&pmu->lock, flags); + } + + 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) + struct hw_perf_event *hwc = &event->hw; + unsigned long flags; + +- spin_lock_irqsave(&pmu->lock, flags); ++ raw_spin_lock_irqsave(&pmu->lock, flags); + + /* 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) + hwc->state |= PERF_HES_UPTODATE; + } + +- spin_unlock_irqrestore(&pmu->lock, flags); ++ raw_spin_unlock_irqrestore(&pmu->lock, flags); + } + + 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) + struct hw_perf_event *hwc = &event->hw; + unsigned long flags; + +- spin_lock_irqsave(&pmu->lock, flags); ++ raw_spin_lock_irqsave(&pmu->lock, flags); + + hwc->state = PERF_HES_UPTODATE | PERF_HES_STOPPED; + + if (mode & PERF_EF_START) + __rapl_pmu_event_start(pmu, event); + +- spin_unlock_irqrestore(&pmu->lock, flags); ++ raw_spin_unlock_irqrestore(&pmu->lock, flags); + + return 0; + } +@@ -594,7 +594,7 @@ static int rapl_cpu_prepare(int cpu) + pmu = kzalloc_node(sizeof(*pmu), GFP_KERNEL, cpu_to_node(cpu)); + if (!pmu) + return -1; +- spin_lock_init(&pmu->lock); ++ raw_spin_lock_init(&pmu->lock); + + 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, unsigned long *stack, unsigned long bp, const struct stacktrace_ops *ops, void *data) { @@ -3868,7 +4606,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/kernel/dumpstack_32.c linux-4.1.26/arch/x86 int graph = 0; u32 *prev_esp; -@@ -86,7 +86,7 @@ +@@ -86,7 +86,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs, break; touch_nmi_watchdog(); } @@ -3877,10 +4615,11 @@ diff -Nur linux-4.1.26.orig/arch/x86/kernel/dumpstack_32.c linux-4.1.26/arch/x86 } EXPORT_SYMBOL(dump_trace); -diff -Nur linux-4.1.26.orig/arch/x86/kernel/dumpstack_64.c linux-4.1.26/arch/x86/kernel/dumpstack_64.c ---- linux-4.1.26.orig/arch/x86/kernel/dumpstack_64.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/x86/kernel/dumpstack_64.c 2016-06-19 15:30:58.615294573 +0200 -@@ -152,7 +152,7 @@ +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, unsigned long *stack, unsigned long bp, const struct stacktrace_ops *ops, void *data) { @@ -3889,7 +4628,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/kernel/dumpstack_64.c linux-4.1.26/arch/x86 struct thread_info *tinfo; unsigned long *irq_stack = (unsigned long *)per_cpu(irq_stack_ptr, cpu); unsigned long dummy; -@@ -241,7 +241,7 @@ +@@ -241,7 +241,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs, * This handles the process stack: */ bp = ops->walk_stack(tinfo, stack, bp, ops, data, NULL, &graph); @@ -3898,7 +4637,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/kernel/dumpstack_64.c linux-4.1.26/arch/x86 } EXPORT_SYMBOL(dump_trace); -@@ -255,7 +255,7 @@ +@@ -255,7 +255,7 @@ show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs, int cpu; int i; @@ -3907,7 +4646,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/kernel/dumpstack_64.c linux-4.1.26/arch/x86 cpu = smp_processor_id(); irq_stack_end = (unsigned long *)(per_cpu(irq_stack_ptr, cpu)); -@@ -291,7 +291,7 @@ +@@ -291,7 +291,7 @@ show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs, pr_cont(" %016lx", *stack++); touch_nmi_watchdog(); } @@ -3916,10 +4655,11 @@ diff -Nur linux-4.1.26.orig/arch/x86/kernel/dumpstack_64.c linux-4.1.26/arch/x86 pr_cont("\n"); show_trace_log_lvl(task, regs, sp, bp, log_lvl); -diff -Nur linux-4.1.26.orig/arch/x86/kernel/entry_32.S linux-4.1.26/arch/x86/kernel/entry_32.S ---- linux-4.1.26.orig/arch/x86/kernel/entry_32.S 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/x86/kernel/entry_32.S 2016-06-19 15:30:58.615294573 +0200 -@@ -359,8 +359,24 @@ +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) ENTRY(resume_kernel) DISABLE_INTERRUPTS(CLBR_ANY) need_resched: @@ -3944,7 +4684,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/kernel/entry_32.S linux-4.1.26/arch/x86/ker testl $X86_EFLAGS_IF,PT_EFLAGS(%esp) # interrupts off (exception path) ? jz restore_all call preempt_schedule_irq -@@ -594,7 +610,7 @@ +@@ -594,7 +610,7 @@ ENDPROC(system_call) ALIGN RING0_PTREGS_FRAME # can't unwind into user space anyway work_pending: @@ -3953,7 +4693,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/kernel/entry_32.S linux-4.1.26/arch/x86/ker jz work_notifysig work_resched: call schedule -@@ -607,7 +623,7 @@ +@@ -607,7 +623,7 @@ work_resched: andl $_TIF_WORK_MASK, %ecx # is there any work to be done other # than syscall tracing? jz restore_all @@ -3962,10 +4702,11 @@ diff -Nur linux-4.1.26.orig/arch/x86/kernel/entry_32.S linux-4.1.26/arch/x86/ker jnz work_resched work_notifysig: # deal with pending signals and -diff -Nur linux-4.1.26.orig/arch/x86/kernel/entry_64.S linux-4.1.26/arch/x86/kernel/entry_64.S ---- linux-4.1.26.orig/arch/x86/kernel/entry_64.S 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/x86/kernel/entry_64.S 2016-06-19 15:30:58.615294573 +0200 -@@ -370,8 +370,8 @@ +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) /* First do a reschedule test. */ /* edx: work, edi: workmask */ int_careful: @@ -3976,7 +4717,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/kernel/entry_64.S linux-4.1.26/arch/x86/ker TRACE_IRQS_ON ENABLE_INTERRUPTS(CLBR_NONE) pushq_cfi %rdi -@@ -776,7 +776,23 @@ +@@ -776,7 +776,23 @@ retint_kernel: bt $9,EFLAGS(%rsp) /* interrupts were off? */ jnc 1f 0: cmpl $0,PER_CPU_VAR(__preempt_count) @@ -4000,7 +4741,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/kernel/entry_64.S linux-4.1.26/arch/x86/ker call preempt_schedule_irq jmp 0b 1: -@@ -844,8 +860,8 @@ +@@ -844,8 +860,8 @@ native_irq_return_ldt: /* edi: workmask, edx: work */ retint_careful: CFI_RESTORE_STATE @@ -4011,7 +4752,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/kernel/entry_64.S linux-4.1.26/arch/x86/ker TRACE_IRQS_ON ENABLE_INTERRUPTS(CLBR_NONE) pushq_cfi %rdi -@@ -1118,6 +1134,7 @@ +@@ -1118,6 +1134,7 @@ bad_gs: jmp 2b .previous @@ -4019,7 +4760,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/kernel/entry_64.S linux-4.1.26/arch/x86/ker /* Call softirq on interrupt stack. Interrupts are off. */ ENTRY(do_softirq_own_stack) CFI_STARTPROC -@@ -1137,6 +1154,7 @@ +@@ -1137,6 +1154,7 @@ ENTRY(do_softirq_own_stack) ret CFI_ENDPROC END(do_softirq_own_stack) @@ -4027,10 +4768,11 @@ diff -Nur linux-4.1.26.orig/arch/x86/kernel/entry_64.S linux-4.1.26/arch/x86/ker #ifdef CONFIG_XEN idtentry xen_hypervisor_callback xen_do_hypervisor_callback has_error_code=0 -diff -Nur linux-4.1.26.orig/arch/x86/kernel/irq_32.c linux-4.1.26/arch/x86/kernel/irq_32.c ---- linux-4.1.26.orig/arch/x86/kernel/irq_32.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/x86/kernel/irq_32.c 2016-06-19 15:30:58.619294727 +0200 -@@ -135,6 +135,7 @@ +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) cpu, per_cpu(hardirq_stack, cpu), per_cpu(softirq_stack, cpu)); } @@ -4038,7 +4780,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/kernel/irq_32.c linux-4.1.26/arch/x86/kerne void do_softirq_own_stack(void) { struct thread_info *curstk; -@@ -153,6 +154,7 @@ +@@ -153,6 +154,7 @@ void do_softirq_own_stack(void) call_on_stack(__do_softirq, isp); } @@ -4046,9 +4788,153 @@ diff -Nur linux-4.1.26.orig/arch/x86/kernel/irq_32.c linux-4.1.26/arch/x86/kerne bool handle_irq(unsigned irq, struct pt_regs *regs) { -diff -Nur linux-4.1.26.orig/arch/x86/kernel/process_32.c linux-4.1.26/arch/x86/kernel/process_32.c ---- linux-4.1.26.orig/arch/x86/kernel/process_32.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/x86/kernel/process_32.c 2016-06-19 15:30:58.619294727 +0200 +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 +@@ -36,6 +36,7 @@ + #include <linux/kprobes.h> + #include <linux/debugfs.h> + #include <linux/nmi.h> ++#include <linux/wait-simple.h> + #include <asm/timer.h> + #include <asm/cpu.h> + #include <asm/traps.h> +@@ -91,14 +92,14 @@ static void kvm_io_delay(void) + + struct kvm_task_sleep_node { + struct hlist_node link; +- wait_queue_head_t wq; ++ struct swait_head wq; + u32 token; + int cpu; + bool halted; + }; + + static struct kvm_task_sleep_head { +- spinlock_t lock; ++ raw_spinlock_t lock; + struct hlist_head list; + } async_pf_sleepers[KVM_TASK_SLEEP_HASHSIZE]; + +@@ -122,17 +123,17 @@ void kvm_async_pf_task_wait(u32 token) + 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; +- DEFINE_WAIT(wait); ++ DEFINE_SWAITER(wait); + + rcu_irq_enter(); + +- spin_lock(&b->lock); ++ raw_spin_lock(&b->lock); + e = _find_apf_task(b, token); + if (e) { + /* dummy entry exist -> wake up was delivered ahead of PF */ + hlist_del(&e->link); + kfree(e); +- spin_unlock(&b->lock); ++ raw_spin_unlock(&b->lock); + + rcu_irq_exit(); + return; +@@ -141,13 +142,13 @@ void kvm_async_pf_task_wait(u32 token) + n.token = token; + n.cpu = smp_processor_id(); + n.halted = is_idle_task(current) || preempt_count() > 1; +- init_waitqueue_head(&n.wq); ++ init_swait_head(&n.wq); + hlist_add_head(&n.link, &b->list); +- spin_unlock(&b->lock); ++ raw_spin_unlock(&b->lock); + + for (;;) { + if (!n.halted) +- prepare_to_wait(&n.wq, &wait, TASK_UNINTERRUPTIBLE); ++ swait_prepare(&n.wq, &wait, TASK_UNINTERRUPTIBLE); + if (hlist_unhashed(&n.link)) + break; + +@@ -166,7 +167,7 @@ void kvm_async_pf_task_wait(u32 token) + } + } + if (!n.halted) +- finish_wait(&n.wq, &wait); ++ swait_finish(&n.wq, &wait); + + rcu_irq_exit(); + return; +@@ -178,8 +179,8 @@ static void apf_task_wake_one(struct kvm_task_sleep_node *n) + hlist_del_init(&n->link); + if (n->halted) + smp_send_reschedule(n->cpu); +- else if (waitqueue_active(&n->wq)) +- wake_up(&n->wq); ++ else if (swaitqueue_active(&n->wq)) ++ swait_wake(&n->wq); + } + + static void apf_task_wake_all(void) +@@ -189,14 +190,14 @@ static void apf_task_wake_all(void) + for (i = 0; i < KVM_TASK_SLEEP_HASHSIZE; i++) { + struct hlist_node *p, *next; + struct kvm_task_sleep_head *b = &async_pf_sleepers[i]; +- spin_lock(&b->lock); ++ raw_spin_lock(&b->lock); + hlist_for_each_safe(p, next, &b->list) { + struct kvm_task_sleep_node *n = + hlist_entry(p, typeof(*n), link); + if (n->cpu == smp_processor_id()) + apf_task_wake_one(n); + } +- spin_unlock(&b->lock); ++ raw_spin_unlock(&b->lock); + } + } + +@@ -212,7 +213,7 @@ void kvm_async_pf_task_wake(u32 token) + } + + again: +- spin_lock(&b->lock); ++ raw_spin_lock(&b->lock); + n = _find_apf_task(b, token); + if (!n) { + /* +@@ -225,17 +226,17 @@ again: + * Allocation failed! Busy wait while other cpu + * handles async PF. + */ +- spin_unlock(&b->lock); ++ raw_spin_unlock(&b->lock); + cpu_relax(); + goto again; + } + n->token = token; + n->cpu = smp_processor_id(); +- init_waitqueue_head(&n->wq); ++ init_swait_head(&n->wq); + hlist_add_head(&n->link, &b->list); + } else + apf_task_wake_one(n); +- spin_unlock(&b->lock); ++ raw_spin_unlock(&b->lock); + return; + } + EXPORT_SYMBOL_GPL(kvm_async_pf_task_wake); +@@ -486,7 +487,7 @@ void __init kvm_guest_init(void) + paravirt_ops_setup(); + register_reboot_notifier(&kvm_pv_reboot_nb); + for (i = 0; i < KVM_TASK_SLEEP_HASHSIZE; i++) +- spin_lock_init(&async_pf_sleepers[i].lock); ++ raw_spin_lock_init(&async_pf_sleepers[i].lock); + 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 @@ -35,6 +35,7 @@ #include <linux/uaccess.h> #include <linux/io.h> @@ -4057,7 +4943,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/kernel/process_32.c linux-4.1.26/arch/x86/k #include <asm/pgtable.h> #include <asm/ldt.h> -@@ -210,6 +211,35 @@ +@@ -210,6 +211,35 @@ start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp) } EXPORT_SYMBOL_GPL(start_thread); @@ -4093,7 +4979,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/kernel/process_32.c linux-4.1.26/arch/x86/k /* * switch_to(x,y) should switch tasks from x to y. -@@ -292,6 +322,8 @@ +@@ -292,6 +322,8 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p) task_thread_info(next_p)->flags & _TIF_WORK_CTXSW_NEXT)) __switch_to_xtra(prev_p, next_p, tss); @@ -4102,10 +4988,11 @@ diff -Nur linux-4.1.26.orig/arch/x86/kernel/process_32.c linux-4.1.26/arch/x86/k /* * Leave lazy mode, flushing any hypercalls made here. * This must be done before restoring TLS segments so -diff -Nur linux-4.1.26.orig/arch/x86/kernel/signal.c linux-4.1.26/arch/x86/kernel/signal.c ---- linux-4.1.26.orig/arch/x86/kernel/signal.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/x86/kernel/signal.c 2016-06-19 15:30:58.619294727 +0200 -@@ -726,6 +726,14 @@ +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) { user_exit(); @@ -4120,10 +5007,11 @@ diff -Nur linux-4.1.26.orig/arch/x86/kernel/signal.c linux-4.1.26/arch/x86/kerne if (thread_info_flags & _TIF_UPROBE) uprobe_notify_resume(regs); -diff -Nur linux-4.1.26.orig/arch/x86/kvm/lapic.c linux-4.1.26/arch/x86/kvm/lapic.c ---- linux-4.1.26.orig/arch/x86/kvm/lapic.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/x86/kvm/lapic.c 2016-06-19 15:30:58.619294727 +0200 -@@ -1106,7 +1106,7 @@ +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) static void apic_timer_expired(struct kvm_lapic *apic) { struct kvm_vcpu *vcpu = apic->vcpu; @@ -4132,7 +5020,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/kvm/lapic.c linux-4.1.26/arch/x86/kvm/lapic struct kvm_timer *ktimer = &apic->lapic_timer; if (atomic_read(&apic->lapic_timer.pending)) -@@ -1115,8 +1115,8 @@ +@@ -1115,8 +1115,8 @@ static void apic_timer_expired(struct kvm_lapic *apic) atomic_inc(&apic->lapic_timer.pending); kvm_set_pending_timer(vcpu); @@ -4143,7 +5031,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/kvm/lapic.c linux-4.1.26/arch/x86/kvm/lapic if (apic_lvtt_tscdeadline(apic)) ktimer->expired_tscdeadline = ktimer->tscdeadline; -@@ -1169,8 +1169,36 @@ +@@ -1169,8 +1169,36 @@ void wait_lapic_expire(struct kvm_vcpu *vcpu) __delay(tsc_deadline - guest_tsc); } @@ -4180,7 +5068,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/kvm/lapic.c linux-4.1.26/arch/x86/kvm/lapic ktime_t now; atomic_set(&apic->lapic_timer.pending, 0); -@@ -1201,9 +1229,11 @@ +@@ -1201,9 +1229,11 @@ static void start_apic_timer(struct kvm_lapic *apic) } } @@ -4193,7 +5081,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/kvm/lapic.c linux-4.1.26/arch/x86/kvm/lapic apic_debug("%s: bus cycle is %" PRId64 "ns, now 0x%016" PRIx64 ", " -@@ -1235,8 +1265,10 @@ +@@ -1235,8 +1265,10 @@ static void start_apic_timer(struct kvm_lapic *apic) do_div(ns, this_tsc_khz); expire = ktime_add_ns(now, ns); expire = ktime_sub_ns(expire, lapic_timer_advance_ns); @@ -4205,7 +5093,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/kvm/lapic.c linux-4.1.26/arch/x86/kvm/lapic } else apic_timer_expired(apic); -@@ -1709,6 +1741,7 @@ +@@ -1709,6 +1741,7 @@ int kvm_create_lapic(struct kvm_vcpu *vcpu) hrtimer_init(&apic->lapic_timer.timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS); apic->lapic_timer.timer.function = apic_timer_fn; @@ -4213,7 +5101,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/kvm/lapic.c linux-4.1.26/arch/x86/kvm/lapic /* * APIC is created enabled. This will prevent kvm_lapic_set_base from -@@ -1836,7 +1869,8 @@ +@@ -1836,7 +1869,8 @@ void __kvm_migrate_apic_timer(struct kvm_vcpu *vcpu) timer = &vcpu->arch.apic->lapic_timer.timer; if (hrtimer_cancel(timer)) @@ -4223,10 +5111,11 @@ diff -Nur linux-4.1.26.orig/arch/x86/kvm/lapic.c linux-4.1.26/arch/x86/kvm/lapic } /* -diff -Nur linux-4.1.26.orig/arch/x86/kvm/x86.c linux-4.1.26/arch/x86/kvm/x86.c ---- linux-4.1.26.orig/arch/x86/kvm/x86.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/x86/kvm/x86.c 2016-06-19 15:30:58.619294727 +0200 -@@ -5810,6 +5810,13 @@ +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) goto out; } @@ -4240,10 +5129,11 @@ diff -Nur linux-4.1.26.orig/arch/x86/kvm/x86.c linux-4.1.26/arch/x86/kvm/x86.c r = kvm_mmu_module_init(); if (r) goto out_free_percpu; -diff -Nur linux-4.1.26.orig/arch/x86/lib/usercopy_32.c linux-4.1.26/arch/x86/lib/usercopy_32.c ---- linux-4.1.26.orig/arch/x86/lib/usercopy_32.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/x86/lib/usercopy_32.c 2016-06-19 15:30:58.619294727 +0200 -@@ -647,7 +647,8 @@ +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); * @from: Source address, in kernel space. * @n: Number of bytes to copy. * @@ -4253,7 +5143,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/lib/usercopy_32.c linux-4.1.26/arch/x86/lib * * Copy data from kernel space to user space. * -@@ -668,7 +669,8 @@ +@@ -668,7 +669,8 @@ EXPORT_SYMBOL(_copy_to_user); * @from: Source address, in user space. * @n: Number of bytes to copy. * @@ -4263,9 +5153,10 @@ diff -Nur linux-4.1.26.orig/arch/x86/lib/usercopy_32.c linux-4.1.26/arch/x86/lib * * Copy data from user space to kernel space. * -diff -Nur linux-4.1.26.orig/arch/x86/mm/fault.c linux-4.1.26/arch/x86/mm/fault.c ---- linux-4.1.26.orig/arch/x86/mm/fault.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/x86/mm/fault.c 2016-06-19 15:30:58.619294727 +0200 +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 @@ -13,6 +13,7 @@ #include <linux/hugetlb.h> /* hstate_index_to_shift */ #include <linux/prefetch.h> /* prefetchw */ @@ -4274,7 +5165,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/mm/fault.c linux-4.1.26/arch/x86/mm/fault.c #include <asm/traps.h> /* dotraplinkage, ... */ #include <asm/pgalloc.h> /* pgd_*(), ... */ -@@ -1133,9 +1134,9 @@ +@@ -1133,9 +1134,9 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code, /* * If we're in an interrupt, have no user context or are running @@ -4286,10 +5177,11 @@ diff -Nur linux-4.1.26.orig/arch/x86/mm/fault.c linux-4.1.26/arch/x86/mm/fault.c bad_area_nosemaphore(regs, error_code, address); return; } -diff -Nur linux-4.1.26.orig/arch/x86/mm/highmem_32.c linux-4.1.26/arch/x86/mm/highmem_32.c ---- linux-4.1.26.orig/arch/x86/mm/highmem_32.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/x86/mm/highmem_32.c 2016-06-19 15:30:58.619294727 +0200 -@@ -32,10 +32,11 @@ +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); */ void *kmap_atomic_prot(struct page *page, pgprot_t prot) { @@ -4302,7 +5194,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/mm/highmem_32.c linux-4.1.26/arch/x86/mm/hi pagefault_disable(); if (!PageHighMem(page)) -@@ -45,7 +46,10 @@ +@@ -45,7 +46,10 @@ void *kmap_atomic_prot(struct page *page, pgprot_t prot) idx = type + KM_TYPE_NR*smp_processor_id(); vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx); BUG_ON(!pte_none(*(kmap_pte-idx))); @@ -4314,7 +5206,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/mm/highmem_32.c linux-4.1.26/arch/x86/mm/hi arch_flush_lazy_mmu_mode(); return (void *)vaddr; -@@ -88,6 +92,9 @@ +@@ -88,6 +92,9 @@ void __kunmap_atomic(void *kvaddr) * is a bad idea also, in case the page changes cacheability * attributes or becomes a protected page in a hypervisor. */ @@ -4324,7 +5216,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/mm/highmem_32.c linux-4.1.26/arch/x86/mm/hi kpte_clear_flush(kmap_pte-idx, vaddr); kmap_atomic_idx_pop(); arch_flush_lazy_mmu_mode(); -@@ -100,6 +107,7 @@ +@@ -100,6 +107,7 @@ void __kunmap_atomic(void *kvaddr) #endif pagefault_enable(); @@ -4332,10 +5224,11 @@ diff -Nur linux-4.1.26.orig/arch/x86/mm/highmem_32.c linux-4.1.26/arch/x86/mm/hi } EXPORT_SYMBOL(__kunmap_atomic); -diff -Nur linux-4.1.26.orig/arch/x86/mm/iomap_32.c linux-4.1.26/arch/x86/mm/iomap_32.c ---- linux-4.1.26.orig/arch/x86/mm/iomap_32.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/x86/mm/iomap_32.c 2016-06-19 15:30:58.619294727 +0200 -@@ -56,15 +56,22 @@ +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); void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot) { @@ -4359,7 +5252,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/mm/iomap_32.c linux-4.1.26/arch/x86/mm/ioma arch_flush_lazy_mmu_mode(); return (void *)vaddr; -@@ -112,10 +119,14 @@ +@@ -112,10 +119,14 @@ iounmap_atomic(void __iomem *kvaddr) * is a bad idea also, in case the page changes cacheability * attributes or becomes a protected page in a hypervisor. */ @@ -4374,10 +5267,11 @@ diff -Nur linux-4.1.26.orig/arch/x86/mm/iomap_32.c linux-4.1.26/arch/x86/mm/ioma + preempt_enable(); } EXPORT_SYMBOL_GPL(iounmap_atomic); -diff -Nur linux-4.1.26.orig/arch/x86/platform/uv/tlb_uv.c linux-4.1.26/arch/x86/platform/uv/tlb_uv.c ---- linux-4.1.26.orig/arch/x86/platform/uv/tlb_uv.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/x86/platform/uv/tlb_uv.c 2016-06-19 15:30:58.619294727 +0200 -@@ -714,9 +714,9 @@ +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, quiesce_local_uvhub(hmaster); @@ -4389,7 +5283,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/platform/uv/tlb_uv.c linux-4.1.26/arch/x86/ end_uvhub_quiesce(hmaster); -@@ -736,9 +736,9 @@ +@@ -736,9 +736,9 @@ static void destination_timeout(struct bau_desc *bau_desc, quiesce_local_uvhub(hmaster); @@ -4401,7 +5295,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/platform/uv/tlb_uv.c linux-4.1.26/arch/x86/ end_uvhub_quiesce(hmaster); -@@ -759,7 +759,7 @@ +@@ -759,7 +759,7 @@ static void disable_for_period(struct bau_control *bcp, struct ptc_stats *stat) cycles_t tm1; hmaster = bcp->uvhub_master; @@ -4410,7 +5304,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/platform/uv/tlb_uv.c linux-4.1.26/arch/x86/ if (!bcp->baudisabled) { stat->s_bau_disabled++; tm1 = get_cycles(); -@@ -772,7 +772,7 @@ +@@ -772,7 +772,7 @@ static void disable_for_period(struct bau_control *bcp, struct ptc_stats *stat) } } } @@ -4419,7 +5313,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/platform/uv/tlb_uv.c linux-4.1.26/arch/x86/ } static void count_max_concurr(int stat, struct bau_control *bcp, -@@ -835,7 +835,7 @@ +@@ -835,7 +835,7 @@ static void record_send_stats(cycles_t time1, cycles_t time2, */ static void uv1_throttle(struct bau_control *hmaster, struct ptc_stats *stat) { @@ -4428,7 +5322,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/platform/uv/tlb_uv.c linux-4.1.26/arch/x86/ atomic_t *v; v = &hmaster->active_descriptor_count; -@@ -968,7 +968,7 @@ +@@ -968,7 +968,7 @@ static int check_enable(struct bau_control *bcp, struct ptc_stats *stat) struct bau_control *hmaster; hmaster = bcp->uvhub_master; @@ -4437,7 +5331,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/platform/uv/tlb_uv.c linux-4.1.26/arch/x86/ if (bcp->baudisabled && (get_cycles() >= bcp->set_bau_on_time)) { stat->s_bau_reenabled++; for_each_present_cpu(tcpu) { -@@ -980,10 +980,10 @@ +@@ -980,10 +980,10 @@ static int check_enable(struct bau_control *bcp, struct ptc_stats *stat) tbcp->period_giveups = 0; } } @@ -4450,7 +5344,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/platform/uv/tlb_uv.c linux-4.1.26/arch/x86/ return -1; } -@@ -1901,9 +1901,9 @@ +@@ -1901,9 +1901,9 @@ static void __init init_per_cpu_tunables(void) bcp->cong_reps = congested_reps; bcp->disabled_period = sec_2_cycles(disabled_period); bcp->giveup_limit = giveup_limit; @@ -4463,10 +5357,11 @@ diff -Nur linux-4.1.26.orig/arch/x86/platform/uv/tlb_uv.c linux-4.1.26/arch/x86/ } } -diff -Nur linux-4.1.26.orig/arch/x86/platform/uv/uv_time.c linux-4.1.26/arch/x86/platform/uv/uv_time.c ---- linux-4.1.26.orig/arch/x86/platform/uv/uv_time.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/x86/platform/uv/uv_time.c 2016-06-19 15:30:58.623294881 +0200 -@@ -58,7 +58,7 @@ +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); /* There is one of these allocated per node */ struct uv_rtc_timer_head { @@ -4475,7 +5370,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/platform/uv/uv_time.c linux-4.1.26/arch/x86 /* next cpu waiting for timer, local node relative: */ int next_cpu; /* number of cpus on this node: */ -@@ -178,7 +178,7 @@ +@@ -178,7 +178,7 @@ static __init int uv_rtc_allocate_timers(void) uv_rtc_deallocate_timers(); return -ENOMEM; } @@ -4484,7 +5379,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/platform/uv/uv_time.c linux-4.1.26/arch/x86 head->ncpus = uv_blade_nr_possible_cpus(bid); head->next_cpu = -1; blade_info[bid] = head; -@@ -232,7 +232,7 @@ +@@ -232,7 +232,7 @@ static int uv_rtc_set_timer(int cpu, u64 expires) unsigned long flags; int next_cpu; @@ -4493,7 +5388,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/platform/uv/uv_time.c linux-4.1.26/arch/x86 next_cpu = head->next_cpu; *t = expires; -@@ -244,12 +244,12 @@ +@@ -244,12 +244,12 @@ static int uv_rtc_set_timer(int cpu, u64 expires) if (uv_setup_intr(cpu, expires)) { *t = ULLONG_MAX; uv_rtc_find_next_timer(head, pnode); @@ -4508,7 +5403,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/platform/uv/uv_time.c linux-4.1.26/arch/x86 return 0; } -@@ -268,7 +268,7 @@ +@@ -268,7 +268,7 @@ static int uv_rtc_unset_timer(int cpu, int force) unsigned long flags; int rc = 0; @@ -4517,7 +5412,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/platform/uv/uv_time.c linux-4.1.26/arch/x86 if ((head->next_cpu == bcpu && uv_read_rtc(NULL) >= *t) || force) rc = 1; -@@ -280,7 +280,7 @@ +@@ -280,7 +280,7 @@ static int uv_rtc_unset_timer(int cpu, int force) uv_rtc_find_next_timer(head, pnode); } @@ -4526,7 +5421,7 @@ diff -Nur linux-4.1.26.orig/arch/x86/platform/uv/uv_time.c linux-4.1.26/arch/x86 return rc; } -@@ -300,13 +300,18 @@ +@@ -300,13 +300,18 @@ static int uv_rtc_unset_timer(int cpu, int force) static cycle_t uv_read_rtc(struct clocksource *cs) { unsigned long offset; @@ -4546,9 +5441,10 @@ diff -Nur linux-4.1.26.orig/arch/x86/platform/uv/uv_time.c linux-4.1.26/arch/x86 } /* -diff -Nur linux-4.1.26.orig/arch/xtensa/mm/fault.c linux-4.1.26/arch/xtensa/mm/fault.c ---- linux-4.1.26.orig/arch/xtensa/mm/fault.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/xtensa/mm/fault.c 2016-06-19 15:30:58.623294881 +0200 +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 @@ -15,10 +15,10 @@ #include <linux/mm.h> #include <linux/module.h> @@ -4561,7 +5457,7 @@ diff -Nur linux-4.1.26.orig/arch/xtensa/mm/fault.c linux-4.1.26/arch/xtensa/mm/f #include <asm/pgalloc.h> DEFINE_PER_CPU(unsigned long, asid_cache) = ASID_USER_FIRST; -@@ -57,7 +57,7 @@ +@@ -57,7 +57,7 @@ void do_page_fault(struct pt_regs *regs) /* If we're in an interrupt or have no user * context, we must not take the fault.. */ @@ -4570,10 +5466,11 @@ diff -Nur linux-4.1.26.orig/arch/xtensa/mm/fault.c linux-4.1.26/arch/xtensa/mm/f bad_page_fault(regs, address, SIGSEGV); return; } -diff -Nur linux-4.1.26.orig/arch/xtensa/mm/highmem.c linux-4.1.26/arch/xtensa/mm/highmem.c ---- linux-4.1.26.orig/arch/xtensa/mm/highmem.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/arch/xtensa/mm/highmem.c 2016-06-19 15:30:58.623294881 +0200 -@@ -42,6 +42,7 @@ +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) enum fixed_addresses idx; unsigned long vaddr; @@ -4581,7 +5478,7 @@ diff -Nur linux-4.1.26.orig/arch/xtensa/mm/highmem.c linux-4.1.26/arch/xtensa/mm pagefault_disable(); if (!PageHighMem(page)) return page_address(page); -@@ -79,6 +80,7 @@ +@@ -79,6 +80,7 @@ void __kunmap_atomic(void *kvaddr) } pagefault_enable(); @@ -4589,10 +5486,11 @@ diff -Nur linux-4.1.26.orig/arch/xtensa/mm/highmem.c linux-4.1.26/arch/xtensa/mm } EXPORT_SYMBOL(__kunmap_atomic); -diff -Nur linux-4.1.26.orig/block/blk-core.c linux-4.1.26/block/blk-core.c ---- linux-4.1.26.orig/block/blk-core.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/block/blk-core.c 2016-06-19 15:30:58.623294881 +0200 -@@ -100,6 +100,9 @@ +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) INIT_LIST_HEAD(&rq->queuelist); INIT_LIST_HEAD(&rq->timeout_list); @@ -4602,7 +5500,7 @@ diff -Nur linux-4.1.26.orig/block/blk-core.c linux-4.1.26/block/blk-core.c rq->cpu = -1; rq->q = q; rq->__sector = (sector_t) -1; -@@ -194,7 +197,7 @@ +@@ -194,7 +197,7 @@ EXPORT_SYMBOL(blk_delay_queue); **/ void blk_start_queue(struct request_queue *q) { @@ -4611,7 +5509,7 @@ diff -Nur linux-4.1.26.orig/block/blk-core.c linux-4.1.26/block/blk-core.c queue_flag_clear(QUEUE_FLAG_STOPPED, q); __blk_run_queue(q); -@@ -661,7 +664,7 @@ +@@ -663,7 +666,7 @@ struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id) q->bypass_depth = 1; __set_bit(QUEUE_FLAG_BYPASS, &q->queue_flags); @@ -4620,7 +5518,7 @@ diff -Nur linux-4.1.26.orig/block/blk-core.c linux-4.1.26/block/blk-core.c if (blkcg_init_queue(q)) goto fail_bdi; -@@ -3077,7 +3080,7 @@ +@@ -3079,7 +3082,7 @@ static void queue_unplugged(struct request_queue *q, unsigned int depth, blk_run_queue_async(q); else __blk_run_queue(q); @@ -4629,7 +5527,7 @@ diff -Nur linux-4.1.26.orig/block/blk-core.c linux-4.1.26/block/blk-core.c } static void flush_plug_callbacks(struct blk_plug *plug, bool from_schedule) -@@ -3125,7 +3128,6 @@ +@@ -3127,7 +3130,6 @@ EXPORT_SYMBOL(blk_check_plugged); void blk_flush_plug_list(struct blk_plug *plug, bool from_schedule) { struct request_queue *q; @@ -4637,7 +5535,7 @@ diff -Nur linux-4.1.26.orig/block/blk-core.c linux-4.1.26/block/blk-core.c struct request *rq; LIST_HEAD(list); unsigned int depth; -@@ -3145,11 +3147,6 @@ +@@ -3147,11 +3149,6 @@ void blk_flush_plug_list(struct blk_plug *plug, bool from_schedule) q = NULL; depth = 0; @@ -4649,7 +5547,7 @@ diff -Nur linux-4.1.26.orig/block/blk-core.c linux-4.1.26/block/blk-core.c while (!list_empty(&list)) { rq = list_entry_rq(list.next); list_del_init(&rq->queuelist); -@@ -3162,7 +3159,7 @@ +@@ -3164,7 +3161,7 @@ void blk_flush_plug_list(struct blk_plug *plug, bool from_schedule) queue_unplugged(q, depth, from_schedule); q = rq->q; depth = 0; @@ -4658,7 +5556,7 @@ diff -Nur linux-4.1.26.orig/block/blk-core.c linux-4.1.26/block/blk-core.c } /* -@@ -3189,8 +3186,6 @@ +@@ -3191,8 +3188,6 @@ void blk_flush_plug_list(struct blk_plug *plug, bool from_schedule) */ if (q) queue_unplugged(q, depth, from_schedule); @@ -4667,9 +5565,10 @@ diff -Nur linux-4.1.26.orig/block/blk-core.c linux-4.1.26/block/blk-core.c } void blk_finish_plug(struct blk_plug *plug) -diff -Nur linux-4.1.26.orig/block/blk-ioc.c linux-4.1.26/block/blk-ioc.c ---- linux-4.1.26.orig/block/blk-ioc.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/block/blk-ioc.c 2016-06-19 15:30:58.623294881 +0200 +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 @@ -7,6 +7,7 @@ #include <linux/bio.h> #include <linux/blkdev.h> @@ -4678,7 +5577,7 @@ diff -Nur linux-4.1.26.orig/block/blk-ioc.c linux-4.1.26/block/blk-ioc.c #include "blk.h" -@@ -109,7 +110,7 @@ +@@ -109,7 +110,7 @@ static void ioc_release_fn(struct work_struct *work) spin_unlock(q->queue_lock); } else { spin_unlock_irqrestore(&ioc->lock, flags); @@ -4687,7 +5586,7 @@ diff -Nur linux-4.1.26.orig/block/blk-ioc.c linux-4.1.26/block/blk-ioc.c spin_lock_irqsave_nested(&ioc->lock, flags, 1); } } -@@ -187,7 +188,7 @@ +@@ -187,7 +188,7 @@ retry: spin_unlock(icq->q->queue_lock); } else { spin_unlock_irqrestore(&ioc->lock, flags); @@ -4696,10 +5595,11 @@ diff -Nur linux-4.1.26.orig/block/blk-ioc.c linux-4.1.26/block/blk-ioc.c goto retry; } } -diff -Nur linux-4.1.26.orig/block/blk-iopoll.c linux-4.1.26/block/blk-iopoll.c ---- linux-4.1.26.orig/block/blk-iopoll.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/block/blk-iopoll.c 2016-06-19 15:30:58.623294881 +0200 -@@ -35,6 +35,7 @@ +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) list_add_tail(&iop->list, this_cpu_ptr(&blk_cpu_iopoll)); __raise_softirq_irqoff(BLOCK_IOPOLL_SOFTIRQ); local_irq_restore(flags); @@ -4707,7 +5607,7 @@ diff -Nur linux-4.1.26.orig/block/blk-iopoll.c linux-4.1.26/block/blk-iopoll.c } EXPORT_SYMBOL(blk_iopoll_sched); -@@ -132,6 +133,7 @@ +@@ -132,6 +133,7 @@ static void blk_iopoll_softirq(struct softirq_action *h) __raise_softirq_irqoff(BLOCK_IOPOLL_SOFTIRQ); local_irq_enable(); @@ -4715,7 +5615,7 @@ diff -Nur linux-4.1.26.orig/block/blk-iopoll.c linux-4.1.26/block/blk-iopoll.c } /** -@@ -201,6 +203,7 @@ +@@ -201,6 +203,7 @@ static int blk_iopoll_cpu_notify(struct notifier_block *self, this_cpu_ptr(&blk_cpu_iopoll)); __raise_softirq_irqoff(BLOCK_IOPOLL_SOFTIRQ); local_irq_enable(); @@ -4723,10 +5623,66 @@ diff -Nur linux-4.1.26.orig/block/blk-iopoll.c linux-4.1.26/block/blk-iopoll.c } return NOTIFY_OK; -diff -Nur linux-4.1.26.orig/block/blk-mq.c linux-4.1.26/block/blk-mq.c ---- linux-4.1.26.orig/block/blk-mq.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/block/blk-mq.c 2016-06-19 15:30:58.623294881 +0200 -@@ -88,7 +88,7 @@ +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) if (!(gfp & __GFP_WAIT)) return -EBUSY; @@ -4735,7 +5691,7 @@ diff -Nur linux-4.1.26.orig/block/blk-mq.c linux-4.1.26/block/blk-mq.c !q->mq_freeze_depth || blk_queue_dying(q)); if (blk_queue_dying(q)) return -ENODEV; -@@ -107,7 +107,7 @@ +@@ -107,7 +107,7 @@ static void blk_mq_usage_counter_release(struct percpu_ref *ref) struct request_queue *q = container_of(ref, struct request_queue, mq_usage_counter); @@ -4744,7 +5700,7 @@ diff -Nur linux-4.1.26.orig/block/blk-mq.c linux-4.1.26/block/blk-mq.c } void blk_mq_freeze_queue_start(struct request_queue *q) -@@ -127,7 +127,7 @@ +@@ -127,7 +127,7 @@ EXPORT_SYMBOL_GPL(blk_mq_freeze_queue_start); static void blk_mq_freeze_queue_wait(struct request_queue *q) { @@ -4753,7 +5709,7 @@ diff -Nur linux-4.1.26.orig/block/blk-mq.c linux-4.1.26/block/blk-mq.c } /* -@@ -151,7 +151,7 @@ +@@ -151,7 +151,7 @@ void blk_mq_unfreeze_queue(struct request_queue *q) spin_unlock_irq(q->queue_lock); if (wake) { percpu_ref_reinit(&q->mq_usage_counter); @@ -4762,7 +5718,7 @@ diff -Nur linux-4.1.26.orig/block/blk-mq.c linux-4.1.26/block/blk-mq.c } } EXPORT_SYMBOL_GPL(blk_mq_unfreeze_queue); -@@ -170,7 +170,7 @@ +@@ -170,7 +170,7 @@ void blk_mq_wake_waiters(struct request_queue *q) * dying, we need to ensure that processes currently waiting on * the queue are notified as well. */ @@ -4771,7 +5727,7 @@ diff -Nur linux-4.1.26.orig/block/blk-mq.c linux-4.1.26/block/blk-mq.c } bool blk_mq_can_queue(struct blk_mq_hw_ctx *hctx) -@@ -217,6 +217,9 @@ +@@ -217,6 +217,9 @@ static void blk_mq_rq_ctx_init(struct request_queue *q, struct blk_mq_ctx *ctx, rq->resid_len = 0; rq->sense = NULL; @@ -4781,7 +5737,7 @@ diff -Nur linux-4.1.26.orig/block/blk-mq.c linux-4.1.26/block/blk-mq.c INIT_LIST_HEAD(&rq->timeout_list); rq->timeout = 0; -@@ -346,6 +349,17 @@ +@@ -346,6 +349,17 @@ void blk_mq_end_request(struct request *rq, int error) } EXPORT_SYMBOL(blk_mq_end_request); @@ -4799,7 +5755,7 @@ diff -Nur linux-4.1.26.orig/block/blk-mq.c linux-4.1.26/block/blk-mq.c static void __blk_mq_complete_request_remote(void *data) { struct request *rq = data; -@@ -353,6 +367,8 @@ +@@ -353,6 +367,8 @@ static void __blk_mq_complete_request_remote(void *data) rq->q->softirq_done_fn(rq); } @@ -4808,7 +5764,7 @@ diff -Nur linux-4.1.26.orig/block/blk-mq.c linux-4.1.26/block/blk-mq.c static void blk_mq_ipi_complete_request(struct request *rq) { struct blk_mq_ctx *ctx = rq->mq_ctx; -@@ -364,19 +380,23 @@ +@@ -364,19 +380,23 @@ static void blk_mq_ipi_complete_request(struct request *rq) return; } @@ -4834,7 +5790,7 @@ diff -Nur linux-4.1.26.orig/block/blk-mq.c linux-4.1.26/block/blk-mq.c } void __blk_mq_complete_request(struct request *rq) -@@ -905,14 +925,14 @@ +@@ -905,14 +925,14 @@ void blk_mq_run_hw_queue(struct blk_mq_hw_ctx *hctx, bool async) return; if (!async) { @@ -4852,7 +5808,7 @@ diff -Nur linux-4.1.26.orig/block/blk-mq.c linux-4.1.26/block/blk-mq.c } kblockd_schedule_delayed_work_on(blk_mq_hctx_next_cpu(hctx), -@@ -1589,7 +1609,7 @@ +@@ -1589,7 +1609,7 @@ static int blk_mq_hctx_notify(void *data, unsigned long action, { struct blk_mq_hw_ctx *hctx = data; @@ -4861,64 +5817,11 @@ diff -Nur linux-4.1.26.orig/block/blk-mq.c linux-4.1.26/block/blk-mq.c return blk_mq_hctx_cpu_offline(hctx, cpu); /* -diff -Nur linux-4.1.26.orig/block/blk-mq-cpu.c linux-4.1.26/block/blk-mq-cpu.c ---- linux-4.1.26.orig/block/blk-mq-cpu.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/block/blk-mq-cpu.c 2016-06-19 15:30:58.623294881 +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.26.orig/block/blk-mq.h linux-4.1.26/block/blk-mq.h ---- linux-4.1.26.orig/block/blk-mq.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/block/blk-mq.h 2016-06-19 15:30:58.623294881 +0200 -@@ -76,7 +76,10 @@ +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 { static inline struct blk_mq_ctx *__blk_mq_get_ctx(struct request_queue *q, unsigned int cpu) { @@ -4930,7 +5833,7 @@ diff -Nur linux-4.1.26.orig/block/blk-mq.h linux-4.1.26/block/blk-mq.h } /* -@@ -87,12 +90,12 @@ +@@ -87,12 +90,12 @@ static inline struct blk_mq_ctx *__blk_mq_get_ctx(struct request_queue *q, */ static inline struct blk_mq_ctx *blk_mq_get_ctx(struct request_queue *q) { @@ -4945,10 +5848,11 @@ diff -Nur linux-4.1.26.orig/block/blk-mq.h linux-4.1.26/block/blk-mq.h } struct blk_mq_alloc_data { -diff -Nur linux-4.1.26.orig/block/blk-softirq.c linux-4.1.26/block/blk-softirq.c ---- linux-4.1.26.orig/block/blk-softirq.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/block/blk-softirq.c 2016-06-19 15:30:58.623294881 +0200 -@@ -51,6 +51,7 @@ +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) raise_softirq_irqoff(BLOCK_SOFTIRQ); local_irq_restore(flags); @@ -4956,7 +5860,7 @@ diff -Nur linux-4.1.26.orig/block/blk-softirq.c linux-4.1.26/block/blk-softirq.c } /* -@@ -93,6 +94,7 @@ +@@ -93,6 +94,7 @@ static int blk_cpu_notify(struct notifier_block *self, unsigned long action, this_cpu_ptr(&blk_cpu_done)); raise_softirq_irqoff(BLOCK_SOFTIRQ); local_irq_enable(); @@ -4964,7 +5868,7 @@ diff -Nur linux-4.1.26.orig/block/blk-softirq.c linux-4.1.26/block/blk-softirq.c } return NOTIFY_OK; -@@ -150,6 +152,7 @@ +@@ -150,6 +152,7 @@ do_local: goto do_local; local_irq_restore(flags); @@ -4972,10 +5876,11 @@ diff -Nur linux-4.1.26.orig/block/blk-softirq.c linux-4.1.26/block/blk-softirq.c } /** -diff -Nur linux-4.1.26.orig/block/bounce.c linux-4.1.26/block/bounce.c ---- linux-4.1.26.orig/block/bounce.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/block/bounce.c 2016-06-19 15:30:58.623294881 +0200 -@@ -54,11 +54,11 @@ +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) unsigned long flags; unsigned char *vto; @@ -4989,10 +5894,11 @@ diff -Nur linux-4.1.26.orig/block/bounce.c linux-4.1.26/block/bounce.c } #else /* CONFIG_HIGHMEM */ -diff -Nur linux-4.1.26.orig/crypto/algapi.c linux-4.1.26/crypto/algapi.c ---- linux-4.1.26.orig/crypto/algapi.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/crypto/algapi.c 2016-06-19 15:30:58.623294881 +0200 -@@ -695,13 +695,13 @@ +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); int crypto_register_notifier(struct notifier_block *nb) { @@ -5008,10 +5914,11 @@ diff -Nur linux-4.1.26.orig/crypto/algapi.c linux-4.1.26/crypto/algapi.c } EXPORT_SYMBOL_GPL(crypto_unregister_notifier); -diff -Nur linux-4.1.26.orig/crypto/api.c linux-4.1.26/crypto/api.c ---- linux-4.1.26.orig/crypto/api.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/crypto/api.c 2016-06-19 15:30:58.623294881 +0200 -@@ -31,7 +31,7 @@ +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); DECLARE_RWSEM(crypto_alg_sem); EXPORT_SYMBOL_GPL(crypto_alg_sem); @@ -5020,7 +5927,7 @@ diff -Nur linux-4.1.26.orig/crypto/api.c linux-4.1.26/crypto/api.c EXPORT_SYMBOL_GPL(crypto_chain); static struct crypto_alg *crypto_larval_wait(struct crypto_alg *alg); -@@ -236,10 +236,10 @@ +@@ -236,10 +236,10 @@ int crypto_probing_notify(unsigned long val, void *v) { int ok; @@ -5033,10 +5940,11 @@ diff -Nur linux-4.1.26.orig/crypto/api.c linux-4.1.26/crypto/api.c } return ok; -diff -Nur linux-4.1.26.orig/crypto/internal.h linux-4.1.26/crypto/internal.h ---- linux-4.1.26.orig/crypto/internal.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/crypto/internal.h 2016-06-19 15:30:58.623294881 +0200 -@@ -48,7 +48,7 @@ +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 { extern struct list_head crypto_alg_list; extern struct rw_semaphore crypto_alg_sem; @@ -5045,7 +5953,7 @@ diff -Nur linux-4.1.26.orig/crypto/internal.h linux-4.1.26/crypto/internal.h #ifdef CONFIG_PROC_FS void __init crypto_init_proc(void); -@@ -142,7 +142,7 @@ +@@ -142,7 +142,7 @@ static inline int crypto_is_moribund(struct crypto_alg *alg) static inline void crypto_notify(unsigned long val, void *v) { @@ -5054,291 +5962,11 @@ diff -Nur linux-4.1.26.orig/crypto/internal.h linux-4.1.26/crypto/internal.h } #endif /* _CRYPTO_INTERNAL_H */ -diff -Nur linux-4.1.26.orig/Documentation/hwlat_detector.txt linux-4.1.26/Documentation/hwlat_detector.txt ---- linux-4.1.26.orig/Documentation/hwlat_detector.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-4.1.26/Documentation/hwlat_detector.txt 2016-06-19 15:30:54.915151887 +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.26.orig/Documentation/sysrq.txt linux-4.1.26/Documentation/sysrq.txt ---- linux-4.1.26.orig/Documentation/sysrq.txt 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/Documentation/sysrq.txt 2016-06-19 15:30:54.915151887 +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.26.orig/Documentation/trace/histograms.txt linux-4.1.26/Documentation/trace/histograms.txt ---- linux-4.1.26.orig/Documentation/trace/histograms.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-4.1.26/Documentation/trace/histograms.txt 2016-06-19 15:30:54.915151887 +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.26.orig/drivers/acpi/acpica/acglobal.h linux-4.1.26/drivers/acpi/acpica/acglobal.h ---- linux-4.1.26.orig/drivers/acpi/acpica/acglobal.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/drivers/acpi/acpica/acglobal.h 2016-06-19 15:30:58.627295036 +0200 -@@ -112,7 +112,7 @@ +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); * interrupt level */ ACPI_GLOBAL(acpi_spinlock, acpi_gbl_gpe_lock); /* For GPE data structs and registers */ @@ -5347,10 +5975,11 @@ diff -Nur linux-4.1.26.orig/drivers/acpi/acpica/acglobal.h linux-4.1.26/drivers/ ACPI_GLOBAL(acpi_spinlock, acpi_gbl_reference_count_lock); /* Mutex for _OSI support */ -diff -Nur linux-4.1.26.orig/drivers/acpi/acpica/hwregs.c linux-4.1.26/drivers/acpi/acpica/hwregs.c ---- linux-4.1.26.orig/drivers/acpi/acpica/hwregs.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/drivers/acpi/acpica/hwregs.c 2016-06-19 15:30:58.627295036 +0200 -@@ -269,14 +269,14 @@ +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) ACPI_BITMASK_ALL_FIXED_STATUS, ACPI_FORMAT_UINT64(acpi_gbl_xpm1a_status.address))); @@ -5367,10 +5996,11 @@ diff -Nur linux-4.1.26.orig/drivers/acpi/acpica/hwregs.c linux-4.1.26/drivers/ac if (ACPI_FAILURE(status)) { goto exit; -diff -Nur linux-4.1.26.orig/drivers/acpi/acpica/hwxface.c linux-4.1.26/drivers/acpi/acpica/hwxface.c ---- linux-4.1.26.orig/drivers/acpi/acpica/hwxface.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/drivers/acpi/acpica/hwxface.c 2016-06-19 15:30:58.627295036 +0200 -@@ -374,7 +374,7 @@ +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) return_ACPI_STATUS(AE_BAD_PARAMETER); } @@ -5379,7 +6009,7 @@ diff -Nur linux-4.1.26.orig/drivers/acpi/acpica/hwxface.c linux-4.1.26/drivers/a /* * At this point, we know that the parent register is one of the -@@ -435,7 +435,7 @@ +@@ -435,7 +435,7 @@ acpi_status acpi_write_bit_register(u32 register_id, u32 value) unlock_and_exit: @@ -5388,10 +6018,11 @@ diff -Nur linux-4.1.26.orig/drivers/acpi/acpica/hwxface.c linux-4.1.26/drivers/a return_ACPI_STATUS(status); } -diff -Nur linux-4.1.26.orig/drivers/acpi/acpica/utmutex.c linux-4.1.26/drivers/acpi/acpica/utmutex.c ---- linux-4.1.26.orig/drivers/acpi/acpica/utmutex.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/drivers/acpi/acpica/utmutex.c 2016-06-19 15:30:58.627295036 +0200 -@@ -88,7 +88,7 @@ +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) return_ACPI_STATUS (status); } @@ -5400,7 +6031,7 @@ diff -Nur linux-4.1.26.orig/drivers/acpi/acpica/utmutex.c linux-4.1.26/drivers/a if (ACPI_FAILURE (status)) { return_ACPI_STATUS (status); } -@@ -141,7 +141,7 @@ +@@ -141,7 +141,7 @@ void acpi_ut_mutex_terminate(void) /* Delete the spinlocks */ acpi_os_delete_lock(acpi_gbl_gpe_lock); @@ -5409,10 +6040,11 @@ diff -Nur linux-4.1.26.orig/drivers/acpi/acpica/utmutex.c linux-4.1.26/drivers/a acpi_os_delete_lock(acpi_gbl_reference_count_lock); /* Delete the reader/writer lock */ -diff -Nur linux-4.1.26.orig/drivers/ata/libata-sff.c linux-4.1.26/drivers/ata/libata-sff.c ---- linux-4.1.26.orig/drivers/ata/libata-sff.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/drivers/ata/libata-sff.c 2016-06-19 15:30:58.627295036 +0200 -@@ -678,9 +678,9 @@ +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, unsigned long flags; unsigned int consumed; @@ -5424,7 +6056,7 @@ diff -Nur linux-4.1.26.orig/drivers/ata/libata-sff.c linux-4.1.26/drivers/ata/li return consumed; } -@@ -719,7 +719,7 @@ +@@ -719,7 +719,7 @@ static void ata_pio_sector(struct ata_queued_cmd *qc) unsigned long flags; /* FIXME: use a bounce buffer */ @@ -5433,7 +6065,7 @@ diff -Nur linux-4.1.26.orig/drivers/ata/libata-sff.c linux-4.1.26/drivers/ata/li buf = kmap_atomic(page); /* do the actual data transfer */ -@@ -727,7 +727,7 @@ +@@ -727,7 +727,7 @@ static void ata_pio_sector(struct ata_queued_cmd *qc) do_write); kunmap_atomic(buf); @@ -5442,7 +6074,7 @@ diff -Nur linux-4.1.26.orig/drivers/ata/libata-sff.c linux-4.1.26/drivers/ata/li } else { buf = page_address(page); ap->ops->sff_data_xfer(qc->dev, buf + offset, qc->sect_size, -@@ -864,7 +864,7 @@ +@@ -864,7 +864,7 @@ next_sg: unsigned long flags; /* FIXME: use bounce buffer */ @@ -5451,7 +6083,7 @@ diff -Nur linux-4.1.26.orig/drivers/ata/libata-sff.c linux-4.1.26/drivers/ata/li buf = kmap_atomic(page); /* do the actual data transfer */ -@@ -872,7 +872,7 @@ +@@ -872,7 +872,7 @@ next_sg: count, rw); kunmap_atomic(buf); @@ -5460,10 +6092,175 @@ diff -Nur linux-4.1.26.orig/drivers/ata/libata-sff.c linux-4.1.26/drivers/ata/li } else { buf = page_address(page); consumed = ap->ops->sff_data_xfer(dev, buf + offset, -diff -Nur linux-4.1.26.orig/drivers/char/random.c linux-4.1.26/drivers/char/random.c ---- linux-4.1.26.orig/drivers/char/random.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/drivers/char/random.c 2016-06-19 15:30:58.627295036 +0200 -@@ -776,8 +776,6 @@ +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) + goto out_error; + } + ++ zram_meta_init_table_locks(meta, disksize); ++ + return meta; + + out_error: +@@ -484,12 +486,12 @@ static int zram_decompress_page(struct zram *zram, char *mem, u32 index) + unsigned long handle; + size_t size; + +- bit_spin_lock(ZRAM_ACCESS, &meta->table[index].value); ++ zram_lock_table(&meta->table[index]); + handle = meta->table[index].handle; + size = zram_get_obj_size(meta, index); + + if (!handle || zram_test_flag(meta, index, ZRAM_ZERO)) { +- bit_spin_unlock(ZRAM_ACCESS, &meta->table[index].value); ++ zram_unlock_table(&meta->table[index]); + clear_page(mem); + return 0; + } +@@ -500,7 +502,7 @@ static int zram_decompress_page(struct zram *zram, char *mem, u32 index) + else + ret = zcomp_decompress(zram->comp, cmem, size, mem); + zs_unmap_object(meta->mem_pool, handle); +- bit_spin_unlock(ZRAM_ACCESS, &meta->table[index].value); ++ zram_unlock_table(&meta->table[index]); + + /* 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, + struct zram_meta *meta = zram->meta; + page = bvec->bv_page; + +- bit_spin_lock(ZRAM_ACCESS, &meta->table[index].value); ++ zram_lock_table(&meta->table[index]); + if (unlikely(!meta->table[index].handle) || + zram_test_flag(meta, index, ZRAM_ZERO)) { +- bit_spin_unlock(ZRAM_ACCESS, &meta->table[index].value); ++ zram_unlock_table(&meta->table[index]); + handle_zero_page(bvec); + return 0; + } +- bit_spin_unlock(ZRAM_ACCESS, &meta->table[index].value); ++ zram_unlock_table(&meta->table[index]); + + 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, + if (user_mem) + kunmap_atomic(user_mem); + /* Free memory associated with this sector now. */ +- bit_spin_lock(ZRAM_ACCESS, &meta->table[index].value); ++ zram_lock_table(&meta->table[index]); + zram_free_page(zram, index); + zram_set_flag(meta, index, ZRAM_ZERO); +- bit_spin_unlock(ZRAM_ACCESS, &meta->table[index].value); ++ zram_unlock_table(&meta->table[index]); + + 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, + * Free memory associated with this sector + * before overwriting unused sectors. + */ +- bit_spin_lock(ZRAM_ACCESS, &meta->table[index].value); ++ zram_lock_table(&meta->table[index]); + zram_free_page(zram, index); + + meta->table[index].handle = handle; + zram_set_obj_size(meta, index, clen); +- bit_spin_unlock(ZRAM_ACCESS, &meta->table[index].value); ++ zram_unlock_table(&meta->table[index]); + + /* Update stats */ + atomic64_add(clen, &zram->stats.compr_data_size); +@@ -762,9 +764,9 @@ static void zram_bio_discard(struct zram *zram, u32 index, + } + + while (n >= PAGE_SIZE) { +- bit_spin_lock(ZRAM_ACCESS, &meta->table[index].value); ++ zram_lock_table(&meta->table[index]); + zram_free_page(zram, index); +- bit_spin_unlock(ZRAM_ACCESS, &meta->table[index].value); ++ zram_unlock_table(&meta->table[index]); + atomic64_inc(&zram->stats.notify_free); + index++; + n -= PAGE_SIZE; +@@ -1007,9 +1009,9 @@ static void zram_slot_free_notify(struct block_device *bdev, + zram = bdev->bd_disk->private_data; + meta = zram->meta; + +- bit_spin_lock(ZRAM_ACCESS, &meta->table[index].value); ++ zram_lock_table(&meta->table[index]); + zram_free_page(zram, index); +- bit_spin_unlock(ZRAM_ACCESS, &meta->table[index].value); ++ zram_unlock_table(&meta->table[index]); + 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 { + struct zram_table_entry { + unsigned long handle; + unsigned long value; ++#ifdef CONFIG_PREEMPT_RT_BASE ++ spinlock_t lock; ++#endif + }; + + struct zram_stats { +@@ -122,4 +125,42 @@ struct zram { + u64 disksize; /* bytes */ + char compressor[10]; + }; ++ ++#ifndef CONFIG_PREEMPT_RT_BASE ++static inline void zram_lock_table(struct zram_table_entry *table) ++{ ++ bit_spin_lock(ZRAM_ACCESS, &table->value); ++} ++ ++static inline void zram_unlock_table(struct zram_table_entry *table) ++{ ++ bit_spin_unlock(ZRAM_ACCESS, &table->value); ++} ++ ++static inline void zram_meta_init_table_locks(struct zram_meta *meta, u64 disksize) { } ++#else /* CONFIG_PREEMPT_RT_BASE */ ++static inline void zram_lock_table(struct zram_table_entry *table) ++{ ++ spin_lock(&table->lock); ++ __set_bit(ZRAM_ACCESS, &table->value); ++} ++ ++static inline void zram_unlock_table(struct zram_table_entry *table) ++{ ++ __clear_bit(ZRAM_ACCESS, &table->value); ++ spin_unlock(&table->lock); ++} ++ ++static inline void zram_meta_init_table_locks(struct zram_meta *meta, u64 disksize) ++{ ++ size_t num_pages = disksize >> PAGE_SHIFT; ++ size_t index; ++ ++ for (index = 0; index < num_pages; index++) { ++ spinlock_t *lock = &meta->table[index].lock; ++ spin_lock_init(lock); ++ } ++} ++#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) } sample; long delta, delta2, delta3; @@ -5472,7 +6269,7 @@ diff -Nur linux-4.1.26.orig/drivers/char/random.c linux-4.1.26/drivers/char/rand sample.jiffies = jiffies; sample.cycles = random_get_entropy(); sample.num = num; -@@ -818,7 +816,6 @@ +@@ -818,7 +816,6 @@ static void add_timer_randomness(struct timer_rand_state *state, unsigned num) */ credit_entropy_bits(r, min_t(int, fls(delta>>1), 11)); } @@ -5480,7 +6277,7 @@ diff -Nur linux-4.1.26.orig/drivers/char/random.c linux-4.1.26/drivers/char/rand } void add_input_randomness(unsigned int type, unsigned int code, -@@ -871,28 +868,27 @@ +@@ -871,28 +868,27 @@ static __u32 get_reg(struct fast_pool *f, struct pt_regs *regs) return *(ptr + f->reg_idx++); } @@ -5514,9 +6311,36 @@ diff -Nur linux-4.1.26.orig/drivers/char/random.c linux-4.1.26/drivers/char/rand fast_mix(fast_pool); add_interrupt_bench(cycles); -diff -Nur linux-4.1.26.orig/drivers/clocksource/tcb_clksrc.c linux-4.1.26/drivers/clocksource/tcb_clksrc.c ---- linux-4.1.26.orig/drivers/clocksource/tcb_clksrc.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/drivers/clocksource/tcb_clksrc.c 2016-06-19 15:30:58.627295036 +0200 +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 +@@ -27,21 +27,6 @@ + void __iomem *at91_pmc_base; + EXPORT_SYMBOL_GPL(at91_pmc_base); + +-void at91rm9200_idle(void) +-{ +- /* +- * Disable the processor clock. The processor will be automatically +- * re-enabled by an interrupt or by a reset. +- */ +- at91_pmc_write(AT91_PMC_SCDR, AT91_PMC_PCK); +-} +- +-void at91sam9_idle(void) +-{ +- at91_pmc_write(AT91_PMC_SCDR, AT91_PMC_PCK); +- cpu_do_idle(); +-} +- + 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 @@ -23,8 +23,7 @@ * this 32 bit free-running counter. the second channel is not used. * @@ -5527,7 +6351,7 @@ diff -Nur linux-4.1.26.orig/drivers/clocksource/tcb_clksrc.c linux-4.1.26/driver * * 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 @@ +@@ -74,6 +73,7 @@ static struct clocksource clksrc = { struct tc_clkevt_device { struct clock_event_device clkevt; struct clk *clk; @@ -5535,7 +6359,7 @@ diff -Nur linux-4.1.26.orig/drivers/clocksource/tcb_clksrc.c linux-4.1.26/driver void __iomem *regs; }; -@@ -82,13 +82,6 @@ +@@ -82,13 +82,6 @@ static struct tc_clkevt_device *to_tc_clkevt(struct clock_event_device *clkevt) return container_of(clkevt, struct tc_clkevt_device, clkevt); } @@ -5549,7 +6373,7 @@ diff -Nur linux-4.1.26.orig/drivers/clocksource/tcb_clksrc.c linux-4.1.26/driver static u32 timer_clock; static void tc_mode(enum clock_event_mode m, struct clock_event_device *d) -@@ -111,11 +104,12 @@ +@@ -111,11 +104,12 @@ static void tc_mode(enum clock_event_mode m, struct clock_event_device *d) case CLOCK_EVT_MODE_PERIODIC: clk_enable(tcd->clk); @@ -5564,7 +6388,7 @@ diff -Nur linux-4.1.26.orig/drivers/clocksource/tcb_clksrc.c linux-4.1.26/driver /* Enable clock and interrupts on RC compare */ __raw_writel(ATMEL_TC_CPCS, regs + ATMEL_TC_REG(2, IER)); -@@ -128,7 +122,7 @@ +@@ -128,7 +122,7 @@ static void tc_mode(enum clock_event_mode m, struct clock_event_device *d) case CLOCK_EVT_MODE_ONESHOT: clk_enable(tcd->clk); @@ -5573,7 +6397,7 @@ diff -Nur linux-4.1.26.orig/drivers/clocksource/tcb_clksrc.c linux-4.1.26/driver __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 @@ +@@ -157,8 +151,12 @@ static struct tc_clkevt_device clkevt = { .name = "tc_clkevt", .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT, @@ -5586,7 +6410,7 @@ diff -Nur linux-4.1.26.orig/drivers/clocksource/tcb_clksrc.c linux-4.1.26/driver .set_next_event = tc_next_event, .set_mode = tc_mode, }, -@@ -178,8 +176,9 @@ +@@ -178,8 +176,9 @@ static irqreturn_t ch2_irq(int irq, void *handle) return IRQ_NONE; } @@ -5597,7 +6421,7 @@ diff -Nur linux-4.1.26.orig/drivers/clocksource/tcb_clksrc.c linux-4.1.26/driver int ret; struct clk *t2_clk = tc->clk[2]; int irq = tc->irq[2]; -@@ -193,7 +192,11 @@ +@@ -193,7 +192,11 @@ static int __init setup_clkevents(struct atmel_tc *tc, int clk32k_divisor_idx) clkevt.regs = tc->regs; clkevt.clk = t2_clk; @@ -5610,7 +6434,7 @@ diff -Nur linux-4.1.26.orig/drivers/clocksource/tcb_clksrc.c linux-4.1.26/driver clkevt.clkevt.cpumask = cpumask_of(0); -@@ -203,7 +206,7 @@ +@@ -203,7 +206,7 @@ static int __init setup_clkevents(struct atmel_tc *tc, int clk32k_divisor_idx) return ret; } @@ -5619,7 +6443,7 @@ diff -Nur linux-4.1.26.orig/drivers/clocksource/tcb_clksrc.c linux-4.1.26/driver return ret; } -@@ -340,7 +343,11 @@ +@@ -340,7 +343,11 @@ static int __init tcb_clksrc_init(void) goto err_disable_t1; /* channel 2: periodic and oneshot timer support */ @@ -5631,10 +6455,11 @@ diff -Nur linux-4.1.26.orig/drivers/clocksource/tcb_clksrc.c linux-4.1.26/driver if (ret) goto err_unregister_clksrc; -diff -Nur linux-4.1.26.orig/drivers/clocksource/timer-atmel-pit.c linux-4.1.26/drivers/clocksource/timer-atmel-pit.c ---- linux-4.1.26.orig/drivers/clocksource/timer-atmel-pit.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/drivers/clocksource/timer-atmel-pit.c 2016-06-19 15:30:58.627295036 +0200 -@@ -90,6 +90,7 @@ +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) return elapsed; } @@ -5642,7 +6467,7 @@ diff -Nur linux-4.1.26.orig/drivers/clocksource/timer-atmel-pit.c linux-4.1.26/d /* * Clockevent device: interrupts every 1/HZ (== pit_cycles * MCK/16) */ -@@ -100,6 +101,8 @@ +@@ -100,6 +101,8 @@ pit_clkevt_mode(enum clock_event_mode mode, struct clock_event_device *dev) switch (mode) { case CLOCK_EVT_MODE_PERIODIC: @@ -5651,7 +6476,7 @@ diff -Nur linux-4.1.26.orig/drivers/clocksource/timer-atmel-pit.c linux-4.1.26/d /* 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 @@ +@@ -113,6 +116,7 @@ pit_clkevt_mode(enum clock_event_mode mode, struct clock_event_device *dev) /* disable irq, leaving the clocksource active */ pit_write(data->base, AT91_PIT_MR, (data->cycle - 1) | AT91_PIT_PITEN); @@ -5659,10 +6484,11 @@ diff -Nur linux-4.1.26.orig/drivers/clocksource/timer-atmel-pit.c linux-4.1.26/d break; case CLOCK_EVT_MODE_RESUME: break; -diff -Nur linux-4.1.26.orig/drivers/clocksource/timer-atmel-st.c linux-4.1.26/drivers/clocksource/timer-atmel-st.c ---- linux-4.1.26.orig/drivers/clocksource/timer-atmel-st.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/drivers/clocksource/timer-atmel-st.c 2016-06-19 15:30:58.627295036 +0200 -@@ -131,6 +131,7 @@ +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) break; case CLOCK_EVT_MODE_SHUTDOWN: case CLOCK_EVT_MODE_UNUSED: @@ -5670,10 +6496,24 @@ diff -Nur linux-4.1.26.orig/drivers/clocksource/timer-atmel-st.c linux-4.1.26/dr case CLOCK_EVT_MODE_RESUME: irqmask = 0; break; -diff -Nur linux-4.1.26.orig/drivers/cpufreq/cpufreq.c linux-4.1.26/drivers/cpufreq/cpufreq.c ---- linux-4.1.26.orig/drivers/cpufreq/cpufreq.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/drivers/cpufreq/cpufreq.c 2016-06-19 15:30:58.627295036 +0200 -@@ -64,12 +64,6 @@ +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) return cpufreq_driver->target_index || cpufreq_driver->target; } @@ -5686,7 +6526,7 @@ diff -Nur linux-4.1.26.orig/drivers/cpufreq/cpufreq.c linux-4.1.26/drivers/cpufr /* internal prototypes */ static int __cpufreq_governor(struct cpufreq_policy *policy, unsigned int event); -@@ -215,9 +209,6 @@ +@@ -215,9 +209,6 @@ struct cpufreq_policy *cpufreq_cpu_get(unsigned int cpu) if (cpu >= nr_cpu_ids) return NULL; @@ -5696,7 +6536,7 @@ diff -Nur linux-4.1.26.orig/drivers/cpufreq/cpufreq.c linux-4.1.26/drivers/cpufr /* get the cpufreq driver */ read_lock_irqsave(&cpufreq_driver_lock, flags); -@@ -230,9 +221,6 @@ +@@ -230,9 +221,6 @@ struct cpufreq_policy *cpufreq_cpu_get(unsigned int cpu) read_unlock_irqrestore(&cpufreq_driver_lock, flags); @@ -5706,7 +6546,7 @@ diff -Nur linux-4.1.26.orig/drivers/cpufreq/cpufreq.c linux-4.1.26/drivers/cpufr return policy; } EXPORT_SYMBOL_GPL(cpufreq_cpu_get); -@@ -240,7 +228,6 @@ +@@ -240,7 +228,6 @@ EXPORT_SYMBOL_GPL(cpufreq_cpu_get); void cpufreq_cpu_put(struct cpufreq_policy *policy) { kobject_put(&policy->kobj); @@ -5714,7 +6554,7 @@ diff -Nur linux-4.1.26.orig/drivers/cpufreq/cpufreq.c linux-4.1.26/drivers/cpufr } EXPORT_SYMBOL_GPL(cpufreq_cpu_put); -@@ -765,9 +752,6 @@ +@@ -765,9 +752,6 @@ static ssize_t show(struct kobject *kobj, struct attribute *attr, char *buf) struct freq_attr *fattr = to_attr(attr); ssize_t ret; @@ -5724,7 +6564,7 @@ diff -Nur linux-4.1.26.orig/drivers/cpufreq/cpufreq.c linux-4.1.26/drivers/cpufr down_read(&policy->rwsem); if (fattr->show) -@@ -776,7 +760,6 @@ +@@ -776,7 +760,6 @@ static ssize_t show(struct kobject *kobj, struct attribute *attr, char *buf) ret = -EIO; up_read(&policy->rwsem); @@ -5732,7 +6572,7 @@ diff -Nur linux-4.1.26.orig/drivers/cpufreq/cpufreq.c linux-4.1.26/drivers/cpufr return ret; } -@@ -793,9 +776,6 @@ +@@ -793,9 +776,6 @@ static ssize_t store(struct kobject *kobj, struct attribute *attr, if (!cpu_online(policy->cpu)) goto unlock; @@ -5742,7 +6582,7 @@ diff -Nur linux-4.1.26.orig/drivers/cpufreq/cpufreq.c linux-4.1.26/drivers/cpufr down_write(&policy->rwsem); if (fattr->store) -@@ -804,8 +784,6 @@ +@@ -804,8 +784,6 @@ static ssize_t store(struct kobject *kobj, struct attribute *attr, ret = -EIO; up_write(&policy->rwsem); @@ -5751,7 +6591,7 @@ diff -Nur linux-4.1.26.orig/drivers/cpufreq/cpufreq.c linux-4.1.26/drivers/cpufr unlock: put_online_cpus(); -@@ -1117,16 +1095,12 @@ +@@ -1117,16 +1095,12 @@ static int __cpufreq_add_dev(struct device *dev, struct subsys_interface *sif) if (unlikely(policy)) return 0; @@ -5768,7 +6608,7 @@ diff -Nur linux-4.1.26.orig/drivers/cpufreq/cpufreq.c linux-4.1.26/drivers/cpufr return ret; } } -@@ -1269,8 +1243,6 @@ +@@ -1269,8 +1243,6 @@ static int __cpufreq_add_dev(struct device *dev, struct subsys_interface *sif) kobject_uevent(&policy->kobj, KOBJ_ADD); @@ -5777,7 +6617,7 @@ diff -Nur linux-4.1.26.orig/drivers/cpufreq/cpufreq.c linux-4.1.26/drivers/cpufr /* Callback for handling stuff after policy is ready */ if (cpufreq_driver->ready) cpufreq_driver->ready(policy); -@@ -1304,8 +1276,6 @@ +@@ -1304,8 +1276,6 @@ err_set_policy_cpu: cpufreq_policy_free(policy); nomem_out: @@ -5786,7 +6626,7 @@ diff -Nur linux-4.1.26.orig/drivers/cpufreq/cpufreq.c linux-4.1.26/drivers/cpufr return ret; } -@@ -2499,19 +2469,20 @@ +@@ -2499,19 +2469,20 @@ int cpufreq_unregister_driver(struct cpufreq_driver *driver) pr_debug("unregistering driver %s\n", driver->name); @@ -5809,21 +6649,23 @@ diff -Nur linux-4.1.26.orig/drivers/cpufreq/cpufreq.c linux-4.1.26/drivers/cpufr return 0; } -diff -Nur linux-4.1.26.orig/drivers/cpufreq/Kconfig.x86 linux-4.1.26/drivers/cpufreq/Kconfig.x86 ---- linux-4.1.26.orig/drivers/cpufreq/Kconfig.x86 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/drivers/cpufreq/Kconfig.x86 2016-06-19 15:30:58.627295036 +0200 -@@ -123,7 +123,7 @@ +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. - 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.26.orig/drivers/gpio/gpio-omap.c linux-4.1.26/drivers/gpio/gpio-omap.c ---- linux-4.1.26.orig/drivers/gpio/gpio-omap.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/drivers/gpio/gpio-omap.c 2016-06-19 15:30:58.631295190 +0200 + 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 @@ -29,6 +29,7 @@ #include <linux/platform_data/gpio-omap.h> @@ -5832,7 +6674,7 @@ diff -Nur linux-4.1.26.orig/drivers/gpio/gpio-omap.c linux-4.1.26/drivers/gpio/g static LIST_HEAD(omap_gpio_list); -@@ -50,14 +51,15 @@ +@@ -50,14 +51,15 @@ struct gpio_regs { struct gpio_bank { struct list_head node; void __iomem *base; @@ -5850,7 +6692,7 @@ diff -Nur linux-4.1.26.orig/drivers/gpio/gpio-omap.c linux-4.1.26/drivers/gpio/g struct gpio_chip chip; struct clk *dbck; u32 mod_usage; -@@ -67,7 +69,7 @@ +@@ -67,7 +69,7 @@ struct gpio_bank { struct device *dev; bool is_mpuio; bool dbck_flag; @@ -5859,7 +6701,7 @@ diff -Nur linux-4.1.26.orig/drivers/gpio/gpio-omap.c linux-4.1.26/drivers/gpio/g bool context_valid; int stride; u32 width; -@@ -175,7 +177,7 @@ +@@ -175,7 +177,7 @@ static inline void omap_gpio_rmw(void __iomem *base, u32 reg, u32 mask, bool set static inline void omap_gpio_dbck_enable(struct gpio_bank *bank) { if (bank->dbck_enable_mask && !bank->dbck_enabled) { @@ -5868,7 +6710,7 @@ diff -Nur linux-4.1.26.orig/drivers/gpio/gpio-omap.c linux-4.1.26/drivers/gpio/g bank->dbck_enabled = true; writel_relaxed(bank->dbck_enable_mask, -@@ -193,7 +195,7 @@ +@@ -193,7 +195,7 @@ static inline void omap_gpio_dbck_disable(struct gpio_bank *bank) */ writel_relaxed(0, bank->base + bank->regs->debounce_en); @@ -5877,7 +6719,7 @@ diff -Nur linux-4.1.26.orig/drivers/gpio/gpio-omap.c linux-4.1.26/drivers/gpio/g bank->dbck_enabled = false; } } -@@ -204,8 +206,9 @@ +@@ -204,8 +206,9 @@ static inline void omap_gpio_dbck_disable(struct gpio_bank *bank) * @offset: the gpio number on this @bank * @debounce: debounce time to use * @@ -5889,7 +6731,7 @@ diff -Nur linux-4.1.26.orig/drivers/gpio/gpio-omap.c linux-4.1.26/drivers/gpio/g */ static void omap2_set_gpio_debounce(struct gpio_bank *bank, unsigned offset, unsigned debounce) -@@ -213,34 +216,33 @@ +@@ -213,34 +216,33 @@ static void omap2_set_gpio_debounce(struct gpio_bank *bank, unsigned offset, void __iomem *reg; u32 val; u32 l; @@ -5932,7 +6774,7 @@ diff -Nur linux-4.1.26.orig/drivers/gpio/gpio-omap.c linux-4.1.26/drivers/gpio/g /* * Enable debounce clock per module. * This call is mandatory because in omap_gpio_request() when -@@ -285,7 +287,7 @@ +@@ -285,7 +287,7 @@ static void omap_clear_gpio_debounce(struct gpio_bank *bank, unsigned offset) bank->context.debounce = 0; writel_relaxed(bank->context.debounce, bank->base + bank->regs->debounce); @@ -5941,7 +6783,7 @@ diff -Nur linux-4.1.26.orig/drivers/gpio/gpio-omap.c linux-4.1.26/drivers/gpio/g bank->dbck_enabled = false; } } -@@ -488,9 +490,6 @@ +@@ -488,9 +490,6 @@ static int omap_gpio_irq_type(struct irq_data *d, unsigned type) unsigned long flags; unsigned offset = d->hwirq; @@ -5951,7 +6793,7 @@ diff -Nur linux-4.1.26.orig/drivers/gpio/gpio-omap.c linux-4.1.26/drivers/gpio/g if (type & ~IRQ_TYPE_SENSE_MASK) return -EINVAL; -@@ -498,20 +497,28 @@ +@@ -498,20 +497,28 @@ static int omap_gpio_irq_type(struct irq_data *d, unsigned type) (type & (IRQ_TYPE_LEVEL_LOW|IRQ_TYPE_LEVEL_HIGH))) return -EINVAL; @@ -5984,7 +6826,7 @@ diff -Nur linux-4.1.26.orig/drivers/gpio/gpio-omap.c linux-4.1.26/drivers/gpio/g return retval; } -@@ -626,34 +633,30 @@ +@@ -626,34 +633,30 @@ static int omap_set_gpio_wakeup(struct gpio_bank *bank, unsigned offset, return -EINVAL; } @@ -6027,7 +6869,7 @@ diff -Nur linux-4.1.26.orig/drivers/gpio/gpio-omap.c linux-4.1.26/drivers/gpio/g } static int omap_gpio_request(struct gpio_chip *chip, unsigned offset) -@@ -668,17 +671,10 @@ +@@ -668,17 +671,10 @@ static int omap_gpio_request(struct gpio_chip *chip, unsigned offset) if (!BANK_USED(bank)) pm_runtime_get_sync(bank->dev); @@ -6048,7 +6890,7 @@ diff -Nur linux-4.1.26.orig/drivers/gpio/gpio-omap.c linux-4.1.26/drivers/gpio/g return 0; } -@@ -688,11 +684,14 @@ +@@ -688,11 +684,14 @@ static void omap_gpio_free(struct gpio_chip *chip, unsigned offset) struct gpio_bank *bank = container_of(chip, struct gpio_bank, chip); unsigned long flags; @@ -6066,7 +6908,7 @@ diff -Nur linux-4.1.26.orig/drivers/gpio/gpio-omap.c linux-4.1.26/drivers/gpio/g /* * If this is the last gpio to be freed in the bank, -@@ -711,29 +710,27 @@ +@@ -711,29 +710,27 @@ static void omap_gpio_free(struct gpio_chip *chip, unsigned offset) * line's interrupt handler has been run, we may miss some nested * interrupts. */ @@ -6104,7 +6946,7 @@ diff -Nur linux-4.1.26.orig/drivers/gpio/gpio-omap.c linux-4.1.26/drivers/gpio/g enabled = omap_get_gpio_irqbank_mask(bank); isr_saved = isr = readl_relaxed(isr_reg) & enabled; -@@ -747,12 +744,7 @@ +@@ -747,12 +744,7 @@ static void omap_gpio_irq_handler(unsigned int irq, struct irq_desc *desc) omap_clear_gpio_irqbank(bank, isr_saved & ~level_mask); omap_enable_gpio_irqbank(bank, isr_saved & ~level_mask); @@ -6118,7 +6960,7 @@ diff -Nur linux-4.1.26.orig/drivers/gpio/gpio-omap.c linux-4.1.26/drivers/gpio/g if (!isr) break; -@@ -761,6 +753,7 @@ +@@ -761,6 +753,7 @@ static void omap_gpio_irq_handler(unsigned int irq, struct irq_desc *desc) bit = __ffs(isr); isr &= ~(BIT(bit)); @@ -6126,7 +6968,7 @@ diff -Nur linux-4.1.26.orig/drivers/gpio/gpio-omap.c linux-4.1.26/drivers/gpio/g /* * Some chips can't respond to both rising and falling * at the same time. If this irq was requested with -@@ -771,18 +764,20 @@ +@@ -771,18 +764,20 @@ static void omap_gpio_irq_handler(unsigned int irq, struct irq_desc *desc) if (bank->toggle_mask & (BIT(bit))) omap_toggle_gpio_edge_triggering(bank, bit); @@ -6153,7 +6995,7 @@ diff -Nur linux-4.1.26.orig/drivers/gpio/gpio-omap.c linux-4.1.26/drivers/gpio/g } static unsigned int omap_gpio_irq_startup(struct irq_data *d) -@@ -791,15 +786,22 @@ +@@ -791,15 +786,22 @@ static unsigned int omap_gpio_irq_startup(struct irq_data *d) unsigned long flags; unsigned offset = d->hwirq; @@ -6181,7 +7023,7 @@ diff -Nur linux-4.1.26.orig/drivers/gpio/gpio-omap.c linux-4.1.26/drivers/gpio/g } static void omap_gpio_irq_shutdown(struct irq_data *d) -@@ -808,11 +810,28 @@ +@@ -808,11 +810,28 @@ static void omap_gpio_irq_shutdown(struct irq_data *d) unsigned long flags; unsigned offset = d->hwirq; @@ -6213,7 +7055,7 @@ diff -Nur linux-4.1.26.orig/drivers/gpio/gpio-omap.c linux-4.1.26/drivers/gpio/g /* * If this is the last IRQ to be freed in the bank, -@@ -836,10 +855,10 @@ +@@ -836,10 +855,10 @@ static void omap_gpio_mask_irq(struct irq_data *d) unsigned offset = d->hwirq; unsigned long flags; @@ -6226,7 +7068,7 @@ diff -Nur linux-4.1.26.orig/drivers/gpio/gpio-omap.c linux-4.1.26/drivers/gpio/g } static void omap_gpio_unmask_irq(struct irq_data *d) -@@ -849,7 +868,7 @@ +@@ -849,7 +868,7 @@ static void omap_gpio_unmask_irq(struct irq_data *d) u32 trigger = irqd_get_trigger_type(d); unsigned long flags; @@ -6235,7 +7077,7 @@ diff -Nur linux-4.1.26.orig/drivers/gpio/gpio-omap.c linux-4.1.26/drivers/gpio/g if (trigger) omap_set_gpio_triggering(bank, offset, trigger); -@@ -861,7 +880,7 @@ +@@ -861,7 +880,7 @@ static void omap_gpio_unmask_irq(struct irq_data *d) } omap_set_gpio_irqenable(bank, offset, 1); @@ -6244,7 +7086,7 @@ diff -Nur linux-4.1.26.orig/drivers/gpio/gpio-omap.c linux-4.1.26/drivers/gpio/g } /*---------------------------------------------------------------------*/ -@@ -874,9 +893,9 @@ +@@ -874,9 +893,9 @@ static int omap_mpuio_suspend_noirq(struct device *dev) OMAP_MPUIO_GPIO_MASKIT / bank->stride; unsigned long flags; @@ -6256,7 +7098,7 @@ diff -Nur linux-4.1.26.orig/drivers/gpio/gpio-omap.c linux-4.1.26/drivers/gpio/g return 0; } -@@ -889,9 +908,9 @@ +@@ -889,9 +908,9 @@ static int omap_mpuio_resume_noirq(struct device *dev) OMAP_MPUIO_GPIO_MASKIT / bank->stride; unsigned long flags; @@ -6268,7 +7110,7 @@ diff -Nur linux-4.1.26.orig/drivers/gpio/gpio-omap.c linux-4.1.26/drivers/gpio/g return 0; } -@@ -937,9 +956,9 @@ +@@ -937,9 +956,9 @@ static int omap_gpio_get_direction(struct gpio_chip *chip, unsigned offset) bank = container_of(chip, struct gpio_bank, chip); reg = bank->base + bank->regs->direction; @@ -6280,7 +7122,7 @@ diff -Nur linux-4.1.26.orig/drivers/gpio/gpio-omap.c linux-4.1.26/drivers/gpio/g return dir; } -@@ -949,9 +968,9 @@ +@@ -949,9 +968,9 @@ static int omap_gpio_input(struct gpio_chip *chip, unsigned offset) unsigned long flags; bank = container_of(chip, struct gpio_bank, chip); @@ -6292,7 +7134,7 @@ diff -Nur linux-4.1.26.orig/drivers/gpio/gpio-omap.c linux-4.1.26/drivers/gpio/g return 0; } -@@ -973,10 +992,10 @@ +@@ -973,10 +992,10 @@ static int omap_gpio_output(struct gpio_chip *chip, unsigned offset, int value) unsigned long flags; bank = container_of(chip, struct gpio_bank, chip); @@ -6305,7 +7147,7 @@ diff -Nur linux-4.1.26.orig/drivers/gpio/gpio-omap.c linux-4.1.26/drivers/gpio/g return 0; } -@@ -988,9 +1007,9 @@ +@@ -988,9 +1007,9 @@ static int omap_gpio_debounce(struct gpio_chip *chip, unsigned offset, bank = container_of(chip, struct gpio_bank, chip); @@ -6317,7 +7159,7 @@ diff -Nur linux-4.1.26.orig/drivers/gpio/gpio-omap.c linux-4.1.26/drivers/gpio/g return 0; } -@@ -1001,9 +1020,9 @@ +@@ -1001,9 +1020,9 @@ static void omap_gpio_set(struct gpio_chip *chip, unsigned offset, int value) unsigned long flags; bank = container_of(chip, struct gpio_bank, chip); @@ -6329,7 +7171,7 @@ diff -Nur linux-4.1.26.orig/drivers/gpio/gpio-omap.c linux-4.1.26/drivers/gpio/g } /*---------------------------------------------------------------------*/ -@@ -1048,10 +1067,6 @@ +@@ -1048,10 +1067,6 @@ static void omap_gpio_mod_init(struct gpio_bank *bank) /* Initialize interface clk ungated, module enabled */ if (bank->regs->ctrl) writel_relaxed(0, base + bank->regs->ctrl); @@ -6340,7 +7182,7 @@ diff -Nur linux-4.1.26.orig/drivers/gpio/gpio-omap.c linux-4.1.26/drivers/gpio/g } static int omap_gpio_chip_init(struct gpio_bank *bank, struct irq_chip *irqc) -@@ -1080,7 +1095,6 @@ +@@ -1080,7 +1095,6 @@ static int omap_gpio_chip_init(struct gpio_bank *bank, struct irq_chip *irqc) } else { bank->chip.label = "gpio"; bank->chip.base = gpio; @@ -6348,7 +7190,7 @@ diff -Nur linux-4.1.26.orig/drivers/gpio/gpio-omap.c linux-4.1.26/drivers/gpio/g } bank->chip.ngpio = bank->width; -@@ -1090,6 +1104,9 @@ +@@ -1090,6 +1104,9 @@ static int omap_gpio_chip_init(struct gpio_bank *bank, struct irq_chip *irqc) return ret; } @@ -6358,7 +7200,7 @@ diff -Nur linux-4.1.26.orig/drivers/gpio/gpio-omap.c linux-4.1.26/drivers/gpio/g #ifdef CONFIG_ARCH_OMAP1 /* * REVISIT: Once we have OMAP1 supporting SPARSE_IRQ, we can drop -@@ -1112,7 +1129,7 @@ +@@ -1112,7 +1129,7 @@ static int omap_gpio_chip_init(struct gpio_bank *bank, struct irq_chip *irqc) } ret = gpiochip_irqchip_add(&bank->chip, irqc, @@ -6367,7 +7209,7 @@ diff -Nur linux-4.1.26.orig/drivers/gpio/gpio-omap.c linux-4.1.26/drivers/gpio/g IRQ_TYPE_NONE); if (ret) { -@@ -1121,10 +1138,14 @@ +@@ -1121,10 +1138,14 @@ static int omap_gpio_chip_init(struct gpio_bank *bank, struct irq_chip *irqc) return -ENODEV; } @@ -6385,7 +7227,7 @@ diff -Nur linux-4.1.26.orig/drivers/gpio/gpio-omap.c linux-4.1.26/drivers/gpio/g } static const struct of_device_id omap_gpio_match[]; -@@ -1163,17 +1184,23 @@ +@@ -1163,17 +1184,23 @@ static int omap_gpio_probe(struct platform_device *pdev) irqc->irq_unmask = omap_gpio_unmask_irq, irqc->irq_set_type = omap_gpio_irq_type, irqc->irq_set_wake = omap_gpio_wake_enable, @@ -6414,7 +7256,7 @@ diff -Nur linux-4.1.26.orig/drivers/gpio/gpio-omap.c linux-4.1.26/drivers/gpio/g bank->dbck_flag = pdata->dbck_flag; bank->stride = pdata->bank_stride; bank->width = pdata->bank_width; -@@ -1183,15 +1210,9 @@ +@@ -1183,15 +1210,9 @@ static int omap_gpio_probe(struct platform_device *pdev) #ifdef CONFIG_OF_GPIO bank->chip.of_node = of_node_get(node); #endif @@ -6433,7 +7275,7 @@ diff -Nur linux-4.1.26.orig/drivers/gpio/gpio-omap.c linux-4.1.26/drivers/gpio/g } if (bank->regs->set_dataout && bank->regs->clr_dataout) -@@ -1199,16 +1220,27 @@ +@@ -1199,16 +1220,27 @@ static int omap_gpio_probe(struct platform_device *pdev) else bank->set_dataout = omap_set_gpio_dataout_mask; @@ -6463,7 +7305,7 @@ diff -Nur linux-4.1.26.orig/drivers/gpio/gpio-omap.c linux-4.1.26/drivers/gpio/g platform_set_drvdata(pdev, bank); pm_runtime_enable(bank->dev); -@@ -1221,8 +1253,11 @@ +@@ -1221,8 +1253,11 @@ static int omap_gpio_probe(struct platform_device *pdev) omap_gpio_mod_init(bank); ret = omap_gpio_chip_init(bank, irqc); @@ -6476,7 +7318,7 @@ diff -Nur linux-4.1.26.orig/drivers/gpio/gpio-omap.c linux-4.1.26/drivers/gpio/g omap_gpio_show_rev(bank); -@@ -1233,6 +1268,19 @@ +@@ -1233,6 +1268,19 @@ static int omap_gpio_probe(struct platform_device *pdev) return 0; } @@ -6496,7 +7338,7 @@ diff -Nur linux-4.1.26.orig/drivers/gpio/gpio-omap.c linux-4.1.26/drivers/gpio/g #ifdef CONFIG_ARCH_OMAP2PLUS #if defined(CONFIG_PM) -@@ -1246,7 +1294,7 @@ +@@ -1246,7 +1294,7 @@ static int omap_gpio_runtime_suspend(struct device *dev) unsigned long flags; u32 wake_low, wake_hi; @@ -6505,7 +7347,7 @@ diff -Nur linux-4.1.26.orig/drivers/gpio/gpio-omap.c linux-4.1.26/drivers/gpio/g /* * Only edges can generate a wakeup event to the PRCM. -@@ -1299,7 +1347,7 @@ +@@ -1299,7 +1347,7 @@ update_gpio_context_count: bank->get_context_loss_count(bank->dev); omap_gpio_dbck_disable(bank); @@ -6514,7 +7356,7 @@ diff -Nur linux-4.1.26.orig/drivers/gpio/gpio-omap.c linux-4.1.26/drivers/gpio/g return 0; } -@@ -1314,14 +1362,14 @@ +@@ -1314,14 +1362,14 @@ static int omap_gpio_runtime_resume(struct device *dev) unsigned long flags; int c; @@ -6531,7 +7373,7 @@ diff -Nur linux-4.1.26.orig/drivers/gpio/gpio-omap.c linux-4.1.26/drivers/gpio/g omap_gpio_init_context(bank); if (bank->get_context_loss_count) -@@ -1342,22 +1390,20 @@ +@@ -1342,22 +1390,20 @@ static int omap_gpio_runtime_resume(struct device *dev) writel_relaxed(bank->context.risingdetect, bank->base + bank->regs->risingdetect); @@ -6562,7 +7404,7 @@ diff -Nur linux-4.1.26.orig/drivers/gpio/gpio-omap.c linux-4.1.26/drivers/gpio/g return 0; } -@@ -1412,18 +1458,19 @@ +@@ -1412,18 +1458,19 @@ static int omap_gpio_runtime_resume(struct device *dev) } bank->workaround_enabled = false; @@ -6584,7 +7426,7 @@ diff -Nur linux-4.1.26.orig/drivers/gpio/gpio-omap.c linux-4.1.26/drivers/gpio/g continue; bank->power_mode = pwr_mode; -@@ -1437,12 +1484,13 @@ +@@ -1437,12 +1484,13 @@ void omap2_gpio_resume_after_idle(void) struct gpio_bank *bank; list_for_each_entry(bank, &omap_gpio_list, node) { @@ -6599,7 +7441,7 @@ diff -Nur linux-4.1.26.orig/drivers/gpio/gpio-omap.c linux-4.1.26/drivers/gpio/g #if defined(CONFIG_PM) static void omap_gpio_init_context(struct gpio_bank *p) -@@ -1598,6 +1646,7 @@ +@@ -1598,6 +1646,7 @@ MODULE_DEVICE_TABLE(of, omap_gpio_match); static struct platform_driver omap_gpio_driver = { .probe = omap_gpio_probe, @@ -6607,7 +7449,7 @@ diff -Nur linux-4.1.26.orig/drivers/gpio/gpio-omap.c linux-4.1.26/drivers/gpio/g .driver = { .name = "omap_gpio", .pm = &gpio_pm_ops, -@@ -1615,3 +1664,13 @@ +@@ -1615,3 +1664,13 @@ static int __init omap_gpio_drv_reg(void) return platform_driver_register(&omap_gpio_driver); } postcore_initcall(omap_gpio_drv_reg); @@ -6621,21 +7463,10 @@ diff -Nur linux-4.1.26.orig/drivers/gpio/gpio-omap.c linux-4.1.26/drivers/gpio/g +MODULE_DESCRIPTION("omap gpio driver"); +MODULE_ALIAS("platform:gpio-omap"); +MODULE_LICENSE("GPL v2"); -diff -Nur linux-4.1.26.orig/drivers/gpio/Kconfig linux-4.1.26/drivers/gpio/Kconfig ---- linux-4.1.26.orig/drivers/gpio/Kconfig 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/drivers/gpio/Kconfig 2016-06-19 15:30:58.631295190 +0200 -@@ -308,7 +308,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.26.orig/drivers/gpu/drm/i915/i915_gem_execbuffer.c linux-4.1.26/drivers/gpu/drm/i915/i915_gem_execbuffer.c ---- linux-4.1.26.orig/drivers/gpu/drm/i915/i915_gem_execbuffer.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/drivers/gpu/drm/i915/i915_gem_execbuffer.c 2016-06-19 15:30:58.631295190 +0200 +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 @@ -32,6 +32,7 @@ #include "i915_trace.h" #include "intel_drv.h" @@ -6644,7 +7475,7 @@ diff -Nur linux-4.1.26.orig/drivers/gpu/drm/i915/i915_gem_execbuffer.c linux-4.1 #define __EXEC_OBJECT_HAS_PIN (1<<31) #define __EXEC_OBJECT_HAS_FENCE (1<<30) -@@ -465,7 +466,7 @@ +@@ -465,7 +466,7 @@ i915_gem_execbuffer_relocate_entry(struct drm_i915_gem_object *obj, } /* We can't wait for rendering with pagefaults disabled */ @@ -6653,7 +7484,7 @@ diff -Nur linux-4.1.26.orig/drivers/gpu/drm/i915/i915_gem_execbuffer.c linux-4.1 return -EFAULT; if (use_cpu_reloc(obj)) -@@ -1338,7 +1339,9 @@ +@@ -1338,7 +1339,9 @@ i915_gem_ringbuffer_submission(struct drm_device *dev, struct drm_file *file, return ret; } @@ -6663,22 +7494,24 @@ diff -Nur linux-4.1.26.orig/drivers/gpu/drm/i915/i915_gem_execbuffer.c linux-4.1 i915_gem_execbuffer_move_to_active(vmas, ring); i915_gem_execbuffer_retire_commands(dev, file, ring, batch_obj); -diff -Nur linux-4.1.26.orig/drivers/gpu/drm/i915/i915_gem_shrinker.c linux-4.1.26/drivers/gpu/drm/i915/i915_gem_shrinker.c ---- linux-4.1.26.orig/drivers/gpu/drm/i915/i915_gem_shrinker.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/drivers/gpu/drm/i915/i915_gem_shrinker.c 2016-06-19 15:30:58.631295190 +0200 -@@ -39,7 +39,7 @@ +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) if (!mutex_is_locked(mutex)) return false; --#if defined(CONFIG_SMP) || defined(CONFIG_DEBUG_MUTEXES) -+#if (defined(CONFIG_SMP) || defined(CONFIG_DEBUG_MUTEXES)) && !defined(CONFIG_PREEMPT_RT_BASE) +-#if defined(CONFIG_DEBUG_MUTEXES) || defined(CONFIG_MUTEX_SPIN_ON_OWNER) ++#if (defined(CONFIG_DEBUG_MUTEXES) || defined(CONFIG_MUTEX_SPIN_ON_OWNER)) && !defined(CONFIG_PREEMPT_RT_BASE) return mutex->owner == task; #else /* Since UP may be pre-empted, we cannot assume that we own the lock */ -diff -Nur linux-4.1.26.orig/drivers/gpu/drm/i915/i915_irq.c linux-4.1.26/drivers/gpu/drm/i915/i915_irq.c ---- linux-4.1.26.orig/drivers/gpu/drm/i915/i915_irq.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/drivers/gpu/drm/i915/i915_irq.c 2016-06-19 15:30:58.631295190 +0200 -@@ -676,6 +676,7 @@ +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, spin_lock_irqsave(&dev_priv->uncore.lock, irqflags); /* preempt_disable_rt() should go right here in PREEMPT_RT patchset. */ @@ -6686,7 +7519,7 @@ diff -Nur linux-4.1.26.orig/drivers/gpu/drm/i915/i915_irq.c linux-4.1.26/drivers /* Get optional system timestamp before query. */ if (stime) -@@ -727,6 +728,7 @@ +@@ -727,6 +728,7 @@ static int i915_get_crtc_scanoutpos(struct drm_device *dev, int pipe, *etime = ktime_get(); /* preempt_enable_rt() should go right here in PREEMPT_RT patchset. */ @@ -6694,10 +7527,11 @@ diff -Nur linux-4.1.26.orig/drivers/gpu/drm/i915/i915_irq.c linux-4.1.26/drivers spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags); -diff -Nur linux-4.1.26.orig/drivers/gpu/drm/i915/intel_display.c linux-4.1.26/drivers/gpu/drm/i915/intel_display.c ---- linux-4.1.26.orig/drivers/gpu/drm/i915/intel_display.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/drivers/gpu/drm/i915/intel_display.c 2016-06-19 15:30:58.635295344 +0200 -@@ -10084,7 +10084,7 @@ +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) struct drm_crtc *crtc = dev_priv->pipe_to_crtc_mapping[pipe]; struct intel_crtc *intel_crtc = to_intel_crtc(crtc); @@ -6706,9 +7540,10 @@ diff -Nur linux-4.1.26.orig/drivers/gpu/drm/i915/intel_display.c linux-4.1.26/dr if (crtc == NULL) return; -diff -Nur linux-4.1.26.orig/drivers/gpu/drm/i915/intel_sprite.c linux-4.1.26/drivers/gpu/drm/i915/intel_sprite.c ---- linux-4.1.26.orig/drivers/gpu/drm/i915/intel_sprite.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/drivers/gpu/drm/i915/intel_sprite.c 2016-06-19 15:30:58.635295344 +0200 +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 @@ -37,6 +37,7 @@ #include "intel_drv.h" #include <drm/i915_drm.h> @@ -6717,7 +7552,7 @@ diff -Nur linux-4.1.26.orig/drivers/gpu/drm/i915/intel_sprite.c linux-4.1.26/dri static bool format_is_yuv(uint32_t format) -@@ -61,6 +62,8 @@ +@@ -61,6 +62,8 @@ static int usecs_to_scanlines(const struct drm_display_mode *mode, int usecs) return DIV_ROUND_UP(usecs * mode->crtc_clock, 1000 * mode->crtc_htotal); } @@ -6726,7 +7561,7 @@ diff -Nur linux-4.1.26.orig/drivers/gpu/drm/i915/intel_sprite.c linux-4.1.26/dri /** * 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 @@ +@@ -101,7 +104,7 @@ bool intel_pipe_update_start(struct intel_crtc *crtc, uint32_t *start_vbl_count) if (WARN_ON(drm_crtc_vblank_get(&crtc->base))) return false; @@ -6735,7 +7570,7 @@ diff -Nur linux-4.1.26.orig/drivers/gpu/drm/i915/intel_sprite.c linux-4.1.26/dri trace_i915_pipe_update_start(crtc, min, max); -@@ -123,11 +126,11 @@ +@@ -123,11 +126,11 @@ bool intel_pipe_update_start(struct intel_crtc *crtc, uint32_t *start_vbl_count) break; } @@ -6749,7 +7584,7 @@ diff -Nur linux-4.1.26.orig/drivers/gpu/drm/i915/intel_sprite.c linux-4.1.26/dri } finish_wait(wq, &wait); -@@ -158,7 +161,7 @@ +@@ -158,7 +161,7 @@ void intel_pipe_update_end(struct intel_crtc *crtc, u32 start_vbl_count) trace_i915_pipe_update_end(crtc, end_vbl_count); @@ -6758,10 +7593,11 @@ diff -Nur linux-4.1.26.orig/drivers/gpu/drm/i915/intel_sprite.c linux-4.1.26/dri if (start_vbl_count != end_vbl_count) DRM_ERROR("Atomic update failure on pipe %c (start=%u end=%u)\n", -diff -Nur linux-4.1.26.orig/drivers/gpu/drm/radeon/radeon_display.c linux-4.1.26/drivers/gpu/drm/radeon/radeon_display.c ---- linux-4.1.26.orig/drivers/gpu/drm/radeon/radeon_display.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/drivers/gpu/drm/radeon/radeon_display.c 2016-06-19 15:30:58.635295344 +0200 -@@ -1798,6 +1798,7 @@ +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 struct radeon_device *rdev = dev->dev_private; /* preempt_disable_rt() should go right here in PREEMPT_RT patchset. */ @@ -6769,7 +7605,7 @@ diff -Nur linux-4.1.26.orig/drivers/gpu/drm/radeon/radeon_display.c linux-4.1.26 /* Get optional system timestamp before query. */ if (stime) -@@ -1890,6 +1891,7 @@ +@@ -1890,6 +1891,7 @@ int radeon_get_crtc_scanoutpos(struct drm_device *dev, int crtc, unsigned int fl *etime = ktime_get(); /* preempt_enable_rt() should go right here in PREEMPT_RT patchset. */ @@ -6777,10 +7613,11 @@ diff -Nur linux-4.1.26.orig/drivers/gpu/drm/radeon/radeon_display.c linux-4.1.26 /* Decode into vertical and horizontal scanout position. */ *vpos = position & 0x1fff; -diff -Nur linux-4.1.26.orig/drivers/i2c/busses/i2c-omap.c linux-4.1.26/drivers/i2c/busses/i2c-omap.c ---- linux-4.1.26.orig/drivers/i2c/busses/i2c-omap.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/drivers/i2c/busses/i2c-omap.c 2016-06-19 15:30:58.635295344 +0200 -@@ -996,15 +996,12 @@ +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) u16 mask; u16 stat; @@ -6797,10 +7634,11 @@ diff -Nur linux-4.1.26.orig/drivers/i2c/busses/i2c-omap.c linux-4.1.26/drivers/i return ret; } -diff -Nur linux-4.1.26.orig/drivers/ide/alim15x3.c linux-4.1.26/drivers/ide/alim15x3.c ---- linux-4.1.26.orig/drivers/ide/alim15x3.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/drivers/ide/alim15x3.c 2016-06-19 15:30:58.635295344 +0200 -@@ -234,7 +234,7 @@ +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) isa_dev = pci_get_device(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1533, NULL); @@ -6809,7 +7647,7 @@ diff -Nur linux-4.1.26.orig/drivers/ide/alim15x3.c linux-4.1.26/drivers/ide/alim if (m5229_revision < 0xC2) { /* -@@ -325,7 +325,7 @@ +@@ -325,7 +325,7 @@ out: } pci_dev_put(north); pci_dev_put(isa_dev); @@ -6818,10 +7656,11 @@ diff -Nur linux-4.1.26.orig/drivers/ide/alim15x3.c linux-4.1.26/drivers/ide/alim return 0; } -diff -Nur linux-4.1.26.orig/drivers/ide/hpt366.c linux-4.1.26/drivers/ide/hpt366.c ---- linux-4.1.26.orig/drivers/ide/hpt366.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/drivers/ide/hpt366.c 2016-06-19 15:30:58.635295344 +0200 -@@ -1241,7 +1241,7 @@ +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, dma_old = inb(base + 2); @@ -6830,7 +7669,7 @@ diff -Nur linux-4.1.26.orig/drivers/ide/hpt366.c linux-4.1.26/drivers/ide/hpt366 dma_new = dma_old; pci_read_config_byte(dev, hwif->channel ? 0x4b : 0x43, &masterdma); -@@ -1252,7 +1252,7 @@ +@@ -1252,7 +1252,7 @@ static int init_dma_hpt366(ide_hwif_t *hwif, if (dma_new != dma_old) outb(dma_new, base + 2); @@ -6839,40 +7678,11 @@ diff -Nur linux-4.1.26.orig/drivers/ide/hpt366.c linux-4.1.26/drivers/ide/hpt366 printk(KERN_INFO " %s: BM-DMA at 0x%04lx-0x%04lx\n", hwif->name, base, base + 7); -diff -Nur linux-4.1.26.orig/drivers/ide/ide-io.c linux-4.1.26/drivers/ide/ide-io.c ---- linux-4.1.26.orig/drivers/ide/ide-io.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/drivers/ide/ide-io.c 2016-06-19 15:30:58.635295344 +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.26.orig/drivers/ide/ide-iops.c linux-4.1.26/drivers/ide/ide-iops.c ---- linux-4.1.26.orig/drivers/ide/ide-iops.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/drivers/ide/ide-iops.c 2016-06-19 15:30:58.635295344 +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.26.orig/drivers/ide/ide-io-std.c linux-4.1.26/drivers/ide/ide-io-std.c ---- linux-4.1.26.orig/drivers/ide/ide-io-std.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/drivers/ide/ide-io-std.c 2016-06-19 15:30:58.635295344 +0200 -@@ -175,7 +175,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, unsigned long uninitialized_var(flags); if ((io_32bit & 2) && !mmio) { @@ -6881,7 +7691,7 @@ diff -Nur linux-4.1.26.orig/drivers/ide/ide-io-std.c linux-4.1.26/drivers/ide/id ata_vlb_sync(io_ports->nsect_addr); } -@@ -186,7 +186,7 @@ +@@ -186,7 +186,7 @@ void ide_input_data(ide_drive_t *drive, struct ide_cmd *cmd, void *buf, insl(data_addr, buf, words); if ((io_32bit & 2) && !mmio) @@ -6890,7 +7700,7 @@ diff -Nur linux-4.1.26.orig/drivers/ide/ide-io-std.c linux-4.1.26/drivers/ide/id if (((len + 1) & 3) < 2) return; -@@ -219,7 +219,7 @@ +@@ -219,7 +219,7 @@ void ide_output_data(ide_drive_t *drive, struct ide_cmd *cmd, void *buf, unsigned long uninitialized_var(flags); if ((io_32bit & 2) && !mmio) { @@ -6899,7 +7709,7 @@ diff -Nur linux-4.1.26.orig/drivers/ide/ide-io-std.c linux-4.1.26/drivers/ide/id ata_vlb_sync(io_ports->nsect_addr); } -@@ -230,7 +230,7 @@ +@@ -230,7 +230,7 @@ void ide_output_data(ide_drive_t *drive, struct ide_cmd *cmd, void *buf, outsl(data_addr, buf, words); if ((io_32bit & 2) && !mmio) @@ -6908,10 +7718,43 @@ diff -Nur linux-4.1.26.orig/drivers/ide/ide-io-std.c linux-4.1.26/drivers/ide/id if (((len + 1) & 3) < 2) return; -diff -Nur linux-4.1.26.orig/drivers/ide/ide-probe.c linux-4.1.26/drivers/ide/ide-probe.c ---- linux-4.1.26.orig/drivers/ide/ide-probe.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/drivers/ide/ide-probe.c 2016-06-19 15:30:58.635295344 +0200 -@@ -196,10 +196,10 @@ +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) int bswap = 1; /* local CPU only; some systems need this */ @@ -6924,10 +7767,11 @@ diff -Nur linux-4.1.26.orig/drivers/ide/ide-probe.c linux-4.1.26/drivers/ide/ide drive->dev_flags |= IDE_DFLAG_ID_READ; #ifdef DEBUG -diff -Nur linux-4.1.26.orig/drivers/ide/ide-taskfile.c linux-4.1.26/drivers/ide/ide-taskfile.c ---- linux-4.1.26.orig/drivers/ide/ide-taskfile.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/drivers/ide/ide-taskfile.c 2016-06-19 15:30:58.635295344 +0200 -@@ -250,7 +250,7 @@ +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, page_is_high = PageHighMem(page); if (page_is_high) @@ -6936,7 +7780,7 @@ diff -Nur linux-4.1.26.orig/drivers/ide/ide-taskfile.c linux-4.1.26/drivers/ide/ buf = kmap_atomic(page) + offset; -@@ -271,7 +271,7 @@ +@@ -271,7 +271,7 @@ void ide_pio_bytes(ide_drive_t *drive, struct ide_cmd *cmd, kunmap_atomic(buf); if (page_is_high) @@ -6945,7 +7789,7 @@ diff -Nur linux-4.1.26.orig/drivers/ide/ide-taskfile.c linux-4.1.26/drivers/ide/ len -= nr_bytes; } -@@ -414,7 +414,7 @@ +@@ -414,7 +414,7 @@ static ide_startstop_t pre_task_out_intr(ide_drive_t *drive, } if ((drive->dev_flags & IDE_DFLAG_UNMASK) == 0) @@ -6954,10 +7798,11 @@ diff -Nur linux-4.1.26.orig/drivers/ide/ide-taskfile.c linux-4.1.26/drivers/ide/ ide_set_handler(drive, &task_pio_intr, WAIT_WORSTCASE); -diff -Nur linux-4.1.26.orig/drivers/infiniband/ulp/ipoib/ipoib_multicast.c linux-4.1.26/drivers/infiniband/ulp/ipoib/ipoib_multicast.c ---- linux-4.1.26.orig/drivers/infiniband/ulp/ipoib/ipoib_multicast.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/drivers/infiniband/ulp/ipoib/ipoib_multicast.c 2016-06-19 15:30:58.639295498 +0200 -@@ -821,7 +821,7 @@ +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) ipoib_dbg_mcast(priv, "restarting multicast task\n"); @@ -6966,7 +7811,7 @@ diff -Nur linux-4.1.26.orig/drivers/infiniband/ulp/ipoib/ipoib_multicast.c linux netif_addr_lock(dev); spin_lock(&priv->lock); -@@ -903,7 +903,7 @@ +@@ -903,7 +903,7 @@ void ipoib_mcast_restart_task(struct work_struct *work) spin_unlock(&priv->lock); netif_addr_unlock(dev); @@ -6975,10 +7820,11 @@ diff -Nur linux-4.1.26.orig/drivers/infiniband/ulp/ipoib/ipoib_multicast.c linux /* * make sure the in-flight joins have finished before we attempt -diff -Nur linux-4.1.26.orig/drivers/input/gameport/gameport.c linux-4.1.26/drivers/input/gameport/gameport.c ---- linux-4.1.26.orig/drivers/input/gameport/gameport.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/drivers/input/gameport/gameport.c 2016-06-19 15:30:58.639295498 +0200 -@@ -124,12 +124,12 @@ +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) tx = 1 << 30; for(i = 0; i < 50; i++) { @@ -6993,7 +7839,7 @@ diff -Nur linux-4.1.26.orig/drivers/input/gameport/gameport.c linux-4.1.26/drive udelay(i * 10); if ((t = DELTA(t2,t1) - DELTA(t3,t2)) < tx) tx = t; } -@@ -148,11 +148,11 @@ +@@ -148,11 +148,11 @@ static int old_gameport_measure_speed(struct gameport *gameport) tx = 1 << 30; for(i = 0; i < 50; i++) { @@ -7007,10 +7853,11 @@ diff -Nur linux-4.1.26.orig/drivers/input/gameport/gameport.c linux-4.1.26/drive udelay(i * 10); if (t2 - t1 < tx) tx = t2 - t1; } -diff -Nur linux-4.1.26.orig/drivers/leds/trigger/Kconfig linux-4.1.26/drivers/leds/trigger/Kconfig ---- linux-4.1.26.orig/drivers/leds/trigger/Kconfig 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/drivers/leds/trigger/Kconfig 2016-06-19 15:30:58.639295498 +0200 -@@ -61,7 +61,7 @@ +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 config LEDS_TRIGGER_CPU bool "LED CPU Trigger" @@ -7019,9 +7866,10 @@ diff -Nur linux-4.1.26.orig/drivers/leds/trigger/Kconfig linux-4.1.26/drivers/le 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 -Nur linux-4.1.26.orig/drivers/md/bcache/Kconfig linux-4.1.26/drivers/md/bcache/Kconfig ---- linux-4.1.26.orig/drivers/md/bcache/Kconfig 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/drivers/md/bcache/Kconfig 2016-06-19 15:30:58.639295498 +0200 +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 @@ -1,6 +1,7 @@ config BCACHE @@ -7030,10 +7878,11 @@ diff -Nur linux-4.1.26.orig/drivers/md/bcache/Kconfig linux-4.1.26/drivers/md/bc ---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 -Nur linux-4.1.26.orig/drivers/md/dm.c linux-4.1.26/drivers/md/dm.c ---- linux-4.1.26.orig/drivers/md/dm.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/drivers/md/dm.c 2016-06-19 15:30:58.639295498 +0200 -@@ -2133,7 +2133,7 @@ +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) /* Establish tio->ti before queuing work (map_tio_request) */ tio->ti = ti; queue_kthread_work(&md->kworker, &tio->work); @@ -7042,10 +7891,11 @@ diff -Nur linux-4.1.26.orig/drivers/md/dm.c linux-4.1.26/drivers/md/dm.c } goto out; -diff -Nur linux-4.1.26.orig/drivers/md/raid5.c linux-4.1.26/drivers/md/raid5.c ---- linux-4.1.26.orig/drivers/md/raid5.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/drivers/md/raid5.c 2016-06-19 15:30:58.639295498 +0200 -@@ -1918,8 +1918,9 @@ +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) struct raid5_percpu *percpu; unsigned long cpu; @@ -7056,7 +7906,7 @@ diff -Nur linux-4.1.26.orig/drivers/md/raid5.c linux-4.1.26/drivers/md/raid5.c if (test_bit(STRIPE_OP_BIOFILL, &ops_request)) { ops_run_biofill(sh); overlap_clear++; -@@ -1975,7 +1976,8 @@ +@@ -1975,7 +1976,8 @@ static void raid_run_ops(struct stripe_head *sh, unsigned long ops_request) if (test_and_clear_bit(R5_Overlap, &dev->flags)) wake_up(&sh->raid_conf->wait_for_overlap); } @@ -7066,7 +7916,7 @@ diff -Nur linux-4.1.26.orig/drivers/md/raid5.c linux-4.1.26/drivers/md/raid5.c } static struct stripe_head *alloc_stripe(struct kmem_cache *sc, gfp_t gfp) -@@ -6375,6 +6377,7 @@ +@@ -6375,6 +6377,7 @@ static int raid5_alloc_percpu(struct r5conf *conf) __func__, cpu); break; } @@ -7074,10 +7924,11 @@ diff -Nur linux-4.1.26.orig/drivers/md/raid5.c linux-4.1.26/drivers/md/raid5.c } put_online_cpus(); -diff -Nur linux-4.1.26.orig/drivers/md/raid5.h linux-4.1.26/drivers/md/raid5.h ---- linux-4.1.26.orig/drivers/md/raid5.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/drivers/md/raid5.h 2016-06-19 15:30:58.639295498 +0200 -@@ -495,6 +495,7 @@ +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 { int recovery_disabled; /* per cpu variables */ struct raid5_percpu { @@ -7085,9 +7936,97 @@ diff -Nur linux-4.1.26.orig/drivers/md/raid5.h linux-4.1.26/drivers/md/raid5.h struct page *spare_page; /* Used when checking P/Q in raid6 */ struct flex_array *scribble; /* space for constructing buffer * lists and performing address -diff -Nur linux-4.1.26.orig/drivers/misc/hwlat_detector.c linux-4.1.26/drivers/misc/hwlat_detector.c ---- linux-4.1.26.orig/drivers/misc/hwlat_detector.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-4.1.26/drivers/misc/hwlat_detector.c 2016-06-19 15:30:58.643295653 +0200 +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 @@ -0,0 +1,1240 @@ +/* + * hwlat_detector.c - A simple Hardware Latency detector. @@ -8329,94 +9268,11 @@ diff -Nur linux-4.1.26.orig/drivers/misc/hwlat_detector.c linux-4.1.26/drivers/m + +module_init(detector_init); +module_exit(detector_exit); -diff -Nur linux-4.1.26.orig/drivers/misc/Kconfig linux-4.1.26/drivers/misc/Kconfig ---- linux-4.1.26.orig/drivers/misc/Kconfig 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/drivers/misc/Kconfig 2016-06-19 15:30:58.639295498 +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.26.orig/drivers/misc/Makefile linux-4.1.26/drivers/misc/Makefile ---- linux-4.1.26.orig/drivers/misc/Makefile 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/drivers/misc/Makefile 2016-06-19 15:30:58.639295498 +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.26.orig/drivers/mmc/host/mmci.c linux-4.1.26/drivers/mmc/host/mmci.c ---- linux-4.1.26.orig/drivers/mmc/host/mmci.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/drivers/mmc/host/mmci.c 2016-06-19 15:30:58.643295653 +0200 -@@ -1155,15 +1155,12 @@ +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) struct sg_mapping_iter *sg_miter = &host->sg_miter; struct variant_data *variant = host->variant; void __iomem *base = host->base; @@ -8432,7 +9288,7 @@ diff -Nur linux-4.1.26.orig/drivers/mmc/host/mmci.c linux-4.1.26/drivers/mmc/hos do { unsigned int remain, len; char *buffer; -@@ -1203,8 +1200,6 @@ +@@ -1203,8 +1200,6 @@ static irqreturn_t mmci_pio_irq(int irq, void *dev_id) sg_miter_stop(sg_miter); @@ -8441,10 +9297,11 @@ diff -Nur linux-4.1.26.orig/drivers/mmc/host/mmci.c linux-4.1.26/drivers/mmc/hos /* * If we have less than the fifo 'half-full' threshold to transfer, * trigger a PIO interrupt as soon as any data is available. -diff -Nur linux-4.1.26.orig/drivers/net/ethernet/3com/3c59x.c linux-4.1.26/drivers/net/ethernet/3com/3c59x.c ---- linux-4.1.26.orig/drivers/net/ethernet/3com/3c59x.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/drivers/net/ethernet/3com/3c59x.c 2016-06-19 15:30:58.643295653 +0200 -@@ -842,9 +842,9 @@ +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) { struct vortex_private *vp = netdev_priv(dev); unsigned long flags; @@ -8456,7 +9313,7 @@ diff -Nur linux-4.1.26.orig/drivers/net/ethernet/3com/3c59x.c linux-4.1.26/drive } #endif -@@ -1916,12 +1916,12 @@ +@@ -1916,12 +1916,12 @@ static void vortex_tx_timeout(struct net_device *dev) * Block interrupts because vortex_interrupt does a bare spin_lock() */ unsigned long flags; @@ -8471,10 +9328,11 @@ diff -Nur linux-4.1.26.orig/drivers/net/ethernet/3com/3c59x.c linux-4.1.26/drive } } -diff -Nur linux-4.1.26.orig/drivers/net/ethernet/atheros/atl1c/atl1c_main.c linux-4.1.26/drivers/net/ethernet/atheros/atl1c/atl1c_main.c ---- linux-4.1.26.orig/drivers/net/ethernet/atheros/atl1c/atl1c_main.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/drivers/net/ethernet/atheros/atl1c/atl1c_main.c 2016-06-19 15:30:58.643295653 +0200 -@@ -2212,11 +2212,7 @@ +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, } tpd_req = atl1c_cal_tpd_req(skb); @@ -8487,10 +9345,11 @@ diff -Nur linux-4.1.26.orig/drivers/net/ethernet/atheros/atl1c/atl1c_main.c linu if (atl1c_tpd_avail(adapter, type) < tpd_req) { /* no enough descriptor, just stop queue */ -diff -Nur linux-4.1.26.orig/drivers/net/ethernet/atheros/atl1e/atl1e_main.c linux-4.1.26/drivers/net/ethernet/atheros/atl1e/atl1e_main.c ---- linux-4.1.26.orig/drivers/net/ethernet/atheros/atl1e/atl1e_main.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/drivers/net/ethernet/atheros/atl1e/atl1e_main.c 2016-06-19 15:30:58.643295653 +0200 -@@ -1880,8 +1880,7 @@ +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, return NETDEV_TX_OK; } tpd_req = atl1e_cal_tdp_req(skb); @@ -8500,10 +9359,11 @@ diff -Nur linux-4.1.26.orig/drivers/net/ethernet/atheros/atl1e/atl1e_main.c linu if (atl1e_tpd_avail(adapter) < tpd_req) { /* no enough descriptor, just stop queue */ -diff -Nur linux-4.1.26.orig/drivers/net/ethernet/chelsio/cxgb/sge.c linux-4.1.26/drivers/net/ethernet/chelsio/cxgb/sge.c ---- linux-4.1.26.orig/drivers/net/ethernet/chelsio/cxgb/sge.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/drivers/net/ethernet/chelsio/cxgb/sge.c 2016-06-19 15:30:58.643295653 +0200 -@@ -1664,8 +1664,7 @@ +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, struct cmdQ *q = &sge->cmdQ[qid]; unsigned int credits, pidx, genbit, count, use_sched_skb = 0; @@ -8513,10 +9373,11 @@ diff -Nur linux-4.1.26.orig/drivers/net/ethernet/chelsio/cxgb/sge.c linux-4.1.26 reclaim_completed_tx(sge, q); -diff -Nur linux-4.1.26.orig/drivers/net/ethernet/freescale/gianfar.c linux-4.1.26/drivers/net/ethernet/freescale/gianfar.c ---- linux-4.1.26.orig/drivers/net/ethernet/freescale/gianfar.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/drivers/net/ethernet/freescale/gianfar.c 2016-06-19 15:30:58.643295653 +0200 -@@ -1540,7 +1540,7 @@ +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) if (netif_running(ndev)) { @@ -8525,7 +9386,7 @@ diff -Nur linux-4.1.26.orig/drivers/net/ethernet/freescale/gianfar.c linux-4.1.2 lock_tx_qs(priv); gfar_halt_nodisable(priv); -@@ -1556,7 +1556,7 @@ +@@ -1556,7 +1556,7 @@ static int gfar_suspend(struct device *dev) gfar_write(®s->maccfg1, tempval); unlock_tx_qs(priv); @@ -8534,7 +9395,7 @@ diff -Nur linux-4.1.26.orig/drivers/net/ethernet/freescale/gianfar.c linux-4.1.2 disable_napi(priv); -@@ -1598,7 +1598,7 @@ +@@ -1598,7 +1598,7 @@ static int gfar_resume(struct device *dev) /* Disable Magic Packet mode, in case something * else woke us up. */ @@ -8543,7 +9404,7 @@ diff -Nur linux-4.1.26.orig/drivers/net/ethernet/freescale/gianfar.c linux-4.1.2 lock_tx_qs(priv); tempval = gfar_read(®s->maccfg2); -@@ -1608,7 +1608,7 @@ +@@ -1608,7 +1608,7 @@ static int gfar_resume(struct device *dev) gfar_start(priv); unlock_tx_qs(priv); @@ -8552,7 +9413,7 @@ diff -Nur linux-4.1.26.orig/drivers/net/ethernet/freescale/gianfar.c linux-4.1.2 netif_device_attach(ndev); -@@ -3418,14 +3418,14 @@ +@@ -3418,14 +3418,14 @@ static irqreturn_t gfar_error(int irq, void *grp_id) dev->stats.tx_dropped++; atomic64_inc(&priv->extra_stats.tx_underrun); @@ -8569,10 +9430,11 @@ diff -Nur linux-4.1.26.orig/drivers/net/ethernet/freescale/gianfar.c linux-4.1.2 } netif_dbg(priv, tx_err, dev, "Transmit Error\n"); } -diff -Nur linux-4.1.26.orig/drivers/net/ethernet/neterion/s2io.c linux-4.1.26/drivers/net/ethernet/neterion/s2io.c ---- linux-4.1.26.orig/drivers/net/ethernet/neterion/s2io.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/drivers/net/ethernet/neterion/s2io.c 2016-06-19 15:30:58.647295807 +0200 -@@ -4084,12 +4084,7 @@ +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) [skb->priority & (MAX_TX_FIFOS - 1)]; fifo = &mac_control->fifos[queue]; @@ -8586,10 +9448,11 @@ diff -Nur linux-4.1.26.orig/drivers/net/ethernet/neterion/s2io.c linux-4.1.26/dr if (sp->config.multiq) { if (__netif_subqueue_stopped(dev, fifo->fifo_no)) { -diff -Nur linux-4.1.26.orig/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c linux-4.1.26/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c ---- linux-4.1.26.orig/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c 2016-06-19 15:30:58.647295807 +0200 -@@ -2137,10 +2137,8 @@ +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) struct pch_gbe_tx_ring *tx_ring = adapter->tx_ring; unsigned long flags; @@ -8602,10 +9465,11 @@ diff -Nur linux-4.1.26.orig/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c if (unlikely(!PCH_GBE_DESC_UNUSED(tx_ring))) { netif_stop_queue(netdev); spin_unlock_irqrestore(&tx_ring->tx_lock, flags); -diff -Nur linux-4.1.26.orig/drivers/net/ethernet/realtek/8139too.c linux-4.1.26/drivers/net/ethernet/realtek/8139too.c ---- linux-4.1.26.orig/drivers/net/ethernet/realtek/8139too.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/drivers/net/ethernet/realtek/8139too.c 2016-06-19 15:30:58.647295807 +0200 -@@ -2229,7 +2229,7 @@ +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) struct rtl8139_private *tp = netdev_priv(dev); const int irq = tp->pci_dev->irq; @@ -8614,10 +9478,11 @@ diff -Nur linux-4.1.26.orig/drivers/net/ethernet/realtek/8139too.c linux-4.1.26/ rtl8139_interrupt(irq, dev); enable_irq(irq); } -diff -Nur linux-4.1.26.orig/drivers/net/ethernet/tehuti/tehuti.c linux-4.1.26/drivers/net/ethernet/tehuti/tehuti.c ---- linux-4.1.26.orig/drivers/net/ethernet/tehuti/tehuti.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/drivers/net/ethernet/tehuti/tehuti.c 2016-06-19 15:30:58.647295807 +0200 -@@ -1629,13 +1629,8 @@ +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, unsigned long flags; ENTER; @@ -8633,10 +9498,11 @@ diff -Nur linux-4.1.26.orig/drivers/net/ethernet/tehuti/tehuti.c linux-4.1.26/dr /* build tx descriptor */ BDX_ASSERT(f->m.wptr >= f->m.memsz); /* started with valid wptr */ -diff -Nur linux-4.1.26.orig/drivers/net/rionet.c linux-4.1.26/drivers/net/rionet.c ---- linux-4.1.26.orig/drivers/net/rionet.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/drivers/net/rionet.c 2016-06-19 15:30:58.647295807 +0200 -@@ -174,11 +174,7 @@ +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) unsigned long flags; int add_num = 1; @@ -8649,10 +9515,11 @@ diff -Nur linux-4.1.26.orig/drivers/net/rionet.c linux-4.1.26/drivers/net/rionet if (is_multicast_ether_addr(eth->h_dest)) add_num = nets[rnet->mport->id].nact; -diff -Nur linux-4.1.26.orig/drivers/net/wireless/orinoco/orinoco_usb.c linux-4.1.26/drivers/net/wireless/orinoco/orinoco_usb.c ---- linux-4.1.26.orig/drivers/net/wireless/orinoco/orinoco_usb.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/drivers/net/wireless/orinoco/orinoco_usb.c 2016-06-19 15:30:58.647295807 +0200 -@@ -697,7 +697,7 @@ +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, while (!ctx->done.done && msecs--) udelay(1000); } else { @@ -8661,10 +9528,11 @@ diff -Nur linux-4.1.26.orig/drivers/net/wireless/orinoco/orinoco_usb.c linux-4.1 ctx->done.done); } break; -diff -Nur linux-4.1.26.orig/drivers/pci/access.c linux-4.1.26/drivers/pci/access.c ---- linux-4.1.26.orig/drivers/pci/access.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/drivers/pci/access.c 2016-06-19 15:30:58.647295807 +0200 -@@ -561,7 +561,7 @@ +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) WARN_ON(!dev->block_cfg_access); dev->block_cfg_access = 0; @@ -8673,10 +9541,11 @@ diff -Nur linux-4.1.26.orig/drivers/pci/access.c linux-4.1.26/drivers/pci/access raw_spin_unlock_irqrestore(&pci_lock, flags); } EXPORT_SYMBOL_GPL(pci_cfg_access_unlock); -diff -Nur linux-4.1.26.orig/drivers/scsi/fcoe/fcoe.c linux-4.1.26/drivers/scsi/fcoe/fcoe.c ---- linux-4.1.26.orig/drivers/scsi/fcoe/fcoe.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/drivers/scsi/fcoe/fcoe.c 2016-06-19 15:30:58.647295807 +0200 -@@ -1287,7 +1287,7 @@ +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) struct sk_buff *skb; #ifdef CONFIG_SMP struct fcoe_percpu_s *p0; @@ -8685,7 +9554,7 @@ diff -Nur linux-4.1.26.orig/drivers/scsi/fcoe/fcoe.c linux-4.1.26/drivers/scsi/f #endif /* CONFIG_SMP */ FCOE_DBG("Destroying receive thread for CPU %d\n", cpu); -@@ -1343,7 +1343,7 @@ +@@ -1343,7 +1343,7 @@ static void fcoe_percpu_thread_destroy(unsigned int cpu) kfree_skb(skb); spin_unlock_bh(&p->fcoe_rx_list.lock); } @@ -8694,7 +9563,7 @@ diff -Nur linux-4.1.26.orig/drivers/scsi/fcoe/fcoe.c linux-4.1.26/drivers/scsi/f #else /* * This a non-SMP scenario where the singular Rx thread is -@@ -1567,11 +1567,11 @@ +@@ -1567,11 +1567,11 @@ err2: static int fcoe_alloc_paged_crc_eof(struct sk_buff *skb, int tlen) { struct fcoe_percpu_s *fps; @@ -8709,7 +9578,7 @@ diff -Nur linux-4.1.26.orig/drivers/scsi/fcoe/fcoe.c linux-4.1.26/drivers/scsi/f return rc; } -@@ -1767,11 +1767,11 @@ +@@ -1767,11 +1767,11 @@ static inline int fcoe_filter_frames(struct fc_lport *lport, return 0; } @@ -8723,7 +9592,16 @@ diff -Nur linux-4.1.26.orig/drivers/scsi/fcoe/fcoe.c linux-4.1.26/drivers/scsi/f return -EINVAL; } -@@ -1847,13 +1847,13 @@ +@@ -1815,7 +1815,7 @@ static void fcoe_recv_frame(struct sk_buff *skb) + */ + hp = (struct fcoe_hdr *) skb_network_header(skb); + +- stats = per_cpu_ptr(lport->stats, get_cpu()); ++ stats = per_cpu_ptr(lport->stats, get_cpu_light()); + if (unlikely(FC_FCOE_DECAPS_VER(hp) != FC_FCOE_VER)) { + if (stats->ErrorFrames < 5) + printk(KERN_WARNING "fcoe: FCoE version " +@@ -1847,13 +1847,13 @@ static void fcoe_recv_frame(struct sk_buff *skb) goto drop; if (!fcoe_filter_frames(lport, fp)) { @@ -8739,10 +9617,11 @@ diff -Nur linux-4.1.26.orig/drivers/scsi/fcoe/fcoe.c linux-4.1.26/drivers/scsi/f kfree_skb(skb); } -diff -Nur linux-4.1.26.orig/drivers/scsi/fcoe/fcoe_ctlr.c linux-4.1.26/drivers/scsi/fcoe/fcoe_ctlr.c ---- linux-4.1.26.orig/drivers/scsi/fcoe/fcoe_ctlr.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/drivers/scsi/fcoe/fcoe_ctlr.c 2016-06-19 15:30:58.651295961 +0200 -@@ -831,7 +831,7 @@ +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) INIT_LIST_HEAD(&del_list); @@ -8751,7 +9630,7 @@ diff -Nur linux-4.1.26.orig/drivers/scsi/fcoe/fcoe_ctlr.c linux-4.1.26/drivers/s list_for_each_entry_safe(fcf, next, &fip->fcfs, list) { deadline = fcf->time + fcf->fka_period + fcf->fka_period / 2; -@@ -867,7 +867,7 @@ +@@ -867,7 +867,7 @@ static unsigned long fcoe_ctlr_age_fcfs(struct fcoe_ctlr *fip) sel_time = fcf->time; } } @@ -8760,10 +9639,11 @@ diff -Nur linux-4.1.26.orig/drivers/scsi/fcoe/fcoe_ctlr.c linux-4.1.26/drivers/s list_for_each_entry_safe(fcf, next, &del_list, list) { /* Removes fcf from current list */ -diff -Nur linux-4.1.26.orig/drivers/scsi/libfc/fc_exch.c linux-4.1.26/drivers/scsi/libfc/fc_exch.c ---- linux-4.1.26.orig/drivers/scsi/libfc/fc_exch.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/drivers/scsi/libfc/fc_exch.c 2016-06-19 15:30:58.651295961 +0200 -@@ -814,10 +814,10 @@ +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, } memset(ep, 0, sizeof(*ep)); @@ -8776,10 +9656,11 @@ diff -Nur linux-4.1.26.orig/drivers/scsi/libfc/fc_exch.c linux-4.1.26/drivers/sc /* peek cache of free slot */ if (pool->left != FC_XID_UNKNOWN) { -diff -Nur linux-4.1.26.orig/drivers/scsi/libsas/sas_ata.c linux-4.1.26/drivers/scsi/libsas/sas_ata.c ---- linux-4.1.26.orig/drivers/scsi/libsas/sas_ata.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/drivers/scsi/libsas/sas_ata.c 2016-06-19 15:30:58.651295961 +0200 -@@ -190,7 +190,7 @@ +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) /* TODO: audit callers to ensure they are ready for qc_issue to * unconditionally re-enable interrupts */ @@ -8788,7 +9669,7 @@ diff -Nur linux-4.1.26.orig/drivers/scsi/libsas/sas_ata.c linux-4.1.26/drivers/s spin_unlock(ap->lock); /* If the device fell off, no sense in issuing commands */ -@@ -255,7 +255,7 @@ +@@ -255,7 +255,7 @@ static unsigned int sas_ata_qc_issue(struct ata_queued_cmd *qc) out: spin_lock(ap->lock); @@ -8797,10 +9678,11 @@ diff -Nur linux-4.1.26.orig/drivers/scsi/libsas/sas_ata.c linux-4.1.26/drivers/s return ret; } -diff -Nur linux-4.1.26.orig/drivers/scsi/qla2xxx/qla_inline.h linux-4.1.26/drivers/scsi/qla2xxx/qla_inline.h ---- linux-4.1.26.orig/drivers/scsi/qla2xxx/qla_inline.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/drivers/scsi/qla2xxx/qla_inline.h 2016-06-19 15:30:58.651295961 +0200 -@@ -59,12 +59,12 @@ +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) { unsigned long flags; struct qla_hw_data *ha = rsp->hw; @@ -8815,9 +9697,10 @@ diff -Nur linux-4.1.26.orig/drivers/scsi/qla2xxx/qla_inline.h linux-4.1.26/drive } static inline uint8_t * -diff -Nur linux-4.1.26.orig/drivers/thermal/x86_pkg_temp_thermal.c linux-4.1.26/drivers/thermal/x86_pkg_temp_thermal.c ---- linux-4.1.26.orig/drivers/thermal/x86_pkg_temp_thermal.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/drivers/thermal/x86_pkg_temp_thermal.c 2016-06-19 15:30:58.651295961 +0200 +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 @@ -29,6 +29,7 @@ #include <linux/pm.h> #include <linux/thermal.h> @@ -8826,7 +9709,7 @@ diff -Nur linux-4.1.26.orig/drivers/thermal/x86_pkg_temp_thermal.c linux-4.1.26/ #include <asm/cpu_device_id.h> #include <asm/mce.h> -@@ -352,7 +353,7 @@ +@@ -352,7 +353,7 @@ static void pkg_temp_thermal_threshold_work_fn(struct work_struct *work) } } @@ -8835,7 +9718,7 @@ diff -Nur linux-4.1.26.orig/drivers/thermal/x86_pkg_temp_thermal.c linux-4.1.26/ { unsigned long flags; int cpu = smp_processor_id(); -@@ -369,7 +370,7 @@ +@@ -369,7 +370,7 @@ static int pkg_temp_thermal_platform_thermal_notify(__u64 msr_val) pkg_work_scheduled[phy_id]) { disable_pkg_thres_interrupt(); spin_unlock_irqrestore(&pkg_work_lock, flags); @@ -8844,7 +9727,7 @@ diff -Nur linux-4.1.26.orig/drivers/thermal/x86_pkg_temp_thermal.c linux-4.1.26/ } pkg_work_scheduled[phy_id] = 1; spin_unlock_irqrestore(&pkg_work_lock, flags); -@@ -378,9 +379,48 @@ +@@ -378,9 +379,48 @@ static int pkg_temp_thermal_platform_thermal_notify(__u64 msr_val) schedule_delayed_work_on(cpu, &per_cpu(pkg_temp_thermal_threshold_work, cpu), msecs_to_jiffies(notify_delay_ms)); @@ -8893,7 +9776,7 @@ diff -Nur linux-4.1.26.orig/drivers/thermal/x86_pkg_temp_thermal.c linux-4.1.26/ static int find_siblings_cpu(int cpu) { int i; -@@ -584,6 +624,9 @@ +@@ -584,6 +624,9 @@ static int __init pkg_temp_thermal_init(void) if (!x86_match_cpu(pkg_temp_thermal_ids)) return -ENODEV; @@ -8903,7 +9786,7 @@ diff -Nur linux-4.1.26.orig/drivers/thermal/x86_pkg_temp_thermal.c linux-4.1.26/ spin_lock_init(&pkg_work_lock); platform_thermal_package_notify = pkg_temp_thermal_platform_thermal_notify; -@@ -608,7 +651,7 @@ +@@ -608,7 +651,7 @@ err_ret: kfree(pkg_work_scheduled); platform_thermal_package_notify = NULL; platform_thermal_package_rate_control = NULL; @@ -8912,7 +9795,7 @@ diff -Nur linux-4.1.26.orig/drivers/thermal/x86_pkg_temp_thermal.c linux-4.1.26/ return -ENODEV; } -@@ -633,6 +676,7 @@ +@@ -633,6 +676,7 @@ static void __exit pkg_temp_thermal_exit(void) mutex_unlock(&phy_dev_list_mutex); platform_thermal_package_notify = NULL; platform_thermal_package_rate_control = NULL; @@ -8920,9 +9803,10 @@ diff -Nur linux-4.1.26.orig/drivers/thermal/x86_pkg_temp_thermal.c linux-4.1.26/ for_each_online_cpu(i) cancel_delayed_work_sync( &per_cpu(pkg_temp_thermal_threshold_work, i)); -diff -Nur linux-4.1.26.orig/drivers/tty/serial/8250/8250_core.c linux-4.1.26/drivers/tty/serial/8250/8250_core.c ---- linux-4.1.26.orig/drivers/tty/serial/8250/8250_core.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/drivers/tty/serial/8250/8250_core.c 2016-06-19 15:30:58.651295961 +0200 +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 @@ -36,6 +36,7 @@ #include <linux/nmi.h> #include <linux/mutex.h> @@ -8931,7 +9815,7 @@ diff -Nur linux-4.1.26.orig/drivers/tty/serial/8250/8250_core.c linux-4.1.26/dri #include <linux/uaccess.h> #include <linux/pm_runtime.h> #ifdef CONFIG_SPARC -@@ -80,7 +81,16 @@ +@@ -80,7 +81,16 @@ static unsigned int skip_txen_test; /* force skip of txen test at init time */ #define DEBUG_INTR(fmt...) do { } while (0) #endif @@ -8949,7 +9833,7 @@ diff -Nur linux-4.1.26.orig/drivers/tty/serial/8250/8250_core.c linux-4.1.26/dri #define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE) -@@ -3372,7 +3382,7 @@ +@@ -3366,7 +3376,7 @@ static void serial8250_console_write(struct uart_8250_port *up, const char *s, if (port->sysrq) locked = 0; @@ -8958,10 +9842,11 @@ diff -Nur linux-4.1.26.orig/drivers/tty/serial/8250/8250_core.c linux-4.1.26/dri locked = spin_trylock_irqsave(&port->lock, flags); else spin_lock_irqsave(&port->lock, flags); -diff -Nur linux-4.1.26.orig/drivers/tty/serial/amba-pl011.c linux-4.1.26/drivers/tty/serial/amba-pl011.c ---- linux-4.1.26.orig/drivers/tty/serial/amba-pl011.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/drivers/tty/serial/amba-pl011.c 2016-06-19 15:30:58.651295961 +0200 -@@ -2000,13 +2000,19 @@ +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) clk_enable(uap->clk); @@ -8984,7 +9869,7 @@ diff -Nur linux-4.1.26.orig/drivers/tty/serial/amba-pl011.c linux-4.1.26/drivers /* * First save the CR then disable the interrupts -@@ -2028,8 +2034,7 @@ +@@ -2028,8 +2034,7 @@ pl011_console_write(struct console *co, const char *s, unsigned int count) writew(old_cr, uap->port.membase + UART011_CR); if (locked) @@ -8994,10 +9879,11 @@ diff -Nur linux-4.1.26.orig/drivers/tty/serial/amba-pl011.c linux-4.1.26/drivers clk_disable(uap->clk); } -diff -Nur linux-4.1.26.orig/drivers/tty/serial/omap-serial.c linux-4.1.26/drivers/tty/serial/omap-serial.c ---- linux-4.1.26.orig/drivers/tty/serial/omap-serial.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/drivers/tty/serial/omap-serial.c 2016-06-19 15:30:58.651295961 +0200 -@@ -1282,13 +1282,10 @@ +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, pm_runtime_get_sync(up->dev); @@ -9014,7 +9900,7 @@ diff -Nur linux-4.1.26.orig/drivers/tty/serial/omap-serial.c linux-4.1.26/driver /* * First save the IER then disable the interrupts -@@ -1317,8 +1314,7 @@ +@@ -1317,8 +1314,7 @@ serial_omap_console_write(struct console *co, const char *s, pm_runtime_mark_last_busy(up->dev); pm_runtime_put_autosuspend(up->dev); if (locked) @@ -9024,10 +9910,11 @@ diff -Nur linux-4.1.26.orig/drivers/tty/serial/omap-serial.c linux-4.1.26/driver } static int __init -diff -Nur linux-4.1.26.orig/drivers/usb/core/hcd.c linux-4.1.26/drivers/usb/core/hcd.c ---- linux-4.1.26.orig/drivers/usb/core/hcd.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/drivers/usb/core/hcd.c 2016-06-19 15:30:58.655296115 +0200 -@@ -1684,9 +1684,9 @@ +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) * and no one may trigger the above deadlock situation when * running complete() in tasklet. */ @@ -9039,10 +9926,11 @@ diff -Nur linux-4.1.26.orig/drivers/usb/core/hcd.c linux-4.1.26/drivers/usb/core usb_anchor_resume_wakeups(anchor); atomic_dec(&urb->use_count); -diff -Nur linux-4.1.26.orig/drivers/usb/gadget/function/f_fs.c linux-4.1.26/drivers/usb/gadget/function/f_fs.c ---- linux-4.1.26.orig/drivers/usb/gadget/function/f_fs.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/drivers/usb/gadget/function/f_fs.c 2016-06-19 15:30:58.655296115 +0200 -@@ -1404,7 +1404,7 @@ +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) pr_info("%s(): freeing\n", __func__); ffs_data_clear(ffs); BUG_ON(waitqueue_active(&ffs->ev.waitq) || @@ -9051,10 +9939,11 @@ diff -Nur linux-4.1.26.orig/drivers/usb/gadget/function/f_fs.c linux-4.1.26/driv kfree(ffs->dev_name); kfree(ffs); } -diff -Nur linux-4.1.26.orig/drivers/usb/gadget/legacy/inode.c linux-4.1.26/drivers/usb/gadget/legacy/inode.c ---- linux-4.1.26.orig/drivers/usb/gadget/legacy/inode.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/drivers/usb/gadget/legacy/inode.c 2016-06-19 15:30:58.655296115 +0200 -@@ -345,7 +345,7 @@ +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) spin_unlock_irq (&epdata->dev->lock); if (likely (value == 0)) { @@ -9063,7 +9952,7 @@ diff -Nur linux-4.1.26.orig/drivers/usb/gadget/legacy/inode.c linux-4.1.26/drive if (value != 0) { spin_lock_irq (&epdata->dev->lock); if (likely (epdata->ep != NULL)) { -@@ -354,7 +354,7 @@ +@@ -354,7 +354,7 @@ ep_io (struct ep_data *epdata, void *buf, unsigned len) usb_ep_dequeue (epdata->ep, epdata->req); spin_unlock_irq (&epdata->dev->lock); @@ -9072,9 +9961,73 @@ diff -Nur linux-4.1.26.orig/drivers/usb/gadget/legacy/inode.c linux-4.1.26/drive if (epdata->status == -ECONNRESET) epdata->status = -EINTR; } else { -diff -Nur linux-4.1.26.orig/fs/aio.c linux-4.1.26/fs/aio.c ---- linux-4.1.26.orig/fs/aio.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/fs/aio.c 2016-06-19 15:30:58.655296115 +0200 +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 +@@ -17,7 +17,9 @@ + #include <linux/device.h> + #include <linux/dma-mapping.h> + #include <linux/list.h> ++#include <linux/mfd/syscon.h> + #include <linux/platform_device.h> ++#include <linux/regmap.h> + #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) + #ifdef CONFIG_OF + static void at91sam9rl_toggle_bias(struct usba_udc *udc, int is_on) + { +- unsigned int uckr = at91_pmc_read(AT91_CKGR_UCKR); +- +- if (is_on) +- at91_pmc_write(AT91_CKGR_UCKR, uckr | AT91_PMC_BIASEN); +- else +- at91_pmc_write(AT91_CKGR_UCKR, uckr & ~(AT91_PMC_BIASEN)); ++ regmap_update_bits(udc->pmc, AT91_CKGR_UCKR, AT91_PMC_BIASEN, ++ is_on ? AT91_PMC_BIASEN : 0); + } + + static void at91sam9g45_pulse_bias(struct usba_udc *udc) + { +- unsigned int uckr = at91_pmc_read(AT91_CKGR_UCKR); +- +- at91_pmc_write(AT91_CKGR_UCKR, uckr & ~(AT91_PMC_BIASEN)); +- at91_pmc_write(AT91_CKGR_UCKR, uckr | AT91_PMC_BIASEN); ++ regmap_update_bits(udc->pmc, AT91_CKGR_UCKR, AT91_PMC_BIASEN, 0); ++ regmap_update_bits(udc->pmc, AT91_CKGR_UCKR, AT91_PMC_BIASEN, ++ AT91_PMC_BIASEN); + } + + static const struct usba_udc_errata at91sam9rl_errata = { +@@ -1939,6 +1936,9 @@ static struct usba_ep * atmel_udc_of_init(struct platform_device *pdev, + return ERR_PTR(-EINVAL); + + udc->errata = match->data; ++ udc->pmc = syscon_regmap_lookup_by_compatible("atmel,at91sam9g45-pmc"); ++ if (udc->errata && IS_ERR(udc->pmc)) ++ return ERR_CAST(udc->pmc); + + 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 { + struct dentry *debugfs_root; + struct dentry *debugfs_regs; + #endif ++ ++ struct regmap *pmc; + }; + + 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 @@ -40,6 +40,7 @@ #include <linux/ramfs.h> #include <linux/percpu-refcount.h> @@ -9083,7 +10036,7 @@ diff -Nur linux-4.1.26.orig/fs/aio.c linux-4.1.26/fs/aio.c #include <asm/kmap_types.h> #include <asm/uaccess.h> -@@ -115,7 +116,7 @@ +@@ -115,7 +116,7 @@ struct kioctx { struct page **ring_pages; long nr_pages; @@ -9092,7 +10045,7 @@ diff -Nur linux-4.1.26.orig/fs/aio.c linux-4.1.26/fs/aio.c /* * signals when all in-flight requests are done -@@ -253,6 +254,7 @@ +@@ -253,6 +254,7 @@ static int __init aio_setup(void) .mount = aio_mount, .kill_sb = kill_anon_super, }; @@ -9100,7 +10053,7 @@ diff -Nur linux-4.1.26.orig/fs/aio.c linux-4.1.26/fs/aio.c aio_mnt = kern_mount(&aio_fs); if (IS_ERR(aio_mnt)) panic("Failed to create aio fs mount."); -@@ -559,9 +561,9 @@ +@@ -559,9 +561,9 @@ static int kiocb_cancel(struct aio_kiocb *kiocb) return cancel(&kiocb->common); } @@ -9112,7 +10065,7 @@ diff -Nur linux-4.1.26.orig/fs/aio.c linux-4.1.26/fs/aio.c pr_debug("freeing %p\n", ctx); -@@ -580,8 +582,8 @@ +@@ -580,8 +582,8 @@ static void free_ioctx_reqs(struct percpu_ref *ref) if (ctx->rq_wait && atomic_dec_and_test(&ctx->rq_wait->count)) complete(&ctx->rq_wait->comp); @@ -9123,7 +10076,7 @@ diff -Nur linux-4.1.26.orig/fs/aio.c linux-4.1.26/fs/aio.c } /* -@@ -589,9 +591,9 @@ +@@ -589,9 +591,9 @@ static void free_ioctx_reqs(struct percpu_ref *ref) * 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. */ @@ -9135,7 +10088,7 @@ diff -Nur linux-4.1.26.orig/fs/aio.c linux-4.1.26/fs/aio.c struct aio_kiocb *req; spin_lock_irq(&ctx->ctx_lock); -@@ -610,6 +612,14 @@ +@@ -610,6 +612,14 @@ static void free_ioctx_users(struct percpu_ref *ref) percpu_ref_put(&ctx->reqs); } @@ -9150,9 +10103,10 @@ diff -Nur linux-4.1.26.orig/fs/aio.c linux-4.1.26/fs/aio.c static int ioctx_add_table(struct kioctx *ctx, struct mm_struct *mm) { unsigned i, new_nr; -diff -Nur linux-4.1.26.orig/fs/autofs4/autofs_i.h linux-4.1.26/fs/autofs4/autofs_i.h ---- linux-4.1.26.orig/fs/autofs4/autofs_i.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/fs/autofs4/autofs_i.h 2016-06-19 15:30:58.655296115 +0200 +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 @@ -34,6 +34,7 @@ #include <linux/sched.h> #include <linux/mount.h> @@ -9161,10 +10115,11 @@ diff -Nur linux-4.1.26.orig/fs/autofs4/autofs_i.h linux-4.1.26/fs/autofs4/autofs #include <asm/current.h> #include <asm/uaccess.h> -diff -Nur linux-4.1.26.orig/fs/autofs4/expire.c linux-4.1.26/fs/autofs4/expire.c ---- linux-4.1.26.orig/fs/autofs4/expire.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/fs/autofs4/expire.c 2016-06-19 15:30:58.655296115 +0200 -@@ -150,7 +150,7 @@ +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: parent = p->d_parent; if (!spin_trylock(&parent->d_lock)) { spin_unlock(&p->d_lock); @@ -9173,10 +10128,11 @@ diff -Nur linux-4.1.26.orig/fs/autofs4/expire.c linux-4.1.26/fs/autofs4/expire.c goto relock; } spin_unlock(&p->d_lock); -diff -Nur linux-4.1.26.orig/fs/buffer.c linux-4.1.26/fs/buffer.c ---- linux-4.1.26.orig/fs/buffer.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/fs/buffer.c 2016-06-19 15:30:58.655296115 +0200 -@@ -301,8 +301,7 @@ +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) * decide that the page is now completely done. */ first = page_buffers(page); @@ -9186,7 +10142,7 @@ diff -Nur linux-4.1.26.orig/fs/buffer.c linux-4.1.26/fs/buffer.c clear_buffer_async_read(bh); unlock_buffer(bh); tmp = bh; -@@ -315,8 +314,7 @@ +@@ -315,8 +314,7 @@ static void end_buffer_async_read(struct buffer_head *bh, int uptodate) } tmp = tmp->b_this_page; } while (tmp != bh); @@ -9196,7 +10152,7 @@ diff -Nur linux-4.1.26.orig/fs/buffer.c linux-4.1.26/fs/buffer.c /* * If none of the buffers had errors and they are all -@@ -328,9 +326,7 @@ +@@ -328,9 +326,7 @@ static void end_buffer_async_read(struct buffer_head *bh, int uptodate) return; still_busy: @@ -9207,7 +10163,7 @@ diff -Nur linux-4.1.26.orig/fs/buffer.c linux-4.1.26/fs/buffer.c } /* -@@ -358,8 +354,7 @@ +@@ -358,8 +354,7 @@ void end_buffer_async_write(struct buffer_head *bh, int uptodate) } first = page_buffers(page); @@ -9217,7 +10173,7 @@ diff -Nur linux-4.1.26.orig/fs/buffer.c linux-4.1.26/fs/buffer.c clear_buffer_async_write(bh); unlock_buffer(bh); -@@ -371,15 +366,12 @@ +@@ -371,15 +366,12 @@ void end_buffer_async_write(struct buffer_head *bh, int uptodate) } tmp = tmp->b_this_page; } @@ -9235,7 +10191,7 @@ diff -Nur linux-4.1.26.orig/fs/buffer.c linux-4.1.26/fs/buffer.c } EXPORT_SYMBOL(end_buffer_async_write); -@@ -3325,6 +3317,7 @@ +@@ -3325,6 +3317,7 @@ struct buffer_head *alloc_buffer_head(gfp_t gfp_flags) struct buffer_head *ret = kmem_cache_zalloc(bh_cachep, gfp_flags); if (ret) { INIT_LIST_HEAD(&ret->b_assoc_buffers); @@ -9243,9 +10199,10 @@ diff -Nur linux-4.1.26.orig/fs/buffer.c linux-4.1.26/fs/buffer.c preempt_disable(); __this_cpu_inc(bh_accounting.nr); recalc_bh_state(); -diff -Nur linux-4.1.26.orig/fs/dcache.c linux-4.1.26/fs/dcache.c ---- linux-4.1.26.orig/fs/dcache.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/fs/dcache.c 2016-06-19 15:30:58.655296115 +0200 +diff --git a/fs/dcache.c b/fs/dcache.c +index 660857431b1c..c790b2b070ab 100644 +--- a/fs/dcache.c ++++ b/fs/dcache.c @@ -19,6 +19,7 @@ #include <linux/mm.h> #include <linux/fs.h> @@ -9254,16 +10211,38 @@ diff -Nur linux-4.1.26.orig/fs/dcache.c linux-4.1.26/fs/dcache.c #include <linux/slab.h> #include <linux/init.h> #include <linux/hash.h> -@@ -578,7 +579,7 @@ +@@ -747,6 +748,8 @@ static inline bool fast_dput(struct dentry *dentry) + */ + void dput(struct dentry *dentry) + { ++ struct dentry *parent; ++ + if (unlikely(!dentry)) + return; - failed: - spin_unlock(&dentry->d_lock); -- cpu_relax(); -+ cpu_chill(); - return dentry; /* try again with same dentry */ - } +@@ -783,9 +786,18 @@ repeat: + return; -@@ -2388,7 +2389,7 @@ + kill_it: +- dentry = dentry_kill(dentry); +- if (dentry) { +- cond_resched(); ++ parent = dentry_kill(dentry); ++ if (parent) { ++ int r; ++ ++ if (parent == dentry) { ++ /* the task with the highest priority won't schedule */ ++ r = cond_resched(); ++ if (!r) ++ cpu_chill(); ++ } else { ++ dentry = parent; ++ } + goto repeat; + } + } +@@ -2391,7 +2403,7 @@ again: if (dentry->d_lockref.count == 1) { if (!spin_trylock(&inode->i_lock)) { spin_unlock(&dentry->d_lock); @@ -9272,10 +10251,11 @@ diff -Nur linux-4.1.26.orig/fs/dcache.c linux-4.1.26/fs/dcache.c goto again; } dentry->d_flags &= ~DCACHE_CANT_MOUNT; -diff -Nur linux-4.1.26.orig/fs/eventpoll.c linux-4.1.26/fs/eventpoll.c ---- linux-4.1.26.orig/fs/eventpoll.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/fs/eventpoll.c 2016-06-19 15:30:58.655296115 +0200 -@@ -505,12 +505,12 @@ +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) */ static void ep_poll_safewake(wait_queue_head_t *wq) { @@ -9290,10 +10270,11 @@ diff -Nur linux-4.1.26.orig/fs/eventpoll.c linux-4.1.26/fs/eventpoll.c } static void ep_remove_wait_queue(struct eppoll_entry *pwq) -diff -Nur linux-4.1.26.orig/fs/exec.c linux-4.1.26/fs/exec.c ---- linux-4.1.26.orig/fs/exec.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/fs/exec.c 2016-06-19 15:30:58.659296270 +0200 -@@ -859,12 +859,14 @@ +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) } } task_lock(tsk); @@ -9308,9 +10289,10 @@ diff -Nur linux-4.1.26.orig/fs/exec.c linux-4.1.26/fs/exec.c task_unlock(tsk); if (old_mm) { up_read(&old_mm->mmap_sem); -diff -Nur linux-4.1.26.orig/fs/f2fs/f2fs.h linux-4.1.26/fs/f2fs/f2fs.h ---- linux-4.1.26.orig/fs/f2fs/f2fs.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/fs/f2fs/f2fs.h 2016-06-19 15:30:58.659296270 +0200 +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 @@ -22,7 +22,6 @@ #ifdef CONFIG_F2FS_CHECK_FS @@ -9327,7 +10309,7 @@ diff -Nur linux-4.1.26.orig/fs/f2fs/f2fs.h linux-4.1.26/fs/f2fs/f2fs.h #endif /* -@@ -838,7 +836,7 @@ +@@ -838,7 +836,7 @@ static inline void f2fs_unlock_op(struct f2fs_sb_info *sbi) static inline void f2fs_lock_all(struct f2fs_sb_info *sbi) { @@ -9336,10 +10318,11 @@ diff -Nur linux-4.1.26.orig/fs/f2fs/f2fs.h linux-4.1.26/fs/f2fs/f2fs.h } static inline void f2fs_unlock_all(struct f2fs_sb_info *sbi) -diff -Nur linux-4.1.26.orig/fs/jbd/checkpoint.c linux-4.1.26/fs/jbd/checkpoint.c ---- linux-4.1.26.orig/fs/jbd/checkpoint.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/fs/jbd/checkpoint.c 2016-06-19 15:30:58.659296270 +0200 -@@ -129,6 +129,8 @@ +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) if (journal->j_flags & JFS_ABORT) return; spin_unlock(&journal->j_state_lock); @@ -9348,10 +10331,11 @@ diff -Nur linux-4.1.26.orig/fs/jbd/checkpoint.c linux-4.1.26/fs/jbd/checkpoint.c mutex_lock(&journal->j_checkpoint_mutex); /* -diff -Nur linux-4.1.26.orig/fs/jbd2/checkpoint.c linux-4.1.26/fs/jbd2/checkpoint.c ---- linux-4.1.26.orig/fs/jbd2/checkpoint.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/fs/jbd2/checkpoint.c 2016-06-19 15:30:58.659296270 +0200 -@@ -116,6 +116,8 @@ +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) nblocks = jbd2_space_needed(journal); while (jbd2_log_space_left(journal) < nblocks) { write_unlock(&journal->j_state_lock); @@ -9360,9 +10344,10 @@ diff -Nur linux-4.1.26.orig/fs/jbd2/checkpoint.c linux-4.1.26/fs/jbd2/checkpoint mutex_lock(&journal->j_checkpoint_mutex); /* -diff -Nur linux-4.1.26.orig/fs/namespace.c linux-4.1.26/fs/namespace.c ---- linux-4.1.26.orig/fs/namespace.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/fs/namespace.c 2016-06-19 15:30:58.659296270 +0200 +diff --git a/fs/namespace.c b/fs/namespace.c +index 556721fb0cf6..d27cd4633f59 100644 +--- a/fs/namespace.c ++++ b/fs/namespace.c @@ -14,6 +14,7 @@ #include <linux/mnt_namespace.h> #include <linux/user_namespace.h> @@ -9371,7 +10356,7 @@ diff -Nur linux-4.1.26.orig/fs/namespace.c linux-4.1.26/fs/namespace.c #include <linux/security.h> #include <linux/idr.h> #include <linux/init.h> /* init_rootfs */ -@@ -353,8 +354,11 @@ +@@ -353,8 +354,11 @@ int __mnt_want_write(struct vfsmount *m) * incremented count after it has set MNT_WRITE_HOLD. */ smp_mb(); @@ -9385,10 +10370,11 @@ diff -Nur linux-4.1.26.orig/fs/namespace.c linux-4.1.26/fs/namespace.c /* * 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 -Nur linux-4.1.26.orig/fs/ntfs/aops.c linux-4.1.26/fs/ntfs/aops.c ---- linux-4.1.26.orig/fs/ntfs/aops.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/fs/ntfs/aops.c 2016-06-19 15:30:58.659296270 +0200 -@@ -107,8 +107,7 @@ +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) "0x%llx.", (unsigned long long)bh->b_blocknr); } first = page_buffers(page); @@ -9398,7 +10384,7 @@ diff -Nur linux-4.1.26.orig/fs/ntfs/aops.c linux-4.1.26/fs/ntfs/aops.c clear_buffer_async_read(bh); unlock_buffer(bh); tmp = bh; -@@ -123,8 +122,7 @@ +@@ -123,8 +122,7 @@ static void ntfs_end_buffer_async_read(struct buffer_head *bh, int uptodate) } tmp = tmp->b_this_page; } while (tmp != bh); @@ -9408,7 +10394,7 @@ diff -Nur linux-4.1.26.orig/fs/ntfs/aops.c linux-4.1.26/fs/ntfs/aops.c /* * 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 @@ +@@ -145,13 +143,13 @@ static void ntfs_end_buffer_async_read(struct buffer_head *bh, int uptodate) recs = PAGE_CACHE_SIZE / rec_size; /* Should have been verified before we got here... */ BUG_ON(!recs); @@ -9424,7 +10410,7 @@ diff -Nur linux-4.1.26.orig/fs/ntfs/aops.c linux-4.1.26/fs/ntfs/aops.c flush_dcache_page(page); if (likely(page_uptodate && !PageError(page))) SetPageUptodate(page); -@@ -159,9 +157,7 @@ +@@ -159,9 +157,7 @@ static void ntfs_end_buffer_async_read(struct buffer_head *bh, int uptodate) unlock_page(page); return; still_busy: @@ -9435,10 +10421,11 @@ diff -Nur linux-4.1.26.orig/fs/ntfs/aops.c linux-4.1.26/fs/ntfs/aops.c } /** -diff -Nur linux-4.1.26.orig/fs/timerfd.c linux-4.1.26/fs/timerfd.c ---- linux-4.1.26.orig/fs/timerfd.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/fs/timerfd.c 2016-06-19 15:30:58.659296270 +0200 -@@ -450,7 +450,10 @@ +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, break; } spin_unlock_irq(&ctx->wqh.lock); @@ -9450,10 +10437,11 @@ diff -Nur linux-4.1.26.orig/fs/timerfd.c linux-4.1.26/fs/timerfd.c } /* -diff -Nur linux-4.1.26.orig/fs/xfs/xfs_inode.c linux-4.1.26/fs/xfs/xfs_inode.c ---- linux-4.1.26.orig/fs/xfs/xfs_inode.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/fs/xfs/xfs_inode.c 2016-06-19 15:30:58.659296270 +0200 -@@ -164,7 +164,7 @@ +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( (XFS_MMAPLOCK_SHARED | XFS_MMAPLOCK_EXCL)); ASSERT((lock_flags & (XFS_ILOCK_SHARED | XFS_ILOCK_EXCL)) != (XFS_ILOCK_SHARED | XFS_ILOCK_EXCL)); @@ -9462,7 +10450,7 @@ diff -Nur linux-4.1.26.orig/fs/xfs/xfs_inode.c linux-4.1.26/fs/xfs/xfs_inode.c if (lock_flags & XFS_IOLOCK_EXCL) mrupdate_nested(&ip->i_iolock, XFS_IOLOCK_DEP(lock_flags)); -@@ -212,7 +212,7 @@ +@@ -212,7 +212,7 @@ xfs_ilock_nowait( (XFS_MMAPLOCK_SHARED | XFS_MMAPLOCK_EXCL)); ASSERT((lock_flags & (XFS_ILOCK_SHARED | XFS_ILOCK_EXCL)) != (XFS_ILOCK_SHARED | XFS_ILOCK_EXCL)); @@ -9471,7 +10459,7 @@ diff -Nur linux-4.1.26.orig/fs/xfs/xfs_inode.c linux-4.1.26/fs/xfs/xfs_inode.c if (lock_flags & XFS_IOLOCK_EXCL) { if (!mrtryupdate(&ip->i_iolock)) -@@ -281,7 +281,7 @@ +@@ -281,7 +281,7 @@ xfs_iunlock( (XFS_MMAPLOCK_SHARED | XFS_MMAPLOCK_EXCL)); ASSERT((lock_flags & (XFS_ILOCK_SHARED | XFS_ILOCK_EXCL)) != (XFS_ILOCK_SHARED | XFS_ILOCK_EXCL)); @@ -9480,7 +10468,7 @@ diff -Nur linux-4.1.26.orig/fs/xfs/xfs_inode.c linux-4.1.26/fs/xfs/xfs_inode.c ASSERT(lock_flags != 0); if (lock_flags & XFS_IOLOCK_EXCL) -@@ -364,30 +364,38 @@ +@@ -364,30 +364,38 @@ int xfs_lock_delays; /* * Bump the subclass so xfs_lock_inodes() acquires each lock with a different @@ -9532,7 +10520,7 @@ diff -Nur linux-4.1.26.orig/fs/xfs/xfs_inode.c linux-4.1.26/fs/xfs/xfs_inode.c } /* -@@ -399,6 +407,11 @@ +@@ -399,6 +407,11 @@ xfs_lock_inumorder(int lock_mode, int subclass) * 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. @@ -9544,7 +10532,7 @@ diff -Nur linux-4.1.26.orig/fs/xfs/xfs_inode.c linux-4.1.26/fs/xfs/xfs_inode.c */ void xfs_lock_inodes( -@@ -409,8 +422,29 @@ +@@ -409,8 +422,29 @@ xfs_lock_inodes( int attempts = 0, i, j, try_lock; xfs_log_item_t *lp; @@ -9575,10 +10563,11 @@ diff -Nur linux-4.1.26.orig/fs/xfs/xfs_inode.c linux-4.1.26/fs/xfs/xfs_inode.c try_lock = 0; i = 0; -diff -Nur linux-4.1.26.orig/fs/xfs/xfs_inode.h linux-4.1.26/fs/xfs/xfs_inode.h ---- linux-4.1.26.orig/fs/xfs/xfs_inode.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/fs/xfs/xfs_inode.h 2016-06-19 15:30:58.659296270 +0200 -@@ -284,9 +284,9 @@ +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) * Flags for lockdep annotations. * * XFS_LOCK_PARENT - for directory operations that require locking a @@ -9591,7 +10580,7 @@ diff -Nur linux-4.1.26.orig/fs/xfs/xfs_inode.h linux-4.1.26/fs/xfs/xfs_inode.h * * 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 @@ +@@ -295,30 +295,63 @@ static inline int xfs_isiflocked(struct xfs_inode *ip) * 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. @@ -9641,22 +10630,29 @@ diff -Nur linux-4.1.26.orig/fs/xfs/xfs_inode.h linux-4.1.26/fs/xfs/xfs_inode.h - -#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) @@ -9666,18 +10662,15 @@ diff -Nur linux-4.1.26.orig/fs/xfs/xfs_inode.h linux-4.1.26/fs/xfs/xfs_inode.h +#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 -Nur linux-4.1.26.orig/include/acpi/platform/aclinux.h linux-4.1.26/include/acpi/platform/aclinux.h ---- linux-4.1.26.orig/include/acpi/platform/aclinux.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/acpi/platform/aclinux.h 2016-06-19 15:30:58.659296270 +0200 +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 @@ -123,6 +123,7 @@ #define acpi_cache_t struct kmem_cache @@ -9707,10 +10700,11 @@ diff -Nur linux-4.1.26.orig/include/acpi/platform/aclinux.h linux-4.1.26/include /* * OSL interfaces used by debugger/disassembler */ -diff -Nur linux-4.1.26.orig/include/asm-generic/bug.h linux-4.1.26/include/asm-generic/bug.h ---- linux-4.1.26.orig/include/asm-generic/bug.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/asm-generic/bug.h 2016-06-19 15:30:58.663296424 +0200 -@@ -206,6 +206,20 @@ +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); # define WARN_ON_SMP(x) ({0;}) #endif @@ -9731,9 +10725,10 @@ diff -Nur linux-4.1.26.orig/include/asm-generic/bug.h linux-4.1.26/include/asm-g #endif /* __ASSEMBLY__ */ #endif -diff -Nur linux-4.1.26.orig/include/asm-generic/futex.h linux-4.1.26/include/asm-generic/futex.h ---- linux-4.1.26.orig/include/asm-generic/futex.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/asm-generic/futex.h 2016-06-19 15:30:58.663296424 +0200 +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 @@ -8,8 +8,7 @@ #ifndef CONFIG_SMP /* @@ -9744,7 +10739,7 @@ diff -Nur linux-4.1.26.orig/include/asm-generic/futex.h linux-4.1.26/include/asm * */ -@@ -38,6 +37,7 @@ +@@ -38,6 +37,7 @@ futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr) if (encoded_op & (FUTEX_OP_OPARG_SHIFT << 28)) oparg = 1 << oparg; @@ -9752,7 +10747,7 @@ diff -Nur linux-4.1.26.orig/include/asm-generic/futex.h linux-4.1.26/include/asm pagefault_disable(); ret = -EFAULT; -@@ -72,6 +72,7 @@ +@@ -72,6 +72,7 @@ futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr) out_pagefault_enable: pagefault_enable(); @@ -9760,7 +10755,7 @@ diff -Nur linux-4.1.26.orig/include/asm-generic/futex.h linux-4.1.26/include/asm if (ret == 0) { switch (cmp) { -@@ -106,6 +107,7 @@ +@@ -106,6 +107,7 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, { u32 val; @@ -9768,7 +10763,7 @@ diff -Nur linux-4.1.26.orig/include/asm-generic/futex.h linux-4.1.26/include/asm if (unlikely(get_user(val, uaddr) != 0)) return -EFAULT; -@@ -113,6 +115,7 @@ +@@ -113,6 +115,7 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, return -EFAULT; *uval = val; @@ -9776,10 +10771,40 @@ diff -Nur linux-4.1.26.orig/include/asm-generic/futex.h linux-4.1.26/include/asm return 0; } -diff -Nur linux-4.1.26.orig/include/linux/blkdev.h linux-4.1.26/include/linux/blkdev.h ---- linux-4.1.26.orig/include/linux/blkdev.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/linux/blkdev.h 2016-06-19 15:30:58.663296424 +0200 -@@ -101,6 +101,7 @@ +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 +@@ -7,10 +7,10 @@ + + static __always_inline int preempt_count(void) + { +- return current_thread_info()->preempt_count; ++ return READ_ONCE(current_thread_info()->preempt_count); + } + +-static __always_inline int *preempt_count_ptr(void) ++static __always_inline volatile int *preempt_count_ptr(void) + { + 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 { struct list_head queuelist; union { struct call_single_data csd; @@ -9787,7 +10812,7 @@ diff -Nur linux-4.1.26.orig/include/linux/blkdev.h linux-4.1.26/include/linux/bl unsigned long fifo_time; }; -@@ -482,7 +483,7 @@ +@@ -482,7 +483,7 @@ struct request_queue { struct throtl_data *td; #endif struct rcu_head rcu_head; @@ -9796,20 +10821,10 @@ diff -Nur linux-4.1.26.orig/include/linux/blkdev.h linux-4.1.26/include/linux/bl struct percpu_ref mq_usage_counter; struct list_head all_q_node; -diff -Nur linux-4.1.26.orig/include/linux/blk-mq.h linux-4.1.26/include/linux/blk-mq.h ---- linux-4.1.26.orig/include/linux/blk-mq.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/linux/blk-mq.h 2016-06-19 15:30:58.663296424 +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.26.orig/include/linux/bottom_half.h linux-4.1.26/include/linux/bottom_half.h ---- linux-4.1.26.orig/include/linux/bottom_half.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/linux/bottom_half.h 2016-06-19 15:30:58.663296424 +0200 +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 @@ -4,6 +4,39 @@ #include <linux/preempt.h> #include <linux/preempt_mask.h> @@ -9850,17 +10865,18 @@ diff -Nur linux-4.1.26.orig/include/linux/bottom_half.h linux-4.1.26/include/lin #ifdef CONFIG_TRACE_IRQFLAGS extern void __local_bh_disable_ip(unsigned long ip, unsigned int cnt); #else -@@ -31,5 +64,6 @@ +@@ -31,5 +64,6 @@ static inline void local_bh_enable(void) { __local_bh_enable_ip(_THIS_IP_, SOFTIRQ_DISABLE_OFFSET); } +#endif #endif /* _LINUX_BH_H */ -diff -Nur linux-4.1.26.orig/include/linux/buffer_head.h linux-4.1.26/include/linux/buffer_head.h ---- linux-4.1.26.orig/include/linux/buffer_head.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/linux/buffer_head.h 2016-06-19 15:30:58.663296424 +0200 -@@ -75,8 +75,52 @@ +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 { struct address_space *b_assoc_map; /* mapping this buffer is associated with */ atomic_t b_count; /* users using this buffer_head */ @@ -9913,10 +10929,11 @@ diff -Nur linux-4.1.26.orig/include/linux/buffer_head.h linux-4.1.26/include/lin /* * macro tricks to expand the set_buffer_foo(), clear_buffer_foo() * and buffer_foo() functions. -diff -Nur linux-4.1.26.orig/include/linux/cgroup-defs.h linux-4.1.26/include/linux/cgroup-defs.h ---- linux-4.1.26.orig/include/linux/cgroup-defs.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/linux/cgroup-defs.h 2016-06-19 15:30:58.663296424 +0200 -@@ -124,6 +124,7 @@ +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 { /* percpu_ref killing and RCU release */ struct rcu_head rcu_head; struct work_struct destroy_work; @@ -9924,9 +10941,10 @@ diff -Nur linux-4.1.26.orig/include/linux/cgroup-defs.h linux-4.1.26/include/lin }; /* -diff -Nur linux-4.1.26.orig/include/linux/cgroup.h linux-4.1.26/include/linux/cgroup.h ---- linux-4.1.26.orig/include/linux/cgroup.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/linux/cgroup.h 2016-06-19 15:30:58.663296424 +0200 +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 @@ -17,6 +17,8 @@ #include <linux/fs.h> #include <linux/seq_file.h> @@ -9936,9 +10954,10 @@ diff -Nur linux-4.1.26.orig/include/linux/cgroup.h linux-4.1.26/include/linux/cg #include <linux/cgroup-defs.h> -diff -Nur linux-4.1.26.orig/include/linux/completion.h linux-4.1.26/include/linux/completion.h ---- linux-4.1.26.orig/include/linux/completion.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/linux/completion.h 2016-06-19 15:30:58.663296424 +0200 +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 @@ -7,8 +7,7 @@ * Atomic wait-for-completion handler data structures. * See kernel/sched/completion.c for details. @@ -9963,7 +10982,7 @@ diff -Nur linux-4.1.26.orig/include/linux/completion.h linux-4.1.26/include/linu #define COMPLETION_INITIALIZER_ONSTACK(work) \ ({ init_completion(&work); work; }) -@@ -73,7 +72,7 @@ +@@ -73,7 +72,7 @@ struct completion { static inline void init_completion(struct completion *x) { x->done = 0; @@ -9972,10 +10991,11 @@ diff -Nur linux-4.1.26.orig/include/linux/completion.h linux-4.1.26/include/linu } /** -diff -Nur linux-4.1.26.orig/include/linux/cpu.h linux-4.1.26/include/linux/cpu.h ---- linux-4.1.26.orig/include/linux/cpu.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/linux/cpu.h 2016-06-19 15:30:58.663296424 +0200 -@@ -231,6 +231,8 @@ +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); extern void put_online_cpus(void); extern void cpu_hotplug_disable(void); extern void cpu_hotplug_enable(void); @@ -9984,7 +11004,7 @@ diff -Nur linux-4.1.26.orig/include/linux/cpu.h linux-4.1.26/include/linux/cpu.h #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 @@ +@@ -249,6 +251,8 @@ static inline void cpu_hotplug_done(void) {} #define put_online_cpus() do { } while (0) #define cpu_hotplug_disable() do { } while (0) #define cpu_hotplug_enable() do { } while (0) @@ -9993,10 +11013,11 @@ diff -Nur linux-4.1.26.orig/include/linux/cpu.h linux-4.1.26/include/linux/cpu.h #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 -Nur linux-4.1.26.orig/include/linux/delay.h linux-4.1.26/include/linux/delay.h ---- linux-4.1.26.orig/include/linux/delay.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/linux/delay.h 2016-06-19 15:30:58.663296424 +0200 -@@ -52,4 +52,10 @@ +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) msleep(seconds * 1000); } @@ -10007,23 +11028,11 @@ diff -Nur linux-4.1.26.orig/include/linux/delay.h linux-4.1.26/include/linux/del +#endif + #endif /* defined(_LINUX_DELAY_H) */ -diff -Nur linux-4.1.26.orig/include/linux/ftrace_event.h linux-4.1.26/include/linux/ftrace_event.h ---- linux-4.1.26.orig/include/linux/ftrace_event.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/linux/ftrace_event.h 2016-06-19 15:30:58.663296424 +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.26.orig/include/linux/ftrace.h linux-4.1.26/include/linux/ftrace.h ---- linux-4.1.26.orig/include/linux/ftrace.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/linux/ftrace.h 2016-06-19 15:30:58.663296424 +0200 -@@ -682,6 +682,18 @@ +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) #define CALLER_ADDR5 ((unsigned long)ftrace_return_address(5)) #define CALLER_ADDR6 ((unsigned long)ftrace_return_address(6)) @@ -10042,9 +11051,24 @@ diff -Nur linux-4.1.26.orig/include/linux/ftrace.h linux-4.1.26/include/linux/ft #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 -Nur linux-4.1.26.orig/include/linux/highmem.h linux-4.1.26/include/linux/highmem.h ---- linux-4.1.26.orig/include/linux/highmem.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/linux/highmem.h 2016-06-19 15:30:58.663296424 +0200 +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 @@ -7,6 +7,7 @@ #include <linux/mm.h> #include <linux/uaccess.h> @@ -10053,7 +11077,7 @@ diff -Nur linux-4.1.26.orig/include/linux/highmem.h linux-4.1.26/include/linux/h #include <asm/cacheflush.h> -@@ -65,6 +66,7 @@ +@@ -65,6 +66,7 @@ static inline void kunmap(struct page *page) static inline void *kmap_atomic(struct page *page) { @@ -10061,7 +11085,7 @@ diff -Nur linux-4.1.26.orig/include/linux/highmem.h linux-4.1.26/include/linux/h pagefault_disable(); return page_address(page); } -@@ -73,6 +75,7 @@ +@@ -73,6 +75,7 @@ static inline void *kmap_atomic(struct page *page) static inline void __kunmap_atomic(void *addr) { pagefault_enable(); @@ -10069,7 +11093,7 @@ diff -Nur linux-4.1.26.orig/include/linux/highmem.h linux-4.1.26/include/linux/h } #define kmap_atomic_pfn(pfn) kmap_atomic(pfn_to_page(pfn)) -@@ -85,32 +88,51 @@ +@@ -85,32 +88,51 @@ static inline void __kunmap_atomic(void *addr) #if defined(CONFIG_HIGHMEM) || defined(CONFIG_X86_32) @@ -10125,10 +11149,11 @@ diff -Nur linux-4.1.26.orig/include/linux/highmem.h linux-4.1.26/include/linux/h #endif } -diff -Nur linux-4.1.26.orig/include/linux/hrtimer.h linux-4.1.26/include/linux/hrtimer.h ---- linux-4.1.26.orig/include/linux/hrtimer.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/linux/hrtimer.h 2016-06-19 15:30:58.663296424 +0200 -@@ -111,6 +111,11 @@ +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 { enum hrtimer_restart (*function)(struct hrtimer *); struct hrtimer_clock_base *base; unsigned long state; @@ -10140,7 +11165,7 @@ diff -Nur linux-4.1.26.orig/include/linux/hrtimer.h linux-4.1.26/include/linux/h #ifdef CONFIG_TIMER_STATS int start_pid; void *start_site; -@@ -147,6 +152,7 @@ +@@ -147,6 +152,7 @@ struct hrtimer_clock_base { int index; clockid_t clockid; struct timerqueue_head active; @@ -10148,7 +11173,7 @@ diff -Nur linux-4.1.26.orig/include/linux/hrtimer.h linux-4.1.26/include/linux/h ktime_t resolution; ktime_t (*get_time)(void); ktime_t softirq_time; -@@ -194,6 +200,9 @@ +@@ -194,6 +200,9 @@ struct hrtimer_cpu_base { unsigned long nr_hangs; ktime_t max_hang_time; #endif @@ -10158,7 +11183,7 @@ diff -Nur linux-4.1.26.orig/include/linux/hrtimer.h linux-4.1.26/include/linux/h struct hrtimer_clock_base clock_base[HRTIMER_MAX_CLOCK_BASES]; }; -@@ -381,6 +390,13 @@ +@@ -381,6 +390,13 @@ static inline int hrtimer_restart(struct hrtimer *timer) return hrtimer_start_expires(timer, HRTIMER_MODE_ABS); } @@ -10172,10 +11197,11 @@ diff -Nur linux-4.1.26.orig/include/linux/hrtimer.h linux-4.1.26/include/linux/h /* 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 -Nur linux-4.1.26.orig/include/linux/idr.h linux-4.1.26/include/linux/idr.h ---- linux-4.1.26.orig/include/linux/idr.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/linux/idr.h 2016-06-19 15:30:58.663296424 +0200 -@@ -95,10 +95,14 @@ +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); * Each idr_preload() should be matched with an invocation of this * function. See idr_preload() for details. */ @@ -10190,10 +11216,11 @@ diff -Nur linux-4.1.26.orig/include/linux/idr.h linux-4.1.26/include/linux/idr.h /** * idr_find - return pointer for given id -diff -Nur linux-4.1.26.orig/include/linux/init_task.h linux-4.1.26/include/linux/init_task.h ---- linux-4.1.26.orig/include/linux/init_task.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/linux/init_task.h 2016-06-19 15:30:58.667296578 +0200 -@@ -147,9 +147,16 @@ +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; # define INIT_PERF_EVENTS(tsk) #endif @@ -10211,7 +11238,7 @@ diff -Nur linux-4.1.26.orig/include/linux/init_task.h linux-4.1.26/include/linux .vtime_snap = 0, \ .vtime_snap_whence = VTIME_SYS, #else -@@ -238,6 +245,7 @@ +@@ -238,6 +245,7 @@ extern struct task_group root_task_group; .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 */ \ @@ -10219,9 +11246,10 @@ diff -Nur linux-4.1.26.orig/include/linux/init_task.h linux-4.1.26/include/linux .pids = { \ [PIDTYPE_PID] = INIT_PID_LINK(PIDTYPE_PID), \ [PIDTYPE_PGID] = INIT_PID_LINK(PIDTYPE_PGID), \ -diff -Nur linux-4.1.26.orig/include/linux/interrupt.h linux-4.1.26/include/linux/interrupt.h ---- linux-4.1.26.orig/include/linux/interrupt.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/linux/interrupt.h 2016-06-19 15:30:58.667296578 +0200 +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 @@ -61,6 +61,7 @@ * interrupt handler after suspending interrupts. For system * wakeup devices users need to implement wakeup detection in @@ -10238,7 +11266,7 @@ diff -Nur linux-4.1.26.orig/include/linux/interrupt.h linux-4.1.26/include/linux #define IRQF_TIMER (__IRQF_TIMER | IRQF_NO_SUSPEND | IRQF_NO_THREAD) -@@ -102,6 +104,7 @@ +@@ -102,6 +104,7 @@ typedef irqreturn_t (*irq_handler_t)(int, void *); * @flags: flags (see IRQF_* above) * @thread_fn: interrupt handler function for threaded interrupts * @thread: thread pointer for threaded interrupts @@ -10246,7 +11274,7 @@ diff -Nur linux-4.1.26.orig/include/linux/interrupt.h linux-4.1.26/include/linux * @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 @@ +@@ -113,6 +116,7 @@ struct irqaction { struct irqaction *next; irq_handler_t thread_fn; struct task_struct *thread; @@ -10254,7 +11282,7 @@ diff -Nur linux-4.1.26.orig/include/linux/interrupt.h linux-4.1.26/include/linux unsigned int irq; unsigned int flags; unsigned long thread_flags; -@@ -184,7 +188,7 @@ +@@ -184,7 +188,7 @@ extern void devm_free_irq(struct device *dev, unsigned int irq, void *dev_id); #ifdef CONFIG_LOCKDEP # define local_irq_enable_in_hardirq() do { } while (0) #else @@ -10263,7 +11291,7 @@ diff -Nur linux-4.1.26.orig/include/linux/interrupt.h linux-4.1.26/include/linux #endif extern void disable_irq_nosync(unsigned int irq); -@@ -215,6 +219,7 @@ +@@ -215,6 +219,7 @@ struct irq_affinity_notify { unsigned int irq; struct kref kref; struct work_struct work; @@ -10271,7 +11299,7 @@ diff -Nur linux-4.1.26.orig/include/linux/interrupt.h linux-4.1.26/include/linux void (*notify)(struct irq_affinity_notify *, const cpumask_t *mask); void (*release)(struct kref *ref); }; -@@ -377,9 +382,13 @@ +@@ -377,9 +382,13 @@ extern int irq_set_irqchip_state(unsigned int irq, enum irqchip_irq_state which, bool state); #ifdef CONFIG_IRQ_FORCED_THREADING @@ -10286,7 +11314,7 @@ diff -Nur linux-4.1.26.orig/include/linux/interrupt.h linux-4.1.26/include/linux #endif #ifndef __ARCH_SET_SOFTIRQ_PENDING -@@ -435,9 +444,10 @@ +@@ -435,9 +444,10 @@ struct softirq_action void (*action)(struct softirq_action *); }; @@ -10298,7 +11326,7 @@ diff -Nur linux-4.1.26.orig/include/linux/interrupt.h linux-4.1.26/include/linux #ifdef __ARCH_HAS_DO_SOFTIRQ void do_softirq_own_stack(void); #else -@@ -446,13 +456,25 @@ +@@ -446,13 +456,25 @@ static inline void do_softirq_own_stack(void) __do_softirq(); } #endif @@ -10324,7 +11352,7 @@ diff -Nur linux-4.1.26.orig/include/linux/interrupt.h linux-4.1.26/include/linux DECLARE_PER_CPU(struct task_struct *, ksoftirqd); -@@ -474,8 +496,9 @@ +@@ -474,8 +496,9 @@ static inline struct task_struct *this_cpu_ksoftirqd(void) 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. @@ -10336,7 +11364,7 @@ diff -Nur linux-4.1.26.orig/include/linux/interrupt.h linux-4.1.26/include/linux * 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 @@ +@@ -500,27 +523,36 @@ struct tasklet_struct name = { NULL, 0, ATOMIC_INIT(1), func, data } enum { TASKLET_STATE_SCHED, /* Tasklet is scheduled for execution */ @@ -10379,7 +11407,7 @@ diff -Nur linux-4.1.26.orig/include/linux/interrupt.h linux-4.1.26/include/linux #define tasklet_unlock_wait(t) do { } while (0) #define tasklet_unlock(t) do { } while (0) #endif -@@ -569,12 +601,7 @@ +@@ -569,12 +601,7 @@ static inline void tasklet_disable(struct tasklet_struct *t) smp_mb(); } @@ -10393,7 +11421,7 @@ diff -Nur linux-4.1.26.orig/include/linux/interrupt.h linux-4.1.26/include/linux 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 @@ +@@ -605,6 +632,12 @@ void tasklet_hrtimer_cancel(struct tasklet_hrtimer *ttimer) tasklet_kill(&ttimer->tasklet); } @@ -10406,10 +11434,11 @@ diff -Nur linux-4.1.26.orig/include/linux/interrupt.h linux-4.1.26/include/linux /* * Autoprobing for irqs: * -diff -Nur linux-4.1.26.orig/include/linux/io-mapping.h linux-4.1.26/include/linux/io-mapping.h ---- linux-4.1.26.orig/include/linux/io-mapping.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/linux/io-mapping.h 2016-06-19 15:30:58.667296578 +0200 -@@ -141,6 +141,7 @@ +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 * io_mapping_map_atomic_wc(struct io_mapping *mapping, unsigned long offset) { @@ -10417,7 +11446,7 @@ diff -Nur linux-4.1.26.orig/include/linux/io-mapping.h linux-4.1.26/include/linu pagefault_disable(); return ((char __force __iomem *) mapping) + offset; } -@@ -149,6 +150,7 @@ +@@ -149,6 +150,7 @@ static inline void io_mapping_unmap_atomic(void __iomem *vaddr) { pagefault_enable(); @@ -10425,10 +11454,62 @@ diff -Nur linux-4.1.26.orig/include/linux/io-mapping.h linux-4.1.26/include/linu } /* Non-atomic map/unmap */ -diff -Nur linux-4.1.26.orig/include/linux/irqdesc.h linux-4.1.26/include/linux/irqdesc.h ---- linux-4.1.26.orig/include/linux/irqdesc.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/linux/irqdesc.h 2016-06-19 15:30:58.667296578 +0200 -@@ -63,6 +63,7 @@ +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 { unsigned int irqs_unhandled; atomic_t threads_handled; int threads_handled_last; @@ -10436,9 +11517,10 @@ diff -Nur linux-4.1.26.orig/include/linux/irqdesc.h linux-4.1.26/include/linux/i raw_spinlock_t lock; struct cpumask *percpu_enabled; #ifdef CONFIG_SMP -diff -Nur linux-4.1.26.orig/include/linux/irqflags.h linux-4.1.26/include/linux/irqflags.h ---- linux-4.1.26.orig/include/linux/irqflags.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/linux/irqflags.h 2016-06-19 15:30:58.667296578 +0200 +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 @@ -25,8 +25,6 @@ # define trace_softirqs_enabled(p) ((p)->softirqs_enabled) # define trace_hardirq_enter() do { current->hardirq_context++; } while (0) @@ -10489,59 +11571,11 @@ diff -Nur linux-4.1.26.orig/include/linux/irqflags.h linux-4.1.26/include/linux/ +#endif + #endif -diff -Nur linux-4.1.26.orig/include/linux/irq.h linux-4.1.26/include/linux/irq.h ---- linux-4.1.26.orig/include/linux/irq.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/linux/irq.h 2016-06-19 15:30:58.667296578 +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.26.orig/include/linux/irq_work.h linux-4.1.26/include/linux/irq_work.h ---- linux-4.1.26.orig/include/linux/irq_work.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/linux/irq_work.h 2016-06-19 15:30:58.667296578 +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.26.orig/include/linux/jbd_common.h linux-4.1.26/include/linux/jbd_common.h ---- linux-4.1.26.orig/include/linux/jbd_common.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/linux/jbd_common.h 2016-06-19 15:30:58.667296578 +0200 -@@ -15,32 +15,56 @@ +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) static inline void jbd_lock_bh_state(struct buffer_head *bh) { @@ -10598,10 +11632,11 @@ diff -Nur linux-4.1.26.orig/include/linux/jbd_common.h linux-4.1.26/include/linu } #endif -diff -Nur linux-4.1.26.orig/include/linux/kdb.h linux-4.1.26/include/linux/kdb.h ---- linux-4.1.26.orig/include/linux/kdb.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/linux/kdb.h 2016-06-19 15:30:58.667296578 +0200 -@@ -167,6 +167,7 @@ +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, extern __printf(1, 2) int kdb_printf(const char *, ...); typedef __printf(1, 2) int (*kdb_printf_t)(const char *, ...); @@ -10609,7 +11644,7 @@ diff -Nur linux-4.1.26.orig/include/linux/kdb.h linux-4.1.26/include/linux/kdb.h extern void kdb_init(int level); /* Access to kdb specific polling devices */ -@@ -201,6 +202,7 @@ +@@ -201,6 +202,7 @@ extern int kdb_register_flags(char *, kdb_func_t, char *, char *, extern int kdb_unregister(char *); #else /* ! CONFIG_KGDB_KDB */ static inline __printf(1, 2) int kdb_printf(const char *fmt, ...) { return 0; } @@ -10617,10 +11652,11 @@ diff -Nur linux-4.1.26.orig/include/linux/kdb.h linux-4.1.26/include/linux/kdb.h 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 -Nur linux-4.1.26.orig/include/linux/kernel.h linux-4.1.26/include/linux/kernel.h ---- linux-4.1.26.orig/include/linux/kernel.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/linux/kernel.h 2016-06-19 15:30:58.667296578 +0200 -@@ -188,6 +188,9 @@ +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); */ # define might_sleep() \ do { __might_sleep(__FILE__, __LINE__, 0); might_resched(); } while (0) @@ -10630,7 +11666,7 @@ diff -Nur linux-4.1.26.orig/include/linux/kernel.h linux-4.1.26/include/linux/ke # define sched_annotate_sleep() (current->task_state_change = 0) #else static inline void ___might_sleep(const char *file, int line, -@@ -195,6 +198,7 @@ +@@ -195,6 +198,7 @@ extern int _cond_resched(void); static inline void __might_sleep(const char *file, int line, int preempt_offset) { } # define might_sleep() do { might_resched(); } while (0) @@ -10638,7 +11674,7 @@ diff -Nur linux-4.1.26.orig/include/linux/kernel.h linux-4.1.26/include/linux/ke # define sched_annotate_sleep() do { } while (0) #endif -@@ -244,7 +248,8 @@ +@@ -244,7 +248,8 @@ static inline u32 reciprocal_scale(u32 val, u32 ep_ro) #if defined(CONFIG_MMU) && \ (defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_DEBUG_ATOMIC_SLEEP)) @@ -10648,7 +11684,7 @@ diff -Nur linux-4.1.26.orig/include/linux/kernel.h linux-4.1.26/include/linux/ke #else static inline void might_fault(void) { } #endif -@@ -466,6 +471,7 @@ +@@ -466,6 +471,7 @@ extern enum system_states { SYSTEM_HALT, SYSTEM_POWER_OFF, SYSTEM_RESTART, @@ -10656,10 +11692,11 @@ diff -Nur linux-4.1.26.orig/include/linux/kernel.h linux-4.1.26/include/linux/ke } system_state; #define TAINT_PROPRIETARY_MODULE 0 -diff -Nur linux-4.1.26.orig/include/linux/kvm_host.h linux-4.1.26/include/linux/kvm_host.h ---- linux-4.1.26.orig/include/linux/kvm_host.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/linux/kvm_host.h 2016-06-19 15:30:58.667296578 +0200 -@@ -230,7 +230,7 @@ +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 { int fpu_active; int guest_fpu_loaded, guest_xcr0_loaded; @@ -10668,7 +11705,7 @@ diff -Nur linux-4.1.26.orig/include/linux/kvm_host.h linux-4.1.26/include/linux/ struct pid *pid; int sigset_active; sigset_t sigset; -@@ -701,7 +701,7 @@ +@@ -701,7 +701,7 @@ static inline bool kvm_arch_has_noncoherent_dma(struct kvm *kvm) } #endif @@ -10677,9 +11714,10 @@ diff -Nur linux-4.1.26.orig/include/linux/kvm_host.h linux-4.1.26/include/linux/ { #ifdef __KVM_HAVE_ARCH_WQP return vcpu->arch.wqp; -diff -Nur linux-4.1.26.orig/include/linux/lglock.h linux-4.1.26/include/linux/lglock.h ---- linux-4.1.26.orig/include/linux/lglock.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/linux/lglock.h 2016-06-19 15:30:58.667296578 +0200 +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 @@ -34,22 +34,39 @@ #endif @@ -10722,7 +11760,7 @@ diff -Nur linux-4.1.26.orig/include/linux/lglock.h linux-4.1.26/include/linux/lg void lg_lock_init(struct lglock *lg, char *name); void lg_local_lock(struct lglock *lg); -@@ -59,6 +76,12 @@ +@@ -59,6 +76,12 @@ void lg_local_unlock_cpu(struct lglock *lg, int cpu); void lg_global_lock(struct lglock *lg); void lg_global_unlock(struct lglock *lg); @@ -10735,9 +11773,10 @@ diff -Nur linux-4.1.26.orig/include/linux/lglock.h linux-4.1.26/include/linux/lg #else /* When !CONFIG_SMP, map lglock to spinlock */ #define lglock spinlock -diff -Nur linux-4.1.26.orig/include/linux/list_bl.h linux-4.1.26/include/linux/list_bl.h ---- linux-4.1.26.orig/include/linux/list_bl.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/linux/list_bl.h 2016-06-19 15:30:58.667296578 +0200 +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 @@ -2,6 +2,7 @@ #define _LINUX_LIST_BL_H @@ -10746,7 +11785,7 @@ diff -Nur linux-4.1.26.orig/include/linux/list_bl.h linux-4.1.26/include/linux/l #include <linux/bit_spinlock.h> /* -@@ -32,13 +33,22 @@ +@@ -32,13 +33,24 @@ struct hlist_bl_head { struct hlist_bl_node *first; @@ -10761,17 +11800,19 @@ diff -Nur linux-4.1.26.orig/include/linux/list_bl.h linux-4.1.26/include/linux/l -#define INIT_HLIST_BL_HEAD(ptr) \ - ((ptr)->first = NULL) + -+static inline void INIT_HLIST_BL_HEAD(struct hlist_bl_head *h) -+{ -+ h->first = NULL; +#ifdef CONFIG_PREEMPT_RT_BASE -+ raw_spin_lock_init(&h->lock); ++#define INIT_HLIST_BL_HEAD(h) \ ++do { \ ++ (h)->first = NULL; \ ++ raw_spin_lock_init(&(h)->lock); \ ++} while (0) ++#else ++#define INIT_HLIST_BL_HEAD(h) (h)->first = NULL +#endif -+} static inline void INIT_HLIST_BL_NODE(struct hlist_bl_node *h) { -@@ -117,12 +127,26 @@ +@@ -117,12 +129,26 @@ static inline void hlist_bl_del_init(struct hlist_bl_node *n) static inline void hlist_bl_lock(struct hlist_bl_head *b) { @@ -10798,10 +11839,12 @@ diff -Nur linux-4.1.26.orig/include/linux/list_bl.h linux-4.1.26/include/linux/l } static inline bool hlist_bl_is_locked(struct hlist_bl_head *b) -diff -Nur linux-4.1.26.orig/include/linux/locallock.h linux-4.1.26/include/linux/locallock.h ---- linux-4.1.26.orig/include/linux/locallock.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-4.1.26/include/linux/locallock.h 2016-06-19 15:30:58.667296578 +0200 -@@ -0,0 +1,270 @@ +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 +@@ -0,0 +1,276 @@ +#ifndef _LINUX_LOCALLOCK_H +#define _LINUX_LOCALLOCK_H + @@ -10870,6 +11913,9 @@ diff -Nur linux-4.1.26.orig/include/linux/locallock.h linux-4.1.26/include/linux +#define local_lock(lvar) \ + do { __local_lock(&get_local_var(lvar)); } while (0) + ++#define local_lock_on(lvar, cpu) \ ++ do { __local_lock(&per_cpu(lvar, cpu)); } while (0) ++ +static inline int __local_trylock(struct local_irq_lock *lv) +{ + if (lv->owner != current && spin_trylock_local(&lv->lock)) { @@ -10908,6 +11954,9 @@ diff -Nur linux-4.1.26.orig/include/linux/locallock.h linux-4.1.26/include/linux + put_local_var(lvar); \ + } while (0) + ++#define local_unlock_on(lvar, cpu) \ ++ do { __local_unlock(&per_cpu(lvar, cpu)); } while (0) ++ +static inline void __local_lock_irq(struct local_irq_lock *lv) +{ + spin_lock_irqsave(&lv->lock, lv->flags); @@ -11072,9 +12121,10 @@ diff -Nur linux-4.1.26.orig/include/linux/locallock.h linux-4.1.26/include/linux +#endif + +#endif -diff -Nur linux-4.1.26.orig/include/linux/mm_types.h linux-4.1.26/include/linux/mm_types.h ---- linux-4.1.26.orig/include/linux/mm_types.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/linux/mm_types.h 2016-06-19 15:30:58.667296578 +0200 +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 @@ -11,6 +11,7 @@ #include <linux/completion.h> #include <linux/cpumask.h> @@ -11083,7 +12133,7 @@ diff -Nur linux-4.1.26.orig/include/linux/mm_types.h linux-4.1.26/include/linux/ #include <linux/page-flags-layout.h> #include <asm/page.h> #include <asm/mmu.h> -@@ -453,6 +454,9 @@ +@@ -453,6 +454,9 @@ struct mm_struct { bool tlb_flush_pending; #endif struct uprobes_state uprobes_state; @@ -11093,9 +12143,10 @@ diff -Nur linux-4.1.26.orig/include/linux/mm_types.h linux-4.1.26/include/linux/ #ifdef CONFIG_X86_INTEL_MPX /* address of the bounds directory */ void __user *bd_addr; -diff -Nur linux-4.1.26.orig/include/linux/mutex.h linux-4.1.26/include/linux/mutex.h ---- linux-4.1.26.orig/include/linux/mutex.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/linux/mutex.h 2016-06-19 15:30:58.671296732 +0200 +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 @@ -19,6 +19,17 @@ #include <asm/processor.h> #include <linux/osq_lock.h> @@ -11114,7 +12165,7 @@ diff -Nur linux-4.1.26.orig/include/linux/mutex.h linux-4.1.26/include/linux/mut /* * Simple, straightforward mutexes with strict semantics: * -@@ -99,13 +110,6 @@ +@@ -99,13 +110,6 @@ do { \ static inline void mutex_destroy(struct mutex *lock) {} #endif @@ -11128,7 +12179,7 @@ diff -Nur linux-4.1.26.orig/include/linux/mutex.h linux-4.1.26/include/linux/mut #define __MUTEX_INITIALIZER(lockname) \ { .count = ATOMIC_INIT(1) \ , .wait_lock = __SPIN_LOCK_UNLOCKED(lockname.wait_lock) \ -@@ -173,6 +177,8 @@ +@@ -173,6 +177,8 @@ extern int __must_check mutex_lock_killable(struct mutex *lock); extern int mutex_trylock(struct mutex *lock); extern void mutex_unlock(struct mutex *lock); @@ -11137,9 +12188,11 @@ diff -Nur linux-4.1.26.orig/include/linux/mutex.h linux-4.1.26/include/linux/mut extern int atomic_dec_and_mutex_lock(atomic_t *cnt, struct mutex *lock); #endif /* __LINUX_MUTEX_H */ -diff -Nur linux-4.1.26.orig/include/linux/mutex_rt.h linux-4.1.26/include/linux/mutex_rt.h ---- linux-4.1.26.orig/include/linux/mutex_rt.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-4.1.26/include/linux/mutex_rt.h 2016-06-19 15:30:58.671296732 +0200 +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 @@ +#ifndef __LINUX_MUTEX_RT_H +#define __LINUX_MUTEX_RT_H @@ -11225,10 +12278,11 @@ diff -Nur linux-4.1.26.orig/include/linux/mutex_rt.h linux-4.1.26/include/linux/ +} while (0) + +#endif -diff -Nur linux-4.1.26.orig/include/linux/netdevice.h linux-4.1.26/include/linux/netdevice.h ---- linux-4.1.26.orig/include/linux/netdevice.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/linux/netdevice.h 2016-06-19 15:30:58.671296732 +0200 -@@ -2192,11 +2192,20 @@ +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); void synchronize_net(void); int init_dummy_netdev(struct net_device *dev); @@ -11249,7 +12303,7 @@ diff -Nur linux-4.1.26.orig/include/linux/netdevice.h linux-4.1.26/include/linux struct net_device *dev_get_by_index(struct net *net, int ifindex); struct net_device *__dev_get_by_index(struct net *net, int ifindex); -@@ -2469,6 +2478,7 @@ +@@ -2488,6 +2497,7 @@ struct softnet_data { unsigned int dropped; struct sk_buff_head input_pkt_queue; struct napi_struct backlog; @@ -11257,9 +12311,10 @@ diff -Nur linux-4.1.26.orig/include/linux/netdevice.h linux-4.1.26/include/linux }; -diff -Nur linux-4.1.26.orig/include/linux/netfilter/x_tables.h linux-4.1.26/include/linux/netfilter/x_tables.h ---- linux-4.1.26.orig/include/linux/netfilter/x_tables.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/linux/netfilter/x_tables.h 2016-06-19 15:30:58.671296732 +0200 +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 @@ -3,6 +3,7 @@ @@ -11268,7 +12323,7 @@ diff -Nur linux-4.1.26.orig/include/linux/netfilter/x_tables.h linux-4.1.26/incl #include <uapi/linux/netfilter/x_tables.h> /** -@@ -282,6 +283,8 @@ +@@ -293,6 +294,8 @@ void xt_free_table_info(struct xt_table_info *info); */ DECLARE_PER_CPU(seqcount_t, xt_recseq); @@ -11277,7 +12332,7 @@ diff -Nur linux-4.1.26.orig/include/linux/netfilter/x_tables.h linux-4.1.26/incl /** * xt_write_recseq_begin - start of a write section * -@@ -296,6 +299,9 @@ +@@ -307,6 +310,9 @@ static inline unsigned int xt_write_recseq_begin(void) { unsigned int addend; @@ -11287,7 +12342,7 @@ diff -Nur linux-4.1.26.orig/include/linux/netfilter/x_tables.h linux-4.1.26/incl /* * Low order bit of sequence is set if we already * called xt_write_recseq_begin(). -@@ -326,6 +332,7 @@ +@@ -337,6 +343,7 @@ static inline void xt_write_recseq_end(unsigned int addend) /* this is kind of a write_seqcount_end(), but addend is 0 or 1 */ smp_wmb(); __this_cpu_add(xt_recseq.sequence, addend); @@ -11295,9 +12350,10 @@ diff -Nur linux-4.1.26.orig/include/linux/netfilter/x_tables.h linux-4.1.26/incl } /* -diff -Nur linux-4.1.26.orig/include/linux/notifier.h linux-4.1.26/include/linux/notifier.h ---- linux-4.1.26.orig/include/linux/notifier.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/linux/notifier.h 2016-06-19 15:30:58.671296732 +0200 +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 @@ -6,7 +6,7 @@ * * Alan Cox <Alan.Cox@linux.org> @@ -11318,7 +12374,7 @@ diff -Nur linux-4.1.26.orig/include/linux/notifier.h linux-4.1.26/include/linux/ */ typedef int (*notifier_fn_t)(struct notifier_block *nb, -@@ -88,7 +86,7 @@ +@@ -88,7 +86,7 @@ struct srcu_notifier_head { (name)->head = NULL; \ } while (0) @@ -11327,7 +12383,7 @@ diff -Nur linux-4.1.26.orig/include/linux/notifier.h linux-4.1.26/include/linux/ 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 @@ +@@ -101,7 +99,13 @@ extern void srcu_init_notifier_head(struct srcu_notifier_head *nh); .head = NULL } #define RAW_NOTIFIER_INIT(name) { \ .head = NULL } @@ -11342,7 +12398,7 @@ diff -Nur linux-4.1.26.orig/include/linux/notifier.h linux-4.1.26/include/linux/ #define ATOMIC_NOTIFIER_HEAD(name) \ struct atomic_notifier_head name = \ -@@ -113,6 +117,18 @@ +@@ -113,6 +117,18 @@ extern void srcu_init_notifier_head(struct srcu_notifier_head *nh); struct raw_notifier_head name = \ RAW_NOTIFIER_INIT(name) @@ -11361,7 +12417,7 @@ diff -Nur linux-4.1.26.orig/include/linux/notifier.h linux-4.1.26/include/linux/ #ifdef __KERNEL__ extern int atomic_notifier_chain_register(struct atomic_notifier_head *nh, -@@ -182,12 +198,12 @@ +@@ -182,12 +198,12 @@ static inline int notifier_to_errno(int ret) /* * Declared notifiers so far. I can imagine quite a few more chains @@ -11377,9 +12433,10 @@ diff -Nur linux-4.1.26.orig/include/linux/notifier.h linux-4.1.26/include/linux/ /* CPU notfiers are defined in include/linux/cpu.h. */ /* netdevice notifiers are defined in include/linux/netdevice.h */ -diff -Nur linux-4.1.26.orig/include/linux/percpu.h linux-4.1.26/include/linux/percpu.h ---- linux-4.1.26.orig/include/linux/percpu.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/linux/percpu.h 2016-06-19 15:30:58.671296732 +0200 +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 @@ -24,6 +24,35 @@ PERCPU_MODULE_RESERVE) #endif @@ -11416,9 +12473,10 @@ diff -Nur linux-4.1.26.orig/include/linux/percpu.h linux-4.1.26/include/linux/pe /* minimum unit size, also is the maximum supported allocation size */ #define PCPU_MIN_UNIT_SIZE PFN_ALIGN(32 << 10) -diff -Nur linux-4.1.26.orig/include/linux/pid.h linux-4.1.26/include/linux/pid.h ---- linux-4.1.26.orig/include/linux/pid.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/linux/pid.h 2016-06-19 15:30:58.671296732 +0200 +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 @@ -2,6 +2,7 @@ #define _LINUX_PID_H @@ -11427,10 +12485,11 @@ diff -Nur linux-4.1.26.orig/include/linux/pid.h linux-4.1.26/include/linux/pid.h enum pid_type { -diff -Nur linux-4.1.26.orig/include/linux/platform_data/gpio-omap.h linux-4.1.26/include/linux/platform_data/gpio-omap.h ---- linux-4.1.26.orig/include/linux/platform_data/gpio-omap.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/linux/platform_data/gpio-omap.h 2016-06-19 15:30:58.671296732 +0200 -@@ -198,7 +198,6 @@ +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 { 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 */ @@ -11438,7 +12497,7 @@ diff -Nur linux-4.1.26.orig/include/linux/platform_data/gpio-omap.h linux-4.1.26 bool is_mpuio; /* whether the bank is of type MPUIO */ u32 non_wakeup_gpios; -@@ -208,9 +207,17 @@ +@@ -208,9 +207,17 @@ struct omap_gpio_platform_data { int (*get_context_loss_count)(struct device *dev); }; @@ -11458,10 +12517,11 @@ diff -Nur linux-4.1.26.orig/include/linux/platform_data/gpio-omap.h linux-4.1.26 +#endif #endif -diff -Nur linux-4.1.26.orig/include/linux/preempt.h linux-4.1.26/include/linux/preempt.h ---- linux-4.1.26.orig/include/linux/preempt.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/linux/preempt.h 2016-06-19 15:30:58.671296732 +0200 -@@ -34,6 +34,20 @@ +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); #define preempt_count_inc() preempt_count_add(1) #define preempt_count_dec() preempt_count_sub(1) @@ -11482,7 +12542,7 @@ diff -Nur linux-4.1.26.orig/include/linux/preempt.h linux-4.1.26/include/linux/p #ifdef CONFIG_PREEMPT_COUNT #define preempt_disable() \ -@@ -42,13 +56,25 @@ +@@ -42,13 +56,25 @@ do { \ barrier(); \ } while (0) @@ -11509,7 +12569,7 @@ diff -Nur linux-4.1.26.orig/include/linux/preempt.h linux-4.1.26/include/linux/p #ifdef CONFIG_PREEMPT #define preempt_enable() \ -@@ -64,6 +90,13 @@ +@@ -64,6 +90,13 @@ do { \ __preempt_schedule(); \ } while (0) @@ -11523,7 +12583,7 @@ diff -Nur linux-4.1.26.orig/include/linux/preempt.h linux-4.1.26/include/linux/p #else #define preempt_enable() \ do { \ -@@ -122,6 +155,7 @@ +@@ -122,6 +155,7 @@ do { \ #define preempt_disable_notrace() barrier() #define preempt_enable_no_resched_notrace() barrier() #define preempt_enable_notrace() barrier() @@ -11531,7 +12591,7 @@ diff -Nur linux-4.1.26.orig/include/linux/preempt.h linux-4.1.26/include/linux/p #endif /* CONFIG_PREEMPT_COUNT */ -@@ -141,10 +175,31 @@ +@@ -141,10 +175,31 @@ do { \ } while (0) #define preempt_fold_need_resched() \ do { \ @@ -11564,9 +12624,10 @@ diff -Nur linux-4.1.26.orig/include/linux/preempt.h linux-4.1.26/include/linux/p #ifdef CONFIG_PREEMPT_NOTIFIERS struct preempt_notifier; -diff -Nur linux-4.1.26.orig/include/linux/preempt_mask.h linux-4.1.26/include/linux/preempt_mask.h ---- linux-4.1.26.orig/include/linux/preempt_mask.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/linux/preempt_mask.h 2016-06-19 15:30:58.671296732 +0200 +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 @@ -44,16 +44,26 @@ #define HARDIRQ_OFFSET (1UL << HARDIRQ_SHIFT) #define NMI_OFFSET (1UL << NMI_SHIFT) @@ -11616,10 +12677,11 @@ diff -Nur linux-4.1.26.orig/include/linux/preempt_mask.h linux-4.1.26/include/li /* * The preempt_count offset needed for things like: -diff -Nur linux-4.1.26.orig/include/linux/printk.h linux-4.1.26/include/linux/printk.h ---- linux-4.1.26.orig/include/linux/printk.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/linux/printk.h 2016-06-19 15:30:58.671296732 +0200 -@@ -115,9 +115,11 @@ +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, ...) #ifdef CONFIG_EARLY_PRINTK extern asmlinkage __printf(1, 2) void early_printk(const char *fmt, ...); @@ -11631,10 +12693,11 @@ diff -Nur linux-4.1.26.orig/include/linux/printk.h linux-4.1.26/include/linux/pr #endif typedef int(*printk_func_t)(const char *fmt, va_list args); -diff -Nur linux-4.1.26.orig/include/linux/radix-tree.h linux-4.1.26/include/linux/radix-tree.h ---- linux-4.1.26.orig/include/linux/radix-tree.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/linux/radix-tree.h 2016-06-19 15:30:58.671296732 +0200 -@@ -277,8 +277,13 @@ +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, unsigned long first_index, unsigned int max_items); @@ -11648,7 +12711,7 @@ diff -Nur linux-4.1.26.orig/include/linux/radix-tree.h linux-4.1.26/include/linu 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 @@ +@@ -303,7 +308,7 @@ unsigned long radix_tree_locate_item(struct radix_tree_root *root, void *item); static inline void radix_tree_preload_end(void) { @@ -11657,9 +12720,10 @@ diff -Nur linux-4.1.26.orig/include/linux/radix-tree.h linux-4.1.26/include/linu } /** -diff -Nur linux-4.1.26.orig/include/linux/random.h linux-4.1.26/include/linux/random.h ---- linux-4.1.26.orig/include/linux/random.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/linux/random.h 2016-06-19 15:30:58.671296732 +0200 +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 @@ -11,7 +11,7 @@ extern void add_device_randomness(const void *, unsigned int); extern void add_input_randomness(unsigned int type, unsigned int code, @@ -11669,10 +12733,11 @@ diff -Nur linux-4.1.26.orig/include/linux/random.h linux-4.1.26/include/linux/ra extern void get_random_bytes(void *buf, int nbytes); extern void get_random_bytes_arch(void *buf, int nbytes); -diff -Nur linux-4.1.26.orig/include/linux/rcupdate.h linux-4.1.26/include/linux/rcupdate.h ---- linux-4.1.26.orig/include/linux/rcupdate.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/linux/rcupdate.h 2016-06-19 15:30:58.671296732 +0200 -@@ -167,6 +167,9 @@ +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, #endif /* #else #ifdef CONFIG_PREEMPT_RCU */ @@ -11682,7 +12747,7 @@ diff -Nur linux-4.1.26.orig/include/linux/rcupdate.h linux-4.1.26/include/linux/ /** * 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 @@ +@@ -190,6 +193,7 @@ void call_rcu(struct rcu_head *head, */ void call_rcu_bh(struct rcu_head *head, void (*func)(struct rcu_head *head)); @@ -11690,7 +12755,7 @@ diff -Nur linux-4.1.26.orig/include/linux/rcupdate.h linux-4.1.26/include/linux/ /** * call_rcu_sched() - Queue an RCU for invocation after sched grace period. -@@ -260,6 +264,11 @@ +@@ -260,6 +264,11 @@ void synchronize_rcu(void); * types of kernel builds, the rcu_read_lock() nesting depth is unknowable. */ #define rcu_preempt_depth() (current->rcu_read_lock_nesting) @@ -11702,7 +12767,7 @@ diff -Nur linux-4.1.26.orig/include/linux/rcupdate.h linux-4.1.26/include/linux/ #else /* #ifdef CONFIG_PREEMPT_RCU */ -@@ -283,6 +292,8 @@ +@@ -283,6 +292,8 @@ static inline int rcu_preempt_depth(void) return 0; } @@ -11711,7 +12776,7 @@ diff -Nur linux-4.1.26.orig/include/linux/rcupdate.h linux-4.1.26/include/linux/ #endif /* #else #ifdef CONFIG_PREEMPT_RCU */ /* Internal to kernel */ -@@ -463,7 +474,14 @@ +@@ -463,7 +474,14 @@ extern struct lockdep_map rcu_callback_map; int debug_lockdep_rcu_enabled(void); int rcu_read_lock_held(void); @@ -11726,7 +12791,7 @@ diff -Nur linux-4.1.26.orig/include/linux/rcupdate.h linux-4.1.26/include/linux/ /** * rcu_read_lock_sched_held() - might we be in RCU-sched read-side critical section? -@@ -990,10 +1008,14 @@ +@@ -990,10 +1008,14 @@ static inline void rcu_read_unlock(void) static inline void rcu_read_lock_bh(void) { local_bh_disable(); @@ -11741,7 +12806,7 @@ diff -Nur linux-4.1.26.orig/include/linux/rcupdate.h linux-4.1.26/include/linux/ } /* -@@ -1003,10 +1025,14 @@ +@@ -1003,10 +1025,14 @@ static inline void rcu_read_lock_bh(void) */ static inline void rcu_read_unlock_bh(void) { @@ -11756,10 +12821,11 @@ diff -Nur linux-4.1.26.orig/include/linux/rcupdate.h linux-4.1.26/include/linux/ local_bh_enable(); } -diff -Nur linux-4.1.26.orig/include/linux/rcutree.h linux-4.1.26/include/linux/rcutree.h ---- linux-4.1.26.orig/include/linux/rcutree.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/linux/rcutree.h 2016-06-19 15:30:58.671296732 +0200 -@@ -46,7 +46,11 @@ +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) rcu_note_context_switch(); } @@ -11771,7 +12837,7 @@ diff -Nur linux-4.1.26.orig/include/linux/rcutree.h linux-4.1.26/include/linux/r void synchronize_sched_expedited(void); void synchronize_rcu_expedited(void); -@@ -74,7 +78,11 @@ +@@ -74,7 +78,11 @@ static inline void synchronize_rcu_bh_expedited(void) } void rcu_barrier(void); @@ -11783,7 +12849,7 @@ diff -Nur linux-4.1.26.orig/include/linux/rcutree.h linux-4.1.26/include/linux/r void rcu_barrier_sched(void); unsigned long get_state_synchronize_rcu(void); void cond_synchronize_rcu(unsigned long oldstate); -@@ -85,12 +93,10 @@ +@@ -85,12 +93,10 @@ unsigned long rcu_batches_started(void); unsigned long rcu_batches_started_bh(void); unsigned long rcu_batches_started_sched(void); unsigned long rcu_batches_completed(void); @@ -11796,7 +12862,7 @@ diff -Nur linux-4.1.26.orig/include/linux/rcutree.h linux-4.1.26/include/linux/r void rcu_sched_force_quiescent_state(void); void exit_rcu(void); -@@ -100,6 +106,14 @@ +@@ -100,6 +106,14 @@ extern int rcu_scheduler_active __read_mostly; bool rcu_is_watching(void); @@ -11811,9 +12877,10 @@ diff -Nur linux-4.1.26.orig/include/linux/rcutree.h linux-4.1.26/include/linux/r void rcu_all_qs(void); #endif /* __LINUX_RCUTREE_H */ -diff -Nur linux-4.1.26.orig/include/linux/rtmutex.h linux-4.1.26/include/linux/rtmutex.h ---- linux-4.1.26.orig/include/linux/rtmutex.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/linux/rtmutex.h 2016-06-19 15:30:58.675296887 +0200 +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 @@ -14,10 +14,14 @@ #include <linux/linkage.h> @@ -11830,7 +12897,7 @@ diff -Nur linux-4.1.26.orig/include/linux/rtmutex.h linux-4.1.26/include/linux/r /** * The rt_mutex structure * -@@ -31,8 +35,8 @@ +@@ -31,8 +35,8 @@ struct rt_mutex { struct rb_root waiters; struct rb_node *waiters_leftmost; struct task_struct *owner; @@ -11840,7 +12907,7 @@ diff -Nur linux-4.1.26.orig/include/linux/rtmutex.h linux-4.1.26/include/linux/r const char *name, *file; int line; void *magic; -@@ -55,22 +59,33 @@ +@@ -55,22 +59,33 @@ struct hrtimer_sleeper; # define rt_mutex_debug_check_no_locks_held(task) do { } while (0) #endif @@ -11879,7 +12946,7 @@ diff -Nur linux-4.1.26.orig/include/linux/rtmutex.h linux-4.1.26/include/linux/r #define DEFINE_RT_MUTEX(mutexname) \ struct rt_mutex mutexname = __RT_MUTEX_INITIALIZER(mutexname) -@@ -91,6 +106,7 @@ +@@ -91,6 +106,7 @@ extern void rt_mutex_destroy(struct rt_mutex *lock); extern void rt_mutex_lock(struct rt_mutex *lock); extern int rt_mutex_lock_interruptible(struct rt_mutex *lock); @@ -11887,9 +12954,11 @@ diff -Nur linux-4.1.26.orig/include/linux/rtmutex.h linux-4.1.26/include/linux/r extern int rt_mutex_timed_lock(struct rt_mutex *lock, struct hrtimer_sleeper *timeout); -diff -Nur linux-4.1.26.orig/include/linux/rwlock_rt.h linux-4.1.26/include/linux/rwlock_rt.h ---- linux-4.1.26.orig/include/linux/rwlock_rt.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-4.1.26/include/linux/rwlock_rt.h 2016-06-19 15:30:58.675296887 +0200 +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 @@ -0,0 +1,99 @@ +#ifndef __LINUX_RWLOCK_RT_H +#define __LINUX_RWLOCK_RT_H @@ -11990,9 +13059,10 @@ diff -Nur linux-4.1.26.orig/include/linux/rwlock_rt.h linux-4.1.26/include/linux + } while (0) + +#endif -diff -Nur linux-4.1.26.orig/include/linux/rwlock_types.h linux-4.1.26/include/linux/rwlock_types.h ---- linux-4.1.26.orig/include/linux/rwlock_types.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/linux/rwlock_types.h 2016-06-19 15:30:58.675296887 +0200 +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 @@ -1,6 +1,10 @@ #ifndef __LINUX_RWLOCK_TYPES_H #define __LINUX_RWLOCK_TYPES_H @@ -12004,7 +13074,7 @@ diff -Nur linux-4.1.26.orig/include/linux/rwlock_types.h linux-4.1.26/include/li /* * include/linux/rwlock_types.h - generic rwlock type definitions * and initializers -@@ -43,6 +47,7 @@ +@@ -43,6 +47,7 @@ typedef struct { RW_DEP_MAP_INIT(lockname) } #endif @@ -12013,9 +13083,11 @@ diff -Nur linux-4.1.26.orig/include/linux/rwlock_types.h linux-4.1.26/include/li + rwlock_t name __cacheline_aligned_in_smp = __RW_LOCK_UNLOCKED(name) #endif /* __LINUX_RWLOCK_TYPES_H */ -diff -Nur linux-4.1.26.orig/include/linux/rwlock_types_rt.h linux-4.1.26/include/linux/rwlock_types_rt.h ---- linux-4.1.26.orig/include/linux/rwlock_types_rt.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-4.1.26/include/linux/rwlock_types_rt.h 2016-06-19 15:30:58.675296887 +0200 +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 @@ -0,0 +1,33 @@ +#ifndef __LINUX_RWLOCK_TYPES_RT_H +#define __LINUX_RWLOCK_TYPES_RT_H @@ -12050,9 +13122,10 @@ diff -Nur linux-4.1.26.orig/include/linux/rwlock_types_rt.h linux-4.1.26/include + rwlock_t name __cacheline_aligned_in_smp = __RW_LOCK_UNLOCKED(name) + +#endif -diff -Nur linux-4.1.26.orig/include/linux/rwsem.h linux-4.1.26/include/linux/rwsem.h ---- linux-4.1.26.orig/include/linux/rwsem.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/linux/rwsem.h 2016-06-19 15:30:58.675296887 +0200 +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 @@ -18,6 +18,10 @@ #include <linux/osq_lock.h> #endif @@ -12064,16 +13137,18 @@ diff -Nur linux-4.1.26.orig/include/linux/rwsem.h linux-4.1.26/include/linux/rws struct rw_semaphore; #ifdef CONFIG_RWSEM_GENERIC_SPINLOCK -@@ -177,4 +181,6 @@ +@@ -177,4 +181,6 @@ extern void up_read_non_owner(struct rw_semaphore *sem); # define up_read_non_owner(sem) up_read(sem) #endif +#endif /* !PREEMPT_RT_FULL */ + #endif /* _LINUX_RWSEM_H */ -diff -Nur linux-4.1.26.orig/include/linux/rwsem_rt.h linux-4.1.26/include/linux/rwsem_rt.h ---- linux-4.1.26.orig/include/linux/rwsem_rt.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-4.1.26/include/linux/rwsem_rt.h 2016-06-19 15:30:58.675296887 +0200 +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 @@ -0,0 +1,140 @@ +#ifndef _LINUX_RWSEM_RT_H +#define _LINUX_RWSEM_RT_H @@ -12215,10 +13290,11 @@ diff -Nur linux-4.1.26.orig/include/linux/rwsem_rt.h linux-4.1.26/include/linux/ +} +#endif +#endif -diff -Nur linux-4.1.26.orig/include/linux/sched.h linux-4.1.26/include/linux/sched.h ---- linux-4.1.26.orig/include/linux/sched.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/linux/sched.h 2016-06-19 15:30:58.675296887 +0200 -@@ -26,6 +26,7 @@ +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 { #include <linux/nodemask.h> #include <linux/mm_types.h> #include <linux/preempt_mask.h> @@ -12226,7 +13302,7 @@ diff -Nur linux-4.1.26.orig/include/linux/sched.h linux-4.1.26/include/linux/sch #include <asm/page.h> #include <asm/ptrace.h> -@@ -175,8 +176,6 @@ +@@ -175,8 +176,6 @@ extern void get_iowait_load(unsigned long *nr_waiters, unsigned long *load); extern void calc_global_load(unsigned long ticks); extern void update_cpu_load_nohz(void); @@ -12235,7 +13311,7 @@ diff -Nur linux-4.1.26.orig/include/linux/sched.h linux-4.1.26/include/linux/sch extern void dump_cpu_task(int cpu); struct seq_file; -@@ -234,10 +233,7 @@ +@@ -234,10 +233,7 @@ extern char ___assert_task_state[1 - 2*!!( TASK_UNINTERRUPTIBLE | __TASK_STOPPED | \ __TASK_TRACED | EXIT_ZOMBIE | EXIT_DEAD) @@ -12246,7 +13322,7 @@ diff -Nur linux-4.1.26.orig/include/linux/sched.h linux-4.1.26/include/linux/sch #define task_contributes_to_load(task) \ ((task->state & TASK_UNINTERRUPTIBLE) != 0 && \ (task->flags & PF_FROZEN) == 0) -@@ -302,6 +298,11 @@ +@@ -302,6 +298,11 @@ extern char ___assert_task_state[1 - 2*!!( #endif @@ -12258,7 +13334,7 @@ diff -Nur linux-4.1.26.orig/include/linux/sched.h linux-4.1.26/include/linux/sch /* Task command name length */ #define TASK_COMM_LEN 16 -@@ -901,6 +902,50 @@ +@@ -902,6 +903,50 @@ enum cpu_idle_type { #define SCHED_CAPACITY_SCALE (1L << SCHED_CAPACITY_SHIFT) /* @@ -12309,7 +13385,7 @@ diff -Nur linux-4.1.26.orig/include/linux/sched.h linux-4.1.26/include/linux/sch * sched-domains (multiprocessor balancing) declarations: */ #ifdef CONFIG_SMP -@@ -1292,6 +1337,7 @@ +@@ -1293,6 +1338,7 @@ enum perf_event_task_context { struct task_struct { volatile long state; /* -1 unrunnable, 0 runnable, >0 stopped */ @@ -12317,7 +13393,7 @@ diff -Nur linux-4.1.26.orig/include/linux/sched.h linux-4.1.26/include/linux/sch void *stack; atomic_t usage; unsigned int flags; /* per process flags, defined below */ -@@ -1328,6 +1374,12 @@ +@@ -1329,6 +1375,12 @@ struct task_struct { #endif unsigned int policy; @@ -12330,7 +13406,7 @@ diff -Nur linux-4.1.26.orig/include/linux/sched.h linux-4.1.26/include/linux/sch int nr_cpus_allowed; cpumask_t cpus_allowed; -@@ -1435,7 +1487,8 @@ +@@ -1436,7 +1488,8 @@ struct task_struct { struct cputime prev_cputime; #endif #ifdef CONFIG_VIRT_CPU_ACCOUNTING_GEN @@ -12340,7 +13416,7 @@ diff -Nur linux-4.1.26.orig/include/linux/sched.h linux-4.1.26/include/linux/sch unsigned long long vtime_snap; enum { VTIME_SLEEPING = 0, -@@ -1451,6 +1504,9 @@ +@@ -1452,6 +1505,9 @@ struct task_struct { struct task_cputime cputime_expires; struct list_head cpu_timers[3]; @@ -12350,7 +13426,7 @@ diff -Nur linux-4.1.26.orig/include/linux/sched.h linux-4.1.26/include/linux/sch /* process credentials */ const struct cred __rcu *real_cred; /* objective and real subjective task -@@ -1483,10 +1539,15 @@ +@@ -1484,10 +1540,15 @@ struct task_struct { /* signal handlers */ struct signal_struct *signal; struct sighand_struct *sighand; @@ -12366,7 +13442,7 @@ diff -Nur linux-4.1.26.orig/include/linux/sched.h linux-4.1.26/include/linux/sch unsigned long sas_ss_sp; size_t sas_ss_size; -@@ -1512,6 +1573,8 @@ +@@ -1513,6 +1574,8 @@ struct task_struct { /* Protection of the PI data structures: */ raw_spinlock_t pi_lock; @@ -12375,7 +13451,7 @@ diff -Nur linux-4.1.26.orig/include/linux/sched.h linux-4.1.26/include/linux/sch #ifdef CONFIG_RT_MUTEXES /* PI waiters blocked on a rt_mutex held by this task */ struct rb_root pi_waiters; -@@ -1706,6 +1769,12 @@ +@@ -1707,6 +1770,12 @@ struct task_struct { unsigned long trace; /* bitmask and counter of trace recursion */ unsigned long trace_recursion; @@ -12388,7 +13464,7 @@ diff -Nur linux-4.1.26.orig/include/linux/sched.h linux-4.1.26/include/linux/sch #endif /* CONFIG_TRACING */ #ifdef CONFIG_MEMCG struct memcg_oom_info { -@@ -1722,14 +1791,26 @@ +@@ -1723,14 +1792,26 @@ struct task_struct { unsigned int sequential_io; unsigned int sequential_io_avg; #endif @@ -12418,7 +13494,7 @@ diff -Nur linux-4.1.26.orig/include/linux/sched.h linux-4.1.26/include/linux/sch #define TNF_MIGRATED 0x01 #define TNF_NO_GROUP 0x02 #define TNF_SHARED 0x04 -@@ -1918,6 +1999,15 @@ +@@ -1919,6 +2000,15 @@ extern struct pid *cad_pid; extern void free_task(struct task_struct *tsk); #define get_task_struct(tsk) do { atomic_inc(&(tsk)->usage); } while(0) @@ -12434,7 +13510,7 @@ diff -Nur linux-4.1.26.orig/include/linux/sched.h linux-4.1.26/include/linux/sch extern void __put_task_struct(struct task_struct *t); static inline void put_task_struct(struct task_struct *t) -@@ -1925,6 +2015,7 @@ +@@ -1926,6 +2016,7 @@ static inline void put_task_struct(struct task_struct *t) if (atomic_dec_and_test(&t->usage)) __put_task_struct(t); } @@ -12442,7 +13518,7 @@ diff -Nur linux-4.1.26.orig/include/linux/sched.h linux-4.1.26/include/linux/sch #ifdef CONFIG_VIRT_CPU_ACCOUNTING_GEN extern void task_cputime(struct task_struct *t, -@@ -1963,6 +2054,7 @@ +@@ -1964,6 +2055,7 @@ extern void thread_group_cputime_adjusted(struct task_struct *p, cputime_t *ut, /* * Per process flags */ @@ -12450,7 +13526,7 @@ diff -Nur linux-4.1.26.orig/include/linux/sched.h linux-4.1.26/include/linux/sch #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 */ -@@ -2127,6 +2219,10 @@ +@@ -2128,6 +2220,10 @@ extern void do_set_cpus_allowed(struct task_struct *p, extern int set_cpus_allowed_ptr(struct task_struct *p, const struct cpumask *new_mask); @@ -12461,7 +13537,7 @@ diff -Nur linux-4.1.26.orig/include/linux/sched.h linux-4.1.26/include/linux/sch #else static inline void do_set_cpus_allowed(struct task_struct *p, const struct cpumask *new_mask) -@@ -2139,6 +2235,9 @@ +@@ -2140,6 +2236,9 @@ static inline int set_cpus_allowed_ptr(struct task_struct *p, return -EINVAL; return 0; } @@ -12471,7 +13547,7 @@ diff -Nur linux-4.1.26.orig/include/linux/sched.h linux-4.1.26/include/linux/sch #endif #ifdef CONFIG_NO_HZ_COMMON -@@ -2355,6 +2454,7 @@ +@@ -2356,6 +2455,7 @@ extern void xtime_update(unsigned long ticks); extern int wake_up_state(struct task_struct *tsk, unsigned int state); extern int wake_up_process(struct task_struct *tsk); @@ -12479,7 +13555,7 @@ diff -Nur linux-4.1.26.orig/include/linux/sched.h linux-4.1.26/include/linux/sch extern void wake_up_new_task(struct task_struct *tsk); #ifdef CONFIG_SMP extern void kick_process(struct task_struct *tsk); -@@ -2471,12 +2571,24 @@ +@@ -2472,12 +2572,24 @@ extern struct mm_struct * mm_alloc(void); /* mmdrop drops the mm and the page tables */ extern void __mmdrop(struct mm_struct *); @@ -12504,7 +13580,7 @@ diff -Nur linux-4.1.26.orig/include/linux/sched.h linux-4.1.26/include/linux/sch /* 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 */ -@@ -2788,6 +2900,43 @@ +@@ -2789,6 +2901,43 @@ static inline int test_tsk_need_resched(struct task_struct *tsk) return unlikely(test_tsk_thread_flag(tsk,TIF_NEED_RESCHED)); } @@ -12548,7 +13624,7 @@ diff -Nur linux-4.1.26.orig/include/linux/sched.h linux-4.1.26/include/linux/sch static inline int restart_syscall(void) { set_tsk_thread_flag(current, TIF_SIGPENDING); -@@ -2819,6 +2968,51 @@ +@@ -2820,6 +2969,51 @@ static inline int signal_pending_state(long state, struct task_struct *p) return (state & TASK_INTERRUPTIBLE) || __fatal_signal_pending(p); } @@ -12600,7 +13676,7 @@ diff -Nur linux-4.1.26.orig/include/linux/sched.h linux-4.1.26/include/linux/sch /* * cond_resched() and cond_resched_lock(): latency reduction via * explicit rescheduling in places that are safe. The return -@@ -2840,12 +3034,16 @@ +@@ -2841,12 +3035,16 @@ extern int __cond_resched_lock(spinlock_t *lock); __cond_resched_lock(lock); \ }) @@ -12617,7 +13693,7 @@ diff -Nur linux-4.1.26.orig/include/linux/sched.h linux-4.1.26/include/linux/sch static inline void cond_resched_rcu(void) { -@@ -3012,6 +3210,26 @@ +@@ -3013,6 +3211,26 @@ static inline void set_task_cpu(struct task_struct *p, unsigned int cpu) #endif /* CONFIG_SMP */ @@ -12644,10 +13720,11 @@ diff -Nur linux-4.1.26.orig/include/linux/sched.h linux-4.1.26/include/linux/sch extern long sched_setaffinity(pid_t pid, const struct cpumask *new_mask); extern long sched_getaffinity(pid_t pid, struct cpumask *mask); -diff -Nur linux-4.1.26.orig/include/linux/seqlock.h linux-4.1.26/include/linux/seqlock.h ---- linux-4.1.26.orig/include/linux/seqlock.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/linux/seqlock.h 2016-06-19 15:30:58.675296887 +0200 -@@ -219,20 +219,30 @@ +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) return __read_seqcount_retry(s, start); } @@ -12682,7 +13759,7 @@ diff -Nur linux-4.1.26.orig/include/linux/seqlock.h linux-4.1.26/include/linux/s /* * raw_write_seqcount_latch - redirect readers to even/odd copy * @s: pointer to seqcount_t -@@ -305,10 +315,32 @@ +@@ -305,10 +315,32 @@ typedef struct { /* * Read side functions for starting and finalizing a read side section. */ @@ -12715,7 +13792,7 @@ diff -Nur linux-4.1.26.orig/include/linux/seqlock.h linux-4.1.26/include/linux/s static inline unsigned read_seqretry(const seqlock_t *sl, unsigned start) { -@@ -323,36 +355,36 @@ +@@ -323,36 +355,36 @@ static inline unsigned read_seqretry(const seqlock_t *sl, unsigned start) static inline void write_seqlock(seqlock_t *sl) { spin_lock(&sl->lock); @@ -12758,7 +13835,7 @@ diff -Nur linux-4.1.26.orig/include/linux/seqlock.h linux-4.1.26/include/linux/s spin_unlock_irq(&sl->lock); } -@@ -361,7 +393,7 @@ +@@ -361,7 +393,7 @@ static inline unsigned long __write_seqlock_irqsave(seqlock_t *sl) unsigned long flags; spin_lock_irqsave(&sl->lock, flags); @@ -12767,7 +13844,7 @@ diff -Nur linux-4.1.26.orig/include/linux/seqlock.h linux-4.1.26/include/linux/s return flags; } -@@ -371,7 +403,7 @@ +@@ -371,7 +403,7 @@ static inline unsigned long __write_seqlock_irqsave(seqlock_t *sl) static inline void write_sequnlock_irqrestore(seqlock_t *sl, unsigned long flags) { @@ -12776,10 +13853,11 @@ diff -Nur linux-4.1.26.orig/include/linux/seqlock.h linux-4.1.26/include/linux/s spin_unlock_irqrestore(&sl->lock, flags); } -diff -Nur linux-4.1.26.orig/include/linux/signal.h linux-4.1.26/include/linux/signal.h ---- linux-4.1.26.orig/include/linux/signal.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/linux/signal.h 2016-06-19 15:30:58.675296887 +0200 -@@ -233,6 +233,7 @@ +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) } extern void flush_sigqueue(struct sigpending *queue); @@ -12787,10 +13865,11 @@ diff -Nur linux-4.1.26.orig/include/linux/signal.h linux-4.1.26/include/linux/si /* Test if 'sig' is valid signal. Use this instead of testing _NSIG directly */ static inline int valid_signal(unsigned long sig) -diff -Nur linux-4.1.26.orig/include/linux/skbuff.h linux-4.1.26/include/linux/skbuff.h ---- linux-4.1.26.orig/include/linux/skbuff.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/linux/skbuff.h 2016-06-19 15:30:58.675296887 +0200 -@@ -187,6 +187,7 @@ +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 { __u32 qlen; spinlock_t lock; @@ -12798,7 +13877,7 @@ diff -Nur linux-4.1.26.orig/include/linux/skbuff.h linux-4.1.26/include/linux/sk }; struct sk_buff; -@@ -1337,6 +1338,12 @@ +@@ -1337,6 +1338,12 @@ static inline void skb_queue_head_init(struct sk_buff_head *list) __skb_queue_head_init(list); } @@ -12811,10 +13890,11 @@ diff -Nur linux-4.1.26.orig/include/linux/skbuff.h linux-4.1.26/include/linux/sk static inline void skb_queue_head_init_class(struct sk_buff_head *list, struct lock_class_key *class) { -diff -Nur linux-4.1.26.orig/include/linux/smp.h linux-4.1.26/include/linux/smp.h ---- linux-4.1.26.orig/include/linux/smp.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/linux/smp.h 2016-06-19 15:30:58.675296887 +0200 -@@ -185,6 +185,9 @@ +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) { } #define get_cpu() ({ preempt_disable(); smp_processor_id(); }) #define put_cpu() preempt_enable() @@ -12824,23 +13904,11 @@ diff -Nur linux-4.1.26.orig/include/linux/smp.h linux-4.1.26/include/linux/smp.h /* * Callback to arch code if there's nosmp or maxcpus=0 on the * boot command line: -diff -Nur linux-4.1.26.orig/include/linux/spinlock_api_smp.h linux-4.1.26/include/linux/spinlock_api_smp.h ---- linux-4.1.26.orig/include/linux/spinlock_api_smp.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/linux/spinlock_api_smp.h 2016-06-19 15:30:58.679297041 +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.26.orig/include/linux/spinlock.h linux-4.1.26/include/linux/spinlock.h ---- linux-4.1.26.orig/include/linux/spinlock.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/linux/spinlock.h 2016-06-19 15:30:58.679297041 +0200 -@@ -281,7 +281,11 @@ +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) #define raw_spin_can_lock(lock) (!raw_spin_is_locked(lock)) /* Include rwlock functions */ @@ -12853,7 +13921,7 @@ diff -Nur linux-4.1.26.orig/include/linux/spinlock.h linux-4.1.26/include/linux/ /* * Pull the _spin_*()/_read_*()/_write_*() functions/declarations: -@@ -292,6 +296,10 @@ +@@ -292,6 +296,10 @@ static inline void do_raw_spin_unlock(raw_spinlock_t *lock) __releases(lock) # include <linux/spinlock_api_up.h> #endif @@ -12864,16 +13932,32 @@ diff -Nur linux-4.1.26.orig/include/linux/spinlock.h linux-4.1.26/include/linux/ /* * Map the spin_lock functions to the raw variants for PREEMPT_RT=n */ -@@ -426,4 +434,6 @@ +@@ -426,4 +434,6 @@ extern int _atomic_dec_and_lock(atomic_t *atomic, spinlock_t *lock); #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 -Nur linux-4.1.26.orig/include/linux/spinlock_rt.h linux-4.1.26/include/linux/spinlock_rt.h ---- linux-4.1.26.orig/include/linux/spinlock_rt.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-4.1.26/include/linux/spinlock_rt.h 2016-06-19 15:30:58.679297041 +0200 +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 @@ -0,0 +1,174 @@ +#ifndef __LINUX_SPINLOCK_RT_H +#define __LINUX_SPINLOCK_RT_H @@ -13049,9 +14133,10 @@ diff -Nur linux-4.1.26.orig/include/linux/spinlock_rt.h linux-4.1.26/include/lin + atomic_dec_and_spin_lock(atomic, lock) + +#endif -diff -Nur linux-4.1.26.orig/include/linux/spinlock_types.h linux-4.1.26/include/linux/spinlock_types.h ---- linux-4.1.26.orig/include/linux/spinlock_types.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/linux/spinlock_types.h 2016-06-19 15:30:58.679297041 +0200 +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 @@ -9,80 +9,15 @@ * Released under the General Public License (GPL). */ @@ -13140,9 +14225,11 @@ diff -Nur linux-4.1.26.orig/include/linux/spinlock_types.h linux-4.1.26/include/ -#include <linux/rwlock_types.h> - #endif /* __LINUX_SPINLOCK_TYPES_H */ -diff -Nur linux-4.1.26.orig/include/linux/spinlock_types_nort.h linux-4.1.26/include/linux/spinlock_types_nort.h ---- linux-4.1.26.orig/include/linux/spinlock_types_nort.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-4.1.26/include/linux/spinlock_types_nort.h 2016-06-19 15:30:58.679297041 +0200 +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 @@ -0,0 +1,33 @@ +#ifndef __LINUX_SPINLOCK_TYPES_NORT_H +#define __LINUX_SPINLOCK_TYPES_NORT_H @@ -13177,9 +14264,11 @@ diff -Nur linux-4.1.26.orig/include/linux/spinlock_types_nort.h linux-4.1.26/inc +#define DEFINE_SPINLOCK(x) spinlock_t x = __SPIN_LOCK_UNLOCKED(x) + +#endif -diff -Nur linux-4.1.26.orig/include/linux/spinlock_types_raw.h linux-4.1.26/include/linux/spinlock_types_raw.h ---- linux-4.1.26.orig/include/linux/spinlock_types_raw.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-4.1.26/include/linux/spinlock_types_raw.h 2016-06-19 15:30:58.679297041 +0200 +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 @@ -0,0 +1,56 @@ +#ifndef __LINUX_SPINLOCK_TYPES_RAW_H +#define __LINUX_SPINLOCK_TYPES_RAW_H @@ -13237,9 +14326,11 @@ diff -Nur linux-4.1.26.orig/include/linux/spinlock_types_raw.h linux-4.1.26/incl +#define DEFINE_RAW_SPINLOCK(x) raw_spinlock_t x = __RAW_SPIN_LOCK_UNLOCKED(x) + +#endif -diff -Nur linux-4.1.26.orig/include/linux/spinlock_types_rt.h linux-4.1.26/include/linux/spinlock_types_rt.h ---- linux-4.1.26.orig/include/linux/spinlock_types_rt.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-4.1.26/include/linux/spinlock_types_rt.h 2016-06-19 15:30:58.679297041 +0200 +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 @@ -0,0 +1,51 @@ +#ifndef __LINUX_SPINLOCK_TYPES_RT_H +#define __LINUX_SPINLOCK_TYPES_RT_H @@ -13292,10 +14383,11 @@ diff -Nur linux-4.1.26.orig/include/linux/spinlock_types_rt.h linux-4.1.26/inclu + spinlock_t name __cacheline_aligned_in_smp = __SPIN_LOCK_UNLOCKED(name) + +#endif -diff -Nur linux-4.1.26.orig/include/linux/srcu.h linux-4.1.26/include/linux/srcu.h ---- linux-4.1.26.orig/include/linux/srcu.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/linux/srcu.h 2016-06-19 15:30:58.679297041 +0200 -@@ -84,10 +84,10 @@ +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); void process_srcu(struct work_struct *work); @@ -13308,7 +14400,7 @@ diff -Nur linux-4.1.26.orig/include/linux/srcu.h linux-4.1.26/include/linux/srcu .queue_lock = __SPIN_LOCK_UNLOCKED(name.queue_lock), \ .running = false, \ .batch_queue = RCU_BATCH_INIT(name.batch_queue), \ -@@ -104,7 +104,7 @@ +@@ -104,7 +104,7 @@ void process_srcu(struct work_struct *work); */ #define __DEFINE_SRCU(name, is_static) \ static DEFINE_PER_CPU(struct srcu_struct_array, name##_srcu_array);\ @@ -13317,9 +14409,10 @@ diff -Nur linux-4.1.26.orig/include/linux/srcu.h linux-4.1.26/include/linux/srcu #define DEFINE_SRCU(name) __DEFINE_SRCU(name, /* not static */) #define DEFINE_STATIC_SRCU(name) __DEFINE_SRCU(name, static) -diff -Nur linux-4.1.26.orig/include/linux/swap.h linux-4.1.26/include/linux/swap.h ---- linux-4.1.26.orig/include/linux/swap.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/linux/swap.h 2016-06-19 15:30:58.679297041 +0200 +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 @@ -11,6 +11,7 @@ #include <linux/fs.h> #include <linux/atomic.h> @@ -13328,7 +14421,7 @@ diff -Nur linux-4.1.26.orig/include/linux/swap.h linux-4.1.26/include/linux/swap #include <asm/page.h> struct notifier_block; -@@ -252,7 +253,8 @@ +@@ -252,7 +253,8 @@ struct swap_info_struct { void *workingset_eviction(struct address_space *mapping, struct page *page); bool workingset_refault(void *shadow); void workingset_activation(struct page *page); @@ -13338,7 +14431,7 @@ diff -Nur linux-4.1.26.orig/include/linux/swap.h linux-4.1.26/include/linux/swap static inline unsigned int workingset_node_pages(struct radix_tree_node *node) { -@@ -296,6 +298,7 @@ +@@ -296,6 +298,7 @@ extern unsigned long nr_free_pagecache_pages(void); /* linux/mm/swap.c */ @@ -13346,10 +14439,11 @@ diff -Nur linux-4.1.26.orig/include/linux/swap.h linux-4.1.26/include/linux/swap 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 -Nur linux-4.1.26.orig/include/linux/thread_info.h linux-4.1.26/include/linux/thread_info.h ---- linux-4.1.26.orig/include/linux/thread_info.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/linux/thread_info.h 2016-06-19 15:30:58.679297041 +0200 -@@ -102,7 +102,17 @@ +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) #define test_thread_flag(flag) \ test_ti_thread_flag(current_thread_info(), flag) @@ -13368,10 +14462,11 @@ diff -Nur linux-4.1.26.orig/include/linux/thread_info.h linux-4.1.26/include/lin #if defined TIF_RESTORE_SIGMASK && !defined HAVE_SET_RESTORE_SIGMASK /* -diff -Nur linux-4.1.26.orig/include/linux/timer.h linux-4.1.26/include/linux/timer.h ---- linux-4.1.26.orig/include/linux/timer.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/linux/timer.h 2016-06-19 15:30:58.679297041 +0200 -@@ -241,7 +241,7 @@ +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); extern int try_to_del_timer_sync(struct timer_list *timer); @@ -13380,9 +14475,10 @@ diff -Nur linux-4.1.26.orig/include/linux/timer.h linux-4.1.26/include/linux/tim extern int del_timer_sync(struct timer_list *timer); #else # define del_timer_sync(t) del_timer(t) -diff -Nur linux-4.1.26.orig/include/linux/uaccess.h linux-4.1.26/include/linux/uaccess.h ---- linux-4.1.26.orig/include/linux/uaccess.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/linux/uaccess.h 2016-06-19 15:30:58.679297041 +0200 +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 @@ -1,21 +1,31 @@ #ifndef __LINUX_UACCESS_H__ #define __LINUX_UACCESS_H__ @@ -13423,7 +14519,7 @@ diff -Nur linux-4.1.26.orig/include/linux/uaccess.h linux-4.1.26/include/linux/u /* * make sure to have issued the store before a pagefault * can hit. -@@ -25,18 +35,32 @@ +@@ -25,18 +35,32 @@ static inline void pagefault_disable(void) static inline void pagefault_enable(void) { @@ -13461,9 +14557,10 @@ diff -Nur linux-4.1.26.orig/include/linux/uaccess.h linux-4.1.26/include/linux/u #ifndef ARCH_HAS_NOCACHE_UACCESS static inline unsigned long __copy_from_user_inatomic_nocache(void *to, -diff -Nur linux-4.1.26.orig/include/linux/uprobes.h linux-4.1.26/include/linux/uprobes.h ---- linux-4.1.26.orig/include/linux/uprobes.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/linux/uprobes.h 2016-06-19 15:30:58.679297041 +0200 +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 @@ -27,6 +27,7 @@ #include <linux/errno.h> #include <linux/rbtree.h> @@ -13472,10 +14569,11 @@ diff -Nur linux-4.1.26.orig/include/linux/uprobes.h linux-4.1.26/include/linux/u struct vm_area_struct; struct mm_struct; -diff -Nur linux-4.1.26.orig/include/linux/vmstat.h linux-4.1.26/include/linux/vmstat.h ---- linux-4.1.26.orig/include/linux/vmstat.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/linux/vmstat.h 2016-06-19 15:30:58.679297041 +0200 -@@ -33,7 +33,9 @@ +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); */ static inline void __count_vm_event(enum vm_event_item item) { @@ -13485,7 +14583,7 @@ diff -Nur linux-4.1.26.orig/include/linux/vmstat.h linux-4.1.26/include/linux/vm } static inline void count_vm_event(enum vm_event_item item) -@@ -43,7 +45,9 @@ +@@ -43,7 +45,9 @@ static inline void count_vm_event(enum vm_event_item item) static inline void __count_vm_events(enum vm_event_item item, long delta) { @@ -13495,20 +14593,11 @@ diff -Nur linux-4.1.26.orig/include/linux/vmstat.h linux-4.1.26/include/linux/vm } static inline void count_vm_events(enum vm_event_item item, long delta) -diff -Nur linux-4.1.26.orig/include/linux/wait.h linux-4.1.26/include/linux/wait.h ---- linux-4.1.26.orig/include/linux/wait.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/linux/wait.h 2016-06-19 15:30:58.679297041 +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.26.orig/include/linux/wait-simple.h linux-4.1.26/include/linux/wait-simple.h ---- linux-4.1.26.orig/include/linux/wait-simple.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-4.1.26/include/linux/wait-simple.h 2016-06-19 15:30:58.679297041 +0200 +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 @@ -0,0 +1,207 @@ +#ifndef _LINUX_WAIT_SIMPLE_H +#define _LINUX_WAIT_SIMPLE_H @@ -13717,9 +14806,23 @@ diff -Nur linux-4.1.26.orig/include/linux/wait-simple.h linux-4.1.26/include/lin +}) + +#endif -diff -Nur linux-4.1.26.orig/include/linux/work-simple.h linux-4.1.26/include/linux/work-simple.h ---- linux-4.1.26.orig/include/linux/work-simple.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-4.1.26/include/linux/work-simple.h 2016-06-19 15:30:58.679297041 +0200 +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 @@ -0,0 +1,24 @@ +#ifndef _LINUX_SWORK_H +#define _LINUX_SWORK_H @@ -13745,10 +14848,11 @@ diff -Nur linux-4.1.26.orig/include/linux/work-simple.h linux-4.1.26/include/lin +void swork_put(void); + +#endif /* _LINUX_SWORK_H */ -diff -Nur linux-4.1.26.orig/include/net/dst.h linux-4.1.26/include/net/dst.h ---- linux-4.1.26.orig/include/net/dst.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/net/dst.h 2016-06-19 15:30:58.679297041 +0200 -@@ -436,7 +436,7 @@ +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) static inline int dst_neigh_output(struct dst_entry *dst, struct neighbour *n, struct sk_buff *skb) { @@ -13757,10 +14861,11 @@ diff -Nur linux-4.1.26.orig/include/net/dst.h linux-4.1.26/include/net/dst.h if (dst->pending_confirm) { unsigned long now = jiffies; -diff -Nur linux-4.1.26.orig/include/net/neighbour.h linux-4.1.26/include/net/neighbour.h ---- linux-4.1.26.orig/include/net/neighbour.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/net/neighbour.h 2016-06-19 15:30:58.679297041 +0200 -@@ -445,7 +445,7 @@ +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) } #endif @@ -13769,7 +14874,7 @@ diff -Nur linux-4.1.26.orig/include/net/neighbour.h linux-4.1.26/include/net/nei { unsigned int seq; int hh_len; -@@ -500,7 +500,7 @@ +@@ -500,7 +500,7 @@ struct neighbour_cb { #define NEIGH_CB(skb) ((struct neighbour_cb *)(skb)->cb) @@ -13778,10 +14883,11 @@ diff -Nur linux-4.1.26.orig/include/net/neighbour.h linux-4.1.26/include/net/nei const struct net_device *dev) { unsigned int seq; -diff -Nur linux-4.1.26.orig/include/net/netns/ipv4.h linux-4.1.26/include/net/netns/ipv4.h ---- linux-4.1.26.orig/include/net/netns/ipv4.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/net/netns/ipv4.h 2016-06-19 15:30:58.683297195 +0200 -@@ -69,6 +69,7 @@ +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 { int sysctl_icmp_echo_ignore_all; int sysctl_icmp_echo_ignore_broadcasts; @@ -13789,9 +14895,11 @@ diff -Nur linux-4.1.26.orig/include/net/netns/ipv4.h linux-4.1.26/include/net/ne int sysctl_icmp_ignore_bogus_error_responses; int sysctl_icmp_ratelimit; int sysctl_icmp_ratemask; -diff -Nur linux-4.1.26.orig/include/trace/events/hist.h linux-4.1.26/include/trace/events/hist.h ---- linux-4.1.26.orig/include/trace/events/hist.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-4.1.26/include/trace/events/hist.h 2016-06-19 15:30:58.683297195 +0200 +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 @@ -0,0 +1,74 @@ +#undef TRACE_SYSTEM +#define TRACE_SYSTEM hist @@ -13867,9 +14975,11 @@ diff -Nur linux-4.1.26.orig/include/trace/events/hist.h linux-4.1.26/include/tra + +/* This part must be outside protection */ +#include <trace/define_trace.h> -diff -Nur linux-4.1.26.orig/include/trace/events/latency_hist.h linux-4.1.26/include/trace/events/latency_hist.h ---- linux-4.1.26.orig/include/trace/events/latency_hist.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-4.1.26/include/trace/events/latency_hist.h 2016-06-19 15:30:58.683297195 +0200 +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 @@ -0,0 +1,29 @@ +#ifndef _LATENCY_HIST_H +#define _LATENCY_HIST_H @@ -13900,10 +15010,11 @@ diff -Nur linux-4.1.26.orig/include/trace/events/latency_hist.h linux-4.1.26/inc +} + +#endif /* _LATENCY_HIST_H */ -diff -Nur linux-4.1.26.orig/include/trace/events/sched.h linux-4.1.26/include/trace/events/sched.h ---- linux-4.1.26.orig/include/trace/events/sched.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/include/trace/events/sched.h 2016-06-19 15:30:58.683297195 +0200 -@@ -55,9 +55,9 @@ +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, */ DECLARE_EVENT_CLASS(sched_wakeup_template, @@ -13915,7 +15026,7 @@ diff -Nur linux-4.1.26.orig/include/trace/events/sched.h linux-4.1.26/include/tr TP_STRUCT__entry( __array( char, comm, TASK_COMM_LEN ) -@@ -71,25 +71,37 @@ +@@ -71,25 +71,37 @@ DECLARE_EVENT_CLASS(sched_wakeup_template, memcpy(__entry->comm, p->comm, TASK_COMM_LEN); __entry->pid = p->pid; __entry->prio = p->prio; @@ -13960,10 +15071,11 @@ diff -Nur linux-4.1.26.orig/include/trace/events/sched.h linux-4.1.26/include/tr #ifdef CREATE_TRACE_POINTS static inline long __trace_sched_switch_state(struct task_struct *p) -diff -Nur linux-4.1.26.orig/init/Kconfig linux-4.1.26/init/Kconfig ---- linux-4.1.26.orig/init/Kconfig 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/init/Kconfig 2016-06-19 15:30:58.683297195 +0200 -@@ -637,7 +637,7 @@ +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 config RCU_FAST_NO_HZ bool "Accelerate last non-dyntick-idle CPU's grace periods" @@ -13972,7 +15084,7 @@ diff -Nur linux-4.1.26.orig/init/Kconfig linux-4.1.26/init/Kconfig default n help This option permits CPUs to enter dynticks-idle state even if -@@ -664,7 +664,7 @@ +@@ -664,7 +664,7 @@ config TREE_RCU_TRACE config RCU_BOOST bool "Enable RCU priority boosting" depends on RT_MUTEXES && PREEMPT_RCU @@ -13981,7 +15093,7 @@ diff -Nur linux-4.1.26.orig/init/Kconfig linux-4.1.26/init/Kconfig 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 @@ +@@ -1101,6 +1101,7 @@ config CFS_BANDWIDTH config RT_GROUP_SCHED bool "Group scheduling for SCHED_RR/FIFO" depends on CGROUP_SCHED @@ -13989,7 +15101,7 @@ diff -Nur linux-4.1.26.orig/init/Kconfig linux-4.1.26/init/Kconfig default n help This feature lets you explicitly allocate real CPU bandwidth -@@ -1688,6 +1689,7 @@ +@@ -1688,6 +1689,7 @@ choice config SLAB bool "SLAB" @@ -13997,7 +15109,7 @@ diff -Nur linux-4.1.26.orig/init/Kconfig linux-4.1.26/init/Kconfig 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 @@ +@@ -1706,6 +1708,7 @@ config SLUB config SLOB depends on EXPERT bool "SLOB (Simple Allocator)" @@ -14005,7 +15117,7 @@ diff -Nur linux-4.1.26.orig/init/Kconfig linux-4.1.26/init/Kconfig help SLOB replaces the stock allocator with a drastically simpler allocator. SLOB is generally more space efficient but -@@ -1715,7 +1718,7 @@ +@@ -1715,7 +1718,7 @@ endchoice config SLUB_CPU_PARTIAL default y @@ -14014,10 +15126,21 @@ diff -Nur linux-4.1.26.orig/init/Kconfig linux-4.1.26/init/Kconfig bool "SLUB per cpu partial cache" help Per cpu partial caches accellerate objects allocation and freeing -diff -Nur linux-4.1.26.orig/init/main.c linux-4.1.26/init/main.c ---- linux-4.1.26.orig/init/main.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/init/main.c 2016-06-19 15:30:58.683297195 +0200 -@@ -525,6 +525,7 @@ +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) setup_command_line(command_line); setup_nr_cpu_ids(); setup_per_cpu_areas(); @@ -14025,18 +15148,10 @@ diff -Nur linux-4.1.26.orig/init/main.c linux-4.1.26/init/main.c smp_prepare_boot_cpu(); /* arch-specific boot-cpu hooks */ build_all_zonelists(NULL, NULL); -diff -Nur linux-4.1.26.orig/init/Makefile linux-4.1.26/init/Makefile ---- linux-4.1.26.orig/init/Makefile 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/init/Makefile 2016-06-19 15:30:58.683297195 +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.26.orig/ipc/mqueue.c linux-4.1.26/ipc/mqueue.c ---- linux-4.1.26.orig/ipc/mqueue.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/ipc/mqueue.c 2016-06-19 15:30:58.683297195 +0200 +diff --git a/ipc/mqueue.c b/ipc/mqueue.c +index c3fc5c2b63f3..161a1807e6ef 100644 +--- a/ipc/mqueue.c ++++ b/ipc/mqueue.c @@ -47,8 +47,7 @@ #define RECV 1 @@ -14047,7 +15162,7 @@ diff -Nur linux-4.1.26.orig/ipc/mqueue.c linux-4.1.26/ipc/mqueue.c struct posix_msg_tree_node { struct rb_node rb_node; -@@ -568,15 +567,12 @@ +@@ -568,15 +567,12 @@ static int wq_sleep(struct mqueue_inode_info *info, int sr, wq_add(info, sr, ewp); for (;;) { @@ -14064,7 +15179,7 @@ diff -Nur linux-4.1.26.orig/ipc/mqueue.c linux-4.1.26/ipc/mqueue.c if (ewp->state == STATE_READY) { retval = 0; goto out; -@@ -904,11 +900,15 @@ +@@ -904,11 +900,15 @@ out_name: * 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 @@ -14085,7 +15200,7 @@ diff -Nur linux-4.1.26.orig/ipc/mqueue.c linux-4.1.26/ipc/mqueue.c * * The same algorithm is used for senders. */ -@@ -916,21 +916,29 @@ +@@ -916,21 +916,29 @@ out_name: /* pipelined_send() - send a message directly to the task waiting in * sys_mq_timedreceive() (without inserting message into a queue). */ @@ -14120,7 +15235,7 @@ diff -Nur linux-4.1.26.orig/ipc/mqueue.c linux-4.1.26/ipc/mqueue.c { struct ext_wait_queue *sender = wq_get_first_waiter(info, SEND); -@@ -941,10 +949,9 @@ +@@ -941,10 +949,9 @@ static inline void pipelined_receive(struct mqueue_inode_info *info) } if (msg_insert(sender->msg, info)) return; @@ -14133,7 +15248,7 @@ diff -Nur linux-4.1.26.orig/ipc/mqueue.c linux-4.1.26/ipc/mqueue.c sender->state = STATE_READY; } -@@ -962,6 +969,7 @@ +@@ -962,6 +969,7 @@ SYSCALL_DEFINE5(mq_timedsend, mqd_t, mqdes, const char __user *, u_msg_ptr, struct timespec ts; struct posix_msg_tree_node *new_leaf = NULL; int ret = 0; @@ -14141,7 +15256,7 @@ diff -Nur linux-4.1.26.orig/ipc/mqueue.c linux-4.1.26/ipc/mqueue.c if (u_abs_timeout) { int res = prepare_timeout(u_abs_timeout, &expires, &ts); -@@ -1045,7 +1053,7 @@ +@@ -1045,7 +1053,7 @@ SYSCALL_DEFINE5(mq_timedsend, mqd_t, mqdes, const char __user *, u_msg_ptr, } else { receiver = wq_get_first_waiter(info, RECV); if (receiver) { @@ -14150,7 +15265,7 @@ diff -Nur linux-4.1.26.orig/ipc/mqueue.c linux-4.1.26/ipc/mqueue.c } else { /* adds message to the queue */ ret = msg_insert(msg_ptr, info); -@@ -1058,6 +1066,7 @@ +@@ -1058,6 +1066,7 @@ SYSCALL_DEFINE5(mq_timedsend, mqd_t, mqdes, const char __user *, u_msg_ptr, } out_unlock: spin_unlock(&info->lock); @@ -14158,7 +15273,7 @@ diff -Nur linux-4.1.26.orig/ipc/mqueue.c linux-4.1.26/ipc/mqueue.c out_free: if (ret) free_msg(msg_ptr); -@@ -1144,14 +1153,17 @@ +@@ -1144,14 +1153,17 @@ SYSCALL_DEFINE5(mq_timedreceive, mqd_t, mqdes, char __user *, u_msg_ptr, msg_ptr = wait.msg; } } else { @@ -14177,10 +15292,11 @@ diff -Nur linux-4.1.26.orig/ipc/mqueue.c linux-4.1.26/ipc/mqueue.c ret = 0; } if (ret == 0) { -diff -Nur linux-4.1.26.orig/ipc/msg.c linux-4.1.26/ipc/msg.c ---- linux-4.1.26.orig/ipc/msg.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/ipc/msg.c 2016-06-19 15:30:58.683297195 +0200 -@@ -188,6 +188,12 @@ +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) struct msg_receiver *msr, *t; list_for_each_entry_safe(msr, t, &msq->q_receivers, r_list) { @@ -14193,7 +15309,7 @@ diff -Nur linux-4.1.26.orig/ipc/msg.c linux-4.1.26/ipc/msg.c msr->r_msg = NULL; /* initialize expunge ordering */ wake_up_process(msr->r_tsk); /* -@@ -198,6 +204,8 @@ +@@ -198,6 +204,8 @@ static void expunge_all(struct msg_queue *msq, int res) */ smp_mb(); msr->r_msg = ERR_PTR(res); @@ -14202,7 +15318,7 @@ diff -Nur linux-4.1.26.orig/ipc/msg.c linux-4.1.26/ipc/msg.c } } -@@ -574,6 +582,11 @@ +@@ -574,6 +582,11 @@ static inline int pipelined_send(struct msg_queue *msq, struct msg_msg *msg) if (testmsg(msg, msr->r_msgtype, msr->r_mode) && !security_msg_queue_msgrcv(msq, msg, msr->r_tsk, msr->r_msgtype, msr->r_mode)) { @@ -14214,7 +15330,7 @@ diff -Nur linux-4.1.26.orig/ipc/msg.c linux-4.1.26/ipc/msg.c list_del(&msr->r_list); if (msr->r_maxsize < msg->m_ts) { -@@ -595,12 +608,13 @@ +@@ -595,12 +608,13 @@ static inline int pipelined_send(struct msg_queue *msq, struct msg_msg *msg) */ smp_mb(); msr->r_msg = msg; @@ -14229,10 +15345,11 @@ diff -Nur linux-4.1.26.orig/ipc/msg.c linux-4.1.26/ipc/msg.c return 0; } -diff -Nur linux-4.1.26.orig/ipc/sem.c linux-4.1.26/ipc/sem.c ---- linux-4.1.26.orig/ipc/sem.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/ipc/sem.c 2016-06-19 15:30:58.683297195 +0200 -@@ -690,6 +690,13 @@ +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: static void wake_up_sem_queue_prepare(struct list_head *pt, struct sem_queue *q, int error) { @@ -14246,7 +15363,7 @@ diff -Nur linux-4.1.26.orig/ipc/sem.c linux-4.1.26/ipc/sem.c if (list_empty(pt)) { /* * Hold preempt off so that we don't get preempted and have the -@@ -701,6 +708,7 @@ +@@ -701,6 +708,7 @@ static void wake_up_sem_queue_prepare(struct list_head *pt, q->pid = error; list_add_tail(&q->list, pt); @@ -14254,7 +15371,7 @@ diff -Nur linux-4.1.26.orig/ipc/sem.c linux-4.1.26/ipc/sem.c } /** -@@ -714,6 +722,7 @@ +@@ -714,6 +722,7 @@ static void wake_up_sem_queue_prepare(struct list_head *pt, */ static void wake_up_sem_queue_do(struct list_head *pt) { @@ -14262,7 +15379,7 @@ diff -Nur linux-4.1.26.orig/ipc/sem.c linux-4.1.26/ipc/sem.c struct sem_queue *q, *t; int did_something; -@@ -726,6 +735,7 @@ +@@ -726,6 +735,7 @@ static void wake_up_sem_queue_do(struct list_head *pt) } if (did_something) preempt_enable(); @@ -14270,9 +15387,84 @@ diff -Nur linux-4.1.26.orig/ipc/sem.c linux-4.1.26/ipc/sem.c } static void unlink_queue(struct sem_array *sma, struct sem_queue *q) -diff -Nur linux-4.1.26.orig/kernel/bpf/hashtab.c linux-4.1.26/kernel/bpf/hashtab.c ---- linux-4.1.26.orig/kernel/bpf/hashtab.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/bpf/hashtab.c 2016-06-19 15:30:58.683297195 +0200 +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 @@ -17,7 +17,7 @@ struct bpf_htab { struct bpf_map map; @@ -14282,7 +15474,7 @@ diff -Nur linux-4.1.26.orig/kernel/bpf/hashtab.c linux-4.1.26/kernel/bpf/hashtab 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 @@ +@@ -82,7 +82,7 @@ static struct bpf_map *htab_map_alloc(union bpf_attr *attr) for (i = 0; i < htab->n_buckets; i++) INIT_HLIST_HEAD(&htab->buckets[i]); @@ -14291,7 +15483,7 @@ diff -Nur linux-4.1.26.orig/kernel/bpf/hashtab.c linux-4.1.26/kernel/bpf/hashtab htab->count = 0; htab->elem_size = sizeof(struct htab_elem) + -@@ -230,7 +230,7 @@ +@@ -230,7 +230,7 @@ static int htab_map_update_elem(struct bpf_map *map, void *key, void *value, l_new->hash = htab_map_hash(l_new->key, key_size); /* bpf_map_update_elem() can be called in_irq() */ @@ -14300,7 +15492,7 @@ diff -Nur linux-4.1.26.orig/kernel/bpf/hashtab.c linux-4.1.26/kernel/bpf/hashtab head = select_bucket(htab, l_new->hash); -@@ -266,11 +266,11 @@ +@@ -266,11 +266,11 @@ static int htab_map_update_elem(struct bpf_map *map, void *key, void *value, } else { htab->count++; } @@ -14314,7 +15506,7 @@ diff -Nur linux-4.1.26.orig/kernel/bpf/hashtab.c linux-4.1.26/kernel/bpf/hashtab kfree(l_new); return ret; } -@@ -291,7 +291,7 @@ +@@ -291,7 +291,7 @@ static int htab_map_delete_elem(struct bpf_map *map, void *key) hash = htab_map_hash(key, key_size); @@ -14323,7 +15515,7 @@ diff -Nur linux-4.1.26.orig/kernel/bpf/hashtab.c linux-4.1.26/kernel/bpf/hashtab head = select_bucket(htab, hash); -@@ -304,7 +304,7 @@ +@@ -304,7 +304,7 @@ static int htab_map_delete_elem(struct bpf_map *map, void *key) ret = 0; } @@ -14332,10 +15524,11 @@ diff -Nur linux-4.1.26.orig/kernel/bpf/hashtab.c linux-4.1.26/kernel/bpf/hashtab return ret; } -diff -Nur linux-4.1.26.orig/kernel/cgroup.c linux-4.1.26/kernel/cgroup.c ---- linux-4.1.26.orig/kernel/cgroup.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/cgroup.c 2016-06-19 15:30:58.687297349 +0200 -@@ -4422,10 +4422,10 @@ +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) queue_work(cgroup_destroy_wq, &css->destroy_work); } @@ -14348,7 +15541,7 @@ diff -Nur linux-4.1.26.orig/kernel/cgroup.c linux-4.1.26/kernel/cgroup.c struct cgroup_subsys *ss = css->ss; struct cgroup *cgrp = css->cgroup; -@@ -4464,8 +4464,8 @@ +@@ -4465,8 +4465,8 @@ static void css_release(struct percpu_ref *ref) struct cgroup_subsys_state *css = container_of(ref, struct cgroup_subsys_state, refcnt); @@ -14359,7 +15552,7 @@ diff -Nur linux-4.1.26.orig/kernel/cgroup.c linux-4.1.26/kernel/cgroup.c } static void init_and_link_css(struct cgroup_subsys_state *css, -@@ -5081,6 +5081,7 @@ +@@ -5080,6 +5080,7 @@ static int __init cgroup_wq_init(void) */ cgroup_destroy_wq = alloc_workqueue("cgroup_destroy", 0, 1); BUG_ON(!cgroup_destroy_wq); @@ -14367,10 +15560,11 @@ diff -Nur linux-4.1.26.orig/kernel/cgroup.c linux-4.1.26/kernel/cgroup.c /* * Used to destroy pidlists and separate to serve as flush domain. -diff -Nur linux-4.1.26.orig/kernel/cpu.c linux-4.1.26/kernel/cpu.c ---- linux-4.1.26.orig/kernel/cpu.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/cpu.c 2016-06-19 15:30:58.687297349 +0200 -@@ -74,8 +74,8 @@ +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 { #endif } cpu_hotplug = { .active_writer = NULL, @@ -14380,7 +15574,7 @@ diff -Nur linux-4.1.26.orig/kernel/cpu.c linux-4.1.26/kernel/cpu.c #ifdef CONFIG_DEBUG_LOCK_ALLOC .dep_map = {.name = "cpu_hotplug.lock" }, #endif -@@ -88,6 +88,289 @@ +@@ -88,6 +88,289 @@ static struct { #define cpuhp_lock_acquire() lock_map_acquire(&cpu_hotplug.dep_map) #define cpuhp_lock_release() lock_map_release(&cpu_hotplug.dep_map) @@ -14670,7 +15864,7 @@ diff -Nur linux-4.1.26.orig/kernel/cpu.c linux-4.1.26/kernel/cpu.c void get_online_cpus(void) { -@@ -349,13 +632,15 @@ +@@ -349,13 +632,15 @@ static int __ref take_cpu_down(void *_param) /* Requires cpu_add_remove_lock to be held */ static int __ref _cpu_down(unsigned int cpu, int tasks_frozen) { @@ -14687,7 +15881,7 @@ diff -Nur linux-4.1.26.orig/kernel/cpu.c linux-4.1.26/kernel/cpu.c if (num_online_cpus() == 1) return -EBUSY; -@@ -363,7 +648,34 @@ +@@ -363,7 +648,34 @@ static int __ref _cpu_down(unsigned int cpu, int tasks_frozen) if (!cpu_online(cpu)) return -EINVAL; @@ -14722,7 +15916,7 @@ diff -Nur linux-4.1.26.orig/kernel/cpu.c linux-4.1.26/kernel/cpu.c err = __cpu_notify(CPU_DOWN_PREPARE | mod, hcpu, -1, &nr_calls); if (err) { -@@ -389,8 +701,12 @@ +@@ -389,8 +701,12 @@ static int __ref _cpu_down(unsigned int cpu, int tasks_frozen) #endif synchronize_rcu(); @@ -14735,7 +15929,7 @@ diff -Nur linux-4.1.26.orig/kernel/cpu.c linux-4.1.26/kernel/cpu.c /* * So now all preempt/rcu users must observe !cpu_active(). */ -@@ -427,9 +743,14 @@ +@@ -427,9 +743,14 @@ static int __ref _cpu_down(unsigned int cpu, int tasks_frozen) check_for_tasks(cpu); out_release: @@ -14750,10 +15944,11 @@ diff -Nur linux-4.1.26.orig/kernel/cpu.c linux-4.1.26/kernel/cpu.c return err; } -diff -Nur linux-4.1.26.orig/kernel/debug/kdb/kdb_io.c linux-4.1.26/kernel/debug/kdb/kdb_io.c ---- linux-4.1.26.orig/kernel/debug/kdb/kdb_io.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/debug/kdb/kdb_io.c 2016-06-19 15:30:58.687297349 +0200 -@@ -554,7 +554,6 @@ +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) int linecount; int colcount; int logging, saved_loglevel = 0; @@ -14761,7 +15956,7 @@ diff -Nur linux-4.1.26.orig/kernel/debug/kdb/kdb_io.c linux-4.1.26/kernel/debug/ int got_printf_lock = 0; int retlen = 0; int fnd, len; -@@ -565,8 +564,6 @@ +@@ -565,8 +564,6 @@ int vkdb_printf(enum kdb_msgsrc src, const char *fmt, va_list ap) unsigned long uninitialized_var(flags); preempt_disable(); @@ -14770,7 +15965,7 @@ diff -Nur linux-4.1.26.orig/kernel/debug/kdb/kdb_io.c linux-4.1.26/kernel/debug/ /* 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 @@ +@@ -855,7 +852,6 @@ kdb_print_out: } else { __release(kdb_printf_lock); } @@ -14778,7 +15973,7 @@ diff -Nur linux-4.1.26.orig/kernel/debug/kdb/kdb_io.c linux-4.1.26/kernel/debug/ preempt_enable(); return retlen; } -@@ -865,9 +861,11 @@ +@@ -865,9 +861,11 @@ int kdb_printf(const char *fmt, ...) va_list ap; int r; @@ -14790,10 +15985,11 @@ diff -Nur linux-4.1.26.orig/kernel/debug/kdb/kdb_io.c linux-4.1.26/kernel/debug/ return r; } -diff -Nur linux-4.1.26.orig/kernel/events/core.c linux-4.1.26/kernel/events/core.c ---- linux-4.1.26.orig/kernel/events/core.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/events/core.c 2016-06-19 15:30:58.687297349 +0200 -@@ -6925,6 +6925,7 @@ +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) hrtimer_init(&hwc->hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); hwc->hrtimer.function = perf_swevent_hrtimer; @@ -14801,10 +15997,11 @@ diff -Nur linux-4.1.26.orig/kernel/events/core.c linux-4.1.26/kernel/events/core /* * Since hrtimers have a fixed rate, we can do a static freq->period -diff -Nur linux-4.1.26.orig/kernel/exit.c linux-4.1.26/kernel/exit.c ---- linux-4.1.26.orig/kernel/exit.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/exit.c 2016-06-19 15:30:58.687297349 +0200 -@@ -144,7 +144,7 @@ +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) * Do this under ->siglock, we can race with another thread * doing sigqueue_free() if we have SIGQUEUE_PREALLOC signals. */ @@ -14813,10 +16010,11 @@ diff -Nur linux-4.1.26.orig/kernel/exit.c linux-4.1.26/kernel/exit.c tsk->sighand = NULL; spin_unlock(&sighand->siglock); -diff -Nur linux-4.1.26.orig/kernel/fork.c linux-4.1.26/kernel/fork.c ---- linux-4.1.26.orig/kernel/fork.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/fork.c 2016-06-19 15:30:58.687297349 +0200 -@@ -108,7 +108,7 @@ +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 */ DEFINE_PER_CPU(unsigned long, process_counts) = 0; @@ -14825,7 +16023,7 @@ diff -Nur linux-4.1.26.orig/kernel/fork.c linux-4.1.26/kernel/fork.c #ifdef CONFIG_PROVE_RCU int lockdep_tasklist_lock_is_held(void) -@@ -244,7 +244,9 @@ +@@ -244,7 +244,9 @@ static inline void put_signal_struct(struct signal_struct *sig) if (atomic_dec_and_test(&sig->sigcnt)) free_signal_struct(sig); } @@ -14836,7 +16034,7 @@ diff -Nur linux-4.1.26.orig/kernel/fork.c linux-4.1.26/kernel/fork.c void __put_task_struct(struct task_struct *tsk) { WARN_ON(!tsk->exit_state); -@@ -260,7 +262,18 @@ +@@ -260,7 +262,18 @@ void __put_task_struct(struct task_struct *tsk) if (!profile_handoff_task(tsk)) free_task(tsk); } @@ -14855,7 +16053,7 @@ diff -Nur linux-4.1.26.orig/kernel/fork.c linux-4.1.26/kernel/fork.c void __init __weak arch_task_cache_init(void) { } -@@ -374,6 +387,7 @@ +@@ -374,6 +387,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig) #endif tsk->splice_pipe = NULL; tsk->task_frag.page = NULL; @@ -14863,7 +16061,7 @@ diff -Nur linux-4.1.26.orig/kernel/fork.c linux-4.1.26/kernel/fork.c account_kernel_stack(ti, 1); -@@ -680,6 +694,19 @@ +@@ -680,6 +694,19 @@ void __mmdrop(struct mm_struct *mm) } EXPORT_SYMBOL_GPL(__mmdrop); @@ -14883,7 +16081,7 @@ diff -Nur linux-4.1.26.orig/kernel/fork.c linux-4.1.26/kernel/fork.c /* * Decrement the use count and release all resources for an mm. */ -@@ -1214,6 +1241,9 @@ +@@ -1214,6 +1241,9 @@ static void rt_mutex_init_task(struct task_struct *p) */ static void posix_cpu_timers_init(struct task_struct *tsk) { @@ -14893,7 +16091,7 @@ diff -Nur linux-4.1.26.orig/kernel/fork.c linux-4.1.26/kernel/fork.c tsk->cputime_expires.prof_exp = 0; tsk->cputime_expires.virt_exp = 0; tsk->cputime_expires.sched_exp = 0; -@@ -1338,6 +1368,7 @@ +@@ -1338,6 +1368,7 @@ static struct task_struct *copy_process(unsigned long clone_flags, spin_lock_init(&p->alloc_lock); init_sigpending(&p->pending); @@ -14901,7 +16099,7 @@ diff -Nur linux-4.1.26.orig/kernel/fork.c linux-4.1.26/kernel/fork.c p->utime = p->stime = p->gtime = 0; p->utimescaled = p->stimescaled = 0; -@@ -1345,7 +1376,8 @@ +@@ -1345,7 +1376,8 @@ static struct task_struct *copy_process(unsigned long clone_flags, p->prev_cputime.utime = p->prev_cputime.stime = 0; #endif #ifdef CONFIG_VIRT_CPU_ACCOUNTING_GEN @@ -14911,7 +16109,7 @@ diff -Nur linux-4.1.26.orig/kernel/fork.c linux-4.1.26/kernel/fork.c p->vtime_snap = 0; p->vtime_snap_whence = VTIME_SLEEPING; #endif -@@ -1396,6 +1428,9 @@ +@@ -1396,6 +1428,9 @@ static struct task_struct *copy_process(unsigned long clone_flags, p->hardirq_context = 0; p->softirq_context = 0; #endif @@ -14921,10 +16119,11 @@ diff -Nur linux-4.1.26.orig/kernel/fork.c linux-4.1.26/kernel/fork.c #ifdef CONFIG_LOCKDEP p->lockdep_depth = 0; /* no locks held yet */ p->curr_chain_key = 0; -diff -Nur linux-4.1.26.orig/kernel/futex.c linux-4.1.26/kernel/futex.c ---- linux-4.1.26.orig/kernel/futex.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/futex.c 2016-06-19 15:32:42.447298576 +0200 -@@ -738,7 +738,9 @@ +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) * task still owns the PI-state: */ if (head->next != next) { @@ -14934,7 +16133,7 @@ diff -Nur linux-4.1.26.orig/kernel/futex.c linux-4.1.26/kernel/futex.c continue; } -@@ -1090,9 +1092,11 @@ +@@ -1090,9 +1092,11 @@ static void __unqueue_futex(struct futex_q *q) /* * The hash bucket lock must be held when this is called. @@ -14948,7 +16147,7 @@ diff -Nur linux-4.1.26.orig/kernel/futex.c linux-4.1.26/kernel/futex.c { struct task_struct *p = q->task; -@@ -1100,14 +1104,10 @@ +@@ -1100,14 +1104,10 @@ static void wake_futex(struct futex_q *q) return; /* @@ -14966,7 +16165,7 @@ diff -Nur linux-4.1.26.orig/kernel/futex.c linux-4.1.26/kernel/futex.c __unqueue_futex(q); /* * The waiting task can free the futex_q as soon as -@@ -1117,16 +1117,15 @@ +@@ -1117,16 +1117,15 @@ static void wake_futex(struct futex_q *q) */ smp_wmb(); q->lock_ptr = NULL; @@ -14986,7 +16185,7 @@ diff -Nur linux-4.1.26.orig/kernel/futex.c linux-4.1.26/kernel/futex.c int ret = 0; if (!pi_state) -@@ -1188,7 +1187,17 @@ +@@ -1188,7 +1187,17 @@ static int wake_futex_pi(u32 __user *uaddr, u32 uval, struct futex_q *this) raw_spin_unlock_irq(&new_owner->pi_lock); raw_spin_unlock(&pi_state->pi_mutex.wait_lock); @@ -15005,7 +16204,7 @@ diff -Nur linux-4.1.26.orig/kernel/futex.c linux-4.1.26/kernel/futex.c return 0; } -@@ -1227,6 +1236,7 @@ +@@ -1227,6 +1236,7 @@ futex_wake(u32 __user *uaddr, unsigned int flags, int nr_wake, u32 bitset) struct futex_q *this, *next; union futex_key key = FUTEX_KEY_INIT; int ret; @@ -15013,7 +16212,7 @@ diff -Nur linux-4.1.26.orig/kernel/futex.c linux-4.1.26/kernel/futex.c if (!bitset) return -EINVAL; -@@ -1254,13 +1264,14 @@ +@@ -1254,13 +1264,14 @@ futex_wake(u32 __user *uaddr, unsigned int flags, int nr_wake, u32 bitset) if (!(this->bitset & bitset)) continue; @@ -15029,7 +16228,7 @@ diff -Nur linux-4.1.26.orig/kernel/futex.c linux-4.1.26/kernel/futex.c out_put_key: put_futex_key(&key); out: -@@ -1279,6 +1290,7 @@ +@@ -1279,6 +1290,7 @@ futex_wake_op(u32 __user *uaddr1, unsigned int flags, u32 __user *uaddr2, struct futex_hash_bucket *hb1, *hb2; struct futex_q *this, *next; int ret, op_ret; @@ -15037,7 +16236,7 @@ diff -Nur linux-4.1.26.orig/kernel/futex.c linux-4.1.26/kernel/futex.c retry: ret = get_futex_key(uaddr1, flags & FLAGS_SHARED, &key1, VERIFY_READ); -@@ -1330,7 +1342,7 @@ +@@ -1330,7 +1342,7 @@ retry_private: ret = -EINVAL; goto out_unlock; } @@ -15046,7 +16245,7 @@ diff -Nur linux-4.1.26.orig/kernel/futex.c linux-4.1.26/kernel/futex.c if (++ret >= nr_wake) break; } -@@ -1344,7 +1356,7 @@ +@@ -1344,7 +1356,7 @@ retry_private: ret = -EINVAL; goto out_unlock; } @@ -15055,7 +16254,7 @@ diff -Nur linux-4.1.26.orig/kernel/futex.c linux-4.1.26/kernel/futex.c if (++op_ret >= nr_wake2) break; } -@@ -1354,6 +1366,7 @@ +@@ -1354,6 +1366,7 @@ retry_private: out_unlock: double_unlock_hb(hb1, hb2); @@ -15063,7 +16262,7 @@ diff -Nur linux-4.1.26.orig/kernel/futex.c linux-4.1.26/kernel/futex.c out_put_keys: put_futex_key(&key2); out_put_key1: -@@ -1513,6 +1526,7 @@ +@@ -1513,6 +1526,7 @@ static int futex_requeue(u32 __user *uaddr1, unsigned int flags, struct futex_pi_state *pi_state = NULL; struct futex_hash_bucket *hb1, *hb2; struct futex_q *this, *next; @@ -15071,7 +16270,7 @@ diff -Nur linux-4.1.26.orig/kernel/futex.c linux-4.1.26/kernel/futex.c if (requeue_pi) { /* -@@ -1689,7 +1703,7 @@ +@@ -1689,7 +1703,7 @@ retry_private: * woken by futex_unlock_pi(). */ if (++task_count <= nr_wake && !requeue_pi) { @@ -15080,7 +16279,7 @@ diff -Nur linux-4.1.26.orig/kernel/futex.c linux-4.1.26/kernel/futex.c continue; } -@@ -1715,6 +1729,16 @@ +@@ -1715,6 +1729,16 @@ retry_private: requeue_pi_wake_futex(this, &key2, hb2); drop_count++; continue; @@ -15097,7 +16296,7 @@ diff -Nur linux-4.1.26.orig/kernel/futex.c linux-4.1.26/kernel/futex.c } else if (ret) { /* -EDEADLK */ this->pi_state = NULL; -@@ -1729,6 +1753,7 @@ +@@ -1729,6 +1753,7 @@ retry_private: out_unlock: free_pi_state(pi_state); double_unlock_hb(hb1, hb2); @@ -15105,24 +16304,43 @@ diff -Nur linux-4.1.26.orig/kernel/futex.c linux-4.1.26/kernel/futex.c hb_waiters_dec(hb2); /* -@@ -2422,7 +2447,15 @@ +@@ -2422,13 +2447,22 @@ retry: */ match = futex_top_waiter(hb, &key); if (match) { - ret = wake_futex_pi(uaddr, uval, match); -+ ret = wake_futex_pi(uaddr, uval, match, hb); ++ ret = wake_futex_pi(uaddr, uval, match, hb); + -+ /* -+ * In case of success wake_futex_pi dropped the hash -+ * bucket lock. -+ */ -+ if (!ret) -+ goto out_putkey; ++ /* ++ * In case of success wake_futex_pi dropped the hash ++ * bucket lock. ++ */ ++ if (!ret) ++ goto out_putkey; + /* * The atomic access to the futex value generated a * pagefault, so retry the user-access and the wakeup: -@@ -2458,6 +2491,7 @@ + */ + if (ret == -EFAULT) + goto pi_faulted; ++ + /* + * A unconditional UNLOCK_PI op raced against a waiter + * setting the FUTEX_WAITERS bit. Try again. +@@ -2438,6 +2472,11 @@ retry: + put_futex_key(&key); + goto retry; + } ++ ++ /* ++ * wake_futex_pi has detected invalid state. Tell user ++ * space. ++ */ + goto out_unlock; + } + +@@ -2458,6 +2497,7 @@ retry: out_unlock: spin_unlock(&hb->lock); @@ -15130,7 +16348,7 @@ diff -Nur linux-4.1.26.orig/kernel/futex.c linux-4.1.26/kernel/futex.c put_futex_key(&key); return ret; -@@ -2568,7 +2602,7 @@ +@@ -2568,7 +2608,7 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags, struct hrtimer_sleeper timeout, *to = NULL; struct rt_mutex_waiter rt_waiter; struct rt_mutex *pi_mutex = NULL; @@ -15139,7 +16357,7 @@ diff -Nur linux-4.1.26.orig/kernel/futex.c linux-4.1.26/kernel/futex.c union futex_key key2 = FUTEX_KEY_INIT; struct futex_q q = futex_q_init; int res, ret; -@@ -2593,10 +2627,7 @@ +@@ -2593,10 +2633,7 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags, * The waiter is allocated on our stack, manipulated by the requeue * code while we sleep on uaddr. */ @@ -15151,7 +16369,7 @@ diff -Nur linux-4.1.26.orig/kernel/futex.c linux-4.1.26/kernel/futex.c ret = get_futex_key(uaddr2, flags & FLAGS_SHARED, &key2, VERIFY_WRITE); if (unlikely(ret != 0)) -@@ -2627,20 +2658,55 @@ +@@ -2627,20 +2664,55 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags, /* Queue the futex_q, drop the hb lock, wait for wakeup. */ futex_wait_queue_me(hb, &q, to); @@ -15218,7 +16436,7 @@ diff -Nur linux-4.1.26.orig/kernel/futex.c linux-4.1.26/kernel/futex.c /* Check if the requeue code acquired the second futex for us. */ if (!q.rt_waiter) { -@@ -2649,14 +2715,15 @@ +@@ -2649,14 +2721,15 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags, * did a lock-steal - fix up the PI-state in that case. */ if (q.pi_state && (q.pi_state->owner != current)) { @@ -15236,7 +16454,7 @@ diff -Nur linux-4.1.26.orig/kernel/futex.c linux-4.1.26/kernel/futex.c } } else { /* -@@ -2669,7 +2736,8 @@ +@@ -2669,7 +2742,8 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags, ret = rt_mutex_finish_proxy_lock(pi_mutex, to, &rt_waiter); debug_rt_mutex_free_waiter(&rt_waiter); @@ -15246,10 +16464,11 @@ diff -Nur linux-4.1.26.orig/kernel/futex.c linux-4.1.26/kernel/futex.c /* * Fixup the pi_state owner and possibly acquire the lock if we * haven't already. -diff -Nur linux-4.1.26.orig/kernel/irq/handle.c linux-4.1.26/kernel/irq/handle.c ---- linux-4.1.26.orig/kernel/irq/handle.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/irq/handle.c 2016-06-19 15:30:58.691297504 +0200 -@@ -133,6 +133,8 @@ +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) irqreturn_t handle_irq_event_percpu(struct irq_desc *desc, struct irqaction *action) { @@ -15258,7 +16477,7 @@ diff -Nur linux-4.1.26.orig/kernel/irq/handle.c linux-4.1.26/kernel/irq/handle.c irqreturn_t retval = IRQ_NONE; unsigned int flags = 0, irq = desc->irq_data.irq; -@@ -173,7 +175,11 @@ +@@ -173,7 +175,11 @@ handle_irq_event_percpu(struct irq_desc *desc, struct irqaction *action) action = action->next; } while (action); @@ -15271,9 +16490,10 @@ diff -Nur linux-4.1.26.orig/kernel/irq/handle.c linux-4.1.26/kernel/irq/handle.c if (!noirqdebug) note_interrupt(irq, desc, retval); -diff -Nur linux-4.1.26.orig/kernel/irq/manage.c linux-4.1.26/kernel/irq/manage.c ---- linux-4.1.26.orig/kernel/irq/manage.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/irq/manage.c 2016-06-19 15:30:58.691297504 +0200 +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 @@ -22,6 +22,7 @@ #include "internals.h" @@ -15282,7 +16502,7 @@ diff -Nur linux-4.1.26.orig/kernel/irq/manage.c linux-4.1.26/kernel/irq/manage.c __read_mostly bool force_irqthreads; static int __init setup_forced_irqthreads(char *arg) -@@ -30,6 +31,7 @@ +@@ -30,6 +31,7 @@ static int __init setup_forced_irqthreads(char *arg) return 0; } early_param("threadirqs", setup_forced_irqthreads); @@ -15290,7 +16510,7 @@ diff -Nur linux-4.1.26.orig/kernel/irq/manage.c linux-4.1.26/kernel/irq/manage.c #endif static void __synchronize_hardirq(struct irq_desc *desc) -@@ -179,6 +181,62 @@ +@@ -179,6 +181,62 @@ static inline void irq_get_pending(struct cpumask *mask, struct irq_desc *desc) { } #endif @@ -15353,7 +16573,7 @@ diff -Nur linux-4.1.26.orig/kernel/irq/manage.c linux-4.1.26/kernel/irq/manage.c int irq_do_set_affinity(struct irq_data *data, const struct cpumask *mask, bool force) { -@@ -218,7 +276,17 @@ +@@ -218,7 +276,17 @@ int irq_set_affinity_locked(struct irq_data *data, const struct cpumask *mask, if (desc->affinity_notify) { kref_get(&desc->affinity_notify->kref); @@ -15371,7 +16591,7 @@ diff -Nur linux-4.1.26.orig/kernel/irq/manage.c linux-4.1.26/kernel/irq/manage.c } irqd_set(data, IRQD_AFFINITY_SET); -@@ -256,10 +324,8 @@ +@@ -256,10 +324,8 @@ int irq_set_affinity_hint(unsigned int irq, const struct cpumask *m) } EXPORT_SYMBOL_GPL(irq_set_affinity_hint); @@ -15383,7 +16603,7 @@ diff -Nur linux-4.1.26.orig/kernel/irq/manage.c linux-4.1.26/kernel/irq/manage.c struct irq_desc *desc = irq_to_desc(notify->irq); cpumask_var_t cpumask; unsigned long flags; -@@ -281,6 +347,13 @@ +@@ -281,6 +347,13 @@ out: kref_put(¬ify->kref, notify->release); } @@ -15397,7 +16617,7 @@ diff -Nur linux-4.1.26.orig/kernel/irq/manage.c linux-4.1.26/kernel/irq/manage.c /** * irq_set_affinity_notifier - control notification of IRQ affinity changes * @irq: Interrupt for which to enable/disable notification -@@ -310,6 +383,8 @@ +@@ -310,6 +383,8 @@ irq_set_affinity_notifier(unsigned int irq, struct irq_affinity_notify *notify) notify->irq = irq; kref_init(¬ify->kref); INIT_WORK(¬ify->work, irq_affinity_notify); @@ -15406,7 +16626,7 @@ diff -Nur linux-4.1.26.orig/kernel/irq/manage.c linux-4.1.26/kernel/irq/manage.c } raw_spin_lock_irqsave(&desc->lock, flags); -@@ -697,6 +772,12 @@ +@@ -697,6 +772,12 @@ static irqreturn_t irq_nested_primary_handler(int irq, void *dev_id) return IRQ_NONE; } @@ -15419,7 +16639,7 @@ diff -Nur linux-4.1.26.orig/kernel/irq/manage.c linux-4.1.26/kernel/irq/manage.c static int irq_wait_for_interrupt(struct irqaction *action) { set_current_state(TASK_INTERRUPTIBLE); -@@ -723,7 +804,8 @@ +@@ -723,7 +804,8 @@ static int irq_wait_for_interrupt(struct irqaction *action) static void irq_finalize_oneshot(struct irq_desc *desc, struct irqaction *action) { @@ -15429,7 +16649,7 @@ diff -Nur linux-4.1.26.orig/kernel/irq/manage.c linux-4.1.26/kernel/irq/manage.c return; again: chip_bus_lock(desc); -@@ -825,7 +907,15 @@ +@@ -825,7 +907,15 @@ irq_forced_thread_fn(struct irq_desc *desc, struct irqaction *action) local_bh_disable(); ret = action->thread_fn(action->irq, action->dev_id); irq_finalize_oneshot(desc, action); @@ -15446,7 +16666,7 @@ diff -Nur linux-4.1.26.orig/kernel/irq/manage.c linux-4.1.26/kernel/irq/manage.c return ret; } -@@ -877,6 +967,18 @@ +@@ -877,6 +967,18 @@ static void irq_thread_dtor(struct callback_head *unused) irq_finalize_oneshot(desc, action); } @@ -15465,13 +16685,14 @@ diff -Nur linux-4.1.26.orig/kernel/irq/manage.c linux-4.1.26/kernel/irq/manage.c /* * Interrupt handler thread */ -@@ -907,7 +1009,15 @@ +@@ -907,7 +1009,15 @@ static int irq_thread(void *data) 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, @@ -15481,7 +16702,7 @@ diff -Nur linux-4.1.26.orig/kernel/irq/manage.c linux-4.1.26/kernel/irq/manage.c wake_threads_waitq(desc); } -@@ -951,20 +1061,36 @@ +@@ -951,20 +1061,36 @@ void irq_wake_thread(unsigned int irq, void *dev_id) } EXPORT_SYMBOL_GPL(irq_wake_thread); @@ -15501,7 +16722,6 @@ diff -Nur linux-4.1.26.orig/kernel/irq/manage.c linux-4.1.26/kernel/irq/manage.c - 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 @@ -15517,7 +16737,7 @@ diff -Nur linux-4.1.26.orig/kernel/irq/manage.c linux-4.1.26/kernel/irq/manage.c + 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; @@ -15526,7 +16746,7 @@ diff -Nur linux-4.1.26.orig/kernel/irq/manage.c linux-4.1.26/kernel/irq/manage.c } static int irq_request_resources(struct irq_desc *desc) -@@ -984,6 +1110,48 @@ +@@ -984,6 +1110,48 @@ static void irq_release_resources(struct irq_desc *desc) c->irq_release_resources(d); } @@ -15575,7 +16795,7 @@ diff -Nur linux-4.1.26.orig/kernel/irq/manage.c linux-4.1.26/kernel/irq/manage.c /* * Internal function to register an irqaction - typically used to * allocate special interrupts that are part of the architecture. -@@ -1004,6 +1172,8 @@ +@@ -1004,6 +1172,8 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new) if (!try_module_get(desc->owner)) return -ENODEV; @@ -15584,7 +16804,7 @@ diff -Nur linux-4.1.26.orig/kernel/irq/manage.c linux-4.1.26/kernel/irq/manage.c /* * Check whether the interrupt nests into another interrupt * thread. -@@ -1021,8 +1191,11 @@ +@@ -1021,8 +1191,11 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new) */ new->handler = irq_nested_primary_handler; } else { @@ -15598,7 +16818,7 @@ diff -Nur linux-4.1.26.orig/kernel/irq/manage.c linux-4.1.26/kernel/irq/manage.c } /* -@@ -1031,37 +1204,14 @@ +@@ -1031,37 +1204,14 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new) * thread. */ if (new->thread_fn && !nested) { @@ -15642,7 +16862,7 @@ diff -Nur linux-4.1.26.orig/kernel/irq/manage.c linux-4.1.26/kernel/irq/manage.c } if (!alloc_cpumask_var(&mask, GFP_KERNEL)) { -@@ -1221,6 +1371,9 @@ +@@ -1221,6 +1371,9 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new) irqd_set(&desc->irq_data, IRQD_NO_BALANCING); } @@ -15652,7 +16872,7 @@ diff -Nur linux-4.1.26.orig/kernel/irq/manage.c linux-4.1.26/kernel/irq/manage.c /* Set default affinity mask once everything is setup */ setup_affinity(irq, desc, mask); -@@ -1234,7 +1387,6 @@ +@@ -1234,7 +1387,6 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new) irq, nmsk, omsk); } @@ -15660,7 +16880,7 @@ diff -Nur linux-4.1.26.orig/kernel/irq/manage.c linux-4.1.26/kernel/irq/manage.c *old_ptr = new; irq_pm_install_action(desc, new); -@@ -1260,6 +1412,8 @@ +@@ -1260,6 +1412,8 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new) */ if (new->thread) wake_up_process(new->thread); @@ -15669,7 +16889,7 @@ diff -Nur linux-4.1.26.orig/kernel/irq/manage.c linux-4.1.26/kernel/irq/manage.c register_irq_proc(irq, desc); new->dir = NULL; -@@ -1290,6 +1444,13 @@ +@@ -1290,6 +1444,13 @@ out_thread: kthread_stop(t); put_task_struct(t); } @@ -15683,7 +16903,7 @@ diff -Nur linux-4.1.26.orig/kernel/irq/manage.c linux-4.1.26/kernel/irq/manage.c out_mput: module_put(desc->owner); return ret; -@@ -1397,9 +1558,14 @@ +@@ -1397,9 +1558,14 @@ static struct irqaction *__free_irq(unsigned int irq, void *dev_id) if (action->thread) { kthread_stop(action->thread); put_task_struct(action->thread); @@ -15698,7 +16918,7 @@ diff -Nur linux-4.1.26.orig/kernel/irq/manage.c linux-4.1.26/kernel/irq/manage.c return action; } -@@ -1543,8 +1709,10 @@ +@@ -1543,8 +1709,10 @@ int request_threaded_irq(unsigned int irq, irq_handler_t handler, retval = __setup_irq(irq, desc, action); chip_bus_sync_unlock(desc); @@ -15710,10 +16930,11 @@ diff -Nur linux-4.1.26.orig/kernel/irq/manage.c linux-4.1.26/kernel/irq/manage.c #ifdef CONFIG_DEBUG_SHIRQ_FIXME if (!retval && (irqflags & IRQF_SHARED)) { -diff -Nur linux-4.1.26.orig/kernel/irq/settings.h linux-4.1.26/kernel/irq/settings.h ---- linux-4.1.26.orig/kernel/irq/settings.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/irq/settings.h 2016-06-19 15:30:58.691297504 +0200 -@@ -15,6 +15,7 @@ +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 { _IRQ_NESTED_THREAD = IRQ_NESTED_THREAD, _IRQ_PER_CPU_DEVID = IRQ_PER_CPU_DEVID, _IRQ_IS_POLLED = IRQ_IS_POLLED, @@ -15721,7 +16942,7 @@ diff -Nur linux-4.1.26.orig/kernel/irq/settings.h linux-4.1.26/kernel/irq/settin _IRQF_MODIFY_MASK = IRQF_MODIFY_MASK, }; -@@ -28,6 +29,7 @@ +@@ -28,6 +29,7 @@ enum { #define IRQ_NESTED_THREAD GOT_YOU_MORON #define IRQ_PER_CPU_DEVID GOT_YOU_MORON #define IRQ_IS_POLLED GOT_YOU_MORON @@ -15729,7 +16950,7 @@ diff -Nur linux-4.1.26.orig/kernel/irq/settings.h linux-4.1.26/kernel/irq/settin #undef IRQF_MODIFY_MASK #define IRQF_MODIFY_MASK GOT_YOU_MORON -@@ -38,6 +40,16 @@ +@@ -38,6 +40,16 @@ irq_settings_clr_and_set(struct irq_desc *desc, u32 clr, u32 set) desc->status_use_accessors |= (set & _IRQF_MODIFY_MASK); } @@ -15746,10 +16967,11 @@ diff -Nur linux-4.1.26.orig/kernel/irq/settings.h linux-4.1.26/kernel/irq/settin static inline bool irq_settings_is_per_cpu(struct irq_desc *desc) { return desc->status_use_accessors & _IRQ_PER_CPU; -diff -Nur linux-4.1.26.orig/kernel/irq/spurious.c linux-4.1.26/kernel/irq/spurious.c ---- linux-4.1.26.orig/kernel/irq/spurious.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/irq/spurious.c 2016-06-19 15:30:58.691297504 +0200 -@@ -444,6 +444,10 @@ +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"); static int __init irqfixup_setup(char *str) { @@ -15760,7 +16982,7 @@ diff -Nur linux-4.1.26.orig/kernel/irq/spurious.c linux-4.1.26/kernel/irq/spurio irqfixup = 1; printk(KERN_WARNING "Misrouted IRQ fixup support enabled.\n"); printk(KERN_WARNING "This may impact system performance.\n"); -@@ -456,6 +460,10 @@ +@@ -456,6 +460,10 @@ module_param(irqfixup, int, 0644); static int __init irqpoll_setup(char *str) { @@ -15771,9 +16993,10 @@ diff -Nur linux-4.1.26.orig/kernel/irq/spurious.c linux-4.1.26/kernel/irq/spurio irqfixup = 2; printk(KERN_WARNING "Misrouted IRQ fixup and polling support " "enabled\n"); -diff -Nur linux-4.1.26.orig/kernel/irq_work.c linux-4.1.26/kernel/irq_work.c ---- linux-4.1.26.orig/kernel/irq_work.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/irq_work.c 2016-06-19 15:30:58.691297504 +0200 +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 @@ -17,6 +17,7 @@ #include <linux/cpu.h> #include <linux/notifier.h> @@ -15782,7 +17005,7 @@ diff -Nur linux-4.1.26.orig/kernel/irq_work.c linux-4.1.26/kernel/irq_work.c #include <asm/processor.h> -@@ -65,6 +66,8 @@ +@@ -65,6 +66,8 @@ void __weak arch_irq_work_raise(void) */ bool irq_work_queue_on(struct irq_work *work, int cpu) { @@ -15791,7 +17014,7 @@ diff -Nur linux-4.1.26.orig/kernel/irq_work.c linux-4.1.26/kernel/irq_work.c /* All work should have been flushed before going offline */ WARN_ON_ONCE(cpu_is_offline(cpu)); -@@ -75,7 +78,12 @@ +@@ -75,7 +78,12 @@ bool irq_work_queue_on(struct irq_work *work, int cpu) if (!irq_work_claim(work)) return false; @@ -15805,7 +17028,7 @@ diff -Nur linux-4.1.26.orig/kernel/irq_work.c linux-4.1.26/kernel/irq_work.c arch_send_call_function_single_ipi(cpu); return true; -@@ -86,6 +94,9 @@ +@@ -86,6 +94,9 @@ EXPORT_SYMBOL_GPL(irq_work_queue_on); /* Enqueue the irq work @work on the current CPU */ bool irq_work_queue(struct irq_work *work) { @@ -15815,7 +17038,7 @@ diff -Nur linux-4.1.26.orig/kernel/irq_work.c linux-4.1.26/kernel/irq_work.c /* Only queue if not already pending */ if (!irq_work_claim(work)) return false; -@@ -93,13 +104,15 @@ +@@ -93,13 +104,15 @@ bool irq_work_queue(struct irq_work *work) /* Queue the entry and raise the IPI if needed. */ preempt_disable(); @@ -15838,7 +17061,7 @@ diff -Nur linux-4.1.26.orig/kernel/irq_work.c linux-4.1.26/kernel/irq_work.c arch_irq_work_raise(); } -@@ -116,9 +129,8 @@ +@@ -116,9 +129,8 @@ bool irq_work_needs_cpu(void) raised = this_cpu_ptr(&raised_list); lazy = this_cpu_ptr(&lazy_list); @@ -15850,7 +17073,7 @@ diff -Nur linux-4.1.26.orig/kernel/irq_work.c linux-4.1.26/kernel/irq_work.c /* All work should have been flushed before going offline */ WARN_ON_ONCE(cpu_is_offline(smp_processor_id())); -@@ -132,7 +144,7 @@ +@@ -132,7 +144,7 @@ static void irq_work_run_list(struct llist_head *list) struct irq_work *work; struct llist_node *llnode; @@ -15859,7 +17082,7 @@ diff -Nur linux-4.1.26.orig/kernel/irq_work.c linux-4.1.26/kernel/irq_work.c if (llist_empty(list)) return; -@@ -169,7 +181,16 @@ +@@ -169,7 +181,16 @@ static void irq_work_run_list(struct llist_head *list) void irq_work_run(void) { irq_work_run_list(this_cpu_ptr(&raised_list)); @@ -15877,7 +17100,7 @@ diff -Nur linux-4.1.26.orig/kernel/irq_work.c linux-4.1.26/kernel/irq_work.c } EXPORT_SYMBOL_GPL(irq_work_run); -@@ -179,8 +200,17 @@ +@@ -179,8 +200,17 @@ void irq_work_tick(void) if (!llist_empty(raised) && !arch_irq_work_has_interrupt()) irq_work_run_list(raised); @@ -15895,82 +17118,11 @@ diff -Nur linux-4.1.26.orig/kernel/irq_work.c linux-4.1.26/kernel/irq_work.c /* * Synchronize against the irq_work @entry, ensures the entry is not -diff -Nur linux-4.1.26.orig/kernel/Kconfig.locks linux-4.1.26/kernel/Kconfig.locks ---- linux-4.1.26.orig/kernel/Kconfig.locks 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/Kconfig.locks 2016-06-19 15:30:58.683297195 +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.26.orig/kernel/Kconfig.preempt linux-4.1.26/kernel/Kconfig.preempt ---- linux-4.1.26.orig/kernel/Kconfig.preempt 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/Kconfig.preempt 2016-06-19 15:30:58.683297195 +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.26.orig/kernel/ksysfs.c linux-4.1.26/kernel/ksysfs.c ---- linux-4.1.26.orig/kernel/ksysfs.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/ksysfs.c 2016-06-19 15:30:58.691297504 +0200 -@@ -136,6 +136,15 @@ +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); #endif /* CONFIG_KEXEC */ @@ -15986,7 +17138,7 @@ diff -Nur linux-4.1.26.orig/kernel/ksysfs.c linux-4.1.26/kernel/ksysfs.c /* whether file capabilities are enabled */ static ssize_t fscaps_show(struct kobject *kobj, struct kobj_attribute *attr, char *buf) -@@ -203,6 +212,9 @@ +@@ -203,6 +212,9 @@ static struct attribute * kernel_attrs[] = { &vmcoreinfo_attr.attr, #endif &rcu_expedited_attr.attr, @@ -15996,9 +17148,45 @@ diff -Nur linux-4.1.26.orig/kernel/ksysfs.c linux-4.1.26/kernel/ksysfs.c NULL }; -diff -Nur linux-4.1.26.orig/kernel/locking/lglock.c linux-4.1.26/kernel/locking/lglock.c ---- linux-4.1.26.orig/kernel/locking/lglock.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/locking/lglock.c 2016-06-19 15:30:58.691297504 +0200 +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 @@ -4,6 +4,15 @@ #include <linux/cpu.h> #include <linux/string.h> @@ -16088,7 +17276,7 @@ diff -Nur linux-4.1.26.orig/kernel/locking/lglock.c linux-4.1.26/kernel/locking/ } EXPORT_SYMBOL(lg_local_unlock_cpu); -@@ -64,12 +82,12 @@ +@@ -64,12 +82,12 @@ void lg_global_lock(struct lglock *lg) { int i; @@ -16104,7 +17292,7 @@ diff -Nur linux-4.1.26.orig/kernel/locking/lglock.c linux-4.1.26/kernel/locking/ } } EXPORT_SYMBOL(lg_global_lock); -@@ -80,10 +98,35 @@ +@@ -80,10 +98,35 @@ void lg_global_unlock(struct lglock *lg) lock_release(&lg->lock_dep_map, 1, _RET_IP_); for_each_possible_cpu(i) { @@ -16143,10 +17331,11 @@ diff -Nur linux-4.1.26.orig/kernel/locking/lglock.c linux-4.1.26/kernel/locking/ + } +} +#endif -diff -Nur linux-4.1.26.orig/kernel/locking/lockdep.c linux-4.1.26/kernel/locking/lockdep.c ---- linux-4.1.26.orig/kernel/locking/lockdep.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/locking/lockdep.c 2016-06-19 15:30:58.691297504 +0200 -@@ -3563,6 +3563,7 @@ +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) } } @@ -16154,7 +17343,7 @@ diff -Nur linux-4.1.26.orig/kernel/locking/lockdep.c linux-4.1.26/kernel/locking /* * We dont accurately track softirq state in e.g. * hardirq contexts (such as on 4KSTACKS), so only -@@ -3577,6 +3578,7 @@ +@@ -3577,6 +3578,7 @@ static void check_flags(unsigned long flags) DEBUG_LOCKS_WARN_ON(!current->softirqs_enabled); } } @@ -16162,9 +17351,10 @@ diff -Nur linux-4.1.26.orig/kernel/locking/lockdep.c linux-4.1.26/kernel/locking if (!debug_locks) print_irqtrace_events(current); -diff -Nur linux-4.1.26.orig/kernel/locking/locktorture.c linux-4.1.26/kernel/locking/locktorture.c ---- linux-4.1.26.orig/kernel/locking/locktorture.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/locking/locktorture.c 2016-06-19 15:30:58.695297658 +0200 +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 @@ -24,7 +24,6 @@ #include <linux/module.h> #include <linux/kthread.h> @@ -16173,43 +17363,11 @@ diff -Nur linux-4.1.26.orig/kernel/locking/locktorture.c linux-4.1.26/kernel/loc #include <linux/mutex.h> #include <linux/rwsem.h> #include <linux/smp.h> -diff -Nur linux-4.1.26.orig/kernel/locking/Makefile linux-4.1.26/kernel/locking/Makefile ---- linux-4.1.26.orig/kernel/locking/Makefile 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/locking/Makefile 2016-06-19 15:30:58.691297504 +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.26.orig/kernel/locking/rt.c linux-4.1.26/kernel/locking/rt.c ---- linux-4.1.26.orig/kernel/locking/rt.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-4.1.26/kernel/locking/rt.c 2016-06-19 15:30:58.695297658 +0200 +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 @@ -0,0 +1,461 @@ +/* + * kernel/rt.c @@ -16672,9 +17830,10 @@ diff -Nur linux-4.1.26.orig/kernel/locking/rt.c linux-4.1.26/kernel/locking/rt.c + return 1; +} +EXPORT_SYMBOL(atomic_dec_and_mutex_lock); -diff -Nur linux-4.1.26.orig/kernel/locking/rtmutex.c linux-4.1.26/kernel/locking/rtmutex.c ---- linux-4.1.26.orig/kernel/locking/rtmutex.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/locking/rtmutex.c 2016-06-19 15:30:58.695297658 +0200 +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 @@ -7,6 +7,11 @@ * Copyright (C) 2005-2006 Timesys Corp., Thomas Gleixner <tglx@timesys.com> * Copyright (C) 2005 Kihon Technologies Inc., Steven Rostedt @@ -16695,7 +17854,7 @@ diff -Nur linux-4.1.26.orig/kernel/locking/rtmutex.c linux-4.1.26/kernel/locking #include "rtmutex_common.h" -@@ -69,6 +75,12 @@ +@@ -69,6 +75,12 @@ static void fixup_rt_mutex_waiters(struct rt_mutex *lock) clear_rt_mutex_waiters(lock); } @@ -16708,7 +17867,7 @@ diff -Nur linux-4.1.26.orig/kernel/locking/rtmutex.c linux-4.1.26/kernel/locking /* * 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 @@ +@@ -300,7 +312,7 @@ static void __rt_mutex_adjust_prio(struct task_struct *task) * of task. We do not use the spin_xx_mutex() variants here as we are * outside of the debug path.) */ @@ -16717,7 +17876,7 @@ diff -Nur linux-4.1.26.orig/kernel/locking/rtmutex.c linux-4.1.26/kernel/locking { unsigned long flags; -@@ -335,6 +347,14 @@ +@@ -335,6 +347,14 @@ static bool rt_mutex_cond_detect_deadlock(struct rt_mutex_waiter *waiter, return debug_rt_mutex_detect_deadlock(waiter, chwalk); } @@ -16732,7 +17891,7 @@ diff -Nur linux-4.1.26.orig/kernel/locking/rtmutex.c linux-4.1.26/kernel/locking /* * Max number of times we'll walk the boosting chain: */ -@@ -342,7 +362,8 @@ +@@ -342,7 +362,8 @@ int max_lock_depth = 1024; static inline struct rt_mutex *task_blocked_on_lock(struct task_struct *p) { @@ -16742,7 +17901,7 @@ diff -Nur linux-4.1.26.orig/kernel/locking/rtmutex.c linux-4.1.26/kernel/locking } /* -@@ -479,7 +500,7 @@ +@@ -479,7 +500,7 @@ static int rt_mutex_adjust_prio_chain(struct task_struct *task, * reached or the state of the chain has changed while we * dropped the locks. */ @@ -16751,7 +17910,7 @@ diff -Nur linux-4.1.26.orig/kernel/locking/rtmutex.c linux-4.1.26/kernel/locking goto out_unlock_pi; /* -@@ -641,13 +662,16 @@ +@@ -641,13 +662,16 @@ static int rt_mutex_adjust_prio_chain(struct task_struct *task, * follow here. This is the end of the chain we are walking. */ if (!rt_mutex_owner(lock)) { @@ -16770,7 +17929,7 @@ diff -Nur linux-4.1.26.orig/kernel/locking/rtmutex.c linux-4.1.26/kernel/locking raw_spin_unlock(&lock->wait_lock); return 0; } -@@ -740,6 +764,25 @@ +@@ -740,6 +764,25 @@ static int rt_mutex_adjust_prio_chain(struct task_struct *task, return ret; } @@ -16796,7 +17955,7 @@ diff -Nur linux-4.1.26.orig/kernel/locking/rtmutex.c linux-4.1.26/kernel/locking /* * Try to take an rt-mutex * -@@ -750,8 +793,9 @@ +@@ -750,8 +793,9 @@ static int rt_mutex_adjust_prio_chain(struct task_struct *task, * @waiter: The waiter that is queued to the lock's wait list if the * callsite called task_blocked_on_lock(), otherwise NULL */ @@ -16808,7 +17967,7 @@ diff -Nur linux-4.1.26.orig/kernel/locking/rtmutex.c linux-4.1.26/kernel/locking { unsigned long flags; -@@ -790,8 +834,10 @@ +@@ -790,8 +834,10 @@ static int try_to_take_rt_mutex(struct rt_mutex *lock, struct task_struct *task, * If waiter is not the highest priority waiter of * @lock, give up. */ @@ -16820,7 +17979,7 @@ diff -Nur linux-4.1.26.orig/kernel/locking/rtmutex.c linux-4.1.26/kernel/locking /* * We can acquire the lock. Remove the waiter from the -@@ -809,14 +855,10 @@ +@@ -809,14 +855,10 @@ static int try_to_take_rt_mutex(struct rt_mutex *lock, struct task_struct *task, * not need to be dequeued. */ if (rt_mutex_has_waiters(lock)) { @@ -16838,7 +17997,7 @@ diff -Nur linux-4.1.26.orig/kernel/locking/rtmutex.c linux-4.1.26/kernel/locking /* * The current top waiter stays enqueued. We * don't have to change anything in the lock -@@ -865,6 +907,347 @@ +@@ -865,6 +907,347 @@ takeit: return 1; } @@ -17186,7 +18345,7 @@ diff -Nur linux-4.1.26.orig/kernel/locking/rtmutex.c linux-4.1.26/kernel/locking /* * Task blocks on lock. * -@@ -896,6 +1279,23 @@ +@@ -896,6 +1279,23 @@ static int task_blocks_on_rt_mutex(struct rt_mutex *lock, return -EDEADLK; raw_spin_lock_irqsave(&task->pi_lock, flags); @@ -17210,7 +18369,7 @@ diff -Nur linux-4.1.26.orig/kernel/locking/rtmutex.c linux-4.1.26/kernel/locking __rt_mutex_adjust_prio(task); waiter->task = task; waiter->lock = lock; -@@ -919,7 +1319,7 @@ +@@ -919,7 +1319,7 @@ static int task_blocks_on_rt_mutex(struct rt_mutex *lock, rt_mutex_enqueue_pi(owner, waiter); __rt_mutex_adjust_prio(owner); @@ -17219,7 +18378,7 @@ diff -Nur linux-4.1.26.orig/kernel/locking/rtmutex.c linux-4.1.26/kernel/locking chain_walk = 1; } else if (rt_mutex_cond_detect_deadlock(waiter, chwalk)) { chain_walk = 1; -@@ -957,8 +1357,9 @@ +@@ -957,8 +1357,9 @@ static int task_blocks_on_rt_mutex(struct rt_mutex *lock, /* * Wake up the next waiter on the lock. * @@ -17231,7 +18390,7 @@ diff -Nur linux-4.1.26.orig/kernel/locking/rtmutex.c linux-4.1.26/kernel/locking * * Called with lock->wait_lock held. */ -@@ -996,7 +1397,7 @@ +@@ -996,7 +1397,7 @@ static void wakeup_next_waiter(struct rt_mutex *lock) * long as we hold lock->wait_lock. The waiter task needs to * acquire it in order to dequeue the waiter. */ @@ -17240,7 +18399,7 @@ diff -Nur linux-4.1.26.orig/kernel/locking/rtmutex.c linux-4.1.26/kernel/locking } /* -@@ -1010,7 +1411,7 @@ +@@ -1010,7 +1411,7 @@ static void remove_waiter(struct rt_mutex *lock, { bool is_top_waiter = (waiter == rt_mutex_top_waiter(lock)); struct task_struct *owner = rt_mutex_owner(lock); @@ -17249,7 +18408,7 @@ diff -Nur linux-4.1.26.orig/kernel/locking/rtmutex.c linux-4.1.26/kernel/locking unsigned long flags; raw_spin_lock_irqsave(¤t->pi_lock, flags); -@@ -1035,7 +1436,8 @@ +@@ -1035,7 +1436,8 @@ static void remove_waiter(struct rt_mutex *lock, __rt_mutex_adjust_prio(owner); /* Store the lock on which owner is blocked or NULL */ @@ -17259,7 +18418,7 @@ diff -Nur linux-4.1.26.orig/kernel/locking/rtmutex.c linux-4.1.26/kernel/locking raw_spin_unlock_irqrestore(&owner->pi_lock, flags); -@@ -1071,17 +1473,17 @@ +@@ -1071,17 +1473,17 @@ void rt_mutex_adjust_pi(struct task_struct *task) raw_spin_lock_irqsave(&task->pi_lock, flags); waiter = task->pi_blocked_on; @@ -17279,7 +18438,7 @@ diff -Nur linux-4.1.26.orig/kernel/locking/rtmutex.c linux-4.1.26/kernel/locking rt_mutex_adjust_prio_chain(task, RT_MUTEX_MIN_CHAINWALK, NULL, next_lock, NULL, task); } -@@ -1099,7 +1501,8 @@ +@@ -1099,7 +1501,8 @@ void rt_mutex_adjust_pi(struct task_struct *task) static int __sched __rt_mutex_slowlock(struct rt_mutex *lock, int state, struct hrtimer_sleeper *timeout, @@ -17289,7 +18448,7 @@ diff -Nur linux-4.1.26.orig/kernel/locking/rtmutex.c linux-4.1.26/kernel/locking { int ret = 0; -@@ -1122,6 +1525,12 @@ +@@ -1122,6 +1525,12 @@ __rt_mutex_slowlock(struct rt_mutex *lock, int state, break; } @@ -17302,7 +18461,7 @@ diff -Nur linux-4.1.26.orig/kernel/locking/rtmutex.c linux-4.1.26/kernel/locking raw_spin_unlock(&lock->wait_lock); debug_rt_mutex_print_deadlock(waiter); -@@ -1156,25 +1565,102 @@ +@@ -1156,25 +1565,102 @@ static void rt_mutex_handle_deadlock(int res, int detect_deadlock, } } @@ -17409,7 +18568,7 @@ diff -Nur linux-4.1.26.orig/kernel/locking/rtmutex.c linux-4.1.26/kernel/locking raw_spin_unlock(&lock->wait_lock); return 0; } -@@ -1192,13 +1678,23 @@ +@@ -1192,13 +1678,23 @@ rt_mutex_slowlock(struct rt_mutex *lock, int state, if (likely(!ret)) /* sleep on the mutex */ @@ -17435,7 +18594,7 @@ diff -Nur linux-4.1.26.orig/kernel/locking/rtmutex.c linux-4.1.26/kernel/locking } /* -@@ -1255,7 +1751,7 @@ +@@ -1255,7 +1751,7 @@ static inline int rt_mutex_slowtrylock(struct rt_mutex *lock) /* * Slow path to release a rt-mutex: */ @@ -17444,7 +18603,7 @@ diff -Nur linux-4.1.26.orig/kernel/locking/rtmutex.c linux-4.1.26/kernel/locking rt_mutex_slowunlock(struct rt_mutex *lock) { raw_spin_lock(&lock->wait_lock); -@@ -1298,7 +1794,7 @@ +@@ -1298,7 +1794,7 @@ rt_mutex_slowunlock(struct rt_mutex *lock) while (!rt_mutex_has_waiters(lock)) { /* Drops lock->wait_lock ! */ if (unlock_rt_mutex_safe(lock) == true) @@ -17453,7 +18612,7 @@ diff -Nur linux-4.1.26.orig/kernel/locking/rtmutex.c linux-4.1.26/kernel/locking /* Relock the rtmutex and try again */ raw_spin_lock(&lock->wait_lock); } -@@ -1311,8 +1807,7 @@ +@@ -1311,8 +1807,7 @@ rt_mutex_slowunlock(struct rt_mutex *lock) raw_spin_unlock(&lock->wait_lock); @@ -17463,7 +18622,7 @@ diff -Nur linux-4.1.26.orig/kernel/locking/rtmutex.c linux-4.1.26/kernel/locking } /* -@@ -1323,31 +1818,36 @@ +@@ -1323,31 +1818,36 @@ rt_mutex_slowunlock(struct rt_mutex *lock) */ static inline int rt_mutex_fastlock(struct rt_mutex *lock, int state, @@ -17504,7 +18663,7 @@ diff -Nur linux-4.1.26.orig/kernel/locking/rtmutex.c linux-4.1.26/kernel/locking } static inline int -@@ -1363,12 +1863,14 @@ +@@ -1363,12 +1863,14 @@ rt_mutex_fasttrylock(struct rt_mutex *lock, static inline void rt_mutex_fastunlock(struct rt_mutex *lock, @@ -17523,7 +18682,7 @@ diff -Nur linux-4.1.26.orig/kernel/locking/rtmutex.c linux-4.1.26/kernel/locking } /** -@@ -1380,7 +1882,7 @@ +@@ -1380,7 +1882,7 @@ void __sched rt_mutex_lock(struct rt_mutex *lock) { might_sleep(); @@ -17532,7 +18691,7 @@ diff -Nur linux-4.1.26.orig/kernel/locking/rtmutex.c linux-4.1.26/kernel/locking } EXPORT_SYMBOL_GPL(rt_mutex_lock); -@@ -1397,7 +1899,7 @@ +@@ -1397,7 +1899,7 @@ int __sched rt_mutex_lock_interruptible(struct rt_mutex *lock) { might_sleep(); @@ -17541,7 +18700,7 @@ diff -Nur linux-4.1.26.orig/kernel/locking/rtmutex.c linux-4.1.26/kernel/locking } EXPORT_SYMBOL_GPL(rt_mutex_lock_interruptible); -@@ -1410,11 +1912,30 @@ +@@ -1410,11 +1912,30 @@ int rt_mutex_timed_futex_lock(struct rt_mutex *lock, might_sleep(); return rt_mutex_timed_fastlock(lock, TASK_INTERRUPTIBLE, timeout, @@ -17573,7 +18732,7 @@ diff -Nur linux-4.1.26.orig/kernel/locking/rtmutex.c linux-4.1.26/kernel/locking * rt_mutex_timed_lock - lock a rt_mutex interruptible * the timeout structure is provided * by the caller -@@ -1434,6 +1955,7 @@ +@@ -1434,6 +1955,7 @@ rt_mutex_timed_lock(struct rt_mutex *lock, struct hrtimer_sleeper *timeout) return rt_mutex_timed_fastlock(lock, TASK_INTERRUPTIBLE, timeout, RT_MUTEX_MIN_CHAINWALK, @@ -17581,7 +18740,7 @@ diff -Nur linux-4.1.26.orig/kernel/locking/rtmutex.c linux-4.1.26/kernel/locking rt_mutex_slowlock); } EXPORT_SYMBOL_GPL(rt_mutex_timed_lock); -@@ -1463,6 +1985,22 @@ +@@ -1463,6 +1985,22 @@ void __sched rt_mutex_unlock(struct rt_mutex *lock) EXPORT_SYMBOL_GPL(rt_mutex_unlock); /** @@ -17604,7 +18763,7 @@ diff -Nur linux-4.1.26.orig/kernel/locking/rtmutex.c linux-4.1.26/kernel/locking * rt_mutex_destroy - mark a mutex unusable * @lock: the mutex to be destroyed * -@@ -1492,13 +2030,12 @@ +@@ -1492,13 +2030,12 @@ EXPORT_SYMBOL_GPL(rt_mutex_destroy); void __rt_mutex_init(struct rt_mutex *lock, const char *name) { lock->owner = NULL; @@ -17619,7 +18778,7 @@ diff -Nur linux-4.1.26.orig/kernel/locking/rtmutex.c linux-4.1.26/kernel/locking /** * rt_mutex_init_proxy_locked - initialize and lock a rt_mutex on behalf of a -@@ -1513,7 +2050,7 @@ +@@ -1513,7 +2050,7 @@ EXPORT_SYMBOL_GPL(__rt_mutex_init); void rt_mutex_init_proxy_locked(struct rt_mutex *lock, struct task_struct *proxy_owner) { @@ -17628,7 +18787,7 @@ diff -Nur linux-4.1.26.orig/kernel/locking/rtmutex.c linux-4.1.26/kernel/locking 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 @@ +@@ -1561,6 +2098,35 @@ int rt_mutex_start_proxy_lock(struct rt_mutex *lock, return 1; } @@ -17664,7 +18823,7 @@ diff -Nur linux-4.1.26.orig/kernel/locking/rtmutex.c linux-4.1.26/kernel/locking /* We enforce deadlock detection for futexes */ ret = task_blocks_on_rt_mutex(lock, waiter, task, RT_MUTEX_FULL_CHAINWALK); -@@ -1575,7 +2141,7 @@ +@@ -1575,7 +2141,7 @@ int rt_mutex_start_proxy_lock(struct rt_mutex *lock, ret = 0; } @@ -17673,7 +18832,7 @@ diff -Nur linux-4.1.26.orig/kernel/locking/rtmutex.c linux-4.1.26/kernel/locking remove_waiter(lock, waiter); raw_spin_unlock(&lock->wait_lock); -@@ -1631,7 +2197,7 @@ +@@ -1631,7 +2197,7 @@ int rt_mutex_finish_proxy_lock(struct rt_mutex *lock, set_current_state(TASK_INTERRUPTIBLE); /* sleep on the mutex */ @@ -17682,7 +18841,7 @@ diff -Nur linux-4.1.26.orig/kernel/locking/rtmutex.c linux-4.1.26/kernel/locking if (unlikely(ret)) remove_waiter(lock, waiter); -@@ -1646,3 +2212,89 @@ +@@ -1646,3 +2212,89 @@ int rt_mutex_finish_proxy_lock(struct rt_mutex *lock, return ret; } @@ -17772,10 +18931,11 @@ diff -Nur linux-4.1.26.orig/kernel/locking/rtmutex.c linux-4.1.26/kernel/locking +} +EXPORT_SYMBOL(ww_mutex_unlock); +#endif -diff -Nur linux-4.1.26.orig/kernel/locking/rtmutex_common.h linux-4.1.26/kernel/locking/rtmutex_common.h ---- linux-4.1.26.orig/kernel/locking/rtmutex_common.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/locking/rtmutex_common.h 2016-06-19 15:30:58.695297658 +0200 -@@ -49,6 +49,7 @@ +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 { struct rb_node pi_tree_entry; struct task_struct *task; struct rt_mutex *lock; @@ -17783,7 +18943,7 @@ diff -Nur linux-4.1.26.orig/kernel/locking/rtmutex_common.h linux-4.1.26/kernel/ #ifdef CONFIG_DEBUG_RT_MUTEXES unsigned long ip; struct pid *deadlock_task_pid; -@@ -119,6 +120,9 @@ +@@ -119,6 +120,9 @@ enum rtmutex_chainwalk { /* * PI-futex support (proxy locking functions, etc.): */ @@ -17793,7 +18953,7 @@ diff -Nur linux-4.1.26.orig/kernel/locking/rtmutex_common.h linux-4.1.26/kernel/ 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 @@ +@@ -132,10 +136,24 @@ extern int rt_mutex_finish_proxy_lock(struct rt_mutex *lock, struct rt_mutex_waiter *waiter); extern int rt_mutex_timed_futex_lock(struct rt_mutex *l, struct hrtimer_sleeper *to); @@ -17818,10 +18978,11 @@ diff -Nur linux-4.1.26.orig/kernel/locking/rtmutex_common.h linux-4.1.26/kernel/ +} + #endif -diff -Nur linux-4.1.26.orig/kernel/locking/spinlock.c linux-4.1.26/kernel/locking/spinlock.c ---- linux-4.1.26.orig/kernel/locking/spinlock.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/locking/spinlock.c 2016-06-19 15:30:58.695297658 +0200 -@@ -124,8 +124,11 @@ +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) \ * __[spin|read|write]_lock_bh() */ BUILD_LOCK_OPS(spin, raw_spinlock); @@ -17833,7 +18994,7 @@ diff -Nur linux-4.1.26.orig/kernel/locking/spinlock.c linux-4.1.26/kernel/lockin #endif -@@ -209,6 +212,8 @@ +@@ -209,6 +212,8 @@ void __lockfunc _raw_spin_unlock_bh(raw_spinlock_t *lock) EXPORT_SYMBOL(_raw_spin_unlock_bh); #endif @@ -17842,7 +19003,7 @@ diff -Nur linux-4.1.26.orig/kernel/locking/spinlock.c linux-4.1.26/kernel/lockin #ifndef CONFIG_INLINE_READ_TRYLOCK int __lockfunc _raw_read_trylock(rwlock_t *lock) { -@@ -353,6 +358,8 @@ +@@ -353,6 +358,8 @@ void __lockfunc _raw_write_unlock_bh(rwlock_t *lock) EXPORT_SYMBOL(_raw_write_unlock_bh); #endif @@ -17851,10 +19012,11 @@ diff -Nur linux-4.1.26.orig/kernel/locking/spinlock.c linux-4.1.26/kernel/lockin #ifdef CONFIG_DEBUG_LOCK_ALLOC void __lockfunc _raw_spin_lock_nested(raw_spinlock_t *lock, int subclass) -diff -Nur linux-4.1.26.orig/kernel/locking/spinlock_debug.c linux-4.1.26/kernel/locking/spinlock_debug.c ---- linux-4.1.26.orig/kernel/locking/spinlock_debug.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/locking/spinlock_debug.c 2016-06-19 15:30:58.695297658 +0200 -@@ -31,6 +31,7 @@ +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, EXPORT_SYMBOL(__raw_spin_lock_init); @@ -17862,7 +19024,7 @@ diff -Nur linux-4.1.26.orig/kernel/locking/spinlock_debug.c linux-4.1.26/kernel/ void __rwlock_init(rwlock_t *lock, const char *name, struct lock_class_key *key) { -@@ -48,6 +49,7 @@ +@@ -48,6 +49,7 @@ void __rwlock_init(rwlock_t *lock, const char *name, } EXPORT_SYMBOL(__rwlock_init); @@ -17870,7 +19032,7 @@ diff -Nur linux-4.1.26.orig/kernel/locking/spinlock_debug.c linux-4.1.26/kernel/ static void spin_dump(raw_spinlock_t *lock, const char *msg) { -@@ -159,6 +161,7 @@ +@@ -159,6 +161,7 @@ void do_raw_spin_unlock(raw_spinlock_t *lock) arch_spin_unlock(&lock->raw_lock); } @@ -17878,16 +19040,17 @@ diff -Nur linux-4.1.26.orig/kernel/locking/spinlock_debug.c linux-4.1.26/kernel/ static void rwlock_bug(rwlock_t *lock, const char *msg) { if (!debug_locks_off()) -@@ -300,3 +303,5 @@ +@@ -300,3 +303,5 @@ void do_raw_write_unlock(rwlock_t *lock) debug_write_unlock(lock); arch_write_unlock(&lock->raw_lock); } + +#endif -diff -Nur linux-4.1.26.orig/kernel/panic.c linux-4.1.26/kernel/panic.c ---- linux-4.1.26.orig/kernel/panic.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/panic.c 2016-06-19 15:30:58.695297658 +0200 -@@ -399,9 +399,11 @@ +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; static int init_oops_id(void) { @@ -17899,10 +19062,11 @@ diff -Nur linux-4.1.26.orig/kernel/panic.c linux-4.1.26/kernel/panic.c oops_id++; return 0; -diff -Nur linux-4.1.26.orig/kernel/power/hibernate.c linux-4.1.26/kernel/power/hibernate.c ---- linux-4.1.26.orig/kernel/power/hibernate.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/power/hibernate.c 2016-06-19 15:30:58.695297658 +0200 -@@ -285,6 +285,8 @@ +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) local_irq_disable(); @@ -17911,7 +19075,7 @@ diff -Nur linux-4.1.26.orig/kernel/power/hibernate.c linux-4.1.26/kernel/power/h error = syscore_suspend(); if (error) { printk(KERN_ERR "PM: Some system devices failed to power down, " -@@ -314,6 +316,7 @@ +@@ -314,6 +316,7 @@ static int create_image(int platform_mode) syscore_resume(); Enable_irqs: @@ -17919,7 +19083,7 @@ diff -Nur linux-4.1.26.orig/kernel/power/hibernate.c linux-4.1.26/kernel/power/h local_irq_enable(); Enable_cpus: -@@ -437,6 +440,7 @@ +@@ -437,6 +440,7 @@ static int resume_target_kernel(bool platform_mode) goto Enable_cpus; local_irq_disable(); @@ -17927,7 +19091,7 @@ diff -Nur linux-4.1.26.orig/kernel/power/hibernate.c linux-4.1.26/kernel/power/h error = syscore_suspend(); if (error) -@@ -470,6 +474,7 @@ +@@ -470,6 +474,7 @@ static int resume_target_kernel(bool platform_mode) syscore_resume(); Enable_irqs: @@ -17935,7 +19099,7 @@ diff -Nur linux-4.1.26.orig/kernel/power/hibernate.c linux-4.1.26/kernel/power/h local_irq_enable(); Enable_cpus: -@@ -555,6 +560,7 @@ +@@ -555,6 +560,7 @@ int hibernation_platform_enter(void) goto Platform_finish; local_irq_disable(); @@ -17943,7 +19107,7 @@ diff -Nur linux-4.1.26.orig/kernel/power/hibernate.c linux-4.1.26/kernel/power/h syscore_suspend(); if (pm_wakeup_pending()) { error = -EAGAIN; -@@ -567,6 +573,7 @@ +@@ -567,6 +573,7 @@ int hibernation_platform_enter(void) Power_up: syscore_resume(); @@ -17951,10 +19115,11 @@ diff -Nur linux-4.1.26.orig/kernel/power/hibernate.c linux-4.1.26/kernel/power/h local_irq_enable(); enable_nonboot_cpus(); -diff -Nur linux-4.1.26.orig/kernel/power/suspend.c linux-4.1.26/kernel/power/suspend.c ---- linux-4.1.26.orig/kernel/power/suspend.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/power/suspend.c 2016-06-19 15:30:58.695297658 +0200 -@@ -356,6 +356,8 @@ +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) arch_suspend_disable_irqs(); BUG_ON(!irqs_disabled()); @@ -17963,7 +19128,7 @@ diff -Nur linux-4.1.26.orig/kernel/power/suspend.c linux-4.1.26/kernel/power/sus error = syscore_suspend(); if (!error) { *wakeup = pm_wakeup_pending(); -@@ -370,6 +372,8 @@ +@@ -370,6 +372,8 @@ static int suspend_enter(suspend_state_t state, bool *wakeup) syscore_resume(); } @@ -17972,10 +19137,11 @@ diff -Nur linux-4.1.26.orig/kernel/power/suspend.c linux-4.1.26/kernel/power/sus arch_suspend_enable_irqs(); BUG_ON(irqs_disabled()); -diff -Nur linux-4.1.26.orig/kernel/printk/printk.c linux-4.1.26/kernel/printk/printk.c ---- linux-4.1.26.orig/kernel/printk/printk.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/printk/printk.c 2016-06-19 15:30:58.695297658 +0200 -@@ -1163,6 +1163,7 @@ +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) { char *text; int len = 0; @@ -17983,7 +19149,7 @@ diff -Nur linux-4.1.26.orig/kernel/printk/printk.c linux-4.1.26/kernel/printk/pr text = kmalloc(LOG_LINE_MAX + PREFIX_MAX, GFP_KERNEL); if (!text) -@@ -1174,7 +1175,14 @@ +@@ -1174,7 +1175,14 @@ static int syslog_print_all(char __user *buf, int size, bool clear) u64 seq; u32 idx; enum log_flags prev; @@ -17999,7 +19165,7 @@ diff -Nur linux-4.1.26.orig/kernel/printk/printk.c linux-4.1.26/kernel/printk/pr if (clear_seq < log_first_seq) { /* messages are gone, move to first available one */ clear_seq = log_first_seq; -@@ -1195,6 +1203,14 @@ +@@ -1195,6 +1203,14 @@ static int syslog_print_all(char __user *buf, int size, bool clear) prev = msg->flags; idx = log_next(idx); seq++; @@ -18014,7 +19180,7 @@ diff -Nur linux-4.1.26.orig/kernel/printk/printk.c linux-4.1.26/kernel/printk/pr } /* move first record forward until length fits into the buffer */ -@@ -1208,6 +1224,14 @@ +@@ -1208,6 +1224,14 @@ static int syslog_print_all(char __user *buf, int size, bool clear) prev = msg->flags; idx = log_next(idx); seq++; @@ -18029,7 +19195,7 @@ diff -Nur linux-4.1.26.orig/kernel/printk/printk.c linux-4.1.26/kernel/printk/pr } /* last message fitting into this dump */ -@@ -1248,6 +1272,7 @@ +@@ -1248,6 +1272,7 @@ static int syslog_print_all(char __user *buf, int size, bool clear) clear_seq = log_next_seq; clear_idx = log_next_idx; } @@ -18037,15 +19203,20 @@ diff -Nur linux-4.1.26.orig/kernel/printk/printk.c linux-4.1.26/kernel/printk/pr raw_spin_unlock_irq(&logbuf_lock); kfree(text); -@@ -1401,6 +1426,7 @@ +@@ -1401,6 +1426,12 @@ static void call_console_drivers(int level, const char *text, size_t len) if (!console_drivers) return; ++ if (IS_ENABLED(CONFIG_PREEMPT_RT_BASE)) { ++ if (in_irq() || in_nmi()) ++ return; ++ } ++ + migrate_disable(); for_each_console(con) { if (exclusive_console && con != exclusive_console) continue; -@@ -1413,6 +1439,7 @@ +@@ -1413,6 +1444,7 @@ static void call_console_drivers(int level, const char *text, size_t len) continue; con->write(con, text, len); } @@ -18053,7 +19224,7 @@ diff -Nur linux-4.1.26.orig/kernel/printk/printk.c linux-4.1.26/kernel/printk/pr } /* -@@ -1473,6 +1500,15 @@ +@@ -1473,6 +1505,15 @@ static inline int can_use_console(unsigned int cpu) static int console_trylock_for_printk(void) { unsigned int cpu = smp_processor_id(); @@ -18069,7 +19240,7 @@ diff -Nur linux-4.1.26.orig/kernel/printk/printk.c linux-4.1.26/kernel/printk/pr if (!console_trylock()) return 0; -@@ -1607,6 +1643,62 @@ +@@ -1607,6 +1648,62 @@ static size_t cont_print_text(char *text, size_t size) return textlen; } @@ -18132,7 +19303,7 @@ diff -Nur linux-4.1.26.orig/kernel/printk/printk.c linux-4.1.26/kernel/printk/pr asmlinkage int vprintk_emit(int facility, int level, const char *dict, size_t dictlen, const char *fmt, va_list args) -@@ -1623,6 +1715,13 @@ +@@ -1623,6 +1720,13 @@ asmlinkage int vprintk_emit(int facility, int level, /* cpu currently holding logbuf_lock in this function */ static unsigned int logbuf_cpu = UINT_MAX; @@ -18146,7 +19317,7 @@ diff -Nur linux-4.1.26.orig/kernel/printk/printk.c linux-4.1.26/kernel/printk/pr if (level == LOGLEVEL_SCHED) { level = LOGLEVEL_DEFAULT; in_sched = true; -@@ -1764,8 +1863,7 @@ +@@ -1764,8 +1868,7 @@ asmlinkage int vprintk_emit(int facility, int level, * console_sem which would prevent anyone from printing to * console */ @@ -18156,7 +19327,7 @@ diff -Nur linux-4.1.26.orig/kernel/printk/printk.c linux-4.1.26/kernel/printk/pr /* * Try to acquire and then immediately release the console * semaphore. The release will print out buffers and wake up -@@ -1773,7 +1871,7 @@ +@@ -1773,7 +1876,7 @@ asmlinkage int vprintk_emit(int facility, int level, */ if (console_trylock_for_printk()) console_unlock(); @@ -18165,7 +19336,7 @@ diff -Nur linux-4.1.26.orig/kernel/printk/printk.c linux-4.1.26/kernel/printk/pr lockdep_on(); } -@@ -1902,26 +2000,6 @@ +@@ -1902,26 +2005,6 @@ DEFINE_PER_CPU(printk_func_t, printk_func); #endif /* CONFIG_PRINTK */ @@ -18192,7 +19363,7 @@ diff -Nur linux-4.1.26.orig/kernel/printk/printk.c linux-4.1.26/kernel/printk/pr static int __add_preferred_console(char *name, int idx, char *options, char *brl_options) { -@@ -2143,11 +2221,16 @@ +@@ -2143,11 +2226,16 @@ static void console_cont_flush(char *text, size_t size) goto out; len = cont_print_text(text, size); @@ -18209,7 +19380,7 @@ diff -Nur linux-4.1.26.orig/kernel/printk/printk.c linux-4.1.26/kernel/printk/pr return; out: raw_spin_unlock_irqrestore(&logbuf_lock, flags); -@@ -2246,12 +2329,17 @@ +@@ -2246,12 +2334,17 @@ skip: console_idx = log_next(console_idx); console_seq++; console_prev = msg->flags; @@ -18227,10 +19398,23 @@ diff -Nur linux-4.1.26.orig/kernel/printk/printk.c linux-4.1.26/kernel/printk/pr if (do_cond_resched) cond_resched(); -diff -Nur linux-4.1.26.orig/kernel/ptrace.c linux-4.1.26/kernel/ptrace.c ---- linux-4.1.26.orig/kernel/ptrace.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/ptrace.c 2016-06-19 15:30:58.699297812 +0200 -@@ -129,7 +129,14 @@ +@@ -2304,6 +2397,11 @@ void console_unblank(void) + { + struct console *c; + ++ if (IS_ENABLED(CONFIG_PREEMPT_RT_BASE)) { ++ if (in_irq() || in_nmi()) ++ return; ++ } ++ + /* + * 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) spin_lock_irq(&task->sighand->siglock); if (task_is_traced(task) && !__fatal_signal_pending(task)) { @@ -18246,10 +19430,11 @@ diff -Nur linux-4.1.26.orig/kernel/ptrace.c linux-4.1.26/kernel/ptrace.c ret = true; } spin_unlock_irq(&task->sighand->siglock); -diff -Nur linux-4.1.26.orig/kernel/rcu/rcutorture.c linux-4.1.26/kernel/rcu/rcutorture.c ---- linux-4.1.26.orig/kernel/rcu/rcutorture.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/rcu/rcutorture.c 2016-06-19 15:30:58.699297812 +0200 -@@ -389,6 +389,7 @@ +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 = { .name = "rcu" }; @@ -18257,7 +19442,7 @@ diff -Nur linux-4.1.26.orig/kernel/rcu/rcutorture.c linux-4.1.26/kernel/rcu/rcut /* * Definitions for rcu_bh torture testing. */ -@@ -428,6 +429,12 @@ +@@ -428,6 +429,12 @@ static struct rcu_torture_ops rcu_bh_ops = { .name = "rcu_bh" }; @@ -18270,9 +19455,10 @@ diff -Nur linux-4.1.26.orig/kernel/rcu/rcutorture.c linux-4.1.26/kernel/rcu/rcut /* * Don't even think about trying any of these in real life!!! * The names includes "busted", and they really means it! -diff -Nur linux-4.1.26.orig/kernel/rcu/tree.c linux-4.1.26/kernel/rcu/tree.c ---- linux-4.1.26.orig/kernel/rcu/tree.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/rcu/tree.c 2016-06-19 15:30:58.699297812 +0200 +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 @@ -56,6 +56,11 @@ #include <linux/random.h> #include <linux/ftrace_event.h> @@ -18285,7 +19471,7 @@ diff -Nur linux-4.1.26.orig/kernel/rcu/tree.c linux-4.1.26/kernel/rcu/tree.c #include "tree.h" #include "rcu.h" -@@ -220,6 +225,19 @@ +@@ -220,6 +225,19 @@ void rcu_sched_qs(void) } } @@ -18305,7 +19491,7 @@ diff -Nur linux-4.1.26.orig/kernel/rcu/tree.c linux-4.1.26/kernel/rcu/tree.c void rcu_bh_qs(void) { if (!__this_cpu_read(rcu_bh_data.passed_quiesce)) { -@@ -229,6 +247,7 @@ +@@ -229,6 +247,7 @@ void rcu_bh_qs(void) __this_cpu_write(rcu_bh_data.passed_quiesce, 1); } } @@ -18313,7 +19499,7 @@ diff -Nur linux-4.1.26.orig/kernel/rcu/tree.c linux-4.1.26/kernel/rcu/tree.c static DEFINE_PER_CPU(int, rcu_sched_qs_mask); -@@ -404,6 +423,7 @@ +@@ -404,6 +423,7 @@ unsigned long rcu_batches_completed_sched(void) } EXPORT_SYMBOL_GPL(rcu_batches_completed_sched); @@ -18321,7 +19507,7 @@ diff -Nur linux-4.1.26.orig/kernel/rcu/tree.c linux-4.1.26/kernel/rcu/tree.c /* * Return the number of RCU BH batches completed thus far for debug & stats. */ -@@ -431,6 +451,13 @@ +@@ -431,6 +451,13 @@ void rcu_bh_force_quiescent_state(void) } EXPORT_SYMBOL_GPL(rcu_bh_force_quiescent_state); @@ -18335,7 +19521,7 @@ diff -Nur linux-4.1.26.orig/kernel/rcu/tree.c linux-4.1.26/kernel/rcu/tree.c /* * Force a quiescent state for RCU-sched. */ -@@ -1545,7 +1572,7 @@ +@@ -1545,7 +1572,7 @@ static void rcu_gp_kthread_wake(struct rcu_state *rsp) !ACCESS_ONCE(rsp->gp_flags) || !rsp->gp_kthread) return; @@ -18344,7 +19530,7 @@ diff -Nur linux-4.1.26.orig/kernel/rcu/tree.c linux-4.1.26/kernel/rcu/tree.c } /* -@@ -1986,7 +2013,7 @@ +@@ -1986,7 +2013,7 @@ static int __noreturn rcu_gp_kthread(void *arg) ACCESS_ONCE(rsp->gpnum), TPS("reqwait")); rsp->gp_state = RCU_GP_WAIT_GPS; @@ -18353,7 +19539,7 @@ diff -Nur linux-4.1.26.orig/kernel/rcu/tree.c linux-4.1.26/kernel/rcu/tree.c ACCESS_ONCE(rsp->gp_flags) & RCU_GP_FLAG_INIT); /* Locking provides needed memory barrier. */ -@@ -2015,7 +2042,7 @@ +@@ -2015,7 +2042,7 @@ static int __noreturn rcu_gp_kthread(void *arg) ACCESS_ONCE(rsp->gpnum), TPS("fqswait")); rsp->gp_state = RCU_GP_WAIT_FQS; @@ -18362,7 +19548,7 @@ diff -Nur linux-4.1.26.orig/kernel/rcu/tree.c linux-4.1.26/kernel/rcu/tree.c ((gf = ACCESS_ONCE(rsp->gp_flags)) & RCU_GP_FLAG_FQS) || (!ACCESS_ONCE(rnp->qsmask) && -@@ -2860,18 +2887,17 @@ +@@ -2860,18 +2887,17 @@ __rcu_process_callbacks(struct rcu_state *rsp) /* * Do RCU core processing for the current CPU. */ @@ -18383,7 +19569,7 @@ diff -Nur linux-4.1.26.orig/kernel/rcu/tree.c linux-4.1.26/kernel/rcu/tree.c /* * 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 @@ +@@ -2883,18 +2909,105 @@ static void invoke_rcu_callbacks(struct rcu_state *rsp, struct rcu_data *rdp) { if (unlikely(!ACCESS_ONCE(rcu_scheduler_fully_active))) return; @@ -18495,7 +19681,7 @@ diff -Nur linux-4.1.26.orig/kernel/rcu/tree.c linux-4.1.26/kernel/rcu/tree.c /* * Handle any core-RCU processing required by a call_rcu() invocation. -@@ -3040,6 +3153,7 @@ +@@ -3040,6 +3153,7 @@ void call_rcu_sched(struct rcu_head *head, void (*func)(struct rcu_head *rcu)) } EXPORT_SYMBOL_GPL(call_rcu_sched); @@ -18503,7 +19689,7 @@ diff -Nur linux-4.1.26.orig/kernel/rcu/tree.c linux-4.1.26/kernel/rcu/tree.c /* * Queue an RCU callback for invocation after a quicker grace period. */ -@@ -3048,6 +3162,7 @@ +@@ -3048,6 +3162,7 @@ void call_rcu_bh(struct rcu_head *head, void (*func)(struct rcu_head *rcu)) __call_rcu(head, func, &rcu_bh_state, -1, 0); } EXPORT_SYMBOL_GPL(call_rcu_bh); @@ -18511,7 +19697,7 @@ diff -Nur linux-4.1.26.orig/kernel/rcu/tree.c linux-4.1.26/kernel/rcu/tree.c /* * Queue an RCU callback for lazy invocation after a grace period. -@@ -3139,6 +3254,7 @@ +@@ -3139,6 +3254,7 @@ void synchronize_sched(void) } EXPORT_SYMBOL_GPL(synchronize_sched); @@ -18519,7 +19705,7 @@ diff -Nur linux-4.1.26.orig/kernel/rcu/tree.c linux-4.1.26/kernel/rcu/tree.c /** * synchronize_rcu_bh - wait until an rcu_bh grace period has elapsed. * -@@ -3165,6 +3281,7 @@ +@@ -3165,6 +3281,7 @@ void synchronize_rcu_bh(void) wait_rcu_gp(call_rcu_bh); } EXPORT_SYMBOL_GPL(synchronize_rcu_bh); @@ -18527,7 +19713,7 @@ diff -Nur linux-4.1.26.orig/kernel/rcu/tree.c linux-4.1.26/kernel/rcu/tree.c /** * get_state_synchronize_rcu - Snapshot current RCU state -@@ -3677,6 +3794,7 @@ +@@ -3677,6 +3794,7 @@ static void _rcu_barrier(struct rcu_state *rsp) mutex_unlock(&rsp->barrier_mutex); } @@ -18535,7 +19721,7 @@ diff -Nur linux-4.1.26.orig/kernel/rcu/tree.c linux-4.1.26/kernel/rcu/tree.c /** * rcu_barrier_bh - Wait until all in-flight call_rcu_bh() callbacks complete. */ -@@ -3685,6 +3803,7 @@ +@@ -3685,6 +3803,7 @@ void rcu_barrier_bh(void) _rcu_barrier(&rcu_bh_state); } EXPORT_SYMBOL_GPL(rcu_barrier_bh); @@ -18543,7 +19729,7 @@ diff -Nur linux-4.1.26.orig/kernel/rcu/tree.c linux-4.1.26/kernel/rcu/tree.c /** * rcu_barrier_sched - Wait for in-flight call_rcu_sched() callbacks. -@@ -4021,7 +4140,7 @@ +@@ -4021,7 +4140,7 @@ static void __init rcu_init_one(struct rcu_state *rsp, } } @@ -18552,7 +19738,7 @@ diff -Nur linux-4.1.26.orig/kernel/rcu/tree.c linux-4.1.26/kernel/rcu/tree.c rnp = rsp->level[rcu_num_lvls - 1]; for_each_possible_cpu(i) { while (i > rnp->grphi) -@@ -4120,7 +4239,6 @@ +@@ -4120,7 +4239,6 @@ void __init rcu_init(void) rcu_init_one(&rcu_bh_state, &rcu_bh_data); rcu_init_one(&rcu_sched_state, &rcu_sched_data); __rcu_init_preempt(); @@ -18560,9 +19746,10 @@ diff -Nur linux-4.1.26.orig/kernel/rcu/tree.c linux-4.1.26/kernel/rcu/tree.c /* * We don't need protection against CPU-hotplug here because -diff -Nur linux-4.1.26.orig/kernel/rcu/tree.h linux-4.1.26/kernel/rcu/tree.h ---- linux-4.1.26.orig/kernel/rcu/tree.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/rcu/tree.h 2016-06-19 15:30:58.699297812 +0200 +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 @@ -27,6 +27,7 @@ #include <linux/threads.h> #include <linux/cpumask.h> @@ -18571,7 +19758,7 @@ diff -Nur linux-4.1.26.orig/kernel/rcu/tree.h linux-4.1.26/kernel/rcu/tree.h /* * Define shape of hierarchy based on NR_CPUS, CONFIG_RCU_FANOUT, and -@@ -210,7 +211,7 @@ +@@ -210,7 +211,7 @@ struct rcu_node { /* This can happen due to race conditions. */ #endif /* #ifdef CONFIG_RCU_BOOST */ #ifdef CONFIG_RCU_NOCB_CPU @@ -18580,7 +19767,7 @@ diff -Nur linux-4.1.26.orig/kernel/rcu/tree.h linux-4.1.26/kernel/rcu/tree.h /* Place for rcu_nocb_kthread() to wait GP. */ #endif /* #ifdef CONFIG_RCU_NOCB_CPU */ int need_future_gp[2]; -@@ -349,7 +350,7 @@ +@@ -349,7 +350,7 @@ struct rcu_data { 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; @@ -18589,7 +19776,7 @@ diff -Nur linux-4.1.26.orig/kernel/rcu/tree.h linux-4.1.26/kernel/rcu/tree.h struct task_struct *nocb_kthread; int nocb_defer_wakeup; /* Defer wakeup of nocb_kthread. */ -@@ -438,7 +439,7 @@ +@@ -438,7 +439,7 @@ struct rcu_state { unsigned long gpnum; /* Current gp number. */ unsigned long completed; /* # of last completed gp. */ struct task_struct *gp_kthread; /* Task for grace periods. */ @@ -18598,7 +19785,7 @@ diff -Nur linux-4.1.26.orig/kernel/rcu/tree.h linux-4.1.26/kernel/rcu/tree.h short gp_flags; /* Commands for GP task. */ short gp_state; /* GP kthread sleep state. */ -@@ -529,12 +530,10 @@ +@@ -529,12 +530,10 @@ extern struct rcu_state rcu_preempt_state; DECLARE_PER_CPU(struct rcu_data, rcu_preempt_data); #endif /* #ifdef CONFIG_PREEMPT_RCU */ @@ -18611,7 +19798,7 @@ diff -Nur linux-4.1.26.orig/kernel/rcu/tree.h linux-4.1.26/kernel/rcu/tree.h #ifndef RCU_TREE_NONCORE -@@ -553,10 +552,9 @@ +@@ -553,10 +552,9 @@ void call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu)); 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); @@ -18623,9 +19810,10 @@ diff -Nur linux-4.1.26.orig/kernel/rcu/tree.h linux-4.1.26/kernel/rcu/tree.h static int rcu_spawn_one_boost_kthread(struct rcu_state *rsp, struct rcu_node *rnp); #endif /* #ifdef CONFIG_RCU_BOOST */ -diff -Nur linux-4.1.26.orig/kernel/rcu/tree_plugin.h linux-4.1.26/kernel/rcu/tree_plugin.h ---- linux-4.1.26.orig/kernel/rcu/tree_plugin.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/rcu/tree_plugin.h 2016-06-19 15:30:58.699297812 +0200 +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 @@ -24,27 +24,20 @@ * Paul E. McKenney <paulmck@linux.vnet.ibm.com> */ @@ -18656,7 +19844,7 @@ diff -Nur linux-4.1.26.orig/kernel/rcu/tree_plugin.h linux-4.1.26/kernel/rcu/tre #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 @@ +@@ -291,7 +284,7 @@ void rcu_read_unlock_special(struct task_struct *t) } /* Hardware IRQ handlers cannot block, complain if they get here. */ @@ -18665,7 +19853,7 @@ diff -Nur linux-4.1.26.orig/kernel/rcu/tree_plugin.h linux-4.1.26/kernel/rcu/tre 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 @@ +@@ -496,15 +489,6 @@ static void rcu_preempt_check_callbacks(void) t->rcu_read_unlock_special.b.need_qs = true; } @@ -18681,7 +19869,7 @@ diff -Nur linux-4.1.26.orig/kernel/rcu/tree_plugin.h linux-4.1.26/kernel/rcu/tre /* * Queue a preemptible-RCU callback for invocation after a grace period. */ -@@ -939,6 +923,19 @@ +@@ -939,6 +923,19 @@ void exit_rcu(void) #endif /* #else #ifdef CONFIG_PREEMPT_RCU */ @@ -18701,7 +19889,7 @@ diff -Nur linux-4.1.26.orig/kernel/rcu/tree_plugin.h linux-4.1.26/kernel/rcu/tre #ifdef CONFIG_RCU_BOOST #include "../locking/rtmutex_common.h" -@@ -970,16 +967,6 @@ +@@ -970,16 +967,6 @@ static void rcu_initiate_boost_trace(struct rcu_node *rnp) #endif /* #else #ifdef CONFIG_RCU_TRACE */ @@ -18718,7 +19906,7 @@ diff -Nur linux-4.1.26.orig/kernel/rcu/tree_plugin.h linux-4.1.26/kernel/rcu/tre /* * 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 @@ +@@ -1125,23 +1112,6 @@ static void rcu_initiate_boost(struct rcu_node *rnp, unsigned long flags) } /* @@ -18742,7 +19930,7 @@ diff -Nur linux-4.1.26.orig/kernel/rcu/tree_plugin.h linux-4.1.26/kernel/rcu/tre * Is the current CPU running the RCU-callbacks kthread? * Caller must have preemption disabled. */ -@@ -1196,67 +1166,6 @@ +@@ -1196,67 +1166,6 @@ static int rcu_spawn_one_boost_kthread(struct rcu_state *rsp, return 0; } @@ -18810,7 +19998,7 @@ diff -Nur linux-4.1.26.orig/kernel/rcu/tree_plugin.h linux-4.1.26/kernel/rcu/tre /* * 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 @@ +@@ -1286,26 +1195,12 @@ static void rcu_boost_kthread_setaffinity(struct rcu_node *rnp, int outgoingcpu) free_cpumask_var(cm); } @@ -18837,7 +20025,7 @@ diff -Nur linux-4.1.26.orig/kernel/rcu/tree_plugin.h linux-4.1.26/kernel/rcu/tre rcu_for_each_leaf_node(rcu_state_p, rnp) (void)rcu_spawn_one_boost_kthread(rcu_state_p, rnp); } -@@ -1328,11 +1223,6 @@ +@@ -1328,11 +1223,6 @@ static void rcu_initiate_boost(struct rcu_node *rnp, unsigned long flags) raw_spin_unlock_irqrestore(&rnp->lock, flags); } @@ -18849,7 +20037,7 @@ diff -Nur linux-4.1.26.orig/kernel/rcu/tree_plugin.h linux-4.1.26/kernel/rcu/tre static bool rcu_is_callbacks_kthread(void) { return false; -@@ -1356,7 +1246,7 @@ +@@ -1356,7 +1246,7 @@ static void rcu_prepare_kthreads(int cpu) #endif /* #else #ifdef CONFIG_RCU_BOOST */ @@ -18858,7 +20046,7 @@ diff -Nur linux-4.1.26.orig/kernel/rcu/tree_plugin.h linux-4.1.26/kernel/rcu/tre /* * Check to see if any future RCU-related work will need to be done -@@ -1374,7 +1264,9 @@ +@@ -1374,7 +1264,9 @@ int rcu_needs_cpu(unsigned long *delta_jiffies) return rcu_cpu_has_callbacks(NULL); } #endif /* #ifndef CONFIG_RCU_NOCB_CPU_ALL */ @@ -18868,7 +20056,7 @@ diff -Nur linux-4.1.26.orig/kernel/rcu/tree_plugin.h linux-4.1.26/kernel/rcu/tre /* * Because we do not have RCU_FAST_NO_HZ, don't bother cleaning up * after it. -@@ -1472,6 +1364,8 @@ +@@ -1472,6 +1364,8 @@ static bool __maybe_unused rcu_try_advance_all_cbs(void) return cbs_ready; } @@ -18877,7 +20065,7 @@ diff -Nur linux-4.1.26.orig/kernel/rcu/tree_plugin.h linux-4.1.26/kernel/rcu/tre /* * 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 @@ +@@ -1512,7 +1406,7 @@ int rcu_needs_cpu(unsigned long *dj) return 0; } #endif /* #ifndef CONFIG_RCU_NOCB_CPU_ALL */ @@ -18886,7 +20074,7 @@ diff -Nur linux-4.1.26.orig/kernel/rcu/tree_plugin.h linux-4.1.26/kernel/rcu/tre /* * 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 @@ +@@ -1859,7 +1753,7 @@ early_param("rcu_nocb_poll", parse_rcu_nocb_poll); */ static void rcu_nocb_gp_cleanup(struct rcu_state *rsp, struct rcu_node *rnp) { @@ -18895,7 +20083,7 @@ diff -Nur linux-4.1.26.orig/kernel/rcu/tree_plugin.h linux-4.1.26/kernel/rcu/tre } /* -@@ -1877,8 +1771,8 @@ +@@ -1877,8 +1771,8 @@ static void rcu_nocb_gp_set(struct rcu_node *rnp, int nrq) static void rcu_init_one_nocb(struct rcu_node *rnp) { @@ -18906,7 +20094,7 @@ diff -Nur linux-4.1.26.orig/kernel/rcu/tree_plugin.h linux-4.1.26/kernel/rcu/tre } #ifndef CONFIG_RCU_NOCB_CPU_ALL -@@ -1903,7 +1797,7 @@ +@@ -1903,7 +1797,7 @@ static void wake_nocb_leader(struct rcu_data *rdp, bool force) 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; @@ -18915,7 +20103,7 @@ diff -Nur linux-4.1.26.orig/kernel/rcu/tree_plugin.h linux-4.1.26/kernel/rcu/tre } } -@@ -2116,7 +2010,7 @@ +@@ -2116,7 +2010,7 @@ static void rcu_nocb_wait_gp(struct rcu_data *rdp) */ trace_rcu_future_gp(rnp, rdp, c, TPS("StartWait")); for (;;) { @@ -18924,7 +20112,7 @@ diff -Nur linux-4.1.26.orig/kernel/rcu/tree_plugin.h linux-4.1.26/kernel/rcu/tre rnp->nocb_gp_wq[c & 0x1], (d = ULONG_CMP_GE(ACCESS_ONCE(rnp->completed), c))); if (likely(d)) -@@ -2144,7 +2038,7 @@ +@@ -2144,7 +2038,7 @@ wait_again: /* Wait for callbacks to appear. */ if (!rcu_nocb_poll) { trace_rcu_nocb_wake(my_rdp->rsp->name, my_rdp->cpu, "Sleep"); @@ -18933,7 +20121,7 @@ diff -Nur linux-4.1.26.orig/kernel/rcu/tree_plugin.h linux-4.1.26/kernel/rcu/tre !ACCESS_ONCE(my_rdp->nocb_leader_sleep)); /* Memory barrier handled by smp_mb() calls below and repoll. */ } else if (firsttime) { -@@ -2219,7 +2113,7 @@ +@@ -2219,7 +2113,7 @@ wait_again: * List was empty, wake up the follower. * Memory barriers supplied by atomic_long_add(). */ @@ -18942,7 +20130,7 @@ diff -Nur linux-4.1.26.orig/kernel/rcu/tree_plugin.h linux-4.1.26/kernel/rcu/tre } } -@@ -2240,7 +2134,7 @@ +@@ -2240,7 +2134,7 @@ static void nocb_follower_wait(struct rcu_data *rdp) if (!rcu_nocb_poll) { trace_rcu_nocb_wake(rdp->rsp->name, rdp->cpu, "FollowerSleep"); @@ -18951,7 +20139,7 @@ diff -Nur linux-4.1.26.orig/kernel/rcu/tree_plugin.h linux-4.1.26/kernel/rcu/tre ACCESS_ONCE(rdp->nocb_follower_head)); } else if (firsttime) { /* Don't drown trace log with "Poll"! */ -@@ -2399,7 +2293,7 @@ +@@ -2399,7 +2293,7 @@ void __init rcu_init_nohz(void) static void __init rcu_boot_init_nocb_percpu_data(struct rcu_data *rdp) { rdp->nocb_tail = &rdp->nocb_head; @@ -18960,10 +20148,11 @@ diff -Nur linux-4.1.26.orig/kernel/rcu/tree_plugin.h linux-4.1.26/kernel/rcu/tre rdp->nocb_follower_tail = &rdp->nocb_follower_head; } -diff -Nur linux-4.1.26.orig/kernel/rcu/update.c linux-4.1.26/kernel/rcu/update.c ---- linux-4.1.26.orig/kernel/rcu/update.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/rcu/update.c 2016-06-19 15:30:58.699297812 +0200 -@@ -227,6 +227,7 @@ +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) } EXPORT_SYMBOL_GPL(rcu_read_lock_held); @@ -18971,7 +20160,7 @@ diff -Nur linux-4.1.26.orig/kernel/rcu/update.c linux-4.1.26/kernel/rcu/update.c /** * rcu_read_lock_bh_held() - might we be in RCU-bh read-side critical section? * -@@ -253,6 +254,7 @@ +@@ -253,6 +254,7 @@ int rcu_read_lock_bh_held(void) return in_softirq() || irqs_disabled(); } EXPORT_SYMBOL_GPL(rcu_read_lock_bh_held); @@ -18979,10 +20168,11 @@ diff -Nur linux-4.1.26.orig/kernel/rcu/update.c linux-4.1.26/kernel/rcu/update.c #endif /* #ifdef CONFIG_DEBUG_LOCK_ALLOC */ -diff -Nur linux-4.1.26.orig/kernel/relay.c linux-4.1.26/kernel/relay.c ---- linux-4.1.26.orig/kernel/relay.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/relay.c 2016-06-19 15:30:58.699297812 +0200 -@@ -339,6 +339,10 @@ +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) { struct rchan_buf *buf = (struct rchan_buf *)data; wake_up_interruptible(&buf->read_wait); @@ -18993,7 +20183,7 @@ diff -Nur linux-4.1.26.orig/kernel/relay.c linux-4.1.26/kernel/relay.c } /** -@@ -356,6 +360,7 @@ +@@ -356,6 +360,7 @@ static void __relay_reset(struct rchan_buf *buf, unsigned int init) init_waitqueue_head(&buf->read_wait); kref_init(&buf->kref); setup_timer(&buf->timer, wakeup_readers, (unsigned long)buf); @@ -19001,7 +20191,7 @@ diff -Nur linux-4.1.26.orig/kernel/relay.c linux-4.1.26/kernel/relay.c } else del_timer_sync(&buf->timer); -@@ -739,15 +744,6 @@ +@@ -739,15 +744,6 @@ size_t relay_switch_subbuf(struct rchan_buf *buf, size_t length) else buf->early_bytes += buf->chan->subbuf_size - buf->padding[old_subbuf]; @@ -19017,10 +20207,24 @@ diff -Nur linux-4.1.26.orig/kernel/relay.c linux-4.1.26/kernel/relay.c } old = buf->data; -diff -Nur linux-4.1.26.orig/kernel/sched/completion.c linux-4.1.26/kernel/sched/completion.c ---- linux-4.1.26.orig/kernel/sched/completion.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/sched/completion.c 2016-06-19 15:30:58.699297812 +0200 -@@ -30,10 +30,10 @@ +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) { unsigned long flags; @@ -19034,7 +20238,7 @@ diff -Nur linux-4.1.26.orig/kernel/sched/completion.c linux-4.1.26/kernel/sched/ } EXPORT_SYMBOL(complete); -@@ -50,10 +50,10 @@ +@@ -50,10 +50,10 @@ void complete_all(struct completion *x) { unsigned long flags; @@ -19048,7 +20252,7 @@ diff -Nur linux-4.1.26.orig/kernel/sched/completion.c linux-4.1.26/kernel/sched/ } EXPORT_SYMBOL(complete_all); -@@ -62,20 +62,20 @@ +@@ -62,20 +62,20 @@ do_wait_for_common(struct completion *x, long (*action)(long), long timeout, int state) { if (!x->done) { @@ -19074,7 +20278,7 @@ diff -Nur linux-4.1.26.orig/kernel/sched/completion.c linux-4.1.26/kernel/sched/ if (!x->done) return timeout; } -@@ -89,9 +89,9 @@ +@@ -89,9 +89,9 @@ __wait_for_common(struct completion *x, { might_sleep(); @@ -19086,7 +20290,7 @@ diff -Nur linux-4.1.26.orig/kernel/sched/completion.c linux-4.1.26/kernel/sched/ return timeout; } -@@ -277,12 +277,12 @@ +@@ -277,12 +277,12 @@ bool try_wait_for_completion(struct completion *x) if (!READ_ONCE(x->done)) return 0; @@ -19101,7 +20305,7 @@ diff -Nur linux-4.1.26.orig/kernel/sched/completion.c linux-4.1.26/kernel/sched/ return ret; } EXPORT_SYMBOL(try_wait_for_completion); -@@ -311,7 +311,7 @@ +@@ -311,7 +311,7 @@ bool completion_done(struct completion *x) * after it's acquired the lock. */ smp_rmb(); @@ -19110,10 +20314,11 @@ diff -Nur linux-4.1.26.orig/kernel/sched/completion.c linux-4.1.26/kernel/sched/ return true; } EXPORT_SYMBOL(completion_done); -diff -Nur linux-4.1.26.orig/kernel/sched/core.c linux-4.1.26/kernel/sched/core.c ---- linux-4.1.26.orig/kernel/sched/core.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/sched/core.c 2016-06-19 15:30:58.703297966 +0200 -@@ -282,7 +282,11 @@ +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); * Number of tasks to iterate in a single balance run. * Limited because this is done with IRQs disabled. */ @@ -19125,7 +20330,7 @@ diff -Nur linux-4.1.26.orig/kernel/sched/core.c linux-4.1.26/kernel/sched/core.c /* * period over which we average the RT time consumption, measured -@@ -461,6 +465,7 @@ +@@ -461,6 +465,7 @@ static void init_rq_hrtick(struct rq *rq) hrtimer_init(&rq->hrtick_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); rq->hrtick_timer.function = hrtick; @@ -19133,7 +20338,7 @@ diff -Nur linux-4.1.26.orig/kernel/sched/core.c linux-4.1.26/kernel/sched/core.c } #else /* CONFIG_SCHED_HRTICK */ static inline void hrtick_clear(struct rq *rq) -@@ -541,6 +546,52 @@ +@@ -541,6 +546,52 @@ static bool set_nr_if_polling(struct task_struct *p) #endif #endif @@ -19186,7 +20391,7 @@ diff -Nur linux-4.1.26.orig/kernel/sched/core.c linux-4.1.26/kernel/sched/core.c /* * resched_curr - mark rq's current task 'to be rescheduled now'. * -@@ -572,6 +623,38 @@ +@@ -572,6 +623,38 @@ void resched_curr(struct rq *rq) trace_sched_wake_idle_without_ipi(cpu); } @@ -19225,7 +20430,7 @@ diff -Nur linux-4.1.26.orig/kernel/sched/core.c linux-4.1.26/kernel/sched/core.c void resched_cpu(int cpu) { struct rq *rq = cpu_rq(cpu); -@@ -595,12 +678,14 @@ +@@ -595,12 +678,14 @@ void resched_cpu(int cpu) */ int get_nohz_timer_target(int pinned) { @@ -19242,7 +20447,7 @@ diff -Nur linux-4.1.26.orig/kernel/sched/core.c linux-4.1.26/kernel/sched/core.c rcu_read_lock(); for_each_domain(cpu, sd) { -@@ -613,6 +698,8 @@ +@@ -613,6 +698,8 @@ int get_nohz_timer_target(int pinned) } unlock: rcu_read_unlock(); @@ -19251,7 +20456,7 @@ diff -Nur linux-4.1.26.orig/kernel/sched/core.c linux-4.1.26/kernel/sched/core.c return cpu; } /* -@@ -1164,6 +1251,18 @@ +@@ -1164,6 +1251,18 @@ struct migration_arg { static int migration_cpu_stop(void *data); @@ -19270,7 +20475,7 @@ diff -Nur linux-4.1.26.orig/kernel/sched/core.c linux-4.1.26/kernel/sched/core.c /* * wait_task_inactive - wait for a thread to unschedule. * -@@ -1208,7 +1307,7 @@ +@@ -1208,7 +1307,7 @@ unsigned long wait_task_inactive(struct task_struct *p, long match_state) * is actually now running somewhere else! */ while (task_running(rq, p)) { @@ -19279,7 +20484,7 @@ diff -Nur linux-4.1.26.orig/kernel/sched/core.c linux-4.1.26/kernel/sched/core.c return 0; cpu_relax(); } -@@ -1223,7 +1322,8 @@ +@@ -1223,7 +1322,8 @@ unsigned long wait_task_inactive(struct task_struct *p, long match_state) running = task_running(rq, p); queued = task_on_rq_queued(p); ncsw = 0; @@ -19289,7 +20494,7 @@ diff -Nur linux-4.1.26.orig/kernel/sched/core.c linux-4.1.26/kernel/sched/core.c ncsw = p->nvcsw | LONG_MIN; /* sets MSB */ task_rq_unlock(rq, p, &flags); -@@ -1449,10 +1549,6 @@ +@@ -1449,10 +1549,6 @@ static void ttwu_activate(struct rq *rq, struct task_struct *p, int en_flags) { activate_task(rq, p, en_flags); p->on_rq = TASK_ON_RQ_QUEUED; @@ -19300,7 +20505,7 @@ diff -Nur linux-4.1.26.orig/kernel/sched/core.c linux-4.1.26/kernel/sched/core.c } /* -@@ -1462,9 +1558,9 @@ +@@ -1462,9 +1558,9 @@ static void ttwu_do_wakeup(struct rq *rq, struct task_struct *p, int wake_flags) { check_preempt_curr(rq, p, wake_flags); @@ -19312,7 +20517,7 @@ diff -Nur linux-4.1.26.orig/kernel/sched/core.c linux-4.1.26/kernel/sched/core.c #ifdef CONFIG_SMP if (p->sched_class->task_woken) p->sched_class->task_woken(rq, p); -@@ -1666,8 +1762,29 @@ +@@ -1666,8 +1762,29 @@ try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags) */ smp_mb__before_spinlock(); raw_spin_lock_irqsave(&p->pi_lock, flags); @@ -19343,7 +20548,7 @@ diff -Nur linux-4.1.26.orig/kernel/sched/core.c linux-4.1.26/kernel/sched/core.c success = 1; /* we're going to change ->state */ cpu = task_cpu(p); -@@ -1710,42 +1827,6 @@ +@@ -1732,42 +1849,6 @@ out: } /** @@ -19386,7 +20591,7 @@ diff -Nur linux-4.1.26.orig/kernel/sched/core.c linux-4.1.26/kernel/sched/core.c * wake_up_process - Wake up a specific process * @p: The process to be woken up. * -@@ -1759,11 +1840,23 @@ +@@ -1781,11 +1862,23 @@ out: */ int wake_up_process(struct task_struct *p) { @@ -19411,7 +20616,7 @@ diff -Nur linux-4.1.26.orig/kernel/sched/core.c linux-4.1.26/kernel/sched/core.c int wake_up_state(struct task_struct *p, unsigned int state) { return try_to_wake_up(p, state, 0); -@@ -1959,6 +2052,9 @@ +@@ -1981,6 +2074,9 @@ int sched_fork(unsigned long clone_flags, struct task_struct *p) p->on_cpu = 0; #endif init_task_preempt_count(p); @@ -19421,7 +20626,7 @@ diff -Nur linux-4.1.26.orig/kernel/sched/core.c linux-4.1.26/kernel/sched/core.c #ifdef CONFIG_SMP plist_node_init(&p->pushable_tasks, MAX_PRIO); RB_CLEAR_NODE(&p->pushable_dl_tasks); -@@ -2094,7 +2190,7 @@ +@@ -2116,7 +2212,7 @@ void wake_up_new_task(struct task_struct *p) rq = __task_rq_lock(p); activate_task(rq, p, 0); p->on_rq = TASK_ON_RQ_QUEUED; @@ -19430,7 +20635,7 @@ diff -Nur linux-4.1.26.orig/kernel/sched/core.c linux-4.1.26/kernel/sched/core.c check_preempt_curr(rq, p, WF_FORK); #ifdef CONFIG_SMP if (p->sched_class->task_woken) -@@ -2231,8 +2327,12 @@ +@@ -2253,8 +2349,12 @@ static struct rq *finish_task_switch(struct task_struct *prev) finish_arch_post_lock_switch(); fire_sched_in_preempt_notifiers(current); @@ -19444,7 +20649,7 @@ diff -Nur linux-4.1.26.orig/kernel/sched/core.c linux-4.1.26/kernel/sched/core.c if (unlikely(prev_state == TASK_DEAD)) { if (prev->sched_class->task_dead) prev->sched_class->task_dead(prev); -@@ -2543,16 +2643,6 @@ +@@ -2565,16 +2665,6 @@ u64 scheduler_tick_max_deferment(void) } #endif @@ -19461,7 +20666,7 @@ diff -Nur linux-4.1.26.orig/kernel/sched/core.c linux-4.1.26/kernel/sched/core.c #if defined(CONFIG_PREEMPT) && (defined(CONFIG_DEBUG_PREEMPT) || \ defined(CONFIG_PREEMPT_TRACER)) -@@ -2574,7 +2664,7 @@ +@@ -2596,7 +2686,7 @@ void preempt_count_add(int val) PREEMPT_MASK - 10); #endif if (preempt_count() == val) { @@ -19470,7 +20675,7 @@ diff -Nur linux-4.1.26.orig/kernel/sched/core.c linux-4.1.26/kernel/sched/core.c #ifdef CONFIG_DEBUG_PREEMPT current->preempt_disable_ip = ip; #endif -@@ -2601,7 +2691,7 @@ +@@ -2623,7 +2713,7 @@ void preempt_count_sub(int val) #endif if (preempt_count() == val) @@ -19479,7 +20684,7 @@ diff -Nur linux-4.1.26.orig/kernel/sched/core.c linux-4.1.26/kernel/sched/core.c __preempt_count_sub(val); } EXPORT_SYMBOL(preempt_count_sub); -@@ -2657,6 +2747,133 @@ +@@ -2679,6 +2769,133 @@ static inline void schedule_debug(struct task_struct *prev) schedstat_inc(this_rq(), sched_count); } @@ -19613,7 +20818,7 @@ diff -Nur linux-4.1.26.orig/kernel/sched/core.c linux-4.1.26/kernel/sched/core.c /* * Pick up the highest-prio task: */ -@@ -2763,6 +2980,8 @@ +@@ -2785,6 +3002,8 @@ static void __sched __schedule(void) smp_mb__before_spinlock(); raw_spin_lock_irq(&rq->lock); @@ -19622,7 +20827,7 @@ diff -Nur linux-4.1.26.orig/kernel/sched/core.c linux-4.1.26/kernel/sched/core.c rq->clock_skip_update <<= 1; /* promote REQ to ACT */ switch_count = &prev->nivcsw; -@@ -2772,19 +2991,6 @@ +@@ -2794,19 +3013,6 @@ static void __sched __schedule(void) } else { deactivate_task(rq, prev, DEQUEUE_SLEEP); prev->on_rq = 0; @@ -19642,7 +20847,7 @@ diff -Nur linux-4.1.26.orig/kernel/sched/core.c linux-4.1.26/kernel/sched/core.c } switch_count = &prev->nvcsw; } -@@ -2794,6 +3000,7 @@ +@@ -2816,6 +3022,7 @@ static void __sched __schedule(void) next = pick_next_task(rq, prev); clear_tsk_need_resched(prev); @@ -19650,7 +20855,7 @@ diff -Nur linux-4.1.26.orig/kernel/sched/core.c linux-4.1.26/kernel/sched/core.c clear_preempt_need_resched(); rq->clock_skip_update = 0; -@@ -2814,8 +3021,19 @@ +@@ -2836,8 +3043,19 @@ static void __sched __schedule(void) static inline void sched_submit_work(struct task_struct *tsk) { @@ -19671,7 +20876,7 @@ diff -Nur linux-4.1.26.orig/kernel/sched/core.c linux-4.1.26/kernel/sched/core.c /* * If we are going to sleep and we have plugged IO queued, * make sure to submit it to avoid deadlocks. -@@ -2824,6 +3042,12 @@ +@@ -2846,6 +3064,12 @@ static inline void sched_submit_work(struct task_struct *tsk) blk_schedule_flush_plug(tsk); } @@ -19684,7 +20889,7 @@ diff -Nur linux-4.1.26.orig/kernel/sched/core.c linux-4.1.26/kernel/sched/core.c asmlinkage __visible void __sched schedule(void) { struct task_struct *tsk = current; -@@ -2832,6 +3056,7 @@ +@@ -2854,6 +3078,7 @@ asmlinkage __visible void __sched schedule(void) do { __schedule(); } while (need_resched()); @@ -19692,7 +20897,7 @@ diff -Nur linux-4.1.26.orig/kernel/sched/core.c linux-4.1.26/kernel/sched/core.c } EXPORT_SYMBOL(schedule); -@@ -2881,6 +3106,30 @@ +@@ -2903,6 +3128,30 @@ static void __sched notrace preempt_schedule_common(void) } while (need_resched()); } @@ -19713,7 +20918,7 @@ diff -Nur linux-4.1.26.orig/kernel/sched/core.c linux-4.1.26/kernel/sched/core.c + +#else + -+static int preemptible_lazy(void) ++static inline int preemptible_lazy(void) +{ + return 1; +} @@ -19723,7 +20928,7 @@ diff -Nur linux-4.1.26.orig/kernel/sched/core.c linux-4.1.26/kernel/sched/core.c #ifdef CONFIG_PREEMPT /* * this is the entry point to schedule() from in-kernel preemption -@@ -2895,6 +3144,8 @@ +@@ -2917,6 +3166,8 @@ asmlinkage __visible void __sched notrace preempt_schedule(void) */ if (likely(!preemptible())) return; @@ -19732,7 +20937,7 @@ diff -Nur linux-4.1.26.orig/kernel/sched/core.c linux-4.1.26/kernel/sched/core.c preempt_schedule_common(); } -@@ -2922,6 +3173,8 @@ +@@ -2944,6 +3195,8 @@ asmlinkage __visible void __sched notrace preempt_schedule_context(void) if (likely(!preemptible())) return; @@ -19741,7 +20946,7 @@ diff -Nur linux-4.1.26.orig/kernel/sched/core.c linux-4.1.26/kernel/sched/core.c do { __preempt_count_add(PREEMPT_ACTIVE); -@@ -2931,7 +3184,16 @@ +@@ -2953,7 +3206,16 @@ asmlinkage __visible void __sched notrace preempt_schedule_context(void) * an infinite recursion. */ prev_ctx = exception_enter(); @@ -19758,7 +20963,7 @@ diff -Nur linux-4.1.26.orig/kernel/sched/core.c linux-4.1.26/kernel/sched/core.c exception_exit(prev_ctx); __preempt_count_sub(PREEMPT_ACTIVE); -@@ -4268,6 +4530,7 @@ +@@ -4290,6 +4552,7 @@ int __cond_resched_lock(spinlock_t *lock) } EXPORT_SYMBOL(__cond_resched_lock); @@ -19766,7 +20971,7 @@ diff -Nur linux-4.1.26.orig/kernel/sched/core.c linux-4.1.26/kernel/sched/core.c int __sched __cond_resched_softirq(void) { BUG_ON(!in_softirq()); -@@ -4281,6 +4544,7 @@ +@@ -4303,6 +4566,7 @@ int __sched __cond_resched_softirq(void) return 0; } EXPORT_SYMBOL(__cond_resched_softirq); @@ -19774,7 +20979,7 @@ diff -Nur linux-4.1.26.orig/kernel/sched/core.c linux-4.1.26/kernel/sched/core.c /** * yield - yield the current processor to other threads. -@@ -4635,7 +4899,9 @@ +@@ -4659,7 +4923,9 @@ void init_idle(struct task_struct *idle, int cpu) /* Set the preempt count _outside_ the spinlocks! */ init_idle_preempt_count(idle, cpu); @@ -19785,7 +20990,7 @@ diff -Nur linux-4.1.26.orig/kernel/sched/core.c linux-4.1.26/kernel/sched/core.c /* * The idle tasks have their own, simple scheduling class: */ -@@ -4755,11 +5021,91 @@ +@@ -4779,11 +5045,91 @@ static struct rq *move_queued_task(struct task_struct *p, int new_cpu) void do_set_cpus_allowed(struct task_struct *p, const struct cpumask *new_mask) { @@ -19880,7 +21085,7 @@ diff -Nur linux-4.1.26.orig/kernel/sched/core.c linux-4.1.26/kernel/sched/core.c } /* -@@ -4805,7 +5151,7 @@ +@@ -4829,7 +5175,7 @@ int set_cpus_allowed_ptr(struct task_struct *p, const struct cpumask *new_mask) do_set_cpus_allowed(p, new_mask); /* Can the task run on the task's current CPU? If so, we're done */ @@ -19889,7 +21094,7 @@ diff -Nur linux-4.1.26.orig/kernel/sched/core.c linux-4.1.26/kernel/sched/core.c goto out; dest_cpu = cpumask_any_and(cpu_active_mask, new_mask); -@@ -4945,6 +5291,8 @@ +@@ -4969,6 +5315,8 @@ static int migration_cpu_stop(void *data) #ifdef CONFIG_HOTPLUG_CPU @@ -19898,7 +21103,7 @@ diff -Nur linux-4.1.26.orig/kernel/sched/core.c linux-4.1.26/kernel/sched/core.c /* * Ensures that the idle task is using init_mm right before its cpu goes * offline. -@@ -4959,7 +5307,11 @@ +@@ -4983,7 +5331,11 @@ void idle_task_exit(void) switch_mm(mm, &init_mm, current); finish_arch_post_lock_switch(); } @@ -19911,7 +21116,7 @@ diff -Nur linux-4.1.26.orig/kernel/sched/core.c linux-4.1.26/kernel/sched/core.c } /* -@@ -5302,6 +5654,10 @@ +@@ -5326,6 +5678,10 @@ migration_call(struct notifier_block *nfb, unsigned long action, void *hcpu) case CPU_DEAD: calc_load_migrate(rq); @@ -19922,7 +21127,7 @@ diff -Nur linux-4.1.26.orig/kernel/sched/core.c linux-4.1.26/kernel/sched/core.c break; #endif } -@@ -7281,7 +7637,8 @@ +@@ -7305,7 +7661,8 @@ void __init sched_init(void) #ifdef CONFIG_DEBUG_ATOMIC_SLEEP static inline int preempt_count_equals(int preempt_offset) { @@ -19932,10 +21137,11 @@ diff -Nur linux-4.1.26.orig/kernel/sched/core.c linux-4.1.26/kernel/sched/core.c return (nested == preempt_offset); } -diff -Nur linux-4.1.26.orig/kernel/sched/cputime.c linux-4.1.26/kernel/sched/cputime.c ---- linux-4.1.26.orig/kernel/sched/cputime.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/sched/cputime.c 2016-06-19 15:30:58.703297966 +0200 -@@ -675,37 +675,45 @@ +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) void vtime_account_system(struct task_struct *tsk) { @@ -19989,7 +21195,7 @@ diff -Nur linux-4.1.26.orig/kernel/sched/cputime.c linux-4.1.26/kernel/sched/cpu } void vtime_guest_enter(struct task_struct *tsk) -@@ -717,19 +725,23 @@ +@@ -717,19 +725,23 @@ void vtime_guest_enter(struct task_struct *tsk) * synchronization against the reader (task_gtime()) * that can thus safely catch up with a tickless delta. */ @@ -20017,7 +21223,7 @@ diff -Nur linux-4.1.26.orig/kernel/sched/cputime.c linux-4.1.26/kernel/sched/cpu } EXPORT_SYMBOL_GPL(vtime_guest_exit); -@@ -742,24 +754,30 @@ +@@ -742,24 +754,30 @@ void vtime_account_idle(struct task_struct *tsk) void arch_vtime_task_switch(struct task_struct *prev) { @@ -20054,7 +21260,7 @@ diff -Nur linux-4.1.26.orig/kernel/sched/cputime.c linux-4.1.26/kernel/sched/cpu } cputime_t task_gtime(struct task_struct *t) -@@ -768,13 +786,13 @@ +@@ -768,13 +786,13 @@ cputime_t task_gtime(struct task_struct *t) cputime_t gtime; do { @@ -20070,7 +21276,7 @@ diff -Nur linux-4.1.26.orig/kernel/sched/cputime.c linux-4.1.26/kernel/sched/cpu return gtime; } -@@ -797,7 +815,7 @@ +@@ -797,7 +815,7 @@ fetch_task_cputime(struct task_struct *t, *udelta = 0; *sdelta = 0; @@ -20079,7 +21285,7 @@ diff -Nur linux-4.1.26.orig/kernel/sched/cputime.c linux-4.1.26/kernel/sched/cpu if (u_dst) *u_dst = *u_src; -@@ -821,7 +839,7 @@ +@@ -821,7 +839,7 @@ fetch_task_cputime(struct task_struct *t, if (t->vtime_snap_whence == VTIME_SYS) *sdelta = delta; } @@ -20088,10 +21294,11 @@ diff -Nur linux-4.1.26.orig/kernel/sched/cputime.c linux-4.1.26/kernel/sched/cpu } -diff -Nur linux-4.1.26.orig/kernel/sched/deadline.c linux-4.1.26/kernel/sched/deadline.c ---- linux-4.1.26.orig/kernel/sched/deadline.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/sched/deadline.c 2016-06-19 15:30:58.703297966 +0200 -@@ -637,6 +637,7 @@ +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) hrtimer_init(timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); timer->function = dl_task_timer; @@ -20099,10 +21306,11 @@ diff -Nur linux-4.1.26.orig/kernel/sched/deadline.c linux-4.1.26/kernel/sched/de } static -diff -Nur linux-4.1.26.orig/kernel/sched/debug.c linux-4.1.26/kernel/sched/debug.c ---- linux-4.1.26.orig/kernel/sched/debug.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/sched/debug.c 2016-06-19 15:30:58.703297966 +0200 -@@ -260,6 +260,9 @@ +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) P(rt_throttled); PN(rt_time); PN(rt_runtime); @@ -20112,7 +21320,7 @@ diff -Nur linux-4.1.26.orig/kernel/sched/debug.c linux-4.1.26/kernel/sched/debug #undef PN #undef P -@@ -648,6 +651,10 @@ +@@ -648,6 +651,10 @@ void proc_sched_show_task(struct task_struct *p, struct seq_file *m) #endif P(policy); P(prio); @@ -20123,10 +21331,11 @@ diff -Nur linux-4.1.26.orig/kernel/sched/debug.c linux-4.1.26/kernel/sched/debug #undef PN #undef __PN #undef P -diff -Nur linux-4.1.26.orig/kernel/sched/fair.c linux-4.1.26/kernel/sched/fair.c ---- linux-4.1.26.orig/kernel/sched/fair.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/sched/fair.c 2016-06-19 15:30:58.703297966 +0200 -@@ -3201,7 +3201,7 @@ +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) ideal_runtime = sched_slice(cfs_rq, curr); delta_exec = curr->sum_exec_runtime - curr->prev_sum_exec_runtime; if (delta_exec > ideal_runtime) { @@ -20135,7 +21344,7 @@ diff -Nur linux-4.1.26.orig/kernel/sched/fair.c linux-4.1.26/kernel/sched/fair.c /* * The current task ran long enough, ensure it doesn't get * re-elected due to buddy favours. -@@ -3225,7 +3225,7 @@ +@@ -3225,7 +3225,7 @@ check_preempt_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr) return; if (delta > ideal_runtime) @@ -20144,7 +21353,7 @@ diff -Nur linux-4.1.26.orig/kernel/sched/fair.c linux-4.1.26/kernel/sched/fair.c } static void -@@ -3366,7 +3366,7 @@ +@@ -3366,7 +3366,7 @@ entity_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr, int queued) * validating it and just reschedule. */ if (queued) { @@ -20153,7 +21362,7 @@ diff -Nur linux-4.1.26.orig/kernel/sched/fair.c linux-4.1.26/kernel/sched/fair.c return; } /* -@@ -3557,7 +3557,7 @@ +@@ -3557,7 +3557,7 @@ static void __account_cfs_rq_runtime(struct cfs_rq *cfs_rq, u64 delta_exec) * hierarchy can be throttled */ if (!assign_cfs_rq_runtime(cfs_rq) && likely(cfs_rq->curr)) @@ -20162,7 +21371,7 @@ diff -Nur linux-4.1.26.orig/kernel/sched/fair.c linux-4.1.26/kernel/sched/fair.c } static __always_inline -@@ -4180,7 +4180,7 @@ +@@ -4180,7 +4180,7 @@ static void hrtick_start_fair(struct rq *rq, struct task_struct *p) if (delta < 0) { if (rq->curr == p) @@ -20171,7 +21380,7 @@ diff -Nur linux-4.1.26.orig/kernel/sched/fair.c linux-4.1.26/kernel/sched/fair.c return; } hrtick_start(rq, delta); -@@ -5076,7 +5076,7 @@ +@@ -5076,7 +5076,7 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_ return; preempt: @@ -20180,7 +21389,7 @@ diff -Nur linux-4.1.26.orig/kernel/sched/fair.c linux-4.1.26/kernel/sched/fair.c /* * 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 @@ +@@ -7869,7 +7869,7 @@ static void task_fork_fair(struct task_struct *p) * 'current' within the tree based on its new key value. */ swap(curr->vruntime, se->vruntime); @@ -20189,7 +21398,7 @@ diff -Nur linux-4.1.26.orig/kernel/sched/fair.c linux-4.1.26/kernel/sched/fair.c } se->vruntime -= cfs_rq->min_vruntime; -@@ -7894,7 +7894,7 @@ +@@ -7894,7 +7894,7 @@ prio_changed_fair(struct rq *rq, struct task_struct *p, int oldprio) */ if (rq->curr == p) { if (p->prio > oldprio) @@ -20198,10 +21407,11 @@ diff -Nur linux-4.1.26.orig/kernel/sched/fair.c linux-4.1.26/kernel/sched/fair.c } else check_preempt_curr(rq, p, 0); } -diff -Nur linux-4.1.26.orig/kernel/sched/features.h linux-4.1.26/kernel/sched/features.h ---- linux-4.1.26.orig/kernel/sched/features.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/sched/features.h 2016-06-19 15:30:58.707298121 +0200 -@@ -50,11 +50,19 @@ +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) */ SCHED_FEAT(NONTASK_CAPACITY, true) @@ -20221,22 +21431,11 @@ diff -Nur linux-4.1.26.orig/kernel/sched/features.h linux-4.1.26/kernel/sched/fe #ifdef HAVE_RT_PUSH_IPI /* -diff -Nur linux-4.1.26.orig/kernel/sched/Makefile linux-4.1.26/kernel/sched/Makefile ---- linux-4.1.26.orig/kernel/sched/Makefile 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/sched/Makefile 2016-06-19 15:30:58.699297812 +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.26.orig/kernel/sched/rt.c linux-4.1.26/kernel/sched/rt.c ---- linux-4.1.26.orig/kernel/sched/rt.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/sched/rt.c 2016-06-19 15:30:58.707298121 +0200 -@@ -44,6 +44,7 @@ +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) hrtimer_init(&rt_b->rt_period_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); @@ -20244,7 +21443,7 @@ diff -Nur linux-4.1.26.orig/kernel/sched/rt.c linux-4.1.26/kernel/sched/rt.c rt_b->rt_period_timer.function = sched_rt_period_timer; } -@@ -89,6 +90,7 @@ +@@ -89,6 +90,7 @@ void init_rt_rq(struct rt_rq *rt_rq) 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); @@ -20252,10 +21451,11 @@ diff -Nur linux-4.1.26.orig/kernel/sched/rt.c linux-4.1.26/kernel/sched/rt.c #endif #endif /* CONFIG_SMP */ /* We start is dequeued state, because no RT tasks are queued */ -diff -Nur linux-4.1.26.orig/kernel/sched/sched.h linux-4.1.26/kernel/sched/sched.h ---- linux-4.1.26.orig/kernel/sched/sched.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/sched/sched.h 2016-06-19 15:30:58.707298121 +0200 -@@ -1093,6 +1093,7 @@ +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) #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 */ @@ -20263,7 +21463,7 @@ diff -Nur linux-4.1.26.orig/kernel/sched/sched.h linux-4.1.26/kernel/sched/sched /* * To aid in avoiding the subversion of "niceness" due to uneven distribution -@@ -1290,6 +1291,15 @@ +@@ -1290,6 +1291,15 @@ extern void init_sched_dl_class(void); extern void resched_curr(struct rq *rq); extern void resched_cpu(int cpu); @@ -20279,9 +21479,11 @@ diff -Nur linux-4.1.26.orig/kernel/sched/sched.h linux-4.1.26/kernel/sched/sched extern struct rt_bandwidth def_rt_bandwidth; extern void init_rt_bandwidth(struct rt_bandwidth *rt_b, u64 period, u64 runtime); -diff -Nur linux-4.1.26.orig/kernel/sched/wait-simple.c linux-4.1.26/kernel/sched/wait-simple.c ---- linux-4.1.26.orig/kernel/sched/wait-simple.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-4.1.26/kernel/sched/wait-simple.c 2016-06-19 15:30:58.707298121 +0200 +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 @@ -0,0 +1,115 @@ +/* + * Simple waitqueues without fancy flags and callbacks @@ -20398,9 +21600,11 @@ diff -Nur linux-4.1.26.orig/kernel/sched/wait-simple.c linux-4.1.26/kernel/sched + return woken; +} +EXPORT_SYMBOL(__swait_wake); -diff -Nur linux-4.1.26.orig/kernel/sched/work-simple.c linux-4.1.26/kernel/sched/work-simple.c ---- linux-4.1.26.orig/kernel/sched/work-simple.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-4.1.26/kernel/sched/work-simple.c 2016-06-19 15:30:58.707298121 +0200 +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 @@ -0,0 +1,173 @@ +/* + * Copyright (C) 2014 BMW Car IT GmbH, Daniel Wagner daniel.wagner@bmw-carit.de @@ -20575,9 +21779,10 @@ diff -Nur linux-4.1.26.orig/kernel/sched/work-simple.c linux-4.1.26/kernel/sched + mutex_unlock(&worker_mutex); +} +EXPORT_SYMBOL_GPL(swork_put); -diff -Nur linux-4.1.26.orig/kernel/signal.c linux-4.1.26/kernel/signal.c ---- linux-4.1.26.orig/kernel/signal.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/signal.c 2016-06-19 15:30:58.707298121 +0200 +diff --git a/kernel/signal.c b/kernel/signal.c +index 0206be728dac..1336e4c016ba 100644 +--- a/kernel/signal.c ++++ b/kernel/signal.c @@ -14,6 +14,7 @@ #include <linux/export.h> #include <linux/init.h> @@ -20586,7 +21791,7 @@ diff -Nur linux-4.1.26.orig/kernel/signal.c linux-4.1.26/kernel/signal.c #include <linux/fs.h> #include <linux/tty.h> #include <linux/binfmts.h> -@@ -352,13 +353,45 @@ +@@ -352,13 +353,45 @@ static bool task_participate_group_stop(struct task_struct *task) return false; } @@ -20633,7 +21838,7 @@ diff -Nur linux-4.1.26.orig/kernel/signal.c linux-4.1.26/kernel/signal.c { struct sigqueue *q = NULL; struct user_struct *user; -@@ -375,7 +408,10 @@ +@@ -375,7 +408,10 @@ __sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimi if (override_rlimit || atomic_read(&user->sigpending) <= task_rlimit(t, RLIMIT_SIGPENDING)) { @@ -20645,7 +21850,7 @@ diff -Nur linux-4.1.26.orig/kernel/signal.c linux-4.1.26/kernel/signal.c } else { print_dropped_signal(sig); } -@@ -392,6 +428,13 @@ +@@ -392,6 +428,13 @@ __sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimi return q; } @@ -20659,7 +21864,7 @@ diff -Nur linux-4.1.26.orig/kernel/signal.c linux-4.1.26/kernel/signal.c static void __sigqueue_free(struct sigqueue *q) { if (q->flags & SIGQUEUE_PREALLOC) -@@ -401,6 +444,21 @@ +@@ -401,6 +444,21 @@ static void __sigqueue_free(struct sigqueue *q) kmem_cache_free(sigqueue_cachep, q); } @@ -20681,7 +21886,7 @@ diff -Nur linux-4.1.26.orig/kernel/signal.c linux-4.1.26/kernel/signal.c void flush_sigqueue(struct sigpending *queue) { struct sigqueue *q; -@@ -414,6 +472,21 @@ +@@ -414,6 +472,21 @@ void flush_sigqueue(struct sigpending *queue) } /* @@ -20703,7 +21908,7 @@ diff -Nur linux-4.1.26.orig/kernel/signal.c linux-4.1.26/kernel/signal.c * Flush all pending signals for a task. */ void __flush_signals(struct task_struct *t) -@@ -565,7 +638,7 @@ +@@ -565,7 +638,7 @@ static void collect_signal(int sig, struct sigpending *list, siginfo_t *info) still_pending: list_del_init(&first->list); copy_siginfo(info, &first->info); @@ -20712,7 +21917,7 @@ diff -Nur linux-4.1.26.orig/kernel/signal.c linux-4.1.26/kernel/signal.c } else { /* * Ok, it wasn't in the queue. This must be -@@ -611,6 +684,8 @@ +@@ -611,6 +684,8 @@ int dequeue_signal(struct task_struct *tsk, sigset_t *mask, siginfo_t *info) { int signr; @@ -20721,7 +21926,7 @@ diff -Nur linux-4.1.26.orig/kernel/signal.c linux-4.1.26/kernel/signal.c /* We only dequeue private signals from ourselves, we don't let * signalfd steal them */ -@@ -1207,8 +1282,8 @@ +@@ -1207,8 +1282,8 @@ int do_send_sig_info(int sig, struct siginfo *info, struct task_struct *p, * We don't want to have recursive SIGSEGV's etc, for example, * that is why we also clear SIGNAL_UNKILLABLE. */ @@ -20732,7 +21937,7 @@ diff -Nur linux-4.1.26.orig/kernel/signal.c linux-4.1.26/kernel/signal.c { unsigned long int flags; int ret, blocked, ignored; -@@ -1233,6 +1308,39 @@ +@@ -1233,6 +1308,39 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t) return ret; } @@ -20772,7 +21977,7 @@ diff -Nur linux-4.1.26.orig/kernel/signal.c linux-4.1.26/kernel/signal.c /* * Nuke all other threads in the group. */ -@@ -1267,12 +1375,12 @@ +@@ -1267,12 +1375,12 @@ struct sighand_struct *__lock_task_sighand(struct task_struct *tsk, * Disable interrupts early to avoid deadlocks. * See rcu_read_unlock() comment header for details. */ @@ -20787,7 +21992,7 @@ diff -Nur linux-4.1.26.orig/kernel/signal.c linux-4.1.26/kernel/signal.c break; } /* -@@ -1293,7 +1401,7 @@ +@@ -1293,7 +1401,7 @@ struct sighand_struct *__lock_task_sighand(struct task_struct *tsk, } spin_unlock(&sighand->siglock); rcu_read_unlock(); @@ -20796,7 +22001,7 @@ diff -Nur linux-4.1.26.orig/kernel/signal.c linux-4.1.26/kernel/signal.c } return sighand; -@@ -1536,7 +1644,8 @@ +@@ -1536,7 +1644,8 @@ EXPORT_SYMBOL(kill_pid); */ struct sigqueue *sigqueue_alloc(void) { @@ -20806,7 +22011,7 @@ diff -Nur linux-4.1.26.orig/kernel/signal.c linux-4.1.26/kernel/signal.c if (q) q->flags |= SIGQUEUE_PREALLOC; -@@ -1897,15 +2006,7 @@ +@@ -1897,15 +2006,7 @@ static void ptrace_stop(int exit_code, int why, int clear_code, siginfo_t *info) if (gstop_done && ptrace_reparented(current)) do_notify_parent_cldstop(current, false, why); @@ -20822,9 +22027,10 @@ diff -Nur linux-4.1.26.orig/kernel/signal.c linux-4.1.26/kernel/signal.c freezable_schedule(); } else { /* -diff -Nur linux-4.1.26.orig/kernel/softirq.c linux-4.1.26/kernel/softirq.c ---- linux-4.1.26.orig/kernel/softirq.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/softirq.c 2016-06-19 15:30:58.707298121 +0200 +diff --git a/kernel/softirq.c b/kernel/softirq.c +index 479e4436f787..cb9c1d5dee10 100644 +--- a/kernel/softirq.c ++++ b/kernel/softirq.c @@ -21,10 +21,12 @@ #include <linux/freezer.h> #include <linux/kthread.h> @@ -20838,7 +22044,7 @@ diff -Nur linux-4.1.26.orig/kernel/softirq.c linux-4.1.26/kernel/softirq.c #include <linux/irq.h> #define CREATE_TRACE_POINTS -@@ -56,12 +58,108 @@ +@@ -56,12 +58,108 @@ EXPORT_SYMBOL(irq_stat); static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp; DEFINE_PER_CPU(struct task_struct *, ksoftirqd); @@ -20947,7 +22153,7 @@ diff -Nur linux-4.1.26.orig/kernel/softirq.c linux-4.1.26/kernel/softirq.c /* * 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 @@ +@@ -77,6 +175,79 @@ static void wakeup_softirqd(void) wake_up_process(tsk); } @@ -21027,7 +22233,7 @@ diff -Nur linux-4.1.26.orig/kernel/softirq.c linux-4.1.26/kernel/softirq.c /* * preempt_count and SOFTIRQ_OFFSET usage: * - preempt_count is changed by SOFTIRQ_OFFSET on entering or leaving -@@ -116,9 +287,9 @@ +@@ -116,9 +287,9 @@ void __local_bh_disable_ip(unsigned long ip, unsigned int cnt) if (preempt_count() == cnt) { #ifdef CONFIG_DEBUG_PREEMPT @@ -21039,7 +22245,7 @@ diff -Nur linux-4.1.26.orig/kernel/softirq.c linux-4.1.26/kernel/softirq.c } } EXPORT_SYMBOL(__local_bh_disable_ip); -@@ -232,10 +403,8 @@ +@@ -232,10 +403,8 @@ asmlinkage __visible void __do_softirq(void) unsigned long end = jiffies + MAX_SOFTIRQ_TIME; unsigned long old_flags = current->flags; int max_restart = MAX_SOFTIRQ_RESTART; @@ -21050,7 +22256,7 @@ diff -Nur linux-4.1.26.orig/kernel/softirq.c linux-4.1.26/kernel/softirq.c /* * Mask out PF_MEMALLOC s current task context is borrowed for the -@@ -254,36 +423,7 @@ +@@ -254,36 +423,7 @@ restart: /* Reset the pending bitmask before enabling irqs */ set_softirq_pending(0); @@ -21088,7 +22294,7 @@ diff -Nur linux-4.1.26.orig/kernel/softirq.c linux-4.1.26/kernel/softirq.c pending = local_softirq_pending(); if (pending) { -@@ -320,6 +460,310 @@ +@@ -320,6 +460,310 @@ asmlinkage __visible void do_softirq(void) } /* @@ -21399,7 +22605,7 @@ diff -Nur linux-4.1.26.orig/kernel/softirq.c linux-4.1.26/kernel/softirq.c * Enter an interrupt context. */ void irq_enter(void) -@@ -330,9 +774,9 @@ +@@ -330,9 +774,9 @@ void irq_enter(void) * Prevent raise_softirq from needlessly waking up ksoftirqd * here, as softirq will be serviced on return from interrupt. */ @@ -21411,7 +22617,7 @@ diff -Nur linux-4.1.26.orig/kernel/softirq.c linux-4.1.26/kernel/softirq.c } __irq_enter(); -@@ -340,6 +784,7 @@ +@@ -340,6 +784,7 @@ void irq_enter(void) static inline void invoke_softirq(void) { @@ -21419,7 +22625,7 @@ diff -Nur linux-4.1.26.orig/kernel/softirq.c linux-4.1.26/kernel/softirq.c if (!force_irqthreads) { #ifdef CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK /* -@@ -359,6 +804,18 @@ +@@ -359,6 +804,18 @@ static inline void invoke_softirq(void) } else { wakeup_softirqd(); } @@ -21438,7 +22644,7 @@ diff -Nur linux-4.1.26.orig/kernel/softirq.c linux-4.1.26/kernel/softirq.c } static inline void tick_irq_exit(void) -@@ -395,26 +852,6 @@ +@@ -395,26 +852,6 @@ void irq_exit(void) trace_hardirq_exit(); /* must be last! */ } @@ -21465,7 +22671,7 @@ diff -Nur linux-4.1.26.orig/kernel/softirq.c linux-4.1.26/kernel/softirq.c void raise_softirq(unsigned int nr) { unsigned long flags; -@@ -424,12 +861,6 @@ +@@ -424,12 +861,6 @@ void raise_softirq(unsigned int nr) local_irq_restore(flags); } @@ -21478,7 +22684,7 @@ diff -Nur linux-4.1.26.orig/kernel/softirq.c linux-4.1.26/kernel/softirq.c void open_softirq(int nr, void (*action)(struct softirq_action *)) { softirq_vec[nr].action = action; -@@ -446,15 +877,45 @@ +@@ -446,15 +877,45 @@ struct tasklet_head { static DEFINE_PER_CPU(struct tasklet_head, tasklet_vec); static DEFINE_PER_CPU(struct tasklet_head, tasklet_hi_vec); @@ -21528,7 +22734,7 @@ diff -Nur linux-4.1.26.orig/kernel/softirq.c linux-4.1.26/kernel/softirq.c local_irq_restore(flags); } EXPORT_SYMBOL(__tasklet_schedule); -@@ -464,10 +925,7 @@ +@@ -464,10 +925,7 @@ void __tasklet_hi_schedule(struct tasklet_struct *t) unsigned long flags; local_irq_save(flags); @@ -21540,7 +22746,7 @@ diff -Nur linux-4.1.26.orig/kernel/softirq.c linux-4.1.26/kernel/softirq.c local_irq_restore(flags); } EXPORT_SYMBOL(__tasklet_hi_schedule); -@@ -476,82 +934,122 @@ +@@ -476,82 +934,122 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t) { BUG_ON(!irqs_disabled()); @@ -21712,7 +22918,7 @@ diff -Nur linux-4.1.26.orig/kernel/softirq.c linux-4.1.26/kernel/softirq.c } void tasklet_init(struct tasklet_struct *t, -@@ -572,7 +1070,7 @@ +@@ -572,7 +1070,7 @@ void tasklet_kill(struct tasklet_struct *t) while (test_and_set_bit(TASKLET_STATE_SCHED, &t->state)) { do { @@ -21721,7 +22927,7 @@ diff -Nur linux-4.1.26.orig/kernel/softirq.c linux-4.1.26/kernel/softirq.c } while (test_bit(TASKLET_STATE_SCHED, &t->state)); } tasklet_unlock_wait(t); -@@ -646,25 +1144,26 @@ +@@ -646,25 +1144,26 @@ void __init softirq_init(void) open_softirq(HI_SOFTIRQ, tasklet_hi_action); } @@ -21763,7 +22969,7 @@ diff -Nur linux-4.1.26.orig/kernel/softirq.c linux-4.1.26/kernel/softirq.c } #ifdef CONFIG_HOTPLUG_CPU -@@ -746,16 +1245,31 @@ +@@ -746,16 +1245,31 @@ static struct notifier_block cpu_nfb = { static struct smp_hotplug_thread softirq_threads = { .store = &ksoftirqd, @@ -21795,10 +23001,11 @@ diff -Nur linux-4.1.26.orig/kernel/softirq.c linux-4.1.26/kernel/softirq.c return 0; } -diff -Nur linux-4.1.26.orig/kernel/stop_machine.c linux-4.1.26/kernel/stop_machine.c ---- linux-4.1.26.orig/kernel/stop_machine.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/stop_machine.c 2016-06-19 15:30:58.707298121 +0200 -@@ -35,7 +35,7 @@ +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 { /* the actual stopper, one per every possible cpu, enabled on online cpus */ struct cpu_stopper { @@ -21807,7 +23014,7 @@ diff -Nur linux-4.1.26.orig/kernel/stop_machine.c linux-4.1.26/kernel/stop_machi bool enabled; /* is this stopper enabled? */ struct list_head works; /* list of pending works */ }; -@@ -78,7 +78,7 @@ +@@ -78,7 +78,7 @@ static void cpu_stop_queue_work(unsigned int cpu, struct cpu_stop_work *work) unsigned long flags; @@ -21816,7 +23023,7 @@ diff -Nur linux-4.1.26.orig/kernel/stop_machine.c linux-4.1.26/kernel/stop_machi if (stopper->enabled) { list_add_tail(&work->list, &stopper->works); -@@ -86,7 +86,7 @@ +@@ -86,7 +86,7 @@ static void cpu_stop_queue_work(unsigned int cpu, struct cpu_stop_work *work) } else cpu_stop_signal_done(work->done, false); @@ -21825,7 +23032,7 @@ diff -Nur linux-4.1.26.orig/kernel/stop_machine.c linux-4.1.26/kernel/stop_machi } /** -@@ -248,7 +248,7 @@ +@@ -248,7 +248,7 @@ int stop_two_cpus(unsigned int cpu1, unsigned int cpu2, cpu_stop_fn_t fn, void * struct irq_cpu_stop_queue_work_info call_args; struct multi_stop_data msdata; @@ -21834,7 +23041,7 @@ diff -Nur linux-4.1.26.orig/kernel/stop_machine.c linux-4.1.26/kernel/stop_machi msdata = (struct multi_stop_data){ .fn = fn, .data = arg, -@@ -281,7 +281,7 @@ +@@ -281,7 +281,7 @@ int stop_two_cpus(unsigned int cpu1, unsigned int cpu2, cpu_stop_fn_t fn, void * * This relies on the stopper workqueues to be FIFO. */ if (!cpu_active(cpu1) || !cpu_active(cpu2)) { @@ -21843,7 +23050,7 @@ diff -Nur linux-4.1.26.orig/kernel/stop_machine.c linux-4.1.26/kernel/stop_machi return -ENOENT; } -@@ -295,7 +295,7 @@ +@@ -295,7 +295,7 @@ int stop_two_cpus(unsigned int cpu1, unsigned int cpu2, cpu_stop_fn_t fn, void * &irq_cpu_stop_queue_work, &call_args, 1); lg_local_unlock(&stop_cpus_lock); @@ -21852,7 +23059,7 @@ diff -Nur linux-4.1.26.orig/kernel/stop_machine.c linux-4.1.26/kernel/stop_machi wait_for_completion(&done.completion); -@@ -329,7 +329,7 @@ +@@ -329,7 +329,7 @@ static DEFINE_PER_CPU(struct cpu_stop_work, stop_cpus_work); static void queue_stop_cpus_work(const struct cpumask *cpumask, cpu_stop_fn_t fn, void *arg, @@ -21861,7 +23068,7 @@ diff -Nur linux-4.1.26.orig/kernel/stop_machine.c linux-4.1.26/kernel/stop_machi { struct cpu_stop_work *work; unsigned int cpu; -@@ -343,11 +343,13 @@ +@@ -343,11 +343,13 @@ static void queue_stop_cpus_work(const struct cpumask *cpumask, } /* @@ -21879,7 +23086,7 @@ diff -Nur linux-4.1.26.orig/kernel/stop_machine.c linux-4.1.26/kernel/stop_machi 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 @@ +@@ -359,7 +361,7 @@ static int __stop_cpus(const struct cpumask *cpumask, struct cpu_stop_done done; cpu_stop_init_done(&done, cpumask_weight(cpumask)); @@ -21888,7 +23095,7 @@ diff -Nur linux-4.1.26.orig/kernel/stop_machine.c linux-4.1.26/kernel/stop_machi wait_for_completion(&done.completion); return done.executed ? done.ret : -ENOENT; } -@@ -439,9 +441,9 @@ +@@ -439,9 +441,9 @@ static int cpu_stop_should_run(unsigned int cpu) unsigned long flags; int run; @@ -21900,7 +23107,7 @@ diff -Nur linux-4.1.26.orig/kernel/stop_machine.c linux-4.1.26/kernel/stop_machi return run; } -@@ -453,13 +455,13 @@ +@@ -453,13 +455,13 @@ static void cpu_stopper_thread(unsigned int cpu) repeat: work = NULL; @@ -21916,7 +23123,7 @@ diff -Nur linux-4.1.26.orig/kernel/stop_machine.c linux-4.1.26/kernel/stop_machi if (work) { cpu_stop_fn_t fn = work->fn; -@@ -467,6 +469,16 @@ +@@ -467,6 +469,16 @@ repeat: struct cpu_stop_done *done = work->done; char ksym_buf[KSYM_NAME_LEN] __maybe_unused; @@ -21933,7 +23140,7 @@ diff -Nur linux-4.1.26.orig/kernel/stop_machine.c linux-4.1.26/kernel/stop_machi /* cpu stop callbacks are not allowed to sleep */ preempt_disable(); -@@ -500,20 +512,20 @@ +@@ -500,20 +512,20 @@ static void cpu_stop_park(unsigned int cpu) unsigned long flags; /* drain remaining works */ @@ -21958,7 +23165,7 @@ diff -Nur linux-4.1.26.orig/kernel/stop_machine.c linux-4.1.26/kernel/stop_machi } static struct smp_hotplug_thread cpu_stop_threads = { -@@ -535,10 +547,12 @@ +@@ -535,10 +547,12 @@ static int __init cpu_stop_init(void) for_each_possible_cpu(cpu) { struct cpu_stopper *stopper = &per_cpu(cpu_stopper, cpu); @@ -21972,7 +23179,7 @@ diff -Nur linux-4.1.26.orig/kernel/stop_machine.c linux-4.1.26/kernel/stop_machi BUG_ON(smpboot_register_percpu_thread(&cpu_stop_threads)); stop_machine_initialized = true; return 0; -@@ -634,7 +648,7 @@ +@@ -634,7 +648,7 @@ int stop_machine_from_inactive_cpu(int (*fn)(void *), void *data, 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, @@ -21981,9 +23188,10 @@ diff -Nur linux-4.1.26.orig/kernel/stop_machine.c linux-4.1.26/kernel/stop_machi ret = multi_cpu_stop(&msdata); /* Busy wait for completion. */ -diff -Nur linux-4.1.26.orig/kernel/time/hrtimer.c linux-4.1.26/kernel/time/hrtimer.c ---- linux-4.1.26.orig/kernel/time/hrtimer.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/time/hrtimer.c 2016-06-19 15:30:58.707298121 +0200 +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 @@ -48,11 +48,13 @@ #include <linux/sched/rt.h> #include <linux/sched/deadline.h> @@ -21998,7 +23206,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/hrtimer.c linux-4.1.26/kernel/time/hrtim #include "tick-internal.h" -@@ -576,8 +578,7 @@ +@@ -576,8 +578,7 @@ static int hrtimer_reprogram(struct hrtimer *timer, * 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 @@ -22008,7 +23216,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/hrtimer.c linux-4.1.26/kernel/time/hrtim */ if (hrtimer_callback_running(timer)) return 0; -@@ -621,6 +622,9 @@ +@@ -621,6 +622,9 @@ static int hrtimer_reprogram(struct hrtimer *timer, return res; } @@ -22018,7 +23226,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/hrtimer.c linux-4.1.26/kernel/time/hrtim /* * Initialize the high resolution related parts of cpu_base */ -@@ -630,6 +634,21 @@ +@@ -630,6 +634,21 @@ static inline void hrtimer_init_hres(struct hrtimer_cpu_base *base) base->hres_active = 0; } @@ -22040,7 +23248,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/hrtimer.c linux-4.1.26/kernel/time/hrtim 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 @@ +@@ -695,6 +714,44 @@ static void clock_was_set_work(struct work_struct *work) static DECLARE_WORK(hrtimer_work, clock_was_set_work); @@ -22085,7 +23293,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/hrtimer.c linux-4.1.26/kernel/time/hrtim /* * Called from timekeeping and resume code to reprogramm the hrtimer * interrupt device on all cpus. -@@ -703,6 +760,7 @@ +@@ -703,6 +760,7 @@ void clock_was_set_delayed(void) { schedule_work(&hrtimer_work); } @@ -22093,7 +23301,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/hrtimer.c linux-4.1.26/kernel/time/hrtim #else -@@ -711,6 +769,13 @@ +@@ -711,6 +769,13 @@ static inline int hrtimer_is_hres_enabled(void) { return 0; } static inline int hrtimer_switch_to_hres(void) { return 0; } static inline void hrtimer_force_reprogram(struct hrtimer_cpu_base *base, int skip_equal) { } @@ -22107,7 +23315,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/hrtimer.c linux-4.1.26/kernel/time/hrtim static inline int hrtimer_reprogram(struct hrtimer *timer, struct hrtimer_clock_base *base) { -@@ -718,7 +783,6 @@ +@@ -718,7 +783,6 @@ static inline int hrtimer_reprogram(struct hrtimer *timer, } static inline void hrtimer_init_hres(struct hrtimer_cpu_base *base) { } static inline void retrigger_next_event(void *arg) { } @@ -22115,7 +23323,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/hrtimer.c linux-4.1.26/kernel/time/hrtim #endif /* CONFIG_HIGH_RES_TIMERS */ /* -@@ -836,6 +900,32 @@ +@@ -836,6 +900,32 @@ u64 hrtimer_forward(struct hrtimer *timer, ktime_t now, ktime_t interval) } EXPORT_SYMBOL_GPL(hrtimer_forward); @@ -22148,7 +23356,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/hrtimer.c linux-4.1.26/kernel/time/hrtim /* * enqueue_hrtimer - internal function to (re)start a timer * -@@ -879,6 +969,11 @@ +@@ -879,6 +969,11 @@ static void __remove_hrtimer(struct hrtimer *timer, if (!(timer->state & HRTIMER_STATE_ENQUEUED)) goto out; @@ -22160,7 +23368,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/hrtimer.c linux-4.1.26/kernel/time/hrtim next_timer = timerqueue_getnext(&base->active); timerqueue_del(&base->active, &timer->node); if (&timer->node == next_timer) { -@@ -966,7 +1061,16 @@ +@@ -966,7 +1061,16 @@ int __hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim, new_base = switch_hrtimer_base(timer, base, mode & HRTIMER_MODE_PINNED); timer_stats_hrtimer_set_start_info(timer); @@ -22177,7 +23385,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/hrtimer.c linux-4.1.26/kernel/time/hrtim leftmost = enqueue_hrtimer(timer, new_base); if (!leftmost) { -@@ -980,15 +1084,26 @@ +@@ -980,15 +1084,26 @@ int __hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim, * on dynticks target. */ wake_up_nohz_cpu(new_base->cpu_base->cpu); @@ -22207,7 +23415,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/hrtimer.c linux-4.1.26/kernel/time/hrtim /* * We need to drop cpu_base->lock to avoid a * lock ordering issue vs. rq->lock. -@@ -996,9 +1111,7 @@ +@@ -996,9 +1111,7 @@ int __hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim, raw_spin_unlock(&new_base->cpu_base->lock); raise_softirq_irqoff(HRTIMER_SOFTIRQ); local_irq_restore(flags); @@ -22218,7 +23426,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/hrtimer.c linux-4.1.26/kernel/time/hrtim } } -@@ -1089,7 +1202,7 @@ +@@ -1089,7 +1202,7 @@ int hrtimer_cancel(struct hrtimer *timer) if (ret >= 0) return ret; @@ -22227,7 +23435,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/hrtimer.c linux-4.1.26/kernel/time/hrtim } } EXPORT_SYMBOL_GPL(hrtimer_cancel); -@@ -1153,6 +1266,7 @@ +@@ -1153,6 +1266,7 @@ static void __hrtimer_init(struct hrtimer *timer, clockid_t clock_id, base = hrtimer_clockid_to_base(clock_id); timer->base = &cpu_base->clock_base[base]; @@ -22235,7 +23443,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/hrtimer.c linux-4.1.26/kernel/time/hrtim timerqueue_init(&timer->node); #ifdef CONFIG_TIMER_STATS -@@ -1236,6 +1350,126 @@ +@@ -1236,6 +1350,126 @@ static void __run_hrtimer(struct hrtimer *timer, ktime_t *now) timer->state &= ~HRTIMER_STATE_CALLBACK; } @@ -22362,7 +23570,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/hrtimer.c linux-4.1.26/kernel/time/hrtim #ifdef CONFIG_HIGH_RES_TIMERS /* -@@ -1246,7 +1480,7 @@ +@@ -1246,7 +1480,7 @@ void hrtimer_interrupt(struct clock_event_device *dev) { struct hrtimer_cpu_base *cpu_base = this_cpu_ptr(&hrtimer_bases); ktime_t expires_next, now, entry_time, delta; @@ -22371,7 +23579,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/hrtimer.c linux-4.1.26/kernel/time/hrtim BUG_ON(!cpu_base->hres_active); cpu_base->nr_events++; -@@ -1281,6 +1515,15 @@ +@@ -1281,6 +1515,15 @@ retry: timer = container_of(node, struct hrtimer, node); @@ -22387,7 +23595,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/hrtimer.c linux-4.1.26/kernel/time/hrtim /* * The immediate goal for using the softexpires is * minimizing wakeups, not running timers at the -@@ -1296,7 +1539,10 @@ +@@ -1296,7 +1539,10 @@ retry: if (basenow.tv64 < hrtimer_get_softexpires_tv64(timer)) break; @@ -22399,7 +23607,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/hrtimer.c linux-4.1.26/kernel/time/hrtim } } /* Reevaluate the clock bases for the next expiry */ -@@ -1313,7 +1559,7 @@ +@@ -1313,7 +1559,7 @@ retry: if (expires_next.tv64 == KTIME_MAX || !tick_program_event(expires_next, 0)) { cpu_base->hang_detected = 0; @@ -22408,7 +23616,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/hrtimer.c linux-4.1.26/kernel/time/hrtim } /* -@@ -1357,6 +1603,9 @@ +@@ -1357,6 +1603,9 @@ retry: tick_program_event(expires_next, 1); printk_once(KERN_WARNING "hrtimer: interrupt took %llu ns\n", ktime_to_ns(delta)); @@ -22418,7 +23626,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/hrtimer.c linux-4.1.26/kernel/time/hrtim } /* -@@ -1392,18 +1641,18 @@ +@@ -1392,18 +1641,18 @@ void hrtimer_peek_ahead_timers(void) __hrtimer_peek_ahead_timers(); local_irq_restore(flags); } @@ -22443,7 +23651,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/hrtimer.c linux-4.1.26/kernel/time/hrtim /* * Called from timer softirq every jiffy, expire hrtimers: * -@@ -1436,7 +1685,7 @@ +@@ -1436,7 +1685,7 @@ void hrtimer_run_queues(void) struct timerqueue_node *node; struct hrtimer_cpu_base *cpu_base = this_cpu_ptr(&hrtimer_bases); struct hrtimer_clock_base *base; @@ -22452,7 +23660,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/hrtimer.c linux-4.1.26/kernel/time/hrtim if (hrtimer_hres_active()) return; -@@ -1461,10 +1710,16 @@ +@@ -1461,10 +1710,16 @@ void hrtimer_run_queues(void) hrtimer_get_expires_tv64(timer)) break; @@ -22470,7 +23678,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/hrtimer.c linux-4.1.26/kernel/time/hrtim } /* -@@ -1486,16 +1741,18 @@ +@@ -1486,16 +1741,18 @@ static enum hrtimer_restart hrtimer_wakeup(struct hrtimer *timer) void hrtimer_init_sleeper(struct hrtimer_sleeper *sl, struct task_struct *task) { sl->timer.function = hrtimer_wakeup; @@ -22491,7 +23699,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/hrtimer.c linux-4.1.26/kernel/time/hrtim hrtimer_start_expires(&t->timer, mode); if (!hrtimer_active(&t->timer)) t->task = NULL; -@@ -1539,7 +1796,8 @@ +@@ -1539,7 +1796,8 @@ long __sched hrtimer_nanosleep_restart(struct restart_block *restart) HRTIMER_MODE_ABS); hrtimer_set_expires_tv64(&t.timer, restart->nanosleep.expires); @@ -22501,7 +23709,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/hrtimer.c linux-4.1.26/kernel/time/hrtim goto out; rmtp = restart->nanosleep.rmtp; -@@ -1556,8 +1814,10 @@ +@@ -1556,8 +1814,10 @@ out: return ret; } @@ -22514,7 +23722,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/hrtimer.c linux-4.1.26/kernel/time/hrtim { struct restart_block *restart; struct hrtimer_sleeper t; -@@ -1570,7 +1830,7 @@ +@@ -1570,7 +1830,7 @@ long hrtimer_nanosleep(struct timespec *rqtp, struct timespec __user *rmtp, hrtimer_init_on_stack(&t.timer, clockid, mode); hrtimer_set_expires_range_ns(&t.timer, timespec_to_ktime(*rqtp), slack); @@ -22523,7 +23731,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/hrtimer.c linux-4.1.26/kernel/time/hrtim goto out; /* Absolute timers do not update the rmtp value and restart: */ -@@ -1597,6 +1857,12 @@ +@@ -1597,6 +1857,12 @@ out: return ret; } @@ -22536,7 +23744,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/hrtimer.c linux-4.1.26/kernel/time/hrtim SYSCALL_DEFINE2(nanosleep, struct timespec __user *, rqtp, struct timespec __user *, rmtp) { -@@ -1611,6 +1877,26 @@ +@@ -1611,6 +1877,26 @@ SYSCALL_DEFINE2(nanosleep, struct timespec __user *, rqtp, return hrtimer_nanosleep(&tu, rmtp, HRTIMER_MODE_REL, CLOCK_MONOTONIC); } @@ -22563,7 +23771,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/hrtimer.c linux-4.1.26/kernel/time/hrtim /* * Functions related to boot-time initialization: */ -@@ -1622,10 +1908,14 @@ +@@ -1622,10 +1908,14 @@ static void init_hrtimers_cpu(int cpu) 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); @@ -22578,7 +23786,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/hrtimer.c linux-4.1.26/kernel/time/hrtim } #ifdef CONFIG_HOTPLUG_CPU -@@ -1731,9 +2021,7 @@ +@@ -1731,9 +2021,7 @@ void __init hrtimers_init(void) hrtimer_cpu_notify(&hrtimers_nb, (unsigned long)CPU_UP_PREPARE, (void *)(long)smp_processor_id()); register_cpu_notifier(&hrtimers_nb); @@ -22588,10 +23796,11 @@ diff -Nur linux-4.1.26.orig/kernel/time/hrtimer.c linux-4.1.26/kernel/time/hrtim } /** -diff -Nur linux-4.1.26.orig/kernel/time/itimer.c linux-4.1.26/kernel/time/itimer.c ---- linux-4.1.26.orig/kernel/time/itimer.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/time/itimer.c 2016-06-19 15:30:58.711298275 +0200 -@@ -213,6 +213,7 @@ +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: /* We are sharing ->siglock with it_real_fn() */ if (hrtimer_try_to_cancel(timer) < 0) { spin_unlock_irq(&tsk->sighand->siglock); @@ -22599,10 +23808,11 @@ diff -Nur linux-4.1.26.orig/kernel/time/itimer.c linux-4.1.26/kernel/time/itimer goto again; } expires = timeval_to_ktime(value->it_value); -diff -Nur linux-4.1.26.orig/kernel/time/jiffies.c linux-4.1.26/kernel/time/jiffies.c ---- linux-4.1.26.orig/kernel/time/jiffies.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/time/jiffies.c 2016-06-19 15:30:58.711298275 +0200 -@@ -74,7 +74,8 @@ +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 = { .max_cycles = 10, }; @@ -22612,7 +23822,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/jiffies.c linux-4.1.26/kernel/time/jiffi #if (BITS_PER_LONG < 64) u64 get_jiffies_64(void) -@@ -83,9 +84,9 @@ +@@ -83,9 +84,9 @@ u64 get_jiffies_64(void) u64 ret; do { @@ -22624,9 +23834,10 @@ diff -Nur linux-4.1.26.orig/kernel/time/jiffies.c linux-4.1.26/kernel/time/jiffi return ret; } EXPORT_SYMBOL(get_jiffies_64); -diff -Nur linux-4.1.26.orig/kernel/time/ntp.c linux-4.1.26/kernel/time/ntp.c ---- linux-4.1.26.orig/kernel/time/ntp.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/time/ntp.c 2016-06-19 15:30:58.711298275 +0200 +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 @@ -10,6 +10,7 @@ #include <linux/workqueue.h> #include <linux/hrtimer.h> @@ -22635,7 +23846,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/ntp.c linux-4.1.26/kernel/time/ntp.c #include <linux/math64.h> #include <linux/timex.h> #include <linux/time.h> -@@ -529,10 +530,52 @@ +@@ -529,10 +530,52 @@ static void sync_cmos_clock(struct work_struct *work) &sync_cmos_work, timespec_to_jiffies(&next)); } @@ -22688,9 +23899,10 @@ diff -Nur linux-4.1.26.orig/kernel/time/ntp.c linux-4.1.26/kernel/time/ntp.c #else void ntp_notify_cmos_timer(void) { } -diff -Nur linux-4.1.26.orig/kernel/time/posix-cpu-timers.c linux-4.1.26/kernel/time/posix-cpu-timers.c ---- linux-4.1.26.orig/kernel/time/posix-cpu-timers.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/time/posix-cpu-timers.c 2016-06-19 15:30:58.711298275 +0200 +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 @@ -3,6 +3,7 @@ */ @@ -22699,7 +23911,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/posix-cpu-timers.c linux-4.1.26/kernel/t #include <linux/posix-timers.h> #include <linux/errno.h> #include <linux/math64.h> -@@ -626,7 +627,7 @@ +@@ -626,7 +627,7 @@ static int posix_cpu_timer_set(struct k_itimer *timer, int timer_flags, /* * Disarm any old timer after extracting its expiry time. */ @@ -22708,7 +23920,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/posix-cpu-timers.c linux-4.1.26/kernel/t ret = 0; old_incr = timer->it.cpu.incr; -@@ -1047,7 +1048,7 @@ +@@ -1048,7 +1049,7 @@ void posix_cpu_timer_schedule(struct k_itimer *timer) /* * Now re-arm for the new expiry time. */ @@ -22717,7 +23929,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/posix-cpu-timers.c linux-4.1.26/kernel/t arm_timer(timer); unlock_task_sighand(p, &flags); -@@ -1113,10 +1114,11 @@ +@@ -1114,10 +1115,11 @@ static inline int fastpath_timer_check(struct task_struct *tsk) sig = tsk->signal; if (sig->cputimer.running) { struct task_cputime group_sample; @@ -22731,7 +23943,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/posix-cpu-timers.c linux-4.1.26/kernel/t if (task_cputime_expired(&group_sample, &sig->cputime_expires)) return 1; -@@ -1130,13 +1132,13 @@ +@@ -1131,13 +1133,13 @@ static inline int fastpath_timer_check(struct task_struct *tsk) * already updated our counts. We need to check if any timers fire now. * Interrupts are disabled. */ @@ -22747,7 +23959,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/posix-cpu-timers.c linux-4.1.26/kernel/t /* * The fast path checks that there are no expired thread or thread -@@ -1194,6 +1196,190 @@ +@@ -1195,6 +1197,190 @@ void run_posix_cpu_timers(struct task_struct *tsk) } } @@ -22938,10 +24150,11 @@ diff -Nur linux-4.1.26.orig/kernel/time/posix-cpu-timers.c linux-4.1.26/kernel/t /* * Set one of the process-wide special case CPU timers or RLIMIT_CPU. * The tsk->sighand->siglock must be held by the caller. -diff -Nur linux-4.1.26.orig/kernel/time/posix-timers.c linux-4.1.26/kernel/time/posix-timers.c ---- linux-4.1.26.orig/kernel/time/posix-timers.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/time/posix-timers.c 2016-06-19 15:30:58.711298275 +0200 -@@ -499,6 +499,7 @@ +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) static struct pid *good_sigevent(sigevent_t * event) { struct task_struct *rtn = current->group_leader; @@ -22949,7 +24162,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/posix-timers.c linux-4.1.26/kernel/time/ if ((event->sigev_notify & SIGEV_THREAD_ID ) && (!(rtn = find_task_by_vpid(event->sigev_notify_thread_id)) || -@@ -507,7 +508,8 @@ +@@ -507,7 +508,8 @@ static struct pid *good_sigevent(sigevent_t * event) return NULL; if (((event->sigev_notify & ~SIGEV_THREAD_ID) != SIGEV_NONE) && @@ -22959,7 +24172,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/posix-timers.c linux-4.1.26/kernel/time/ return NULL; return task_pid(rtn); -@@ -819,6 +821,20 @@ +@@ -819,6 +821,20 @@ SYSCALL_DEFINE1(timer_getoverrun, timer_t, timer_id) return overrun; } @@ -22980,7 +24193,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/posix-timers.c linux-4.1.26/kernel/time/ /* Set a POSIX.1b interval timer. */ /* timr->it_lock is taken. */ static int -@@ -896,6 +912,7 @@ +@@ -896,6 +912,7 @@ retry: if (!timr) return -EINVAL; @@ -22988,7 +24201,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/posix-timers.c linux-4.1.26/kernel/time/ kc = clockid_to_kclock(timr->it_clock); if (WARN_ON_ONCE(!kc || !kc->timer_set)) error = -EINVAL; -@@ -904,9 +921,12 @@ +@@ -904,9 +921,12 @@ retry: unlock_timer(timr, flag); if (error == TIMER_RETRY) { @@ -23001,7 +24214,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/posix-timers.c linux-4.1.26/kernel/time/ if (old_setting && !error && copy_to_user(old_setting, &old_spec, sizeof (old_spec))) -@@ -944,10 +964,15 @@ +@@ -944,10 +964,15 @@ retry_delete: if (!timer) return -EINVAL; @@ -23017,7 +24230,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/posix-timers.c linux-4.1.26/kernel/time/ spin_lock(¤t->sighand->siglock); list_del(&timer->list); -@@ -973,8 +998,18 @@ +@@ -973,8 +998,18 @@ static void itimer_delete(struct k_itimer *timer) retry_delete: spin_lock_irqsave(&timer->it_lock, flags); @@ -23036,20 +24249,22 @@ diff -Nur linux-4.1.26.orig/kernel/time/posix-timers.c linux-4.1.26/kernel/time/ goto retry_delete; } list_del(&timer->list); -diff -Nur linux-4.1.26.orig/kernel/time/tick-broadcast-hrtimer.c linux-4.1.26/kernel/time/tick-broadcast-hrtimer.c ---- linux-4.1.26.orig/kernel/time/tick-broadcast-hrtimer.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/time/tick-broadcast-hrtimer.c 2016-06-19 15:30:58.711298275 +0200 -@@ -109,5 +109,6 @@ +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) { hrtimer_init(&bctimer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS); bctimer.function = bc_handler; + bctimer.irqsafe = true; clockevents_register_device(&ce_broadcast_hrtimer); } -diff -Nur linux-4.1.26.orig/kernel/time/tick-common.c linux-4.1.26/kernel/time/tick-common.c ---- linux-4.1.26.orig/kernel/time/tick-common.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/time/tick-common.c 2016-06-19 15:30:58.711298275 +0200 -@@ -78,13 +78,15 @@ +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) static void tick_periodic(int cpu) { if (tick_do_timer_cpu == cpu) { @@ -23067,7 +24282,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/tick-common.c linux-4.1.26/kernel/time/t update_wall_time(); } -@@ -146,9 +148,9 @@ +@@ -146,9 +148,9 @@ void tick_setup_periodic(struct clock_event_device *dev, int broadcast) ktime_t next; do { @@ -23079,10 +24294,11 @@ diff -Nur linux-4.1.26.orig/kernel/time/tick-common.c linux-4.1.26/kernel/time/t clockevents_set_state(dev, CLOCK_EVT_STATE_ONESHOT); -diff -Nur linux-4.1.26.orig/kernel/time/tick-sched.c linux-4.1.26/kernel/time/tick-sched.c ---- linux-4.1.26.orig/kernel/time/tick-sched.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/time/tick-sched.c 2016-06-19 15:30:58.711298275 +0200 -@@ -62,7 +62,8 @@ +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) return; /* Reevalute with jiffies_lock held */ @@ -23092,7 +24308,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/tick-sched.c linux-4.1.26/kernel/time/ti delta = ktime_sub(now, last_jiffies_update); if (delta.tv64 >= tick_period.tv64) { -@@ -85,10 +86,12 @@ +@@ -85,10 +86,12 @@ static void tick_do_update_jiffies64(ktime_t now) /* Keep the tick_next_period variable up to date */ tick_next_period = ktime_add(last_jiffies_update, tick_period); } else { @@ -23107,7 +24323,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/tick-sched.c linux-4.1.26/kernel/time/ti update_wall_time(); } -@@ -99,12 +102,14 @@ +@@ -99,12 +102,14 @@ static ktime_t tick_init_jiffy_update(void) { ktime_t period; @@ -23124,7 +24340,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/tick-sched.c linux-4.1.26/kernel/time/ti return period; } -@@ -176,6 +181,11 @@ +@@ -176,6 +181,11 @@ static bool can_stop_full_tick(void) return false; } @@ -23136,7 +24352,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/tick-sched.c linux-4.1.26/kernel/time/ti /* sched_clock_tick() needs us? */ #ifdef CONFIG_HAVE_UNSTABLE_SCHED_CLOCK /* -@@ -222,6 +232,7 @@ +@@ -222,6 +232,7 @@ static void nohz_full_kick_work_func(struct irq_work *work) static DEFINE_PER_CPU(struct irq_work, nohz_full_kick_work) = { .func = nohz_full_kick_work_func, @@ -23144,7 +24360,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/tick-sched.c linux-4.1.26/kernel/time/ti }; /* -@@ -578,10 +589,10 @@ +@@ -578,10 +589,10 @@ static ktime_t tick_nohz_stop_sched_tick(struct tick_sched *ts, /* Read jiffies and the time when jiffies were updated last */ do { @@ -23157,7 +24373,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/tick-sched.c linux-4.1.26/kernel/time/ti if (rcu_needs_cpu(&rcu_delta_jiffies) || arch_needs_cpu() || irq_work_needs_cpu()) { -@@ -759,14 +770,7 @@ +@@ -759,14 +770,7 @@ static bool can_stop_idle_tick(int cpu, struct tick_sched *ts) return false; if (unlikely(local_softirq_pending() && cpu_online(cpu))) { @@ -23173,7 +24389,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/tick-sched.c linux-4.1.26/kernel/time/ti return false; } -@@ -1154,6 +1158,7 @@ +@@ -1154,6 +1158,7 @@ void tick_setup_sched_timer(void) * Emulate tick processing via per-CPU hrtimers: */ hrtimer_init(&ts->sched_timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS); @@ -23181,10 +24397,11 @@ diff -Nur linux-4.1.26.orig/kernel/time/tick-sched.c linux-4.1.26/kernel/time/ti ts->sched_timer.function = tick_sched_timer; /* Get the next period (per cpu) */ -diff -Nur linux-4.1.26.orig/kernel/time/timekeeping.c linux-4.1.26/kernel/time/timekeeping.c ---- linux-4.1.26.orig/kernel/time/timekeeping.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/time/timekeeping.c 2016-06-19 15:30:58.711298275 +0200 -@@ -2064,8 +2064,10 @@ +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); */ void xtime_update(unsigned long ticks) { @@ -23197,10 +24414,11 @@ diff -Nur linux-4.1.26.orig/kernel/time/timekeeping.c linux-4.1.26/kernel/time/t + raw_spin_unlock(&jiffies_lock); update_wall_time(); } -diff -Nur linux-4.1.26.orig/kernel/time/timekeeping.h linux-4.1.26/kernel/time/timekeeping.h ---- linux-4.1.26.orig/kernel/time/timekeeping.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/time/timekeeping.h 2016-06-19 15:30:58.711298275 +0200 -@@ -22,7 +22,8 @@ +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); extern void do_timer(unsigned long ticks); extern void update_wall_time(void); @@ -23210,10 +24428,11 @@ diff -Nur linux-4.1.26.orig/kernel/time/timekeeping.h linux-4.1.26/kernel/time/t #define CS_NAME_LEN 32 -diff -Nur linux-4.1.26.orig/kernel/time/timer.c linux-4.1.26/kernel/time/timer.c ---- linux-4.1.26.orig/kernel/time/timer.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/time/timer.c 2016-06-19 15:30:58.711298275 +0200 -@@ -78,6 +78,9 @@ +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 { struct tvec_base { spinlock_t lock; struct timer_list *running_timer; @@ -23223,7 +24442,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/timer.c linux-4.1.26/kernel/time/timer.c unsigned long timer_jiffies; unsigned long next_timer; unsigned long active_timers; -@@ -768,6 +771,36 @@ +@@ -768,6 +771,36 @@ static struct tvec_base *lock_timer_base(struct timer_list *timer, } } @@ -23260,7 +24479,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/timer.c linux-4.1.26/kernel/time/timer.c static inline int __mod_timer(struct timer_list *timer, unsigned long expires, bool pending_only, int pinned) -@@ -798,14 +831,8 @@ +@@ -798,14 +831,8 @@ __mod_timer(struct timer_list *timer, unsigned long expires, * handler yet has not finished. This also guarantees that * the timer is serialized wrt itself. */ @@ -23277,7 +24496,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/timer.c linux-4.1.26/kernel/time/timer.c } timer->expires = expires; -@@ -979,6 +1006,29 @@ +@@ -979,6 +1006,29 @@ void add_timer_on(struct timer_list *timer, int cpu) } EXPORT_SYMBOL_GPL(add_timer_on); @@ -23294,7 +24513,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/timer.c linux-4.1.26/kernel/time/timer.c + base->running_timer != timer); +} + -+# define wakeup_timer_waiters(b) wake_up(&(b)->wait_for_running_timer) ++# define wakeup_timer_waiters(b) wake_up_all(&(b)->wait_for_running_timer) +#else +static inline void wait_for_running_timer(struct timer_list *timer) +{ @@ -23307,7 +24526,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/timer.c linux-4.1.26/kernel/time/timer.c /** * del_timer - deactive a timer. * @timer: the timer to be deactivated -@@ -1036,7 +1086,7 @@ +@@ -1036,7 +1086,7 @@ int try_to_del_timer_sync(struct timer_list *timer) } EXPORT_SYMBOL(try_to_del_timer_sync); @@ -23316,7 +24535,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/timer.c linux-4.1.26/kernel/time/timer.c static DEFINE_PER_CPU(struct tvec_base, __tvec_bases); /** -@@ -1098,7 +1148,7 @@ +@@ -1098,7 +1148,7 @@ int del_timer_sync(struct timer_list *timer) int ret = try_to_del_timer_sync(timer); if (ret >= 0) return ret; @@ -23325,7 +24544,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/timer.c linux-4.1.26/kernel/time/timer.c } } EXPORT_SYMBOL(del_timer_sync); -@@ -1219,15 +1269,17 @@ +@@ -1219,16 +1269,18 @@ static inline void __run_timers(struct tvec_base *base) if (irqsafe) { spin_unlock(&base->lock); call_timer_fn(timer, fn, data); @@ -23340,11 +24559,12 @@ diff -Nur linux-4.1.26.orig/kernel/time/timer.c linux-4.1.26/kernel/time/timer.c } } - base->running_timer = NULL; -+ wakeup_timer_waiters(base); spin_unlock_irq(&base->lock); ++ wakeup_timer_waiters(base); } -@@ -1367,6 +1419,14 @@ + #ifdef CONFIG_NO_HZ_COMMON +@@ -1367,6 +1419,14 @@ unsigned long get_next_timer_interrupt(unsigned long now) if (cpu_is_offline(smp_processor_id())) return expires; @@ -23359,7 +24579,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/timer.c linux-4.1.26/kernel/time/timer.c spin_lock(&base->lock); if (base->active_timers) { if (time_before_eq(base->next_timer, base->timer_jiffies)) -@@ -1392,13 +1452,13 @@ +@@ -1392,13 +1452,13 @@ void update_process_times(int user_tick) /* Note: this timer irq context must be accounted for as well. */ account_process_tick(p, user_tick); @@ -23375,7 +24595,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/timer.c linux-4.1.26/kernel/time/timer.c run_posix_cpu_timers(p); } -@@ -1411,6 +1471,8 @@ +@@ -1411,6 +1471,8 @@ static void run_timer_softirq(struct softirq_action *h) hrtimer_run_pending(); @@ -23384,7 +24604,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/timer.c linux-4.1.26/kernel/time/timer.c if (time_after_eq(jiffies, base->timer_jiffies)) __run_timers(base); } -@@ -1566,7 +1628,7 @@ +@@ -1566,7 +1628,7 @@ static void migrate_timers(int cpu) BUG_ON(cpu_online(cpu)); old_base = per_cpu(tvec_bases, cpu); @@ -23393,7 +24613,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/timer.c linux-4.1.26/kernel/time/timer.c /* * The caller is globally serialized and nobody else * takes two locks at once, deadlock is not possible. -@@ -1590,7 +1652,7 @@ +@@ -1590,7 +1652,7 @@ static void migrate_timers(int cpu) spin_unlock(&old_base->lock); spin_unlock_irq(&new_base->lock); @@ -23402,7 +24622,7 @@ diff -Nur linux-4.1.26.orig/kernel/time/timer.c linux-4.1.26/kernel/time/timer.c } static int timer_cpu_notify(struct notifier_block *self, -@@ -1625,6 +1687,9 @@ +@@ -1625,6 +1687,9 @@ static void __init init_timer_cpu(struct tvec_base *base, int cpu) base->cpu = cpu; per_cpu(tvec_bases, cpu) = base; spin_lock_init(&base->lock); @@ -23412,10 +24632,11 @@ diff -Nur linux-4.1.26.orig/kernel/time/timer.c linux-4.1.26/kernel/time/timer.c for (j = 0; j < TVN_SIZE; j++) { INIT_LIST_HEAD(base->tv5.vec + j); -diff -Nur linux-4.1.26.orig/kernel/trace/Kconfig linux-4.1.26/kernel/trace/Kconfig ---- linux-4.1.26.orig/kernel/trace/Kconfig 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/trace/Kconfig 2016-06-19 15:30:58.711298275 +0200 -@@ -187,6 +187,24 @@ +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 enabled. This option and the preempt-off timing option can be used together or separately.) @@ -23440,7 +24661,7 @@ diff -Nur linux-4.1.26.orig/kernel/trace/Kconfig linux-4.1.26/kernel/trace/Kconf config PREEMPT_TRACER bool "Preemption-off Latency Tracer" default n -@@ -211,6 +229,24 @@ +@@ -211,6 +229,24 @@ config PREEMPT_TRACER enabled. This option and the irqs-off timing option can be used together or separately.) @@ -23465,7 +24686,7 @@ diff -Nur linux-4.1.26.orig/kernel/trace/Kconfig linux-4.1.26/kernel/trace/Kconf config SCHED_TRACER bool "Scheduling Latency Tracer" select GENERIC_TRACER -@@ -221,6 +257,74 @@ +@@ -221,6 +257,74 @@ config SCHED_TRACER This tracer tracks the latency of the highest priority task to be scheduled in, starting from the point it has woken up. @@ -23540,9 +24761,26 @@ diff -Nur linux-4.1.26.orig/kernel/trace/Kconfig linux-4.1.26/kernel/trace/Kconf config ENABLE_DEFAULT_TRACERS bool "Trace process context switches and events" depends on !GENERIC_TRACER -diff -Nur linux-4.1.26.orig/kernel/trace/latency_hist.c linux-4.1.26/kernel/trace/latency_hist.c ---- linux-4.1.26.orig/kernel/trace/latency_hist.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-4.1.26/kernel/trace/latency_hist.c 2016-06-19 15:30:58.715298429 +0200 +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 @@ -0,0 +1,1178 @@ +/* + * kernel/trace/latency_hist.c @@ -24722,24 +25960,11 @@ diff -Nur linux-4.1.26.orig/kernel/trace/latency_hist.c linux-4.1.26/kernel/trac +} + +device_initcall(latency_hist_init); -diff -Nur linux-4.1.26.orig/kernel/trace/Makefile linux-4.1.26/kernel/trace/Makefile ---- linux-4.1.26.orig/kernel/trace/Makefile 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/trace/Makefile 2016-06-19 15:30:58.715298429 +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.26.orig/kernel/trace/trace.c linux-4.1.26/kernel/trace/trace.c ---- linux-4.1.26.orig/kernel/trace/trace.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/trace/trace.c 2016-06-19 15:30:58.715298429 +0200 -@@ -1630,6 +1630,7 @@ +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, struct task_struct *tsk = current; entry->preempt_count = pc & 0xff; @@ -24747,7 +25972,7 @@ diff -Nur linux-4.1.26.orig/kernel/trace/trace.c linux-4.1.26/kernel/trace/trace entry->pid = (tsk) ? tsk->pid : 0; entry->flags = #ifdef CONFIG_TRACE_IRQFLAGS_SUPPORT -@@ -1639,8 +1640,11 @@ +@@ -1639,8 +1640,11 @@ tracing_generic_entry_update(struct trace_entry *entry, unsigned long flags, #endif ((pc & HARDIRQ_MASK) ? TRACE_FLAG_HARDIRQ : 0) | ((pc & SOFTIRQ_MASK) ? TRACE_FLAG_SOFTIRQ : 0) | @@ -24760,7 +25985,7 @@ diff -Nur linux-4.1.26.orig/kernel/trace/trace.c linux-4.1.26/kernel/trace/trace } EXPORT_SYMBOL_GPL(tracing_generic_entry_update); -@@ -2558,14 +2562,17 @@ +@@ -2558,14 +2562,17 @@ get_total_entries(struct trace_buffer *buf, static void print_lat_help_header(struct seq_file *m) { @@ -24786,7 +26011,7 @@ diff -Nur linux-4.1.26.orig/kernel/trace/trace.c linux-4.1.26/kernel/trace/trace } static void print_event_info(struct trace_buffer *buf, struct seq_file *m) -@@ -2591,11 +2598,14 @@ +@@ -2591,11 +2598,14 @@ static void print_func_help_header_irq(struct trace_buffer *buf, struct seq_file print_event_info(buf, m); seq_puts(m, "# _-----=> irqs-off\n" "# / _----=> need-resched\n" @@ -24806,22 +26031,11 @@ diff -Nur linux-4.1.26.orig/kernel/trace/trace.c linux-4.1.26/kernel/trace/trace } void -diff -Nur linux-4.1.26.orig/kernel/trace/trace_events.c linux-4.1.26/kernel/trace/trace_events.c ---- linux-4.1.26.orig/kernel/trace/trace_events.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/trace/trace_events.c 2016-06-19 15:30:58.715298429 +0200 -@@ -162,6 +162,8 @@ - __common_field(unsigned char, flags); - __common_field(unsigned char, preempt_count); - __common_field(int, pid); -+ __common_field(unsigned short, migrate_disable); -+ __common_field(unsigned short, padding); - - return ret; - } -diff -Nur linux-4.1.26.orig/kernel/trace/trace.h linux-4.1.26/kernel/trace/trace.h ---- linux-4.1.26.orig/kernel/trace/trace.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/trace/trace.h 2016-06-19 15:30:58.715298429 +0200 -@@ -120,6 +120,7 @@ +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 @@ -24829,7 +26043,7 @@ diff -Nur linux-4.1.26.orig/kernel/trace/trace.h linux-4.1.26/kernel/trace/trace */ enum trace_flag_type { TRACE_FLAG_IRQS_OFF = 0x01, -@@ -128,6 +129,7 @@ +@@ -128,6 +129,7 @@ enum trace_flag_type { TRACE_FLAG_HARDIRQ = 0x08, TRACE_FLAG_SOFTIRQ = 0x10, TRACE_FLAG_PREEMPT_RESCHED = 0x20, @@ -24837,9 +26051,38 @@ diff -Nur linux-4.1.26.orig/kernel/trace/trace.h linux-4.1.26/kernel/trace/trace }; #define TRACE_BUF_SIZE 1024 -diff -Nur linux-4.1.26.orig/kernel/trace/trace_irqsoff.c linux-4.1.26/kernel/trace/trace_irqsoff.c ---- linux-4.1.26.orig/kernel/trace/trace_irqsoff.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/trace/trace_irqsoff.c 2016-06-19 15:30:58.715298429 +0200 +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) + __common_field(unsigned char, flags); + __common_field(unsigned char, preempt_count); + __common_field(int, pid); ++ __common_field(unsigned short, migrate_disable); ++ __common_field(unsigned short, padding); + + return ret; + } +@@ -198,6 +200,14 @@ void *ftrace_event_buffer_reserve(struct ftrace_event_buffer *fbuffer, + + local_save_flags(fbuffer->flags); + fbuffer->pc = preempt_count(); ++ /* ++ * If CONFIG_PREEMPT is enabled, then the tracepoint itself disables ++ * preemption (adding one to the preempt_count). Since we are ++ * interested in the preempt_count at the time the tracepoint was ++ * hit, we need to subtract one to offset the increment. ++ */ ++ if (IS_ENABLED(CONFIG_PREEMPT)) ++ fbuffer->pc--; + 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 @@ -13,6 +13,7 @@ #include <linux/uaccess.h> #include <linux/module.h> @@ -24848,7 +26091,7 @@ diff -Nur linux-4.1.26.orig/kernel/trace/trace_irqsoff.c linux-4.1.26/kernel/tra #include "trace.h" -@@ -433,11 +434,13 @@ +@@ -433,11 +434,13 @@ void start_critical_timings(void) { if (preempt_trace() || irq_trace()) start_critical_timing(CALLER_ADDR0, CALLER_ADDR1); @@ -24862,7 +26105,7 @@ diff -Nur linux-4.1.26.orig/kernel/trace/trace_irqsoff.c linux-4.1.26/kernel/tra if (preempt_trace() || irq_trace()) stop_critical_timing(CALLER_ADDR0, CALLER_ADDR1); } -@@ -447,6 +450,7 @@ +@@ -447,6 +450,7 @@ EXPORT_SYMBOL_GPL(stop_critical_timings); #ifdef CONFIG_PROVE_LOCKING void time_hardirqs_on(unsigned long a0, unsigned long a1) { @@ -24870,7 +26113,7 @@ diff -Nur linux-4.1.26.orig/kernel/trace/trace_irqsoff.c linux-4.1.26/kernel/tra if (!preempt_trace() && irq_trace()) stop_critical_timing(a0, a1); } -@@ -455,6 +459,7 @@ +@@ -455,6 +459,7 @@ void time_hardirqs_off(unsigned long a0, unsigned long a1) { if (!preempt_trace() && irq_trace()) start_critical_timing(a0, a1); @@ -24878,7 +26121,7 @@ diff -Nur linux-4.1.26.orig/kernel/trace/trace_irqsoff.c linux-4.1.26/kernel/tra } #else /* !CONFIG_PROVE_LOCKING */ -@@ -480,6 +485,7 @@ +@@ -480,6 +485,7 @@ inline void print_irqtrace_events(struct task_struct *curr) */ void trace_hardirqs_on(void) { @@ -24886,7 +26129,7 @@ diff -Nur linux-4.1.26.orig/kernel/trace/trace_irqsoff.c linux-4.1.26/kernel/tra if (!preempt_trace() && irq_trace()) stop_critical_timing(CALLER_ADDR0, CALLER_ADDR1); } -@@ -489,11 +495,13 @@ +@@ -489,11 +495,13 @@ void trace_hardirqs_off(void) { if (!preempt_trace() && irq_trace()) start_critical_timing(CALLER_ADDR0, CALLER_ADDR1); @@ -24900,7 +26143,7 @@ diff -Nur linux-4.1.26.orig/kernel/trace/trace_irqsoff.c linux-4.1.26/kernel/tra if (!preempt_trace() && irq_trace()) stop_critical_timing(CALLER_ADDR0, caller_addr); } -@@ -503,6 +511,7 @@ +@@ -503,6 +511,7 @@ __visible void trace_hardirqs_off_caller(unsigned long caller_addr) { if (!preempt_trace() && irq_trace()) start_critical_timing(CALLER_ADDR0, caller_addr); @@ -24908,7 +26151,7 @@ diff -Nur linux-4.1.26.orig/kernel/trace/trace_irqsoff.c linux-4.1.26/kernel/tra } EXPORT_SYMBOL(trace_hardirqs_off_caller); -@@ -512,12 +521,14 @@ +@@ -512,12 +521,14 @@ EXPORT_SYMBOL(trace_hardirqs_off_caller); #ifdef CONFIG_PREEMPT_TRACER void trace_preempt_on(unsigned long a0, unsigned long a1) { @@ -24923,10 +26166,11 @@ diff -Nur linux-4.1.26.orig/kernel/trace/trace_irqsoff.c linux-4.1.26/kernel/tra if (preempt_trace() && !irq_trace()) start_critical_timing(a0, a1); } -diff -Nur linux-4.1.26.orig/kernel/trace/trace_output.c linux-4.1.26/kernel/trace/trace_output.c ---- linux-4.1.26.orig/kernel/trace/trace_output.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/trace/trace_output.c 2016-06-19 15:30:58.715298429 +0200 -@@ -430,6 +430,7 @@ +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) { char hardsoft_irq; char need_resched; @@ -24934,7 +26178,7 @@ diff -Nur linux-4.1.26.orig/kernel/trace/trace_output.c linux-4.1.26/kernel/trac char irqs_off; int hardirq; int softirq; -@@ -457,6 +458,8 @@ +@@ -457,6 +458,8 @@ int trace_print_lat_fmt(struct trace_seq *s, struct trace_entry *entry) need_resched = '.'; break; } @@ -24943,7 +26187,7 @@ diff -Nur linux-4.1.26.orig/kernel/trace/trace_output.c linux-4.1.26/kernel/trac hardsoft_irq = (hardirq && softirq) ? 'H' : -@@ -464,14 +467,25 @@ +@@ -464,14 +467,25 @@ int trace_print_lat_fmt(struct trace_seq *s, struct trace_entry *entry) softirq ? 's' : '.'; @@ -24971,10 +26215,11 @@ diff -Nur linux-4.1.26.orig/kernel/trace/trace_output.c linux-4.1.26/kernel/trac return !trace_seq_has_overflowed(s); } -diff -Nur linux-4.1.26.orig/kernel/trace/trace_sched_switch.c linux-4.1.26/kernel/trace/trace_sched_switch.c ---- linux-4.1.26.orig/kernel/trace/trace_sched_switch.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/trace/trace_sched_switch.c 2016-06-19 15:30:58.715298429 +0200 -@@ -26,7 +26,7 @@ +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 } static void @@ -24983,10 +26228,11 @@ diff -Nur linux-4.1.26.orig/kernel/trace/trace_sched_switch.c linux-4.1.26/kerne { if (unlikely(!sched_ref)) return; -diff -Nur linux-4.1.26.orig/kernel/trace/trace_sched_wakeup.c linux-4.1.26/kernel/trace/trace_sched_wakeup.c ---- linux-4.1.26.orig/kernel/trace/trace_sched_wakeup.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/trace/trace_sched_wakeup.c 2016-06-19 15:30:58.719298583 +0200 -@@ -514,7 +514,7 @@ +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) } static void @@ -24995,10 +26241,11 @@ diff -Nur linux-4.1.26.orig/kernel/trace/trace_sched_wakeup.c linux-4.1.26/kerne { struct trace_array_cpu *data; int cpu = smp_processor_id(); -diff -Nur linux-4.1.26.orig/kernel/user.c linux-4.1.26/kernel/user.c ---- linux-4.1.26.orig/kernel/user.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/user.c 2016-06-19 15:30:58.719298583 +0200 -@@ -161,11 +161,11 @@ +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) if (!up) return; @@ -25012,10 +26259,11 @@ diff -Nur linux-4.1.26.orig/kernel/user.c linux-4.1.26/kernel/user.c } struct user_struct *alloc_uid(kuid_t uid) -diff -Nur linux-4.1.26.orig/kernel/watchdog.c linux-4.1.26/kernel/watchdog.c ---- linux-4.1.26.orig/kernel/watchdog.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/watchdog.c 2016-06-19 15:30:58.719298583 +0200 -@@ -262,6 +262,8 @@ +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) #ifdef CONFIG_HARDLOCKUP_DETECTOR @@ -25024,7 +26272,7 @@ diff -Nur linux-4.1.26.orig/kernel/watchdog.c linux-4.1.26/kernel/watchdog.c static struct perf_event_attr wd_hw_attr = { .type = PERF_TYPE_HARDWARE, .config = PERF_COUNT_HW_CPU_CYCLES, -@@ -295,13 +297,21 @@ +@@ -295,13 +297,21 @@ static void watchdog_overflow_callback(struct perf_event *event, /* only print hardlockups once */ if (__this_cpu_read(hard_watchdog_warn) == true) return; @@ -25048,7 +26296,7 @@ diff -Nur linux-4.1.26.orig/kernel/watchdog.c linux-4.1.26/kernel/watchdog.c __this_cpu_write(hard_watchdog_warn, true); return; -@@ -444,6 +454,7 @@ +@@ -444,6 +454,7 @@ static void watchdog_enable(unsigned int cpu) /* kick off the timer for the hardlockup detector */ hrtimer_init(hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); hrtimer->function = watchdog_timer_fn; @@ -25056,9 +26304,10 @@ diff -Nur linux-4.1.26.orig/kernel/watchdog.c linux-4.1.26/kernel/watchdog.c /* Enable the perf event */ watchdog_nmi_enable(cpu); -diff -Nur linux-4.1.26.orig/kernel/workqueue.c linux-4.1.26/kernel/workqueue.c ---- linux-4.1.26.orig/kernel/workqueue.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/workqueue.c 2016-06-19 15:30:58.719298583 +0200 +diff --git a/kernel/workqueue.c b/kernel/workqueue.c +index d0efe9295a0e..80f3bb082136 100644 +--- a/kernel/workqueue.c ++++ b/kernel/workqueue.c @@ -48,6 +48,8 @@ #include <linux/nodemask.h> #include <linux/moduleparam.h> @@ -25068,7 +26317,7 @@ diff -Nur linux-4.1.26.orig/kernel/workqueue.c linux-4.1.26/kernel/workqueue.c #include "workqueue_internal.h" -@@ -121,11 +123,16 @@ +@@ -121,11 +123,16 @@ enum { * cpu or grabbing pool->lock is enough for read access. If * POOL_DISASSOCIATED is set, it's identical to L. * @@ -25086,7 +26335,7 @@ diff -Nur linux-4.1.26.orig/kernel/workqueue.c linux-4.1.26/kernel/workqueue.c * * PW: wq_pool_mutex and wq->mutex protected for writes. Either for reads. * -@@ -134,7 +141,7 @@ +@@ -134,7 +141,7 @@ enum { * * WQ: wq->mutex protected. * @@ -25095,7 +26344,7 @@ diff -Nur linux-4.1.26.orig/kernel/workqueue.c linux-4.1.26/kernel/workqueue.c * * MD: wq_mayday_lock protected. */ -@@ -183,7 +190,7 @@ +@@ -183,7 +190,7 @@ struct worker_pool { atomic_t nr_running ____cacheline_aligned_in_smp; /* @@ -25104,7 +26353,7 @@ diff -Nur linux-4.1.26.orig/kernel/workqueue.c linux-4.1.26/kernel/workqueue.c * from get_work_pool(). */ struct rcu_head rcu; -@@ -212,7 +219,7 @@ +@@ -212,7 +219,7 @@ struct pool_workqueue { /* * Release of unbound pwq is punted to system_wq. See put_pwq() * and pwq_unbound_release_workfn() for details. pool_workqueue @@ -25113,7 +26362,7 @@ diff -Nur linux-4.1.26.orig/kernel/workqueue.c linux-4.1.26/kernel/workqueue.c * determined without grabbing wq->mutex. */ struct work_struct unbound_release_work; -@@ -334,6 +341,8 @@ +@@ -334,6 +341,8 @@ EXPORT_SYMBOL_GPL(system_power_efficient_wq); struct workqueue_struct *system_freezable_power_efficient_wq __read_mostly; EXPORT_SYMBOL_GPL(system_freezable_power_efficient_wq); @@ -25122,7 +26371,7 @@ diff -Nur linux-4.1.26.orig/kernel/workqueue.c linux-4.1.26/kernel/workqueue.c static int worker_thread(void *__worker); static void copy_workqueue_attrs(struct workqueue_attrs *to, const struct workqueue_attrs *from); -@@ -343,14 +352,14 @@ +@@ -343,14 +352,14 @@ static void workqueue_sysfs_unregister(struct workqueue_struct *wq); #include <trace/events/workqueue.h> #define assert_rcu_or_pool_mutex() \ @@ -25141,7 +26390,7 @@ diff -Nur linux-4.1.26.orig/kernel/workqueue.c linux-4.1.26/kernel/workqueue.c #define assert_rcu_or_wq_mutex_or_pool_mutex(wq) \ rcu_lockdep_assert(rcu_read_lock_sched_held() || \ -@@ -368,7 +377,7 @@ +@@ -368,7 +377,7 @@ static void workqueue_sysfs_unregister(struct workqueue_struct *wq); * @pool: iteration cursor * @pi: integer used for iteration * @@ -25150,7 +26399,7 @@ diff -Nur linux-4.1.26.orig/kernel/workqueue.c linux-4.1.26/kernel/workqueue.c * 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 @@ +@@ -400,7 +409,7 @@ static void workqueue_sysfs_unregister(struct workqueue_struct *wq); * @pwq: iteration cursor * @wq: the target workqueue * @@ -25159,7 +26408,7 @@ diff -Nur linux-4.1.26.orig/kernel/workqueue.c linux-4.1.26/kernel/workqueue.c * 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 @@ +@@ -412,6 +421,31 @@ static void workqueue_sysfs_unregister(struct workqueue_struct *wq); if (({ assert_rcu_or_wq_mutex(wq); false; })) { } \ else @@ -25191,7 +26440,7 @@ diff -Nur linux-4.1.26.orig/kernel/workqueue.c linux-4.1.26/kernel/workqueue.c #ifdef CONFIG_DEBUG_OBJECTS_WORK static struct debug_obj_descr work_debug_descr; -@@ -562,8 +596,7 @@ +@@ -562,8 +596,7 @@ static int worker_pool_assign_id(struct worker_pool *pool) * @wq: the target workqueue * @node: the node ID * @@ -25201,7 +26450,7 @@ diff -Nur linux-4.1.26.orig/kernel/workqueue.c linux-4.1.26/kernel/workqueue.c * 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 @@ +@@ -706,8 +739,8 @@ static struct pool_workqueue *get_work_pwq(struct work_struct *work) * @work: the work item of interest * * Pools are created and destroyed under wq_pool_mutex, and allows read @@ -25212,7 +26461,7 @@ diff -Nur linux-4.1.26.orig/kernel/workqueue.c linux-4.1.26/kernel/workqueue.c * * 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 @@ +@@ -844,51 +877,44 @@ static struct worker *first_idle_worker(struct worker_pool *pool) */ static void wake_up_worker(struct worker_pool *pool) { @@ -25283,7 +26532,7 @@ diff -Nur linux-4.1.26.orig/kernel/workqueue.c linux-4.1.26/kernel/workqueue.c struct worker_pool *pool; /* -@@ -897,29 +923,26 @@ +@@ -897,29 +923,26 @@ struct task_struct *wq_worker_sleeping(struct task_struct *task, int cpu) * checking NOT_RUNNING. */ if (worker->flags & WORKER_NOT_RUNNING) @@ -25323,7 +26572,7 @@ diff -Nur linux-4.1.26.orig/kernel/workqueue.c linux-4.1.26/kernel/workqueue.c } /** -@@ -1113,12 +1136,12 @@ +@@ -1113,12 +1136,12 @@ static void put_pwq_unlocked(struct pool_workqueue *pwq) { if (pwq) { /* @@ -25339,7 +26588,7 @@ diff -Nur linux-4.1.26.orig/kernel/workqueue.c linux-4.1.26/kernel/workqueue.c } } -@@ -1220,7 +1243,7 @@ +@@ -1220,7 +1243,7 @@ static int try_to_grab_pending(struct work_struct *work, bool is_dwork, struct worker_pool *pool; struct pool_workqueue *pwq; @@ -25348,7 +26597,7 @@ diff -Nur linux-4.1.26.orig/kernel/workqueue.c linux-4.1.26/kernel/workqueue.c /* try to steal the timer if it exists */ if (is_dwork) { -@@ -1239,6 +1262,7 @@ +@@ -1239,6 +1262,7 @@ static int try_to_grab_pending(struct work_struct *work, bool is_dwork, if (!test_and_set_bit(WORK_STRUCT_PENDING_BIT, work_data_bits(work))) return 0; @@ -25356,7 +26605,7 @@ diff -Nur linux-4.1.26.orig/kernel/workqueue.c linux-4.1.26/kernel/workqueue.c /* * 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 @@ +@@ -1277,14 +1301,16 @@ static int try_to_grab_pending(struct work_struct *work, bool is_dwork, set_work_pool_and_keep_pending(work, pool->id); spin_unlock(&pool->lock); @@ -25375,7 +26624,7 @@ diff -Nur linux-4.1.26.orig/kernel/workqueue.c linux-4.1.26/kernel/workqueue.c return -EAGAIN; } -@@ -1353,7 +1379,7 @@ +@@ -1353,7 +1379,7 @@ static void __queue_work(int cpu, struct workqueue_struct *wq, * queued or lose PENDING. Grabbing PENDING and queueing should * happen with IRQ disabled. */ @@ -25384,7 +26633,7 @@ diff -Nur linux-4.1.26.orig/kernel/workqueue.c linux-4.1.26/kernel/workqueue.c debug_work_activate(work); -@@ -1361,6 +1387,8 @@ +@@ -1361,6 +1387,8 @@ static void __queue_work(int cpu, struct workqueue_struct *wq, if (unlikely(wq->flags & __WQ_DRAINING) && WARN_ON_ONCE(!is_chained_work(wq))) return; @@ -25393,7 +26642,7 @@ diff -Nur linux-4.1.26.orig/kernel/workqueue.c linux-4.1.26/kernel/workqueue.c retry: if (req_cpu == WORK_CPU_UNBOUND) cpu = raw_smp_processor_id(); -@@ -1417,10 +1445,8 @@ +@@ -1417,10 +1445,8 @@ retry: /* pwq determined, queue */ trace_workqueue_queue_work(req_cpu, pwq, work); @@ -25406,7 +26655,7 @@ diff -Nur linux-4.1.26.orig/kernel/workqueue.c linux-4.1.26/kernel/workqueue.c pwq->nr_in_flight[pwq->work_color]++; work_flags = work_color_to_flags(pwq->work_color); -@@ -1436,7 +1462,9 @@ +@@ -1436,7 +1462,9 @@ retry: insert_work(pwq, work, worklist, work_flags); @@ -25416,7 +26665,7 @@ diff -Nur linux-4.1.26.orig/kernel/workqueue.c linux-4.1.26/kernel/workqueue.c } /** -@@ -1456,14 +1484,14 @@ +@@ -1456,14 +1484,14 @@ bool queue_work_on(int cpu, struct workqueue_struct *wq, bool ret = false; unsigned long flags; @@ -25433,7 +26682,7 @@ diff -Nur linux-4.1.26.orig/kernel/workqueue.c linux-4.1.26/kernel/workqueue.c return ret; } EXPORT_SYMBOL(queue_work_on); -@@ -1530,14 +1558,14 @@ +@@ -1530,14 +1558,14 @@ bool queue_delayed_work_on(int cpu, struct workqueue_struct *wq, unsigned long flags; /* read the comment in __queue_work() */ @@ -25450,7 +26699,7 @@ diff -Nur linux-4.1.26.orig/kernel/workqueue.c linux-4.1.26/kernel/workqueue.c return ret; } EXPORT_SYMBOL(queue_delayed_work_on); -@@ -1572,7 +1600,7 @@ +@@ -1572,7 +1600,7 @@ bool mod_delayed_work_on(int cpu, struct workqueue_struct *wq, if (likely(ret >= 0)) { __queue_delayed_work(cpu, wq, dwork, delay); @@ -25459,7 +26708,7 @@ diff -Nur linux-4.1.26.orig/kernel/workqueue.c linux-4.1.26/kernel/workqueue.c } /* -ENOENT from try_to_grab_pending() becomes %true */ -@@ -1605,7 +1633,9 @@ +@@ -1605,7 +1633,9 @@ static void worker_enter_idle(struct worker *worker) worker->last_active = jiffies; /* idle_list is LIFO */ @@ -25469,7 +26718,7 @@ diff -Nur linux-4.1.26.orig/kernel/workqueue.c linux-4.1.26/kernel/workqueue.c if (too_many_workers(pool) && !timer_pending(&pool->idle_timer)) mod_timer(&pool->idle_timer, jiffies + IDLE_WORKER_TIMEOUT); -@@ -1638,7 +1668,9 @@ +@@ -1638,7 +1668,9 @@ static void worker_leave_idle(struct worker *worker) return; worker_clr_flags(worker, WORKER_IDLE); pool->nr_idle--; @@ -25479,7 +26728,7 @@ diff -Nur linux-4.1.26.orig/kernel/workqueue.c linux-4.1.26/kernel/workqueue.c } static struct worker *alloc_worker(int node) -@@ -1806,7 +1838,9 @@ +@@ -1806,7 +1838,9 @@ static void destroy_worker(struct worker *worker) pool->nr_workers--; pool->nr_idle--; @@ -25489,7 +26738,7 @@ diff -Nur linux-4.1.26.orig/kernel/workqueue.c linux-4.1.26/kernel/workqueue.c worker->flags |= WORKER_DIE; wake_up_process(worker->task); } -@@ -2723,14 +2757,14 @@ +@@ -2723,14 +2757,14 @@ static bool start_flush_work(struct work_struct *work, struct wq_barrier *barr) might_sleep(); @@ -25507,7 +26756,7 @@ diff -Nur linux-4.1.26.orig/kernel/workqueue.c linux-4.1.26/kernel/workqueue.c /* see the comment in try_to_grab_pending() with the same code */ pwq = get_work_pwq(work); if (pwq) { -@@ -2757,10 +2791,11 @@ +@@ -2757,10 +2791,11 @@ static bool start_flush_work(struct work_struct *work, struct wq_barrier *barr) else lock_map_acquire_read(&pwq->wq->lockdep_map); lock_map_release(&pwq->wq->lockdep_map); @@ -25520,7 +26769,7 @@ diff -Nur linux-4.1.26.orig/kernel/workqueue.c linux-4.1.26/kernel/workqueue.c return false; } -@@ -2847,7 +2882,7 @@ +@@ -2847,7 +2882,7 @@ static bool __cancel_work_timer(struct work_struct *work, bool is_dwork) /* tell other tasks trying to grab @work to back off */ mark_work_canceling(work); @@ -25529,7 +26778,7 @@ diff -Nur linux-4.1.26.orig/kernel/workqueue.c linux-4.1.26/kernel/workqueue.c flush_work(work); clear_work_data(work); -@@ -2902,10 +2937,10 @@ +@@ -2902,10 +2937,10 @@ EXPORT_SYMBOL_GPL(cancel_work_sync); */ bool flush_delayed_work(struct delayed_work *dwork) { @@ -25542,7 +26791,7 @@ diff -Nur linux-4.1.26.orig/kernel/workqueue.c linux-4.1.26/kernel/workqueue.c return flush_work(&dwork->work); } EXPORT_SYMBOL(flush_delayed_work); -@@ -2940,7 +2975,7 @@ +@@ -2940,7 +2975,7 @@ bool cancel_delayed_work(struct delayed_work *dwork) set_work_pool_and_clear_pending(&dwork->work, get_work_pool_id(&dwork->work)); @@ -25551,7 +26800,7 @@ diff -Nur linux-4.1.26.orig/kernel/workqueue.c linux-4.1.26/kernel/workqueue.c return ret; } EXPORT_SYMBOL(cancel_delayed_work); -@@ -3198,7 +3233,7 @@ +@@ -3198,7 +3233,7 @@ static void rcu_free_pool(struct rcu_head *rcu) * put_unbound_pool - put a worker_pool * @pool: worker_pool to put * @@ -25560,7 +26809,7 @@ diff -Nur linux-4.1.26.orig/kernel/workqueue.c linux-4.1.26/kernel/workqueue.c * 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 @@ +@@ -3252,8 +3287,8 @@ static void put_unbound_pool(struct worker_pool *pool) del_timer_sync(&pool->idle_timer); del_timer_sync(&pool->mayday_timer); @@ -25571,7 +26820,7 @@ diff -Nur linux-4.1.26.orig/kernel/workqueue.c linux-4.1.26/kernel/workqueue.c } /** -@@ -3358,14 +3393,14 @@ +@@ -3358,14 +3393,14 @@ static void pwq_unbound_release_workfn(struct work_struct *work) put_unbound_pool(pool); mutex_unlock(&wq_pool_mutex); @@ -25588,7 +26837,7 @@ diff -Nur linux-4.1.26.orig/kernel/workqueue.c linux-4.1.26/kernel/workqueue.c } /** -@@ -4003,7 +4038,7 @@ +@@ -4003,7 +4038,7 @@ void destroy_workqueue(struct workqueue_struct *wq) * The base ref is never dropped on per-cpu pwqs. Directly * schedule RCU free. */ @@ -25597,7 +26846,7 @@ diff -Nur linux-4.1.26.orig/kernel/workqueue.c linux-4.1.26/kernel/workqueue.c } else { /* * We're the sole accessor of @wq at this point. Directly -@@ -4096,7 +4131,8 @@ +@@ -4096,7 +4131,8 @@ bool workqueue_congested(int cpu, struct workqueue_struct *wq) struct pool_workqueue *pwq; bool ret; @@ -25607,7 +26856,7 @@ diff -Nur linux-4.1.26.orig/kernel/workqueue.c linux-4.1.26/kernel/workqueue.c if (cpu == WORK_CPU_UNBOUND) cpu = smp_processor_id(); -@@ -4107,7 +4143,8 @@ +@@ -4107,7 +4143,8 @@ bool workqueue_congested(int cpu, struct workqueue_struct *wq) pwq = unbound_pwq_by_node(wq, cpu_to_node(cpu)); ret = !list_empty(&pwq->delayed_works); @@ -25617,7 +26866,7 @@ diff -Nur linux-4.1.26.orig/kernel/workqueue.c linux-4.1.26/kernel/workqueue.c return ret; } -@@ -4133,15 +4170,15 @@ +@@ -4133,15 +4170,15 @@ unsigned int work_busy(struct work_struct *work) if (work_pending(work)) ret |= WORK_BUSY_PENDING; @@ -25637,7 +26886,7 @@ diff -Nur linux-4.1.26.orig/kernel/workqueue.c linux-4.1.26/kernel/workqueue.c return ret; } -@@ -4330,7 +4367,7 @@ +@@ -4330,7 +4367,7 @@ void show_workqueue_state(void) unsigned long flags; int pi; @@ -25646,7 +26895,7 @@ diff -Nur linux-4.1.26.orig/kernel/workqueue.c linux-4.1.26/kernel/workqueue.c pr_info("Showing busy workqueues and worker pools:\n"); -@@ -4381,7 +4418,7 @@ +@@ -4381,7 +4418,7 @@ void show_workqueue_state(void) spin_unlock_irqrestore(&pool->lock, flags); } @@ -25655,7 +26904,7 @@ diff -Nur linux-4.1.26.orig/kernel/workqueue.c linux-4.1.26/kernel/workqueue.c } /* -@@ -4742,16 +4779,16 @@ +@@ -4742,16 +4779,16 @@ bool freeze_workqueues_busy(void) * nr_active is monotonically decreasing. It's safe * to peek without lock. */ @@ -25675,7 +26924,7 @@ diff -Nur linux-4.1.26.orig/kernel/workqueue.c linux-4.1.26/kernel/workqueue.c } out_unlock: mutex_unlock(&wq_pool_mutex); -@@ -4865,7 +4902,8 @@ +@@ -4865,7 +4902,8 @@ static ssize_t wq_pool_ids_show(struct device *dev, const char *delim = ""; int node, written = 0; @@ -25685,7 +26934,7 @@ diff -Nur linux-4.1.26.orig/kernel/workqueue.c linux-4.1.26/kernel/workqueue.c for_each_node(node) { written += scnprintf(buf + written, PAGE_SIZE - written, "%s%d:%d", delim, node, -@@ -4873,7 +4911,8 @@ +@@ -4873,7 +4911,8 @@ static ssize_t wq_pool_ids_show(struct device *dev, delim = " "; } written += scnprintf(buf + written, PAGE_SIZE - written, "\n"); @@ -25695,10 +26944,11 @@ diff -Nur linux-4.1.26.orig/kernel/workqueue.c linux-4.1.26/kernel/workqueue.c return written; } -diff -Nur linux-4.1.26.orig/kernel/workqueue_internal.h linux-4.1.26/kernel/workqueue_internal.h ---- linux-4.1.26.orig/kernel/workqueue_internal.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/kernel/workqueue_internal.h 2016-06-19 15:30:58.719298583 +0200 -@@ -43,6 +43,7 @@ +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 { unsigned long last_active; /* L: last active timestamp */ unsigned int flags; /* X: flags */ int id; /* I: worker id */ @@ -25706,7 +26956,7 @@ diff -Nur linux-4.1.26.orig/kernel/workqueue_internal.h linux-4.1.26/kernel/work /* * Opaque string set with work_set_desc(). Printed out with task -@@ -68,7 +69,7 @@ +@@ -68,7 +69,7 @@ static inline struct worker *current_wq_worker(void) * Scheduler hooks for concurrency managed workqueue. Only to be used from * sched/core.c and workqueue.c. */ @@ -25716,10 +26966,23 @@ diff -Nur linux-4.1.26.orig/kernel/workqueue_internal.h linux-4.1.26/kernel/work +void wq_worker_sleeping(struct task_struct *task); #endif /* _KERNEL_WORKQUEUE_INTERNAL_H */ -diff -Nur linux-4.1.26.orig/lib/debugobjects.c linux-4.1.26/lib/debugobjects.c ---- linux-4.1.26.orig/lib/debugobjects.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/lib/debugobjects.c 2016-06-19 15:30:58.719298583 +0200 -@@ -309,7 +309,10 @@ +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) struct debug_obj *obj; unsigned long flags; @@ -25731,9 +26994,10 @@ diff -Nur linux-4.1.26.orig/lib/debugobjects.c linux-4.1.26/lib/debugobjects.c db = get_bucket((unsigned long) addr); -diff -Nur linux-4.1.26.orig/lib/dump_stack.c linux-4.1.26/lib/dump_stack.c ---- linux-4.1.26.orig/lib/dump_stack.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/lib/dump_stack.c 2016-06-19 15:30:58.719298583 +0200 +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 @@ -8,6 +8,7 @@ #include <linux/sched.h> #include <linux/smp.h> @@ -25742,9 +27006,10 @@ diff -Nur linux-4.1.26.orig/lib/dump_stack.c linux-4.1.26/lib/dump_stack.c static void __dump_stack(void) { -diff -Nur linux-4.1.26.orig/lib/idr.c linux-4.1.26/lib/idr.c ---- linux-4.1.26.orig/lib/idr.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/lib/idr.c 2016-06-19 15:30:58.723298738 +0200 +diff --git a/lib/idr.c b/lib/idr.c +index 5335c43adf46..d0681a357e69 100644 +--- a/lib/idr.c ++++ b/lib/idr.c @@ -30,6 +30,7 @@ #include <linux/idr.h> #include <linux/spinlock.h> @@ -25753,7 +27018,7 @@ diff -Nur linux-4.1.26.orig/lib/idr.c linux-4.1.26/lib/idr.c #define MAX_IDR_SHIFT (sizeof(int) * 8 - 1) #define MAX_IDR_BIT (1U << MAX_IDR_SHIFT) -@@ -366,6 +367,35 @@ +@@ -366,6 +367,35 @@ static void idr_fill_slot(struct idr *idr, void *ptr, int id, idr_mark_full(pa, id); } @@ -25789,7 +27054,7 @@ diff -Nur linux-4.1.26.orig/lib/idr.c linux-4.1.26/lib/idr.c /** * idr_preload - preload for idr_alloc() -@@ -401,7 +431,7 @@ +@@ -401,7 +431,7 @@ void idr_preload(gfp_t gfp_mask) WARN_ON_ONCE(in_interrupt()); might_sleep_if(gfp_mask & __GFP_WAIT); @@ -25798,7 +27063,7 @@ diff -Nur linux-4.1.26.orig/lib/idr.c linux-4.1.26/lib/idr.c /* * idr_alloc() is likely to succeed w/o full idr_layer buffer and -@@ -413,9 +443,9 @@ +@@ -413,9 +443,9 @@ void idr_preload(gfp_t gfp_mask) while (__this_cpu_read(idr_preload_cnt) < MAX_IDR_FREE) { struct idr_layer *new; @@ -25810,21 +27075,11 @@ diff -Nur linux-4.1.26.orig/lib/idr.c linux-4.1.26/lib/idr.c if (!new) break; -diff -Nur linux-4.1.26.orig/lib/Kconfig linux-4.1.26/lib/Kconfig ---- linux-4.1.26.orig/lib/Kconfig 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/lib/Kconfig 2016-06-19 15:30:58.719298583 +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.26.orig/lib/locking-selftest.c linux-4.1.26/lib/locking-selftest.c ---- linux-4.1.26.orig/lib/locking-selftest.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/lib/locking-selftest.c 2016-06-19 15:30:58.723298738 +0200 -@@ -590,6 +590,8 @@ +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) #include "locking-selftest-spin-hardirq.h" GENERATE_PERMUTATIONS_2_EVENTS(irqsafe1_hard_spin) @@ -25833,7 +27088,7 @@ diff -Nur linux-4.1.26.orig/lib/locking-selftest.c linux-4.1.26/lib/locking-self #include "locking-selftest-rlock-hardirq.h" GENERATE_PERMUTATIONS_2_EVENTS(irqsafe1_hard_rlock) -@@ -605,9 +607,12 @@ +@@ -605,9 +607,12 @@ GENERATE_PERMUTATIONS_2_EVENTS(irqsafe1_soft_rlock) #include "locking-selftest-wlock-softirq.h" GENERATE_PERMUTATIONS_2_EVENTS(irqsafe1_soft_wlock) @@ -25846,7 +27101,7 @@ diff -Nur linux-4.1.26.orig/lib/locking-selftest.c linux-4.1.26/lib/locking-self /* * Enabling hardirqs with a softirq-safe lock held: */ -@@ -640,6 +645,8 @@ +@@ -640,6 +645,8 @@ GENERATE_PERMUTATIONS_2_EVENTS(irqsafe2A_rlock) #undef E1 #undef E2 @@ -25855,7 +27110,7 @@ diff -Nur linux-4.1.26.orig/lib/locking-selftest.c linux-4.1.26/lib/locking-self /* * Enabling irqs with an irq-safe lock held: */ -@@ -663,6 +670,8 @@ +@@ -663,6 +670,8 @@ GENERATE_PERMUTATIONS_2_EVENTS(irqsafe2A_rlock) #include "locking-selftest-spin-hardirq.h" GENERATE_PERMUTATIONS_2_EVENTS(irqsafe2B_hard_spin) @@ -25864,7 +27119,7 @@ diff -Nur linux-4.1.26.orig/lib/locking-selftest.c linux-4.1.26/lib/locking-self #include "locking-selftest-rlock-hardirq.h" GENERATE_PERMUTATIONS_2_EVENTS(irqsafe2B_hard_rlock) -@@ -678,6 +687,8 @@ +@@ -678,6 +687,8 @@ GENERATE_PERMUTATIONS_2_EVENTS(irqsafe2B_soft_rlock) #include "locking-selftest-wlock-softirq.h" GENERATE_PERMUTATIONS_2_EVENTS(irqsafe2B_soft_wlock) @@ -25873,7 +27128,7 @@ diff -Nur linux-4.1.26.orig/lib/locking-selftest.c linux-4.1.26/lib/locking-self #undef E1 #undef E2 -@@ -709,6 +720,8 @@ +@@ -709,6 +720,8 @@ GENERATE_PERMUTATIONS_2_EVENTS(irqsafe2B_soft_wlock) #include "locking-selftest-spin-hardirq.h" GENERATE_PERMUTATIONS_3_EVENTS(irqsafe3_hard_spin) @@ -25882,7 +27137,7 @@ diff -Nur linux-4.1.26.orig/lib/locking-selftest.c linux-4.1.26/lib/locking-self #include "locking-selftest-rlock-hardirq.h" GENERATE_PERMUTATIONS_3_EVENTS(irqsafe3_hard_rlock) -@@ -724,6 +737,8 @@ +@@ -724,6 +737,8 @@ GENERATE_PERMUTATIONS_3_EVENTS(irqsafe3_soft_rlock) #include "locking-selftest-wlock-softirq.h" GENERATE_PERMUTATIONS_3_EVENTS(irqsafe3_soft_wlock) @@ -25891,7 +27146,7 @@ diff -Nur linux-4.1.26.orig/lib/locking-selftest.c linux-4.1.26/lib/locking-self #undef E1 #undef E2 #undef E3 -@@ -757,6 +772,8 @@ +@@ -757,6 +772,8 @@ GENERATE_PERMUTATIONS_3_EVENTS(irqsafe3_soft_wlock) #include "locking-selftest-spin-hardirq.h" GENERATE_PERMUTATIONS_3_EVENTS(irqsafe4_hard_spin) @@ -25900,7 +27155,7 @@ diff -Nur linux-4.1.26.orig/lib/locking-selftest.c linux-4.1.26/lib/locking-self #include "locking-selftest-rlock-hardirq.h" GENERATE_PERMUTATIONS_3_EVENTS(irqsafe4_hard_rlock) -@@ -772,10 +789,14 @@ +@@ -772,10 +789,14 @@ GENERATE_PERMUTATIONS_3_EVENTS(irqsafe4_soft_rlock) #include "locking-selftest-wlock-softirq.h" GENERATE_PERMUTATIONS_3_EVENTS(irqsafe4_soft_wlock) @@ -25915,7 +27170,7 @@ diff -Nur linux-4.1.26.orig/lib/locking-selftest.c linux-4.1.26/lib/locking-self /* * read-lock / write-lock irq inversion. * -@@ -838,6 +859,10 @@ +@@ -838,6 +859,10 @@ GENERATE_PERMUTATIONS_3_EVENTS(irq_inversion_soft_wlock) #undef E2 #undef E3 @@ -25926,7 +27181,7 @@ diff -Nur linux-4.1.26.orig/lib/locking-selftest.c linux-4.1.26/lib/locking-self /* * read-lock / write-lock recursion that is actually safe. */ -@@ -876,6 +901,8 @@ +@@ -876,6 +901,8 @@ GENERATE_PERMUTATIONS_3_EVENTS(irq_read_recursion_soft) #undef E2 #undef E3 @@ -25935,7 +27190,7 @@ diff -Nur linux-4.1.26.orig/lib/locking-selftest.c linux-4.1.26/lib/locking-self /* * read-lock / write-lock recursion that is unsafe. */ -@@ -1858,6 +1885,7 @@ +@@ -1858,6 +1885,7 @@ void locking_selftest(void) printk(" --------------------------------------------------------------------------\n"); @@ -25943,7 +27198,7 @@ diff -Nur linux-4.1.26.orig/lib/locking-selftest.c linux-4.1.26/lib/locking-self /* * irq-context testcases: */ -@@ -1870,6 +1898,28 @@ +@@ -1870,6 +1898,28 @@ void locking_selftest(void) DO_TESTCASE_6x2("irq read-recursion", irq_read_recursion); // DO_TESTCASE_6x2B("irq read-recursion #2", irq_read_recursion2); @@ -25972,9 +27227,10 @@ diff -Nur linux-4.1.26.orig/lib/locking-selftest.c linux-4.1.26/lib/locking-self ww_tests(); -diff -Nur linux-4.1.26.orig/lib/percpu_ida.c linux-4.1.26/lib/percpu_ida.c ---- linux-4.1.26.orig/lib/percpu_ida.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/lib/percpu_ida.c 2016-06-19 15:30:58.723298738 +0200 +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 @@ -26,6 +26,9 @@ #include <linux/string.h> #include <linux/spinlock.h> @@ -25985,7 +27241,7 @@ diff -Nur linux-4.1.26.orig/lib/percpu_ida.c linux-4.1.26/lib/percpu_ida.c struct percpu_ida_cpu { /* -@@ -148,13 +151,13 @@ +@@ -148,13 +151,13 @@ int percpu_ida_alloc(struct percpu_ida *pool, int state) unsigned long flags; int tag; @@ -26001,7 +27257,7 @@ diff -Nur linux-4.1.26.orig/lib/percpu_ida.c linux-4.1.26/lib/percpu_ida.c return tag; } -@@ -173,6 +176,7 @@ +@@ -173,6 +176,7 @@ int percpu_ida_alloc(struct percpu_ida *pool, int state) if (!tags->nr_free) alloc_global_tags(pool, tags); @@ -26009,7 +27265,7 @@ diff -Nur linux-4.1.26.orig/lib/percpu_ida.c linux-4.1.26/lib/percpu_ida.c if (!tags->nr_free) steal_tags(pool, tags); -@@ -184,7 +188,7 @@ +@@ -184,7 +188,7 @@ int percpu_ida_alloc(struct percpu_ida *pool, int state) } spin_unlock(&pool->lock); @@ -26018,7 +27274,7 @@ diff -Nur linux-4.1.26.orig/lib/percpu_ida.c linux-4.1.26/lib/percpu_ida.c if (tag >= 0 || state == TASK_RUNNING) break; -@@ -196,7 +200,7 @@ +@@ -196,7 +200,7 @@ int percpu_ida_alloc(struct percpu_ida *pool, int state) schedule(); @@ -26027,7 +27283,7 @@ diff -Nur linux-4.1.26.orig/lib/percpu_ida.c linux-4.1.26/lib/percpu_ida.c tags = this_cpu_ptr(pool->tag_cpu); } if (state != TASK_RUNNING) -@@ -221,7 +225,7 @@ +@@ -221,7 +225,7 @@ void percpu_ida_free(struct percpu_ida *pool, unsigned tag) BUG_ON(tag >= pool->nr_tags); @@ -26036,7 +27292,7 @@ diff -Nur linux-4.1.26.orig/lib/percpu_ida.c linux-4.1.26/lib/percpu_ida.c tags = this_cpu_ptr(pool->tag_cpu); spin_lock(&tags->lock); -@@ -253,7 +257,7 @@ +@@ -253,7 +257,7 @@ void percpu_ida_free(struct percpu_ida *pool, unsigned tag) spin_unlock(&pool->lock); } @@ -26045,7 +27301,7 @@ diff -Nur linux-4.1.26.orig/lib/percpu_ida.c linux-4.1.26/lib/percpu_ida.c } EXPORT_SYMBOL_GPL(percpu_ida_free); -@@ -345,7 +349,7 @@ +@@ -345,7 +349,7 @@ int percpu_ida_for_each_free(struct percpu_ida *pool, percpu_ida_cb fn, struct percpu_ida_cpu *remote; unsigned cpu, i, err = 0; @@ -26054,7 +27310,7 @@ diff -Nur linux-4.1.26.orig/lib/percpu_ida.c linux-4.1.26/lib/percpu_ida.c for_each_possible_cpu(cpu) { remote = per_cpu_ptr(pool->tag_cpu, cpu); spin_lock(&remote->lock); -@@ -367,7 +371,7 @@ +@@ -367,7 +371,7 @@ int percpu_ida_for_each_free(struct percpu_ida *pool, percpu_ida_cb fn, } spin_unlock(&pool->lock); out: @@ -26063,10 +27319,11 @@ diff -Nur linux-4.1.26.orig/lib/percpu_ida.c linux-4.1.26/lib/percpu_ida.c return err; } EXPORT_SYMBOL_GPL(percpu_ida_for_each_free); -diff -Nur linux-4.1.26.orig/lib/radix-tree.c linux-4.1.26/lib/radix-tree.c ---- linux-4.1.26.orig/lib/radix-tree.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/lib/radix-tree.c 2016-06-19 15:30:58.723298738 +0200 -@@ -195,12 +195,13 @@ +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) * succeed in getting a node here (and never reach * kmem_cache_alloc) */ @@ -26081,7 +27338,7 @@ diff -Nur linux-4.1.26.orig/lib/radix-tree.c linux-4.1.26/lib/radix-tree.c /* * Update the allocation stack trace as this is more useful * for debugging. -@@ -240,6 +241,7 @@ +@@ -240,6 +241,7 @@ radix_tree_node_free(struct radix_tree_node *node) call_rcu(&node->rcu_head, radix_tree_node_rcu_free); } @@ -26089,7 +27346,7 @@ diff -Nur linux-4.1.26.orig/lib/radix-tree.c linux-4.1.26/lib/radix-tree.c /* * 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 @@ +@@ -305,6 +307,7 @@ int radix_tree_maybe_preload(gfp_t gfp_mask) return 0; } EXPORT_SYMBOL(radix_tree_maybe_preload); @@ -26097,10 +27354,11 @@ diff -Nur linux-4.1.26.orig/lib/radix-tree.c linux-4.1.26/lib/radix-tree.c /* * Return the maximum key which can be store into a -diff -Nur linux-4.1.26.orig/lib/scatterlist.c linux-4.1.26/lib/scatterlist.c ---- linux-4.1.26.orig/lib/scatterlist.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/lib/scatterlist.c 2016-06-19 15:30:58.723298738 +0200 -@@ -592,7 +592,7 @@ +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) flush_kernel_dcache_page(miter->page); if (miter->__flags & SG_MITER_ATOMIC) { @@ -26109,7 +27367,7 @@ diff -Nur linux-4.1.26.orig/lib/scatterlist.c linux-4.1.26/lib/scatterlist.c kunmap_atomic(miter->addr); } else kunmap(miter->page); -@@ -637,7 +637,7 @@ +@@ -637,7 +637,7 @@ static size_t sg_copy_buffer(struct scatterlist *sgl, unsigned int nents, if (!sg_miter_skip(&miter, skip)) return false; @@ -26118,7 +27376,7 @@ diff -Nur linux-4.1.26.orig/lib/scatterlist.c linux-4.1.26/lib/scatterlist.c while (sg_miter_next(&miter) && offset < buflen) { unsigned int len; -@@ -654,7 +654,7 @@ +@@ -654,7 +654,7 @@ static size_t sg_copy_buffer(struct scatterlist *sgl, unsigned int nents, sg_miter_stop(&miter); @@ -26127,10 +27385,11 @@ diff -Nur linux-4.1.26.orig/lib/scatterlist.c linux-4.1.26/lib/scatterlist.c return offset; } -diff -Nur linux-4.1.26.orig/lib/smp_processor_id.c linux-4.1.26/lib/smp_processor_id.c ---- linux-4.1.26.orig/lib/smp_processor_id.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/lib/smp_processor_id.c 2016-06-19 15:30:58.723298738 +0200 -@@ -39,8 +39,9 @@ +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, if (!printk_ratelimit()) goto out_enable; @@ -26142,10 +27401,11 @@ diff -Nur linux-4.1.26.orig/lib/smp_processor_id.c linux-4.1.26/lib/smp_processo print_symbol("caller is %s\n", (long)__builtin_return_address(0)); dump_stack(); -diff -Nur linux-4.1.26.orig/lib/strnlen_user.c linux-4.1.26/lib/strnlen_user.c ---- linux-4.1.26.orig/lib/strnlen_user.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/lib/strnlen_user.c 2016-06-19 15:30:58.723298738 +0200 -@@ -85,7 +85,8 @@ +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, * @str: The string to measure. * @count: Maximum count (including NUL character) * @@ -26155,7 +27415,7 @@ diff -Nur linux-4.1.26.orig/lib/strnlen_user.c linux-4.1.26/lib/strnlen_user.c * * Get the size of a NUL-terminated string in user space. * -@@ -121,7 +122,8 @@ +@@ -121,7 +122,8 @@ EXPORT_SYMBOL(strnlen_user); * strlen_user: - Get the size of a user string INCLUDING final NUL. * @str: The string to measure. * @@ -26165,10 +27425,24 @@ diff -Nur linux-4.1.26.orig/lib/strnlen_user.c linux-4.1.26/lib/strnlen_user.c * * Get the size of a NUL-terminated string in user space. * -diff -Nur linux-4.1.26.orig/mm/compaction.c linux-4.1.26/mm/compaction.c ---- linux-4.1.26.orig/mm/compaction.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/mm/compaction.c 2016-06-19 15:30:58.823302594 +0200 -@@ -1398,10 +1398,12 @@ +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: cc->migrate_pfn & ~((1UL << cc->order) - 1); if (last_migrated_pfn < current_block_start) { @@ -26183,10 +27457,11 @@ diff -Nur linux-4.1.26.orig/mm/compaction.c linux-4.1.26/mm/compaction.c /* No more flushing until we migrate again */ last_migrated_pfn = 0; } -diff -Nur linux-4.1.26.orig/mm/filemap.c linux-4.1.26/mm/filemap.c ---- linux-4.1.26.orig/mm/filemap.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/mm/filemap.c 2016-06-19 15:30:58.823302594 +0200 -@@ -167,7 +167,9 @@ +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, if (!workingset_node_pages(node) && list_empty(&node->private_list)) { node->private_data = mapping; @@ -26197,7 +27472,7 @@ diff -Nur linux-4.1.26.orig/mm/filemap.c linux-4.1.26/mm/filemap.c } } -@@ -533,9 +535,12 @@ +@@ -533,9 +535,12 @@ static int page_cache_tree_insert(struct address_space *mapping, * node->private_list is protected by * mapping->tree_lock. */ @@ -26212,9 +27487,10 @@ diff -Nur linux-4.1.26.orig/mm/filemap.c linux-4.1.26/mm/filemap.c } return 0; } -diff -Nur linux-4.1.26.orig/mm/highmem.c linux-4.1.26/mm/highmem.c ---- linux-4.1.26.orig/mm/highmem.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/mm/highmem.c 2016-06-19 15:30:58.823302594 +0200 +diff --git a/mm/highmem.c b/mm/highmem.c +index 123bcd3ed4f2..16e8cf26d38a 100644 +--- a/mm/highmem.c ++++ b/mm/highmem.c @@ -29,10 +29,11 @@ #include <linux/kgdb.h> #include <asm/tlbflush.h> @@ -26228,7 +27504,7 @@ diff -Nur linux-4.1.26.orig/mm/highmem.c linux-4.1.26/mm/highmem.c /* * Virtual_count is not a pure "count". -@@ -107,8 +108,9 @@ +@@ -107,8 +108,9 @@ static inline wait_queue_head_t *get_pkmap_wait_queue_head(unsigned int color) unsigned long totalhigh_pages __read_mostly; EXPORT_SYMBOL(totalhigh_pages); @@ -26239,21 +27515,10 @@ diff -Nur linux-4.1.26.orig/mm/highmem.c linux-4.1.26/mm/highmem.c unsigned int nr_free_highpages (void) { -diff -Nur linux-4.1.26.orig/mm/Kconfig linux-4.1.26/mm/Kconfig ---- linux-4.1.26.orig/mm/Kconfig 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/mm/Kconfig 2016-06-19 15:30:58.823302594 +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.26.orig/mm/memcontrol.c linux-4.1.26/mm/memcontrol.c ---- linux-4.1.26.orig/mm/memcontrol.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/mm/memcontrol.c 2016-06-19 15:30:58.827302748 +0200 +diff --git a/mm/memcontrol.c b/mm/memcontrol.c +index 221762e24a68..cefa875a4320 100644 +--- a/mm/memcontrol.c ++++ b/mm/memcontrol.c @@ -66,6 +66,8 @@ #include <net/sock.h> #include <net/ip.h> @@ -26263,7 +27528,7 @@ diff -Nur linux-4.1.26.orig/mm/memcontrol.c linux-4.1.26/mm/memcontrol.c #include "slab.h" #include <asm/uaccess.h> -@@ -85,6 +87,7 @@ +@@ -85,6 +87,7 @@ int do_swap_account __read_mostly; #define do_swap_account 0 #endif @@ -26271,7 +27536,7 @@ diff -Nur linux-4.1.26.orig/mm/memcontrol.c linux-4.1.26/mm/memcontrol.c static const char * const mem_cgroup_stat_names[] = { "cache", "rss", -@@ -2124,14 +2127,17 @@ +@@ -2124,14 +2127,17 @@ static void drain_local_stock(struct work_struct *dummy) */ static void refill_stock(struct mem_cgroup *memcg, unsigned int nr_pages) { @@ -26291,7 +27556,7 @@ diff -Nur linux-4.1.26.orig/mm/memcontrol.c linux-4.1.26/mm/memcontrol.c } /* -@@ -2147,7 +2153,7 @@ +@@ -2147,7 +2153,7 @@ static void drain_all_stock(struct mem_cgroup *root_memcg) return; /* Notify other cpus that system-wide "drain" is running */ get_online_cpus(); @@ -26300,7 +27565,7 @@ diff -Nur linux-4.1.26.orig/mm/memcontrol.c linux-4.1.26/mm/memcontrol.c for_each_online_cpu(cpu) { struct memcg_stock_pcp *stock = &per_cpu(memcg_stock, cpu); struct mem_cgroup *memcg; -@@ -2164,7 +2170,7 @@ +@@ -2164,7 +2170,7 @@ static void drain_all_stock(struct mem_cgroup *root_memcg) schedule_work_on(cpu, &stock->work); } } @@ -26309,7 +27574,7 @@ diff -Nur linux-4.1.26.orig/mm/memcontrol.c linux-4.1.26/mm/memcontrol.c put_online_cpus(); mutex_unlock(&percpu_charge_mutex); } -@@ -4803,12 +4809,12 @@ +@@ -4803,12 +4809,12 @@ static int mem_cgroup_move_account(struct page *page, ret = 0; @@ -26324,7 +27589,7 @@ diff -Nur linux-4.1.26.orig/mm/memcontrol.c linux-4.1.26/mm/memcontrol.c out_unlock: unlock_page(page); out: -@@ -5551,10 +5557,10 @@ +@@ -5551,10 +5557,10 @@ void mem_cgroup_commit_charge(struct page *page, struct mem_cgroup *memcg, VM_BUG_ON_PAGE(!PageTransHuge(page), page); } @@ -26337,7 +27602,7 @@ diff -Nur linux-4.1.26.orig/mm/memcontrol.c linux-4.1.26/mm/memcontrol.c if (do_swap_account && PageSwapCache(page)) { swp_entry_t entry = { .val = page_private(page) }; -@@ -5610,14 +5616,14 @@ +@@ -5610,14 +5616,14 @@ static void uncharge_batch(struct mem_cgroup *memcg, unsigned long pgpgout, memcg_oom_recover(memcg); } @@ -26354,7 +27619,7 @@ diff -Nur linux-4.1.26.orig/mm/memcontrol.c linux-4.1.26/mm/memcontrol.c if (!mem_cgroup_is_root(memcg)) css_put_many(&memcg->css, nr_pages); -@@ -5821,6 +5827,7 @@ +@@ -5821,6 +5827,7 @@ void mem_cgroup_swapout(struct page *page, swp_entry_t entry) { struct mem_cgroup *memcg; unsigned short oldid; @@ -26362,7 +27627,7 @@ diff -Nur linux-4.1.26.orig/mm/memcontrol.c linux-4.1.26/mm/memcontrol.c VM_BUG_ON_PAGE(PageLRU(page), page); VM_BUG_ON_PAGE(page_count(page), page); -@@ -5843,9 +5850,11 @@ +@@ -5843,9 +5850,11 @@ void mem_cgroup_swapout(struct page *page, swp_entry_t entry) if (!mem_cgroup_is_root(memcg)) page_counter_uncharge(&memcg->memory, 1); @@ -26374,10 +27639,11 @@ diff -Nur linux-4.1.26.orig/mm/memcontrol.c linux-4.1.26/mm/memcontrol.c } /** -diff -Nur linux-4.1.26.orig/mm/memory.c linux-4.1.26/mm/memory.c ---- linux-4.1.26.orig/mm/memory.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/mm/memory.c 2016-06-19 15:30:58.827302748 +0200 -@@ -3753,7 +3753,7 @@ +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) } #if defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_DEBUG_ATOMIC_SLEEP) @@ -26386,7 +27652,7 @@ diff -Nur linux-4.1.26.orig/mm/memory.c linux-4.1.26/mm/memory.c { /* * Some code (nfs/sunrpc) uses socket ops on kernel memory while -@@ -3763,21 +3763,15 @@ +@@ -3763,21 +3763,15 @@ void might_fault(void) */ if (segment_eq(get_fs(), KERNEL_DS)) return; @@ -26413,10 +27679,11 @@ diff -Nur linux-4.1.26.orig/mm/memory.c linux-4.1.26/mm/memory.c #endif #if defined(CONFIG_TRANSPARENT_HUGEPAGE) || defined(CONFIG_HUGETLBFS) -diff -Nur linux-4.1.26.orig/mm/mmu_context.c linux-4.1.26/mm/mmu_context.c ---- linux-4.1.26.orig/mm/mmu_context.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/mm/mmu_context.c 2016-06-19 15:30:58.827302748 +0200 -@@ -23,6 +23,7 @@ +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) struct task_struct *tsk = current; task_lock(tsk); @@ -26424,7 +27691,7 @@ diff -Nur linux-4.1.26.orig/mm/mmu_context.c linux-4.1.26/mm/mmu_context.c active_mm = tsk->active_mm; if (active_mm != mm) { atomic_inc(&mm->mm_count); -@@ -30,6 +31,7 @@ +@@ -30,6 +31,7 @@ void use_mm(struct mm_struct *mm) } tsk->mm = mm; switch_mm(active_mm, mm, tsk); @@ -26432,9 +27699,10 @@ diff -Nur linux-4.1.26.orig/mm/mmu_context.c linux-4.1.26/mm/mmu_context.c task_unlock(tsk); #ifdef finish_arch_post_lock_switch finish_arch_post_lock_switch(); -diff -Nur linux-4.1.26.orig/mm/page_alloc.c linux-4.1.26/mm/page_alloc.c ---- linux-4.1.26.orig/mm/page_alloc.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/mm/page_alloc.c 2016-06-19 15:30:58.827302748 +0200 +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 @@ -60,6 +60,7 @@ #include <linux/page_ext.h> #include <linux/hugetlb.h> @@ -26443,7 +27711,7 @@ diff -Nur linux-4.1.26.orig/mm/page_alloc.c linux-4.1.26/mm/page_alloc.c #include <linux/page_owner.h> #include <asm/sections.h> -@@ -233,6 +234,18 @@ +@@ -233,6 +234,18 @@ EXPORT_SYMBOL(nr_node_ids); EXPORT_SYMBOL(nr_online_nodes); #endif @@ -26462,7 +27730,7 @@ diff -Nur linux-4.1.26.orig/mm/page_alloc.c linux-4.1.26/mm/page_alloc.c int page_group_by_mobility_disabled __read_mostly; void set_pageblock_migratetype(struct page *page, int migratetype) -@@ -701,7 +714,7 @@ +@@ -701,7 +714,7 @@ static inline int free_pages_check(struct page *page) } /* @@ -26471,7 +27739,7 @@ diff -Nur linux-4.1.26.orig/mm/page_alloc.c linux-4.1.26/mm/page_alloc.c * 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 @@ +@@ -712,18 +725,51 @@ static inline int free_pages_check(struct page *page) * pinned" detection logic. */ static void free_pcppages_bulk(struct zone *zone, int count, @@ -26527,7 +27795,7 @@ diff -Nur linux-4.1.26.orig/mm/page_alloc.c linux-4.1.26/mm/page_alloc.c while (to_free) { struct page *page; struct list_head *list; -@@ -739,7 +785,7 @@ +@@ -739,7 +785,7 @@ static void free_pcppages_bulk(struct zone *zone, int count, batch_free++; if (++migratetype == MIGRATE_PCPTYPES) migratetype = 0; @@ -26536,7 +27804,7 @@ diff -Nur linux-4.1.26.orig/mm/page_alloc.c linux-4.1.26/mm/page_alloc.c } while (list_empty(list)); /* This is the only non-empty list. Free them all. */ -@@ -747,21 +793,11 @@ +@@ -747,21 +793,11 @@ static void free_pcppages_bulk(struct zone *zone, int count, batch_free = to_free; do { @@ -26560,7 +27828,7 @@ diff -Nur linux-4.1.26.orig/mm/page_alloc.c linux-4.1.26/mm/page_alloc.c } static void free_one_page(struct zone *zone, -@@ -770,7 +806,9 @@ +@@ -770,7 +806,9 @@ static void free_one_page(struct zone *zone, int migratetype) { unsigned long nr_scanned; @@ -26571,7 +27839,7 @@ diff -Nur linux-4.1.26.orig/mm/page_alloc.c linux-4.1.26/mm/page_alloc.c 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 @@ +@@ -780,7 +818,7 @@ static void free_one_page(struct zone *zone, migratetype = get_pfnblock_migratetype(page, pfn); } __free_one_page(page, pfn, zone, order, migratetype); @@ -26580,7 +27848,7 @@ diff -Nur linux-4.1.26.orig/mm/page_alloc.c linux-4.1.26/mm/page_alloc.c } static int free_tail_pages_check(struct page *head_page, struct page *page) -@@ -845,11 +883,11 @@ +@@ -845,11 +883,11 @@ static void __free_pages_ok(struct page *page, unsigned int order) return; migratetype = get_pfnblock_migratetype(page, pfn); @@ -26594,7 +27862,7 @@ diff -Nur linux-4.1.26.orig/mm/page_alloc.c linux-4.1.26/mm/page_alloc.c } void __init __free_pages_bootmem(struct page *page, unsigned long pfn, -@@ -1396,16 +1434,18 @@ +@@ -1396,16 +1434,18 @@ static int rmqueue_bulk(struct zone *zone, unsigned int order, void drain_zone_pages(struct zone *zone, struct per_cpu_pages *pcp) { unsigned long flags; @@ -26616,7 +27884,7 @@ diff -Nur linux-4.1.26.orig/mm/page_alloc.c linux-4.1.26/mm/page_alloc.c } #endif -@@ -1421,16 +1461,21 @@ +@@ -1421,16 +1461,21 @@ static void drain_pages_zone(unsigned int cpu, struct zone *zone) unsigned long flags; struct per_cpu_pageset *pset; struct per_cpu_pages *pcp; @@ -26642,7 +27910,7 @@ diff -Nur linux-4.1.26.orig/mm/page_alloc.c linux-4.1.26/mm/page_alloc.c } /* -@@ -1516,8 +1561,17 @@ +@@ -1516,8 +1561,17 @@ void drain_all_pages(struct zone *zone) else cpumask_clear_cpu(cpu, &cpus_with_pcps); } @@ -26660,7 +27928,7 @@ diff -Nur linux-4.1.26.orig/mm/page_alloc.c linux-4.1.26/mm/page_alloc.c } #ifdef CONFIG_HIBERNATION -@@ -1573,7 +1627,7 @@ +@@ -1573,7 +1627,7 @@ void free_hot_cold_page(struct page *page, bool cold) migratetype = get_pfnblock_migratetype(page, pfn); set_freepage_migratetype(page, migratetype); @@ -26669,7 +27937,7 @@ diff -Nur linux-4.1.26.orig/mm/page_alloc.c linux-4.1.26/mm/page_alloc.c __count_vm_event(PGFREE); /* -@@ -1599,12 +1653,17 @@ +@@ -1599,12 +1653,17 @@ void free_hot_cold_page(struct page *page, bool cold) pcp->count++; if (pcp->count >= pcp->high) { unsigned long batch = READ_ONCE(pcp->batch); @@ -26689,7 +27957,7 @@ diff -Nur linux-4.1.26.orig/mm/page_alloc.c linux-4.1.26/mm/page_alloc.c } /* -@@ -1735,7 +1794,7 @@ +@@ -1735,7 +1794,7 @@ struct page *buffered_rmqueue(struct zone *preferred_zone, struct per_cpu_pages *pcp; struct list_head *list; @@ -26698,7 +27966,7 @@ diff -Nur linux-4.1.26.orig/mm/page_alloc.c linux-4.1.26/mm/page_alloc.c pcp = &this_cpu_ptr(zone->pageset)->pcp; list = &pcp->lists[migratetype]; if (list_empty(list)) { -@@ -1767,13 +1826,15 @@ +@@ -1767,13 +1826,15 @@ struct page *buffered_rmqueue(struct zone *preferred_zone, */ WARN_ON_ONCE(order > 1); } @@ -26717,7 +27985,7 @@ diff -Nur linux-4.1.26.orig/mm/page_alloc.c linux-4.1.26/mm/page_alloc.c } __mod_zone_page_state(zone, NR_ALLOC_BATCH, -(1 << order)); -@@ -1783,13 +1844,13 @@ +@@ -1783,13 +1844,13 @@ struct page *buffered_rmqueue(struct zone *preferred_zone, __count_zone_vm_events(PGALLOC, zone, 1 << order); zone_statistics(preferred_zone, zone, gfp_flags); @@ -26733,7 +28001,7 @@ diff -Nur linux-4.1.26.orig/mm/page_alloc.c linux-4.1.26/mm/page_alloc.c return NULL; } -@@ -5680,6 +5741,7 @@ +@@ -5680,6 +5741,7 @@ static int page_alloc_cpu_notify(struct notifier_block *self, void __init page_alloc_init(void) { hotcpu_notifier(page_alloc_cpu_notify, 0); @@ -26741,7 +28009,7 @@ diff -Nur linux-4.1.26.orig/mm/page_alloc.c linux-4.1.26/mm/page_alloc.c } /* -@@ -6575,7 +6637,7 @@ +@@ -6575,7 +6637,7 @@ void zone_pcp_reset(struct zone *zone) struct per_cpu_pageset *pset; /* avoid races with drain_pages() */ @@ -26750,7 +28018,7 @@ diff -Nur linux-4.1.26.orig/mm/page_alloc.c linux-4.1.26/mm/page_alloc.c if (zone->pageset != &boot_pageset) { for_each_online_cpu(cpu) { pset = per_cpu_ptr(zone->pageset, cpu); -@@ -6584,7 +6646,7 @@ +@@ -6584,7 +6646,7 @@ void zone_pcp_reset(struct zone *zone) free_percpu(zone->pageset); zone->pageset = &boot_pageset; } @@ -26759,10 +28027,11 @@ diff -Nur linux-4.1.26.orig/mm/page_alloc.c linux-4.1.26/mm/page_alloc.c } #ifdef CONFIG_MEMORY_HOTREMOVE -diff -Nur linux-4.1.26.orig/mm/slab.h linux-4.1.26/mm/slab.h ---- linux-4.1.26.orig/mm/slab.h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/mm/slab.h 2016-06-19 15:30:58.827302748 +0200 -@@ -330,7 +330,11 @@ +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) * The slab lists for all objects. */ struct kmem_cache_node { @@ -26774,10 +28043,11 @@ diff -Nur linux-4.1.26.orig/mm/slab.h linux-4.1.26/mm/slab.h #ifdef CONFIG_SLAB struct list_head slabs_partial; /* partial list first, better asm code */ -diff -Nur linux-4.1.26.orig/mm/slub.c linux-4.1.26/mm/slub.c ---- linux-4.1.26.orig/mm/slub.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/mm/slub.c 2016-06-19 15:30:58.827302748 +0200 -@@ -1069,7 +1069,7 @@ +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( { struct kmem_cache_node *n = get_node(s, page_to_nid(page)); @@ -26786,7 +28056,7 @@ diff -Nur linux-4.1.26.orig/mm/slub.c linux-4.1.26/mm/slub.c slab_lock(page); if (!check_slab(s, page)) -@@ -1116,7 +1116,7 @@ +@@ -1116,7 +1116,7 @@ out: fail: slab_unlock(page); @@ -26795,7 +28065,7 @@ diff -Nur linux-4.1.26.orig/mm/slub.c linux-4.1.26/mm/slub.c slab_fix(s, "Object at 0x%p not freed", object); return NULL; } -@@ -1242,6 +1242,12 @@ +@@ -1242,6 +1242,12 @@ static inline void dec_slabs_node(struct kmem_cache *s, int node, #endif /* CONFIG_SLUB_DEBUG */ @@ -26808,7 +28078,7 @@ diff -Nur linux-4.1.26.orig/mm/slub.c linux-4.1.26/mm/slub.c /* * 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 @@ +@@ -1306,6 +1312,17 @@ static inline void slab_free_hook(struct kmem_cache *s, void *x) kasan_slab_free(s, x); } @@ -26826,7 +28096,7 @@ diff -Nur linux-4.1.26.orig/mm/slub.c linux-4.1.26/mm/slub.c /* * Slab allocation and freeing */ -@@ -1336,10 +1353,17 @@ +@@ -1336,10 +1353,17 @@ static struct page *allocate_slab(struct kmem_cache *s, gfp_t flags, int node) struct page *page; struct kmem_cache_order_objects oo = s->oo; gfp_t alloc_gfp; @@ -26845,7 +28115,7 @@ diff -Nur linux-4.1.26.orig/mm/slub.c linux-4.1.26/mm/slub.c local_irq_enable(); flags |= s->allocflags; -@@ -1359,13 +1383,13 @@ +@@ -1359,13 +1383,13 @@ static struct page *allocate_slab(struct kmem_cache *s, gfp_t flags, int node) * Try a lower order alloc if possible */ page = alloc_slab_page(s, alloc_gfp, node, oo); @@ -26864,7 +28134,7 @@ diff -Nur linux-4.1.26.orig/mm/slub.c linux-4.1.26/mm/slub.c int pages = 1 << oo_order(oo); kmemcheck_alloc_shadow(page, oo_order(oo), alloc_gfp, node); -@@ -1380,51 +1404,9 @@ +@@ -1380,51 +1404,9 @@ static struct page *allocate_slab(struct kmem_cache *s, gfp_t flags, int node) kmemcheck_mark_unallocated_pages(page, pages); } @@ -26916,7 +28186,7 @@ diff -Nur linux-4.1.26.orig/mm/slub.c linux-4.1.26/mm/slub.c page->slab_cache = s; __SetPageSlab(page); if (page_is_pfmemalloc(page)) -@@ -1448,10 +1430,34 @@ +@@ -1448,10 +1430,34 @@ static struct page *new_slab(struct kmem_cache *s, gfp_t flags, int node) page->freelist = start; page->inuse = page->objects; page->frozen = 1; @@ -26951,7 +28221,7 @@ diff -Nur linux-4.1.26.orig/mm/slub.c linux-4.1.26/mm/slub.c static void __free_slab(struct kmem_cache *s, struct page *page) { int order = compound_order(page); -@@ -1483,6 +1489,16 @@ +@@ -1483,6 +1489,16 @@ static void __free_slab(struct kmem_cache *s, struct page *page) memcg_uncharge_slab(s, order); } @@ -26968,7 +28238,7 @@ diff -Nur linux-4.1.26.orig/mm/slub.c linux-4.1.26/mm/slub.c #define need_reserve_slab_rcu \ (sizeof(((struct page *)NULL)->lru) < sizeof(struct rcu_head)) -@@ -1517,6 +1533,12 @@ +@@ -1517,6 +1533,12 @@ static void free_slab(struct kmem_cache *s, struct page *page) } call_rcu(head, rcu_free_slab); @@ -26981,7 +28251,7 @@ diff -Nur linux-4.1.26.orig/mm/slub.c linux-4.1.26/mm/slub.c } else __free_slab(s, page); } -@@ -1630,7 +1652,7 @@ +@@ -1630,7 +1652,7 @@ static void *get_partial_node(struct kmem_cache *s, struct kmem_cache_node *n, if (!n || !n->nr_partial) return NULL; @@ -26990,7 +28260,7 @@ diff -Nur linux-4.1.26.orig/mm/slub.c linux-4.1.26/mm/slub.c list_for_each_entry_safe(page, page2, &n->partial, lru) { void *t; -@@ -1655,7 +1677,7 @@ +@@ -1655,7 +1677,7 @@ static void *get_partial_node(struct kmem_cache *s, struct kmem_cache_node *n, break; } @@ -26999,7 +28269,7 @@ diff -Nur linux-4.1.26.orig/mm/slub.c linux-4.1.26/mm/slub.c return object; } -@@ -1901,7 +1923,7 @@ +@@ -1901,7 +1923,7 @@ redo: * that acquire_slab() will see a slab page that * is frozen */ @@ -27008,7 +28278,7 @@ diff -Nur linux-4.1.26.orig/mm/slub.c linux-4.1.26/mm/slub.c } } else { m = M_FULL; -@@ -1912,7 +1934,7 @@ +@@ -1912,7 +1934,7 @@ redo: * slabs from diagnostic functions will not see * any frozen slabs. */ @@ -27017,7 +28287,7 @@ diff -Nur linux-4.1.26.orig/mm/slub.c linux-4.1.26/mm/slub.c } } -@@ -1947,7 +1969,7 @@ +@@ -1947,7 +1969,7 @@ redo: goto redo; if (lock) @@ -27026,7 +28296,7 @@ diff -Nur linux-4.1.26.orig/mm/slub.c linux-4.1.26/mm/slub.c if (m == M_FREE) { stat(s, DEACTIVATE_EMPTY); -@@ -1979,10 +2001,10 @@ +@@ -1979,10 +2001,10 @@ static void unfreeze_partials(struct kmem_cache *s, n2 = get_node(s, page_to_nid(page)); if (n != n2) { if (n) @@ -27039,7 +28309,7 @@ diff -Nur linux-4.1.26.orig/mm/slub.c linux-4.1.26/mm/slub.c } do { -@@ -2011,7 +2033,7 @@ +@@ -2011,7 +2033,7 @@ static void unfreeze_partials(struct kmem_cache *s, } if (n) @@ -27048,7 +28318,7 @@ diff -Nur linux-4.1.26.orig/mm/slub.c linux-4.1.26/mm/slub.c while (discard_page) { page = discard_page; -@@ -2050,14 +2072,21 @@ +@@ -2050,14 +2072,21 @@ static void put_cpu_partial(struct kmem_cache *s, struct page *page, int drain) pobjects = oldpage->pobjects; pages = oldpage->pages; if (drain && pobjects > s->cpu_partial) { @@ -27070,7 +28340,7 @@ diff -Nur linux-4.1.26.orig/mm/slub.c linux-4.1.26/mm/slub.c oldpage = NULL; pobjects = 0; pages = 0; -@@ -2129,7 +2158,22 @@ +@@ -2129,7 +2158,22 @@ static bool has_cpu_slab(int cpu, void *info) static void flush_all(struct kmem_cache *s) { @@ -27093,7 +28363,7 @@ diff -Nur linux-4.1.26.orig/mm/slub.c linux-4.1.26/mm/slub.c } /* -@@ -2165,10 +2209,10 @@ +@@ -2165,10 +2209,10 @@ static unsigned long count_partial(struct kmem_cache_node *n, unsigned long x = 0; struct page *page; @@ -27106,7 +28376,7 @@ diff -Nur linux-4.1.26.orig/mm/slub.c linux-4.1.26/mm/slub.c return x; } #endif /* CONFIG_SLUB_DEBUG || CONFIG_SYSFS */ -@@ -2305,9 +2349,11 @@ +@@ -2305,9 +2349,11 @@ static inline void *get_freelist(struct kmem_cache *s, struct page *page) static void *__slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node, unsigned long addr, struct kmem_cache_cpu *c) { @@ -27118,7 +28388,7 @@ diff -Nur linux-4.1.26.orig/mm/slub.c linux-4.1.26/mm/slub.c local_irq_save(flags); #ifdef CONFIG_PREEMPT -@@ -2375,7 +2421,13 @@ +@@ -2375,7 +2421,13 @@ load_freelist: VM_BUG_ON(!c->page->frozen); c->freelist = get_freepointer(s, freelist); c->tid = next_tid(c->tid); @@ -27132,7 +28402,7 @@ diff -Nur linux-4.1.26.orig/mm/slub.c linux-4.1.26/mm/slub.c return freelist; new_slab: -@@ -2392,8 +2444,7 @@ +@@ -2392,8 +2444,7 @@ new_slab: if (unlikely(!freelist)) { slab_out_of_memory(s, gfpflags, node); @@ -27142,7 +28412,7 @@ diff -Nur linux-4.1.26.orig/mm/slub.c linux-4.1.26/mm/slub.c } page = c->page; -@@ -2408,8 +2459,7 @@ +@@ -2408,8 +2459,7 @@ new_slab: deactivate_slab(s, page, get_freepointer(s, freelist)); c->page = NULL; c->freelist = NULL; @@ -27152,7 +28422,7 @@ diff -Nur linux-4.1.26.orig/mm/slub.c linux-4.1.26/mm/slub.c } /* -@@ -2593,7 +2643,7 @@ +@@ -2593,7 +2643,7 @@ static void __slab_free(struct kmem_cache *s, struct page *page, do { if (unlikely(n)) { @@ -27161,7 +28431,7 @@ diff -Nur linux-4.1.26.orig/mm/slub.c linux-4.1.26/mm/slub.c n = NULL; } prior = page->freelist; -@@ -2625,7 +2675,7 @@ +@@ -2625,7 +2675,7 @@ static void __slab_free(struct kmem_cache *s, struct page *page, * Otherwise the list_lock will synchronize with * other processors updating the list of slabs. */ @@ -27170,7 +28440,7 @@ diff -Nur linux-4.1.26.orig/mm/slub.c linux-4.1.26/mm/slub.c } } -@@ -2667,7 +2717,7 @@ +@@ -2667,7 +2717,7 @@ static void __slab_free(struct kmem_cache *s, struct page *page, add_partial(n, page, DEACTIVATE_TO_TAIL); stat(s, FREE_ADD_PARTIAL); } @@ -27179,7 +28449,7 @@ diff -Nur linux-4.1.26.orig/mm/slub.c linux-4.1.26/mm/slub.c return; slab_empty: -@@ -2682,7 +2732,7 @@ +@@ -2682,7 +2732,7 @@ slab_empty: remove_full(s, n, page); } @@ -27188,7 +28458,7 @@ diff -Nur linux-4.1.26.orig/mm/slub.c linux-4.1.26/mm/slub.c stat(s, FREE_SLAB); discard_slab(s, page); } -@@ -2881,7 +2931,7 @@ +@@ -2881,7 +2931,7 @@ static void init_kmem_cache_node(struct kmem_cache_node *n) { n->nr_partial = 0; @@ -27197,7 +28467,7 @@ diff -Nur linux-4.1.26.orig/mm/slub.c linux-4.1.26/mm/slub.c INIT_LIST_HEAD(&n->partial); #ifdef CONFIG_SLUB_DEBUG atomic_long_set(&n->nr_slabs, 0); -@@ -3463,7 +3513,7 @@ +@@ -3463,7 +3513,7 @@ int __kmem_cache_shrink(struct kmem_cache *s, bool deactivate) for (i = 0; i < SHRINK_PROMOTE_MAX; i++) INIT_LIST_HEAD(promote + i); @@ -27206,7 +28476,7 @@ diff -Nur linux-4.1.26.orig/mm/slub.c linux-4.1.26/mm/slub.c /* * Build lists of slabs to discard or promote. -@@ -3494,7 +3544,7 @@ +@@ -3494,7 +3544,7 @@ int __kmem_cache_shrink(struct kmem_cache *s, bool deactivate) for (i = SHRINK_PROMOTE_MAX - 1; i >= 0; i--) list_splice(promote + i, &n->partial); @@ -27215,7 +28485,7 @@ diff -Nur linux-4.1.26.orig/mm/slub.c linux-4.1.26/mm/slub.c /* Release empty slabs */ list_for_each_entry_safe(page, t, &discard, lru) -@@ -3670,6 +3720,12 @@ +@@ -3670,6 +3720,12 @@ void __init kmem_cache_init(void) { static __initdata struct kmem_cache boot_kmem_cache, boot_kmem_cache_node; @@ -27228,7 +28498,7 @@ diff -Nur linux-4.1.26.orig/mm/slub.c linux-4.1.26/mm/slub.c if (debug_guardpage_minorder()) slub_max_order = 0; -@@ -3912,7 +3968,7 @@ +@@ -3912,7 +3968,7 @@ static int validate_slab_node(struct kmem_cache *s, struct page *page; unsigned long flags; @@ -27237,7 +28507,7 @@ diff -Nur linux-4.1.26.orig/mm/slub.c linux-4.1.26/mm/slub.c list_for_each_entry(page, &n->partial, lru) { validate_slab_slab(s, page, map); -@@ -3934,7 +3990,7 @@ +@@ -3934,7 +3990,7 @@ static int validate_slab_node(struct kmem_cache *s, s->name, count, atomic_long_read(&n->nr_slabs)); out: @@ -27246,7 +28516,7 @@ diff -Nur linux-4.1.26.orig/mm/slub.c linux-4.1.26/mm/slub.c return count; } -@@ -4122,12 +4178,12 @@ +@@ -4122,12 +4178,12 @@ static int list_locations(struct kmem_cache *s, char *buf, if (!atomic_long_read(&n->nr_slabs)) continue; @@ -27261,9 +28531,10 @@ diff -Nur linux-4.1.26.orig/mm/slub.c linux-4.1.26/mm/slub.c } for (i = 0; i < t.count; i++) { -diff -Nur linux-4.1.26.orig/mm/swap.c linux-4.1.26/mm/swap.c ---- linux-4.1.26.orig/mm/swap.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/mm/swap.c 2016-06-19 15:30:58.831302903 +0200 +diff --git a/mm/swap.c b/mm/swap.c +index ab3b9c2dd783..b433019229f8 100644 +--- a/mm/swap.c ++++ b/mm/swap.c @@ -32,6 +32,7 @@ #include <linux/gfp.h> #include <linux/uio.h> @@ -27272,7 +28543,7 @@ diff -Nur linux-4.1.26.orig/mm/swap.c linux-4.1.26/mm/swap.c #include "internal.h" -@@ -45,6 +46,9 @@ +@@ -45,6 +46,9 @@ static DEFINE_PER_CPU(struct pagevec, lru_add_pvec); static DEFINE_PER_CPU(struct pagevec, lru_rotate_pvecs); static DEFINE_PER_CPU(struct pagevec, lru_deactivate_file_pvecs); @@ -27282,21 +28553,21 @@ diff -Nur linux-4.1.26.orig/mm/swap.c linux-4.1.26/mm/swap.c /* * This path almost never happens for VM activity - pages are normally * freed via pagevecs. But it gets used by networking. -@@ -481,11 +485,11 @@ +@@ -481,11 +485,11 @@ void rotate_reclaimable_page(struct page *page) unsigned long flags; page_cache_get(page); - local_irq_save(flags); + local_lock_irqsave(rotate_lock, flags); pvec = this_cpu_ptr(&lru_rotate_pvecs); - if (!pagevec_add(pvec, page)) + if (!pagevec_add(pvec, page) || PageCompound(page)) pagevec_move_tail(pvec); - local_irq_restore(flags); + local_unlock_irqrestore(rotate_lock, flags); } } -@@ -536,12 +540,13 @@ +@@ -536,12 +540,13 @@ static bool need_activate_page_drain(int cpu) void activate_page(struct page *page) { if (PageLRU(page) && !PageActive(page) && !PageUnevictable(page)) { @@ -27305,14 +28576,14 @@ diff -Nur linux-4.1.26.orig/mm/swap.c linux-4.1.26/mm/swap.c + activate_page_pvecs); page_cache_get(page); - if (!pagevec_add(pvec, page)) + if (!pagevec_add(pvec, page) || PageCompound(page)) pagevec_lru_move_fn(pvec, __activate_page, NULL); - put_cpu_var(activate_page_pvecs); + put_locked_var(swapvec_lock, activate_page_pvecs); } } -@@ -567,7 +572,7 @@ +@@ -567,7 +572,7 @@ void activate_page(struct page *page) static void __lru_cache_activate_page(struct page *page) { @@ -27321,7 +28592,7 @@ diff -Nur linux-4.1.26.orig/mm/swap.c linux-4.1.26/mm/swap.c int i; /* -@@ -589,7 +594,7 @@ +@@ -589,7 +594,7 @@ static void __lru_cache_activate_page(struct page *page) } } @@ -27330,7 +28601,7 @@ diff -Nur linux-4.1.26.orig/mm/swap.c linux-4.1.26/mm/swap.c } /* -@@ -628,13 +633,13 @@ +@@ -628,12 +633,12 @@ EXPORT_SYMBOL(mark_page_accessed); static void __lru_cache_add(struct page *page) { @@ -27338,27 +28609,32 @@ diff -Nur linux-4.1.26.orig/mm/swap.c linux-4.1.26/mm/swap.c + struct pagevec *pvec = &get_locked_var(swapvec_lock, lru_add_pvec); page_cache_get(page); - if (!pagevec_space(pvec)) + if (!pagevec_add(pvec, page) || PageCompound(page)) __pagevec_lru_add(pvec); - pagevec_add(pvec, page); - put_cpu_var(lru_add_pvec); + put_locked_var(swapvec_lock, lru_add_pvec); } /** -@@ -814,9 +819,9 @@ +@@ -813,9 +818,15 @@ void lru_add_drain_cpu(int cpu) unsigned long flags; /* No harm done if a racing interrupt already did this */ - local_irq_save(flags); ++#ifdef CONFIG_PREEMPT_RT_BASE ++ local_lock_irqsave_on(rotate_lock, flags, cpu); ++ pagevec_move_tail(pvec); ++ local_unlock_irqrestore_on(rotate_lock, flags, cpu); ++#else + local_lock_irqsave(rotate_lock, flags); pagevec_move_tail(pvec); - local_irq_restore(flags); + local_unlock_irqrestore(rotate_lock, flags); ++#endif } pvec = &per_cpu(lru_deactivate_file_pvecs, cpu); -@@ -844,18 +849,19 @@ +@@ -843,26 +854,47 @@ void deactivate_file_page(struct page *page) return; if (likely(get_page_unless_zero(page))) { @@ -27366,7 +28642,7 @@ diff -Nur linux-4.1.26.orig/mm/swap.c linux-4.1.26/mm/swap.c + struct pagevec *pvec = &get_locked_var(swapvec_lock, + lru_deactivate_file_pvecs); - if (!pagevec_add(pvec, page)) + if (!pagevec_add(pvec, page) || PageCompound(page)) pagevec_lru_move_fn(pvec, lru_deactivate_file_fn, NULL); - put_cpu_var(lru_deactivate_file_pvecs); + put_locked_var(swapvec_lock, lru_deactivate_file_pvecs); @@ -27381,11 +28657,65 @@ diff -Nur linux-4.1.26.orig/mm/swap.c linux-4.1.26/mm/swap.c + local_unlock_cpu(swapvec_lock); } ++ ++#ifdef CONFIG_PREEMPT_RT_BASE ++static inline void remote_lru_add_drain(int cpu, struct cpumask *has_work) ++{ ++ local_lock_on(swapvec_lock, cpu); ++ lru_add_drain_cpu(cpu); ++ local_unlock_on(swapvec_lock, cpu); ++} ++ ++#else ++ static void lru_add_drain_per_cpu(struct work_struct *dummy) -diff -Nur linux-4.1.26.orig/mm/truncate.c linux-4.1.26/mm/truncate.c ---- linux-4.1.26.orig/mm/truncate.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/mm/truncate.c 2016-06-19 15:30:58.831302903 +0200 -@@ -56,8 +56,11 @@ + { + lru_add_drain(); + } + + static DEFINE_PER_CPU(struct work_struct, lru_add_drain_work); ++static inline void remote_lru_add_drain(int cpu, struct cpumask *has_work) ++{ ++ struct work_struct *work = &per_cpu(lru_add_drain_work, cpu); ++ ++ INIT_WORK(work, lru_add_drain_per_cpu); ++ schedule_work_on(cpu, work); ++ cpumask_set_cpu(cpu, has_work); ++} ++#endif + + void lru_add_drain_all(void) + { +@@ -875,20 +907,17 @@ void lru_add_drain_all(void) + cpumask_clear(&has_work); + + for_each_online_cpu(cpu) { +- struct work_struct *work = &per_cpu(lru_add_drain_work, cpu); +- + if (pagevec_count(&per_cpu(lru_add_pvec, cpu)) || + pagevec_count(&per_cpu(lru_rotate_pvecs, cpu)) || + pagevec_count(&per_cpu(lru_deactivate_file_pvecs, cpu)) || +- need_activate_page_drain(cpu)) { +- INIT_WORK(work, lru_add_drain_per_cpu); +- schedule_work_on(cpu, work); +- cpumask_set_cpu(cpu, &has_work); +- } ++ need_activate_page_drain(cpu)) ++ remote_lru_add_drain(cpu, &has_work); + } + ++#ifndef CONFIG_PREEMPT_RT_BASE + for_each_cpu(cpu, &has_work) + flush_work(&per_cpu(lru_add_drain_work, cpu)); ++#endif + + 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, * protected by mapping->tree_lock. */ if (!workingset_node_shadows(node) && @@ -27399,10 +28729,11 @@ diff -Nur linux-4.1.26.orig/mm/truncate.c linux-4.1.26/mm/truncate.c __radix_tree_delete_node(&mapping->page_tree, node); unlock: spin_unlock_irq(&mapping->tree_lock); -diff -Nur linux-4.1.26.orig/mm/vmalloc.c linux-4.1.26/mm/vmalloc.c ---- linux-4.1.26.orig/mm/vmalloc.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/mm/vmalloc.c 2016-06-19 15:30:58.831302903 +0200 -@@ -819,7 +819,7 @@ +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) struct vmap_block *vb; struct vmap_area *va; unsigned long vb_idx; @@ -27411,7 +28742,7 @@ diff -Nur linux-4.1.26.orig/mm/vmalloc.c linux-4.1.26/mm/vmalloc.c void *vaddr; node = numa_node_id(); -@@ -862,11 +862,12 @@ +@@ -862,11 +862,12 @@ static void *new_vmap_block(unsigned int order, gfp_t gfp_mask) BUG_ON(err); radix_tree_preload_end(); @@ -27426,7 +28757,7 @@ diff -Nur linux-4.1.26.orig/mm/vmalloc.c linux-4.1.26/mm/vmalloc.c return vaddr; } -@@ -935,6 +936,7 @@ +@@ -935,6 +936,7 @@ static void *vb_alloc(unsigned long size, gfp_t gfp_mask) struct vmap_block *vb; void *vaddr = NULL; unsigned int order; @@ -27434,7 +28765,7 @@ diff -Nur linux-4.1.26.orig/mm/vmalloc.c linux-4.1.26/mm/vmalloc.c BUG_ON(size & ~PAGE_MASK); BUG_ON(size > PAGE_SIZE*VMAP_MAX_ALLOC); -@@ -949,7 +951,8 @@ +@@ -949,7 +951,8 @@ static void *vb_alloc(unsigned long size, gfp_t gfp_mask) order = get_order(size); rcu_read_lock(); @@ -27444,7 +28775,7 @@ diff -Nur linux-4.1.26.orig/mm/vmalloc.c linux-4.1.26/mm/vmalloc.c list_for_each_entry_rcu(vb, &vbq->free, free_list) { unsigned long pages_off; -@@ -972,7 +975,7 @@ +@@ -972,7 +975,7 @@ static void *vb_alloc(unsigned long size, gfp_t gfp_mask) break; } @@ -27453,10 +28784,11 @@ diff -Nur linux-4.1.26.orig/mm/vmalloc.c linux-4.1.26/mm/vmalloc.c rcu_read_unlock(); /* Allocate new block if nothing was found */ -diff -Nur linux-4.1.26.orig/mm/vmstat.c linux-4.1.26/mm/vmstat.c ---- linux-4.1.26.orig/mm/vmstat.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/mm/vmstat.c 2016-06-19 15:30:58.831302903 +0200 -@@ -226,6 +226,7 @@ +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, long x; long t; @@ -27464,7 +28796,7 @@ diff -Nur linux-4.1.26.orig/mm/vmstat.c linux-4.1.26/mm/vmstat.c x = delta + __this_cpu_read(*p); t = __this_cpu_read(pcp->stat_threshold); -@@ -235,6 +236,7 @@ +@@ -235,6 +236,7 @@ void __mod_zone_page_state(struct zone *zone, enum zone_stat_item item, x = 0; } __this_cpu_write(*p, x); @@ -27472,7 +28804,7 @@ diff -Nur linux-4.1.26.orig/mm/vmstat.c linux-4.1.26/mm/vmstat.c } EXPORT_SYMBOL(__mod_zone_page_state); -@@ -267,6 +269,7 @@ +@@ -267,6 +269,7 @@ void __inc_zone_state(struct zone *zone, enum zone_stat_item item) s8 __percpu *p = pcp->vm_stat_diff + item; s8 v, t; @@ -27480,7 +28812,7 @@ diff -Nur linux-4.1.26.orig/mm/vmstat.c linux-4.1.26/mm/vmstat.c v = __this_cpu_inc_return(*p); t = __this_cpu_read(pcp->stat_threshold); if (unlikely(v > t)) { -@@ -275,6 +278,7 @@ +@@ -275,6 +278,7 @@ void __inc_zone_state(struct zone *zone, enum zone_stat_item item) zone_page_state_add(v + overstep, zone, item); __this_cpu_write(*p, -overstep); } @@ -27488,7 +28820,7 @@ diff -Nur linux-4.1.26.orig/mm/vmstat.c linux-4.1.26/mm/vmstat.c } void __inc_zone_page_state(struct page *page, enum zone_stat_item item) -@@ -289,6 +293,7 @@ +@@ -289,6 +293,7 @@ void __dec_zone_state(struct zone *zone, enum zone_stat_item item) s8 __percpu *p = pcp->vm_stat_diff + item; s8 v, t; @@ -27496,7 +28828,7 @@ diff -Nur linux-4.1.26.orig/mm/vmstat.c linux-4.1.26/mm/vmstat.c v = __this_cpu_dec_return(*p); t = __this_cpu_read(pcp->stat_threshold); if (unlikely(v < - t)) { -@@ -297,6 +302,7 @@ +@@ -297,6 +302,7 @@ void __dec_zone_state(struct zone *zone, enum zone_stat_item item) zone_page_state_add(v - overstep, zone, item); __this_cpu_write(*p, overstep); } @@ -27504,10 +28836,11 @@ diff -Nur linux-4.1.26.orig/mm/vmstat.c linux-4.1.26/mm/vmstat.c } void __dec_zone_page_state(struct page *page, enum zone_stat_item item) -diff -Nur linux-4.1.26.orig/mm/workingset.c linux-4.1.26/mm/workingset.c ---- linux-4.1.26.orig/mm/workingset.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/mm/workingset.c 2016-06-19 15:30:58.835303057 +0200 -@@ -264,7 +264,8 @@ +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) * point where they would still be useful. */ @@ -27517,7 +28850,7 @@ diff -Nur linux-4.1.26.orig/mm/workingset.c linux-4.1.26/mm/workingset.c static unsigned long count_shadow_nodes(struct shrinker *shrinker, struct shrink_control *sc) -@@ -274,9 +275,9 @@ +@@ -274,9 +275,9 @@ static unsigned long count_shadow_nodes(struct shrinker *shrinker, unsigned long pages; /* list_lru lock nests inside IRQ-safe mapping->tree_lock */ @@ -27530,7 +28863,7 @@ diff -Nur linux-4.1.26.orig/mm/workingset.c linux-4.1.26/mm/workingset.c pages = node_present_pages(sc->nid); /* -@@ -363,9 +364,9 @@ +@@ -363,9 +364,9 @@ static enum lru_status shadow_lru_isolate(struct list_head *item, spin_unlock(&mapping->tree_lock); ret = LRU_REMOVED_RETRY; out: @@ -27542,7 +28875,7 @@ diff -Nur linux-4.1.26.orig/mm/workingset.c linux-4.1.26/mm/workingset.c spin_lock(lru_lock); return ret; } -@@ -376,10 +377,10 @@ +@@ -376,10 +377,10 @@ static unsigned long scan_shadow_nodes(struct shrinker *shrinker, unsigned long ret; /* list_lru lock nests inside IRQ-safe mapping->tree_lock */ @@ -27556,7 +28889,7 @@ diff -Nur linux-4.1.26.orig/mm/workingset.c linux-4.1.26/mm/workingset.c return ret; } -@@ -400,7 +401,7 @@ +@@ -400,7 +401,7 @@ static int __init workingset_init(void) { int ret; @@ -27565,7 +28898,7 @@ diff -Nur linux-4.1.26.orig/mm/workingset.c linux-4.1.26/mm/workingset.c if (ret) goto err; ret = register_shrinker(&workingset_shadow_shrinker); -@@ -408,7 +409,7 @@ +@@ -408,7 +409,7 @@ static int __init workingset_init(void) goto err_list_lru; return 0; err_list_lru: @@ -27574,10 +28907,33 @@ diff -Nur linux-4.1.26.orig/mm/workingset.c linux-4.1.26/mm/workingset.c err: return ret; } -diff -Nur linux-4.1.26.orig/net/core/dev.c linux-4.1.26/net/core/dev.c ---- linux-4.1.26.orig/net/core/dev.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/net/core/dev.c 2016-06-19 15:30:58.839303211 +0200 -@@ -184,6 +184,7 @@ +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, + 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->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) + + __zs_unmap_object(area, pages, off, class->size); + } +- put_cpu_var(zs_map_area); ++ put_cpu_light(); + 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; static DEFINE_HASHTABLE(napi_hash, 8); static seqcount_t devnet_rename_seq; @@ -27585,7 +28941,7 @@ diff -Nur linux-4.1.26.orig/net/core/dev.c linux-4.1.26/net/core/dev.c static inline void dev_base_seq_inc(struct net *net) { -@@ -205,14 +206,14 @@ +@@ -205,14 +206,14 @@ static inline struct hlist_head *dev_index_hash(struct net *net, int ifindex) static inline void rps_lock(struct softnet_data *sd) { #ifdef CONFIG_RPS @@ -27602,7 +28958,7 @@ diff -Nur linux-4.1.26.orig/net/core/dev.c linux-4.1.26/net/core/dev.c #endif } -@@ -852,7 +853,8 @@ +@@ -852,7 +853,8 @@ retry: strcpy(name, dev->name); rcu_read_unlock(); if (read_seqcount_retry(&devnet_rename_seq, seq)) { @@ -27612,7 +28968,7 @@ diff -Nur linux-4.1.26.orig/net/core/dev.c linux-4.1.26/net/core/dev.c goto retry; } -@@ -1121,20 +1123,17 @@ +@@ -1121,20 +1123,17 @@ int dev_change_name(struct net_device *dev, const char *newname) if (dev->flags & IFF_UP) return -EBUSY; @@ -27639,7 +28995,7 @@ diff -Nur linux-4.1.26.orig/net/core/dev.c linux-4.1.26/net/core/dev.c if (oldname[0] && !strchr(oldname, '%')) netdev_info(dev, "renamed from %s\n", oldname); -@@ -1147,11 +1146,12 @@ +@@ -1147,11 +1146,12 @@ rollback: if (ret) { memcpy(dev->name, oldname, IFNAMSIZ); dev->name_assign_type = old_assign_type; @@ -27655,7 +29011,7 @@ diff -Nur linux-4.1.26.orig/net/core/dev.c linux-4.1.26/net/core/dev.c netdev_adjacent_rename_links(dev, oldname); -@@ -1172,7 +1172,8 @@ +@@ -1172,7 +1172,8 @@ rollback: /* err >= 0 after dev_alloc_name() or stores the first errno */ if (err >= 0) { err = ret; @@ -27665,7 +29021,7 @@ diff -Nur linux-4.1.26.orig/net/core/dev.c linux-4.1.26/net/core/dev.c memcpy(dev->name, oldname, IFNAMSIZ); memcpy(oldname, newname, IFNAMSIZ); dev->name_assign_type = old_assign_type; -@@ -1185,6 +1186,11 @@ +@@ -1185,6 +1186,11 @@ rollback: } return err; @@ -27677,7 +29033,7 @@ diff -Nur linux-4.1.26.orig/net/core/dev.c linux-4.1.26/net/core/dev.c } /** -@@ -2214,6 +2220,7 @@ +@@ -2214,6 +2220,7 @@ static inline void __netif_reschedule(struct Qdisc *q) sd->output_queue_tailp = &q->next_sched; raise_softirq_irqoff(NET_TX_SOFTIRQ); local_irq_restore(flags); @@ -27685,7 +29041,7 @@ diff -Nur linux-4.1.26.orig/net/core/dev.c linux-4.1.26/net/core/dev.c } void __netif_schedule(struct Qdisc *q) -@@ -2295,6 +2302,7 @@ +@@ -2295,6 +2302,7 @@ void __dev_kfree_skb_irq(struct sk_buff *skb, enum skb_free_reason reason) __this_cpu_write(softnet_data.completion_queue, skb); raise_softirq_irqoff(NET_TX_SOFTIRQ); local_irq_restore(flags); @@ -27693,7 +29049,19 @@ diff -Nur linux-4.1.26.orig/net/core/dev.c linux-4.1.26/net/core/dev.c } EXPORT_SYMBOL(__dev_kfree_skb_irq); -@@ -2880,9 +2888,44 @@ +@@ -2820,7 +2828,11 @@ static inline int __dev_xmit_skb(struct sk_buff *skb, struct Qdisc *q, + * This permits __QDISC___STATE_RUNNING owner to get the lock more + * often and dequeue packets faster. + */ ++#ifdef CONFIG_PREEMPT_RT_FULL ++ contended = true; ++#else + contended = qdisc_is_running(q); ++#endif + if (unlikely(contended)) + spin_lock(&q->busylock); + +@@ -2880,9 +2892,44 @@ static void skb_update_prio(struct sk_buff *skb) #define skb_update_prio(skb) #endif @@ -27738,7 +29106,7 @@ diff -Nur linux-4.1.26.orig/net/core/dev.c linux-4.1.26/net/core/dev.c #define RECURSION_LIMIT 10 /** -@@ -2984,7 +3027,7 @@ +@@ -2984,7 +3031,7 @@ static int __dev_queue_xmit(struct sk_buff *skb, void *accel_priv) if (txq->xmit_lock_owner != cpu) { @@ -27747,7 +29115,7 @@ diff -Nur linux-4.1.26.orig/net/core/dev.c linux-4.1.26/net/core/dev.c goto recursion_alert; skb = validate_xmit_skb(skb, dev); -@@ -2994,9 +3037,9 @@ +@@ -2994,9 +3041,9 @@ static int __dev_queue_xmit(struct sk_buff *skb, void *accel_priv) HARD_TX_LOCK(dev, txq, cpu); if (!netif_xmit_stopped(txq)) { @@ -27759,7 +29127,7 @@ diff -Nur linux-4.1.26.orig/net/core/dev.c linux-4.1.26/net/core/dev.c if (dev_xmit_complete(rc)) { HARD_TX_UNLOCK(dev, txq); goto out; -@@ -3370,6 +3413,7 @@ +@@ -3370,6 +3417,7 @@ drop: rps_unlock(sd); local_irq_restore(flags); @@ -27767,7 +29135,7 @@ diff -Nur linux-4.1.26.orig/net/core/dev.c linux-4.1.26/net/core/dev.c atomic_long_inc(&skb->dev->rx_dropped); kfree_skb(skb); -@@ -3388,7 +3432,7 @@ +@@ -3388,7 +3436,7 @@ static int netif_rx_internal(struct sk_buff *skb) struct rps_dev_flow voidflow, *rflow = &voidflow; int cpu; @@ -27776,7 +29144,7 @@ diff -Nur linux-4.1.26.orig/net/core/dev.c linux-4.1.26/net/core/dev.c rcu_read_lock(); cpu = get_rps_cpu(skb->dev, skb, &rflow); -@@ -3398,13 +3442,13 @@ +@@ -3398,13 +3446,13 @@ static int netif_rx_internal(struct sk_buff *skb) ret = enqueue_to_backlog(skb, cpu, &rflow->last_qtail); rcu_read_unlock(); @@ -27793,7 +29161,7 @@ diff -Nur linux-4.1.26.orig/net/core/dev.c linux-4.1.26/net/core/dev.c } return ret; } -@@ -3438,16 +3482,44 @@ +@@ -3438,16 +3486,44 @@ int netif_rx_ni(struct sk_buff *skb) trace_netif_rx_ni_entry(skb); @@ -27842,7 +29210,7 @@ diff -Nur linux-4.1.26.orig/net/core/dev.c linux-4.1.26/net/core/dev.c static void net_tx_action(struct softirq_action *h) { struct softnet_data *sd = this_cpu_ptr(&softnet_data); -@@ -3489,7 +3561,7 @@ +@@ -3489,7 +3565,7 @@ static void net_tx_action(struct softirq_action *h) head = head->next_sched; root_lock = qdisc_lock(q); @@ -27851,7 +29219,7 @@ diff -Nur linux-4.1.26.orig/net/core/dev.c linux-4.1.26/net/core/dev.c smp_mb__before_atomic(); clear_bit(__QDISC_STATE_SCHED, &q->state); -@@ -3886,7 +3958,7 @@ +@@ -3886,7 +3962,7 @@ static void flush_backlog(void *arg) skb_queue_walk_safe(&sd->input_pkt_queue, skb, tmp) { if (skb->dev == dev) { __skb_unlink(skb, &sd->input_pkt_queue); @@ -27860,7 +29228,7 @@ diff -Nur linux-4.1.26.orig/net/core/dev.c linux-4.1.26/net/core/dev.c input_queue_head_incr(sd); } } -@@ -3895,10 +3967,13 @@ +@@ -3895,10 +3971,13 @@ static void flush_backlog(void *arg) skb_queue_walk_safe(&sd->process_queue, skb, tmp) { if (skb->dev == dev) { __skb_unlink(skb, &sd->process_queue); @@ -27875,7 +29243,7 @@ diff -Nur linux-4.1.26.orig/net/core/dev.c linux-4.1.26/net/core/dev.c } static int napi_gro_complete(struct sk_buff *skb) -@@ -4349,6 +4424,7 @@ +@@ -4349,6 +4428,7 @@ static void net_rps_action_and_irq_enable(struct softnet_data *sd) sd->rps_ipi_list = NULL; local_irq_enable(); @@ -27883,7 +29251,7 @@ diff -Nur linux-4.1.26.orig/net/core/dev.c linux-4.1.26/net/core/dev.c /* Send pending IPI's to kick RPS processing on remote cpus. */ while (remsd) { -@@ -4362,6 +4438,7 @@ +@@ -4362,6 +4442,7 @@ static void net_rps_action_and_irq_enable(struct softnet_data *sd) } else #endif local_irq_enable(); @@ -27891,7 +29259,7 @@ diff -Nur linux-4.1.26.orig/net/core/dev.c linux-4.1.26/net/core/dev.c } static bool sd_has_rps_ipi_waiting(struct softnet_data *sd) -@@ -4443,6 +4520,7 @@ +@@ -4443,6 +4524,7 @@ void __napi_schedule(struct napi_struct *n) local_irq_save(flags); ____napi_schedule(this_cpu_ptr(&softnet_data), n); local_irq_restore(flags); @@ -27899,7 +29267,7 @@ diff -Nur linux-4.1.26.orig/net/core/dev.c linux-4.1.26/net/core/dev.c } EXPORT_SYMBOL(__napi_schedule); -@@ -4717,7 +4795,7 @@ +@@ -4717,7 +4799,7 @@ static void net_rx_action(struct softirq_action *h) list_splice_tail(&repoll, &list); list_splice(&list, &sd->poll_list); if (!list_empty(&sd->poll_list)) @@ -27908,7 +29276,7 @@ diff -Nur linux-4.1.26.orig/net/core/dev.c linux-4.1.26/net/core/dev.c net_rps_action_and_irq_enable(sd); } -@@ -6931,7 +7009,7 @@ +@@ -6931,7 +7013,7 @@ EXPORT_SYMBOL(free_netdev); void synchronize_net(void) { might_sleep(); @@ -27917,7 +29285,7 @@ diff -Nur linux-4.1.26.orig/net/core/dev.c linux-4.1.26/net/core/dev.c synchronize_rcu_expedited(); else synchronize_rcu(); -@@ -7172,16 +7250,20 @@ +@@ -7172,16 +7254,20 @@ static int dev_cpu_callback(struct notifier_block *nfb, raise_softirq_irqoff(NET_TX_SOFTIRQ); local_irq_enable(); @@ -27939,7 +29307,7 @@ diff -Nur linux-4.1.26.orig/net/core/dev.c linux-4.1.26/net/core/dev.c return NOTIFY_OK; } -@@ -7483,8 +7565,9 @@ +@@ -7483,8 +7569,9 @@ static int __init net_dev_init(void) for_each_possible_cpu(i) { struct softnet_data *sd = &per_cpu(softnet_data, i); @@ -27951,9 +29319,10 @@ diff -Nur linux-4.1.26.orig/net/core/dev.c linux-4.1.26/net/core/dev.c INIT_LIST_HEAD(&sd->poll_list); sd->output_queue_tailp = &sd->output_queue; #ifdef CONFIG_RPS -diff -Nur linux-4.1.26.orig/net/core/skbuff.c linux-4.1.26/net/core/skbuff.c ---- linux-4.1.26.orig/net/core/skbuff.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/net/core/skbuff.c 2016-06-19 15:30:58.839303211 +0200 +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 @@ -63,6 +63,7 @@ #include <linux/errqueue.h> #include <linux/prefetch.h> @@ -27962,7 +29331,7 @@ diff -Nur linux-4.1.26.orig/net/core/skbuff.c linux-4.1.26/net/core/skbuff.c #include <net/protocol.h> #include <net/dst.h> -@@ -358,6 +359,8 @@ +@@ -358,6 +359,8 @@ struct netdev_alloc_cache { }; static DEFINE_PER_CPU(struct netdev_alloc_cache, netdev_alloc_cache); static DEFINE_PER_CPU(struct netdev_alloc_cache, napi_alloc_cache); @@ -27971,7 +29340,7 @@ diff -Nur linux-4.1.26.orig/net/core/skbuff.c linux-4.1.26/net/core/skbuff.c static struct page *__page_frag_refill(struct netdev_alloc_cache *nc, gfp_t gfp_mask) -@@ -435,9 +438,9 @@ +@@ -435,9 +438,9 @@ static void *__netdev_alloc_frag(unsigned int fragsz, gfp_t gfp_mask) unsigned long flags; void *data; @@ -27983,7 +29352,7 @@ diff -Nur linux-4.1.26.orig/net/core/skbuff.c linux-4.1.26/net/core/skbuff.c return data; } -@@ -456,7 +459,12 @@ +@@ -456,7 +459,12 @@ EXPORT_SYMBOL(netdev_alloc_frag); static void *__napi_alloc_frag(unsigned int fragsz, gfp_t gfp_mask) { @@ -27997,10 +29366,11 @@ diff -Nur linux-4.1.26.orig/net/core/skbuff.c linux-4.1.26/net/core/skbuff.c } void *napi_alloc_frag(unsigned int fragsz) -diff -Nur linux-4.1.26.orig/net/core/sock.c linux-4.1.26/net/core/sock.c ---- linux-4.1.26.orig/net/core/sock.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/net/core/sock.c 2016-06-19 15:30:58.839303211 +0200 -@@ -2369,12 +2369,11 @@ +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) if (sk->sk_lock.owned) __lock_sock(sk); sk->sk_lock.owned = 1; @@ -28014,9 +29384,10 @@ diff -Nur linux-4.1.26.orig/net/core/sock.c linux-4.1.26/net/core/sock.c } EXPORT_SYMBOL(lock_sock_nested); -diff -Nur linux-4.1.26.orig/net/ipv4/icmp.c linux-4.1.26/net/ipv4/icmp.c ---- linux-4.1.26.orig/net/ipv4/icmp.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/net/ipv4/icmp.c 2016-06-19 15:30:58.839303211 +0200 +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 @@ -69,6 +69,7 @@ #include <linux/jiffies.h> #include <linux/kernel.h> @@ -28025,7 +29396,63 @@ diff -Nur linux-4.1.26.orig/net/ipv4/icmp.c linux-4.1.26/net/ipv4/icmp.c #include <linux/socket.h> #include <linux/in.h> #include <linux/inet.h> -@@ -867,6 +868,30 @@ +@@ -77,6 +78,7 @@ + #include <linux/string.h> + #include <linux/netfilter_ipv4.h> + #include <linux/slab.h> ++#include <linux/locallock.h> + #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]; + * + * On SMP we have one ICMP socket per-cpu. + */ ++static DEFINE_LOCAL_IRQ_LOCK(icmp_sk_lock); ++ + 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) + + local_bh_disable(); + ++ local_lock(icmp_sk_lock); + sk = icmp_sk(net); + + if (unlikely(!spin_trylock(&sk->sk_lock.slock))) { + /* This can happen if the output path signals a + * dst_link_failure() for an outgoing ICMP packet. + */ ++ local_unlock(icmp_sk_lock); + local_bh_enable(); + return NULL; + } +@@ -229,6 +235,7 @@ static inline struct sock *icmp_xmit_lock(struct net *net) + static inline void icmp_xmit_unlock(struct sock *sk) + { + spin_unlock_bh(&sk->sk_lock.slock); ++ local_unlock(icmp_sk_lock); + } + + int sysctl_icmp_msgs_per_sec __read_mostly = 1000; +@@ -356,6 +363,7 @@ static void icmp_push_reply(struct icmp_bxm *icmp_param, + struct sock *sk; + struct sk_buff *skb; + ++ local_lock(icmp_sk_lock); + 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, + skb->ip_summed = CHECKSUM_NONE; + ip_push_pending_frames(sk, fl4); + } ++ local_unlock(icmp_sk_lock); + } + + /* +@@ -867,6 +876,30 @@ static bool icmp_redirect(struct sk_buff *skb) } /* @@ -28056,7 +29483,7 @@ diff -Nur linux-4.1.26.orig/net/ipv4/icmp.c linux-4.1.26/net/ipv4/icmp.c * Handle ICMP_ECHO ("ping") requests. * * RFC 1122: 3.2.2.6 MUST have an echo server that answers ICMP echo -@@ -893,6 +918,11 @@ +@@ -893,6 +926,11 @@ static bool icmp_echo(struct sk_buff *skb) icmp_param.data_len = skb->len; icmp_param.head_len = sizeof(struct icmphdr); icmp_reply(&icmp_param, skb); @@ -28068,10 +29495,11 @@ diff -Nur linux-4.1.26.orig/net/ipv4/icmp.c linux-4.1.26/net/ipv4/icmp.c } /* should there be an ICMP stat for ignored echos? */ return true; -diff -Nur linux-4.1.26.orig/net/ipv4/sysctl_net_ipv4.c linux-4.1.26/net/ipv4/sysctl_net_ipv4.c ---- linux-4.1.26.orig/net/ipv4/sysctl_net_ipv4.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/net/ipv4/sysctl_net_ipv4.c 2016-06-19 15:30:58.839303211 +0200 -@@ -779,6 +779,13 @@ +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[] = { .proc_handler = proc_dointvec }, { @@ -28085,10 +29513,58 @@ diff -Nur linux-4.1.26.orig/net/ipv4/sysctl_net_ipv4.c linux-4.1.26/net/ipv4/sys .procname = "icmp_ignore_bogus_error_responses", .data = &init_net.ipv4.sysctl_icmp_ignore_bogus_error_responses, .maxlen = sizeof(int), -diff -Nur linux-4.1.26.orig/net/mac80211/rx.c linux-4.1.26/net/mac80211/rx.c ---- linux-4.1.26.orig/net/mac80211/rx.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/net/mac80211/rx.c 2016-06-19 15:30:58.839303211 +0200 -@@ -3573,7 +3573,7 @@ +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 +@@ -62,6 +62,7 @@ + #include <linux/init.h> + #include <linux/times.h> + #include <linux/slab.h> ++#include <linux/locallock.h> + + #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) + } + EXPORT_SYMBOL(tcp_v4_send_check); + ++static DEFINE_LOCAL_IRQ_LOCK(tcp_sk_lock); + /* + * 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) + arg.bound_dev_if = sk->sk_bound_dev_if; + + arg.tos = ip_hdr(skb)->tos; ++ ++ local_lock(tcp_sk_lock); + ip_send_unicast_reply(*this_cpu_ptr(net->ipv4.tcp_sk), + skb, &TCP_SKB_CB(skb)->header.h4.opt, + ip_hdr(skb)->saddr, ip_hdr(skb)->daddr, + &arg, arg.iov[0].iov_len); ++ local_unlock(tcp_sk_lock); + + 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, + if (oif) + arg.bound_dev_if = oif; + arg.tos = tos; ++ local_lock(tcp_sk_lock); + ip_send_unicast_reply(*this_cpu_ptr(net->ipv4.tcp_sk), + skb, &TCP_SKB_CB(skb)->header.h4.opt, + ip_hdr(skb)->saddr, ip_hdr(skb)->daddr, + &arg, arg.iov[0].iov_len); ++ local_unlock(tcp_sk_lock); + + 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) struct ieee80211_supported_band *sband; struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb); @@ -28097,9 +29573,10 @@ diff -Nur linux-4.1.26.orig/net/mac80211/rx.c linux-4.1.26/net/mac80211/rx.c if (WARN_ON(status->band >= IEEE80211_NUM_BANDS)) goto drop; -diff -Nur linux-4.1.26.orig/net/netfilter/core.c linux-4.1.26/net/netfilter/core.c ---- linux-4.1.26.orig/net/netfilter/core.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/net/netfilter/core.c 2016-06-19 15:30:58.839303211 +0200 +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 @@ -22,11 +22,17 @@ #include <linux/proc_fs.h> #include <linux/mutex.h> @@ -28118,9 +29595,10 @@ diff -Nur linux-4.1.26.orig/net/netfilter/core.c linux-4.1.26/net/netfilter/core static DEFINE_MUTEX(afinfo_mutex); const struct nf_afinfo __rcu *nf_afinfo[NFPROTO_NUMPROTO] __read_mostly; -diff -Nur linux-4.1.26.orig/net/packet/af_packet.c linux-4.1.26/net/packet/af_packet.c ---- linux-4.1.26.orig/net/packet/af_packet.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/net/packet/af_packet.c 2016-06-19 15:30:58.839303211 +0200 +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 @@ -63,6 +63,7 @@ #include <linux/if_packet.h> #include <linux/wireless.h> @@ -28129,7 +29607,7 @@ diff -Nur linux-4.1.26.orig/net/packet/af_packet.c linux-4.1.26/net/packet/af_pa #include <linux/kmod.h> #include <linux/slab.h> #include <linux/vmalloc.h> -@@ -698,7 +699,7 @@ +@@ -698,7 +699,7 @@ static void prb_retire_rx_blk_timer_expired(unsigned long data) if (BLOCK_NUM_PKTS(pbd)) { while (atomic_read(&pkc->blk_fill_in_prog)) { /* Waiting for skb_copy_bits to finish... */ @@ -28138,7 +29616,7 @@ diff -Nur linux-4.1.26.orig/net/packet/af_packet.c linux-4.1.26/net/packet/af_pa } } -@@ -960,7 +961,7 @@ +@@ -960,7 +961,7 @@ static void prb_retire_current_block(struct tpacket_kbdq_core *pkc, if (!(status & TP_STATUS_BLK_TMO)) { while (atomic_read(&pkc->blk_fill_in_prog)) { /* Waiting for skb_copy_bits to finish... */ @@ -28147,9 +29625,10 @@ diff -Nur linux-4.1.26.orig/net/packet/af_packet.c linux-4.1.26/net/packet/af_pa } } prb_close_block(pkc, pbd, po, status); -diff -Nur linux-4.1.26.orig/net/rds/ib_rdma.c linux-4.1.26/net/rds/ib_rdma.c ---- linux-4.1.26.orig/net/rds/ib_rdma.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/net/rds/ib_rdma.c 2016-06-19 15:30:58.843303365 +0200 +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 @@ -34,6 +34,7 @@ #include <linux/slab.h> #include <linux/rculist.h> @@ -28158,7 +29637,7 @@ diff -Nur linux-4.1.26.orig/net/rds/ib_rdma.c linux-4.1.26/net/rds/ib_rdma.c #include "rds.h" #include "ib.h" -@@ -286,7 +287,7 @@ +@@ -286,7 +287,7 @@ static inline void wait_clean_list_grace(void) for_each_online_cpu(cpu) { flag = &per_cpu(clean_list_grace, cpu); while (test_bit(CLEAN_LIST_BUSY_BIT, flag)) @@ -28167,10 +29646,11 @@ diff -Nur linux-4.1.26.orig/net/rds/ib_rdma.c linux-4.1.26/net/rds/ib_rdma.c } } -diff -Nur linux-4.1.26.orig/net/sched/sch_generic.c linux-4.1.26/net/sched/sch_generic.c ---- linux-4.1.26.orig/net/sched/sch_generic.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/net/sched/sch_generic.c 2016-06-19 15:30:58.843303365 +0200 -@@ -896,7 +896,7 @@ +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) /* Wait for outstanding qdisc_run calls. */ list_for_each_entry(dev, head, close_list) while (some_qdisc_is_busy(dev)) @@ -28179,10 +29659,11 @@ diff -Nur linux-4.1.26.orig/net/sched/sch_generic.c linux-4.1.26/net/sched/sch_g } void dev_deactivate(struct net_device *dev) -diff -Nur linux-4.1.26.orig/net/sunrpc/svc_xprt.c linux-4.1.26/net/sunrpc/svc_xprt.c ---- linux-4.1.26.orig/net/sunrpc/svc_xprt.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/net/sunrpc/svc_xprt.c 2016-06-19 15:30:58.843303365 +0200 -@@ -341,7 +341,7 @@ +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) goto out; } @@ -28191,7 +29672,7 @@ diff -Nur linux-4.1.26.orig/net/sunrpc/svc_xprt.c linux-4.1.26/net/sunrpc/svc_xp pool = svc_pool_for_cpu(xprt->xpt_server, cpu); atomic_long_inc(&pool->sp_stats.packets); -@@ -377,7 +377,7 @@ +@@ -377,7 +377,7 @@ redo_search: atomic_long_inc(&pool->sp_stats.threads_woken); wake_up_process(rqstp->rq_task); @@ -28200,7 +29681,7 @@ diff -Nur linux-4.1.26.orig/net/sunrpc/svc_xprt.c linux-4.1.26/net/sunrpc/svc_xp goto out; } rcu_read_unlock(); -@@ -398,7 +398,7 @@ +@@ -398,7 +398,7 @@ redo_search: goto redo_search; } rqstp = NULL; @@ -28209,10 +29690,11 @@ diff -Nur linux-4.1.26.orig/net/sunrpc/svc_xprt.c linux-4.1.26/net/sunrpc/svc_xp out: trace_svc_xprt_do_enqueue(xprt, rqstp); } -diff -Nur linux-4.1.26.orig/scripts/mkcompile_h linux-4.1.26/scripts/mkcompile_h ---- linux-4.1.26.orig/scripts/mkcompile_h 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/scripts/mkcompile_h 2016-06-19 15:30:58.843303365 +0200 -@@ -4,7 +4,8 @@ +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 ARCH=$2 SMP=$3 PREEMPT=$4 @@ -28222,7 +29704,7 @@ diff -Nur linux-4.1.26.orig/scripts/mkcompile_h linux-4.1.26/scripts/mkcompile_h vecho() { [ "${quiet}" = "silent_" ] || echo "$@" ; } -@@ -57,6 +58,7 @@ +@@ -57,6 +58,7 @@ UTS_VERSION="#$VERSION" CONFIG_FLAGS="" if [ -n "$SMP" ] ; then CONFIG_FLAGS="SMP"; fi if [ -n "$PREEMPT" ] ; then CONFIG_FLAGS="$CONFIG_FLAGS PREEMPT"; fi @@ -28230,10 +29712,11 @@ diff -Nur linux-4.1.26.orig/scripts/mkcompile_h linux-4.1.26/scripts/mkcompile_h UTS_VERSION="$UTS_VERSION $CONFIG_FLAGS $TIMESTAMP" # Truncate to maximum length -diff -Nur linux-4.1.26.orig/sound/core/pcm_native.c linux-4.1.26/sound/core/pcm_native.c ---- linux-4.1.26.orig/sound/core/pcm_native.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/sound/core/pcm_native.c 2016-06-19 15:30:58.843303365 +0200 -@@ -135,7 +135,7 @@ +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); void snd_pcm_stream_lock_irq(struct snd_pcm_substream *substream) { if (!substream->pcm->nonatomic) @@ -28242,7 +29725,7 @@ diff -Nur linux-4.1.26.orig/sound/core/pcm_native.c linux-4.1.26/sound/core/pcm_ snd_pcm_stream_lock(substream); } EXPORT_SYMBOL_GPL(snd_pcm_stream_lock_irq); -@@ -150,7 +150,7 @@ +@@ -150,7 +150,7 @@ void snd_pcm_stream_unlock_irq(struct snd_pcm_substream *substream) { snd_pcm_stream_unlock(substream); if (!substream->pcm->nonatomic) @@ -28251,7 +29734,7 @@ diff -Nur linux-4.1.26.orig/sound/core/pcm_native.c linux-4.1.26/sound/core/pcm_ } EXPORT_SYMBOL_GPL(snd_pcm_stream_unlock_irq); -@@ -158,7 +158,7 @@ +@@ -158,7 +158,7 @@ unsigned long _snd_pcm_stream_lock_irqsave(struct snd_pcm_substream *substream) { unsigned long flags = 0; if (!substream->pcm->nonatomic) @@ -28260,7 +29743,7 @@ diff -Nur linux-4.1.26.orig/sound/core/pcm_native.c linux-4.1.26/sound/core/pcm_ snd_pcm_stream_lock(substream); return flags; } -@@ -176,7 +176,7 @@ +@@ -176,7 +176,7 @@ void snd_pcm_stream_unlock_irqrestore(struct snd_pcm_substream *substream, { snd_pcm_stream_unlock(substream); if (!substream->pcm->nonatomic) @@ -28269,10 +29752,11 @@ diff -Nur linux-4.1.26.orig/sound/core/pcm_native.c linux-4.1.26/sound/core/pcm_ } EXPORT_SYMBOL_GPL(snd_pcm_stream_unlock_irqrestore); -diff -Nur linux-4.1.26.orig/sound/soc/intel/atom/sst/sst.c linux-4.1.26/sound/soc/intel/atom/sst/sst.c ---- linux-4.1.26.orig/sound/soc/intel/atom/sst/sst.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/sound/soc/intel/atom/sst/sst.c 2016-06-19 15:30:58.843303365 +0200 -@@ -368,8 +368,8 @@ +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, * initialize by FW or driver when firmware is loaded */ spin_lock_irqsave(&ctx->ipc_spin_lock, irq_flags); @@ -28283,10 +29767,11 @@ diff -Nur linux-4.1.26.orig/sound/soc/intel/atom/sst/sst.c linux-4.1.26/sound/so spin_unlock_irqrestore(&ctx->ipc_spin_lock, irq_flags); } -diff -Nur linux-4.1.26.orig/virt/kvm/async_pf.c linux-4.1.26/virt/kvm/async_pf.c ---- linux-4.1.26.orig/virt/kvm/async_pf.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/virt/kvm/async_pf.c 2016-06-19 15:30:58.843303365 +0200 -@@ -94,8 +94,8 @@ +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) trace_kvm_async_pf_completed(addr, gva); @@ -28297,10 +29782,11 @@ diff -Nur linux-4.1.26.orig/virt/kvm/async_pf.c linux-4.1.26/virt/kvm/async_pf.c mmput(mm); kvm_put_kvm(vcpu->kvm); -diff -Nur linux-4.1.26.orig/virt/kvm/kvm_main.c linux-4.1.26/virt/kvm/kvm_main.c ---- linux-4.1.26.orig/virt/kvm/kvm_main.c 2016-06-07 01:13:11.000000000 +0200 -+++ linux-4.1.26/virt/kvm/kvm_main.c 2016-06-19 15:30:58.843303365 +0200 -@@ -218,7 +218,7 @@ +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) vcpu->kvm = kvm; vcpu->vcpu_id = id; vcpu->pid = NULL; @@ -28309,7 +29795,7 @@ diff -Nur linux-4.1.26.orig/virt/kvm/kvm_main.c linux-4.1.26/virt/kvm/kvm_main.c kvm_async_pf_vcpu_init(vcpu); page = alloc_page(GFP_KERNEL | __GFP_ZERO); -@@ -1780,7 +1780,7 @@ +@@ -1782,7 +1782,7 @@ static int kvm_vcpu_check_block(struct kvm_vcpu *vcpu) void kvm_vcpu_block(struct kvm_vcpu *vcpu) { ktime_t start, cur; @@ -28318,7 +29804,7 @@ diff -Nur linux-4.1.26.orig/virt/kvm/kvm_main.c linux-4.1.26/virt/kvm/kvm_main.c bool waited = false; start = cur = ktime_get(); -@@ -1801,7 +1801,7 @@ +@@ -1803,7 +1803,7 @@ void kvm_vcpu_block(struct kvm_vcpu *vcpu) } for (;;) { @@ -28327,7 +29813,7 @@ diff -Nur linux-4.1.26.orig/virt/kvm/kvm_main.c linux-4.1.26/virt/kvm/kvm_main.c if (kvm_vcpu_check_block(vcpu) < 0) break; -@@ -1810,7 +1810,7 @@ +@@ -1812,7 +1812,7 @@ void kvm_vcpu_block(struct kvm_vcpu *vcpu) schedule(); } @@ -28336,7 +29822,7 @@ diff -Nur linux-4.1.26.orig/virt/kvm/kvm_main.c linux-4.1.26/virt/kvm/kvm_main.c cur = ktime_get(); out: -@@ -1826,11 +1826,11 @@ +@@ -1828,11 +1828,11 @@ void kvm_vcpu_kick(struct kvm_vcpu *vcpu) { int me; int cpu = vcpu->cpu; @@ -28351,7 +29837,7 @@ diff -Nur linux-4.1.26.orig/virt/kvm/kvm_main.c linux-4.1.26/virt/kvm/kvm_main.c ++vcpu->stat.halt_wakeup; } -@@ -1931,7 +1931,7 @@ +@@ -1933,7 +1933,7 @@ void kvm_vcpu_on_spin(struct kvm_vcpu *me) continue; if (vcpu == me) continue; |