diff options
| author | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2016-09-20 10:56:34 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2016-09-20 10:56:34 +0200 |
| commit | d1c6b7ba0d96804bed09fbc5fa999bc82369d692 (patch) | |
| tree | 39a98bcc6450e7bc0235d7d9d74fbd495ef9b11c /target/linux/patches/4.4.20/patch-realtime | |
| parent | 5be7462a7c53edc5174fd215a3532392d01853ad (diff) | |
linux-rt: refresh patch, reported by Oliver
Diffstat (limited to 'target/linux/patches/4.4.20/patch-realtime')
| -rw-r--r-- | target/linux/patches/4.4.20/patch-realtime | 7449 |
1 files changed, 3978 insertions, 3471 deletions
diff --git a/target/linux/patches/4.4.20/patch-realtime b/target/linux/patches/4.4.20/patch-realtime index c677e4098..f4cb92ae5 100644 --- a/target/linux/patches/4.4.20/patch-realtime +++ b/target/linux/patches/4.4.20/patch-realtime @@ -1,6 +1,371 @@ -diff -Nur linux-4.4.13.orig/arch/arm/include/asm/switch_to.h linux-4.4.13/arch/arm/include/asm/switch_to.h ---- linux-4.4.13.orig/arch/arm/include/asm/switch_to.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/arm/include/asm/switch_to.h 2016-06-22 21:55:07.966523867 +0200 + From: + https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/ + +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/kernel-parameters.txt b/Documentation/kernel-parameters.txt +index 0e4102ae1a61..26b5f39d57a8 100644 +--- a/Documentation/kernel-parameters.txt ++++ b/Documentation/kernel-parameters.txt +@@ -1629,6 +1629,15 @@ bytes respectively. Such letter suffixes can also be entirely omitted. + ip= [IP_PNP] + See Documentation/filesystems/nfs/nfsroot.txt. + ++ irqaffinity= [SMP] Set the default irq affinity mask ++ Format: ++ <cpu number>,...,<cpu number> ++ or ++ <cpu number>-<cpu number> ++ (must be a positive range in ascending order) ++ or a mixture ++ <cpu number>,...,<cpu number>-<cpu number> ++ + irqfixup [HW] + When an interrupt is not handled search all handlers + for it. Intended to get systems with badly broken +diff --git a/Documentation/sysrq.txt b/Documentation/sysrq.txt +index 13f5619b2203..f64d075ba647 100644 +--- a/Documentation/sysrq.txt ++++ b/Documentation/sysrq.txt +@@ -59,10 +59,17 @@ On PowerPC - Press 'ALT - Print Screen (or F13) - <command key>, + On other - If you know of the key combos for other architectures, please + let me know so I can add them to this section. + +-On all - write a character to /proc/sysrq-trigger. e.g.: +- ++On all - write a character to /proc/sysrq-trigger, e.g.: + echo t > /proc/sysrq-trigger + ++On all - Enable network SysRq by writing a cookie to icmp_echo_sysrq, e.g. ++ echo 0x01020304 >/proc/sys/net/ipv4/icmp_echo_sysrq ++ Send an ICMP echo request with this pattern plus the particular ++ SysRq command key. Example: ++ # ping -c1 -s57 -p0102030468 ++ will trigger the SysRq-H (help) command. ++ ++ + * What are the 'command' keys? + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + 'b' - Will immediately reboot the system without syncing or unmounting +diff --git a/Documentation/trace/histograms.txt b/Documentation/trace/histograms.txt +new file mode 100644 +index 000000000000..6f2aeabf7faa +--- /dev/null ++++ b/Documentation/trace/histograms.txt +@@ -0,0 +1,186 @@ ++ Using the Linux Kernel Latency Histograms ++ ++ ++This document gives a short explanation how to enable, configure and use ++latency histograms. Latency histograms are primarily relevant in the ++context of real-time enabled kernels (CONFIG_PREEMPT/CONFIG_PREEMPT_RT) ++and are used in the quality management of the Linux real-time ++capabilities. ++ ++ ++* Purpose of latency histograms ++ ++A latency histogram continuously accumulates the frequencies of latency ++data. There are two types of histograms ++- potential sources of latencies ++- effective latencies ++ ++ ++* Potential sources of latencies ++ ++Potential sources of latencies are code segments where interrupts, ++preemption or both are disabled (aka critical sections). To create ++histograms of potential sources of latency, the kernel stores the time ++stamp at the start of a critical section, determines the time elapsed ++when the end of the section is reached, and increments the frequency ++counter of that latency value - irrespective of whether any concurrently ++running process is affected by latency or not. ++- Configuration items (in the Kernel hacking/Tracers submenu) ++ CONFIG_INTERRUPT_OFF_LATENCY ++ CONFIG_PREEMPT_OFF_LATENCY ++ ++ ++* Effective latencies ++ ++Effective latencies are actually occuring during wakeup of a process. To ++determine effective latencies, the kernel stores the time stamp when a ++process is scheduled to be woken up, and determines the duration of the ++wakeup time shortly before control is passed over to this process. Note ++that the apparent latency in user space may be somewhat longer, since the ++process may be interrupted after control is passed over to it but before ++the execution in user space takes place. Simply measuring the interval ++between enqueuing and wakeup may also not appropriate in cases when a ++process is scheduled as a result of a timer expiration. The timer may have ++missed its deadline, e.g. due to disabled interrupts, but this latency ++would not be registered. Therefore, the offsets of missed timers are ++recorded in a separate histogram. If both wakeup latency and missed timer ++offsets are configured and enabled, a third histogram may be enabled that ++records the overall latency as a sum of the timer latency, if any, and the ++wakeup latency. This histogram is called "timerandwakeup". ++- Configuration items (in the Kernel hacking/Tracers submenu) ++ CONFIG_WAKEUP_LATENCY ++ CONFIG_MISSED_TIMER_OFSETS ++ ++ ++* Usage ++ ++The interface to the administration of the latency histograms is located ++in the debugfs file system. To mount it, either enter ++ ++mount -t sysfs nodev /sys ++mount -t debugfs nodev /sys/kernel/debug ++ ++from shell command line level, or add ++ ++nodev /sys sysfs defaults 0 0 ++nodev /sys/kernel/debug debugfs defaults 0 0 ++ ++to the file /etc/fstab. All latency histogram related files are then ++available in the directory /sys/kernel/debug/tracing/latency_hist. A ++particular histogram type is enabled by writing non-zero to the related ++variable in the /sys/kernel/debug/tracing/latency_hist/enable directory. ++Select "preemptirqsoff" for the histograms of potential sources of ++latencies and "wakeup" for histograms of effective latencies etc. The ++histogram data - one per CPU - are available in the files ++ ++/sys/kernel/debug/tracing/latency_hist/preemptoff/CPUx ++/sys/kernel/debug/tracing/latency_hist/irqsoff/CPUx ++/sys/kernel/debug/tracing/latency_hist/preemptirqsoff/CPUx ++/sys/kernel/debug/tracing/latency_hist/wakeup/CPUx ++/sys/kernel/debug/tracing/latency_hist/wakeup/sharedprio/CPUx ++/sys/kernel/debug/tracing/latency_hist/missed_timer_offsets/CPUx ++/sys/kernel/debug/tracing/latency_hist/timerandwakeup/CPUx ++ ++The histograms are reset by writing non-zero to the file "reset" in a ++particular latency directory. To reset all latency data, use ++ ++#!/bin/sh ++ ++TRACINGDIR=/sys/kernel/debug/tracing ++HISTDIR=$TRACINGDIR/latency_hist ++ ++if test -d $HISTDIR ++then ++ cd $HISTDIR ++ for i in `find . | grep /reset$` ++ do ++ echo 1 >$i ++ done ++fi ++ ++ ++* Data format ++ ++Latency data are stored with a resolution of one microsecond. The ++maximum latency is 10,240 microseconds. The data are only valid, if the ++overflow register is empty. Every output line contains the latency in ++microseconds in the first row and the number of samples in the second ++row. To display only lines with a positive latency count, use, for ++example, ++ ++grep -v " 0$" /sys/kernel/debug/tracing/latency_hist/preemptoff/CPU0 ++ ++#Minimum latency: 0 microseconds. ++#Average latency: 0 microseconds. ++#Maximum latency: 25 microseconds. ++#Total samples: 3104770694 ++#There are 0 samples greater or equal than 10240 microseconds ++#usecs samples ++ 0 2984486876 ++ 1 49843506 ++ 2 58219047 ++ 3 5348126 ++ 4 2187960 ++ 5 3388262 ++ 6 959289 ++ 7 208294 ++ 8 40420 ++ 9 4485 ++ 10 14918 ++ 11 18340 ++ 12 25052 ++ 13 19455 ++ 14 5602 ++ 15 969 ++ 16 47 ++ 17 18 ++ 18 14 ++ 19 1 ++ 20 3 ++ 21 2 ++ 22 5 ++ 23 2 ++ 25 1 ++ ++ ++* Wakeup latency of a selected process ++ ++To only collect wakeup latency data of a particular process, write the ++PID of the requested process to ++ ++/sys/kernel/debug/tracing/latency_hist/wakeup/pid ++ ++PIDs are not considered, if this variable is set to 0. ++ ++ ++* Details of the process with the highest wakeup latency so far ++ ++Selected data of the process that suffered from the highest wakeup ++latency that occurred in a particular CPU are available in the file ++ ++/sys/kernel/debug/tracing/latency_hist/wakeup/max_latency-CPUx. ++ ++In addition, other relevant system data at the time when the ++latency occurred are given. ++ ++The format of the data is (all in one line): ++<PID> <Priority> <Latency> (<Timeroffset>) <Command> \ ++<- <PID> <Priority> <Command> <Timestamp> ++ ++The value of <Timeroffset> is only relevant in the combined timer ++and wakeup latency recording. In the wakeup recording, it is ++always 0, in the missed_timer_offsets recording, it is the same ++as <Latency>. ++ ++When retrospectively searching for the origin of a latency and ++tracing was not enabled, it may be helpful to know the name and ++some basic data of the task that (finally) was switching to the ++late real-tlme task. In addition to the victim's data, also the ++data of the possible culprit are therefore displayed after the ++"<-" symbol. ++ ++Finally, the timestamp of the time when the latency occurred ++in <seconds>.<microseconds> after the most recent system boot ++is provided. ++ ++These data are also reset when the wakeup histogram is reset. +diff --git a/Makefile b/Makefile +index 695c64ec160c..45b60fceb84b 100644 +--- a/Makefile ++++ b/Makefile +@@ -768,6 +768,9 @@ KBUILD_CFLAGS += $(call cc-option,-Werror=strict-prototypes) + # Prohibit date/time macros, which would make the build non-deterministic + KBUILD_CFLAGS += $(call cc-option,-Werror=date-time) + ++# enforce correct pointer usage ++KBUILD_CFLAGS += $(call cc-option,-Werror=incompatible-pointer-types) ++ + # use the deterministic mode of AR if available + KBUILD_ARFLAGS := $(call ar-option,D) + +diff --git a/arch/Kconfig b/arch/Kconfig +index 4e949e58b192..3b26d76933fb 100644 +--- a/arch/Kconfig ++++ b/arch/Kconfig +@@ -9,6 +9,7 @@ config OPROFILE + tristate "OProfile system profiling" + depends on PROFILING + depends on HAVE_OPROFILE ++ depends on !PREEMPT_RT_FULL + select RING_BUFFER + select RING_BUFFER_ALLOW_SWAP + help +@@ -52,6 +53,7 @@ config KPROBES + config JUMP_LABEL + bool "Optimize very unlikely/likely branches" + depends on HAVE_ARCH_JUMP_LABEL ++ depends on (!INTERRUPT_OFF_HIST && !PREEMPT_OFF_HIST && !WAKEUP_LATENCY_HIST && !MISSED_TIMER_OFFSETS_HIST) + help + This option enables a transparent branch optimization that + makes certain almost-always-true or almost-always-false branch +diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig +index 34e1569a11ee..79c4603e9453 100644 +--- a/arch/arm/Kconfig ++++ b/arch/arm/Kconfig +@@ -33,7 +33,7 @@ config ARM + select HARDIRQS_SW_RESEND + select HAVE_ARCH_AUDITSYSCALL if (AEABI && !OABI_COMPAT) + select HAVE_ARCH_BITREVERSE if (CPU_32v7M || CPU_32v7) && !CPU_32v6 +- select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL && !CPU_ENDIAN_BE32 ++ select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL && !CPU_ENDIAN_BE32 && !PREEMPT_RT_BASE + select HAVE_ARCH_KGDB if !CPU_ENDIAN_BE32 + select HAVE_ARCH_SECCOMP_FILTER if (AEABI && !OABI_COMPAT) + select HAVE_ARCH_TRACEHOOK +@@ -68,6 +68,7 @@ config ARM + select HAVE_PERF_EVENTS + select HAVE_PERF_REGS + select HAVE_PERF_USER_STACK_DUMP ++ select HAVE_PREEMPT_LAZY + select HAVE_RCU_TABLE_FREE if (SMP && ARM_LPAE) + select HAVE_REGS_AND_STACK_ACCESS_API + select HAVE_SYSCALL_TRACEPOINTS +diff --git a/arch/arm/include/asm/switch_to.h b/arch/arm/include/asm/switch_to.h +index 12ebfcc1d539..c962084605bc 100644 +--- a/arch/arm/include/asm/switch_to.h ++++ b/arch/arm/include/asm/switch_to.h @@ -3,6 +3,13 @@ #include <linux/thread_info.h> @@ -15,7 +380,7 @@ diff -Nur linux-4.4.13.orig/arch/arm/include/asm/switch_to.h linux-4.4.13/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 -@@ -25,6 +32,7 @@ +@@ -25,6 +32,7 @@ extern struct task_struct *__switch_to(struct task_struct *, struct thread_info #define switch_to(prev,next,last) \ do { \ __complete_pending_tlbi(); \ @@ -23,10 +388,11 @@ diff -Nur linux-4.4.13.orig/arch/arm/include/asm/switch_to.h linux-4.4.13/arch/a last = __switch_to(prev,task_thread_info(prev), task_thread_info(next)); \ } while (0) -diff -Nur linux-4.4.13.orig/arch/arm/include/asm/thread_info.h linux-4.4.13/arch/arm/include/asm/thread_info.h ---- linux-4.4.13.orig/arch/arm/include/asm/thread_info.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/arm/include/asm/thread_info.h 2016-06-22 21:55:07.966523867 +0200 -@@ -49,6 +49,7 @@ +diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h +index 776757d1604a..1f36a4eccc72 100644 +--- a/arch/arm/include/asm/thread_info.h ++++ b/arch/arm/include/asm/thread_info.h +@@ -49,6 +49,7 @@ struct cpu_context_save { struct thread_info { unsigned long flags; /* low level flags */ int preempt_count; /* 0 => preemptable, <0 => bug */ @@ -34,7 +400,7 @@ diff -Nur linux-4.4.13.orig/arch/arm/include/asm/thread_info.h linux-4.4.13/arch mm_segment_t addr_limit; /* address limit */ struct task_struct *task; /* main task structure */ __u32 cpu; /* cpu */ -@@ -142,7 +143,8 @@ +@@ -142,7 +143,8 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *, #define TIF_SYSCALL_TRACE 4 /* syscall trace active */ #define TIF_SYSCALL_AUDIT 5 /* syscall auditing active */ #define TIF_SYSCALL_TRACEPOINT 6 /* syscall tracepoint instrumentation */ @@ -44,7 +410,7 @@ diff -Nur linux-4.4.13.orig/arch/arm/include/asm/thread_info.h linux-4.4.13/arch #define TIF_NOHZ 12 /* in adaptive nohz mode */ #define TIF_USING_IWMMXT 17 -@@ -152,6 +154,7 @@ +@@ -152,6 +154,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) @@ -52,7 +418,7 @@ diff -Nur linux-4.4.13.orig/arch/arm/include/asm/thread_info.h linux-4.4.13/arch #define _TIF_UPROBE (1 << TIF_UPROBE) #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE) #define _TIF_SYSCALL_AUDIT (1 << TIF_SYSCALL_AUDIT) -@@ -167,7 +170,8 @@ +@@ -167,7 +170,8 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *, * Change these and you break ASM code in entry-common.S */ #define _TIF_WORK_MASK (_TIF_NEED_RESCHED | _TIF_SIGPENDING | \ @@ -62,30 +428,11 @@ diff -Nur linux-4.4.13.orig/arch/arm/include/asm/thread_info.h linux-4.4.13/arch #endif /* __KERNEL__ */ #endif /* __ASM_ARM_THREAD_INFO_H */ -diff -Nur linux-4.4.13.orig/arch/arm/Kconfig linux-4.4.13/arch/arm/Kconfig ---- linux-4.4.13.orig/arch/arm/Kconfig 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/arm/Kconfig 2016-06-22 21:55:07.966523867 +0200 -@@ -33,7 +33,7 @@ - select HARDIRQS_SW_RESEND - select HAVE_ARCH_AUDITSYSCALL if (AEABI && !OABI_COMPAT) - select HAVE_ARCH_BITREVERSE if (CPU_32v7M || CPU_32v7) && !CPU_32v6 -- select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL && !CPU_ENDIAN_BE32 -+ select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL && !CPU_ENDIAN_BE32 && !PREEMPT_RT_BASE - select HAVE_ARCH_KGDB if !CPU_ENDIAN_BE32 - select HAVE_ARCH_SECCOMP_FILTER if (AEABI && !OABI_COMPAT) - select HAVE_ARCH_TRACEHOOK -@@ -68,6 +68,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.4.13.orig/arch/arm/kernel/asm-offsets.c linux-4.4.13/arch/arm/kernel/asm-offsets.c ---- linux-4.4.13.orig/arch/arm/kernel/asm-offsets.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/arm/kernel/asm-offsets.c 2016-06-22 21:55:07.970523867 +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)); @@ -93,10 +440,11 @@ diff -Nur linux-4.4.13.orig/arch/arm/kernel/asm-offsets.c linux-4.4.13/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.4.13.orig/arch/arm/kernel/entry-armv.S linux-4.4.13/arch/arm/kernel/entry-armv.S ---- linux-4.4.13.orig/arch/arm/kernel/entry-armv.S 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/arm/kernel/entry-armv.S 2016-06-22 21:55:07.970523867 +0200 -@@ -215,11 +215,18 @@ +diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S +index 3ce377f7251f..d044cea59f54 100644 +--- a/arch/arm/kernel/entry-armv.S ++++ b/arch/arm/kernel/entry-armv.S +@@ -215,11 +215,18 @@ __irq_svc: #ifdef CONFIG_PREEMPT get_thread_info tsk ldr r8, [tsk, #TI_PREEMPT] @ get preempt count @@ -117,7 +465,7 @@ diff -Nur linux-4.4.13.orig/arch/arm/kernel/entry-armv.S linux-4.4.13/arch/arm/k #endif svc_exit r5, irq = 1 @ return from exception -@@ -234,8 +241,14 @@ +@@ -234,8 +241,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 @@ -133,10 +481,11 @@ diff -Nur linux-4.4.13.orig/arch/arm/kernel/entry-armv.S linux-4.4.13/arch/arm/k #endif __und_fault: -diff -Nur linux-4.4.13.orig/arch/arm/kernel/entry-common.S linux-4.4.13/arch/arm/kernel/entry-common.S ---- linux-4.4.13.orig/arch/arm/kernel/entry-common.S 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/arm/kernel/entry-common.S 2016-06-22 21:55:07.970523867 +0200 -@@ -36,7 +36,9 @@ +diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S +index 30a7228eaceb..c3bd6cbfce4b 100644 +--- a/arch/arm/kernel/entry-common.S ++++ b/arch/arm/kernel/entry-common.S +@@ -36,7 +36,9 @@ ret_fast_syscall: UNWIND(.cantunwind ) disable_irq_notrace @ disable interrupts ldr r1, [tsk, #TI_FLAGS] @ re-check for syscall tracing @@ -147,7 +496,7 @@ diff -Nur linux-4.4.13.orig/arch/arm/kernel/entry-common.S linux-4.4.13/arch/arm bne fast_work_pending /* perform architecture specific actions before user return */ -@@ -62,8 +64,11 @@ +@@ -62,8 +64,11 @@ ret_fast_syscall: str r0, [sp, #S_R0 + S_OFF]! @ save returned r0 disable_irq_notrace @ disable interrupts ldr r1, [tsk, #TI_FLAGS] @ re-check for syscall tracing @@ -160,10 +509,11 @@ diff -Nur linux-4.4.13.orig/arch/arm/kernel/entry-common.S linux-4.4.13/arch/arm UNWIND(.fnend ) ENDPROC(ret_fast_syscall) -diff -Nur linux-4.4.13.orig/arch/arm/kernel/process.c linux-4.4.13/arch/arm/kernel/process.c ---- linux-4.4.13.orig/arch/arm/kernel/process.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/arm/kernel/process.c 2016-06-22 21:55:07.970523867 +0200 -@@ -319,6 +319,30 @@ +diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c +index 4adfb46e3ee9..15f1d94b47c5 100644 +--- a/arch/arm/kernel/process.c ++++ b/arch/arm/kernel/process.c +@@ -319,6 +319,30 @@ unsigned long arch_randomize_brk(struct mm_struct *mm) } #ifdef CONFIG_MMU @@ -194,10 +544,11 @@ diff -Nur linux-4.4.13.orig/arch/arm/kernel/process.c linux-4.4.13/arch/arm/kern #ifdef CONFIG_KUSER_HELPERS /* * The vectors page is always readable from user space for the -diff -Nur linux-4.4.13.orig/arch/arm/kernel/signal.c linux-4.4.13/arch/arm/kernel/signal.c ---- linux-4.4.13.orig/arch/arm/kernel/signal.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/arm/kernel/signal.c 2016-06-22 21:55:07.970523867 +0200 -@@ -572,7 +572,8 @@ +diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c +index 7b8f2141427b..96541e00b74a 100644 +--- a/arch/arm/kernel/signal.c ++++ b/arch/arm/kernel/signal.c +@@ -572,7 +572,8 @@ do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall) */ trace_hardirqs_off(); do { @@ -207,10 +558,11 @@ diff -Nur linux-4.4.13.orig/arch/arm/kernel/signal.c linux-4.4.13/arch/arm/kerne schedule(); } else { if (unlikely(!user_mode(regs))) -diff -Nur linux-4.4.13.orig/arch/arm/kernel/smp.c linux-4.4.13/arch/arm/kernel/smp.c ---- linux-4.4.13.orig/arch/arm/kernel/smp.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/arm/kernel/smp.c 2016-06-22 21:55:07.974523867 +0200 -@@ -230,8 +230,6 @@ +diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c +index b26361355dae..e5754e3b03c4 100644 +--- a/arch/arm/kernel/smp.c ++++ b/arch/arm/kernel/smp.c +@@ -230,8 +230,6 @@ int __cpu_disable(void) flush_cache_louis(); local_flush_tlb_all(); @@ -219,7 +571,7 @@ diff -Nur linux-4.4.13.orig/arch/arm/kernel/smp.c linux-4.4.13/arch/arm/kernel/s return 0; } -@@ -247,6 +245,9 @@ +@@ -247,6 +245,9 @@ void __cpu_die(unsigned int cpu) pr_err("CPU%u: cpu didn't die\n", cpu); return; } @@ -229,10 +581,11 @@ diff -Nur linux-4.4.13.orig/arch/arm/kernel/smp.c linux-4.4.13/arch/arm/kernel/s pr_notice("CPU%u: shutdown\n", cpu); /* -diff -Nur linux-4.4.13.orig/arch/arm/kernel/unwind.c linux-4.4.13/arch/arm/kernel/unwind.c ---- linux-4.4.13.orig/arch/arm/kernel/unwind.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/arm/kernel/unwind.c 2016-06-22 21:55:07.974523867 +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[]; @@ -241,7 +594,7 @@ diff -Nur linux-4.4.13.orig/arch/arm/kernel/unwind.c linux-4.4.13/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; @@ -250,7 +603,7 @@ diff -Nur linux-4.4.13.orig/arch/arm/kernel/unwind.c linux-4.4.13/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; } } @@ -259,7 +612,7 @@ diff -Nur linux-4.4.13.orig/arch/arm/kernel/unwind.c linux-4.4.13/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; @@ -271,7 +624,7 @@ diff -Nur linux-4.4.13.orig/arch/arm/kernel/unwind.c linux-4.4.13/arch/arm/kerne return tab; } -@@ -543,9 +543,9 @@ +@@ -543,9 +543,9 @@ void unwind_table_del(struct unwind_table *tab) if (!tab) return; @@ -283,10 +636,11 @@ diff -Nur linux-4.4.13.orig/arch/arm/kernel/unwind.c linux-4.4.13/arch/arm/kerne kfree(tab); } -diff -Nur linux-4.4.13.orig/arch/arm/kvm/arm.c linux-4.4.13/arch/arm/kvm/arm.c ---- linux-4.4.13.orig/arch/arm/kvm/arm.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/arm/kvm/arm.c 2016-06-22 21:55:07.974523867 +0200 -@@ -498,18 +498,18 @@ +diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c +index e06fd299de08..bb43bc396f06 100644 +--- a/arch/arm/kvm/arm.c ++++ b/arch/arm/kvm/arm.c +@@ -498,18 +498,18 @@ static void kvm_arm_resume_guest(struct kvm *kvm) struct kvm_vcpu *vcpu; kvm_for_each_vcpu(i, vcpu, kvm) { @@ -309,7 +663,7 @@ diff -Nur linux-4.4.13.orig/arch/arm/kvm/arm.c linux-4.4.13/arch/arm/kvm/arm.c (!vcpu->arch.pause))); } -@@ -568,7 +568,7 @@ +@@ -568,7 +568,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run) * involves poking the GIC, which must be done in a * non-preemptible context. */ @@ -318,7 +672,7 @@ diff -Nur linux-4.4.13.orig/arch/arm/kvm/arm.c linux-4.4.13/arch/arm/kvm/arm.c kvm_timer_flush_hwstate(vcpu); kvm_vgic_flush_hwstate(vcpu); -@@ -587,7 +587,7 @@ +@@ -587,7 +587,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run) local_irq_enable(); kvm_timer_sync_hwstate(vcpu); kvm_vgic_sync_hwstate(vcpu); @@ -327,7 +681,7 @@ diff -Nur linux-4.4.13.orig/arch/arm/kvm/arm.c linux-4.4.13/arch/arm/kvm/arm.c continue; } -@@ -641,7 +641,7 @@ +@@ -641,7 +641,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run) kvm_vgic_sync_hwstate(vcpu); @@ -336,10 +690,11 @@ diff -Nur linux-4.4.13.orig/arch/arm/kvm/arm.c linux-4.4.13/arch/arm/kvm/arm.c ret = handle_exit(vcpu, run, ret); } -diff -Nur linux-4.4.13.orig/arch/arm/kvm/psci.c linux-4.4.13/arch/arm/kvm/psci.c ---- linux-4.4.13.orig/arch/arm/kvm/psci.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/arm/kvm/psci.c 2016-06-22 21:55:07.974523867 +0200 -@@ -70,7 +70,7 @@ +diff --git a/arch/arm/kvm/psci.c b/arch/arm/kvm/psci.c +index a9b3b905e661..c2b131527a64 100644 +--- a/arch/arm/kvm/psci.c ++++ b/arch/arm/kvm/psci.c +@@ -70,7 +70,7 @@ static unsigned long kvm_psci_vcpu_on(struct kvm_vcpu *source_vcpu) { struct kvm *kvm = source_vcpu->kvm; struct kvm_vcpu *vcpu = NULL; @@ -348,7 +703,7 @@ diff -Nur linux-4.4.13.orig/arch/arm/kvm/psci.c linux-4.4.13/arch/arm/kvm/psci.c unsigned long cpu_id; unsigned long context_id; phys_addr_t target_pc; -@@ -119,7 +119,7 @@ +@@ -119,7 +119,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); @@ -357,9 +712,22 @@ diff -Nur linux-4.4.13.orig/arch/arm/kvm/psci.c linux-4.4.13/arch/arm/kvm/psci.c return PSCI_RET_SUCCESS; } -diff -Nur linux-4.4.13.orig/arch/arm/mach-at91/at91rm9200.c linux-4.4.13/arch/arm/mach-at91/at91rm9200.c ---- linux-4.4.13.orig/arch/arm/mach-at91/at91rm9200.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/arm/mach-at91/at91rm9200.c 2016-06-22 21:55:07.974523867 +0200 +diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig +index 28656c2b54a0..3f501305ca26 100644 +--- a/arch/arm/mach-at91/Kconfig ++++ b/arch/arm/mach-at91/Kconfig +@@ -99,6 +99,7 @@ config HAVE_AT91_USB_CLK + config COMMON_CLK_AT91 + bool + select COMMON_CLK ++ select MFD_SYSCON + + config HAVE_AT91_SMD + bool +diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c +index c1a7c6cc00e1..63b4fa25b48a 100644 +--- a/arch/arm/mach-at91/at91rm9200.c ++++ b/arch/arm/mach-at91/at91rm9200.c @@ -12,7 +12,6 @@ #include <linux/of_platform.h> @@ -368,7 +736,7 @@ diff -Nur linux-4.4.13.orig/arch/arm/mach-at91/at91rm9200.c linux-4.4.13/arch/ar #include "generic.h" #include "soc.h" -@@ -33,7 +32,6 @@ +@@ -33,7 +32,6 @@ static void __init at91rm9200_dt_device_init(void) of_platform_populate(NULL, of_default_bus_match_table, NULL, soc_dev); @@ -376,10 +744,11 @@ diff -Nur linux-4.4.13.orig/arch/arm/mach-at91/at91rm9200.c linux-4.4.13/arch/ar at91rm9200_pm_init(); } -diff -Nur linux-4.4.13.orig/arch/arm/mach-at91/at91sam9.c linux-4.4.13/arch/arm/mach-at91/at91sam9.c ---- linux-4.4.13.orig/arch/arm/mach-at91/at91sam9.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/arm/mach-at91/at91sam9.c 2016-06-22 21:55:07.974523867 +0200 -@@ -62,8 +62,6 @@ +diff --git a/arch/arm/mach-at91/at91sam9.c b/arch/arm/mach-at91/at91sam9.c +index 7eb64f763034..cada2a6412b3 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); @@ -388,9 +757,10 @@ diff -Nur linux-4.4.13.orig/arch/arm/mach-at91/at91sam9.c linux-4.4.13/arch/arm/ } static void __init at91sam9_dt_device_init(void) -diff -Nur linux-4.4.13.orig/arch/arm/mach-at91/generic.h linux-4.4.13/arch/arm/mach-at91/generic.h ---- linux-4.4.13.orig/arch/arm/mach-at91/generic.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/arm/mach-at91/generic.h 2016-06-22 21:55:07.974523867 +0200 +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 @@ -421,20 +791,10 @@ diff -Nur linux-4.4.13.orig/arch/arm/mach-at91/generic.h linux-4.4.13/arch/arm/m #endif #endif /* _AT91_GENERIC_H */ -diff -Nur linux-4.4.13.orig/arch/arm/mach-at91/Kconfig linux-4.4.13/arch/arm/mach-at91/Kconfig ---- linux-4.4.13.orig/arch/arm/mach-at91/Kconfig 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/arm/mach-at91/Kconfig 2016-06-22 21:55:07.974523867 +0200 -@@ -99,6 +99,7 @@ - config COMMON_CLK_AT91 - bool - select COMMON_CLK -+ select MFD_SYSCON - - config HAVE_AT91_SMD - bool -diff -Nur linux-4.4.13.orig/arch/arm/mach-at91/pm.c linux-4.4.13/arch/arm/mach-at91/pm.c ---- linux-4.4.13.orig/arch/arm/mach-at91/pm.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/arm/mach-at91/pm.c 2016-06-22 21:55:07.974523867 +0200 +diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c +index 23726fb31741..f06270198bf1 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> @@ -449,7 +809,7 @@ diff -Nur linux-4.4.13.orig/arch/arm/mach-at91/pm.c linux-4.4.13/arch/arm/mach-a /* * FIXME: this is needed to communicate between the pinctrl driver and * the PM implementation in the machine. Possibly part of the PM -@@ -87,7 +90,7 @@ +@@ -87,7 +90,7 @@ static int at91_pm_verify_clocks(void) unsigned long scsr; int i; @@ -458,7 +818,7 @@ diff -Nur linux-4.4.13.orig/arch/arm/mach-at91/pm.c linux-4.4.13/arch/arm/mach-a /* USB must not be using PLLB */ if ((scsr & at91_pm_data.uhp_udp_mask) != 0) { -@@ -101,8 +104,7 @@ +@@ -101,8 +104,7 @@ static int at91_pm_verify_clocks(void) if ((scsr & (AT91_PMC_PCK0 << i)) == 0) continue; @@ -468,7 +828,7 @@ diff -Nur linux-4.4.13.orig/arch/arm/mach-at91/pm.c linux-4.4.13/arch/arm/mach-a if (css != AT91_PMC_CSS_SLOW) { pr_err("AT91: PM - Suspend-to-RAM with PCK%d src %d\n", i, css); return 0; -@@ -145,8 +147,8 @@ +@@ -145,8 +147,8 @@ static void at91_pm_suspend(suspend_state_t state) flush_cache_all(); outer_disable(); @@ -479,7 +839,7 @@ diff -Nur linux-4.4.13.orig/arch/arm/mach-at91/pm.c linux-4.4.13/arch/arm/mach-a outer_resume(); } -@@ -353,6 +355,21 @@ +@@ -353,6 +355,21 @@ static __init void at91_dt_ramc(void) at91_pm_set_standby(standby); } @@ -501,7 +861,7 @@ diff -Nur linux-4.4.13.orig/arch/arm/mach-at91/pm.c linux-4.4.13/arch/arm/mach-a static void __init at91_pm_sram_init(void) { struct gen_pool *sram_pool; -@@ -399,13 +416,36 @@ +@@ -399,13 +416,36 @@ static void __init at91_pm_sram_init(void) &at91_pm_suspend_in_sram, at91_pm_suspend_in_sram_sz); } @@ -540,7 +900,7 @@ diff -Nur linux-4.4.13.orig/arch/arm/mach-at91/pm.c linux-4.4.13/arch/arm/mach-a if (at91_suspend_sram_fn) suspend_set_ops(&at91_pm_ops); else -@@ -424,7 +464,7 @@ +@@ -424,7 +464,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; @@ -549,7 +909,7 @@ diff -Nur linux-4.4.13.orig/arch/arm/mach-at91/pm.c linux-4.4.13/arch/arm/mach-a } void __init at91sam9260_pm_init(void) -@@ -432,7 +472,7 @@ +@@ -432,7 +472,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; @@ -558,7 +918,7 @@ diff -Nur linux-4.4.13.orig/arch/arm/mach-at91/pm.c linux-4.4.13/arch/arm/mach-a } void __init at91sam9g45_pm_init(void) -@@ -440,7 +480,7 @@ +@@ -440,7 +480,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; @@ -567,7 +927,7 @@ diff -Nur linux-4.4.13.orig/arch/arm/mach-at91/pm.c linux-4.4.13/arch/arm/mach-a } void __init at91sam9x5_pm_init(void) -@@ -448,5 +488,13 @@ +@@ -448,5 +488,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; @@ -582,10 +942,11 @@ diff -Nur linux-4.4.13.orig/arch/arm/mach-at91/pm.c linux-4.4.13/arch/arm/mach-a + at91_pm_data.memctrl = AT91_MEMCTRL_DDRSDR; + at91_pm_init(NULL); } -diff -Nur linux-4.4.13.orig/arch/arm/mach-at91/sama5.c linux-4.4.13/arch/arm/mach-at91/sama5.c ---- linux-4.4.13.orig/arch/arm/mach-at91/sama5.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/arm/mach-at91/sama5.c 2016-06-22 21:55:07.974523867 +0200 -@@ -51,7 +51,7 @@ +diff --git a/arch/arm/mach-at91/sama5.c b/arch/arm/mach-at91/sama5.c +index d9cf6799aec0..df8fdf1cf66d 100644 +--- a/arch/arm/mach-at91/sama5.c ++++ b/arch/arm/mach-at91/sama5.c +@@ -51,7 +51,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); @@ -594,10 +955,11 @@ diff -Nur linux-4.4.13.orig/arch/arm/mach-at91/sama5.c linux-4.4.13/arch/arm/mac } static const char *const sama5_dt_board_compat[] __initconst = { -diff -Nur linux-4.4.13.orig/arch/arm/mach-exynos/platsmp.c linux-4.4.13/arch/arm/mach-exynos/platsmp.c ---- linux-4.4.13.orig/arch/arm/mach-exynos/platsmp.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/arm/mach-exynos/platsmp.c 2016-06-22 21:55:07.974523867 +0200 -@@ -230,7 +230,7 @@ +diff --git a/arch/arm/mach-exynos/platsmp.c b/arch/arm/mach-exynos/platsmp.c +index 98a2c0cbb833..310dce500d3e 100644 +--- a/arch/arm/mach-exynos/platsmp.c ++++ b/arch/arm/mach-exynos/platsmp.c +@@ -230,7 +230,7 @@ static void __iomem *scu_base_addr(void) return (void __iomem *)(S5P_VA_SCU); } @@ -606,7 +968,7 @@ diff -Nur linux-4.4.13.orig/arch/arm/mach-exynos/platsmp.c linux-4.4.13/arch/arm static void exynos_secondary_init(unsigned int cpu) { -@@ -243,8 +243,8 @@ +@@ -243,8 +243,8 @@ static void exynos_secondary_init(unsigned int cpu) /* * Synchronise with the boot thread. */ @@ -617,7 +979,7 @@ diff -Nur linux-4.4.13.orig/arch/arm/mach-exynos/platsmp.c linux-4.4.13/arch/arm } int exynos_set_boot_addr(u32 core_id, unsigned long boot_addr) -@@ -308,7 +308,7 @@ +@@ -308,7 +308,7 @@ static int exynos_boot_secondary(unsigned int cpu, struct task_struct *idle) * Set synchronisation state between this boot processor * and the secondary one */ @@ -626,7 +988,7 @@ diff -Nur linux-4.4.13.orig/arch/arm/mach-exynos/platsmp.c linux-4.4.13/arch/arm /* * The secondary processor is waiting to be released from -@@ -335,7 +335,7 @@ +@@ -335,7 +335,7 @@ static int exynos_boot_secondary(unsigned int cpu, struct task_struct *idle) if (timeout == 0) { printk(KERN_ERR "cpu1 power enable failed"); @@ -635,7 +997,7 @@ diff -Nur linux-4.4.13.orig/arch/arm/mach-exynos/platsmp.c linux-4.4.13/arch/arm return -ETIMEDOUT; } } -@@ -381,7 +381,7 @@ +@@ -381,7 +381,7 @@ static int exynos_boot_secondary(unsigned int cpu, struct task_struct *idle) * calibrations, then wait for it to finish */ fail: @@ -644,9 +1006,10 @@ diff -Nur linux-4.4.13.orig/arch/arm/mach-exynos/platsmp.c linux-4.4.13/arch/arm return pen_release != -1 ? ret : 0; } -diff -Nur linux-4.4.13.orig/arch/arm/mach-hisi/platmcpm.c linux-4.4.13/arch/arm/mach-hisi/platmcpm.c ---- linux-4.4.13.orig/arch/arm/mach-hisi/platmcpm.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/arm/mach-hisi/platmcpm.c 2016-06-22 21:55:07.974523867 +0200 +diff --git a/arch/arm/mach-hisi/platmcpm.c b/arch/arm/mach-hisi/platmcpm.c +index b5f8f5ffda79..9753a84df9c4 100644 +--- a/arch/arm/mach-hisi/platmcpm.c ++++ b/arch/arm/mach-hisi/platmcpm.c @@ -61,7 +61,7 @@ static void __iomem *sysctrl, *fabric; @@ -656,7 +1019,7 @@ diff -Nur linux-4.4.13.orig/arch/arm/mach-hisi/platmcpm.c linux-4.4.13/arch/arm/ static u32 fabric_phys_addr; /* * [0]: bootwrapper physical address -@@ -113,7 +113,7 @@ +@@ -113,7 +113,7 @@ static int hip04_boot_secondary(unsigned int l_cpu, struct task_struct *idle) if (cluster >= HIP04_MAX_CLUSTERS || cpu >= HIP04_MAX_CPUS_PER_CLUSTER) return -EINVAL; @@ -665,7 +1028,7 @@ diff -Nur linux-4.4.13.orig/arch/arm/mach-hisi/platmcpm.c linux-4.4.13/arch/arm/ if (hip04_cpu_table[cluster][cpu]) goto out; -@@ -147,7 +147,7 @@ +@@ -147,7 +147,7 @@ static int hip04_boot_secondary(unsigned int l_cpu, struct task_struct *idle) out: hip04_cpu_table[cluster][cpu]++; @@ -674,7 +1037,7 @@ diff -Nur linux-4.4.13.orig/arch/arm/mach-hisi/platmcpm.c linux-4.4.13/arch/arm/ return 0; } -@@ -162,11 +162,11 @@ +@@ -162,11 +162,11 @@ static void hip04_cpu_die(unsigned int l_cpu) cpu = MPIDR_AFFINITY_LEVEL(mpidr, 0); cluster = MPIDR_AFFINITY_LEVEL(mpidr, 1); @@ -688,7 +1051,7 @@ diff -Nur linux-4.4.13.orig/arch/arm/mach-hisi/platmcpm.c linux-4.4.13/arch/arm/ return; } else if (hip04_cpu_table[cluster][cpu] > 1) { pr_err("Cluster %d CPU%d boots multiple times\n", cluster, cpu); -@@ -174,7 +174,7 @@ +@@ -174,7 +174,7 @@ static void hip04_cpu_die(unsigned int l_cpu) } last_man = hip04_cluster_is_down(cluster); @@ -697,7 +1060,7 @@ diff -Nur linux-4.4.13.orig/arch/arm/mach-hisi/platmcpm.c linux-4.4.13/arch/arm/ if (last_man) { /* Since it's Cortex A15, disable L2 prefetching. */ asm volatile( -@@ -203,7 +203,7 @@ +@@ -203,7 +203,7 @@ static int hip04_cpu_kill(unsigned int l_cpu) cpu >= HIP04_MAX_CPUS_PER_CLUSTER); count = TIMEOUT_MSEC / POLL_MSEC; @@ -706,7 +1069,7 @@ diff -Nur linux-4.4.13.orig/arch/arm/mach-hisi/platmcpm.c linux-4.4.13/arch/arm/ for (tries = 0; tries < count; tries++) { if (hip04_cpu_table[cluster][cpu]) goto err; -@@ -211,10 +211,10 @@ +@@ -211,10 +211,10 @@ static int hip04_cpu_kill(unsigned int l_cpu) data = readl_relaxed(sysctrl + SC_CPU_RESET_STATUS(cluster)); if (data & CORE_WFI_STATUS(cpu)) break; @@ -719,7 +1082,7 @@ diff -Nur linux-4.4.13.orig/arch/arm/mach-hisi/platmcpm.c linux-4.4.13/arch/arm/ } if (tries >= count) goto err; -@@ -231,10 +231,10 @@ +@@ -231,10 +231,10 @@ static int hip04_cpu_kill(unsigned int l_cpu) goto err; if (hip04_cluster_is_down(cluster)) hip04_set_snoop_filter(cluster, 0); @@ -732,10 +1095,11 @@ diff -Nur linux-4.4.13.orig/arch/arm/mach-hisi/platmcpm.c linux-4.4.13/arch/arm/ return 0; } #endif -diff -Nur linux-4.4.13.orig/arch/arm/mach-imx/Kconfig linux-4.4.13/arch/arm/mach-imx/Kconfig ---- linux-4.4.13.orig/arch/arm/mach-imx/Kconfig 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/arm/mach-imx/Kconfig 2016-06-22 21:55:07.974523867 +0200 -@@ -524,7 +524,7 @@ +diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig +index 8ceda2844c4f..08bcf8fb76f2 100644 +--- a/arch/arm/mach-imx/Kconfig ++++ b/arch/arm/mach-imx/Kconfig +@@ -524,7 +524,7 @@ config SOC_IMX6Q bool "i.MX6 Quad/DualLite support" select ARM_ERRATA_764369 if SMP select HAVE_ARM_SCU if SMP @@ -744,9 +1108,10 @@ diff -Nur linux-4.4.13.orig/arch/arm/mach-imx/Kconfig linux-4.4.13/arch/arm/mach select PCI_DOMAINS if PCI select PINCTRL_IMX6Q select SOC_IMX6 -diff -Nur linux-4.4.13.orig/arch/arm/mach-omap2/omap-smp.c linux-4.4.13/arch/arm/mach-omap2/omap-smp.c ---- linux-4.4.13.orig/arch/arm/mach-omap2/omap-smp.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/arm/mach-omap2/omap-smp.c 2016-06-22 21:55:07.974523867 +0200 +diff --git a/arch/arm/mach-omap2/omap-smp.c b/arch/arm/mach-omap2/omap-smp.c +index 79e1f876d1c9..7e625c17f78e 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; @@ -756,7 +1121,7 @@ diff -Nur linux-4.4.13.orig/arch/arm/mach-omap2/omap-smp.c linux-4.4.13/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. */ @@ -767,7 +1132,7 @@ diff -Nur linux-4.4.13.orig/arch/arm/mach-omap2/omap-smp.c linux-4.4.13/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 */ @@ -776,7 +1141,7 @@ diff -Nur linux-4.4.13.orig/arch/arm/mach-omap2/omap-smp.c linux-4.4.13/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 */ @@ -785,9 +1150,10 @@ diff -Nur linux-4.4.13.orig/arch/arm/mach-omap2/omap-smp.c linux-4.4.13/arch/arm return 0; } -diff -Nur linux-4.4.13.orig/arch/arm/mach-prima2/platsmp.c linux-4.4.13/arch/arm/mach-prima2/platsmp.c ---- linux-4.4.13.orig/arch/arm/mach-prima2/platsmp.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/arm/mach-prima2/platsmp.c 2016-06-22 21:55:07.974523867 +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; @@ -797,7 +1163,7 @@ diff -Nur linux-4.4.13.orig/arch/arm/mach-prima2/platsmp.c linux-4.4.13/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. */ @@ -808,7 +1174,7 @@ diff -Nur linux-4.4.13.orig/arch/arm/mach-prima2/platsmp.c linux-4.4.13/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(); @@ -817,7 +1183,7 @@ diff -Nur linux-4.4.13.orig/arch/arm/mach-prima2/platsmp.c linux-4.4.13/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 */ @@ -826,9 +1192,10 @@ diff -Nur linux-4.4.13.orig/arch/arm/mach-prima2/platsmp.c linux-4.4.13/arch/arm return pen_release != -1 ? -ENOSYS : 0; } -diff -Nur linux-4.4.13.orig/arch/arm/mach-qcom/platsmp.c linux-4.4.13/arch/arm/mach-qcom/platsmp.c ---- linux-4.4.13.orig/arch/arm/mach-qcom/platsmp.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/arm/mach-qcom/platsmp.c 2016-06-22 21:55:07.974523867 +0200 +diff --git a/arch/arm/mach-qcom/platsmp.c b/arch/arm/mach-qcom/platsmp.c +index 9b00123a315d..0a49fe1bc8cf 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); @@ -838,7 +1205,7 @@ diff -Nur linux-4.4.13.orig/arch/arm/mach-qcom/platsmp.c linux-4.4.13/arch/arm/m #ifdef CONFIG_HOTPLUG_CPU static void 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. */ @@ -849,7 +1216,7 @@ diff -Nur linux-4.4.13.orig/arch/arm/mach-qcom/platsmp.c linux-4.4.13/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 */ @@ -858,7 +1225,7 @@ diff -Nur linux-4.4.13.orig/arch/arm/mach-qcom/platsmp.c linux-4.4.13/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 */ @@ -867,10 +1234,11 @@ diff -Nur linux-4.4.13.orig/arch/arm/mach-qcom/platsmp.c linux-4.4.13/arch/arm/m return ret; } -diff -Nur linux-4.4.13.orig/arch/arm/mach-spear/platsmp.c linux-4.4.13/arch/arm/mach-spear/platsmp.c ---- linux-4.4.13.orig/arch/arm/mach-spear/platsmp.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/arm/mach-spear/platsmp.c 2016-06-22 21:55:07.974523867 +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); } @@ -879,7 +1247,7 @@ diff -Nur linux-4.4.13.orig/arch/arm/mach-spear/platsmp.c linux-4.4.13/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. */ @@ -890,7 +1258,7 @@ diff -Nur linux-4.4.13.orig/arch/arm/mach-spear/platsmp.c linux-4.4.13/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 */ @@ -899,7 +1267,7 @@ diff -Nur linux-4.4.13.orig/arch/arm/mach-spear/platsmp.c linux-4.4.13/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 */ @@ -908,10 +1276,11 @@ diff -Nur linux-4.4.13.orig/arch/arm/mach-spear/platsmp.c linux-4.4.13/arch/arm/ return pen_release != -1 ? -ENOSYS : 0; } -diff -Nur linux-4.4.13.orig/arch/arm/mach-sti/platsmp.c linux-4.4.13/arch/arm/mach-sti/platsmp.c ---- linux-4.4.13.orig/arch/arm/mach-sti/platsmp.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/arm/mach-sti/platsmp.c 2016-06-22 21:55:07.974523867 +0200 -@@ -35,7 +35,7 @@ +diff --git a/arch/arm/mach-sti/platsmp.c b/arch/arm/mach-sti/platsmp.c +index c4ad6eae67fa..e830b20b212f 100644 +--- a/arch/arm/mach-sti/platsmp.c ++++ b/arch/arm/mach-sti/platsmp.c +@@ -35,7 +35,7 @@ static void write_pen_release(int val) sync_cache_w(&pen_release); } @@ -920,7 +1289,7 @@ diff -Nur linux-4.4.13.orig/arch/arm/mach-sti/platsmp.c linux-4.4.13/arch/arm/ma static void sti_secondary_init(unsigned int cpu) { -@@ -48,8 +48,8 @@ +@@ -48,8 +48,8 @@ static void sti_secondary_init(unsigned int cpu) /* * Synchronise with the boot thread. */ @@ -931,7 +1300,7 @@ diff -Nur linux-4.4.13.orig/arch/arm/mach-sti/platsmp.c linux-4.4.13/arch/arm/ma } static int sti_boot_secondary(unsigned int cpu, struct task_struct *idle) -@@ -60,7 +60,7 @@ +@@ -60,7 +60,7 @@ static int sti_boot_secondary(unsigned int cpu, struct task_struct *idle) * set synchronisation state between this boot processor * and the secondary one */ @@ -940,7 +1309,7 @@ diff -Nur linux-4.4.13.orig/arch/arm/mach-sti/platsmp.c linux-4.4.13/arch/arm/ma /* * The secondary processor is waiting to be released from -@@ -91,7 +91,7 @@ +@@ -91,7 +91,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 */ @@ -949,10 +1318,11 @@ diff -Nur linux-4.4.13.orig/arch/arm/mach-sti/platsmp.c linux-4.4.13/arch/arm/ma return pen_release != -1 ? -ENOSYS : 0; } -diff -Nur linux-4.4.13.orig/arch/arm/mm/fault.c linux-4.4.13/arch/arm/mm/fault.c ---- linux-4.4.13.orig/arch/arm/mm/fault.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/arm/mm/fault.c 2016-06-22 21:55:07.974523867 +0200 -@@ -430,6 +430,9 @@ +diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c +index daafcf121ce0..b8aa1e9ee8ee 100644 +--- a/arch/arm/mm/fault.c ++++ b/arch/arm/mm/fault.c +@@ -430,6 +430,9 @@ do_translation_fault(unsigned long addr, unsigned int fsr, if (addr < TASK_SIZE) return do_page_fault(addr, fsr, regs); @@ -962,7 +1332,7 @@ diff -Nur linux-4.4.13.orig/arch/arm/mm/fault.c linux-4.4.13/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) { @@ -972,10 +1342,11 @@ diff -Nur linux-4.4.13.orig/arch/arm/mm/fault.c linux-4.4.13/arch/arm/mm/fault.c do_bad_area(addr, fsr, regs); return 0; } -diff -Nur linux-4.4.13.orig/arch/arm/mm/highmem.c linux-4.4.13/arch/arm/mm/highmem.c ---- linux-4.4.13.orig/arch/arm/mm/highmem.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/arm/mm/highmem.c 2016-06-22 21:55:07.974523867 +0200 -@@ -34,6 +34,11 @@ +diff --git a/arch/arm/mm/highmem.c b/arch/arm/mm/highmem.c +index d02f8187b1cc..542692dbd40a 100644 +--- a/arch/arm/mm/highmem.c ++++ b/arch/arm/mm/highmem.c +@@ -34,6 +34,11 @@ static inline pte_t get_fixmap_pte(unsigned long vaddr) return *ptep; } @@ -987,7 +1358,7 @@ diff -Nur linux-4.4.13.orig/arch/arm/mm/highmem.c linux-4.4.13/arch/arm/mm/highm void *kmap(struct page *page) { might_sleep(); -@@ -54,12 +59,13 @@ +@@ -54,12 +59,13 @@ EXPORT_SYMBOL(kunmap); void *kmap_atomic(struct page *page) { @@ -1002,7 +1373,7 @@ diff -Nur linux-4.4.13.orig/arch/arm/mm/highmem.c linux-4.4.13/arch/arm/mm/highm pagefault_disable(); if (!PageHighMem(page)) return page_address(page); -@@ -79,7 +85,7 @@ +@@ -79,7 +85,7 @@ void *kmap_atomic(struct page *page) type = kmap_atomic_idx_push(); @@ -1011,7 +1382,7 @@ diff -Nur linux-4.4.13.orig/arch/arm/mm/highmem.c linux-4.4.13/arch/arm/mm/highm vaddr = __fix_to_virt(idx); #ifdef CONFIG_DEBUG_HIGHMEM /* -@@ -93,7 +99,10 @@ +@@ -93,7 +99,10 @@ void *kmap_atomic(struct page *page) * in place, so the contained TLB flush ensures the TLB is updated * with the new mapping. */ @@ -1023,7 +1394,7 @@ diff -Nur linux-4.4.13.orig/arch/arm/mm/highmem.c linux-4.4.13/arch/arm/mm/highm return (void *)vaddr; } -@@ -106,44 +115,75 @@ +@@ -106,44 +115,75 @@ void __kunmap_atomic(void *kvaddr) if (kvaddr >= (void *)FIXADDR_START) { type = kmap_atomic_idx(); @@ -1105,10 +1476,11 @@ diff -Nur linux-4.4.13.orig/arch/arm/mm/highmem.c linux-4.4.13/arch/arm/mm/highm + } +} +#endif -diff -Nur linux-4.4.13.orig/arch/arm/plat-versatile/platsmp.c linux-4.4.13/arch/arm/plat-versatile/platsmp.c ---- linux-4.4.13.orig/arch/arm/plat-versatile/platsmp.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/arm/plat-versatile/platsmp.c 2016-06-22 21:55:07.974523867 +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); } @@ -1117,7 +1489,7 @@ diff -Nur linux-4.4.13.orig/arch/arm/plat-versatile/platsmp.c linux-4.4.13/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. */ @@ -1128,7 +1500,7 @@ diff -Nur linux-4.4.13.orig/arch/arm/plat-versatile/platsmp.c linux-4.4.13/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 */ @@ -1137,7 +1509,7 @@ diff -Nur linux-4.4.13.orig/arch/arm/plat-versatile/platsmp.c linux-4.4.13/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 */ @@ -1146,10 +1518,32 @@ diff -Nur linux-4.4.13.orig/arch/arm/plat-versatile/platsmp.c linux-4.4.13/arch/ return pen_release != -1 ? -ENOSYS : 0; } -diff -Nur linux-4.4.13.orig/arch/arm64/include/asm/thread_info.h linux-4.4.13/arch/arm64/include/asm/thread_info.h ---- linux-4.4.13.orig/arch/arm64/include/asm/thread_info.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/arm64/include/asm/thread_info.h 2016-06-22 21:55:07.974523867 +0200 -@@ -49,6 +49,7 @@ +diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig +index 871f21783866..1baa6537cf3f 100644 +--- a/arch/arm64/Kconfig ++++ b/arch/arm64/Kconfig +@@ -76,6 +76,7 @@ config ARM64 + select HAVE_PERF_REGS + select HAVE_PERF_USER_STACK_DUMP + select HAVE_RCU_TABLE_FREE ++ select HAVE_PREEMPT_LAZY + select HAVE_SYSCALL_TRACEPOINTS + select IOMMU_DMA if IOMMU_SUPPORT + select IRQ_DOMAIN +@@ -562,7 +563,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/thread_info.h b/arch/arm64/include/asm/thread_info.h +index 90c7ff233735..5f4e89fbc290 100644 +--- a/arch/arm64/include/asm/thread_info.h ++++ b/arch/arm64/include/asm/thread_info.h +@@ -49,6 +49,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 */ @@ -1157,7 +1551,7 @@ diff -Nur linux-4.4.13.orig/arch/arm64/include/asm/thread_info.h linux-4.4.13/ar int cpu; /* cpu */ }; -@@ -103,6 +104,7 @@ +@@ -103,6 +104,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 */ @@ -1165,7 +1559,7 @@ diff -Nur linux-4.4.13.orig/arch/arm64/include/asm/thread_info.h linux-4.4.13/ar #define TIF_NOHZ 7 #define TIF_SYSCALL_TRACE 8 #define TIF_SYSCALL_AUDIT 9 -@@ -118,6 +120,7 @@ +@@ -118,6 +120,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) @@ -1173,7 +1567,7 @@ diff -Nur linux-4.4.13.orig/arch/arm64/include/asm/thread_info.h linux-4.4.13/ar #define _TIF_NOHZ (1 << TIF_NOHZ) #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE) #define _TIF_SYSCALL_AUDIT (1 << TIF_SYSCALL_AUDIT) -@@ -126,7 +129,8 @@ +@@ -126,7 +129,8 @@ static inline struct thread_info *current_thread_info(void) #define _TIF_32BIT (1 << TIF_32BIT) #define _TIF_WORK_MASK (_TIF_NEED_RESCHED | _TIF_SIGPENDING | \ @@ -1183,30 +1577,11 @@ diff -Nur linux-4.4.13.orig/arch/arm64/include/asm/thread_info.h linux-4.4.13/ar #define _TIF_SYSCALL_WORK (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \ _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP | \ -diff -Nur linux-4.4.13.orig/arch/arm64/Kconfig linux-4.4.13/arch/arm64/Kconfig ---- linux-4.4.13.orig/arch/arm64/Kconfig 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/arm64/Kconfig 2016-06-22 21:55:07.974523867 +0200 -@@ -76,6 +76,7 @@ - select HAVE_PERF_REGS - select HAVE_PERF_USER_STACK_DUMP - select HAVE_RCU_TABLE_FREE -+ select HAVE_PREEMPT_LAZY - select HAVE_SYSCALL_TRACEPOINTS - select IOMMU_DMA if IOMMU_SUPPORT - select IRQ_DOMAIN -@@ -562,7 +563,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.4.13.orig/arch/arm64/kernel/asm-offsets.c linux-4.4.13/arch/arm64/kernel/asm-offsets.c ---- linux-4.4.13.orig/arch/arm64/kernel/asm-offsets.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/arm64/kernel/asm-offsets.c 2016-06-22 21:55:07.974523867 +0200 -@@ -35,6 +35,7 @@ +diff --git a/arch/arm64/kernel/asm-offsets.c b/arch/arm64/kernel/asm-offsets.c +index 087cf9a65359..d74475928399 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)); @@ -1214,10 +1589,11 @@ diff -Nur linux-4.4.13.orig/arch/arm64/kernel/asm-offsets.c linux-4.4.13/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.4.13.orig/arch/arm64/kernel/entry.S linux-4.4.13/arch/arm64/kernel/entry.S ---- linux-4.4.13.orig/arch/arm64/kernel/entry.S 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/arm64/kernel/entry.S 2016-06-22 21:55:07.978523867 +0200 -@@ -363,11 +363,16 @@ +diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S +index 5a3753d09e20..05d73c4c03f6 100644 +--- a/arch/arm64/kernel/entry.S ++++ b/arch/arm64/kernel/entry.S +@@ -376,11 +376,16 @@ el1_irq: #ifdef CONFIG_PREEMPT get_thread_info tsk ldr w24, [tsk, #TI_PREEMPT] // get preempt count @@ -1237,7 +1613,7 @@ diff -Nur linux-4.4.13.orig/arch/arm64/kernel/entry.S linux-4.4.13/arch/arm64/ke #endif #ifdef CONFIG_TRACE_IRQFLAGS bl trace_hardirqs_on -@@ -381,6 +386,7 @@ +@@ -394,6 +399,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? @@ -1245,7 +1621,7 @@ diff -Nur linux-4.4.13.orig/arch/arm64/kernel/entry.S linux-4.4.13/arch/arm64/ke ret x24 #endif -@@ -625,6 +631,7 @@ +@@ -638,6 +644,7 @@ ret_fast_syscall_trace: */ work_pending: tbnz x1, #TIF_NEED_RESCHED, work_resched @@ -1253,29 +1629,11 @@ diff -Nur linux-4.4.13.orig/arch/arm64/kernel/entry.S linux-4.4.13/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.4.13.orig/arch/Kconfig linux-4.4.13/arch/Kconfig ---- linux-4.4.13.orig/arch/Kconfig 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/Kconfig 2016-06-22 21:55:07.978523867 +0200 -@@ -9,6 +9,7 @@ - tristate "OProfile system profiling" - depends on PROFILING - depends on HAVE_OPROFILE -+ depends on !PREEMPT_RT_FULL - select RING_BUFFER - select RING_BUFFER_ALLOW_SWAP - help -@@ -52,6 +53,7 @@ - config JUMP_LABEL - bool "Optimize very unlikely/likely branches" - depends on HAVE_ARCH_JUMP_LABEL -+ depends on (!INTERRUPT_OFF_HIST && !PREEMPT_OFF_HIST && !WAKEUP_LATENCY_HIST && !MISSED_TIMER_OFFSETS_HIST) - help - This option enables a transparent branch optimization that - makes certain almost-always-true or almost-always-false branch -diff -Nur linux-4.4.13.orig/arch/mips/Kconfig linux-4.4.13/arch/mips/Kconfig ---- linux-4.4.13.orig/arch/mips/Kconfig 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/mips/Kconfig 2016-06-22 21:55:07.978523867 +0200 -@@ -2410,7 +2410,7 @@ +diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig +index db459612de44..bd8be6a0e745 100644 +--- a/arch/mips/Kconfig ++++ b/arch/mips/Kconfig +@@ -2410,7 +2410,7 @@ config CPU_R4400_WORKAROUNDS # config HIGHMEM bool "High Memory Support" @@ -1284,10 +1642,11 @@ diff -Nur linux-4.4.13.orig/arch/mips/Kconfig linux-4.4.13/arch/mips/Kconfig config CPU_SUPPORTS_HIGHMEM bool -diff -Nur linux-4.4.13.orig/arch/mips/kvm/mips.c linux-4.4.13/arch/mips/kvm/mips.c ---- linux-4.4.13.orig/arch/mips/kvm/mips.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/mips/kvm/mips.c 2016-06-22 21:55:07.978523867 +0200 -@@ -445,8 +445,8 @@ +diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c +index e86b7499921a..b2a2f678c5dc 100644 +--- a/arch/mips/kvm/mips.c ++++ b/arch/mips/kvm/mips.c +@@ -454,8 +454,8 @@ int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu, dvcpu->arch.wait = 0; @@ -1298,7 +1657,7 @@ diff -Nur linux-4.4.13.orig/arch/mips/kvm/mips.c linux-4.4.13/arch/mips/kvm/mips return 0; } -@@ -1174,8 +1174,8 @@ +@@ -1183,8 +1183,8 @@ static void kvm_mips_comparecount_func(unsigned long data) kvm_mips_callbacks->queue_timer_int(vcpu); vcpu->arch.wait = 0; @@ -1309,10 +1668,45 @@ diff -Nur linux-4.4.13.orig/arch/mips/kvm/mips.c linux-4.4.13/arch/mips/kvm/mips } /* low level hrtimer wake routine */ -diff -Nur linux-4.4.13.orig/arch/powerpc/include/asm/kvm_host.h linux-4.4.13/arch/powerpc/include/asm/kvm_host.h ---- linux-4.4.13.orig/arch/powerpc/include/asm/kvm_host.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/powerpc/include/asm/kvm_host.h 2016-06-22 21:55:07.978523867 +0200 -@@ -286,7 +286,7 @@ +diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig +index db49e0d796b1..1d2be228661c 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 +@@ -141,6 +142,7 @@ config PPC + select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST + select GENERIC_STRNCPY_FROM_USER + select GENERIC_STRNLEN_USER ++ select HAVE_PREEMPT_LAZY + select HAVE_MOD_ARCH_SPECIFIC + select MODULES_USE_ELF_RELA + select CLONE_BACKWARDS +@@ -319,7 +321,7 @@ menu "Kernel options" + + config HIGHMEM + bool "High memory support" +- depends on PPC32 ++ depends on PPC32 && !PREEMPT_RT_FULL + + source kernel/Kconfig.hz + source kernel/Kconfig.preempt +diff --git a/arch/powerpc/include/asm/kvm_host.h b/arch/powerpc/include/asm/kvm_host.h +index cfa758c6b4f6..f8673ff84b31 100644 +--- a/arch/powerpc/include/asm/kvm_host.h ++++ b/arch/powerpc/include/asm/kvm_host.h +@@ -286,7 +286,7 @@ struct kvmppc_vcore { struct list_head runnable_threads; struct list_head preempt_list; spinlock_t lock; @@ -1321,7 +1715,7 @@ diff -Nur linux-4.4.13.orig/arch/powerpc/include/asm/kvm_host.h linux-4.4.13/arc spinlock_t stoltb_lock; /* protects stolen_tb and preempt_tb */ u64 stolen_tb; u64 preempt_tb; -@@ -626,7 +626,7 @@ +@@ -626,7 +626,7 @@ struct kvm_vcpu_arch { u8 prodded; u32 last_inst; @@ -1330,10 +1724,11 @@ diff -Nur linux-4.4.13.orig/arch/powerpc/include/asm/kvm_host.h linux-4.4.13/arc struct kvmppc_vcore *vcore; int ret; int trap; -diff -Nur linux-4.4.13.orig/arch/powerpc/include/asm/thread_info.h linux-4.4.13/arch/powerpc/include/asm/thread_info.h ---- linux-4.4.13.orig/arch/powerpc/include/asm/thread_info.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/powerpc/include/asm/thread_info.h 2016-06-22 21:55:07.978523867 +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 */ @@ -1342,7 +1737,7 @@ diff -Nur linux-4.4.13.orig/arch/powerpc/include/asm/thread_info.h linux-4.4.13/ 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 */ @@ -1352,7 +1747,7 @@ diff -Nur linux-4.4.13.orig/arch/powerpc/include/asm/thread_info.h linux-4.4.13/ #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 @@ -1361,7 +1756,7 @@ diff -Nur linux-4.4.13.orig/arch/powerpc/include/asm/thread_info.h linux-4.4.13/ /* 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) @@ -1379,43 +1774,11 @@ diff -Nur linux-4.4.13.orig/arch/powerpc/include/asm/thread_info.h linux-4.4.13/ /* Bits in local_flags */ /* Don't move TLF_NAPPING without adjusting the code in entry_32.S */ -diff -Nur linux-4.4.13.orig/arch/powerpc/Kconfig linux-4.4.13/arch/powerpc/Kconfig ---- linux-4.4.13.orig/arch/powerpc/Kconfig 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/powerpc/Kconfig 2016-06-22 21:55:07.978523867 +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 -@@ -141,6 +142,7 @@ - select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST - select GENERIC_STRNCPY_FROM_USER - select GENERIC_STRNLEN_USER -+ select HAVE_PREEMPT_LAZY - select HAVE_MOD_ARCH_SPECIFIC - select MODULES_USE_ELF_RELA - select CLONE_BACKWARDS -@@ -319,7 +321,7 @@ - - config HIGHMEM - bool "High memory support" -- depends on PPC32 -+ depends on PPC32 && !PREEMPT_RT_FULL - - source kernel/Kconfig.hz - source kernel/Kconfig.preempt -diff -Nur linux-4.4.13.orig/arch/powerpc/kernel/asm-offsets.c linux-4.4.13/arch/powerpc/kernel/asm-offsets.c ---- linux-4.4.13.orig/arch/powerpc/kernel/asm-offsets.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/powerpc/kernel/asm-offsets.c 2016-06-22 21:55:07.978523867 +0200 -@@ -160,6 +160,7 @@ +diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c +index 221d584d089f..d6d0c59ef8ae 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)); @@ -1423,10 +1786,11 @@ diff -Nur linux-4.4.13.orig/arch/powerpc/kernel/asm-offsets.c linux-4.4.13/arch/ DEFINE(TI_TASK, offsetof(struct thread_info, task)); DEFINE(TI_CPU, offsetof(struct thread_info, cpu)); -diff -Nur linux-4.4.13.orig/arch/powerpc/kernel/entry_32.S linux-4.4.13/arch/powerpc/kernel/entry_32.S ---- linux-4.4.13.orig/arch/powerpc/kernel/entry_32.S 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/powerpc/kernel/entry_32.S 2016-06-22 21:55:07.978523867 +0200 -@@ -818,7 +818,14 @@ +diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S +index 2405631e91a2..c21b4b42eaa0 100644 +--- a/arch/powerpc/kernel/entry_32.S ++++ b/arch/powerpc/kernel/entry_32.S +@@ -818,7 +818,14 @@ resume_kernel: cmpwi 0,r0,0 /* if non-zero, just restore regs and return */ bne restore andi. r8,r8,_TIF_NEED_RESCHED @@ -1441,7 +1805,7 @@ diff -Nur linux-4.4.13.orig/arch/powerpc/kernel/entry_32.S linux-4.4.13/arch/pow lwz r3,_MSR(r1) andi. r0,r3,MSR_EE /* interrupts off? */ beq restore /* don't schedule if so */ -@@ -829,11 +836,11 @@ +@@ -829,11 +836,11 @@ resume_kernel: */ bl trace_hardirqs_off #endif @@ -1456,7 +1820,7 @@ diff -Nur linux-4.4.13.orig/arch/powerpc/kernel/entry_32.S linux-4.4.13/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 -@@ -1154,7 +1161,7 @@ +@@ -1154,7 +1161,7 @@ global_dbcr0: #endif /* !(CONFIG_4xx || CONFIG_BOOKE) */ do_work: /* r10 contains MSR_KERNEL here */ @@ -1465,7 +1829,7 @@ diff -Nur linux-4.4.13.orig/arch/powerpc/kernel/entry_32.S linux-4.4.13/arch/pow beq do_user_signal do_resched: /* r10 contains MSR_KERNEL here */ -@@ -1175,7 +1182,7 @@ +@@ -1175,7 +1182,7 @@ recheck: MTMSRD(r10) /* disable interrupts */ CURRENT_THREAD_INFO(r9, r1) lwz r9,TI_FLAGS(r9) @@ -1474,10 +1838,11 @@ diff -Nur linux-4.4.13.orig/arch/powerpc/kernel/entry_32.S linux-4.4.13/arch/pow bne- do_resched andi. r0,r9,_TIF_USER_WORK_MASK beq restore_user -diff -Nur linux-4.4.13.orig/arch/powerpc/kernel/entry_64.S linux-4.4.13/arch/powerpc/kernel/entry_64.S ---- linux-4.4.13.orig/arch/powerpc/kernel/entry_64.S 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/powerpc/kernel/entry_64.S 2016-06-22 21:55:07.978523867 +0200 -@@ -683,7 +683,7 @@ +diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S +index a94f155db78e..5bb3148e592b 100644 +--- a/arch/powerpc/kernel/entry_64.S ++++ b/arch/powerpc/kernel/entry_64.S +@@ -683,7 +683,7 @@ _GLOBAL(ret_from_except_lite) #else beq restore #endif @@ -1486,7 +1851,7 @@ diff -Nur linux-4.4.13.orig/arch/powerpc/kernel/entry_64.S linux-4.4.13/arch/pow beq 2f bl restore_interrupts SCHEDULE_USER -@@ -745,10 +745,18 @@ +@@ -745,10 +745,18 @@ resume_kernel: #ifdef CONFIG_PREEMPT /* Check if we need to preempt */ @@ -1506,7 +1871,7 @@ diff -Nur linux-4.4.13.orig/arch/powerpc/kernel/entry_64.S linux-4.4.13/arch/pow cmpwi cr1,r8,0 ld r0,SOFTE(r1) cmpdi r0,0 -@@ -765,7 +773,7 @@ +@@ -765,7 +773,7 @@ resume_kernel: /* Re-test flags and eventually loop */ CURRENT_THREAD_INFO(r9, r1) ld r4,TI_FLAGS(r9) @@ -1515,10 +1880,11 @@ diff -Nur linux-4.4.13.orig/arch/powerpc/kernel/entry_64.S linux-4.4.13/arch/pow bne 1b /* -diff -Nur linux-4.4.13.orig/arch/powerpc/kernel/irq.c linux-4.4.13/arch/powerpc/kernel/irq.c ---- linux-4.4.13.orig/arch/powerpc/kernel/irq.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/powerpc/kernel/irq.c 2016-06-22 21:55:07.978523867 +0200 -@@ -614,6 +614,7 @@ +diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c +index 290559df1e8b..070afa6da35d 100644 +--- a/arch/powerpc/kernel/irq.c ++++ b/arch/powerpc/kernel/irq.c +@@ -614,6 +614,7 @@ void irq_ctx_init(void) } } @@ -1526,7 +1892,7 @@ diff -Nur linux-4.4.13.orig/arch/powerpc/kernel/irq.c linux-4.4.13/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); } @@ -1534,9 +1900,10 @@ diff -Nur linux-4.4.13.orig/arch/powerpc/kernel/irq.c linux-4.4.13/arch/powerpc/ irq_hw_number_t virq_to_hw(unsigned int virq) { -diff -Nur linux-4.4.13.orig/arch/powerpc/kernel/misc_32.S linux-4.4.13/arch/powerpc/kernel/misc_32.S ---- linux-4.4.13.orig/arch/powerpc/kernel/misc_32.S 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/powerpc/kernel/misc_32.S 2016-06-22 21:55:07.978523867 +0200 +diff --git a/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S +index ed3ab509faca..8b261416c070 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 @@ -1545,7 +1912,7 @@ diff -Nur linux-4.4.13.orig/arch/powerpc/kernel/misc_32.S linux-4.4.13/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 @@ -1553,9 +1920,10 @@ diff -Nur linux-4.4.13.orig/arch/powerpc/kernel/misc_32.S linux-4.4.13/arch/powe /* * void call_do_irq(struct pt_regs *regs, struct thread_info *irqtp); -diff -Nur linux-4.4.13.orig/arch/powerpc/kernel/misc_64.S linux-4.4.13/arch/powerpc/kernel/misc_64.S ---- linux-4.4.13.orig/arch/powerpc/kernel/misc_64.S 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/powerpc/kernel/misc_64.S 2016-06-22 21:55:07.978523867 +0200 +diff --git a/arch/powerpc/kernel/misc_64.S b/arch/powerpc/kernel/misc_64.S +index db475d41b57a..96b7ef80e05d 100644 +--- a/arch/powerpc/kernel/misc_64.S ++++ b/arch/powerpc/kernel/misc_64.S @@ -30,6 +30,7 @@ .text @@ -1564,7 +1932,7 @@ diff -Nur linux-4.4.13.orig/arch/powerpc/kernel/misc_64.S linux-4.4.13/arch/powe _GLOBAL(call_do_softirq) mflr r0 std r0,16(r1) -@@ -40,6 +41,7 @@ +@@ -40,6 +41,7 @@ _GLOBAL(call_do_softirq) ld r0,16(r1) mtlr r0 blr @@ -1572,10 +1940,23 @@ diff -Nur linux-4.4.13.orig/arch/powerpc/kernel/misc_64.S linux-4.4.13/arch/powe _GLOBAL(call_do_irq) mflr r0 -diff -Nur linux-4.4.13.orig/arch/powerpc/kvm/book3s_hv.c linux-4.4.13/arch/powerpc/kvm/book3s_hv.c ---- linux-4.4.13.orig/arch/powerpc/kvm/book3s_hv.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/powerpc/kvm/book3s_hv.c 2016-06-22 21:55:07.978523867 +0200 -@@ -114,11 +114,11 @@ +diff --git a/arch/powerpc/kvm/Kconfig b/arch/powerpc/kvm/Kconfig +index c2024ac9d4e8..2303788da7e1 100644 +--- a/arch/powerpc/kvm/Kconfig ++++ b/arch/powerpc/kvm/Kconfig +@@ -172,6 +172,7 @@ config KVM_E500MC + 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 a7352b59e6f9..df34a6432873 100644 +--- a/arch/powerpc/kvm/book3s_hv.c ++++ b/arch/powerpc/kvm/book3s_hv.c +@@ -114,11 +114,11 @@ static bool kvmppc_ipi_thread(int cpu) static void kvmppc_fast_vcpu_kick_hv(struct kvm_vcpu *vcpu) { int cpu; @@ -1590,7 +1971,7 @@ diff -Nur linux-4.4.13.orig/arch/powerpc/kvm/book3s_hv.c linux-4.4.13/arch/power ++vcpu->stat.halt_wakeup; } -@@ -707,8 +707,8 @@ +@@ -707,8 +707,8 @@ int kvmppc_pseries_do_hcall(struct kvm_vcpu *vcpu) tvcpu->arch.prodded = 1; smp_mb(); if (vcpu->arch.ceded) { @@ -1601,7 +1982,7 @@ diff -Nur linux-4.4.13.orig/arch/powerpc/kvm/book3s_hv.c linux-4.4.13/arch/power vcpu->stat.halt_wakeup++; } } -@@ -1447,7 +1447,7 @@ +@@ -1447,7 +1447,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); @@ -1610,7 +1991,7 @@ diff -Nur linux-4.4.13.orig/arch/powerpc/kvm/book3s_hv.c linux-4.4.13/arch/power vcore->preempt_tb = TB_NIL; vcore->lpcr = kvm->arch.lpcr; vcore->first_vcpuid = core * threads_per_subcore; -@@ -2519,10 +2519,9 @@ +@@ -2519,10 +2519,9 @@ static void kvmppc_vcore_blocked(struct kvmppc_vcore *vc) { struct kvm_vcpu *vcpu; int do_sleep = 1; @@ -1623,7 +2004,7 @@ diff -Nur linux-4.4.13.orig/arch/powerpc/kvm/book3s_hv.c linux-4.4.13/arch/power /* * Check one last time for pending exceptions and ceded state after -@@ -2536,7 +2535,7 @@ +@@ -2536,7 +2535,7 @@ static void kvmppc_vcore_blocked(struct kvmppc_vcore *vc) } if (!do_sleep) { @@ -1632,7 +2013,7 @@ diff -Nur linux-4.4.13.orig/arch/powerpc/kvm/book3s_hv.c linux-4.4.13/arch/power return; } -@@ -2544,7 +2543,7 @@ +@@ -2544,7 +2543,7 @@ static void kvmppc_vcore_blocked(struct kvmppc_vcore *vc) trace_kvmppc_vcore_blocked(vc, 0); spin_unlock(&vc->lock); schedule(); @@ -1641,7 +2022,7 @@ diff -Nur linux-4.4.13.orig/arch/powerpc/kvm/book3s_hv.c linux-4.4.13/arch/power spin_lock(&vc->lock); vc->vcore_state = VCORE_INACTIVE; trace_kvmppc_vcore_blocked(vc, 1); -@@ -2600,7 +2599,7 @@ +@@ -2600,7 +2599,7 @@ static int kvmppc_run_vcpu(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu) kvmppc_start_thread(vcpu, vc); trace_kvm_guest_enter(vcpu); } else if (vc->vcore_state == VCORE_SLEEPING) { @@ -1650,21 +2031,11 @@ diff -Nur linux-4.4.13.orig/arch/powerpc/kvm/book3s_hv.c linux-4.4.13/arch/power } } -diff -Nur linux-4.4.13.orig/arch/powerpc/kvm/Kconfig linux-4.4.13/arch/powerpc/kvm/Kconfig ---- linux-4.4.13.orig/arch/powerpc/kvm/Kconfig 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/powerpc/kvm/Kconfig 2016-06-22 21:55:07.978523867 +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.4.13.orig/arch/powerpc/platforms/ps3/device-init.c linux-4.4.13/arch/powerpc/platforms/ps3/device-init.c ---- linux-4.4.13.orig/arch/powerpc/platforms/ps3/device-init.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/powerpc/platforms/ps3/device-init.c 2016-06-22 21:55:07.982523867 +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); @@ -1673,10 +2044,11 @@ diff -Nur linux-4.4.13.orig/arch/powerpc/platforms/ps3/device-init.c linux-4.4.1 dev->done.done || kthread_should_stop()); if (kthread_should_stop()) res = -EINTR; -diff -Nur linux-4.4.13.orig/arch/s390/include/asm/kvm_host.h linux-4.4.13/arch/s390/include/asm/kvm_host.h ---- linux-4.4.13.orig/arch/s390/include/asm/kvm_host.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/s390/include/asm/kvm_host.h 2016-06-22 21:55:07.982523867 +0200 -@@ -427,7 +427,7 @@ +diff --git a/arch/s390/include/asm/kvm_host.h b/arch/s390/include/asm/kvm_host.h +index e9a983f40a24..bbdc539fb3c6 100644 +--- a/arch/s390/include/asm/kvm_host.h ++++ b/arch/s390/include/asm/kvm_host.h +@@ -427,7 +427,7 @@ struct kvm_s390_irq_payload { struct kvm_s390_local_interrupt { spinlock_t lock; struct kvm_s390_float_interrupt *float_int; @@ -1685,10 +2057,11 @@ diff -Nur linux-4.4.13.orig/arch/s390/include/asm/kvm_host.h linux-4.4.13/arch/s atomic_t *cpuflags; DECLARE_BITMAP(sigp_emerg_pending, KVM_MAX_VCPUS); struct kvm_s390_irq_payload irq; -diff -Nur linux-4.4.13.orig/arch/s390/kvm/interrupt.c linux-4.4.13/arch/s390/kvm/interrupt.c ---- linux-4.4.13.orig/arch/s390/kvm/interrupt.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/s390/kvm/interrupt.c 2016-06-22 21:55:07.982523867 +0200 -@@ -868,13 +868,13 @@ +diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c +index 6a75352f453c..cc862c486002 100644 +--- a/arch/s390/kvm/interrupt.c ++++ b/arch/s390/kvm/interrupt.c +@@ -868,13 +868,13 @@ no_timer: void kvm_s390_vcpu_wakeup(struct kvm_vcpu *vcpu) { @@ -1704,10 +2077,11 @@ diff -Nur linux-4.4.13.orig/arch/s390/kvm/interrupt.c linux-4.4.13/arch/s390/kvm vcpu->stat.halt_wakeup++; } } -diff -Nur linux-4.4.13.orig/arch/sh/kernel/irq.c linux-4.4.13/arch/sh/kernel/irq.c ---- linux-4.4.13.orig/arch/sh/kernel/irq.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/sh/kernel/irq.c 2016-06-22 21:55:07.982523867 +0200 -@@ -147,6 +147,7 @@ +diff --git a/arch/sh/kernel/irq.c b/arch/sh/kernel/irq.c +index 6c0378c0b8b5..abd58b4dff97 100644 +--- a/arch/sh/kernel/irq.c ++++ b/arch/sh/kernel/irq.c +@@ -147,6 +147,7 @@ void irq_ctx_exit(int cpu) hardirq_ctx[cpu] = NULL; } @@ -1715,7 +2089,7 @@ diff -Nur linux-4.4.13.orig/arch/sh/kernel/irq.c linux-4.4.13/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" ); } @@ -1723,10 +2097,11 @@ diff -Nur linux-4.4.13.orig/arch/sh/kernel/irq.c linux-4.4.13/arch/sh/kernel/irq #else static inline void handle_one_irq(unsigned int irq) { -diff -Nur linux-4.4.13.orig/arch/sparc/Kconfig linux-4.4.13/arch/sparc/Kconfig ---- linux-4.4.13.orig/arch/sparc/Kconfig 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/sparc/Kconfig 2016-06-22 21:55:07.982523867 +0200 -@@ -189,12 +189,10 @@ +diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig +index 56442d2d7bbc..8c9598f534c9 100644 +--- a/arch/sparc/Kconfig ++++ b/arch/sparc/Kconfig +@@ -189,12 +189,10 @@ config NR_CPUS source kernel/Kconfig.hz config RWSEM_GENERIC_SPINLOCK @@ -1741,10 +2116,11 @@ diff -Nur linux-4.4.13.orig/arch/sparc/Kconfig linux-4.4.13/arch/sparc/Kconfig config GENERIC_HWEIGHT bool -diff -Nur linux-4.4.13.orig/arch/sparc/kernel/irq_64.c linux-4.4.13/arch/sparc/kernel/irq_64.c ---- linux-4.4.13.orig/arch/sparc/kernel/irq_64.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/sparc/kernel/irq_64.c 2016-06-22 21:55:07.982523867 +0200 -@@ -854,6 +854,7 @@ +diff --git a/arch/sparc/kernel/irq_64.c b/arch/sparc/kernel/irq_64.c +index e22416ce56ea..d359de71153a 100644 +--- a/arch/sparc/kernel/irq_64.c ++++ b/arch/sparc/kernel/irq_64.c +@@ -854,6 +854,7 @@ void __irq_entry handler_irq(int pil, struct pt_regs *regs) set_irq_regs(old_regs); } @@ -1752,7 +2128,7 @@ diff -Nur linux-4.4.13.orig/arch/sparc/kernel/irq_64.c linux-4.4.13/arch/sparc/k void do_softirq_own_stack(void) { void *orig_sp, *sp = softirq_stack[smp_processor_id()]; -@@ -868,6 +869,7 @@ +@@ -868,6 +869,7 @@ void do_softirq_own_stack(void) __asm__ __volatile__("mov %0, %%sp" : : "r" (orig_sp)); } @@ -1760,10 +2136,45 @@ diff -Nur linux-4.4.13.orig/arch/sparc/kernel/irq_64.c linux-4.4.13/arch/sparc/k #ifdef CONFIG_HOTPLUG_CPU void fixup_irqs(void) -diff -Nur linux-4.4.13.orig/arch/x86/crypto/aesni-intel_glue.c linux-4.4.13/arch/x86/crypto/aesni-intel_glue.c ---- linux-4.4.13.orig/arch/x86/crypto/aesni-intel_glue.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/x86/crypto/aesni-intel_glue.c 2016-06-22 21:55:07.982523867 +0200 -@@ -383,14 +383,14 @@ +diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig +index 436639a31624..6ee1dd0deadc 100644 +--- a/arch/x86/Kconfig ++++ b/arch/x86/Kconfig +@@ -17,6 +17,7 @@ config X86_64 + ### Arch settings + config X86 + def_bool y ++ select HAVE_PREEMPT_LAZY + select ACPI_LEGACY_TABLES_LOOKUP if ACPI + select ACPI_SYSTEM_POWER_STATES_SUPPORT if ACPI + select ANON_INODES +@@ -212,8 +213,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 +@@ -848,7 +852,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 3633ad6145c5..c6d5458ee7f9 100644 +--- a/arch/x86/crypto/aesni-intel_glue.c ++++ b/arch/x86/crypto/aesni-intel_glue.c +@@ -383,14 +383,14 @@ static int ecb_encrypt(struct blkcipher_desc *desc, err = blkcipher_walk_virt(desc, &walk); desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP; @@ -1781,7 +2192,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/crypto/aesni-intel_glue.c linux-4.4.13/arch return err; } -@@ -407,14 +407,14 @@ +@@ -407,14 +407,14 @@ static int ecb_decrypt(struct blkcipher_desc *desc, err = blkcipher_walk_virt(desc, &walk); desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP; @@ -1798,7 +2209,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/crypto/aesni-intel_glue.c linux-4.4.13/arch return err; } -@@ -431,14 +431,14 @@ +@@ -431,14 +431,14 @@ static int cbc_encrypt(struct blkcipher_desc *desc, err = blkcipher_walk_virt(desc, &walk); desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP; @@ -1815,7 +2226,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/crypto/aesni-intel_glue.c linux-4.4.13/arch return err; } -@@ -455,14 +455,14 @@ +@@ -455,14 +455,14 @@ static int cbc_decrypt(struct blkcipher_desc *desc, err = blkcipher_walk_virt(desc, &walk); desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP; @@ -1832,7 +2243,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/crypto/aesni-intel_glue.c linux-4.4.13/arch return err; } -@@ -514,18 +514,20 @@ +@@ -514,18 +514,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; @@ -1855,10 +2266,11 @@ diff -Nur linux-4.4.13.orig/arch/x86/crypto/aesni-intel_glue.c linux-4.4.13/arch return err; } -diff -Nur linux-4.4.13.orig/arch/x86/crypto/cast5_avx_glue.c linux-4.4.13/arch/x86/crypto/cast5_avx_glue.c ---- linux-4.4.13.orig/arch/x86/crypto/cast5_avx_glue.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/x86/crypto/cast5_avx_glue.c 2016-06-22 21:55:07.982523867 +0200 -@@ -59,7 +59,7 @@ +diff --git a/arch/x86/crypto/cast5_avx_glue.c b/arch/x86/crypto/cast5_avx_glue.c +index 8648158f3916..d7699130ee36 100644 +--- a/arch/x86/crypto/cast5_avx_glue.c ++++ b/arch/x86/crypto/cast5_avx_glue.c +@@ -59,7 +59,7 @@ static inline void cast5_fpu_end(bool fpu_enabled) static int ecb_crypt(struct blkcipher_desc *desc, struct blkcipher_walk *walk, bool enc) { @@ -1867,7 +2279,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/crypto/cast5_avx_glue.c linux-4.4.13/arch/x struct cast5_ctx *ctx = crypto_blkcipher_ctx(desc->tfm); const unsigned int bsize = CAST5_BLOCK_SIZE; unsigned int nbytes; -@@ -75,7 +75,7 @@ +@@ -75,7 +75,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; @@ -1876,7 +2288,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/crypto/cast5_avx_glue.c linux-4.4.13/arch/x /* Process multi-block batch */ if (nbytes >= bsize * CAST5_PARALLEL_BLOCKS) { -@@ -103,10 +103,9 @@ +@@ -103,10 +103,9 @@ static int ecb_crypt(struct blkcipher_desc *desc, struct blkcipher_walk *walk, } while (nbytes >= bsize); done: @@ -1888,7 +2300,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/crypto/cast5_avx_glue.c linux-4.4.13/arch/x return err; } -@@ -227,7 +226,7 @@ +@@ -227,7 +226,7 @@ done: static int cbc_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst, struct scatterlist *src, unsigned int nbytes) { @@ -1897,7 +2309,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/crypto/cast5_avx_glue.c linux-4.4.13/arch/x struct blkcipher_walk walk; int err; -@@ -236,12 +235,11 @@ +@@ -236,12 +235,11 @@ static int cbc_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst, desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP; while ((nbytes = walk.nbytes)) { @@ -1912,7 +2324,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/crypto/cast5_avx_glue.c linux-4.4.13/arch/x return err; } -@@ -311,7 +309,7 @@ +@@ -311,7 +309,7 @@ done: static int ctr_crypt(struct blkcipher_desc *desc, struct scatterlist *dst, struct scatterlist *src, unsigned int nbytes) { @@ -1921,7 +2333,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/crypto/cast5_avx_glue.c linux-4.4.13/arch/x struct blkcipher_walk walk; int err; -@@ -320,13 +318,12 @@ +@@ -320,13 +318,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) { @@ -1937,10 +2349,11 @@ diff -Nur linux-4.4.13.orig/arch/x86/crypto/cast5_avx_glue.c linux-4.4.13/arch/x if (walk.nbytes) { ctr_crypt_final(desc, &walk); err = blkcipher_walk_done(desc, &walk, 0); -diff -Nur linux-4.4.13.orig/arch/x86/crypto/glue_helper.c linux-4.4.13/arch/x86/crypto/glue_helper.c ---- linux-4.4.13.orig/arch/x86/crypto/glue_helper.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/x86/crypto/glue_helper.c 2016-06-22 21:55:07.982523867 +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; @@ -1949,7 +2362,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/crypto/glue_helper.c linux-4.4.13/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, @@ -1958,7 +2371,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/crypto/glue_helper.c linux-4.4.13/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: @@ -1970,7 +2383,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/crypto/glue_helper.c linux-4.4.13/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; @@ -1979,7 +2392,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/crypto/glue_helper.c linux-4.4.13/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, @@ -1994,7 +2407,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/crypto/glue_helper.c linux-4.4.13/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; @@ -2003,7 +2416,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/crypto/glue_helper.c linux-4.4.13/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, @@ -2019,7 +2432,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/crypto/glue_helper.c linux-4.4.13/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; @@ -2028,7 +2441,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/crypto/glue_helper.c linux-4.4.13/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, @@ -2055,10 +2468,11 @@ diff -Nur linux-4.4.13.orig/arch/x86/crypto/glue_helper.c linux-4.4.13/arch/x86/ return err; } EXPORT_SYMBOL_GPL(glue_xts_crypt_128bit); -diff -Nur linux-4.4.13.orig/arch/x86/entry/common.c linux-4.4.13/arch/x86/entry/common.c ---- linux-4.4.13.orig/arch/x86/entry/common.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/x86/entry/common.c 2016-06-22 21:55:07.982523867 +0200 -@@ -220,7 +220,7 @@ +diff --git a/arch/x86/entry/common.c b/arch/x86/entry/common.c +index 1a4477cedc49..75a301b6a5b6 100644 +--- a/arch/x86/entry/common.c ++++ b/arch/x86/entry/common.c +@@ -220,7 +220,7 @@ long syscall_trace_enter(struct pt_regs *regs) #define EXIT_TO_USERMODE_LOOP_FLAGS \ (_TIF_SIGPENDING | _TIF_NOTIFY_RESUME | _TIF_UPROBE | \ @@ -2067,7 +2481,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/entry/common.c linux-4.4.13/arch/x86/entry/ static void exit_to_usermode_loop(struct pt_regs *regs, u32 cached_flags) { -@@ -236,9 +236,16 @@ +@@ -236,9 +236,16 @@ static void exit_to_usermode_loop(struct pt_regs *regs, u32 cached_flags) /* We have work to do. */ local_irq_enable(); @@ -2085,10 +2499,11 @@ diff -Nur linux-4.4.13.orig/arch/x86/entry/common.c linux-4.4.13/arch/x86/entry/ if (cached_flags & _TIF_UPROBE) uprobe_notify_resume(regs); -diff -Nur linux-4.4.13.orig/arch/x86/entry/entry_32.S linux-4.4.13/arch/x86/entry/entry_32.S ---- linux-4.4.13.orig/arch/x86/entry/entry_32.S 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/x86/entry/entry_32.S 2016-06-22 21:55:07.982523867 +0200 -@@ -278,8 +278,24 @@ +diff --git a/arch/x86/entry/entry_32.S b/arch/x86/entry/entry_32.S +index f3b6d54e0042..2d722ee01fc2 100644 +--- a/arch/x86/entry/entry_32.S ++++ b/arch/x86/entry/entry_32.S +@@ -278,8 +278,24 @@ END(ret_from_exception) ENTRY(resume_kernel) DISABLE_INTERRUPTS(CLBR_ANY) need_resched: @@ -2113,10 +2528,11 @@ diff -Nur linux-4.4.13.orig/arch/x86/entry/entry_32.S linux-4.4.13/arch/x86/entr testl $X86_EFLAGS_IF, PT_EFLAGS(%esp) # interrupts off (exception path) ? jz restore_all call preempt_schedule_irq -diff -Nur linux-4.4.13.orig/arch/x86/entry/entry_64.S linux-4.4.13/arch/x86/entry/entry_64.S ---- linux-4.4.13.orig/arch/x86/entry/entry_64.S 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/x86/entry/entry_64.S 2016-06-22 21:55:07.982523867 +0200 -@@ -579,7 +579,23 @@ +diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S +index a55697d19824..316081a2ca85 100644 +--- a/arch/x86/entry/entry_64.S ++++ b/arch/x86/entry/entry_64.S +@@ -579,7 +579,23 @@ retint_kernel: bt $9, EFLAGS(%rsp) /* were interrupts off? */ jnc 1f 0: cmpl $0, PER_CPU_VAR(__preempt_count) @@ -2140,7 +2556,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/entry/entry_64.S linux-4.4.13/arch/x86/entr call preempt_schedule_irq jmp 0b 1: -@@ -867,6 +883,7 @@ +@@ -867,6 +883,7 @@ bad_gs: jmp 2b .previous @@ -2148,7 +2564,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/entry/entry_64.S linux-4.4.13/arch/x86/entr /* Call softirq on interrupt stack. Interrupts are off. */ ENTRY(do_softirq_own_stack) pushq %rbp -@@ -879,6 +896,7 @@ +@@ -879,6 +896,7 @@ ENTRY(do_softirq_own_stack) decl PER_CPU_VAR(irq_count) ret END(do_softirq_own_stack) @@ -2156,10 +2572,11 @@ diff -Nur linux-4.4.13.orig/arch/x86/entry/entry_64.S linux-4.4.13/arch/x86/entr #ifdef CONFIG_XEN idtentry xen_hypervisor_callback xen_do_hypervisor_callback has_error_code=0 -diff -Nur linux-4.4.13.orig/arch/x86/include/asm/preempt.h linux-4.4.13/arch/x86/include/asm/preempt.h ---- linux-4.4.13.orig/arch/x86/include/asm/preempt.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/x86/include/asm/preempt.h 2016-06-22 21:55:07.982523867 +0200 -@@ -79,17 +79,33 @@ +diff --git a/arch/x86/include/asm/preempt.h b/arch/x86/include/asm/preempt.h +index 01bcde84d3e4..5dbd2d0f91e0 100644 +--- a/arch/x86/include/asm/preempt.h ++++ b/arch/x86/include/asm/preempt.h +@@ -79,17 +79,33 @@ static __always_inline void __preempt_count_sub(int val) * a decrement which hits zero means we have no preempt_count and should * reschedule. */ @@ -2194,10 +2611,11 @@ diff -Nur linux-4.4.13.orig/arch/x86/include/asm/preempt.h linux-4.4.13/arch/x86 } #ifdef CONFIG_PREEMPT -diff -Nur linux-4.4.13.orig/arch/x86/include/asm/signal.h linux-4.4.13/arch/x86/include/asm/signal.h ---- linux-4.4.13.orig/arch/x86/include/asm/signal.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/x86/include/asm/signal.h 2016-06-22 21:55:07.982523867 +0200 -@@ -23,6 +23,19 @@ +diff --git a/arch/x86/include/asm/signal.h b/arch/x86/include/asm/signal.h +index 2138c9ae19ee..3f5b4ee2e2c1 100644 +--- a/arch/x86/include/asm/signal.h ++++ b/arch/x86/include/asm/signal.h +@@ -23,6 +23,19 @@ typedef struct { unsigned long sig[_NSIG_WORDS]; } sigset_t; @@ -2217,9 +2635,10 @@ diff -Nur linux-4.4.13.orig/arch/x86/include/asm/signal.h linux-4.4.13/arch/x86/ #ifndef CONFIG_COMPAT typedef sigset_t compat_sigset_t; #endif -diff -Nur linux-4.4.13.orig/arch/x86/include/asm/stackprotector.h linux-4.4.13/arch/x86/include/asm/stackprotector.h ---- linux-4.4.13.orig/arch/x86/include/asm/stackprotector.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/x86/include/asm/stackprotector.h 2016-06-22 21:55:07.982523867 +0200 +diff --git a/arch/x86/include/asm/stackprotector.h b/arch/x86/include/asm/stackprotector.h +index 58505f01962f..02fa39652cd6 100644 +--- a/arch/x86/include/asm/stackprotector.h ++++ b/arch/x86/include/asm/stackprotector.h @@ -59,7 +59,7 @@ */ static __always_inline void boot_init_stack_canary(void) @@ -2229,7 +2648,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/include/asm/stackprotector.h linux-4.4.13/a u64 tsc; #ifdef CONFIG_X86_64 -@@ -70,8 +70,15 @@ +@@ -70,8 +70,15 @@ 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. @@ -2245,10 +2664,11 @@ diff -Nur linux-4.4.13.orig/arch/x86/include/asm/stackprotector.h linux-4.4.13/a tsc = rdtsc(); canary += tsc + (tsc << 32UL); -diff -Nur linux-4.4.13.orig/arch/x86/include/asm/thread_info.h linux-4.4.13/arch/x86/include/asm/thread_info.h ---- linux-4.4.13.orig/arch/x86/include/asm/thread_info.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/x86/include/asm/thread_info.h 2016-06-22 21:55:07.982523867 +0200 -@@ -58,6 +58,8 @@ +diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h +index c7b551028740..ddb63bd90e3c 100644 +--- a/arch/x86/include/asm/thread_info.h ++++ b/arch/x86/include/asm/thread_info.h +@@ -58,6 +58,8 @@ struct thread_info { __u32 status; /* thread synchronous flags */ __u32 cpu; /* current CPU */ mm_segment_t addr_limit; @@ -2257,7 +2677,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/include/asm/thread_info.h linux-4.4.13/arch unsigned int sig_on_uaccess_error:1; unsigned int uaccess_err:1; /* uaccess failed */ }; -@@ -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 */ @@ -2265,7 +2685,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/include/asm/thread_info.h linux-4.4.13/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) @@ -2273,7 +2693,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/include/asm/thread_info.h linux-4.4.13/arch #define _TIF_USER_RETURN_NOTIFY (1 << TIF_USER_RETURN_NOTIFY) #define _TIF_UPROBE (1 << TIF_UPROBE) #define _TIF_NOTSC (1 << TIF_NOTSC) -@@ -152,6 +156,8 @@ +@@ -152,6 +156,8 @@ struct thread_info { #define _TIF_WORK_CTXSW_PREV (_TIF_WORK_CTXSW|_TIF_USER_RETURN_NOTIFY) #define _TIF_WORK_CTXSW_NEXT (_TIF_WORK_CTXSW) @@ -2282,10 +2702,11 @@ diff -Nur linux-4.4.13.orig/arch/x86/include/asm/thread_info.h linux-4.4.13/arch #define STACK_WARN (THREAD_SIZE/8) /* -diff -Nur linux-4.4.13.orig/arch/x86/include/asm/uv/uv_bau.h linux-4.4.13/arch/x86/include/asm/uv/uv_bau.h ---- linux-4.4.13.orig/arch/x86/include/asm/uv/uv_bau.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/x86/include/asm/uv/uv_bau.h 2016-06-22 21:55:07.982523867 +0200 -@@ -615,9 +615,9 @@ +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; @@ -2298,7 +2719,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/include/asm/uv/uv_bau.h linux-4.4.13/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. */ @@ -2318,10 +2739,11 @@ diff -Nur linux-4.4.13.orig/arch/x86/include/asm/uv/uv_bau.h linux-4.4.13/arch/x return 1; } -diff -Nur linux-4.4.13.orig/arch/x86/include/asm/uv/uv_hub.h linux-4.4.13/arch/x86/include/asm/uv/uv_hub.h ---- linux-4.4.13.orig/arch/x86/include/asm/uv/uv_hub.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/x86/include/asm/uv/uv_hub.h 2016-06-22 21:55:07.982523867 +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 ea7074784cc4..01ec643ce66e 100644 +--- a/arch/x86/include/asm/uv/uv_hub.h ++++ b/arch/x86/include/asm/uv/uv_hub.h +@@ -492,7 +492,7 @@ struct uv_blade_info { unsigned short nr_online_cpus; unsigned short pnode; short memory_nid; @@ -2330,43 +2752,11 @@ diff -Nur linux-4.4.13.orig/arch/x86/include/asm/uv/uv_hub.h linux-4.4.13/arch/x unsigned long nmi_count; /* obsolete, see uv_hub_nmi */ }; extern struct uv_blade_info *uv_blade_info; -diff -Nur linux-4.4.13.orig/arch/x86/Kconfig linux-4.4.13/arch/x86/Kconfig ---- linux-4.4.13.orig/arch/x86/Kconfig 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/x86/Kconfig 2016-06-22 21:55:07.986523867 +0200 -@@ -17,6 +17,7 @@ - ### Arch settings - config X86 - def_bool y -+ select HAVE_PREEMPT_LAZY - select ACPI_LEGACY_TABLES_LOOKUP if ACPI - select ACPI_SYSTEM_POWER_STATES_SUPPORT if ACPI - select ANON_INODES -@@ -212,8 +213,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 -@@ -848,7 +852,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.4.13.orig/arch/x86/kernel/apic/io_apic.c linux-4.4.13/arch/x86/kernel/apic/io_apic.c ---- linux-4.4.13.orig/arch/x86/kernel/apic/io_apic.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/x86/kernel/apic/io_apic.c 2016-06-22 21:55:07.986523867 +0200 -@@ -1711,7 +1711,8 @@ +diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c +index fdb0fbfb1197..678c711e2a16 100644 +--- a/arch/x86/kernel/apic/io_apic.c ++++ b/arch/x86/kernel/apic/io_apic.c +@@ -1711,7 +1711,8 @@ static bool io_apic_level_ack_pending(struct mp_chip_data *data) static inline bool ioapic_irqd_mask(struct irq_data *data) { /* If we are moving the irq we need to mask it */ @@ -2376,10 +2766,11 @@ diff -Nur linux-4.4.13.orig/arch/x86/kernel/apic/io_apic.c linux-4.4.13/arch/x86 mask_ioapic_irq(data); return true; } -diff -Nur linux-4.4.13.orig/arch/x86/kernel/apic/x2apic_uv_x.c linux-4.4.13/arch/x86/kernel/apic/x2apic_uv_x.c ---- linux-4.4.13.orig/arch/x86/kernel/apic/x2apic_uv_x.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/x86/kernel/apic/x2apic_uv_x.c 2016-06-22 21:55:07.986523867 +0200 -@@ -947,7 +947,7 @@ +diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c +index 4a139465f1d4..ad2afff02b36 100644 +--- a/arch/x86/kernel/apic/x2apic_uv_x.c ++++ b/arch/x86/kernel/apic/x2apic_uv_x.c +@@ -947,7 +947,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; @@ -2388,10 +2779,11 @@ diff -Nur linux-4.4.13.orig/arch/x86/kernel/apic/x2apic_uv_x.c linux-4.4.13/arch min_pnode = min(pnode, min_pnode); max_pnode = max(pnode, max_pnode); blade++; -diff -Nur linux-4.4.13.orig/arch/x86/kernel/asm-offsets.c linux-4.4.13/arch/x86/kernel/asm-offsets.c ---- linux-4.4.13.orig/arch/x86/kernel/asm-offsets.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/x86/kernel/asm-offsets.c 2016-06-22 21:55:07.986523867 +0200 -@@ -32,6 +32,7 @@ +diff --git a/arch/x86/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c +index 439df975bc7a..b7954ddd6a0a 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); @@ -2399,25 +2791,26 @@ diff -Nur linux-4.4.13.orig/arch/x86/kernel/asm-offsets.c linux-4.4.13/arch/x86/ BLANK(); OFFSET(crypto_tfm_ctx_offset, crypto_tfm, __crt_ctx); -@@ -89,4 +90,5 @@ +@@ -89,4 +90,5 @@ void common(void) { BLANK(); DEFINE(PTREGS_SIZE, sizeof(struct pt_regs)); + DEFINE(_PREEMPT_ENABLED, PREEMPT_ENABLED); } -diff -Nur linux-4.4.13.orig/arch/x86/kernel/cpu/mcheck/mce.c linux-4.4.13/arch/x86/kernel/cpu/mcheck/mce.c ---- linux-4.4.13.orig/arch/x86/kernel/cpu/mcheck/mce.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/x86/kernel/cpu/mcheck/mce.c 2016-06-22 21:55:07.986523867 +0200 +diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c +index 7e8a736d09db..430a4ec07811 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> #include <linux/export.h> +#include <linux/jiffies.h> -+#include <linux/work-simple.h> ++#include <linux/swork.h> #include <asm/processor.h> #include <asm/traps.h> -@@ -1236,7 +1238,7 @@ +@@ -1236,7 +1238,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 */ @@ -2426,7 +2819,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/kernel/cpu/mcheck/mce.c linux-4.4.13/arch/x static unsigned long mce_adjust_timer_default(unsigned long interval) { -@@ -1245,32 +1247,18 @@ +@@ -1245,32 +1247,18 @@ static unsigned long mce_adjust_timer_default(unsigned long interval) static unsigned long (*mce_adjust_timer)(unsigned long interval) = mce_adjust_timer_default; @@ -2465,7 +2858,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/kernel/cpu/mcheck/mce.c linux-4.4.13/arch/x iv = __this_cpu_read(mce_next_interval); if (mce_available(this_cpu_ptr(&cpu_info))) { -@@ -1293,7 +1281,7 @@ +@@ -1293,7 +1281,7 @@ static void mce_timer_fn(unsigned long data) done: __this_cpu_write(mce_next_interval, iv); @@ -2474,7 +2867,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/kernel/cpu/mcheck/mce.c linux-4.4.13/arch/x } /* -@@ -1301,7 +1289,7 @@ +@@ -1301,7 +1289,7 @@ done: */ void mce_timer_kick(unsigned long interval) { @@ -2483,7 +2876,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/kernel/cpu/mcheck/mce.c linux-4.4.13/arch/x unsigned long iv = __this_cpu_read(mce_next_interval); __restart_timer(t, interval); -@@ -1316,7 +1304,7 @@ +@@ -1316,7 +1304,7 @@ static void mce_timer_delete_all(void) int cpu; for_each_online_cpu(cpu) @@ -2492,7 +2885,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/kernel/cpu/mcheck/mce.c linux-4.4.13/arch/x } static void mce_do_trigger(struct work_struct *work) -@@ -1326,6 +1314,56 @@ +@@ -1326,6 +1314,56 @@ static void mce_do_trigger(struct work_struct *work) static DECLARE_WORK(mce_trigger_work, mce_do_trigger); @@ -2549,7 +2942,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/kernel/cpu/mcheck/mce.c linux-4.4.13/arch/x /* * Notify the user(s) about new machine check events. * Can be called from interrupt context, but not from machine check/NMI -@@ -1333,19 +1371,8 @@ +@@ -1333,19 +1371,8 @@ static DECLARE_WORK(mce_trigger_work, mce_do_trigger); */ int mce_notify_irq(void) { @@ -2570,7 +2963,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/kernel/cpu/mcheck/mce.c linux-4.4.13/arch/x return 1; } return 0; -@@ -1639,7 +1666,7 @@ +@@ -1639,7 +1666,7 @@ static void __mcheck_cpu_clear_vendor(struct cpuinfo_x86 *c) } } @@ -2579,7 +2972,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/kernel/cpu/mcheck/mce.c linux-4.4.13/arch/x { unsigned long iv = check_interval * HZ; -@@ -1648,16 +1675,17 @@ +@@ -1648,16 +1675,17 @@ static void mce_start_timer(unsigned int cpu, struct timer_list *t) per_cpu(mce_next_interval, cpu) = iv; @@ -2601,7 +2994,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/kernel/cpu/mcheck/mce.c linux-4.4.13/arch/x mce_start_timer(cpu, t); } -@@ -2376,6 +2404,8 @@ +@@ -2376,6 +2404,8 @@ static void mce_disable_cpu(void *h) if (!mce_available(raw_cpu_ptr(&cpu_info))) return; @@ -2610,7 +3003,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/kernel/cpu/mcheck/mce.c linux-4.4.13/arch/x if (!(action & CPU_TASKS_FROZEN)) cmci_clear(); -@@ -2398,6 +2428,7 @@ +@@ -2398,6 +2428,7 @@ static void mce_reenable_cpu(void *h) if (b->init) wrmsrl(MSR_IA32_MCx_CTL(i), b->ctl); } @@ -2618,7 +3011,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/kernel/cpu/mcheck/mce.c linux-4.4.13/arch/x } /* Get notified when a cpu comes on/off. Be hotplug friendly. */ -@@ -2405,7 +2436,6 @@ +@@ -2405,7 +2436,6 @@ static int mce_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu) { unsigned int cpu = (unsigned long)hcpu; @@ -2626,7 +3019,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/kernel/cpu/mcheck/mce.c linux-4.4.13/arch/x switch (action & ~CPU_TASKS_FROZEN) { case CPU_ONLINE: -@@ -2425,11 +2455,9 @@ +@@ -2425,11 +2455,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); @@ -2638,7 +3031,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/kernel/cpu/mcheck/mce.c linux-4.4.13/arch/x break; } -@@ -2468,6 +2496,10 @@ +@@ -2468,6 +2496,10 @@ static __init int mcheck_init_device(void) goto err_out; } @@ -2649,10 +3042,11 @@ diff -Nur linux-4.4.13.orig/arch/x86/kernel/cpu/mcheck/mce.c linux-4.4.13/arch/x if (!zalloc_cpumask_var(&mce_device_initialized, GFP_KERNEL)) { err = -ENOMEM; goto err_out; -diff -Nur linux-4.4.13.orig/arch/x86/kernel/cpu/perf_event_intel_rapl.c linux-4.4.13/arch/x86/kernel/cpu/perf_event_intel_rapl.c ---- linux-4.4.13.orig/arch/x86/kernel/cpu/perf_event_intel_rapl.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/x86/kernel/cpu/perf_event_intel_rapl.c 2016-06-22 21:55:07.986523867 +0200 -@@ -117,7 +117,7 @@ +diff --git a/arch/x86/kernel/cpu/perf_event_intel_rapl.c b/arch/x86/kernel/cpu/perf_event_intel_rapl.c +index ed446bdcbf31..d2ac364e2118 100644 +--- a/arch/x86/kernel/cpu/perf_event_intel_rapl.c ++++ b/arch/x86/kernel/cpu/perf_event_intel_rapl.c +@@ -117,7 +117,7 @@ static struct perf_pmu_events_attr event_attr_##v = { \ }; struct rapl_pmu { @@ -2661,7 +3055,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/kernel/cpu/perf_event_intel_rapl.c linux-4. int n_active; /* number of active events */ struct list_head active_list; struct pmu *pmu; /* pointer to rapl_pmu_class */ -@@ -220,13 +220,13 @@ +@@ -220,13 +220,13 @@ static enum hrtimer_restart rapl_hrtimer_handle(struct hrtimer *hrtimer) if (!pmu->n_active) return HRTIMER_NORESTART; @@ -2677,7 +3071,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/kernel/cpu/perf_event_intel_rapl.c linux-4. hrtimer_forward_now(hrtimer, pmu->timer_interval); -@@ -263,9 +263,9 @@ +@@ -263,9 +263,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; @@ -2689,7 +3083,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/kernel/cpu/perf_event_intel_rapl.c linux-4. } static void rapl_pmu_event_stop(struct perf_event *event, int mode) -@@ -274,7 +274,7 @@ +@@ -274,7 +274,7 @@ static void rapl_pmu_event_stop(struct perf_event *event, int mode) struct hw_perf_event *hwc = &event->hw; unsigned long flags; @@ -2698,7 +3092,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/kernel/cpu/perf_event_intel_rapl.c linux-4. /* mark event as deactivated and stopped */ if (!(hwc->state & PERF_HES_STOPPED)) { -@@ -299,7 +299,7 @@ +@@ -299,7 +299,7 @@ static void rapl_pmu_event_stop(struct perf_event *event, int mode) hwc->state |= PERF_HES_UPTODATE; } @@ -2707,7 +3101,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/kernel/cpu/perf_event_intel_rapl.c linux-4. } static int rapl_pmu_event_add(struct perf_event *event, int mode) -@@ -308,14 +308,14 @@ +@@ -308,14 +308,14 @@ static int rapl_pmu_event_add(struct perf_event *event, int mode) struct hw_perf_event *hwc = &event->hw; unsigned long flags; @@ -2724,7 +3118,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/kernel/cpu/perf_event_intel_rapl.c linux-4. return 0; } -@@ -603,7 +603,7 @@ +@@ -603,7 +603,7 @@ static int rapl_cpu_prepare(int cpu) pmu = kzalloc_node(sizeof(*pmu), GFP_KERNEL, cpu_to_node(cpu)); if (!pmu) return -1; @@ -2733,10 +3127,11 @@ diff -Nur linux-4.4.13.orig/arch/x86/kernel/cpu/perf_event_intel_rapl.c linux-4. INIT_LIST_HEAD(&pmu->active_list); -diff -Nur linux-4.4.13.orig/arch/x86/kernel/dumpstack_32.c linux-4.4.13/arch/x86/kernel/dumpstack_32.c ---- linux-4.4.13.orig/arch/x86/kernel/dumpstack_32.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/x86/kernel/dumpstack_32.c 2016-06-22 21:55:07.986523867 +0200 -@@ -42,7 +42,7 @@ +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) { @@ -2745,7 +3140,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/kernel/dumpstack_32.c linux-4.4.13/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(); } @@ -2754,10 +3149,11 @@ diff -Nur linux-4.4.13.orig/arch/x86/kernel/dumpstack_32.c linux-4.4.13/arch/x86 } EXPORT_SYMBOL(dump_trace); -diff -Nur linux-4.4.13.orig/arch/x86/kernel/dumpstack_64.c linux-4.4.13/arch/x86/kernel/dumpstack_64.c ---- linux-4.4.13.orig/arch/x86/kernel/dumpstack_64.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/x86/kernel/dumpstack_64.c 2016-06-22 21:55:07.986523867 +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) { @@ -2766,7 +3162,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/kernel/dumpstack_64.c linux-4.4.13/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); @@ -2775,7 +3171,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/kernel/dumpstack_64.c linux-4.4.13/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; @@ -2784,7 +3180,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/kernel/dumpstack_64.c linux-4.4.13/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(); } @@ -2793,10 +3189,11 @@ diff -Nur linux-4.4.13.orig/arch/x86/kernel/dumpstack_64.c linux-4.4.13/arch/x86 pr_cont("\n"); show_trace_log_lvl(task, regs, sp, bp, log_lvl); -diff -Nur linux-4.4.13.orig/arch/x86/kernel/irq_32.c linux-4.4.13/arch/x86/kernel/irq_32.c ---- linux-4.4.13.orig/arch/x86/kernel/irq_32.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/x86/kernel/irq_32.c 2016-06-22 21:55:07.986523867 +0200 -@@ -128,6 +128,7 @@ +diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c +index 38da8f29a9c8..ce71f7098f15 100644 +--- a/arch/x86/kernel/irq_32.c ++++ b/arch/x86/kernel/irq_32.c +@@ -128,6 +128,7 @@ void irq_ctx_init(int cpu) cpu, per_cpu(hardirq_stack, cpu), per_cpu(softirq_stack, cpu)); } @@ -2804,7 +3201,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/kernel/irq_32.c linux-4.4.13/arch/x86/kerne void do_softirq_own_stack(void) { struct thread_info *curstk; -@@ -146,6 +147,7 @@ +@@ -146,6 +147,7 @@ void do_softirq_own_stack(void) call_on_stack(__do_softirq, isp); } @@ -2812,9 +3209,10 @@ diff -Nur linux-4.4.13.orig/arch/x86/kernel/irq_32.c linux-4.4.13/arch/x86/kerne bool handle_irq(struct irq_desc *desc, struct pt_regs *regs) { -diff -Nur linux-4.4.13.orig/arch/x86/kernel/kvm.c linux-4.4.13/arch/x86/kernel/kvm.c ---- linux-4.4.13.orig/arch/x86/kernel/kvm.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/x86/kernel/kvm.c 2016-06-22 21:55:07.986523867 +0200 +diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c +index 47190bd399e7..807950860fb7 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> @@ -2823,7 +3221,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/kernel/kvm.c linux-4.4.13/arch/x86/kernel/k #include <asm/timer.h> #include <asm/cpu.h> #include <asm/traps.h> -@@ -91,14 +92,14 @@ +@@ -91,14 +92,14 @@ static void kvm_io_delay(void) struct kvm_task_sleep_node { struct hlist_node link; @@ -2840,7 +3238,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/kernel/kvm.c linux-4.4.13/arch/x86/kernel/k struct hlist_head list; } async_pf_sleepers[KVM_TASK_SLEEP_HASHSIZE]; -@@ -122,17 +123,17 @@ +@@ -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; @@ -2861,7 +3259,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/kernel/kvm.c linux-4.4.13/arch/x86/kernel/k rcu_irq_exit(); return; -@@ -141,13 +142,13 @@ +@@ -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; @@ -2878,7 +3276,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/kernel/kvm.c linux-4.4.13/arch/x86/kernel/k if (hlist_unhashed(&n.link)) break; -@@ -166,7 +167,7 @@ +@@ -166,7 +167,7 @@ void kvm_async_pf_task_wait(u32 token) } } if (!n.halted) @@ -2887,7 +3285,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/kernel/kvm.c linux-4.4.13/arch/x86/kernel/k rcu_irq_exit(); return; -@@ -178,8 +179,8 @@ +@@ -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); @@ -2898,7 +3296,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/kernel/kvm.c linux-4.4.13/arch/x86/kernel/k } static void apf_task_wake_all(void) -@@ -189,14 +190,14 @@ +@@ -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]; @@ -2915,7 +3313,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/kernel/kvm.c linux-4.4.13/arch/x86/kernel/k } } -@@ -212,7 +213,7 @@ +@@ -212,7 +213,7 @@ void kvm_async_pf_task_wake(u32 token) } again: @@ -2924,7 +3322,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/kernel/kvm.c linux-4.4.13/arch/x86/kernel/k n = _find_apf_task(b, token); if (!n) { /* -@@ -225,17 +226,17 @@ +@@ -225,17 +226,17 @@ again: * Allocation failed! Busy wait while other cpu * handles async PF. */ @@ -2945,7 +3343,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/kernel/kvm.c linux-4.4.13/arch/x86/kernel/k return; } EXPORT_SYMBOL_GPL(kvm_async_pf_task_wake); -@@ -486,7 +487,7 @@ +@@ -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++) @@ -2954,10 +3352,11 @@ diff -Nur linux-4.4.13.orig/arch/x86/kernel/kvm.c linux-4.4.13/arch/x86/kernel/k if (kvm_para_has_feature(KVM_FEATURE_ASYNC_PF)) x86_init.irqs.trap_init = kvm_apf_trap_init; -diff -Nur linux-4.4.13.orig/arch/x86/kernel/nmi.c linux-4.4.13/arch/x86/kernel/nmi.c ---- linux-4.4.13.orig/arch/x86/kernel/nmi.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/x86/kernel/nmi.c 2016-06-22 21:55:07.986523867 +0200 -@@ -231,7 +231,7 @@ +diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c +index 697f90db0e37..424aec4a4c71 100644 +--- a/arch/x86/kernel/nmi.c ++++ b/arch/x86/kernel/nmi.c +@@ -231,7 +231,7 @@ pci_serr_error(unsigned char reason, struct pt_regs *regs) #endif if (panic_on_unrecovered_nmi) @@ -2966,7 +3365,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/kernel/nmi.c linux-4.4.13/arch/x86/kernel/n pr_emerg("Dazed and confused, but trying to continue\n"); -@@ -255,8 +255,16 @@ +@@ -255,8 +255,16 @@ io_check_error(unsigned char reason, struct pt_regs *regs) reason, smp_processor_id()); show_regs(regs); @@ -2985,7 +3384,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/kernel/nmi.c linux-4.4.13/arch/x86/kernel/n /* Re-enable the IOCK line, wait for a few seconds */ reason = (reason & NMI_REASON_CLEAR_MASK) | NMI_REASON_CLEAR_IOCHK; -@@ -297,7 +305,7 @@ +@@ -297,7 +305,7 @@ unknown_nmi_error(unsigned char reason, struct pt_regs *regs) pr_emerg("Do you have a strange power saving mode enabled?\n"); if (unknown_nmi_panic || panic_on_unrecovered_nmi) @@ -2994,9 +3393,10 @@ diff -Nur linux-4.4.13.orig/arch/x86/kernel/nmi.c linux-4.4.13/arch/x86/kernel/n pr_emerg("Dazed and confused, but trying to continue\n"); } -diff -Nur linux-4.4.13.orig/arch/x86/kernel/process_32.c linux-4.4.13/arch/x86/kernel/process_32.c ---- linux-4.4.13.orig/arch/x86/kernel/process_32.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/x86/kernel/process_32.c 2016-06-22 21:55:07.986523867 +0200 +diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c +index 9f950917528b..4dd4beae917a 100644 +--- a/arch/x86/kernel/process_32.c ++++ b/arch/x86/kernel/process_32.c @@ -35,6 +35,7 @@ #include <linux/uaccess.h> #include <linux/io.h> @@ -3005,7 +3405,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/kernel/process_32.c linux-4.4.13/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); @@ -3041,7 +3441,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/kernel/process_32.c linux-4.4.13/arch/x86/k /* * switch_to(x,y) should switch tasks from x to y. -@@ -286,6 +316,8 @@ +@@ -286,6 +316,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); @@ -3050,10 +3450,11 @@ diff -Nur linux-4.4.13.orig/arch/x86/kernel/process_32.c linux-4.4.13/arch/x86/k /* * Leave lazy mode, flushing any hypercalls made here. * This must be done before restoring TLS segments so -diff -Nur linux-4.4.13.orig/arch/x86/kernel/reboot.c linux-4.4.13/arch/x86/kernel/reboot.c ---- linux-4.4.13.orig/arch/x86/kernel/reboot.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/x86/kernel/reboot.c 2016-06-22 21:55:07.986523867 +0200 -@@ -726,6 +726,7 @@ +diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c +index f660d63f40fe..8384207adde2 100644 +--- a/arch/x86/kernel/reboot.c ++++ b/arch/x86/kernel/reboot.c +@@ -726,6 +726,7 @@ static int crashing_cpu; static nmi_shootdown_cb shootdown_callback; static atomic_t waiting_for_crash_ipi; @@ -3061,7 +3462,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/kernel/reboot.c linux-4.4.13/arch/x86/kerne static int crash_nmi_callback(unsigned int val, struct pt_regs *regs) { -@@ -788,6 +789,9 @@ +@@ -788,6 +789,9 @@ void nmi_shootdown_cpus(nmi_shootdown_cb callback) smp_send_nmi_allbutself(); @@ -3071,7 +3472,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/kernel/reboot.c linux-4.4.13/arch/x86/kerne msecs = 1000; /* Wait at most a second for the other cpus to stop */ while ((atomic_read(&waiting_for_crash_ipi) > 0) && msecs) { mdelay(1); -@@ -796,6 +800,22 @@ +@@ -796,6 +800,22 @@ void nmi_shootdown_cpus(nmi_shootdown_cb callback) /* Leave the nmi callback set */ } @@ -3094,10 +3495,11 @@ diff -Nur linux-4.4.13.orig/arch/x86/kernel/reboot.c linux-4.4.13/arch/x86/kerne #else /* !CONFIG_SMP */ void nmi_shootdown_cpus(nmi_shootdown_cb callback) { -diff -Nur linux-4.4.13.orig/arch/x86/kvm/lapic.c linux-4.4.13/arch/x86/kvm/lapic.c ---- linux-4.4.13.orig/arch/x86/kvm/lapic.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/x86/kvm/lapic.c 2016-06-22 21:55:07.986523867 +0200 -@@ -1195,7 +1195,7 @@ +diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c +index 4d30b865be30..20d9e9fb3b74 100644 +--- a/arch/x86/kvm/lapic.c ++++ b/arch/x86/kvm/lapic.c +@@ -1195,7 +1195,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; @@ -3106,7 +3508,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/kvm/lapic.c linux-4.4.13/arch/x86/kvm/lapic struct kvm_timer *ktimer = &apic->lapic_timer; if (atomic_read(&apic->lapic_timer.pending)) -@@ -1204,8 +1204,8 @@ +@@ -1204,8 +1204,8 @@ static void apic_timer_expired(struct kvm_lapic *apic) atomic_inc(&apic->lapic_timer.pending); kvm_set_pending_timer(vcpu); @@ -3117,7 +3519,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/kvm/lapic.c linux-4.4.13/arch/x86/kvm/lapic if (apic_lvtt_tscdeadline(apic)) ktimer->expired_tscdeadline = ktimer->tscdeadline; -@@ -1801,6 +1801,7 @@ +@@ -1801,6 +1801,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; @@ -3125,10 +3527,11 @@ diff -Nur linux-4.4.13.orig/arch/x86/kvm/lapic.c linux-4.4.13/arch/x86/kvm/lapic /* * APIC is created enabled. This will prevent kvm_lapic_set_base from -diff -Nur linux-4.4.13.orig/arch/x86/kvm/x86.c linux-4.4.13/arch/x86/kvm/x86.c ---- linux-4.4.13.orig/arch/x86/kvm/x86.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/x86/kvm/x86.c 2016-06-22 21:55:07.990523867 +0200 -@@ -5788,6 +5788,13 @@ +diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c +index be222666b1c2..697457897e7c 100644 +--- a/arch/x86/kvm/x86.c ++++ b/arch/x86/kvm/x86.c +@@ -5793,6 +5793,13 @@ int kvm_arch_init(void *opaque) goto out; } @@ -3142,10 +3545,11 @@ diff -Nur linux-4.4.13.orig/arch/x86/kvm/x86.c linux-4.4.13/arch/x86/kvm/x86.c r = kvm_mmu_module_init(); if (r) goto out_free_percpu; -diff -Nur linux-4.4.13.orig/arch/x86/mm/highmem_32.c linux-4.4.13/arch/x86/mm/highmem_32.c ---- linux-4.4.13.orig/arch/x86/mm/highmem_32.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/x86/mm/highmem_32.c 2016-06-22 21:55:07.990523867 +0200 -@@ -32,10 +32,11 @@ +diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c +index a6d739258137..bd24ba1c4a86 100644 +--- a/arch/x86/mm/highmem_32.c ++++ b/arch/x86/mm/highmem_32.c +@@ -32,10 +32,11 @@ EXPORT_SYMBOL(kunmap); */ void *kmap_atomic_prot(struct page *page, pgprot_t prot) { @@ -3158,7 +3562,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/mm/highmem_32.c linux-4.4.13/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))); @@ -3170,7 +3574,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/mm/highmem_32.c linux-4.4.13/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. */ @@ -3180,7 +3584,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/mm/highmem_32.c linux-4.4.13/arch/x86/mm/hi kpte_clear_flush(kmap_pte-idx, vaddr); kmap_atomic_idx_pop(); arch_flush_lazy_mmu_mode(); -@@ -100,7 +107,7 @@ +@@ -100,7 +107,7 @@ void __kunmap_atomic(void *kvaddr) #endif pagefault_enable(); @@ -3189,10 +3593,11 @@ diff -Nur linux-4.4.13.orig/arch/x86/mm/highmem_32.c linux-4.4.13/arch/x86/mm/hi } EXPORT_SYMBOL(__kunmap_atomic); -diff -Nur linux-4.4.13.orig/arch/x86/mm/iomap_32.c linux-4.4.13/arch/x86/mm/iomap_32.c ---- linux-4.4.13.orig/arch/x86/mm/iomap_32.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/x86/mm/iomap_32.c 2016-06-22 21:55:07.990523867 +0200 -@@ -56,6 +56,7 @@ +diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c +index 9c0ff045fdd4..dd25dd1671b6 100644 +--- a/arch/x86/mm/iomap_32.c ++++ b/arch/x86/mm/iomap_32.c +@@ -56,6 +56,7 @@ EXPORT_SYMBOL_GPL(iomap_free); void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot) { @@ -3200,7 +3605,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/mm/iomap_32.c linux-4.4.13/arch/x86/mm/ioma unsigned long vaddr; int idx, type; -@@ -65,7 +66,12 @@ +@@ -65,7 +66,12 @@ void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot) type = kmap_atomic_idx_push(); idx = type + KM_TYPE_NR * smp_processor_id(); vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx); @@ -3214,7 +3619,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/mm/iomap_32.c linux-4.4.13/arch/x86/mm/ioma arch_flush_lazy_mmu_mode(); return (void *)vaddr; -@@ -113,6 +119,9 @@ +@@ -113,6 +119,9 @@ 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. */ @@ -3224,10 +3629,11 @@ diff -Nur linux-4.4.13.orig/arch/x86/mm/iomap_32.c linux-4.4.13/arch/x86/mm/ioma kpte_clear_flush(kmap_pte-idx, vaddr); kmap_atomic_idx_pop(); } -diff -Nur linux-4.4.13.orig/arch/x86/platform/uv/tlb_uv.c linux-4.4.13/arch/x86/platform/uv/tlb_uv.c ---- linux-4.4.13.orig/arch/x86/platform/uv/tlb_uv.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/x86/platform/uv/tlb_uv.c 2016-06-22 21:55:07.990523867 +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); @@ -3239,7 +3645,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/platform/uv/tlb_uv.c linux-4.4.13/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); @@ -3251,7 +3657,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/platform/uv/tlb_uv.c linux-4.4.13/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; @@ -3260,7 +3666,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/platform/uv/tlb_uv.c linux-4.4.13/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) } } } @@ -3269,7 +3675,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/platform/uv/tlb_uv.c linux-4.4.13/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) { @@ -3278,7 +3684,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/platform/uv/tlb_uv.c linux-4.4.13/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; @@ -3287,7 +3693,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/platform/uv/tlb_uv.c linux-4.4.13/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; } } @@ -3300,7 +3706,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/platform/uv/tlb_uv.c linux-4.4.13/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; @@ -3313,10 +3719,11 @@ diff -Nur linux-4.4.13.orig/arch/x86/platform/uv/tlb_uv.c linux-4.4.13/arch/x86/ } } -diff -Nur linux-4.4.13.orig/arch/x86/platform/uv/uv_time.c linux-4.4.13/arch/x86/platform/uv/uv_time.c ---- linux-4.4.13.orig/arch/x86/platform/uv/uv_time.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/arch/x86/platform/uv/uv_time.c 2016-06-22 21:55:07.990523867 +0200 -@@ -57,7 +57,7 @@ +diff --git a/arch/x86/platform/uv/uv_time.c b/arch/x86/platform/uv/uv_time.c +index 2b158a9fa1d7..5e0b122620cb 100644 +--- a/arch/x86/platform/uv/uv_time.c ++++ b/arch/x86/platform/uv/uv_time.c +@@ -57,7 +57,7 @@ static DEFINE_PER_CPU(struct clock_event_device, cpu_ced); /* There is one of these allocated per node */ struct uv_rtc_timer_head { @@ -3325,7 +3732,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/platform/uv/uv_time.c linux-4.4.13/arch/x86 /* next cpu waiting for timer, local node relative: */ int next_cpu; /* number of cpus on this node: */ -@@ -177,7 +177,7 @@ +@@ -177,7 +177,7 @@ static __init int uv_rtc_allocate_timers(void) uv_rtc_deallocate_timers(); return -ENOMEM; } @@ -3334,7 +3741,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/platform/uv/uv_time.c linux-4.4.13/arch/x86 head->ncpus = uv_blade_nr_possible_cpus(bid); head->next_cpu = -1; blade_info[bid] = head; -@@ -231,7 +231,7 @@ +@@ -231,7 +231,7 @@ static int uv_rtc_set_timer(int cpu, u64 expires) unsigned long flags; int next_cpu; @@ -3343,7 +3750,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/platform/uv/uv_time.c linux-4.4.13/arch/x86 next_cpu = head->next_cpu; *t = expires; -@@ -243,12 +243,12 @@ +@@ -243,12 +243,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); @@ -3358,7 +3765,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/platform/uv/uv_time.c linux-4.4.13/arch/x86 return 0; } -@@ -267,7 +267,7 @@ +@@ -267,7 +267,7 @@ static int uv_rtc_unset_timer(int cpu, int force) unsigned long flags; int rc = 0; @@ -3367,7 +3774,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/platform/uv/uv_time.c linux-4.4.13/arch/x86 if ((head->next_cpu == bcpu && uv_read_rtc(NULL) >= *t) || force) rc = 1; -@@ -279,7 +279,7 @@ +@@ -279,7 +279,7 @@ static int uv_rtc_unset_timer(int cpu, int force) uv_rtc_find_next_timer(head, pnode); } @@ -3376,7 +3783,7 @@ diff -Nur linux-4.4.13.orig/arch/x86/platform/uv/uv_time.c linux-4.4.13/arch/x86 return rc; } -@@ -299,13 +299,18 @@ +@@ -299,13 +299,18 @@ static int uv_rtc_unset_timer(int cpu, int force) static cycle_t uv_read_rtc(struct clocksource *cs) { unsigned long offset; @@ -3396,10 +3803,11 @@ diff -Nur linux-4.4.13.orig/arch/x86/platform/uv/uv_time.c linux-4.4.13/arch/x86 } /* -diff -Nur linux-4.4.13.orig/block/blk-core.c linux-4.4.13/block/blk-core.c ---- linux-4.4.13.orig/block/blk-core.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/block/blk-core.c 2016-06-22 21:55:07.990523867 +0200 -@@ -125,6 +125,9 @@ +diff --git a/block/blk-core.c b/block/blk-core.c +index f8e64cac981a..842cfe492cf4 100644 +--- a/block/blk-core.c ++++ b/block/blk-core.c +@@ -125,6 +125,9 @@ void blk_rq_init(struct request_queue *q, struct request *rq) INIT_LIST_HEAD(&rq->queuelist); INIT_LIST_HEAD(&rq->timeout_list); @@ -3409,7 +3817,7 @@ diff -Nur linux-4.4.13.orig/block/blk-core.c linux-4.4.13/block/blk-core.c rq->cpu = -1; rq->q = q; rq->__sector = (sector_t) -1; -@@ -233,7 +236,7 @@ +@@ -233,7 +236,7 @@ EXPORT_SYMBOL(blk_start_queue_async); **/ void blk_start_queue(struct request_queue *q) { @@ -3418,7 +3826,7 @@ diff -Nur linux-4.4.13.orig/block/blk-core.c linux-4.4.13/block/blk-core.c queue_flag_clear(QUEUE_FLAG_STOPPED, q); __blk_run_queue(q); -@@ -657,7 +660,7 @@ +@@ -657,7 +660,7 @@ int blk_queue_enter(struct request_queue *q, gfp_t gfp) if (!gfpflags_allow_blocking(gfp)) return -EBUSY; @@ -3427,7 +3835,7 @@ diff -Nur linux-4.4.13.orig/block/blk-core.c linux-4.4.13/block/blk-core.c !atomic_read(&q->mq_freeze_depth) || blk_queue_dying(q)); if (blk_queue_dying(q)) -@@ -677,7 +680,7 @@ +@@ -677,7 +680,7 @@ static void blk_queue_usage_counter_release(struct percpu_ref *ref) struct request_queue *q = container_of(ref, struct request_queue, q_usage_counter); @@ -3436,7 +3844,7 @@ diff -Nur linux-4.4.13.orig/block/blk-core.c linux-4.4.13/block/blk-core.c } struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id) -@@ -739,7 +742,7 @@ +@@ -739,7 +742,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); @@ -3445,7 +3853,7 @@ diff -Nur linux-4.4.13.orig/block/blk-core.c linux-4.4.13/block/blk-core.c /* * Init percpu_ref in atomic mode so that it's faster to shutdown. -@@ -3198,7 +3201,7 @@ +@@ -3198,7 +3201,7 @@ static void queue_unplugged(struct request_queue *q, unsigned int depth, blk_run_queue_async(q); else __blk_run_queue(q); @@ -3454,7 +3862,7 @@ diff -Nur linux-4.4.13.orig/block/blk-core.c linux-4.4.13/block/blk-core.c } static void flush_plug_callbacks(struct blk_plug *plug, bool from_schedule) -@@ -3246,7 +3249,6 @@ +@@ -3246,7 +3249,6 @@ EXPORT_SYMBOL(blk_check_plugged); void blk_flush_plug_list(struct blk_plug *plug, bool from_schedule) { struct request_queue *q; @@ -3462,7 +3870,7 @@ diff -Nur linux-4.4.13.orig/block/blk-core.c linux-4.4.13/block/blk-core.c struct request *rq; LIST_HEAD(list); unsigned int depth; -@@ -3266,11 +3268,6 @@ +@@ -3266,11 +3268,6 @@ void blk_flush_plug_list(struct blk_plug *plug, bool from_schedule) q = NULL; depth = 0; @@ -3474,7 +3882,7 @@ diff -Nur linux-4.4.13.orig/block/blk-core.c linux-4.4.13/block/blk-core.c while (!list_empty(&list)) { rq = list_entry_rq(list.next); list_del_init(&rq->queuelist); -@@ -3283,7 +3280,7 @@ +@@ -3283,7 +3280,7 @@ void blk_flush_plug_list(struct blk_plug *plug, bool from_schedule) queue_unplugged(q, depth, from_schedule); q = rq->q; depth = 0; @@ -3483,7 +3891,7 @@ diff -Nur linux-4.4.13.orig/block/blk-core.c linux-4.4.13/block/blk-core.c } /* -@@ -3310,8 +3307,6 @@ +@@ -3310,8 +3307,6 @@ void blk_flush_plug_list(struct blk_plug *plug, bool from_schedule) */ if (q) queue_unplugged(q, depth, from_schedule); @@ -3492,9 +3900,10 @@ diff -Nur linux-4.4.13.orig/block/blk-core.c linux-4.4.13/block/blk-core.c } void blk_finish_plug(struct blk_plug *plug) -diff -Nur linux-4.4.13.orig/block/blk-ioc.c linux-4.4.13/block/blk-ioc.c ---- linux-4.4.13.orig/block/blk-ioc.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/block/blk-ioc.c 2016-06-22 21:55:07.990523867 +0200 +diff --git a/block/blk-ioc.c b/block/blk-ioc.c +index 381cb50a673c..dc8785233d94 100644 +--- a/block/blk-ioc.c ++++ b/block/blk-ioc.c @@ -7,6 +7,7 @@ #include <linux/bio.h> #include <linux/blkdev.h> @@ -3503,7 +3912,7 @@ diff -Nur linux-4.4.13.orig/block/blk-ioc.c linux-4.4.13/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); @@ -3512,7 +3921,7 @@ diff -Nur linux-4.4.13.orig/block/blk-ioc.c linux-4.4.13/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); @@ -3521,10 +3930,11 @@ diff -Nur linux-4.4.13.orig/block/blk-ioc.c linux-4.4.13/block/blk-ioc.c goto retry; } } -diff -Nur linux-4.4.13.orig/block/blk-iopoll.c linux-4.4.13/block/blk-iopoll.c ---- linux-4.4.13.orig/block/blk-iopoll.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/block/blk-iopoll.c 2016-06-22 21:55:07.990523867 +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); @@ -3532,7 +3942,7 @@ diff -Nur linux-4.4.13.orig/block/blk-iopoll.c linux-4.4.13/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(); @@ -3540,7 +3950,7 @@ diff -Nur linux-4.4.13.orig/block/blk-iopoll.c linux-4.4.13/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(); @@ -3548,10 +3958,66 @@ diff -Nur linux-4.4.13.orig/block/blk-iopoll.c linux-4.4.13/block/blk-iopoll.c } return NOTIFY_OK; -diff -Nur linux-4.4.13.orig/block/blk-mq.c linux-4.4.13/block/blk-mq.c ---- linux-4.4.13.orig/block/blk-mq.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/block/blk-mq.c 2016-06-22 21:55:07.990523867 +0200 -@@ -92,7 +92,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 6d6f8feb48c0..7cdf19e4aaea 100644 +--- a/block/blk-mq.c ++++ b/block/blk-mq.c +@@ -92,7 +92,7 @@ EXPORT_SYMBOL_GPL(blk_mq_freeze_queue_start); static void blk_mq_freeze_queue_wait(struct request_queue *q) { @@ -3560,7 +4026,7 @@ diff -Nur linux-4.4.13.orig/block/blk-mq.c linux-4.4.13/block/blk-mq.c } /* -@@ -130,7 +130,7 @@ +@@ -130,7 +130,7 @@ void blk_mq_unfreeze_queue(struct request_queue *q) WARN_ON_ONCE(freeze_depth < 0); if (!freeze_depth) { percpu_ref_reinit(&q->q_usage_counter); @@ -3569,7 +4035,7 @@ diff -Nur linux-4.4.13.orig/block/blk-mq.c linux-4.4.13/block/blk-mq.c } } EXPORT_SYMBOL_GPL(blk_mq_unfreeze_queue); -@@ -149,7 +149,7 @@ +@@ -149,7 +149,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. */ @@ -3578,7 +4044,7 @@ diff -Nur linux-4.4.13.orig/block/blk-mq.c linux-4.4.13/block/blk-mq.c } bool blk_mq_can_queue(struct blk_mq_hw_ctx *hctx) -@@ -196,6 +196,9 @@ +@@ -196,6 +196,9 @@ static void blk_mq_rq_ctx_init(struct request_queue *q, struct blk_mq_ctx *ctx, rq->resid_len = 0; rq->sense = NULL; @@ -3588,7 +4054,7 @@ diff -Nur linux-4.4.13.orig/block/blk-mq.c linux-4.4.13/block/blk-mq.c INIT_LIST_HEAD(&rq->timeout_list); rq->timeout = 0; -@@ -325,6 +328,17 @@ +@@ -325,6 +328,17 @@ void blk_mq_end_request(struct request *rq, int error) } EXPORT_SYMBOL(blk_mq_end_request); @@ -3606,7 +4072,7 @@ diff -Nur linux-4.4.13.orig/block/blk-mq.c linux-4.4.13/block/blk-mq.c static void __blk_mq_complete_request_remote(void *data) { struct request *rq = data; -@@ -332,6 +346,8 @@ +@@ -332,6 +346,8 @@ static void __blk_mq_complete_request_remote(void *data) rq->q->softirq_done_fn(rq); } @@ -3615,7 +4081,7 @@ diff -Nur linux-4.4.13.orig/block/blk-mq.c linux-4.4.13/block/blk-mq.c static void blk_mq_ipi_complete_request(struct request *rq) { struct blk_mq_ctx *ctx = rq->mq_ctx; -@@ -343,19 +359,23 @@ +@@ -343,19 +359,23 @@ static void blk_mq_ipi_complete_request(struct request *rq) return; } @@ -3641,7 +4107,7 @@ diff -Nur linux-4.4.13.orig/block/blk-mq.c linux-4.4.13/block/blk-mq.c } static void __blk_mq_complete_request(struct request *rq) -@@ -862,14 +882,14 @@ +@@ -862,14 +882,14 @@ void blk_mq_run_hw_queue(struct blk_mq_hw_ctx *hctx, bool async) return; if (!async) { @@ -3659,7 +4125,7 @@ diff -Nur linux-4.4.13.orig/block/blk-mq.c linux-4.4.13/block/blk-mq.c } kblockd_schedule_delayed_work_on(blk_mq_hctx_next_cpu(hctx), -@@ -1617,7 +1637,7 @@ +@@ -1617,7 +1637,7 @@ static int blk_mq_hctx_notify(void *data, unsigned long action, { struct blk_mq_hw_ctx *hctx = data; @@ -3668,64 +4134,11 @@ diff -Nur linux-4.4.13.orig/block/blk-mq.c linux-4.4.13/block/blk-mq.c return blk_mq_hctx_cpu_offline(hctx, cpu); /* -diff -Nur linux-4.4.13.orig/block/blk-mq-cpu.c linux-4.4.13/block/blk-mq-cpu.c ---- linux-4.4.13.orig/block/blk-mq-cpu.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/block/blk-mq-cpu.c 2016-06-22 21:55:07.990523867 +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.4.13.orig/block/blk-mq.h linux-4.4.13/block/blk-mq.h ---- linux-4.4.13.orig/block/blk-mq.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/block/blk-mq.h 2016-06-22 21:55:07.990523867 +0200 -@@ -74,7 +74,10 @@ +diff --git a/block/blk-mq.h b/block/blk-mq.h +index 713820b47b31..3cb6feb4fe23 100644 +--- a/block/blk-mq.h ++++ b/block/blk-mq.h +@@ -74,7 +74,10 @@ struct blk_align_bitmap { static inline struct blk_mq_ctx *__blk_mq_get_ctx(struct request_queue *q, unsigned int cpu) { @@ -3737,7 +4150,7 @@ diff -Nur linux-4.4.13.orig/block/blk-mq.h linux-4.4.13/block/blk-mq.h } /* -@@ -85,12 +88,12 @@ +@@ -85,12 +88,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) { @@ -3752,10 +4165,11 @@ diff -Nur linux-4.4.13.orig/block/blk-mq.h linux-4.4.13/block/blk-mq.h } struct blk_mq_alloc_data { -diff -Nur linux-4.4.13.orig/block/blk-softirq.c linux-4.4.13/block/blk-softirq.c ---- linux-4.4.13.orig/block/blk-softirq.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/block/blk-softirq.c 2016-06-22 21:55:07.990523867 +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); @@ -3763,7 +4177,7 @@ diff -Nur linux-4.4.13.orig/block/blk-softirq.c linux-4.4.13/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(); @@ -3771,7 +4185,7 @@ diff -Nur linux-4.4.13.orig/block/blk-softirq.c linux-4.4.13/block/blk-softirq.c } return NOTIFY_OK; -@@ -150,6 +152,7 @@ +@@ -150,6 +152,7 @@ do_local: goto do_local; local_irq_restore(flags); @@ -3779,10 +4193,11 @@ diff -Nur linux-4.4.13.orig/block/blk-softirq.c linux-4.4.13/block/blk-softirq.c } /** -diff -Nur linux-4.4.13.orig/block/bounce.c linux-4.4.13/block/bounce.c ---- linux-4.4.13.orig/block/bounce.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/block/bounce.c 2016-06-22 21:55:07.990523867 +0200 -@@ -55,11 +55,11 @@ +diff --git a/block/bounce.c b/block/bounce.c +index 1cb5dd3a5da1..2f1ec8a67cbe 100644 +--- a/block/bounce.c ++++ b/block/bounce.c +@@ -55,11 +55,11 @@ static void bounce_copy_vec(struct bio_vec *to, unsigned char *vfrom) unsigned long flags; unsigned char *vto; @@ -3796,10 +4211,11 @@ diff -Nur linux-4.4.13.orig/block/bounce.c linux-4.4.13/block/bounce.c } #else /* CONFIG_HIGHMEM */ -diff -Nur linux-4.4.13.orig/crypto/algapi.c linux-4.4.13/crypto/algapi.c ---- linux-4.4.13.orig/crypto/algapi.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/crypto/algapi.c 2016-06-22 21:55:07.990523867 +0200 -@@ -719,13 +719,13 @@ +diff --git a/crypto/algapi.c b/crypto/algapi.c +index 59bf491fe3d8..f98e79c8cd77 100644 +--- a/crypto/algapi.c ++++ b/crypto/algapi.c +@@ -719,13 +719,13 @@ EXPORT_SYMBOL_GPL(crypto_spawn_tfm2); int crypto_register_notifier(struct notifier_block *nb) { @@ -3815,10 +4231,11 @@ diff -Nur linux-4.4.13.orig/crypto/algapi.c linux-4.4.13/crypto/algapi.c } EXPORT_SYMBOL_GPL(crypto_unregister_notifier); -diff -Nur linux-4.4.13.orig/crypto/api.c linux-4.4.13/crypto/api.c ---- linux-4.4.13.orig/crypto/api.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/crypto/api.c 2016-06-22 21:55:07.990523867 +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); @@ -3827,7 +4244,7 @@ diff -Nur linux-4.4.13.orig/crypto/api.c linux-4.4.13/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; @@ -3840,10 +4257,11 @@ diff -Nur linux-4.4.13.orig/crypto/api.c linux-4.4.13/crypto/api.c } return ok; -diff -Nur linux-4.4.13.orig/crypto/internal.h linux-4.4.13/crypto/internal.h ---- linux-4.4.13.orig/crypto/internal.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/crypto/internal.h 2016-06-22 21:55:07.990523867 +0200 -@@ -47,7 +47,7 @@ +diff --git a/crypto/internal.h b/crypto/internal.h +index 00e42a3ed814..2e85551e235f 100644 +--- a/crypto/internal.h ++++ b/crypto/internal.h +@@ -47,7 +47,7 @@ struct crypto_larval { extern struct list_head crypto_alg_list; extern struct rw_semaphore crypto_alg_sem; @@ -3852,7 +4270,7 @@ diff -Nur linux-4.4.13.orig/crypto/internal.h linux-4.4.13/crypto/internal.h #ifdef CONFIG_PROC_FS void __init crypto_init_proc(void); -@@ -143,7 +143,7 @@ +@@ -143,7 +143,7 @@ static inline int crypto_is_moribund(struct crypto_alg *alg) static inline void crypto_notify(unsigned long val, void *v) { @@ -3861,310 +4279,11 @@ diff -Nur linux-4.4.13.orig/crypto/internal.h linux-4.4.13/crypto/internal.h } #endif /* _CRYPTO_INTERNAL_H */ -diff -Nur linux-4.4.13.orig/Documentation/hwlat_detector.txt linux-4.4.13/Documentation/hwlat_detector.txt ---- linux-4.4.13.orig/Documentation/hwlat_detector.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-4.4.13/Documentation/hwlat_detector.txt 2016-06-22 21:55:07.994523867 +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.4.13.orig/Documentation/kernel-parameters.txt linux-4.4.13/Documentation/kernel-parameters.txt ---- linux-4.4.13.orig/Documentation/kernel-parameters.txt 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/Documentation/kernel-parameters.txt 2016-06-22 21:55:07.994523867 +0200 -@@ -1629,6 +1629,15 @@ - ip= [IP_PNP] - See Documentation/filesystems/nfs/nfsroot.txt. - -+ irqaffinity= [SMP] Set the default irq affinity mask -+ Format: -+ <cpu number>,...,<cpu number> -+ or -+ <cpu number>-<cpu number> -+ (must be a positive range in ascending order) -+ or a mixture -+ <cpu number>,...,<cpu number>-<cpu number> -+ - irqfixup [HW] - When an interrupt is not handled search all handlers - for it. Intended to get systems with badly broken -diff -Nur linux-4.4.13.orig/Documentation/sysrq.txt linux-4.4.13/Documentation/sysrq.txt ---- linux-4.4.13.orig/Documentation/sysrq.txt 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/Documentation/sysrq.txt 2016-06-22 21:55:07.994523867 +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.4.13.orig/Documentation/trace/histograms.txt linux-4.4.13/Documentation/trace/histograms.txt ---- linux-4.4.13.orig/Documentation/trace/histograms.txt 1970-01-01 01:00:00.000000000 +0100 -+++ linux-4.4.13/Documentation/trace/histograms.txt 2016-06-22 21:55:07.994523867 +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.4.13.orig/drivers/acpi/acpica/acglobal.h linux-4.4.13/drivers/acpi/acpica/acglobal.h ---- linux-4.4.13.orig/drivers/acpi/acpica/acglobal.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/acpi/acpica/acglobal.h 2016-06-22 21:55:07.994523867 +0200 -@@ -116,7 +116,7 @@ +diff --git a/drivers/acpi/acpica/acglobal.h b/drivers/acpi/acpica/acglobal.h +index faa97604d878..941497f31cf0 100644 +--- a/drivers/acpi/acpica/acglobal.h ++++ b/drivers/acpi/acpica/acglobal.h +@@ -116,7 +116,7 @@ ACPI_GLOBAL(u8, acpi_gbl_global_lock_pending); * interrupt level */ ACPI_GLOBAL(acpi_spinlock, acpi_gbl_gpe_lock); /* For GPE data structs and registers */ @@ -4173,10 +4292,11 @@ diff -Nur linux-4.4.13.orig/drivers/acpi/acpica/acglobal.h linux-4.4.13/drivers/ ACPI_GLOBAL(acpi_spinlock, acpi_gbl_reference_count_lock); /* Mutex for _OSI support */ -diff -Nur linux-4.4.13.orig/drivers/acpi/acpica/hwregs.c linux-4.4.13/drivers/acpi/acpica/hwregs.c ---- linux-4.4.13.orig/drivers/acpi/acpica/hwregs.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/acpi/acpica/hwregs.c 2016-06-22 21:55:07.994523867 +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))); @@ -4193,10 +4313,11 @@ diff -Nur linux-4.4.13.orig/drivers/acpi/acpica/hwregs.c linux-4.4.13/drivers/ac if (ACPI_FAILURE(status)) { goto exit; -diff -Nur linux-4.4.13.orig/drivers/acpi/acpica/hwxface.c linux-4.4.13/drivers/acpi/acpica/hwxface.c ---- linux-4.4.13.orig/drivers/acpi/acpica/hwxface.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/acpi/acpica/hwxface.c 2016-06-22 21:55:07.994523867 +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); } @@ -4205,7 +4326,7 @@ diff -Nur linux-4.4.13.orig/drivers/acpi/acpica/hwxface.c linux-4.4.13/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: @@ -4214,10 +4335,11 @@ diff -Nur linux-4.4.13.orig/drivers/acpi/acpica/hwxface.c linux-4.4.13/drivers/a return_ACPI_STATUS(status); } -diff -Nur linux-4.4.13.orig/drivers/acpi/acpica/utmutex.c linux-4.4.13/drivers/acpi/acpica/utmutex.c ---- linux-4.4.13.orig/drivers/acpi/acpica/utmutex.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/acpi/acpica/utmutex.c 2016-06-22 21:55:07.994523867 +0200 -@@ -88,7 +88,7 @@ +diff --git a/drivers/acpi/acpica/utmutex.c b/drivers/acpi/acpica/utmutex.c +index ce406e39b669..41a75eb3ae9d 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); } @@ -4226,7 +4348,7 @@ diff -Nur linux-4.4.13.orig/drivers/acpi/acpica/utmutex.c linux-4.4.13/drivers/a if (ACPI_FAILURE (status)) { return_ACPI_STATUS (status); } -@@ -156,7 +156,7 @@ +@@ -156,7 +156,7 @@ void acpi_ut_mutex_terminate(void) /* Delete the spinlocks */ acpi_os_delete_lock(acpi_gbl_gpe_lock); @@ -4235,10 +4357,11 @@ diff -Nur linux-4.4.13.orig/drivers/acpi/acpica/utmutex.c linux-4.4.13/drivers/a acpi_os_delete_lock(acpi_gbl_reference_count_lock); /* Delete the reader/writer lock */ -diff -Nur linux-4.4.13.orig/drivers/ata/libata-sff.c linux-4.4.13/drivers/ata/libata-sff.c ---- linux-4.4.13.orig/drivers/ata/libata-sff.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/ata/libata-sff.c 2016-06-22 21:55:07.994523867 +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; @@ -4250,7 +4373,7 @@ diff -Nur linux-4.4.13.orig/drivers/ata/libata-sff.c linux-4.4.13/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 */ @@ -4259,7 +4382,7 @@ diff -Nur linux-4.4.13.orig/drivers/ata/libata-sff.c linux-4.4.13/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); @@ -4268,7 +4391,7 @@ diff -Nur linux-4.4.13.orig/drivers/ata/libata-sff.c linux-4.4.13/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 */ @@ -4277,7 +4400,7 @@ diff -Nur linux-4.4.13.orig/drivers/ata/libata-sff.c linux-4.4.13/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); @@ -4286,10 +4409,11 @@ diff -Nur linux-4.4.13.orig/drivers/ata/libata-sff.c linux-4.4.13/drivers/ata/li } else { buf = page_address(page); consumed = ap->ops->sff_data_xfer(dev, buf + offset, -diff -Nur linux-4.4.13.orig/drivers/block/zram/zram_drv.c linux-4.4.13/drivers/block/zram/zram_drv.c ---- linux-4.4.13.orig/drivers/block/zram/zram_drv.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/block/zram/zram_drv.c 2016-06-22 21:55:07.994523867 +0200 -@@ -520,6 +520,8 @@ +diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c +index 370c2f76016d..65e0b375a291 100644 +--- a/drivers/block/zram/zram_drv.c ++++ b/drivers/block/zram/zram_drv.c +@@ -520,6 +520,8 @@ static struct zram_meta *zram_meta_alloc(char *pool_name, u64 disksize) goto out_error; } @@ -4298,7 +4422,7 @@ diff -Nur linux-4.4.13.orig/drivers/block/zram/zram_drv.c linux-4.4.13/drivers/b return meta; out_error: -@@ -568,12 +570,12 @@ +@@ -568,12 +570,12 @@ static int zram_decompress_page(struct zram *zram, char *mem, u32 index) unsigned long handle; size_t size; @@ -4313,7 +4437,7 @@ diff -Nur linux-4.4.13.orig/drivers/block/zram/zram_drv.c linux-4.4.13/drivers/b clear_page(mem); return 0; } -@@ -584,7 +586,7 @@ +@@ -584,7 +586,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); @@ -4322,7 +4446,7 @@ diff -Nur linux-4.4.13.orig/drivers/block/zram/zram_drv.c linux-4.4.13/drivers/b /* Should NEVER happen. Return bio error if it does. */ if (unlikely(ret)) { -@@ -604,14 +606,14 @@ +@@ -604,14 +606,14 @@ static int zram_bvec_read(struct zram *zram, struct bio_vec *bvec, struct zram_meta *meta = zram->meta; page = bvec->bv_page; @@ -4340,7 +4464,7 @@ diff -Nur linux-4.4.13.orig/drivers/block/zram/zram_drv.c linux-4.4.13/drivers/b if (is_partial_io(bvec)) /* Use a temporary buffer to decompress the page */ -@@ -689,10 +691,10 @@ +@@ -689,10 +691,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. */ @@ -4353,7 +4477,7 @@ diff -Nur linux-4.4.13.orig/drivers/block/zram/zram_drv.c linux-4.4.13/drivers/b atomic64_inc(&zram->stats.zero_pages); ret = 0; -@@ -752,12 +754,12 @@ +@@ -752,12 +754,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. */ @@ -4368,7 +4492,7 @@ diff -Nur linux-4.4.13.orig/drivers/block/zram/zram_drv.c linux-4.4.13/drivers/b /* Update stats */ atomic64_add(clen, &zram->stats.compr_data_size); -@@ -800,9 +802,9 @@ +@@ -800,9 +802,9 @@ static void zram_bio_discard(struct zram *zram, u32 index, } while (n >= PAGE_SIZE) { @@ -4380,7 +4504,7 @@ diff -Nur linux-4.4.13.orig/drivers/block/zram/zram_drv.c linux-4.4.13/drivers/b atomic64_inc(&zram->stats.notify_free); index++; n -= PAGE_SIZE; -@@ -928,9 +930,9 @@ +@@ -928,9 +930,9 @@ static void zram_slot_free_notify(struct block_device *bdev, zram = bdev->bd_disk->private_data; meta = zram->meta; @@ -4392,10 +4516,11 @@ diff -Nur linux-4.4.13.orig/drivers/block/zram/zram_drv.c linux-4.4.13/drivers/b atomic64_inc(&zram->stats.notify_free); } -diff -Nur linux-4.4.13.orig/drivers/block/zram/zram_drv.h linux-4.4.13/drivers/block/zram/zram_drv.h ---- linux-4.4.13.orig/drivers/block/zram/zram_drv.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/block/zram/zram_drv.h 2016-06-22 21:55:07.994523867 +0200 -@@ -72,6 +72,9 @@ +diff --git a/drivers/block/zram/zram_drv.h b/drivers/block/zram/zram_drv.h +index 8e92339686d7..9e3e953d680e 100644 +--- a/drivers/block/zram/zram_drv.h ++++ b/drivers/block/zram/zram_drv.h +@@ -72,6 +72,9 @@ enum zram_pageflags { struct zram_table_entry { unsigned long handle; unsigned long value; @@ -4405,7 +4530,7 @@ diff -Nur linux-4.4.13.orig/drivers/block/zram/zram_drv.h linux-4.4.13/drivers/b }; struct zram_stats { -@@ -119,4 +122,42 @@ +@@ -119,4 +122,42 @@ struct zram { */ bool claim; /* Protected by bdev->bd_mutex */ }; @@ -4448,10 +4573,11 @@ diff -Nur linux-4.4.13.orig/drivers/block/zram/zram_drv.h linux-4.4.13/drivers/b +#endif /* CONFIG_PREEMPT_RT_BASE */ + #endif -diff -Nur linux-4.4.13.orig/drivers/char/random.c linux-4.4.13/drivers/char/random.c ---- linux-4.4.13.orig/drivers/char/random.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/char/random.c 2016-06-22 21:55:07.994523867 +0200 -@@ -796,8 +796,6 @@ +diff --git a/drivers/char/random.c b/drivers/char/random.c +index 491a4dce13fe..cf69b6b42208 100644 +--- a/drivers/char/random.c ++++ b/drivers/char/random.c +@@ -799,8 +799,6 @@ static void add_timer_randomness(struct timer_rand_state *state, unsigned num) } sample; long delta, delta2, delta3; @@ -4460,7 +4586,7 @@ diff -Nur linux-4.4.13.orig/drivers/char/random.c linux-4.4.13/drivers/char/rand sample.jiffies = jiffies; sample.cycles = random_get_entropy(); sample.num = num; -@@ -838,7 +836,6 @@ +@@ -841,7 +839,6 @@ static void add_timer_randomness(struct timer_rand_state *state, unsigned num) */ credit_entropy_bits(r, min_t(int, fls(delta>>1), 11)); } @@ -4468,7 +4594,7 @@ diff -Nur linux-4.4.13.orig/drivers/char/random.c linux-4.4.13/drivers/char/rand } void add_input_randomness(unsigned int type, unsigned int code, -@@ -891,28 +888,27 @@ +@@ -894,28 +891,27 @@ static __u32 get_reg(struct fast_pool *f, struct pt_regs *regs) return *(ptr + f->reg_idx++); } @@ -4502,9 +4628,10 @@ diff -Nur linux-4.4.13.orig/drivers/char/random.c linux-4.4.13/drivers/char/rand fast_mix(fast_pool); add_interrupt_bench(cycles); -diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-generated.c linux-4.4.13/drivers/clk/at91/clk-generated.c ---- linux-4.4.13.orig/drivers/clk/at91/clk-generated.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/clk/at91/clk-generated.c 2016-06-22 21:55:07.994523867 +0200 +diff --git a/drivers/clk/at91/clk-generated.c b/drivers/clk/at91/clk-generated.c +index abc80949e1dd..4ad3298eb372 100644 +--- a/drivers/clk/at91/clk-generated.c ++++ b/drivers/clk/at91/clk-generated.c @@ -15,8 +15,8 @@ #include <linux/clkdev.h> #include <linux/clk/at91_pmc.h> @@ -4527,7 +4654,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-generated.c linux-4.4.13/driver u32 id; u32 gckdiv; u8 parent_id; -@@ -41,49 +42,52 @@ +@@ -41,49 +42,52 @@ struct clk_generated { static int clk_generated_enable(struct clk_hw *hw) { struct clk_generated *gck = to_clk_generated(hw); @@ -4566,13 +4693,14 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-generated.c linux-4.4.13/driver struct clk_generated *gck = to_clk_generated(hw); - struct at91_pmc *pmc = gck->pmc; - u32 tmp; -+ unsigned long flags; - +- - pmc_lock(pmc); - pmc_write(pmc, AT91_PMC_PCR, (gck->id & AT91_PMC_PCR_PID_MASK)); - tmp = pmc_read(pmc, AT91_PMC_PCR) & ~AT91_PMC_PCR_GCKEN; - pmc_write(pmc, AT91_PMC_PCR, tmp | AT91_PMC_PCR_CMD); - pmc_unlock(pmc); ++ unsigned long flags; ++ + spin_lock_irqsave(gck->lock, flags); + regmap_write(gck->regmap, AT91_PMC_PCR, + (gck->id & AT91_PMC_PCR_PID_MASK)); @@ -4605,7 +4733,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-generated.c linux-4.4.13/driver } static unsigned long -@@ -214,13 +218,14 @@ +@@ -214,13 +218,14 @@ static const struct clk_ops generated_ops = { */ static void clk_generated_startup(struct clk_generated *gck) { @@ -4625,7 +4753,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-generated.c linux-4.4.13/driver gck->parent_id = (tmp & AT91_PMC_PCR_GCKCSS_MASK) >> AT91_PMC_PCR_GCKCSS_OFFSET; -@@ -229,8 +234,8 @@ +@@ -229,8 +234,8 @@ static void clk_generated_startup(struct clk_generated *gck) } static struct clk * __init @@ -4636,7 +4764,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-generated.c linux-4.4.13/driver u8 id, const struct clk_range *range) { struct clk_generated *gck; -@@ -249,7 +254,8 @@ +@@ -249,7 +254,8 @@ at91_clk_register_generated(struct at91_pmc *pmc, const char *name, gck->id = id; gck->hw.init = &init; @@ -4646,7 +4774,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-generated.c linux-4.4.13/driver gck->range = *range; clk = clk_register(NULL, &gck->hw); -@@ -261,8 +267,7 @@ +@@ -261,8 +267,7 @@ at91_clk_register_generated(struct at91_pmc *pmc, const char *name, return clk; } @@ -4656,7 +4784,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-generated.c linux-4.4.13/driver { int num; u32 id; -@@ -272,6 +277,7 @@ +@@ -272,6 +277,7 @@ void __init of_sama5d2_clk_generated_setup(struct device_node *np, const char *parent_names[GENERATED_SOURCE_MAX]; struct device_node *gcknp; struct clk_range range = CLK_RANGE(0, 0); @@ -4664,7 +4792,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-generated.c linux-4.4.13/driver num_parents = of_clk_get_parent_count(np); if (num_parents <= 0 || num_parents > GENERATED_SOURCE_MAX) -@@ -283,6 +289,10 @@ +@@ -283,6 +289,10 @@ void __init of_sama5d2_clk_generated_setup(struct device_node *np, if (!num || num > PERIPHERAL_MAX) return; @@ -4675,7 +4803,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-generated.c linux-4.4.13/driver for_each_child_of_node(np, gcknp) { if (of_property_read_u32(gcknp, "reg", &id)) continue; -@@ -296,11 +306,14 @@ +@@ -296,11 +306,14 @@ void __init of_sama5d2_clk_generated_setup(struct device_node *np, of_at91_get_clk_range(gcknp, "atmel,clk-output-range", &range); @@ -4692,9 +4820,10 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-generated.c linux-4.4.13/driver } +CLK_OF_DECLARE(of_sama5d2_clk_generated_setup, "atmel,sama5d2-clk-generated", + of_sama5d2_clk_generated_setup); -diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-h32mx.c linux-4.4.13/drivers/clk/at91/clk-h32mx.c ---- linux-4.4.13.orig/drivers/clk/at91/clk-h32mx.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/clk/at91/clk-h32mx.c 2016-06-22 21:55:07.994523867 +0200 +diff --git a/drivers/clk/at91/clk-h32mx.c b/drivers/clk/at91/clk-h32mx.c +index a165230e7eda..8e20c8a76db7 100644 +--- a/drivers/clk/at91/clk-h32mx.c ++++ b/drivers/clk/at91/clk-h32mx.c @@ -15,15 +15,9 @@ #include <linux/clk-provider.h> #include <linux/clkdev.h> @@ -4722,7 +4851,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-h32mx.c linux-4.4.13/drivers/cl }; #define to_clk_sama5d4_h32mx(hw) container_of(hw, struct clk_sama5d4_h32mx, hw) -@@ -40,8 +34,10 @@ +@@ -40,8 +34,10 @@ static unsigned long clk_sama5d4_h32mx_recalc_rate(struct clk_hw *hw, unsigned long parent_rate) { struct clk_sama5d4_h32mx *h32mxclk = to_clk_sama5d4_h32mx(hw); @@ -4734,7 +4863,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-h32mx.c linux-4.4.13/drivers/cl return parent_rate / 2; if (parent_rate > H32MX_MAX_FREQ) -@@ -70,18 +66,16 @@ +@@ -70,18 +66,16 @@ static int clk_sama5d4_h32mx_set_rate(struct clk_hw *hw, unsigned long rate, unsigned long parent_rate) { struct clk_sama5d4_h32mx *h32mxclk = to_clk_sama5d4_h32mx(hw); @@ -4758,7 +4887,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-h32mx.c linux-4.4.13/drivers/cl return 0; } -@@ -92,14 +86,18 @@ +@@ -92,14 +86,18 @@ static const struct clk_ops h32mx_ops = { .set_rate = clk_sama5d4_h32mx_set_rate, }; @@ -4779,7 +4908,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-h32mx.c linux-4.4.13/drivers/cl h32mxclk = kzalloc(sizeof(*h32mxclk), GFP_KERNEL); if (!h32mxclk) return; -@@ -113,7 +111,7 @@ +@@ -113,7 +111,7 @@ void __init of_sama5d4_clk_h32mx_setup(struct device_node *np, init.flags = CLK_SET_RATE_GATE; h32mxclk->hw.init = &init; @@ -4788,15 +4917,16 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-h32mx.c linux-4.4.13/drivers/cl clk = clk_register(NULL, &h32mxclk->hw); if (IS_ERR(clk)) { -@@ -123,3 +121,5 @@ +@@ -123,3 +121,5 @@ void __init of_sama5d4_clk_h32mx_setup(struct device_node *np, of_clk_add_provider(np, of_clk_src_simple_get, clk); } +CLK_OF_DECLARE(of_sama5d4_clk_h32mx_setup, "atmel,sama5d4-clk-h32mx", + of_sama5d4_clk_h32mx_setup); -diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-main.c linux-4.4.13/drivers/clk/at91/clk-main.c ---- linux-4.4.13.orig/drivers/clk/at91/clk-main.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/clk/at91/clk-main.c 2016-06-22 21:55:07.994523867 +0200 +diff --git a/drivers/clk/at91/clk-main.c b/drivers/clk/at91/clk-main.c +index fd7247deabdc..4bfc94d6c26e 100644 +--- a/drivers/clk/at91/clk-main.c ++++ b/drivers/clk/at91/clk-main.c @@ -13,13 +13,8 @@ #include <linux/clk/at91_pmc.h> #include <linux/delay.h> @@ -4834,7 +4964,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-main.c linux-4.4.13/drivers/clk unsigned long frequency; unsigned long accuracy; }; -@@ -54,51 +45,47 @@ +@@ -54,51 +45,47 @@ struct clk_main_rc_osc { struct clk_rm9200_main { struct clk_hw hw; @@ -4899,7 +5029,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-main.c linux-4.4.13/drivers/clk return 0; } -@@ -106,9 +93,10 @@ +@@ -106,9 +93,10 @@ static int clk_main_osc_prepare(struct clk_hw *hw) static void clk_main_osc_unprepare(struct clk_hw *hw) { struct clk_main_osc *osc = to_clk_main_osc(hw); @@ -4912,7 +5042,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-main.c linux-4.4.13/drivers/clk if (tmp & AT91_PMC_OSCBYPASS) return; -@@ -116,20 +104,22 @@ +@@ -116,20 +104,22 @@ static void clk_main_osc_unprepare(struct clk_hw *hw) return; tmp &= ~(AT91_PMC_KEY | AT91_PMC_MOSCEN); @@ -4940,7 +5070,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-main.c linux-4.4.13/drivers/clk } static const struct clk_ops main_osc_ops = { -@@ -139,18 +129,16 @@ +@@ -139,18 +129,16 @@ static const struct clk_ops main_osc_ops = { }; static struct clk * __init @@ -4961,7 +5091,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-main.c linux-4.4.13/drivers/clk return ERR_PTR(-EINVAL); osc = kzalloc(sizeof(*osc), GFP_KERNEL); -@@ -164,85 +152,70 @@ +@@ -164,85 +152,70 @@ at91_clk_register_main_osc(struct at91_pmc *pmc, init.flags = CLK_IGNORE_UNUSED; osc->hw.init = &init; @@ -5073,7 +5203,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-main.c linux-4.4.13/drivers/clk return 0; } -@@ -250,23 +223,28 @@ +@@ -250,23 +223,28 @@ static int clk_main_rc_osc_prepare(struct clk_hw *hw) static void clk_main_rc_osc_unprepare(struct clk_hw *hw) { struct clk_main_rc_osc *osc = to_clk_main_rc_osc(hw); @@ -5081,10 +5211,10 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-main.c linux-4.4.13/drivers/clk - u32 tmp = pmc_read(pmc, AT91_CKGR_MOR); + struct regmap *regmap = osc->regmap; + unsigned int mor; ++ ++ regmap_read(regmap, AT91_CKGR_MOR, &mor); - if (!(tmp & AT91_PMC_MOSCRCEN)) -+ regmap_read(regmap, AT91_CKGR_MOR, &mor); -+ + if (!(mor & AT91_PMC_MOSCRCEN)) return; @@ -5100,17 +5230,17 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-main.c linux-4.4.13/drivers/clk - struct at91_pmc *pmc = osc->pmc; + struct regmap *regmap = osc->regmap; + unsigned int mor, status; -+ -+ regmap_read(regmap, AT91_CKGR_MOR, &mor); -+ regmap_read(regmap, AT91_PMC_SR, &status); - return !!((pmc_read(pmc, AT91_PMC_SR) & AT91_PMC_MOSCRCS) && - (pmc_read(pmc, AT91_CKGR_MOR) & AT91_PMC_MOSCRCEN)); ++ regmap_read(regmap, AT91_CKGR_MOR, &mor); ++ regmap_read(regmap, AT91_PMC_SR, &status); ++ + return (mor & AT91_PMC_MOSCRCEN) && (status & AT91_PMC_MOSCRCS); } static unsigned long clk_main_rc_osc_recalc_rate(struct clk_hw *hw, -@@ -294,17 +272,15 @@ +@@ -294,17 +272,15 @@ static const struct clk_ops main_rc_osc_ops = { }; static struct clk * __init @@ -5130,7 +5260,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-main.c linux-4.4.13/drivers/clk return ERR_PTR(-EINVAL); osc = kzalloc(sizeof(*osc), GFP_KERNEL); -@@ -318,63 +294,53 @@ +@@ -318,63 +294,53 @@ at91_clk_register_main_rc_osc(struct at91_pmc *pmc, init.flags = CLK_IS_ROOT | CLK_IGNORE_UNUSED; osc->hw.init = &init; @@ -5207,7 +5337,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-main.c linux-4.4.13/drivers/clk return 0; usleep_range(MAINF_LOOP_MIN_WAIT, MAINF_LOOP_MAX_WAIT); } while (time_before(prep_time, timeout)); -@@ -382,34 +348,37 @@ +@@ -382,34 +348,37 @@ static int clk_main_probe_frequency(struct at91_pmc *pmc) return -ETIMEDOUT; } @@ -5252,7 +5382,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-main.c linux-4.4.13/drivers/clk } static unsigned long clk_rm9200_main_recalc_rate(struct clk_hw *hw, -@@ -417,7 +386,7 @@ +@@ -417,7 +386,7 @@ static unsigned long clk_rm9200_main_recalc_rate(struct clk_hw *hw, { struct clk_rm9200_main *clkmain = to_clk_rm9200_main(hw); @@ -5261,7 +5391,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-main.c linux-4.4.13/drivers/clk } static const struct clk_ops rm9200_main_ops = { -@@ -427,7 +396,7 @@ +@@ -427,7 +396,7 @@ static const struct clk_ops rm9200_main_ops = { }; static struct clk * __init @@ -5270,7 +5400,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-main.c linux-4.4.13/drivers/clk const char *name, const char *parent_name) { -@@ -435,7 +404,7 @@ +@@ -435,7 +404,7 @@ at91_clk_register_rm9200_main(struct at91_pmc *pmc, struct clk *clk = NULL; struct clk_init_data init; @@ -5279,7 +5409,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-main.c linux-4.4.13/drivers/clk return ERR_PTR(-EINVAL); if (!parent_name) -@@ -452,7 +421,7 @@ +@@ -452,7 +421,7 @@ at91_clk_register_rm9200_main(struct at91_pmc *pmc, init.flags = 0; clkmain->hw.init = &init; @@ -5288,7 +5418,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-main.c linux-4.4.13/drivers/clk clk = clk_register(NULL, &clkmain->hw); if (IS_ERR(clk)) -@@ -461,52 +430,54 @@ +@@ -461,52 +430,54 @@ at91_clk_register_rm9200_main(struct at91_pmc *pmc, return clk; } @@ -5359,7 +5489,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-main.c linux-4.4.13/drivers/clk } static unsigned long clk_sam9x5_main_recalc_rate(struct clk_hw *hw, -@@ -514,30 +485,28 @@ +@@ -514,30 +485,28 @@ static unsigned long clk_sam9x5_main_recalc_rate(struct clk_hw *hw, { struct clk_sam9x5_main *clkmain = to_clk_sam9x5_main(hw); @@ -5399,7 +5529,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-main.c linux-4.4.13/drivers/clk return 0; } -@@ -545,8 +514,11 @@ +@@ -545,8 +514,11 @@ static int clk_sam9x5_main_set_parent(struct clk_hw *hw, u8 index) static u8 clk_sam9x5_main_get_parent(struct clk_hw *hw) { struct clk_sam9x5_main *clkmain = to_clk_sam9x5_main(hw); @@ -5412,7 +5542,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-main.c linux-4.4.13/drivers/clk } static const struct clk_ops sam9x5_main_ops = { -@@ -558,18 +530,17 @@ +@@ -558,18 +530,17 @@ static const struct clk_ops sam9x5_main_ops = { }; static struct clk * __init @@ -5434,7 +5564,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-main.c linux-4.4.13/drivers/clk return ERR_PTR(-EINVAL); if (!parent_names || !num_parents) -@@ -586,51 +557,42 @@ +@@ -586,51 +557,42 @@ at91_clk_register_sam9x5_main(struct at91_pmc *pmc, init.flags = CLK_SET_PARENT_GATE; clkmain->hw.init = &init; @@ -5498,9 +5628,10 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-main.c linux-4.4.13/drivers/clk } +CLK_OF_DECLARE(at91sam9x5_clk_main, "atmel,at91sam9x5-clk-main", + of_at91sam9x5_clk_main_setup); -diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-master.c linux-4.4.13/drivers/clk/at91/clk-master.c ---- linux-4.4.13.orig/drivers/clk/at91/clk-master.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/clk/at91/clk-master.c 2016-06-22 21:55:07.998523867 +0200 +diff --git a/drivers/clk/at91/clk-master.c b/drivers/clk/at91/clk-master.c +index 620ea323356b..7d4a1864ea7c 100644 +--- a/drivers/clk/at91/clk-master.c ++++ b/drivers/clk/at91/clk-master.c @@ -12,13 +12,8 @@ #include <linux/clkdev.h> #include <linux/clk/at91_pmc.h> @@ -5517,7 +5648,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-master.c linux-4.4.13/drivers/c #include "pmc.h" -@@ -44,32 +39,26 @@ +@@ -44,32 +39,26 @@ struct clk_master_layout { struct clk_master { struct clk_hw hw; @@ -5558,7 +5689,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-master.c linux-4.4.13/drivers/c return 0; } -@@ -78,7 +67,7 @@ +@@ -78,7 +67,7 @@ static int clk_master_is_prepared(struct clk_hw *hw) { struct clk_master *master = to_clk_master(hw); @@ -5567,7 +5698,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-master.c linux-4.4.13/drivers/c } static unsigned long clk_master_recalc_rate(struct clk_hw *hw, -@@ -88,18 +77,16 @@ +@@ -88,18 +77,16 @@ static unsigned long clk_master_recalc_rate(struct clk_hw *hw, u8 div; unsigned long rate = parent_rate; struct clk_master *master = to_clk_master(hw); @@ -5591,7 +5722,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-master.c linux-4.4.13/drivers/c if (characteristics->have_div3_pres && pres == MASTER_PRES_MAX) rate /= 3; -@@ -119,9 +106,11 @@ +@@ -119,9 +106,11 @@ static unsigned long clk_master_recalc_rate(struct clk_hw *hw, static u8 clk_master_get_parent(struct clk_hw *hw) { struct clk_master *master = to_clk_master(hw); @@ -5605,7 +5736,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-master.c linux-4.4.13/drivers/c } static const struct clk_ops master_ops = { -@@ -132,18 +121,17 @@ +@@ -132,18 +121,17 @@ static const struct clk_ops master_ops = { }; static struct clk * __init @@ -5626,7 +5757,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-master.c linux-4.4.13/drivers/c return ERR_PTR(-EINVAL); master = kzalloc(sizeof(*master), GFP_KERNEL); -@@ -159,20 +147,10 @@ +@@ -159,20 +147,10 @@ at91_clk_register_master(struct at91_pmc *pmc, unsigned int irq, master->hw.init = &init; master->layout = layout; master->characteristics = characteristics; @@ -5648,7 +5779,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-master.c linux-4.4.13/drivers/c kfree(master); } -@@ -217,15 +195,15 @@ +@@ -217,15 +195,15 @@ out_free_characteristics: } static void __init @@ -5666,7 +5797,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-master.c linux-4.4.13/drivers/c num_parents = of_clk_get_parent_count(np); if (num_parents <= 0 || num_parents > MASTER_SOURCE_MAX) -@@ -239,11 +217,11 @@ +@@ -239,11 +217,11 @@ of_at91_clk_master_setup(struct device_node *np, struct at91_pmc *pmc, if (!characteristics) return; @@ -5682,7 +5813,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-master.c linux-4.4.13/drivers/c parent_names, layout, characteristics); if (IS_ERR(clk)) -@@ -256,14 +234,16 @@ +@@ -256,14 +234,16 @@ out_free_characteristics: kfree(characteristics); } @@ -5705,9 +5836,10 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-master.c linux-4.4.13/drivers/c } +CLK_OF_DECLARE(at91sam9x5_clk_master, "atmel,at91sam9x5-clk-master", + of_at91sam9x5_clk_master_setup); -diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-peripheral.c linux-4.4.13/drivers/clk/at91/clk-peripheral.c ---- linux-4.4.13.orig/drivers/clk/at91/clk-peripheral.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/clk/at91/clk-peripheral.c 2016-06-22 21:55:07.998523867 +0200 +diff --git a/drivers/clk/at91/clk-peripheral.c b/drivers/clk/at91/clk-peripheral.c +index 58f3b568e9cb..d69cd2a121b1 100644 +--- a/drivers/clk/at91/clk-peripheral.c ++++ b/drivers/clk/at91/clk-peripheral.c @@ -12,11 +12,13 @@ #include <linux/clkdev.h> #include <linux/clk/at91_pmc.h> @@ -5733,7 +5865,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-peripheral.c linux-4.4.13/drive u32 id; }; -@@ -41,8 +43,9 @@ +@@ -41,8 +43,9 @@ struct clk_peripheral { struct clk_sam9x5_peripheral { struct clk_hw hw; @@ -5744,7 +5876,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-peripheral.c linux-4.4.13/drive u32 id; u32 div; bool auto_div; -@@ -54,7 +57,6 @@ +@@ -54,7 +57,6 @@ struct clk_sam9x5_peripheral { static int clk_peripheral_enable(struct clk_hw *hw) { struct clk_peripheral *periph = to_clk_peripheral(hw); @@ -5752,7 +5884,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-peripheral.c linux-4.4.13/drive int offset = AT91_PMC_PCER; u32 id = periph->id; -@@ -62,14 +64,14 @@ +@@ -62,14 +64,14 @@ static int clk_peripheral_enable(struct clk_hw *hw) return 0; if (id > PERIPHERAL_ID_MAX) offset = AT91_PMC_PCER1; @@ -5769,7 +5901,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-peripheral.c linux-4.4.13/drive int offset = AT91_PMC_PCDR; u32 id = periph->id; -@@ -77,21 +79,23 @@ +@@ -77,21 +79,23 @@ static void clk_peripheral_disable(struct clk_hw *hw) return; if (id > PERIPHERAL_ID_MAX) offset = AT91_PMC_PCDR1; @@ -5796,7 +5928,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-peripheral.c linux-4.4.13/drive } static const struct clk_ops peripheral_ops = { -@@ -101,14 +105,14 @@ +@@ -101,14 +105,14 @@ static const struct clk_ops peripheral_ops = { }; static struct clk * __init @@ -5813,7 +5945,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-peripheral.c linux-4.4.13/drive return ERR_PTR(-EINVAL); periph = kzalloc(sizeof(*periph), GFP_KERNEL); -@@ -123,7 +127,7 @@ +@@ -123,7 +127,7 @@ at91_clk_register_peripheral(struct at91_pmc *pmc, const char *name, periph->id = id; periph->hw.init = &init; @@ -5822,7 +5954,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-peripheral.c linux-4.4.13/drive clk = clk_register(NULL, &periph->hw); if (IS_ERR(clk)) -@@ -160,53 +164,58 @@ +@@ -160,53 +164,58 @@ static void clk_sam9x5_peripheral_autodiv(struct clk_sam9x5_peripheral *periph) static int clk_sam9x5_peripheral_enable(struct clk_hw *hw) { struct clk_sam9x5_peripheral *periph = to_clk_sam9x5_peripheral(hw); @@ -5904,7 +6036,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-peripheral.c linux-4.4.13/drive } static unsigned long -@@ -214,19 +223,20 @@ +@@ -214,19 +223,20 @@ clk_sam9x5_peripheral_recalc_rate(struct clk_hw *hw, unsigned long parent_rate) { struct clk_sam9x5_peripheral *periph = to_clk_sam9x5_peripheral(hw); @@ -5933,7 +6065,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-peripheral.c linux-4.4.13/drive periph->auto_div = false; } else { clk_sam9x5_peripheral_autodiv(periph); -@@ -318,15 +328,15 @@ +@@ -318,15 +328,15 @@ static const struct clk_ops sam9x5_peripheral_ops = { }; static struct clk * __init @@ -5953,7 +6085,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-peripheral.c linux-4.4.13/drive return ERR_PTR(-EINVAL); periph = kzalloc(sizeof(*periph), GFP_KERNEL); -@@ -342,7 +352,8 @@ +@@ -342,7 +352,8 @@ at91_clk_register_sam9x5_peripheral(struct at91_pmc *pmc, const char *name, periph->id = id; periph->hw.init = &init; periph->div = 0; @@ -5963,7 +6095,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-peripheral.c linux-4.4.13/drive periph->auto_div = true; periph->range = *range; -@@ -356,7 +367,7 @@ +@@ -356,7 +367,7 @@ at91_clk_register_sam9x5_peripheral(struct at91_pmc *pmc, const char *name, } static void __init @@ -5972,7 +6104,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-peripheral.c linux-4.4.13/drive { int num; u32 id; -@@ -364,6 +375,7 @@ +@@ -364,6 +375,7 @@ of_at91_clk_periph_setup(struct device_node *np, struct at91_pmc *pmc, u8 type) const char *parent_name; const char *name; struct device_node *periphclknp; @@ -5980,7 +6112,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-peripheral.c linux-4.4.13/drive parent_name = of_clk_get_parent_name(np, 0); if (!parent_name) -@@ -373,6 +385,10 @@ +@@ -373,6 +385,10 @@ of_at91_clk_periph_setup(struct device_node *np, struct at91_pmc *pmc, u8 type) if (!num || num > PERIPHERAL_MAX) return; @@ -5991,7 +6123,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-peripheral.c linux-4.4.13/drive for_each_child_of_node(np, periphclknp) { if (of_property_read_u32(periphclknp, "reg", &id)) continue; -@@ -384,7 +400,7 @@ +@@ -384,7 +400,7 @@ of_at91_clk_periph_setup(struct device_node *np, struct at91_pmc *pmc, u8 type) name = periphclknp->name; if (type == PERIPHERAL_AT91RM9200) { @@ -6000,7 +6132,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-peripheral.c linux-4.4.13/drive parent_name, id); } else { struct clk_range range = CLK_RANGE(0, 0); -@@ -393,7 +409,9 @@ +@@ -393,7 +409,9 @@ of_at91_clk_periph_setup(struct device_node *np, struct at91_pmc *pmc, u8 type) "atmel,clk-output-range", &range); @@ -6011,7 +6143,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-peripheral.c linux-4.4.13/drive parent_name, id, &range); } -@@ -405,14 +423,16 @@ +@@ -405,14 +423,16 @@ of_at91_clk_periph_setup(struct device_node *np, struct at91_pmc *pmc, u8 type) } } @@ -6034,9 +6166,10 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-peripheral.c linux-4.4.13/drive } +CLK_OF_DECLARE(at91sam9x5_clk_periph, "atmel,at91sam9x5-clk-peripheral", + of_at91sam9x5_clk_periph_setup); -diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-pll.c linux-4.4.13/drivers/clk/at91/clk-pll.c ---- linux-4.4.13.orig/drivers/clk/at91/clk-pll.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/clk/at91/clk-pll.c 2016-06-22 21:55:07.998523867 +0200 +diff --git a/drivers/clk/at91/clk-pll.c b/drivers/clk/at91/clk-pll.c +index 18b60f4895a6..fb2e0b56d4b7 100644 +--- a/drivers/clk/at91/clk-pll.c ++++ b/drivers/clk/at91/clk-pll.c @@ -12,14 +12,8 @@ #include <linux/clkdev.h> #include <linux/clk/at91_pmc.h> @@ -6054,7 +6187,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-pll.c linux-4.4.13/drivers/clk/ #include "pmc.h" -@@ -58,9 +52,7 @@ +@@ -58,9 +52,7 @@ struct clk_pll_layout { struct clk_pll { struct clk_hw hw; @@ -6065,7 +6198,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-pll.c linux-4.4.13/drivers/clk/ u8 id; u8 div; u8 range; -@@ -69,20 +61,19 @@ +@@ -69,20 +61,19 @@ struct clk_pll { const struct clk_pll_characteristics *characteristics; }; @@ -6091,7 +6224,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-pll.c linux-4.4.13/drivers/clk/ const struct clk_pll_layout *layout = pll->layout; const struct clk_pll_characteristics *characteristics = pll->characteristics; -@@ -90,39 +81,34 @@ +@@ -90,39 +81,34 @@ static int clk_pll_prepare(struct clk_hw *hw) u32 mask = PLL_STATUS_MASK(id); int offset = PLL_REG(id); u8 out = 0; @@ -6147,7 +6280,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-pll.c linux-4.4.13/drivers/clk/ return 0; } -@@ -130,32 +116,35 @@ +@@ -130,32 +116,35 @@ static int clk_pll_prepare(struct clk_hw *hw) static int clk_pll_is_prepared(struct clk_hw *hw) { struct clk_pll *pll = to_clk_pll(hw); @@ -6178,13 +6311,13 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-pll.c linux-4.4.13/drivers/clk/ + unsigned int pllr; + u16 mul; + u8 div; -+ + +- if (!pll->div || !pll->mul) + regmap_read(pll->regmap, PLL_REG(pll->id), &pllr); + + div = PLL_DIV(pllr); + mul = PLL_MUL(pllr, pll->layout); - -- if (!pll->div || !pll->mul) ++ + if (!div || !mul) return 0; @@ -6193,7 +6326,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-pll.c linux-4.4.13/drivers/clk/ } static long clk_pll_get_best_div_mul(struct clk_pll *pll, unsigned long rate, -@@ -308,7 +297,7 @@ +@@ -308,7 +297,7 @@ static const struct clk_ops pll_ops = { }; static struct clk * __init @@ -6202,7 +6335,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-pll.c linux-4.4.13/drivers/clk/ const char *parent_name, u8 id, const struct clk_pll_layout *layout, const struct clk_pll_characteristics *characteristics) -@@ -316,9 +305,8 @@ +@@ -316,9 +305,8 @@ at91_clk_register_pll(struct at91_pmc *pmc, unsigned int irq, const char *name, struct clk_pll *pll; struct clk *clk = NULL; struct clk_init_data init; @@ -6213,7 +6346,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-pll.c linux-4.4.13/drivers/clk/ if (id > PLL_MAX_ID) return ERR_PTR(-EINVAL); -@@ -337,23 +325,13 @@ +@@ -337,23 +325,13 @@ at91_clk_register_pll(struct at91_pmc *pmc, unsigned int irq, const char *name, pll->hw.init = &init; pll->layout = layout; pll->characteristics = characteristics; @@ -6241,7 +6374,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-pll.c linux-4.4.13/drivers/clk/ kfree(pll); } -@@ -483,12 +461,12 @@ +@@ -483,12 +461,12 @@ out_free_characteristics: } static void __init @@ -6256,7 +6389,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-pll.c linux-4.4.13/drivers/clk/ const char *parent_name; const char *name = np->name; struct clk_pll_characteristics *characteristics; -@@ -500,15 +478,15 @@ +@@ -500,15 +478,15 @@ of_at91_clk_pll_setup(struct device_node *np, struct at91_pmc *pmc, of_property_read_string(np, "clock-output-names", &name); @@ -6277,7 +6410,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-pll.c linux-4.4.13/drivers/clk/ characteristics); if (IS_ERR(clk)) goto out_free_characteristics; -@@ -520,26 +498,30 @@ +@@ -520,26 +498,30 @@ out_free_characteristics: kfree(characteristics); } @@ -6320,9 +6453,10 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-pll.c linux-4.4.13/drivers/clk/ } +CLK_OF_DECLARE(sama5d3_clk_pll, "atmel,sama5d3-clk-pll", + of_sama5d3_clk_pll_setup); -diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-plldiv.c linux-4.4.13/drivers/clk/at91/clk-plldiv.c ---- linux-4.4.13.orig/drivers/clk/at91/clk-plldiv.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/clk/at91/clk-plldiv.c 2016-06-22 21:55:07.998523867 +0200 +diff --git a/drivers/clk/at91/clk-plldiv.c b/drivers/clk/at91/clk-plldiv.c +index ea226562bb40..2bed26481027 100644 +--- a/drivers/clk/at91/clk-plldiv.c ++++ b/drivers/clk/at91/clk-plldiv.c @@ -12,8 +12,8 @@ #include <linux/clkdev.h> #include <linux/clk/at91_pmc.h> @@ -6356,7 +6490,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-plldiv.c linux-4.4.13/drivers/c return parent_rate / 2; return parent_rate; -@@ -57,18 +59,12 @@ +@@ -57,18 +59,12 @@ static int clk_plldiv_set_rate(struct clk_hw *hw, unsigned long rate, unsigned long parent_rate) { struct clk_plldiv *plldiv = to_clk_plldiv(hw); @@ -6378,7 +6512,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-plldiv.c linux-4.4.13/drivers/c return 0; } -@@ -80,7 +76,7 @@ +@@ -80,7 +76,7 @@ static const struct clk_ops plldiv_ops = { }; static struct clk * __init @@ -6387,7 +6521,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-plldiv.c linux-4.4.13/drivers/c const char *parent_name) { struct clk_plldiv *plldiv; -@@ -98,7 +94,7 @@ +@@ -98,7 +94,7 @@ at91_clk_register_plldiv(struct at91_pmc *pmc, const char *name, init.flags = CLK_SET_RATE_GATE; plldiv->hw.init = &init; @@ -6396,7 +6530,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-plldiv.c linux-4.4.13/drivers/c clk = clk_register(NULL, &plldiv->hw); -@@ -109,27 +105,27 @@ +@@ -109,27 +105,27 @@ at91_clk_register_plldiv(struct at91_pmc *pmc, const char *name, } static void __init @@ -6432,9 +6566,10 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-plldiv.c linux-4.4.13/drivers/c -} +CLK_OF_DECLARE(at91sam9x5_clk_plldiv, "atmel,at91sam9x5-clk-plldiv", + of_at91sam9x5_clk_plldiv_setup); -diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-programmable.c linux-4.4.13/drivers/clk/at91/clk-programmable.c ---- linux-4.4.13.orig/drivers/clk/at91/clk-programmable.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/clk/at91/clk-programmable.c 2016-06-22 21:55:07.998523867 +0200 +diff --git a/drivers/clk/at91/clk-programmable.c b/drivers/clk/at91/clk-programmable.c +index 14b270b85fec..bc0be629671b 100644 +--- a/drivers/clk/at91/clk-programmable.c ++++ b/drivers/clk/at91/clk-programmable.c @@ -12,10 +12,8 @@ #include <linux/clkdev.h> #include <linux/clk/at91_pmc.h> @@ -6456,7 +6591,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-programmable.c linux-4.4.13/dri #define PROG_MAX_RM9200_CSS 3 struct clk_programmable_layout { -@@ -34,7 +33,7 @@ +@@ -34,7 +33,7 @@ struct clk_programmable_layout { struct clk_programmable { struct clk_hw hw; @@ -6465,7 +6600,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-programmable.c linux-4.4.13/dri u8 id; const struct clk_programmable_layout *layout; }; -@@ -44,14 +43,12 @@ +@@ -44,14 +43,12 @@ struct clk_programmable { static unsigned long clk_programmable_recalc_rate(struct clk_hw *hw, unsigned long parent_rate) { @@ -6484,7 +6619,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-programmable.c linux-4.4.13/dri } static int clk_programmable_determine_rate(struct clk_hw *hw, -@@ -101,36 +98,36 @@ +@@ -101,36 +98,36 @@ static int clk_programmable_set_parent(struct clk_hw *hw, u8 index) { struct clk_programmable *prog = to_clk_programmable(hw); const struct clk_programmable_layout *layout = prog->layout; @@ -6536,7 +6671,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-programmable.c linux-4.4.13/dri ret = PROG_MAX_RM9200_CSS + 1; return ret; -@@ -140,26 +137,27 @@ +@@ -140,26 +137,27 @@ static int clk_programmable_set_rate(struct clk_hw *hw, unsigned long rate, unsigned long parent_rate) { struct clk_programmable *prog = to_clk_programmable(hw); @@ -6570,7 +6705,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-programmable.c linux-4.4.13/dri return 0; } -@@ -173,7 +171,7 @@ +@@ -173,7 +171,7 @@ static const struct clk_ops programmable_ops = { }; static struct clk * __init @@ -6579,7 +6714,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-programmable.c linux-4.4.13/dri const char *name, const char **parent_names, u8 num_parents, u8 id, const struct clk_programmable_layout *layout) -@@ -198,7 +196,7 @@ +@@ -198,7 +196,7 @@ at91_clk_register_programmable(struct at91_pmc *pmc, prog->id = id; prog->layout = layout; prog->hw.init = &init; @@ -6588,7 +6723,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-programmable.c linux-4.4.13/dri clk = clk_register(NULL, &prog->hw); if (IS_ERR(clk)) -@@ -226,7 +224,7 @@ +@@ -226,7 +224,7 @@ static const struct clk_programmable_layout at91sam9x5_programmable_layout = { }; static void __init @@ -6597,7 +6732,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-programmable.c linux-4.4.13/dri const struct clk_programmable_layout *layout) { int num; -@@ -236,6 +234,7 @@ +@@ -236,6 +234,7 @@ of_at91_clk_prog_setup(struct device_node *np, struct at91_pmc *pmc, const char *parent_names[PROG_SOURCE_MAX]; const char *name; struct device_node *progclknp; @@ -6605,7 +6740,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-programmable.c linux-4.4.13/dri num_parents = of_clk_get_parent_count(np); if (num_parents <= 0 || num_parents > PROG_SOURCE_MAX) -@@ -247,6 +246,10 @@ +@@ -247,6 +246,10 @@ of_at91_clk_prog_setup(struct device_node *np, struct at91_pmc *pmc, if (!num || num > (PROG_ID_MAX + 1)) return; @@ -6616,7 +6751,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-programmable.c linux-4.4.13/dri for_each_child_of_node(np, progclknp) { if (of_property_read_u32(progclknp, "reg", &id)) continue; -@@ -254,7 +257,7 @@ +@@ -254,7 +257,7 @@ of_at91_clk_prog_setup(struct device_node *np, struct at91_pmc *pmc, if (of_property_read_string(np, "clock-output-names", &name)) name = progclknp->name; @@ -6625,7 +6760,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-programmable.c linux-4.4.13/dri parent_names, num_parents, id, layout); if (IS_ERR(clk)) -@@ -265,20 +268,23 @@ +@@ -265,20 +268,23 @@ of_at91_clk_prog_setup(struct device_node *np, struct at91_pmc *pmc, } @@ -6658,9 +6793,10 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-programmable.c linux-4.4.13/dri } +CLK_OF_DECLARE(at91sam9x5_clk_prog, "atmel,at91sam9x5-clk-programmable", + of_at91sam9x5_clk_prog_setup); -diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-slow.c linux-4.4.13/drivers/clk/at91/clk-slow.c ---- linux-4.4.13.orig/drivers/clk/at91/clk-slow.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/clk/at91/clk-slow.c 2016-06-22 21:55:07.998523867 +0200 +diff --git a/drivers/clk/at91/clk-slow.c b/drivers/clk/at91/clk-slow.c +index d0d5076a9b94..221c09684ba3 100644 +--- a/drivers/clk/at91/clk-slow.c ++++ b/drivers/clk/at91/clk-slow.c @@ -13,17 +13,11 @@ #include <linux/clk.h> #include <linux/clk-provider.h> @@ -6681,7 +6817,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-slow.c linux-4.4.13/drivers/clk #include "pmc.h" #include "sckc.h" -@@ -59,7 +53,7 @@ +@@ -59,7 +53,7 @@ struct clk_slow_rc_osc { struct clk_sam9260_slow { struct clk_hw hw; @@ -6690,7 +6826,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-slow.c linux-4.4.13/drivers/clk }; #define to_clk_sam9260_slow(hw) container_of(hw, struct clk_sam9260_slow, hw) -@@ -393,8 +387,11 @@ +@@ -393,8 +387,11 @@ void __init of_at91sam9x5_clk_slow_setup(struct device_node *np, static u8 clk_sam9260_slow_get_parent(struct clk_hw *hw) { struct clk_sam9260_slow *slowck = to_clk_sam9260_slow(hw); @@ -6703,7 +6839,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-slow.c linux-4.4.13/drivers/clk } static const struct clk_ops sam9260_slow_ops = { -@@ -402,7 +399,7 @@ +@@ -402,7 +399,7 @@ static const struct clk_ops sam9260_slow_ops = { }; static struct clk * __init @@ -6712,7 +6848,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-slow.c linux-4.4.13/drivers/clk const char *name, const char **parent_names, int num_parents) -@@ -411,7 +408,7 @@ +@@ -411,7 +408,7 @@ at91_clk_register_sam9260_slow(struct at91_pmc *pmc, struct clk *clk = NULL; struct clk_init_data init; @@ -6721,7 +6857,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-slow.c linux-4.4.13/drivers/clk return ERR_PTR(-EINVAL); if (!parent_names || !num_parents) -@@ -428,7 +425,7 @@ +@@ -428,7 +425,7 @@ at91_clk_register_sam9260_slow(struct at91_pmc *pmc, init.flags = 0; slowck->hw.init = &init; @@ -6730,7 +6866,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-slow.c linux-4.4.13/drivers/clk clk = clk_register(NULL, &slowck->hw); if (IS_ERR(clk)) -@@ -439,29 +436,34 @@ +@@ -439,29 +436,34 @@ at91_clk_register_sam9260_slow(struct at91_pmc *pmc, return clk; } @@ -6768,9 +6904,10 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-slow.c linux-4.4.13/drivers/clk /* * FIXME: All slow clk users are not properly claiming it (get + prepare + -diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-smd.c linux-4.4.13/drivers/clk/at91/clk-smd.c ---- linux-4.4.13.orig/drivers/clk/at91/clk-smd.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/clk/at91/clk-smd.c 2016-06-22 21:55:07.998523867 +0200 +diff --git a/drivers/clk/at91/clk-smd.c b/drivers/clk/at91/clk-smd.c +index a7f8501cfa05..e6948a52005a 100644 +--- a/drivers/clk/at91/clk-smd.c ++++ b/drivers/clk/at91/clk-smd.c @@ -12,8 +12,8 @@ #include <linux/clkdev.h> #include <linux/clk/at91_pmc.h> @@ -6791,7 +6928,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-smd.c linux-4.4.13/drivers/clk/ }; #define to_at91sam9x5_clk_smd(hw) \ -@@ -33,13 +33,13 @@ +@@ -33,13 +33,13 @@ struct at91sam9x5_clk_smd { static unsigned long at91sam9x5_clk_smd_recalc_rate(struct clk_hw *hw, unsigned long parent_rate) { @@ -6810,7 +6947,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-smd.c linux-4.4.13/drivers/clk/ return parent_rate / (smddiv + 1); } -@@ -67,40 +67,38 @@ +@@ -67,40 +67,38 @@ static long at91sam9x5_clk_smd_round_rate(struct clk_hw *hw, unsigned long rate, static int at91sam9x5_clk_smd_set_parent(struct clk_hw *hw, u8 index) { @@ -6862,7 +6999,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-smd.c linux-4.4.13/drivers/clk/ return 0; } -@@ -114,7 +112,7 @@ +@@ -114,7 +112,7 @@ static const struct clk_ops at91sam9x5_smd_ops = { }; static struct clk * __init @@ -6871,7 +7008,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-smd.c linux-4.4.13/drivers/clk/ const char **parent_names, u8 num_parents) { struct at91sam9x5_clk_smd *smd; -@@ -132,7 +130,7 @@ +@@ -132,7 +130,7 @@ at91sam9x5_clk_register_smd(struct at91_pmc *pmc, const char *name, init.flags = CLK_SET_RATE_GATE | CLK_SET_PARENT_GATE; smd->hw.init = &init; @@ -6880,7 +7017,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-smd.c linux-4.4.13/drivers/clk/ clk = clk_register(NULL, &smd->hw); if (IS_ERR(clk)) -@@ -141,13 +139,13 @@ +@@ -141,13 +139,13 @@ at91sam9x5_clk_register_smd(struct at91_pmc *pmc, const char *name, return clk; } @@ -6896,7 +7033,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-smd.c linux-4.4.13/drivers/clk/ num_parents = of_clk_get_parent_count(np); if (num_parents <= 0 || num_parents > SMD_SOURCE_MAX) -@@ -157,10 +155,16 @@ +@@ -157,10 +155,16 @@ void __init of_at91sam9x5_clk_smd_setup(struct device_node *np, of_property_read_string(np, "clock-output-names", &name); @@ -6914,9 +7051,10 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-smd.c linux-4.4.13/drivers/clk/ } +CLK_OF_DECLARE(at91sam9x5_clk_smd, "atmel,at91sam9x5-clk-smd", + of_at91sam9x5_clk_smd_setup); -diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-system.c linux-4.4.13/drivers/clk/at91/clk-system.c ---- linux-4.4.13.orig/drivers/clk/at91/clk-system.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/clk/at91/clk-system.c 2016-06-22 21:55:07.998523867 +0200 +diff --git a/drivers/clk/at91/clk-system.c b/drivers/clk/at91/clk-system.c +index 3f5314344286..8f35d8172909 100644 +--- a/drivers/clk/at91/clk-system.c ++++ b/drivers/clk/at91/clk-system.c @@ -12,13 +12,8 @@ #include <linux/clkdev.h> #include <linux/clk/at91_pmc.h> @@ -6944,7 +7082,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-system.c linux-4.4.13/drivers/c u8 id; }; -@@ -39,58 +32,54 @@ +@@ -39,58 +32,54 @@ static inline int is_pck(int id) { return (id >= 8) && (id <= 15); } @@ -7020,7 +7158,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-system.c linux-4.4.13/drivers/c } static const struct clk_ops system_ops = { -@@ -100,13 +89,12 @@ +@@ -100,13 +89,12 @@ static const struct clk_ops system_ops = { }; static struct clk * __init @@ -7036,7 +7174,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-system.c linux-4.4.13/drivers/c if (!parent_name || id > SYSTEM_MAX_ID) return ERR_PTR(-EINVAL); -@@ -123,44 +111,33 @@ +@@ -123,44 +111,33 @@ at91_clk_register_system(struct at91_pmc *pmc, const char *name, sys->id = id; sys->hw.init = &init; @@ -7089,7 +7227,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-system.c linux-4.4.13/drivers/c for_each_child_of_node(np, sysclknp) { if (of_property_read_u32(sysclknp, "reg", &id)) continue; -@@ -168,21 +145,14 @@ +@@ -168,21 +145,14 @@ of_at91_clk_sys_setup(struct device_node *np, struct at91_pmc *pmc) if (of_property_read_string(np, "clock-output-names", &name)) name = sysclknp->name; @@ -7114,9 +7252,10 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-system.c linux-4.4.13/drivers/c -} +CLK_OF_DECLARE(at91rm9200_clk_sys, "atmel,at91rm9200-clk-system", + of_at91rm9200_clk_sys_setup); -diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-usb.c linux-4.4.13/drivers/clk/at91/clk-usb.c ---- linux-4.4.13.orig/drivers/clk/at91/clk-usb.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/clk/at91/clk-usb.c 2016-06-22 21:55:07.998523867 +0200 +diff --git a/drivers/clk/at91/clk-usb.c b/drivers/clk/at91/clk-usb.c +index 8ab8502778a2..650ca45892c0 100644 +--- a/drivers/clk/at91/clk-usb.c ++++ b/drivers/clk/at91/clk-usb.c @@ -12,8 +12,8 @@ #include <linux/clkdev.h> #include <linux/clk/at91_pmc.h> @@ -7137,7 +7276,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-usb.c linux-4.4.13/drivers/clk/ }; #define to_at91sam9x5_clk_usb(hw) \ -@@ -35,7 +35,7 @@ +@@ -35,7 +35,7 @@ struct at91sam9x5_clk_usb { struct at91rm9200_clk_usb { struct clk_hw hw; @@ -7146,7 +7285,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-usb.c linux-4.4.13/drivers/clk/ u32 divisors[4]; }; -@@ -45,13 +45,12 @@ +@@ -45,13 +45,12 @@ struct at91rm9200_clk_usb { static unsigned long at91sam9x5_clk_usb_recalc_rate(struct clk_hw *hw, unsigned long parent_rate) { @@ -7164,7 +7303,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-usb.c linux-4.4.13/drivers/clk/ return DIV_ROUND_CLOSEST(parent_rate, (usbdiv + 1)); } -@@ -109,33 +108,31 @@ +@@ -109,33 +108,31 @@ static int at91sam9x5_clk_usb_determine_rate(struct clk_hw *hw, static int at91sam9x5_clk_usb_set_parent(struct clk_hw *hw, u8 index) { @@ -7206,7 +7345,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-usb.c linux-4.4.13/drivers/clk/ unsigned long div; if (!rate) -@@ -145,9 +142,8 @@ +@@ -145,9 +142,8 @@ static int at91sam9x5_clk_usb_set_rate(struct clk_hw *hw, unsigned long rate, if (div > SAM9X5_USB_MAX_DIV + 1 || !div) return -EINVAL; @@ -7218,7 +7357,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-usb.c linux-4.4.13/drivers/clk/ return 0; } -@@ -163,28 +159,28 @@ +@@ -163,28 +159,28 @@ static const struct clk_ops at91sam9x5_usb_ops = { static int at91sam9n12_clk_usb_enable(struct clk_hw *hw) { struct at91sam9x5_clk_usb *usb = to_at91sam9x5_clk_usb(hw); @@ -7255,7 +7394,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-usb.c linux-4.4.13/drivers/clk/ } static const struct clk_ops at91sam9n12_usb_ops = { -@@ -197,7 +193,7 @@ +@@ -197,7 +193,7 @@ static const struct clk_ops at91sam9n12_usb_ops = { }; static struct clk * __init @@ -7264,7 +7403,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-usb.c linux-4.4.13/drivers/clk/ const char **parent_names, u8 num_parents) { struct at91sam9x5_clk_usb *usb; -@@ -216,7 +212,7 @@ +@@ -216,7 +212,7 @@ at91sam9x5_clk_register_usb(struct at91_pmc *pmc, const char *name, CLK_SET_RATE_PARENT; usb->hw.init = &init; @@ -7273,7 +7412,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-usb.c linux-4.4.13/drivers/clk/ clk = clk_register(NULL, &usb->hw); if (IS_ERR(clk)) -@@ -226,7 +222,7 @@ +@@ -226,7 +222,7 @@ at91sam9x5_clk_register_usb(struct at91_pmc *pmc, const char *name, } static struct clk * __init @@ -7282,7 +7421,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-usb.c linux-4.4.13/drivers/clk/ const char *parent_name) { struct at91sam9x5_clk_usb *usb; -@@ -244,7 +240,7 @@ +@@ -244,7 +240,7 @@ at91sam9n12_clk_register_usb(struct at91_pmc *pmc, const char *name, init.flags = CLK_SET_RATE_GATE | CLK_SET_RATE_PARENT; usb->hw.init = &init; @@ -7291,7 +7430,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-usb.c linux-4.4.13/drivers/clk/ clk = clk_register(NULL, &usb->hw); if (IS_ERR(clk)) -@@ -257,12 +253,12 @@ +@@ -257,12 +253,12 @@ static unsigned long at91rm9200_clk_usb_recalc_rate(struct clk_hw *hw, unsigned long parent_rate) { struct at91rm9200_clk_usb *usb = to_at91rm9200_clk_usb(hw); @@ -7308,7 +7447,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-usb.c linux-4.4.13/drivers/clk/ if (usb->divisors[usbdiv]) return parent_rate / usb->divisors[usbdiv]; -@@ -310,10 +306,8 @@ +@@ -310,10 +306,8 @@ static long at91rm9200_clk_usb_round_rate(struct clk_hw *hw, unsigned long rate, static int at91rm9200_clk_usb_set_rate(struct clk_hw *hw, unsigned long rate, unsigned long parent_rate) { @@ -7319,7 +7458,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-usb.c linux-4.4.13/drivers/clk/ unsigned long div; if (!rate) -@@ -323,10 +317,10 @@ +@@ -323,10 +317,10 @@ static int at91rm9200_clk_usb_set_rate(struct clk_hw *hw, unsigned long rate, for (i = 0; i < RM9200_USB_DIV_TAB_SIZE; i++) { if (usb->divisors[i] == div) { @@ -7334,7 +7473,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-usb.c linux-4.4.13/drivers/clk/ return 0; } } -@@ -341,7 +335,7 @@ +@@ -341,7 +335,7 @@ static const struct clk_ops at91rm9200_usb_ops = { }; static struct clk * __init @@ -7343,7 +7482,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-usb.c linux-4.4.13/drivers/clk/ const char *parent_name, const u32 *divisors) { struct at91rm9200_clk_usb *usb; -@@ -359,7 +353,7 @@ +@@ -359,7 +353,7 @@ at91rm9200_clk_register_usb(struct at91_pmc *pmc, const char *name, init.flags = CLK_SET_RATE_PARENT; usb->hw.init = &init; @@ -7352,7 +7491,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-usb.c linux-4.4.13/drivers/clk/ memcpy(usb->divisors, divisors, sizeof(usb->divisors)); clk = clk_register(NULL, &usb->hw); -@@ -369,13 +363,13 @@ +@@ -369,13 +363,13 @@ at91rm9200_clk_register_usb(struct at91_pmc *pmc, const char *name, return clk; } @@ -7368,7 +7507,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-usb.c linux-4.4.13/drivers/clk/ num_parents = of_clk_get_parent_count(np); if (num_parents <= 0 || num_parents > USB_SOURCE_MAX) -@@ -385,19 +379,26 @@ +@@ -385,19 +379,26 @@ void __init of_at91sam9x5_clk_usb_setup(struct device_node *np, of_property_read_string(np, "clock-output-names", &name); @@ -7398,7 +7537,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-usb.c linux-4.4.13/drivers/clk/ parent_name = of_clk_get_parent_name(np, 0); if (!parent_name) -@@ -405,20 +406,26 @@ +@@ -405,20 +406,26 @@ void __init of_at91sam9n12_clk_usb_setup(struct device_node *np, of_property_read_string(np, "clock-output-names", &name); @@ -7428,7 +7567,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-usb.c linux-4.4.13/drivers/clk/ parent_name = of_clk_get_parent_name(np, 0); if (!parent_name) -@@ -430,9 +437,15 @@ +@@ -430,9 +437,15 @@ void __init of_at91rm9200_clk_usb_setup(struct device_node *np, of_property_read_string(np, "clock-output-names", &name); @@ -7445,9 +7584,10 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-usb.c linux-4.4.13/drivers/clk/ } +CLK_OF_DECLARE(at91rm9200_clk_usb, "atmel,at91rm9200-clk-usb", + of_at91rm9200_clk_usb_setup); -diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-utmi.c linux-4.4.13/drivers/clk/at91/clk-utmi.c ---- linux-4.4.13.orig/drivers/clk/at91/clk-utmi.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/clk/at91/clk-utmi.c 2016-06-22 21:55:07.998523867 +0200 +diff --git a/drivers/clk/at91/clk-utmi.c b/drivers/clk/at91/clk-utmi.c +index ca561e90a60f..61fcf399e58c 100644 +--- a/drivers/clk/at91/clk-utmi.c ++++ b/drivers/clk/at91/clk-utmi.c @@ -11,14 +11,9 @@ #include <linux/clk-provider.h> #include <linux/clkdev.h> @@ -7497,25 +7637,23 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-utmi.c linux-4.4.13/drivers/clk - struct at91_pmc *pmc = utmi->pmc; - u32 tmp = pmc_read(pmc, AT91_CKGR_UCKR) | AT91_PMC_UPLLEN | - AT91_PMC_UPLLCOUNT | AT91_PMC_BIASEN; -- ++ unsigned int uckr = AT91_PMC_UPLLEN | AT91_PMC_UPLLCOUNT | ++ AT91_PMC_BIASEN; + - pmc_write(pmc, AT91_CKGR_UCKR, tmp); -- ++ regmap_update_bits(utmi->regmap, AT91_CKGR_UCKR, uckr, uckr); + - while (!(pmc_read(pmc, AT91_PMC_SR) & AT91_PMC_LOCKU)) { - enable_irq(utmi->irq); - wait_event(utmi->wait, - pmc_read(pmc, AT91_PMC_SR) & AT91_PMC_LOCKU); - } -+ unsigned int uckr = AT91_PMC_UPLLEN | AT91_PMC_UPLLCOUNT | -+ AT91_PMC_BIASEN; -+ -+ regmap_update_bits(utmi->regmap, AT91_CKGR_UCKR, uckr, uckr); -+ + while (!clk_utmi_ready(utmi->regmap)) + cpu_relax(); return 0; } -@@ -64,18 +52,15 @@ +@@ -64,18 +52,15 @@ static int clk_utmi_prepare(struct clk_hw *hw) static int clk_utmi_is_prepared(struct clk_hw *hw) { struct clk_utmi *utmi = to_clk_utmi(hw); @@ -7536,7 +7674,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-utmi.c linux-4.4.13/drivers/clk } static unsigned long clk_utmi_recalc_rate(struct clk_hw *hw, -@@ -93,10 +78,9 @@ +@@ -93,10 +78,9 @@ static const struct clk_ops utmi_ops = { }; static struct clk * __init @@ -7548,7 +7686,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-utmi.c linux-4.4.13/drivers/clk struct clk_utmi *utmi; struct clk *clk = NULL; struct clk_init_data init; -@@ -112,52 +96,36 @@ +@@ -112,52 +96,36 @@ at91_clk_register_utmi(struct at91_pmc *pmc, unsigned int irq, init.flags = CLK_SET_RATE_GATE; utmi->hw.init = &init; @@ -7610,9 +7748,10 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/clk-utmi.c linux-4.4.13/drivers/clk -} +CLK_OF_DECLARE(at91sam9x5_clk_utmi, "atmel,at91sam9x5-clk-utmi", + of_at91sam9x5_clk_utmi_setup); -diff -Nur linux-4.4.13.orig/drivers/clk/at91/pmc.c linux-4.4.13/drivers/clk/at91/pmc.c ---- linux-4.4.13.orig/drivers/clk/at91/pmc.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/clk/at91/pmc.c 2016-06-22 21:55:07.998523867 +0200 +diff --git a/drivers/clk/at91/pmc.c b/drivers/clk/at91/pmc.c +index 8476b570779b..526df5ba042d 100644 +--- a/drivers/clk/at91/pmc.c ++++ b/drivers/clk/at91/pmc.c @@ -12,36 +12,13 @@ #include <linux/clkdev.h> #include <linux/clk/at91_pmc.h> @@ -7652,7 +7791,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/pmc.c linux-4.4.13/drivers/clk/at91 int of_at91_get_clk_range(struct device_node *np, const char *propname, struct clk_range *range) { -@@ -64,402 +41,3 @@ +@@ -64,402 +41,3 @@ int of_at91_get_clk_range(struct device_node *np, const char *propname, return 0; } EXPORT_SYMBOL_GPL(of_at91_get_clk_range); @@ -8055,9 +8194,10 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/pmc.c linux-4.4.13/drivers/clk/at91 -} -CLK_OF_DECLARE(sama5d3_clk_pmc, "atmel,sama5d3-pmc", - of_sama5d3_pmc_setup); -diff -Nur linux-4.4.13.orig/drivers/clk/at91/pmc.h linux-4.4.13/drivers/clk/at91/pmc.h ---- linux-4.4.13.orig/drivers/clk/at91/pmc.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/clk/at91/pmc.h 2016-06-22 21:55:07.998523867 +0200 +diff --git a/drivers/clk/at91/pmc.h b/drivers/clk/at91/pmc.h +index f65739272779..5771fff0ee3f 100644 +--- a/drivers/clk/at91/pmc.h ++++ b/drivers/clk/at91/pmc.h @@ -14,8 +14,11 @@ #include <linux/io.h> @@ -8070,7 +8210,7 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/pmc.h linux-4.4.13/drivers/clk/at91 struct clk_range { unsigned long min; unsigned long max; -@@ -23,102 +26,7 @@ +@@ -23,102 +26,7 @@ struct clk_range { #define CLK_RANGE(MIN, MAX) {.min = MIN, .max = MAX,} @@ -8173,9 +8313,10 @@ diff -Nur linux-4.4.13.orig/drivers/clk/at91/pmc.h linux-4.4.13/drivers/clk/at91 - struct at91_pmc *pmc); - #endif /* __PMC_H_ */ -diff -Nur linux-4.4.13.orig/drivers/clocksource/tcb_clksrc.c linux-4.4.13/drivers/clocksource/tcb_clksrc.c ---- linux-4.4.13.orig/drivers/clocksource/tcb_clksrc.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/clocksource/tcb_clksrc.c 2016-06-22 21:55:07.998523867 +0200 +diff --git a/drivers/clocksource/tcb_clksrc.c b/drivers/clocksource/tcb_clksrc.c +index 4da2af9694a2..5b6f57f500b8 100644 +--- a/drivers/clocksource/tcb_clksrc.c ++++ b/drivers/clocksource/tcb_clksrc.c @@ -23,8 +23,7 @@ * this 32 bit free-running counter. the second channel is not used. * @@ -8186,7 +8327,7 @@ diff -Nur linux-4.4.13.orig/drivers/clocksource/tcb_clksrc.c linux-4.4.13/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,8 @@ +@@ -74,6 +73,8 @@ static struct clocksource clksrc = { struct tc_clkevt_device { struct clock_event_device clkevt; struct clk *clk; @@ -8195,7 +8336,7 @@ diff -Nur linux-4.4.13.orig/drivers/clocksource/tcb_clksrc.c linux-4.4.13/driver void __iomem *regs; }; -@@ -82,15 +83,26 @@ +@@ -82,15 +83,26 @@ static struct tc_clkevt_device *to_tc_clkevt(struct clock_event_device *clkevt) return container_of(clkevt, struct tc_clkevt_device, clkevt); } @@ -8229,7 +8370,7 @@ diff -Nur linux-4.4.13.orig/drivers/clocksource/tcb_clksrc.c linux-4.4.13/driver static int tc_shutdown(struct clock_event_device *d) { struct tc_clkevt_device *tcd = to_tc_clkevt(d); -@@ -98,8 +110,14 @@ +@@ -98,8 +110,14 @@ static int tc_shutdown(struct clock_event_device *d) __raw_writel(0xff, regs + ATMEL_TC_REG(2, IDR)); __raw_writel(ATMEL_TC_CLKDIS, regs + ATMEL_TC_REG(2, CCR)); @@ -8245,7 +8386,7 @@ diff -Nur linux-4.4.13.orig/drivers/clocksource/tcb_clksrc.c linux-4.4.13/driver return 0; } -@@ -112,9 +130,9 @@ +@@ -112,9 +130,9 @@ static int tc_set_oneshot(struct clock_event_device *d) if (clockevent_state_oneshot(d) || clockevent_state_periodic(d)) tc_shutdown(d); @@ -8257,7 +8398,7 @@ diff -Nur linux-4.4.13.orig/drivers/clocksource/tcb_clksrc.c linux-4.4.13/driver __raw_writel(timer_clock | ATMEL_TC_CPCSTOP | ATMEL_TC_WAVE | ATMEL_TC_WAVESEL_UP_AUTO, regs + ATMEL_TC_REG(2, CMR)); __raw_writel(ATMEL_TC_CPCS, regs + ATMEL_TC_REG(2, IER)); -@@ -134,12 +152,12 @@ +@@ -134,12 +152,12 @@ static int tc_set_periodic(struct clock_event_device *d) /* By not making the gentime core emulate periodic mode on top * of oneshot, we get lower overhead and improved accuracy. */ @@ -8273,7 +8414,7 @@ diff -Nur linux-4.4.13.orig/drivers/clocksource/tcb_clksrc.c linux-4.4.13/driver /* Enable clock and interrupts on RC compare */ __raw_writel(ATMEL_TC_CPCS, regs + ATMEL_TC_REG(2, IER)); -@@ -166,9 +184,13 @@ +@@ -166,9 +184,13 @@ static struct tc_clkevt_device clkevt = { .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT, /* Should be lower than at91rm9200's system timer */ @@ -8288,7 +8429,7 @@ diff -Nur linux-4.4.13.orig/drivers/clocksource/tcb_clksrc.c linux-4.4.13/driver .set_state_periodic = tc_set_periodic, .set_state_oneshot = tc_set_oneshot, }, -@@ -188,8 +210,9 @@ +@@ -188,8 +210,9 @@ static irqreturn_t ch2_irq(int irq, void *handle) return IRQ_NONE; } @@ -8299,7 +8440,7 @@ diff -Nur linux-4.4.13.orig/drivers/clocksource/tcb_clksrc.c linux-4.4.13/driver int ret; struct clk *t2_clk = tc->clk[2]; int irq = tc->irq[2]; -@@ -210,7 +233,11 @@ +@@ -210,7 +233,11 @@ static int __init setup_clkevents(struct atmel_tc *tc, int clk32k_divisor_idx) clkevt.regs = tc->regs; clkevt.clk = t2_clk; @@ -8312,7 +8453,7 @@ diff -Nur linux-4.4.13.orig/drivers/clocksource/tcb_clksrc.c linux-4.4.13/driver clkevt.clkevt.cpumask = cpumask_of(0); -@@ -221,7 +248,7 @@ +@@ -221,7 +248,7 @@ static int __init setup_clkevents(struct atmel_tc *tc, int clk32k_divisor_idx) return ret; } @@ -8321,7 +8462,7 @@ diff -Nur linux-4.4.13.orig/drivers/clocksource/tcb_clksrc.c linux-4.4.13/driver return ret; } -@@ -358,7 +385,11 @@ +@@ -358,7 +385,11 @@ static int __init tcb_clksrc_init(void) goto err_disable_t1; /* channel 2: periodic and oneshot timer support */ @@ -8333,10 +8474,11 @@ diff -Nur linux-4.4.13.orig/drivers/clocksource/tcb_clksrc.c linux-4.4.13/driver if (ret) goto err_unregister_clksrc; -diff -Nur linux-4.4.13.orig/drivers/clocksource/timer-atmel-pit.c linux-4.4.13/drivers/clocksource/timer-atmel-pit.c ---- linux-4.4.13.orig/drivers/clocksource/timer-atmel-pit.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/clocksource/timer-atmel-pit.c 2016-06-22 21:55:07.998523867 +0200 -@@ -46,6 +46,7 @@ +diff --git a/drivers/clocksource/timer-atmel-pit.c b/drivers/clocksource/timer-atmel-pit.c +index d911c5dca8f1..7a40f7e88468 100644 +--- a/drivers/clocksource/timer-atmel-pit.c ++++ b/drivers/clocksource/timer-atmel-pit.c +@@ -46,6 +46,7 @@ struct pit_data { u32 cycle; u32 cnt; unsigned int irq; @@ -8344,7 +8486,7 @@ diff -Nur linux-4.4.13.orig/drivers/clocksource/timer-atmel-pit.c linux-4.4.13/d struct clk *mck; }; -@@ -96,15 +97,29 @@ +@@ -96,15 +97,29 @@ static int pit_clkevt_shutdown(struct clock_event_device *dev) /* disable irq, leaving the clocksource active */ pit_write(data->base, AT91_PIT_MR, (data->cycle - 1) | AT91_PIT_PITEN); @@ -8374,7 +8516,7 @@ diff -Nur linux-4.4.13.orig/drivers/clocksource/timer-atmel-pit.c linux-4.4.13/d /* update clocksource counter */ data->cnt += data->cycle * PIT_PICNT(pit_read(data->base, AT91_PIT_PIVR)); -@@ -181,7 +196,6 @@ +@@ -181,7 +196,6 @@ static void __init at91sam926x_pit_common_init(struct pit_data *data) { unsigned long pit_rate; unsigned bits; @@ -8382,7 +8524,7 @@ diff -Nur linux-4.4.13.orig/drivers/clocksource/timer-atmel-pit.c linux-4.4.13/d /* * Use our actual MCK to figure out how many MCK/16 ticks per -@@ -206,13 +220,6 @@ +@@ -206,13 +220,6 @@ static void __init at91sam926x_pit_common_init(struct pit_data *data) data->clksrc.flags = CLOCK_SOURCE_IS_CONTINUOUS; clocksource_register_hz(&data->clksrc, pit_rate); @@ -8396,10 +8538,11 @@ diff -Nur linux-4.4.13.orig/drivers/clocksource/timer-atmel-pit.c linux-4.4.13/d /* Set up and register clockevents */ data->clkevt.name = "pit"; data->clkevt.features = CLOCK_EVT_FEAT_PERIODIC; -diff -Nur linux-4.4.13.orig/drivers/clocksource/timer-atmel-st.c linux-4.4.13/drivers/clocksource/timer-atmel-st.c ---- linux-4.4.13.orig/drivers/clocksource/timer-atmel-st.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/clocksource/timer-atmel-st.c 2016-06-22 21:55:07.998523867 +0200 -@@ -115,18 +115,29 @@ +diff --git a/drivers/clocksource/timer-atmel-st.c b/drivers/clocksource/timer-atmel-st.c +index 29d21d68df5a..103d0fd70cc4 100644 +--- a/drivers/clocksource/timer-atmel-st.c ++++ b/drivers/clocksource/timer-atmel-st.c +@@ -115,18 +115,29 @@ static void clkdev32k_disable_and_flush_irq(void) last_crtr = read_CRTR(); } @@ -8429,7 +8572,7 @@ diff -Nur linux-4.4.13.orig/drivers/clocksource/timer-atmel-st.c linux-4.4.13/dr /* * ALM for oneshot irqs, set by next_event() * before 32 seconds have passed. -@@ -139,8 +150,16 @@ +@@ -139,8 +150,16 @@ static int clkevt32k_set_oneshot(struct clock_event_device *dev) static int clkevt32k_set_periodic(struct clock_event_device *dev) { @@ -8446,7 +8589,7 @@ diff -Nur linux-4.4.13.orig/drivers/clocksource/timer-atmel-st.c linux-4.4.13/dr /* PIT for periodic irqs; fixed rate of 1/HZ */ irqmask = AT91_ST_PITS; regmap_write(regmap_st, AT91_ST_PIMR, timer_latch); -@@ -198,7 +217,7 @@ +@@ -198,7 +217,7 @@ static void __init atmel_st_timer_init(struct device_node *node) { struct clk *sclk; unsigned int sclk_rate, val; @@ -8455,7 +8598,7 @@ diff -Nur linux-4.4.13.orig/drivers/clocksource/timer-atmel-st.c linux-4.4.13/dr regmap_st = syscon_node_to_regmap(node); if (IS_ERR(regmap_st)) -@@ -210,17 +229,10 @@ +@@ -210,17 +229,10 @@ static void __init atmel_st_timer_init(struct device_node *node) regmap_read(regmap_st, AT91_ST_SR, &val); /* Get the interrupts property */ @@ -8475,10 +8618,11 @@ diff -Nur linux-4.4.13.orig/drivers/clocksource/timer-atmel-st.c linux-4.4.13/dr sclk = of_clk_get(node, 0); if (IS_ERR(sclk)) panic(pr_fmt("Unable to get slow clock\n")); -diff -Nur linux-4.4.13.orig/drivers/cpufreq/Kconfig.x86 linux-4.4.13/drivers/cpufreq/Kconfig.x86 ---- linux-4.4.13.orig/drivers/cpufreq/Kconfig.x86 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/cpufreq/Kconfig.x86 2016-06-22 21:55:07.998523867 +0200 -@@ -123,7 +123,7 @@ +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!" @@ -8487,10 +8631,11 @@ diff -Nur linux-4.4.13.orig/drivers/cpufreq/Kconfig.x86 linux-4.4.13/drivers/cpu 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.4.13.orig/drivers/cpuidle/coupled.c linux-4.4.13/drivers/cpuidle/coupled.c ---- linux-4.4.13.orig/drivers/cpuidle/coupled.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/cpuidle/coupled.c 2016-06-22 21:55:07.998523867 +0200 -@@ -119,7 +119,6 @@ +diff --git a/drivers/cpuidle/coupled.c b/drivers/cpuidle/coupled.c +index 344058f8501a..d5657d50ac40 100644 +--- a/drivers/cpuidle/coupled.c ++++ b/drivers/cpuidle/coupled.c +@@ -119,7 +119,6 @@ struct cpuidle_coupled { #define CPUIDLE_COUPLED_NOT_IDLE (-1) @@ -8498,10 +8643,11 @@ diff -Nur linux-4.4.13.orig/drivers/cpuidle/coupled.c linux-4.4.13/drivers/cpuid static DEFINE_PER_CPU(struct call_single_data, cpuidle_coupled_poke_cb); /* -diff -Nur linux-4.4.13.orig/drivers/gpu/drm/i915/i915_gem_execbuffer.c linux-4.4.13/drivers/gpu/drm/i915/i915_gem_execbuffer.c ---- linux-4.4.13.orig/drivers/gpu/drm/i915/i915_gem_execbuffer.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/gpu/drm/i915/i915_gem_execbuffer.c 2016-06-22 21:55:07.998523867 +0200 -@@ -1264,7 +1264,9 @@ +diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c +index 6ed7d63a0688..9da7482ad256 100644 +--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c ++++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c +@@ -1264,7 +1264,9 @@ i915_gem_ringbuffer_submission(struct i915_execbuffer_params *params, if (ret) return ret; @@ -8511,22 +8657,24 @@ diff -Nur linux-4.4.13.orig/drivers/gpu/drm/i915/i915_gem_execbuffer.c linux-4.4 i915_gem_execbuffer_move_to_active(vmas, params->request); i915_gem_execbuffer_retire_commands(params); -diff -Nur linux-4.4.13.orig/drivers/gpu/drm/i915/i915_gem_shrinker.c linux-4.4.13/drivers/gpu/drm/i915/i915_gem_shrinker.c ---- linux-4.4.13.orig/drivers/gpu/drm/i915/i915_gem_shrinker.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/gpu/drm/i915/i915_gem_shrinker.c 2016-06-22 21:55:07.998523867 +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 c0a96f1ee18e..deb1e207fa3c 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.4.13.orig/drivers/gpu/drm/i915/i915_irq.c linux-4.4.13/drivers/gpu/drm/i915/i915_irq.c ---- linux-4.4.13.orig/drivers/gpu/drm/i915/i915_irq.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/gpu/drm/i915/i915_irq.c 2016-06-22 21:55:08.002523867 +0200 -@@ -812,6 +812,7 @@ +diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c +index 0f42a2782afc..80a1db09a379 100644 +--- a/drivers/gpu/drm/i915/i915_irq.c ++++ b/drivers/gpu/drm/i915/i915_irq.c +@@ -812,6 +812,7 @@ static int i915_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe, spin_lock_irqsave(&dev_priv->uncore.lock, irqflags); /* preempt_disable_rt() should go right here in PREEMPT_RT patchset. */ @@ -8534,7 +8682,7 @@ diff -Nur linux-4.4.13.orig/drivers/gpu/drm/i915/i915_irq.c linux-4.4.13/drivers /* Get optional system timestamp before query. */ if (stime) -@@ -863,6 +864,7 @@ +@@ -863,6 +864,7 @@ static int i915_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe, *etime = ktime_get(); /* preempt_enable_rt() should go right here in PREEMPT_RT patchset. */ @@ -8542,10 +8690,11 @@ diff -Nur linux-4.4.13.orig/drivers/gpu/drm/i915/i915_irq.c linux-4.4.13/drivers spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags); -diff -Nur linux-4.4.13.orig/drivers/gpu/drm/i915/intel_display.c linux-4.4.13/drivers/gpu/drm/i915/intel_display.c ---- linux-4.4.13.orig/drivers/gpu/drm/i915/intel_display.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/gpu/drm/i915/intel_display.c 2016-06-22 21:55:08.002523867 +0200 -@@ -11376,7 +11376,7 @@ +diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c +index 3292495ee10f..5c1ea4421df6 100644 +--- a/drivers/gpu/drm/i915/intel_display.c ++++ b/drivers/gpu/drm/i915/intel_display.c +@@ -11398,7 +11398,7 @@ void intel_check_page_flip(struct drm_device *dev, int pipe) struct intel_crtc *intel_crtc = to_intel_crtc(crtc); struct intel_unpin_work *work; @@ -8554,9 +8703,10 @@ diff -Nur linux-4.4.13.orig/drivers/gpu/drm/i915/intel_display.c linux-4.4.13/dr if (crtc == NULL) return; -diff -Nur linux-4.4.13.orig/drivers/gpu/drm/i915/intel_sprite.c linux-4.4.13/drivers/gpu/drm/i915/intel_sprite.c ---- linux-4.4.13.orig/drivers/gpu/drm/i915/intel_sprite.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/gpu/drm/i915/intel_sprite.c 2016-06-22 21:55:08.002523867 +0200 +diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c +index 56dc132e8e20..8771d6646e91 100644 +--- a/drivers/gpu/drm/i915/intel_sprite.c ++++ b/drivers/gpu/drm/i915/intel_sprite.c @@ -38,6 +38,7 @@ #include "intel_drv.h" #include <drm/i915_drm.h> @@ -8565,7 +8715,7 @@ diff -Nur linux-4.4.13.orig/drivers/gpu/drm/i915/intel_sprite.c linux-4.4.13/dri static bool format_is_yuv(uint32_t format) -@@ -64,6 +65,8 @@ +@@ -64,6 +65,8 @@ static int usecs_to_scanlines(const struct drm_display_mode *adjusted_mode, 1000 * adjusted_mode->crtc_htotal); } @@ -8574,7 +8724,7 @@ diff -Nur linux-4.4.13.orig/drivers/gpu/drm/i915/intel_sprite.c linux-4.4.13/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 -@@ -96,7 +99,7 @@ +@@ -96,7 +99,7 @@ void intel_pipe_update_start(struct intel_crtc *crtc) min = vblank_start - usecs_to_scanlines(adjusted_mode, 100); max = vblank_start - 1; @@ -8583,7 +8733,7 @@ diff -Nur linux-4.4.13.orig/drivers/gpu/drm/i915/intel_sprite.c linux-4.4.13/dri if (min <= 0 || max <= 0) return; -@@ -126,11 +129,11 @@ +@@ -126,11 +129,11 @@ void intel_pipe_update_start(struct intel_crtc *crtc) break; } @@ -8597,7 +8747,7 @@ diff -Nur linux-4.4.13.orig/drivers/gpu/drm/i915/intel_sprite.c linux-4.4.13/dri } finish_wait(wq, &wait); -@@ -164,7 +167,7 @@ +@@ -164,7 +167,7 @@ void intel_pipe_update_end(struct intel_crtc *crtc) trace_i915_pipe_update_end(crtc, end_vbl_count, scanline_end); @@ -8606,10 +8756,11 @@ diff -Nur linux-4.4.13.orig/drivers/gpu/drm/i915/intel_sprite.c linux-4.4.13/dri if (crtc->debug.start_vbl_count && crtc->debug.start_vbl_count != end_vbl_count) { -diff -Nur linux-4.4.13.orig/drivers/gpu/drm/radeon/radeon_display.c linux-4.4.13/drivers/gpu/drm/radeon/radeon_display.c ---- linux-4.4.13.orig/drivers/gpu/drm/radeon/radeon_display.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/gpu/drm/radeon/radeon_display.c 2016-06-22 21:55:08.002523867 +0200 -@@ -1862,6 +1862,7 @@ +diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c +index 3645b223aa37..642854b2ed2c 100644 +--- a/drivers/gpu/drm/radeon/radeon_display.c ++++ b/drivers/gpu/drm/radeon/radeon_display.c +@@ -1862,6 +1862,7 @@ int radeon_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe, struct radeon_device *rdev = dev->dev_private; /* preempt_disable_rt() should go right here in PREEMPT_RT patchset. */ @@ -8617,7 +8768,7 @@ diff -Nur linux-4.4.13.orig/drivers/gpu/drm/radeon/radeon_display.c linux-4.4.13 /* Get optional system timestamp before query. */ if (stime) -@@ -1954,6 +1955,7 @@ +@@ -1954,6 +1955,7 @@ int radeon_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe, *etime = ktime_get(); /* preempt_enable_rt() should go right here in PREEMPT_RT patchset. */ @@ -8625,10 +8776,11 @@ diff -Nur linux-4.4.13.orig/drivers/gpu/drm/radeon/radeon_display.c linux-4.4.13 /* Decode into vertical and horizontal scanout position. */ *vpos = position & 0x1fff; -diff -Nur linux-4.4.13.orig/drivers/i2c/busses/i2c-omap.c linux-4.4.13/drivers/i2c/busses/i2c-omap.c ---- linux-4.4.13.orig/drivers/i2c/busses/i2c-omap.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/i2c/busses/i2c-omap.c 2016-06-22 21:55:08.006523867 +0200 -@@ -995,15 +995,12 @@ +diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c +index 08d26ba61ed3..46b89dd42b10 100644 +--- a/drivers/i2c/busses/i2c-omap.c ++++ b/drivers/i2c/busses/i2c-omap.c +@@ -995,15 +995,12 @@ omap_i2c_isr(int irq, void *dev_id) u16 mask; u16 stat; @@ -8645,10 +8797,11 @@ diff -Nur linux-4.4.13.orig/drivers/i2c/busses/i2c-omap.c linux-4.4.13/drivers/i return ret; } -diff -Nur linux-4.4.13.orig/drivers/ide/alim15x3.c linux-4.4.13/drivers/ide/alim15x3.c ---- linux-4.4.13.orig/drivers/ide/alim15x3.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/ide/alim15x3.c 2016-06-22 21:55:08.006523867 +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); @@ -8657,7 +8810,7 @@ diff -Nur linux-4.4.13.orig/drivers/ide/alim15x3.c linux-4.4.13/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); @@ -8666,10 +8819,11 @@ diff -Nur linux-4.4.13.orig/drivers/ide/alim15x3.c linux-4.4.13/drivers/ide/alim return 0; } -diff -Nur linux-4.4.13.orig/drivers/ide/hpt366.c linux-4.4.13/drivers/ide/hpt366.c ---- linux-4.4.13.orig/drivers/ide/hpt366.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/ide/hpt366.c 2016-06-22 21:55:08.006523867 +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); @@ -8678,7 +8832,7 @@ diff -Nur linux-4.4.13.orig/drivers/ide/hpt366.c linux-4.4.13/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); @@ -8687,40 +8841,11 @@ diff -Nur linux-4.4.13.orig/drivers/ide/hpt366.c linux-4.4.13/drivers/ide/hpt366 printk(KERN_INFO " %s: BM-DMA at 0x%04lx-0x%04lx\n", hwif->name, base, base + 7); -diff -Nur linux-4.4.13.orig/drivers/ide/ide-io.c linux-4.4.13/drivers/ide/ide-io.c ---- linux-4.4.13.orig/drivers/ide/ide-io.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/ide/ide-io.c 2016-06-22 21:55:08.006523867 +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.4.13.orig/drivers/ide/ide-iops.c linux-4.4.13/drivers/ide/ide-iops.c ---- linux-4.4.13.orig/drivers/ide/ide-iops.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/ide/ide-iops.c 2016-06-22 21:55:08.006523867 +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.4.13.orig/drivers/ide/ide-io-std.c linux-4.4.13/drivers/ide/ide-io-std.c ---- linux-4.4.13.orig/drivers/ide/ide-io-std.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/ide/ide-io-std.c 2016-06-22 21:55:08.006523867 +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) { @@ -8729,7 +8854,7 @@ diff -Nur linux-4.4.13.orig/drivers/ide/ide-io-std.c linux-4.4.13/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) @@ -8738,7 +8863,7 @@ diff -Nur linux-4.4.13.orig/drivers/ide/ide-io-std.c linux-4.4.13/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) { @@ -8747,7 +8872,7 @@ diff -Nur linux-4.4.13.orig/drivers/ide/ide-io-std.c linux-4.4.13/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) @@ -8756,10 +8881,43 @@ diff -Nur linux-4.4.13.orig/drivers/ide/ide-io-std.c linux-4.4.13/drivers/ide/id if (((len + 1) & 3) < 2) return; -diff -Nur linux-4.4.13.orig/drivers/ide/ide-probe.c linux-4.4.13/drivers/ide/ide-probe.c ---- linux-4.4.13.orig/drivers/ide/ide-probe.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/ide/ide-probe.c 2016-06-22 21:55:08.006523867 +0200 -@@ -196,10 +196,10 @@ +diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c +index 669ea1e45795..e12e43e62245 100644 +--- a/drivers/ide/ide-io.c ++++ b/drivers/ide/ide-io.c +@@ -659,7 +659,7 @@ void ide_timer_expiry (unsigned long data) + /* disable_irq_nosync ?? */ + disable_irq(hwif->irq); + /* local CPU only, as if we were handling an interrupt */ +- local_irq_disable(); ++ local_irq_disable_nort(); + if (hwif->polling) { + startstop = handler(drive); + } else if (drive_is_ready(drive)) { +diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c +index 376f2dc410c5..f014dd1b73dc 100644 +--- a/drivers/ide/ide-iops.c ++++ b/drivers/ide/ide-iops.c +@@ -129,12 +129,12 @@ int __ide_wait_stat(ide_drive_t *drive, u8 good, u8 bad, + if ((stat & ATA_BUSY) == 0) + break; + +- local_irq_restore(flags); ++ local_irq_restore_nort(flags); + *rstat = stat; + return -EBUSY; + } + } +- local_irq_restore(flags); ++ local_irq_restore_nort(flags); + } + /* + * Allow status to settle, then read it again. +diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c +index 0b63facd1d87..4ceba37afc0c 100644 +--- a/drivers/ide/ide-probe.c ++++ b/drivers/ide/ide-probe.c +@@ -196,10 +196,10 @@ static void do_identify(ide_drive_t *drive, u8 cmd, u16 *id) int bswap = 1; /* local CPU only; some systems need this */ @@ -8772,10 +8930,11 @@ diff -Nur linux-4.4.13.orig/drivers/ide/ide-probe.c linux-4.4.13/drivers/ide/ide drive->dev_flags |= IDE_DFLAG_ID_READ; #ifdef DEBUG -diff -Nur linux-4.4.13.orig/drivers/ide/ide-taskfile.c linux-4.4.13/drivers/ide/ide-taskfile.c ---- linux-4.4.13.orig/drivers/ide/ide-taskfile.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/ide/ide-taskfile.c 2016-06-22 21:55:08.006523867 +0200 -@@ -250,7 +250,7 @@ +diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c +index a716693417a3..be0568c722d6 100644 +--- a/drivers/ide/ide-taskfile.c ++++ b/drivers/ide/ide-taskfile.c +@@ -250,7 +250,7 @@ void ide_pio_bytes(ide_drive_t *drive, struct ide_cmd *cmd, page_is_high = PageHighMem(page); if (page_is_high) @@ -8784,7 +8943,7 @@ diff -Nur linux-4.4.13.orig/drivers/ide/ide-taskfile.c linux-4.4.13/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) @@ -8793,7 +8952,7 @@ diff -Nur linux-4.4.13.orig/drivers/ide/ide-taskfile.c linux-4.4.13/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) @@ -8802,10 +8961,11 @@ diff -Nur linux-4.4.13.orig/drivers/ide/ide-taskfile.c linux-4.4.13/drivers/ide/ ide_set_handler(drive, &task_pio_intr, WAIT_WORSTCASE); -diff -Nur linux-4.4.13.orig/drivers/infiniband/ulp/ipoib/ipoib_multicast.c linux-4.4.13/drivers/infiniband/ulp/ipoib/ipoib_multicast.c ---- linux-4.4.13.orig/drivers/infiniband/ulp/ipoib/ipoib_multicast.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/infiniband/ulp/ipoib/ipoib_multicast.c 2016-06-22 21:55:08.006523867 +0200 -@@ -857,7 +857,7 @@ +diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c +index 87799de90a1d..66cdd37f8605 100644 +--- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c ++++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c +@@ -857,7 +857,7 @@ void ipoib_mcast_restart_task(struct work_struct *work) ipoib_dbg_mcast(priv, "restarting multicast task\n"); @@ -8814,7 +8974,7 @@ diff -Nur linux-4.4.13.orig/drivers/infiniband/ulp/ipoib/ipoib_multicast.c linux netif_addr_lock(dev); spin_lock(&priv->lock); -@@ -939,7 +939,7 @@ +@@ -939,7 +939,7 @@ void ipoib_mcast_restart_task(struct work_struct *work) spin_unlock(&priv->lock); netif_addr_unlock(dev); @@ -8823,10 +8983,11 @@ diff -Nur linux-4.4.13.orig/drivers/infiniband/ulp/ipoib/ipoib_multicast.c linux /* * make sure the in-flight joins have finished before we attempt -diff -Nur linux-4.4.13.orig/drivers/input/gameport/gameport.c linux-4.4.13/drivers/input/gameport/gameport.c ---- linux-4.4.13.orig/drivers/input/gameport/gameport.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/input/gameport/gameport.c 2016-06-22 21:55:08.006523867 +0200 -@@ -91,13 +91,13 @@ +diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c +index 4a2a9e370be7..e970d9afd179 100644 +--- a/drivers/input/gameport/gameport.c ++++ b/drivers/input/gameport/gameport.c +@@ -91,13 +91,13 @@ static int gameport_measure_speed(struct gameport *gameport) tx = ~0; for (i = 0; i < 50; i++) { @@ -8842,7 +9003,7 @@ diff -Nur linux-4.4.13.orig/drivers/input/gameport/gameport.c linux-4.4.13/drive udelay(i * 10); t = (t2 - t1) - (t3 - t2); if (t < tx) -@@ -124,12 +124,12 @@ +@@ -124,12 +124,12 @@ static int old_gameport_measure_speed(struct gameport *gameport) tx = 1 << 30; for(i = 0; i < 50; i++) { @@ -8857,7 +9018,7 @@ diff -Nur linux-4.4.13.orig/drivers/input/gameport/gameport.c linux-4.4.13/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++) { @@ -8871,10 +9032,11 @@ diff -Nur linux-4.4.13.orig/drivers/input/gameport/gameport.c linux-4.4.13/drive udelay(i * 10); if (t2 - t1 < tx) tx = t2 - t1; } -diff -Nur linux-4.4.13.orig/drivers/iommu/amd_iommu.c linux-4.4.13/drivers/iommu/amd_iommu.c ---- linux-4.4.13.orig/drivers/iommu/amd_iommu.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/iommu/amd_iommu.c 2016-06-22 21:55:08.006523867 +0200 -@@ -2017,10 +2017,10 @@ +diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c +index 0397985a2601..bc0e7d2c5cff 100644 +--- a/drivers/iommu/amd_iommu.c ++++ b/drivers/iommu/amd_iommu.c +@@ -2019,10 +2019,10 @@ static int __attach_device(struct iommu_dev_data *dev_data, int ret; /* @@ -8888,7 +9050,7 @@ diff -Nur linux-4.4.13.orig/drivers/iommu/amd_iommu.c linux-4.4.13/drivers/iommu /* lock domain */ spin_lock(&domain->lock); -@@ -2183,10 +2183,10 @@ +@@ -2185,10 +2185,10 @@ static void __detach_device(struct iommu_dev_data *dev_data) struct protection_domain *domain; /* @@ -8902,10 +9064,11 @@ diff -Nur linux-4.4.13.orig/drivers/iommu/amd_iommu.c linux-4.4.13/drivers/iommu if (WARN_ON(!dev_data->domain)) return; -diff -Nur linux-4.4.13.orig/drivers/leds/trigger/Kconfig linux-4.4.13/drivers/leds/trigger/Kconfig ---- linux-4.4.13.orig/drivers/leds/trigger/Kconfig 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/leds/trigger/Kconfig 2016-06-22 21:55:08.006523867 +0200 -@@ -61,7 +61,7 @@ +diff --git a/drivers/leds/trigger/Kconfig b/drivers/leds/trigger/Kconfig +index 5bda6a9b56bb..d6286584c807 100644 +--- a/drivers/leds/trigger/Kconfig ++++ b/drivers/leds/trigger/Kconfig +@@ -61,7 +61,7 @@ config LEDS_TRIGGER_BACKLIGHT config LEDS_TRIGGER_CPU bool "LED CPU Trigger" @@ -8914,9 +9077,10 @@ diff -Nur linux-4.4.13.orig/drivers/leds/trigger/Kconfig linux-4.4.13/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.4.13.orig/drivers/md/bcache/Kconfig linux-4.4.13/drivers/md/bcache/Kconfig ---- linux-4.4.13.orig/drivers/md/bcache/Kconfig 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/md/bcache/Kconfig 2016-06-22 21:55:08.006523867 +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 @@ -8925,10 +9089,11 @@ diff -Nur linux-4.4.13.orig/drivers/md/bcache/Kconfig linux-4.4.13/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.4.13.orig/drivers/md/dm.c linux-4.4.13/drivers/md/dm.c ---- linux-4.4.13.orig/drivers/md/dm.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/md/dm.c 2016-06-22 21:55:08.006523867 +0200 -@@ -2127,7 +2127,7 @@ +diff --git a/drivers/md/dm.c b/drivers/md/dm.c +index a42729ebf272..c717ec464459 100644 +--- a/drivers/md/dm.c ++++ b/drivers/md/dm.c +@@ -2127,7 +2127,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); @@ -8937,10 +9102,11 @@ diff -Nur linux-4.4.13.orig/drivers/md/dm.c linux-4.4.13/drivers/md/dm.c } goto out; -diff -Nur linux-4.4.13.orig/drivers/md/raid5.c linux-4.4.13/drivers/md/raid5.c ---- linux-4.4.13.orig/drivers/md/raid5.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/md/raid5.c 2016-06-22 21:55:08.010523867 +0200 -@@ -1920,8 +1920,9 @@ +diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c +index 10ce885445f6..76f71791361c 100644 +--- a/drivers/md/raid5.c ++++ b/drivers/md/raid5.c +@@ -1920,8 +1920,9 @@ static void raid_run_ops(struct stripe_head *sh, unsigned long ops_request) struct raid5_percpu *percpu; unsigned long cpu; @@ -8951,7 +9117,7 @@ diff -Nur linux-4.4.13.orig/drivers/md/raid5.c linux-4.4.13/drivers/md/raid5.c if (test_bit(STRIPE_OP_BIOFILL, &ops_request)) { ops_run_biofill(sh); overlap_clear++; -@@ -1977,7 +1978,8 @@ +@@ -1977,7 +1978,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); } @@ -8961,7 +9127,7 @@ diff -Nur linux-4.4.13.orig/drivers/md/raid5.c linux-4.4.13/drivers/md/raid5.c } static struct stripe_head *alloc_stripe(struct kmem_cache *sc, gfp_t gfp) -@@ -6414,6 +6416,7 @@ +@@ -6414,6 +6416,7 @@ static int raid5_alloc_percpu(struct r5conf *conf) __func__, cpu); break; } @@ -8969,10 +9135,11 @@ diff -Nur linux-4.4.13.orig/drivers/md/raid5.c linux-4.4.13/drivers/md/raid5.c } put_online_cpus(); -diff -Nur linux-4.4.13.orig/drivers/md/raid5.h linux-4.4.13/drivers/md/raid5.h ---- linux-4.4.13.orig/drivers/md/raid5.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/md/raid5.h 2016-06-22 21:55:08.010523867 +0200 -@@ -504,6 +504,7 @@ +diff --git a/drivers/md/raid5.h b/drivers/md/raid5.h +index 517d4b68a1be..efe91887ecd7 100644 +--- a/drivers/md/raid5.h ++++ b/drivers/md/raid5.h +@@ -504,6 +504,7 @@ struct r5conf { int recovery_disabled; /* per cpu variables */ struct raid5_percpu { @@ -8980,10 +9147,11 @@ diff -Nur linux-4.4.13.orig/drivers/md/raid5.h linux-4.4.13/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.4.13.orig/drivers/media/platform/vsp1/vsp1_video.c linux-4.4.13/drivers/media/platform/vsp1/vsp1_video.c ---- linux-4.4.13.orig/drivers/media/platform/vsp1/vsp1_video.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/media/platform/vsp1/vsp1_video.c 2016-06-22 21:55:08.010523867 +0200 -@@ -520,7 +520,7 @@ +diff --git a/drivers/media/platform/vsp1/vsp1_video.c b/drivers/media/platform/vsp1/vsp1_video.c +index 5ce88e1f5d71..b4f8cd74ecb8 100644 +--- a/drivers/media/platform/vsp1/vsp1_video.c ++++ b/drivers/media/platform/vsp1/vsp1_video.c +@@ -520,7 +520,7 @@ static bool vsp1_pipeline_stopped(struct vsp1_pipeline *pipe) bool stopped; spin_lock_irqsave(&pipe->irqlock, flags); @@ -8992,9 +9160,97 @@ diff -Nur linux-4.4.13.orig/drivers/media/platform/vsp1/vsp1_video.c linux-4.4.1 spin_unlock_irqrestore(&pipe->irqlock, flags); return stopped; -diff -Nur linux-4.4.13.orig/drivers/misc/hwlat_detector.c linux-4.4.13/drivers/misc/hwlat_detector.c ---- linux-4.4.13.orig/drivers/misc/hwlat_detector.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-4.4.13/drivers/misc/hwlat_detector.c 2016-06-22 21:55:08.010523867 +0200 +diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig +index 4bf7d50b1bc7..6f7e99ad6e29 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 537d7f3b78da..ec4aecba0656 100644 +--- a/drivers/misc/Makefile ++++ b/drivers/misc/Makefile +@@ -39,6 +39,7 @@ obj-$(CONFIG_C2PORT) += c2port/ + obj-$(CONFIG_HMC6352) += hmc6352.o + obj-y += eeprom/ + obj-y += cb710/ ++obj-$(CONFIG_HWLAT_DETECTOR) += hwlat_detector.o + obj-$(CONFIG_SPEAR13XX_PCIE_GADGET) += spear13xx_pcie_gadget.o + obj-$(CONFIG_VMWARE_BALLOON) += vmw_balloon.o + obj-$(CONFIG_ARM_CHARLCD) += arm-charlcd.o +diff --git a/drivers/misc/hwlat_detector.c b/drivers/misc/hwlat_detector.c +new file mode 100644 +index 000000000000..52f5ad5fd9c0 +--- /dev/null ++++ b/drivers/misc/hwlat_detector.c @@ -0,0 +1,1240 @@ +/* + * hwlat_detector.c - A simple Hardware Latency detector. @@ -10236,94 +10492,11 @@ diff -Nur linux-4.4.13.orig/drivers/misc/hwlat_detector.c linux-4.4.13/drivers/m + +module_init(detector_init); +module_exit(detector_exit); -diff -Nur linux-4.4.13.orig/drivers/misc/Kconfig linux-4.4.13/drivers/misc/Kconfig ---- linux-4.4.13.orig/drivers/misc/Kconfig 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/misc/Kconfig 2016-06-22 21:55:08.010523867 +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.4.13.orig/drivers/misc/Makefile linux-4.4.13/drivers/misc/Makefile ---- linux-4.4.13.orig/drivers/misc/Makefile 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/misc/Makefile 2016-06-22 21:55:08.010523867 +0200 -@@ -39,6 +39,7 @@ - obj-$(CONFIG_HMC6352) += hmc6352.o - obj-y += eeprom/ - obj-y += cb710/ -+obj-$(CONFIG_HWLAT_DETECTOR) += hwlat_detector.o - obj-$(CONFIG_SPEAR13XX_PCIE_GADGET) += spear13xx_pcie_gadget.o - obj-$(CONFIG_VMWARE_BALLOON) += vmw_balloon.o - obj-$(CONFIG_ARM_CHARLCD) += arm-charlcd.o -diff -Nur linux-4.4.13.orig/drivers/mmc/host/mmci.c linux-4.4.13/drivers/mmc/host/mmci.c ---- linux-4.4.13.orig/drivers/mmc/host/mmci.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/mmc/host/mmci.c 2016-06-22 21:55:08.010523867 +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; @@ -10339,7 +10512,7 @@ diff -Nur linux-4.4.13.orig/drivers/mmc/host/mmci.c linux-4.4.13/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); @@ -10348,10 +10521,11 @@ diff -Nur linux-4.4.13.orig/drivers/mmc/host/mmci.c linux-4.4.13/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.4.13.orig/drivers/net/ethernet/3com/3c59x.c linux-4.4.13/drivers/net/ethernet/3com/3c59x.c ---- linux-4.4.13.orig/drivers/net/ethernet/3com/3c59x.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/net/ethernet/3com/3c59x.c 2016-06-22 21:55:08.010523867 +0200 -@@ -842,9 +842,9 @@ +diff --git a/drivers/net/ethernet/3com/3c59x.c b/drivers/net/ethernet/3com/3c59x.c +index 2839af00f20c..4348b9c850d3 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; @@ -10363,7 +10537,7 @@ diff -Nur linux-4.4.13.orig/drivers/net/ethernet/3com/3c59x.c linux-4.4.13/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; @@ -10378,10 +10552,11 @@ diff -Nur linux-4.4.13.orig/drivers/net/ethernet/3com/3c59x.c linux-4.4.13/drive } } -diff -Nur linux-4.4.13.orig/drivers/net/ethernet/atheros/atl1c/atl1c_main.c linux-4.4.13/drivers/net/ethernet/atheros/atl1c/atl1c_main.c ---- linux-4.4.13.orig/drivers/net/ethernet/atheros/atl1c/atl1c_main.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/net/ethernet/atheros/atl1c/atl1c_main.c 2016-06-22 21:55:08.010523867 +0200 -@@ -2221,11 +2221,7 @@ +diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c +index 8b5988e210d5..cf9928ccdd7e 100644 +--- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c ++++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c +@@ -2221,11 +2221,7 @@ static netdev_tx_t atl1c_xmit_frame(struct sk_buff *skb, } tpd_req = atl1c_cal_tpd_req(skb); @@ -10394,10 +10569,11 @@ diff -Nur linux-4.4.13.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.4.13.orig/drivers/net/ethernet/atheros/atl1e/atl1e_main.c linux-4.4.13/drivers/net/ethernet/atheros/atl1e/atl1e_main.c ---- linux-4.4.13.orig/drivers/net/ethernet/atheros/atl1e/atl1e_main.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/net/ethernet/atheros/atl1e/atl1e_main.c 2016-06-22 21:55:08.010523867 +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); @@ -10407,10 +10583,11 @@ diff -Nur linux-4.4.13.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.4.13.orig/drivers/net/ethernet/chelsio/cxgb/sge.c linux-4.4.13/drivers/net/ethernet/chelsio/cxgb/sge.c ---- linux-4.4.13.orig/drivers/net/ethernet/chelsio/cxgb/sge.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/net/ethernet/chelsio/cxgb/sge.c 2016-06-22 21:55:08.014523867 +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; @@ -10420,10 +10597,11 @@ diff -Nur linux-4.4.13.orig/drivers/net/ethernet/chelsio/cxgb/sge.c linux-4.4.13 reclaim_completed_tx(sge, q); -diff -Nur linux-4.4.13.orig/drivers/net/ethernet/neterion/s2io.c linux-4.4.13/drivers/net/ethernet/neterion/s2io.c ---- linux-4.4.13.orig/drivers/net/ethernet/neterion/s2io.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/net/ethernet/neterion/s2io.c 2016-06-22 21:55:08.014523867 +0200 -@@ -4084,12 +4084,7 @@ +diff --git a/drivers/net/ethernet/neterion/s2io.c b/drivers/net/ethernet/neterion/s2io.c +index 9ba975853ec6..813cfa698160 100644 +--- a/drivers/net/ethernet/neterion/s2io.c ++++ b/drivers/net/ethernet/neterion/s2io.c +@@ -4084,12 +4084,7 @@ static netdev_tx_t s2io_xmit(struct sk_buff *skb, struct net_device *dev) [skb->priority & (MAX_TX_FIFOS - 1)]; fifo = &mac_control->fifos[queue]; @@ -10437,10 +10615,11 @@ diff -Nur linux-4.4.13.orig/drivers/net/ethernet/neterion/s2io.c linux-4.4.13/dr if (sp->config.multiq) { if (__netif_subqueue_stopped(dev, fifo->fifo_no)) { -diff -Nur linux-4.4.13.orig/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c linux-4.4.13/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c ---- linux-4.4.13.orig/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c 2016-06-22 21:55:08.014523867 +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; @@ -10453,10 +10632,11 @@ diff -Nur linux-4.4.13.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.4.13.orig/drivers/net/ethernet/realtek/8139too.c linux-4.4.13/drivers/net/ethernet/realtek/8139too.c ---- linux-4.4.13.orig/drivers/net/ethernet/realtek/8139too.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/net/ethernet/realtek/8139too.c 2016-06-22 21:55:08.014523867 +0200 -@@ -2229,7 +2229,7 @@ +diff --git a/drivers/net/ethernet/realtek/8139too.c b/drivers/net/ethernet/realtek/8139too.c +index ef668d300800..d987d571fdd6 100644 +--- a/drivers/net/ethernet/realtek/8139too.c ++++ b/drivers/net/ethernet/realtek/8139too.c +@@ -2229,7 +2229,7 @@ static void rtl8139_poll_controller(struct net_device *dev) struct rtl8139_private *tp = netdev_priv(dev); const int irq = tp->pci_dev->irq; @@ -10465,10 +10645,11 @@ diff -Nur linux-4.4.13.orig/drivers/net/ethernet/realtek/8139too.c linux-4.4.13/ rtl8139_interrupt(irq, dev); enable_irq(irq); } -diff -Nur linux-4.4.13.orig/drivers/net/ethernet/tehuti/tehuti.c linux-4.4.13/drivers/net/ethernet/tehuti/tehuti.c ---- linux-4.4.13.orig/drivers/net/ethernet/tehuti/tehuti.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/net/ethernet/tehuti/tehuti.c 2016-06-22 21:55:08.014523867 +0200 -@@ -1629,13 +1629,8 @@ +diff --git a/drivers/net/ethernet/tehuti/tehuti.c b/drivers/net/ethernet/tehuti/tehuti.c +index 14c9d1baa85c..e1a5305418a8 100644 +--- a/drivers/net/ethernet/tehuti/tehuti.c ++++ b/drivers/net/ethernet/tehuti/tehuti.c +@@ -1629,13 +1629,8 @@ static netdev_tx_t bdx_tx_transmit(struct sk_buff *skb, unsigned long flags; ENTER; @@ -10484,10 +10665,11 @@ diff -Nur linux-4.4.13.orig/drivers/net/ethernet/tehuti/tehuti.c linux-4.4.13/dr /* build tx descriptor */ BDX_ASSERT(f->m.wptr >= f->m.memsz); /* started with valid wptr */ -diff -Nur linux-4.4.13.orig/drivers/net/rionet.c linux-4.4.13/drivers/net/rionet.c ---- linux-4.4.13.orig/drivers/net/rionet.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/net/rionet.c 2016-06-22 21:55:08.014523867 +0200 -@@ -174,11 +174,7 @@ +diff --git a/drivers/net/rionet.c b/drivers/net/rionet.c +index e7034c55e796..2e4ee0f912bf 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; @@ -10500,10 +10682,11 @@ diff -Nur linux-4.4.13.orig/drivers/net/rionet.c linux-4.4.13/drivers/net/rionet if (is_multicast_ether_addr(eth->h_dest)) add_num = nets[rnet->mport->id].nact; -diff -Nur linux-4.4.13.orig/drivers/net/wireless/orinoco/orinoco_usb.c linux-4.4.13/drivers/net/wireless/orinoco/orinoco_usb.c ---- linux-4.4.13.orig/drivers/net/wireless/orinoco/orinoco_usb.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/net/wireless/orinoco/orinoco_usb.c 2016-06-22 21:55:08.014523867 +0200 -@@ -697,7 +697,7 @@ +diff --git a/drivers/net/wireless/orinoco/orinoco_usb.c b/drivers/net/wireless/orinoco/orinoco_usb.c +index f2cd513d54b2..6c0f4c9638a2 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 { @@ -10512,10 +10695,11 @@ diff -Nur linux-4.4.13.orig/drivers/net/wireless/orinoco/orinoco_usb.c linux-4.4 ctx->done.done); } break; -diff -Nur linux-4.4.13.orig/drivers/pci/access.c linux-4.4.13/drivers/pci/access.c ---- linux-4.4.13.orig/drivers/pci/access.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/pci/access.c 2016-06-22 21:55:08.014523867 +0200 -@@ -561,7 +561,7 @@ +diff --git a/drivers/pci/access.c b/drivers/pci/access.c +index 59ac36fe7c42..7a45a20af78a 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; @@ -10524,10 +10708,11 @@ diff -Nur linux-4.4.13.orig/drivers/pci/access.c linux-4.4.13/drivers/pci/access raw_spin_unlock_irqrestore(&pci_lock, flags); } EXPORT_SYMBOL_GPL(pci_cfg_access_unlock); -diff -Nur linux-4.4.13.orig/drivers/scsi/fcoe/fcoe.c linux-4.4.13/drivers/scsi/fcoe/fcoe.c ---- linux-4.4.13.orig/drivers/scsi/fcoe/fcoe.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/scsi/fcoe/fcoe.c 2016-06-22 21:55:08.018523867 +0200 -@@ -1286,7 +1286,7 @@ +diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c +index f4424063b860..f1622a05854b 100644 +--- a/drivers/scsi/fcoe/fcoe.c ++++ b/drivers/scsi/fcoe/fcoe.c +@@ -1286,7 +1286,7 @@ static void fcoe_percpu_thread_destroy(unsigned int cpu) struct sk_buff *skb; #ifdef CONFIG_SMP struct fcoe_percpu_s *p0; @@ -10536,7 +10721,7 @@ diff -Nur linux-4.4.13.orig/drivers/scsi/fcoe/fcoe.c linux-4.4.13/drivers/scsi/f #endif /* CONFIG_SMP */ FCOE_DBG("Destroying receive thread for CPU %d\n", cpu); -@@ -1342,7 +1342,7 @@ +@@ -1342,7 +1342,7 @@ static void fcoe_percpu_thread_destroy(unsigned int cpu) kfree_skb(skb); spin_unlock_bh(&p->fcoe_rx_list.lock); } @@ -10545,7 +10730,7 @@ diff -Nur linux-4.4.13.orig/drivers/scsi/fcoe/fcoe.c linux-4.4.13/drivers/scsi/f #else /* * This a non-SMP scenario where the singular Rx thread is -@@ -1566,11 +1566,11 @@ +@@ -1566,11 +1566,11 @@ err2: static int fcoe_alloc_paged_crc_eof(struct sk_buff *skb, int tlen) { struct fcoe_percpu_s *fps; @@ -10560,7 +10745,7 @@ diff -Nur linux-4.4.13.orig/drivers/scsi/fcoe/fcoe.c linux-4.4.13/drivers/scsi/f return rc; } -@@ -1766,11 +1766,11 @@ +@@ -1766,11 +1766,11 @@ static inline int fcoe_filter_frames(struct fc_lport *lport, return 0; } @@ -10574,7 +10759,7 @@ diff -Nur linux-4.4.13.orig/drivers/scsi/fcoe/fcoe.c linux-4.4.13/drivers/scsi/f return -EINVAL; } -@@ -1846,13 +1846,13 @@ +@@ -1846,13 +1846,13 @@ static void fcoe_recv_frame(struct sk_buff *skb) goto drop; if (!fcoe_filter_frames(lport, fp)) { @@ -10590,10 +10775,11 @@ diff -Nur linux-4.4.13.orig/drivers/scsi/fcoe/fcoe.c linux-4.4.13/drivers/scsi/f kfree_skb(skb); } -diff -Nur linux-4.4.13.orig/drivers/scsi/fcoe/fcoe_ctlr.c linux-4.4.13/drivers/scsi/fcoe/fcoe_ctlr.c ---- linux-4.4.13.orig/drivers/scsi/fcoe/fcoe_ctlr.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/scsi/fcoe/fcoe_ctlr.c 2016-06-22 21:55:08.018523867 +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); @@ -10602,7 +10788,7 @@ diff -Nur linux-4.4.13.orig/drivers/scsi/fcoe/fcoe_ctlr.c linux-4.4.13/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; } } @@ -10611,10 +10797,11 @@ diff -Nur linux-4.4.13.orig/drivers/scsi/fcoe/fcoe_ctlr.c linux-4.4.13/drivers/s list_for_each_entry_safe(fcf, next, &del_list, list) { /* Removes fcf from current list */ -diff -Nur linux-4.4.13.orig/drivers/scsi/libfc/fc_exch.c linux-4.4.13/drivers/scsi/libfc/fc_exch.c ---- linux-4.4.13.orig/drivers/scsi/libfc/fc_exch.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/scsi/libfc/fc_exch.c 2016-06-22 21:55:08.018523867 +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)); @@ -10627,10 +10814,11 @@ diff -Nur linux-4.4.13.orig/drivers/scsi/libfc/fc_exch.c linux-4.4.13/drivers/sc /* peek cache of free slot */ if (pool->left != FC_XID_UNKNOWN) { -diff -Nur linux-4.4.13.orig/drivers/scsi/libsas/sas_ata.c linux-4.4.13/drivers/scsi/libsas/sas_ata.c ---- linux-4.4.13.orig/drivers/scsi/libsas/sas_ata.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/scsi/libsas/sas_ata.c 2016-06-22 21:55:08.018523867 +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 */ @@ -10639,7 +10827,7 @@ diff -Nur linux-4.4.13.orig/drivers/scsi/libsas/sas_ata.c linux-4.4.13/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); @@ -10648,10 +10836,11 @@ diff -Nur linux-4.4.13.orig/drivers/scsi/libsas/sas_ata.c linux-4.4.13/drivers/s return ret; } -diff -Nur linux-4.4.13.orig/drivers/scsi/qla2xxx/qla_inline.h linux-4.4.13/drivers/scsi/qla2xxx/qla_inline.h ---- linux-4.4.13.orig/drivers/scsi/qla2xxx/qla_inline.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/scsi/qla2xxx/qla_inline.h 2016-06-22 21:55:08.018523867 +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; @@ -10666,18 +10855,19 @@ diff -Nur linux-4.4.13.orig/drivers/scsi/qla2xxx/qla_inline.h linux-4.4.13/drive } static inline uint8_t * -diff -Nur linux-4.4.13.orig/drivers/thermal/x86_pkg_temp_thermal.c linux-4.4.13/drivers/thermal/x86_pkg_temp_thermal.c ---- linux-4.4.13.orig/drivers/thermal/x86_pkg_temp_thermal.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/thermal/x86_pkg_temp_thermal.c 2016-06-22 21:55:08.018523867 +0200 +diff --git a/drivers/thermal/x86_pkg_temp_thermal.c b/drivers/thermal/x86_pkg_temp_thermal.c +index 7fc919f7da4d..e03fa17b8670 100644 +--- a/drivers/thermal/x86_pkg_temp_thermal.c ++++ b/drivers/thermal/x86_pkg_temp_thermal.c @@ -29,6 +29,7 @@ #include <linux/pm.h> #include <linux/thermal.h> #include <linux/debugfs.h> -+#include <linux/work-simple.h> ++#include <linux/swork.h> #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) } } @@ -10686,7 +10876,7 @@ diff -Nur linux-4.4.13.orig/drivers/thermal/x86_pkg_temp_thermal.c linux-4.4.13/ { 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); @@ -10695,7 +10885,7 @@ diff -Nur linux-4.4.13.orig/drivers/thermal/x86_pkg_temp_thermal.c linux-4.4.13/ } 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)); @@ -10744,7 +10934,7 @@ diff -Nur linux-4.4.13.orig/drivers/thermal/x86_pkg_temp_thermal.c linux-4.4.13/ 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; @@ -10754,7 +10944,7 @@ diff -Nur linux-4.4.13.orig/drivers/thermal/x86_pkg_temp_thermal.c linux-4.4.13/ 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; @@ -10763,7 +10953,7 @@ diff -Nur linux-4.4.13.orig/drivers/thermal/x86_pkg_temp_thermal.c linux-4.4.13/ 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; @@ -10771,10 +10961,11 @@ diff -Nur linux-4.4.13.orig/drivers/thermal/x86_pkg_temp_thermal.c linux-4.4.13/ for_each_online_cpu(i) cancel_delayed_work_sync( &per_cpu(pkg_temp_thermal_threshold_work, i)); -diff -Nur linux-4.4.13.orig/drivers/tty/serial/8250/8250_core.c linux-4.4.13/drivers/tty/serial/8250/8250_core.c ---- linux-4.4.13.orig/drivers/tty/serial/8250/8250_core.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/tty/serial/8250/8250_core.c 2016-06-22 21:55:08.018523867 +0200 -@@ -58,7 +58,16 @@ +diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c +index 39126460c1f5..af7701ca4d48 100644 +--- a/drivers/tty/serial/8250/8250_core.c ++++ b/drivers/tty/serial/8250/8250_core.c +@@ -58,7 +58,16 @@ static struct uart_driver serial8250_reg; static unsigned int skip_txen_test; /* force skip of txen test at init time */ @@ -10792,9 +10983,10 @@ diff -Nur linux-4.4.13.orig/drivers/tty/serial/8250/8250_core.c linux-4.4.13/dri #include <asm/serial.h> /* -diff -Nur linux-4.4.13.orig/drivers/tty/serial/8250/8250_port.c linux-4.4.13/drivers/tty/serial/8250/8250_port.c ---- linux-4.4.13.orig/drivers/tty/serial/8250/8250_port.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/tty/serial/8250/8250_port.c 2016-06-22 21:55:08.018523867 +0200 +diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c +index 56ccbcefdd85..a0b9e854672c 100644 +--- a/drivers/tty/serial/8250/8250_port.c ++++ b/drivers/tty/serial/8250/8250_port.c @@ -35,6 +35,7 @@ #include <linux/nmi.h> #include <linux/mutex.h> @@ -10803,7 +10995,7 @@ diff -Nur linux-4.4.13.orig/drivers/tty/serial/8250/8250_port.c linux-4.4.13/dri #include <linux/uaccess.h> #include <linux/pm_runtime.h> -@@ -2843,9 +2844,9 @@ +@@ -2843,9 +2844,9 @@ void serial8250_console_write(struct uart_8250_port *up, const char *s, serial8250_rpm_get(up); @@ -10815,10 +11007,11 @@ diff -Nur linux-4.4.13.orig/drivers/tty/serial/8250/8250_port.c linux-4.4.13/dri locked = spin_trylock_irqsave(&port->lock, flags); else spin_lock_irqsave(&port->lock, flags); -diff -Nur linux-4.4.13.orig/drivers/tty/serial/amba-pl011.c linux-4.4.13/drivers/tty/serial/amba-pl011.c ---- linux-4.4.13.orig/drivers/tty/serial/amba-pl011.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/tty/serial/amba-pl011.c 2016-06-22 21:55:08.018523867 +0200 -@@ -2067,13 +2067,19 @@ +diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c +index 899a77187bde..3ff6363b3751 100644 +--- a/drivers/tty/serial/amba-pl011.c ++++ b/drivers/tty/serial/amba-pl011.c +@@ -2067,13 +2067,19 @@ pl011_console_write(struct console *co, const char *s, unsigned int count) clk_enable(uap->clk); @@ -10841,7 +11034,7 @@ diff -Nur linux-4.4.13.orig/drivers/tty/serial/amba-pl011.c linux-4.4.13/drivers /* * First save the CR then disable the interrupts -@@ -2098,8 +2104,7 @@ +@@ -2098,8 +2104,7 @@ pl011_console_write(struct console *co, const char *s, unsigned int count) writew(old_cr, uap->port.membase + UART011_CR); if (locked) @@ -10851,10 +11044,11 @@ diff -Nur linux-4.4.13.orig/drivers/tty/serial/amba-pl011.c linux-4.4.13/drivers clk_disable(uap->clk); } -diff -Nur linux-4.4.13.orig/drivers/tty/serial/omap-serial.c linux-4.4.13/drivers/tty/serial/omap-serial.c ---- linux-4.4.13.orig/drivers/tty/serial/omap-serial.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/tty/serial/omap-serial.c 2016-06-22 21:55:08.018523867 +0200 -@@ -1257,13 +1257,10 @@ +diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c +index 24280d9a05e9..9745fb8b7abb 100644 +--- a/drivers/tty/serial/omap-serial.c ++++ b/drivers/tty/serial/omap-serial.c +@@ -1257,13 +1257,10 @@ serial_omap_console_write(struct console *co, const char *s, pm_runtime_get_sync(up->dev); @@ -10871,7 +11065,7 @@ diff -Nur linux-4.4.13.orig/drivers/tty/serial/omap-serial.c linux-4.4.13/driver /* * First save the IER then disable the interrupts -@@ -1292,8 +1289,7 @@ +@@ -1292,8 +1289,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) @@ -10881,10 +11075,11 @@ diff -Nur linux-4.4.13.orig/drivers/tty/serial/omap-serial.c linux-4.4.13/driver } static int __init -diff -Nur linux-4.4.13.orig/drivers/tty/serial/sc16is7xx.c linux-4.4.13/drivers/tty/serial/sc16is7xx.c ---- linux-4.4.13.orig/drivers/tty/serial/sc16is7xx.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/tty/serial/sc16is7xx.c 2016-06-22 21:55:08.018523867 +0200 -@@ -1230,7 +1230,7 @@ +diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c +index edb5305b9d4d..7d5ee8a13ac6 100644 +--- a/drivers/tty/serial/sc16is7xx.c ++++ b/drivers/tty/serial/sc16is7xx.c +@@ -1230,7 +1230,7 @@ static int sc16is7xx_probe(struct device *dev, /* Setup interrupt */ ret = devm_request_irq(dev, irq, sc16is7xx_irq, @@ -10893,10 +11088,11 @@ diff -Nur linux-4.4.13.orig/drivers/tty/serial/sc16is7xx.c linux-4.4.13/drivers/ if (!ret) return 0; -diff -Nur linux-4.4.13.orig/drivers/usb/core/hcd.c linux-4.4.13/drivers/usb/core/hcd.c ---- linux-4.4.13.orig/drivers/usb/core/hcd.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/usb/core/hcd.c 2016-06-22 21:55:08.022523867 +0200 -@@ -1735,9 +1735,9 @@ +diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c +index 1c102d60cd9f..a8f2f5bf2674 100644 +--- a/drivers/usb/core/hcd.c ++++ b/drivers/usb/core/hcd.c +@@ -1735,9 +1735,9 @@ static void __usb_hcd_giveback_urb(struct urb *urb) * and no one may trigger the above deadlock situation when * running complete() in tasklet. */ @@ -10908,10 +11104,11 @@ diff -Nur linux-4.4.13.orig/drivers/usb/core/hcd.c linux-4.4.13/drivers/usb/core usb_anchor_resume_wakeups(anchor); atomic_dec(&urb->use_count); -diff -Nur linux-4.4.13.orig/drivers/usb/gadget/function/f_fs.c linux-4.4.13/drivers/usb/gadget/function/f_fs.c ---- linux-4.4.13.orig/drivers/usb/gadget/function/f_fs.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/usb/gadget/function/f_fs.c 2016-06-22 21:55:08.022523867 +0200 -@@ -1404,7 +1404,7 @@ +diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c +index 803c503a2e3d..8dd2720aab64 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) || @@ -10920,10 +11117,11 @@ diff -Nur linux-4.4.13.orig/drivers/usb/gadget/function/f_fs.c linux-4.4.13/driv kfree(ffs->dev_name); kfree(ffs); } -diff -Nur linux-4.4.13.orig/drivers/usb/gadget/legacy/inode.c linux-4.4.13/drivers/usb/gadget/legacy/inode.c ---- linux-4.4.13.orig/drivers/usb/gadget/legacy/inode.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/usb/gadget/legacy/inode.c 2016-06-22 21:55:08.022523867 +0200 -@@ -345,7 +345,7 @@ +diff --git a/drivers/usb/gadget/legacy/inode.c b/drivers/usb/gadget/legacy/inode.c +index 55386619a0f1..fb2791048cdf 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)) { @@ -10932,7 +11130,7 @@ diff -Nur linux-4.4.13.orig/drivers/usb/gadget/legacy/inode.c linux-4.4.13/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); @@ -10941,9 +11139,10 @@ diff -Nur linux-4.4.13.orig/drivers/usb/gadget/legacy/inode.c linux-4.4.13/drive if (epdata->status == -ECONNRESET) epdata->status = -EINTR; } else { -diff -Nur linux-4.4.13.orig/drivers/usb/gadget/udc/atmel_usba_udc.c linux-4.4.13/drivers/usb/gadget/udc/atmel_usba_udc.c ---- linux-4.4.13.orig/drivers/usb/gadget/udc/atmel_usba_udc.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/usb/gadget/udc/atmel_usba_udc.c 2016-06-22 21:55:08.022523867 +0200 +diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.c b/drivers/usb/gadget/udc/atmel_usba_udc.c +index f92f5aff0dd5..f9bba26e3655 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> @@ -10954,7 +11153,7 @@ diff -Nur linux-4.4.13.orig/drivers/usb/gadget/udc/atmel_usba_udc.c linux-4.4.13 #include <linux/usb/ch9.h> #include <linux/usb/gadget.h> #include <linux/usb/atmel_usba_udc.h> -@@ -1888,20 +1890,15 @@ +@@ -1888,20 +1890,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) { @@ -10980,7 +11179,7 @@ diff -Nur linux-4.4.13.orig/drivers/usb/gadget/udc/atmel_usba_udc.c linux-4.4.13 } static const struct usba_udc_errata at91sam9rl_errata = { -@@ -1938,6 +1935,9 @@ +@@ -1938,6 +1935,9 @@ static struct usba_ep * atmel_udc_of_init(struct platform_device *pdev, return ERR_PTR(-EINVAL); udc->errata = match->data; @@ -10990,10 +11189,11 @@ diff -Nur linux-4.4.13.orig/drivers/usb/gadget/udc/atmel_usba_udc.c linux-4.4.13 udc->num_ep = 0; -diff -Nur linux-4.4.13.orig/drivers/usb/gadget/udc/atmel_usba_udc.h linux-4.4.13/drivers/usb/gadget/udc/atmel_usba_udc.h ---- linux-4.4.13.orig/drivers/usb/gadget/udc/atmel_usba_udc.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/drivers/usb/gadget/udc/atmel_usba_udc.h 2016-06-22 21:55:08.022523867 +0200 -@@ -354,6 +354,8 @@ +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 @@ -11002,18 +11202,19 @@ diff -Nur linux-4.4.13.orig/drivers/usb/gadget/udc/atmel_usba_udc.h linux-4.4.13 }; static inline struct usba_ep *to_usba_ep(struct usb_ep *ep) -diff -Nur linux-4.4.13.orig/fs/aio.c linux-4.4.13/fs/aio.c ---- linux-4.4.13.orig/fs/aio.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/fs/aio.c 2016-06-22 21:55:08.022523867 +0200 +diff --git a/fs/aio.c b/fs/aio.c +index 155f84253f33..dd8d6f234a0b 100644 +--- a/fs/aio.c ++++ b/fs/aio.c @@ -40,6 +40,7 @@ #include <linux/ramfs.h> #include <linux/percpu-refcount.h> #include <linux/mount.h> -+#include <linux/work-simple.h> ++#include <linux/swork.h> #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; @@ -11022,7 +11223,7 @@ diff -Nur linux-4.4.13.orig/fs/aio.c linux-4.4.13/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, }; @@ -11030,7 +11231,7 @@ diff -Nur linux-4.4.13.orig/fs/aio.c linux-4.4.13/fs/aio.c aio_mnt = kern_mount(&aio_fs); if (IS_ERR(aio_mnt)) panic("Failed to create aio fs mount."); -@@ -568,9 +570,9 @@ +@@ -568,9 +570,9 @@ static int kiocb_cancel(struct aio_kiocb *kiocb) return cancel(&kiocb->common); } @@ -11042,7 +11243,7 @@ diff -Nur linux-4.4.13.orig/fs/aio.c linux-4.4.13/fs/aio.c pr_debug("freeing %p\n", ctx); -@@ -589,8 +591,8 @@ +@@ -589,8 +591,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); @@ -11053,7 +11254,7 @@ diff -Nur linux-4.4.13.orig/fs/aio.c linux-4.4.13/fs/aio.c } /* -@@ -598,9 +600,9 @@ +@@ -598,9 +600,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. */ @@ -11065,7 +11266,7 @@ diff -Nur linux-4.4.13.orig/fs/aio.c linux-4.4.13/fs/aio.c struct aio_kiocb *req; spin_lock_irq(&ctx->ctx_lock); -@@ -619,6 +621,14 @@ +@@ -619,6 +621,14 @@ static void free_ioctx_users(struct percpu_ref *ref) percpu_ref_put(&ctx->reqs); } @@ -11080,9 +11281,10 @@ diff -Nur linux-4.4.13.orig/fs/aio.c linux-4.4.13/fs/aio.c static int ioctx_add_table(struct kioctx *ctx, struct mm_struct *mm) { unsigned i, new_nr; -diff -Nur linux-4.4.13.orig/fs/autofs4/autofs_i.h linux-4.4.13/fs/autofs4/autofs_i.h ---- linux-4.4.13.orig/fs/autofs4/autofs_i.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/fs/autofs4/autofs_i.h 2016-06-22 21:55:08.022523867 +0200 +diff --git a/fs/autofs4/autofs_i.h b/fs/autofs4/autofs_i.h +index c37149b929be..4c541347308e 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> @@ -11091,10 +11293,11 @@ diff -Nur linux-4.4.13.orig/fs/autofs4/autofs_i.h linux-4.4.13/fs/autofs4/autofs #include <asm/current.h> #include <asm/uaccess.h> -diff -Nur linux-4.4.13.orig/fs/autofs4/expire.c linux-4.4.13/fs/autofs4/expire.c ---- linux-4.4.13.orig/fs/autofs4/expire.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/fs/autofs4/expire.c 2016-06-22 21:55:08.022523867 +0200 -@@ -150,7 +150,7 @@ +diff --git a/fs/autofs4/expire.c b/fs/autofs4/expire.c +index 1cebc3c52fa5..d487fa27add5 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); @@ -11103,10 +11306,11 @@ diff -Nur linux-4.4.13.orig/fs/autofs4/expire.c linux-4.4.13/fs/autofs4/expire.c goto relock; } spin_unlock(&p->d_lock); -diff -Nur linux-4.4.13.orig/fs/buffer.c linux-4.4.13/fs/buffer.c ---- linux-4.4.13.orig/fs/buffer.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/fs/buffer.c 2016-06-22 21:55:08.022523867 +0200 -@@ -305,8 +305,7 @@ +diff --git a/fs/buffer.c b/fs/buffer.c +index 4f4cd959da7c..72b27e17b907 100644 +--- a/fs/buffer.c ++++ b/fs/buffer.c +@@ -305,8 +305,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); @@ -11116,7 +11320,7 @@ diff -Nur linux-4.4.13.orig/fs/buffer.c linux-4.4.13/fs/buffer.c clear_buffer_async_read(bh); unlock_buffer(bh); tmp = bh; -@@ -319,8 +318,7 @@ +@@ -319,8 +318,7 @@ static void end_buffer_async_read(struct buffer_head *bh, int uptodate) } tmp = tmp->b_this_page; } while (tmp != bh); @@ -11126,7 +11330,7 @@ diff -Nur linux-4.4.13.orig/fs/buffer.c linux-4.4.13/fs/buffer.c /* * If none of the buffers had errors and they are all -@@ -332,9 +330,7 @@ +@@ -332,9 +330,7 @@ static void end_buffer_async_read(struct buffer_head *bh, int uptodate) return; still_busy: @@ -11137,7 +11341,7 @@ diff -Nur linux-4.4.13.orig/fs/buffer.c linux-4.4.13/fs/buffer.c } /* -@@ -362,8 +358,7 @@ +@@ -362,8 +358,7 @@ void end_buffer_async_write(struct buffer_head *bh, int uptodate) } first = page_buffers(page); @@ -11147,7 +11351,7 @@ diff -Nur linux-4.4.13.orig/fs/buffer.c linux-4.4.13/fs/buffer.c clear_buffer_async_write(bh); unlock_buffer(bh); -@@ -375,15 +370,12 @@ +@@ -375,15 +370,12 @@ void end_buffer_async_write(struct buffer_head *bh, int uptodate) } tmp = tmp->b_this_page; } @@ -11165,7 +11369,7 @@ diff -Nur linux-4.4.13.orig/fs/buffer.c linux-4.4.13/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); @@ -11173,9 +11377,10 @@ diff -Nur linux-4.4.13.orig/fs/buffer.c linux-4.4.13/fs/buffer.c preempt_disable(); __this_cpu_inc(bh_accounting.nr); recalc_bh_state(); -diff -Nur linux-4.4.13.orig/fs/dcache.c linux-4.4.13/fs/dcache.c ---- linux-4.4.13.orig/fs/dcache.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/fs/dcache.c 2016-06-22 21:55:08.022523867 +0200 +diff --git a/fs/dcache.c b/fs/dcache.c +index 71b6056ad35d..76f007eb28f8 100644 +--- a/fs/dcache.c ++++ b/fs/dcache.c @@ -19,6 +19,7 @@ #include <linux/mm.h> #include <linux/fs.h> @@ -11184,16 +11389,21 @@ diff -Nur linux-4.4.13.orig/fs/dcache.c linux-4.4.13/fs/dcache.c #include <linux/slab.h> #include <linux/init.h> #include <linux/hash.h> -@@ -578,7 +579,7 @@ - - failed: - spin_unlock(&dentry->d_lock); -- cpu_relax(); -+ cpu_chill(); - return dentry; /* try again with same dentry */ +@@ -785,7 +786,12 @@ repeat: + kill_it: + dentry = dentry_kill(dentry); + if (dentry) { +- cond_resched(); ++ int r; ++ ++ /* the task with the highest priority won't schedule */ ++ r = cond_resched(); ++ if (!r) ++ cpu_chill(); + goto repeat; + } } - -@@ -2391,7 +2392,7 @@ +@@ -2394,7 +2400,7 @@ again: if (dentry->d_lockref.count == 1) { if (!spin_trylock(&inode->i_lock)) { spin_unlock(&dentry->d_lock); @@ -11202,10 +11412,11 @@ diff -Nur linux-4.4.13.orig/fs/dcache.c linux-4.4.13/fs/dcache.c goto again; } dentry->d_flags &= ~DCACHE_CANT_MOUNT; -diff -Nur linux-4.4.13.orig/fs/eventpoll.c linux-4.4.13/fs/eventpoll.c ---- linux-4.4.13.orig/fs/eventpoll.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/fs/eventpoll.c 2016-06-22 21:55:08.026523867 +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) { @@ -11220,10 +11431,11 @@ diff -Nur linux-4.4.13.orig/fs/eventpoll.c linux-4.4.13/fs/eventpoll.c } static void ep_remove_wait_queue(struct eppoll_entry *pwq) -diff -Nur linux-4.4.13.orig/fs/exec.c linux-4.4.13/fs/exec.c ---- linux-4.4.13.orig/fs/exec.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/fs/exec.c 2016-06-22 21:55:08.026523867 +0200 -@@ -865,12 +865,14 @@ +diff --git a/fs/exec.c b/fs/exec.c +index b06623a9347f..e7760b7b692c 100644 +--- a/fs/exec.c ++++ b/fs/exec.c +@@ -865,12 +865,14 @@ static int exec_mmap(struct mm_struct *mm) } } task_lock(tsk); @@ -11238,9 +11450,10 @@ diff -Nur linux-4.4.13.orig/fs/exec.c linux-4.4.13/fs/exec.c task_unlock(tsk); if (old_mm) { up_read(&old_mm->mmap_sem); -diff -Nur linux-4.4.13.orig/fs/f2fs/f2fs.h linux-4.4.13/fs/f2fs/f2fs.h ---- linux-4.4.13.orig/fs/f2fs/f2fs.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/fs/f2fs/f2fs.h 2016-06-22 21:55:08.026523867 +0200 +diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h +index 9db5500d63d9..5951c495d124 100644 +--- a/fs/f2fs/f2fs.h ++++ b/fs/f2fs/f2fs.h @@ -24,7 +24,6 @@ #ifdef CONFIG_F2FS_CHECK_FS @@ -11257,7 +11470,7 @@ diff -Nur linux-4.4.13.orig/fs/f2fs/f2fs.h linux-4.4.13/fs/f2fs/f2fs.h #endif /* -@@ -959,7 +957,7 @@ +@@ -959,7 +957,7 @@ static inline void f2fs_unlock_op(struct f2fs_sb_info *sbi) static inline void f2fs_lock_all(struct f2fs_sb_info *sbi) { @@ -11266,10 +11479,11 @@ diff -Nur linux-4.4.13.orig/fs/f2fs/f2fs.h linux-4.4.13/fs/f2fs/f2fs.h } static inline void f2fs_unlock_all(struct f2fs_sb_info *sbi) -diff -Nur linux-4.4.13.orig/fs/jbd2/checkpoint.c linux-4.4.13/fs/jbd2/checkpoint.c ---- linux-4.4.13.orig/fs/jbd2/checkpoint.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/fs/jbd2/checkpoint.c 2016-06-22 21:55:08.026523867 +0200 -@@ -116,6 +116,8 @@ +diff --git a/fs/jbd2/checkpoint.c b/fs/jbd2/checkpoint.c +index 684996c8a3a4..6e18a06aaabe 100644 +--- a/fs/jbd2/checkpoint.c ++++ b/fs/jbd2/checkpoint.c +@@ -116,6 +116,8 @@ void __jbd2_log_wait_for_space(journal_t *journal) nblocks = jbd2_space_needed(journal); while (jbd2_log_space_left(journal) < nblocks) { write_unlock(&journal->j_state_lock); @@ -11278,9 +11492,10 @@ diff -Nur linux-4.4.13.orig/fs/jbd2/checkpoint.c linux-4.4.13/fs/jbd2/checkpoint mutex_lock(&journal->j_checkpoint_mutex); /* -diff -Nur linux-4.4.13.orig/fs/namespace.c linux-4.4.13/fs/namespace.c ---- linux-4.4.13.orig/fs/namespace.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/fs/namespace.c 2016-06-22 21:55:08.026523867 +0200 +diff --git a/fs/namespace.c b/fs/namespace.c +index 5be02a0635be..1f3725bbd04b 100644 +--- a/fs/namespace.c ++++ b/fs/namespace.c @@ -14,6 +14,7 @@ #include <linux/mnt_namespace.h> #include <linux/user_namespace.h> @@ -11289,7 +11504,7 @@ diff -Nur linux-4.4.13.orig/fs/namespace.c linux-4.4.13/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(); @@ -11303,10 +11518,11 @@ diff -Nur linux-4.4.13.orig/fs/namespace.c linux-4.4.13/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.4.13.orig/fs/ntfs/aops.c linux-4.4.13/fs/ntfs/aops.c ---- linux-4.4.13.orig/fs/ntfs/aops.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/fs/ntfs/aops.c 2016-06-22 21:55:08.026523867 +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); @@ -11316,7 +11532,7 @@ diff -Nur linux-4.4.13.orig/fs/ntfs/aops.c linux-4.4.13/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); @@ -11326,7 +11542,7 @@ diff -Nur linux-4.4.13.orig/fs/ntfs/aops.c linux-4.4.13/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); @@ -11342,7 +11558,7 @@ diff -Nur linux-4.4.13.orig/fs/ntfs/aops.c linux-4.4.13/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: @@ -11353,10 +11569,11 @@ diff -Nur linux-4.4.13.orig/fs/ntfs/aops.c linux-4.4.13/fs/ntfs/aops.c } /** -diff -Nur linux-4.4.13.orig/fs/timerfd.c linux-4.4.13/fs/timerfd.c ---- linux-4.4.13.orig/fs/timerfd.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/fs/timerfd.c 2016-06-22 21:55:08.026523867 +0200 -@@ -450,7 +450,10 @@ +diff --git a/fs/timerfd.c b/fs/timerfd.c +index 053818dd6c18..c4bc14fe0085 100644 +--- a/fs/timerfd.c ++++ b/fs/timerfd.c +@@ -450,7 +450,10 @@ static int do_timerfd_settime(int ufd, int flags, break; } spin_unlock_irq(&ctx->wqh.lock); @@ -11368,9 +11585,10 @@ diff -Nur linux-4.4.13.orig/fs/timerfd.c linux-4.4.13/fs/timerfd.c } /* -diff -Nur linux-4.4.13.orig/include/acpi/platform/aclinux.h linux-4.4.13/include/acpi/platform/aclinux.h ---- linux-4.4.13.orig/include/acpi/platform/aclinux.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/acpi/platform/aclinux.h 2016-06-22 21:55:08.026523867 +0200 +diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h +index 323e5daece54..cc5fbd534fd4 100644 +--- a/include/acpi/platform/aclinux.h ++++ b/include/acpi/platform/aclinux.h @@ -127,6 +127,7 @@ #define acpi_cache_t struct kmem_cache @@ -11400,10 +11618,11 @@ diff -Nur linux-4.4.13.orig/include/acpi/platform/aclinux.h linux-4.4.13/include /* * OSL interfaces used by debugger/disassembler */ -diff -Nur linux-4.4.13.orig/include/asm-generic/bug.h linux-4.4.13/include/asm-generic/bug.h ---- linux-4.4.13.orig/include/asm-generic/bug.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/asm-generic/bug.h 2016-06-22 21:55:08.026523867 +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 @@ -11424,9 +11643,10 @@ diff -Nur linux-4.4.13.orig/include/asm-generic/bug.h linux-4.4.13/include/asm-g #endif /* __ASSEMBLY__ */ #endif -diff -Nur linux-4.4.13.orig/include/asm-generic/preempt.h linux-4.4.13/include/asm-generic/preempt.h ---- linux-4.4.13.orig/include/asm-generic/preempt.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/asm-generic/preempt.h 2016-06-22 21:55:08.026523867 +0200 +diff --git a/include/asm-generic/preempt.h b/include/asm-generic/preempt.h +index 5d8ffa3e6f8c..c1cde3577551 100644 +--- a/include/asm-generic/preempt.h ++++ b/include/asm-generic/preempt.h @@ -7,10 +7,10 @@ static __always_inline int preempt_count(void) @@ -11440,10 +11660,23 @@ diff -Nur linux-4.4.13.orig/include/asm-generic/preempt.h linux-4.4.13/include/a { return ¤t_thread_info()->preempt_count; } -diff -Nur linux-4.4.13.orig/include/linux/blkdev.h linux-4.4.13/include/linux/blkdev.h ---- linux-4.4.13.orig/include/linux/blkdev.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/linux/blkdev.h 2016-06-22 21:55:08.026523867 +0200 -@@ -89,6 +89,7 @@ +diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h +index daf17d70aeca..463df8954255 100644 +--- a/include/linux/blk-mq.h ++++ b/include/linux/blk-mq.h +@@ -212,6 +212,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 168755791ec8..a8f18e02b73e 100644 +--- a/include/linux/blkdev.h ++++ b/include/linux/blkdev.h +@@ -89,6 +89,7 @@ struct request { struct list_head queuelist; union { struct call_single_data csd; @@ -11451,7 +11684,7 @@ diff -Nur linux-4.4.13.orig/include/linux/blkdev.h linux-4.4.13/include/linux/bl unsigned long fifo_time; }; -@@ -455,7 +456,7 @@ +@@ -455,7 +456,7 @@ struct request_queue { struct throtl_data *td; #endif struct rcu_head rcu_head; @@ -11460,20 +11693,10 @@ diff -Nur linux-4.4.13.orig/include/linux/blkdev.h linux-4.4.13/include/linux/bl struct percpu_ref q_usage_counter; struct list_head all_q_node; -diff -Nur linux-4.4.13.orig/include/linux/blk-mq.h linux-4.4.13/include/linux/blk-mq.h ---- linux-4.4.13.orig/include/linux/blk-mq.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/linux/blk-mq.h 2016-06-22 21:55:08.026523867 +0200 -@@ -212,6 +212,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.4.13.orig/include/linux/bottom_half.h linux-4.4.13/include/linux/bottom_half.h ---- linux-4.4.13.orig/include/linux/bottom_half.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/linux/bottom_half.h 2016-06-22 21:55:08.026523867 +0200 +diff --git a/include/linux/bottom_half.h b/include/linux/bottom_half.h +index 8fdcb783197d..d07dbeec7bc1 100644 +--- a/include/linux/bottom_half.h ++++ b/include/linux/bottom_half.h @@ -3,6 +3,39 @@ #include <linux/preempt.h> @@ -11514,17 +11737,18 @@ diff -Nur linux-4.4.13.orig/include/linux/bottom_half.h linux-4.4.13/include/lin #ifdef CONFIG_TRACE_IRQFLAGS extern void __local_bh_disable_ip(unsigned long ip, unsigned int cnt); #else -@@ -30,5 +63,6 @@ +@@ -30,5 +63,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.4.13.orig/include/linux/buffer_head.h linux-4.4.13/include/linux/buffer_head.h ---- linux-4.4.13.orig/include/linux/buffer_head.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/linux/buffer_head.h 2016-06-22 21:55:08.026523867 +0200 -@@ -75,8 +75,50 @@ +diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h +index 89d9aa9e79bf..4a201008b02d 100644 +--- a/include/linux/buffer_head.h ++++ b/include/linux/buffer_head.h +@@ -75,8 +75,50 @@ struct buffer_head { struct address_space *b_assoc_map; /* mapping this buffer is associated with */ atomic_t b_count; /* users using this buffer_head */ @@ -11575,18 +11799,19 @@ diff -Nur linux-4.4.13.orig/include/linux/buffer_head.h linux-4.4.13/include/lin /* * macro tricks to expand the set_buffer_foo(), clear_buffer_foo() * and buffer_foo() functions. -diff -Nur linux-4.4.13.orig/include/linux/cgroup-defs.h linux-4.4.13/include/linux/cgroup-defs.h ---- linux-4.4.13.orig/include/linux/cgroup-defs.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/linux/cgroup-defs.h 2016-06-22 21:55:08.026523867 +0200 +diff --git a/include/linux/cgroup-defs.h b/include/linux/cgroup-defs.h +index 8da263299754..0cc474291e08 100644 +--- a/include/linux/cgroup-defs.h ++++ b/include/linux/cgroup-defs.h @@ -16,6 +16,7 @@ #include <linux/percpu-refcount.h> #include <linux/percpu-rwsem.h> #include <linux/workqueue.h> -+#include <linux/work-simple.h> ++#include <linux/swork.h> #ifdef CONFIG_CGROUPS -@@ -142,6 +143,7 @@ +@@ -142,6 +143,7 @@ struct cgroup_subsys_state { /* percpu_ref killing and RCU release */ struct rcu_head rcu_head; struct work_struct destroy_work; @@ -11594,9 +11819,10 @@ diff -Nur linux-4.4.13.orig/include/linux/cgroup-defs.h linux-4.4.13/include/lin }; /* -diff -Nur linux-4.4.13.orig/include/linux/clk/at91_pmc.h linux-4.4.13/include/linux/clk/at91_pmc.h ---- linux-4.4.13.orig/include/linux/clk/at91_pmc.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/linux/clk/at91_pmc.h 2016-06-22 21:55:08.026523867 +0200 +diff --git a/include/linux/clk/at91_pmc.h b/include/linux/clk/at91_pmc.h +index 1e6932222e11..17f413bbbedf 100644 +--- a/include/linux/clk/at91_pmc.h ++++ b/include/linux/clk/at91_pmc.h @@ -16,18 +16,6 @@ #ifndef AT91_PMC_H #define AT91_PMC_H @@ -11616,9 +11842,10 @@ diff -Nur linux-4.4.13.orig/include/linux/clk/at91_pmc.h linux-4.4.13/include/li #define AT91_PMC_SCER 0x00 /* System Clock Enable Register */ #define AT91_PMC_SCDR 0x04 /* System Clock Disable Register */ -diff -Nur linux-4.4.13.orig/include/linux/completion.h linux-4.4.13/include/linux/completion.h ---- linux-4.4.13.orig/include/linux/completion.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/linux/completion.h 2016-06-22 21:55:08.030523867 +0200 +diff --git a/include/linux/completion.h b/include/linux/completion.h +index 5d5aaae3af43..3bca1590e29f 100644 +--- a/include/linux/completion.h ++++ b/include/linux/completion.h @@ -7,8 +7,7 @@ * Atomic wait-for-completion handler data structures. * See kernel/sched/completion.c for details. @@ -11643,7 +11870,7 @@ diff -Nur linux-4.4.13.orig/include/linux/completion.h linux-4.4.13/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; @@ -11652,10 +11879,11 @@ diff -Nur linux-4.4.13.orig/include/linux/completion.h linux-4.4.13/include/linu } /** -diff -Nur linux-4.4.13.orig/include/linux/cpu.h linux-4.4.13/include/linux/cpu.h ---- linux-4.4.13.orig/include/linux/cpu.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/linux/cpu.h 2016-06-22 21:55:08.030523867 +0200 -@@ -231,6 +231,8 @@ +diff --git a/include/linux/cpu.h b/include/linux/cpu.h +index d2ca8c38f9c4..94041d803d0b 100644 +--- a/include/linux/cpu.h ++++ b/include/linux/cpu.h +@@ -231,6 +231,8 @@ extern void get_online_cpus(void); extern void put_online_cpus(void); extern void cpu_hotplug_disable(void); extern void cpu_hotplug_enable(void); @@ -11664,7 +11892,7 @@ diff -Nur linux-4.4.13.orig/include/linux/cpu.h linux-4.4.13/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) -@@ -248,6 +250,8 @@ +@@ -248,6 +250,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) @@ -11673,10 +11901,11 @@ diff -Nur linux-4.4.13.orig/include/linux/cpu.h linux-4.4.13/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.4.13.orig/include/linux/delay.h linux-4.4.13/include/linux/delay.h ---- linux-4.4.13.orig/include/linux/delay.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/linux/delay.h 2016-06-22 21:55:08.030523867 +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); } @@ -11687,10 +11916,11 @@ diff -Nur linux-4.4.13.orig/include/linux/delay.h linux-4.4.13/include/linux/del +#endif + #endif /* defined(_LINUX_DELAY_H) */ -diff -Nur linux-4.4.13.orig/include/linux/ftrace.h linux-4.4.13/include/linux/ftrace.h ---- linux-4.4.13.orig/include/linux/ftrace.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/linux/ftrace.h 2016-06-22 21:55:08.030523867 +0200 -@@ -694,6 +694,18 @@ +diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h +index 60048c50404e..f2cd67624f18 100644 +--- a/include/linux/ftrace.h ++++ b/include/linux/ftrace.h +@@ -694,6 +694,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)) @@ -11709,9 +11939,10 @@ diff -Nur linux-4.4.13.orig/include/linux/ftrace.h linux-4.4.13/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.4.13.orig/include/linux/highmem.h linux-4.4.13/include/linux/highmem.h ---- linux-4.4.13.orig/include/linux/highmem.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/linux/highmem.h 2016-06-22 21:55:08.030523867 +0200 +diff --git a/include/linux/highmem.h b/include/linux/highmem.h +index bb3f3297062a..a117a33ef72c 100644 +--- a/include/linux/highmem.h ++++ b/include/linux/highmem.h @@ -7,6 +7,7 @@ #include <linux/mm.h> #include <linux/uaccess.h> @@ -11720,7 +11951,7 @@ diff -Nur linux-4.4.13.orig/include/linux/highmem.h linux-4.4.13/include/linux/h #include <asm/cacheflush.h> -@@ -65,7 +66,7 @@ +@@ -65,7 +66,7 @@ static inline void kunmap(struct page *page) static inline void *kmap_atomic(struct page *page) { @@ -11729,7 +11960,7 @@ diff -Nur linux-4.4.13.orig/include/linux/highmem.h linux-4.4.13/include/linux/h pagefault_disable(); return page_address(page); } -@@ -74,7 +75,7 @@ +@@ -74,7 +75,7 @@ static inline void *kmap_atomic(struct page *page) static inline void __kunmap_atomic(void *addr) { pagefault_enable(); @@ -11738,7 +11969,7 @@ diff -Nur linux-4.4.13.orig/include/linux/highmem.h linux-4.4.13/include/linux/h } #define kmap_atomic_pfn(pfn) kmap_atomic(pfn_to_page(pfn)) -@@ -86,32 +87,51 @@ +@@ -86,32 +87,51 @@ static inline void __kunmap_atomic(void *addr) #if defined(CONFIG_HIGHMEM) || defined(CONFIG_X86_32) @@ -11794,10 +12025,11 @@ diff -Nur linux-4.4.13.orig/include/linux/highmem.h linux-4.4.13/include/linux/h #endif } -diff -Nur linux-4.4.13.orig/include/linux/hrtimer.h linux-4.4.13/include/linux/hrtimer.h ---- linux-4.4.13.orig/include/linux/hrtimer.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/linux/hrtimer.h 2016-06-22 21:55:08.030523867 +0200 -@@ -87,6 +87,9 @@ +diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h +index 2ead22dd74a0..8fbcdfa5dc77 100644 +--- a/include/linux/hrtimer.h ++++ b/include/linux/hrtimer.h +@@ -87,6 +87,9 @@ enum hrtimer_restart { * @function: timer expiry callback function * @base: pointer to the timer base (per cpu and per clock) * @state: state information (See bit values above) @@ -11807,7 +12039,7 @@ diff -Nur linux-4.4.13.orig/include/linux/hrtimer.h linux-4.4.13/include/linux/h * @is_rel: Set if the timer was armed relative * @start_pid: timer statistics field to store the pid of the task which * started the timer -@@ -103,6 +106,11 @@ +@@ -103,6 +106,11 @@ struct hrtimer { enum hrtimer_restart (*function)(struct hrtimer *); struct hrtimer_clock_base *base; u8 state; @@ -11819,7 +12051,7 @@ diff -Nur linux-4.4.13.orig/include/linux/hrtimer.h linux-4.4.13/include/linux/h u8 is_rel; #ifdef CONFIG_TIMER_STATS int start_pid; -@@ -123,11 +131,7 @@ +@@ -123,11 +131,7 @@ struct hrtimer_sleeper { struct task_struct *task; }; @@ -11831,7 +12063,7 @@ diff -Nur linux-4.4.13.orig/include/linux/hrtimer.h linux-4.4.13/include/linux/h /** * struct hrtimer_clock_base - the timer base for a specific clock -@@ -136,6 +140,7 @@ +@@ -136,6 +140,7 @@ struct hrtimer_sleeper { * timer to a base on another cpu. * @clockid: clock id for per_cpu support * @active: red black tree root node for the active timers @@ -11839,7 +12071,7 @@ diff -Nur linux-4.4.13.orig/include/linux/hrtimer.h linux-4.4.13/include/linux/h * @get_time: function to retrieve the current time of the clock * @offset: offset of this clock to the monotonic base */ -@@ -144,6 +149,7 @@ +@@ -144,6 +149,7 @@ struct hrtimer_clock_base { int index; clockid_t clockid; struct timerqueue_head active; @@ -11847,7 +12079,7 @@ diff -Nur linux-4.4.13.orig/include/linux/hrtimer.h linux-4.4.13/include/linux/h ktime_t (*get_time)(void); ktime_t offset; } __attribute__((__aligned__(HRTIMER_CLOCK_BASE_ALIGN))); -@@ -187,6 +193,7 @@ +@@ -187,6 +193,7 @@ struct hrtimer_cpu_base { raw_spinlock_t lock; seqcount_t seq; struct hrtimer *running; @@ -11855,7 +12087,7 @@ diff -Nur linux-4.4.13.orig/include/linux/hrtimer.h linux-4.4.13/include/linux/h unsigned int cpu; unsigned int active_bases; unsigned int clock_was_set_seq; -@@ -203,6 +210,9 @@ +@@ -203,6 +210,9 @@ struct hrtimer_cpu_base { unsigned int nr_hangs; unsigned int max_hang_time; #endif @@ -11865,7 +12097,7 @@ diff -Nur linux-4.4.13.orig/include/linux/hrtimer.h linux-4.4.13/include/linux/h struct hrtimer_clock_base clock_base[HRTIMER_MAX_CLOCK_BASES]; } ____cacheline_aligned; -@@ -412,6 +422,13 @@ +@@ -412,6 +422,13 @@ static inline void hrtimer_restart(struct hrtimer *timer) hrtimer_start_expires(timer, HRTIMER_MODE_ABS); } @@ -11879,7 +12111,7 @@ diff -Nur linux-4.4.13.orig/include/linux/hrtimer.h linux-4.4.13/include/linux/h /* Query timers: */ extern ktime_t __hrtimer_get_remaining(const struct hrtimer *timer, bool adjust); -@@ -436,7 +453,7 @@ +@@ -436,7 +453,7 @@ static inline int hrtimer_is_queued(struct hrtimer *timer) * Helper function to check, whether the timer is running the callback * function */ @@ -11888,10 +12120,11 @@ diff -Nur linux-4.4.13.orig/include/linux/hrtimer.h linux-4.4.13/include/linux/h { return timer->base->cpu_base->running == timer; } -diff -Nur linux-4.4.13.orig/include/linux/idr.h linux-4.4.13/include/linux/idr.h ---- linux-4.4.13.orig/include/linux/idr.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/linux/idr.h 2016-06-22 21:55:08.030523867 +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. */ @@ -11906,10 +12139,11 @@ diff -Nur linux-4.4.13.orig/include/linux/idr.h linux-4.4.13/include/linux/idr.h /** * idr_find - return pointer for given id -diff -Nur linux-4.4.13.orig/include/linux/init_task.h linux-4.4.13/include/linux/init_task.h ---- linux-4.4.13.orig/include/linux/init_task.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/linux/init_task.h 2016-06-22 21:55:08.030523867 +0200 -@@ -148,9 +148,15 @@ +diff --git a/include/linux/init_task.h b/include/linux/init_task.h +index 1c1ff7e4faa4..60fadde71a44 100644 +--- a/include/linux/init_task.h ++++ b/include/linux/init_task.h +@@ -148,9 +148,15 @@ extern struct task_group root_task_group; # define INIT_PERF_EVENTS(tsk) #endif @@ -11926,7 +12160,7 @@ diff -Nur linux-4.4.13.orig/include/linux/init_task.h linux-4.4.13/include/linux .vtime_snap = 0, \ .vtime_snap_whence = VTIME_SYS, #else -@@ -239,6 +245,7 @@ +@@ -239,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 */ \ @@ -11934,9 +12168,10 @@ diff -Nur linux-4.4.13.orig/include/linux/init_task.h linux-4.4.13/include/linux .pids = { \ [PIDTYPE_PID] = INIT_PID_LINK(PIDTYPE_PID), \ [PIDTYPE_PGID] = INIT_PID_LINK(PIDTYPE_PGID), \ -diff -Nur linux-4.4.13.orig/include/linux/interrupt.h linux-4.4.13/include/linux/interrupt.h ---- linux-4.4.13.orig/include/linux/interrupt.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/linux/interrupt.h 2016-06-22 21:55:08.030523867 +0200 +diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h +index ad16809c8596..655cee096aed 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 @@ -11953,7 +12188,7 @@ diff -Nur linux-4.4.13.orig/include/linux/interrupt.h linux-4.4.13/include/linux #define IRQF_TIMER (__IRQF_TIMER | IRQF_NO_SUSPEND | IRQF_NO_THREAD) -@@ -186,7 +188,7 @@ +@@ -186,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 @@ -11962,7 +12197,7 @@ diff -Nur linux-4.4.13.orig/include/linux/interrupt.h linux-4.4.13/include/linux #endif extern void disable_irq_nosync(unsigned int irq); -@@ -206,6 +208,7 @@ +@@ -206,6 +208,7 @@ extern void resume_device_irqs(void); * @irq: Interrupt to which notification applies * @kref: Reference count, for internal use * @work: Work item, for internal use @@ -11970,7 +12205,7 @@ diff -Nur linux-4.4.13.orig/include/linux/interrupt.h linux-4.4.13/include/linux * @notify: Function to be called on change. This will be * called in process context. * @release: Function to be called on release. This will be -@@ -217,6 +220,7 @@ +@@ -217,6 +220,7 @@ struct irq_affinity_notify { unsigned int irq; struct kref kref; struct work_struct work; @@ -11978,7 +12213,7 @@ diff -Nur linux-4.4.13.orig/include/linux/interrupt.h linux-4.4.13/include/linux void (*notify)(struct irq_affinity_notify *, const cpumask_t *mask); void (*release)(struct kref *ref); }; -@@ -379,9 +383,13 @@ +@@ -379,9 +383,13 @@ extern int irq_set_irqchip_state(unsigned int irq, enum irqchip_irq_state which, bool state); #ifdef CONFIG_IRQ_FORCED_THREADING @@ -11993,7 +12228,7 @@ diff -Nur linux-4.4.13.orig/include/linux/interrupt.h linux-4.4.13/include/linux #endif #ifndef __ARCH_SET_SOFTIRQ_PENDING -@@ -438,9 +446,10 @@ +@@ -438,9 +446,10 @@ struct softirq_action void (*action)(struct softirq_action *); }; @@ -12005,7 +12240,7 @@ diff -Nur linux-4.4.13.orig/include/linux/interrupt.h linux-4.4.13/include/linux #ifdef __ARCH_HAS_DO_SOFTIRQ void do_softirq_own_stack(void); #else -@@ -449,13 +458,25 @@ +@@ -449,13 +458,25 @@ static inline void do_softirq_own_stack(void) __do_softirq(); } #endif @@ -12031,7 +12266,7 @@ diff -Nur linux-4.4.13.orig/include/linux/interrupt.h linux-4.4.13/include/linux DECLARE_PER_CPU(struct task_struct *, ksoftirqd); -@@ -477,8 +498,9 @@ +@@ -477,8 +498,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. @@ -12043,7 +12278,7 @@ diff -Nur linux-4.4.13.orig/include/linux/interrupt.h linux-4.4.13/include/linux * Tasklet is strictly serialized wrt itself, but not wrt another tasklets. If client needs some intertask synchronization, he makes it with spinlocks. -@@ -503,27 +525,36 @@ +@@ -503,27 +525,36 @@ struct tasklet_struct name = { NULL, 0, ATOMIC_INIT(1), func, data } enum { TASKLET_STATE_SCHED, /* Tasklet is scheduled for execution */ @@ -12086,7 +12321,7 @@ diff -Nur linux-4.4.13.orig/include/linux/interrupt.h linux-4.4.13/include/linux #define tasklet_unlock_wait(t) do { } while (0) #define tasklet_unlock(t) do { } while (0) #endif -@@ -572,12 +603,7 @@ +@@ -572,12 +603,7 @@ static inline void tasklet_disable(struct tasklet_struct *t) smp_mb(); } @@ -12100,7 +12335,7 @@ diff -Nur linux-4.4.13.orig/include/linux/interrupt.h linux-4.4.13/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, -@@ -608,6 +634,12 @@ +@@ -608,6 +634,12 @@ void tasklet_hrtimer_cancel(struct tasklet_hrtimer *ttimer) tasklet_kill(&ttimer->tasklet); } @@ -12113,10 +12348,62 @@ diff -Nur linux-4.4.13.orig/include/linux/interrupt.h linux-4.4.13/include/linux /* * Autoprobing for irqs: * -diff -Nur linux-4.4.13.orig/include/linux/irqdesc.h linux-4.4.13/include/linux/irqdesc.h ---- linux-4.4.13.orig/include/linux/irqdesc.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/linux/irqdesc.h 2016-06-22 21:55:08.030523867 +0200 -@@ -61,6 +61,7 @@ +diff --git a/include/linux/irq.h b/include/linux/irq.h +index 3c1c96786248..311d3f061452 100644 +--- a/include/linux/irq.h ++++ b/include/linux/irq.h +@@ -72,6 +72,7 @@ enum irqchip_irq_state; + * IRQ_IS_POLLED - Always polled by another interrupt. Exclude + * it from the spurious interrupt detection + * mechanism and from core side polling. ++ * IRQ_NO_SOFTIRQ_CALL - No softirq processing in the irq thread context (RT) + * IRQ_DISABLE_UNLAZY - Disable lazy irq disable + */ + enum { +@@ -99,13 +100,14 @@ enum { + IRQ_PER_CPU_DEVID = (1 << 17), + IRQ_IS_POLLED = (1 << 18), + IRQ_DISABLE_UNLAZY = (1 << 19), ++ IRQ_NO_SOFTIRQ_CALL = (1 << 20), + }; + + #define IRQF_MODIFY_MASK \ + (IRQ_TYPE_SENSE_MASK | IRQ_NOPROBE | IRQ_NOREQUEST | \ + IRQ_NOAUTOEN | IRQ_MOVE_PCNTXT | IRQ_LEVEL | IRQ_NO_BALANCING | \ + IRQ_PER_CPU | IRQ_NESTED_THREAD | IRQ_NOTHREAD | IRQ_PER_CPU_DEVID | \ +- IRQ_IS_POLLED | IRQ_DISABLE_UNLAZY) ++ IRQ_IS_POLLED | IRQ_DISABLE_UNLAZY | IRQ_NO_SOFTIRQ_CALL) + + #define IRQ_NO_BALANCING_MASK (IRQ_PER_CPU | IRQ_NO_BALANCING) + +diff --git a/include/linux/irq_work.h b/include/linux/irq_work.h +index 47b9ebd4a74f..2543aab05daa 100644 +--- a/include/linux/irq_work.h ++++ b/include/linux/irq_work.h +@@ -16,6 +16,7 @@ + #define IRQ_WORK_BUSY 2UL + #define IRQ_WORK_FLAGS 3UL + #define IRQ_WORK_LAZY 4UL /* Doesn't want IPI, wait for tick */ ++#define IRQ_WORK_HARD_IRQ 8UL /* Run hard IRQ context, even on RT */ + + struct irq_work { + unsigned long flags; +@@ -51,4 +52,10 @@ static inline bool irq_work_needs_cpu(void) { return false; } + static inline void irq_work_run(void) { } + #endif + ++#if defined(CONFIG_IRQ_WORK) && defined(CONFIG_PREEMPT_RT_FULL) ++void irq_work_tick_soft(void); ++#else ++static inline void irq_work_tick_soft(void) { } ++#endif ++ + #endif /* _LINUX_IRQ_WORK_H */ +diff --git a/include/linux/irqdesc.h b/include/linux/irqdesc.h +index a587a33363c7..ad57402a242d 100644 +--- a/include/linux/irqdesc.h ++++ b/include/linux/irqdesc.h +@@ -61,6 +61,7 @@ struct irq_desc { unsigned int irqs_unhandled; atomic_t threads_handled; int threads_handled_last; @@ -12124,9 +12411,10 @@ diff -Nur linux-4.4.13.orig/include/linux/irqdesc.h linux-4.4.13/include/linux/i raw_spinlock_t lock; struct cpumask *percpu_enabled; #ifdef CONFIG_SMP -diff -Nur linux-4.4.13.orig/include/linux/irqflags.h linux-4.4.13/include/linux/irqflags.h ---- linux-4.4.13.orig/include/linux/irqflags.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/linux/irqflags.h 2016-06-22 21:55:08.030523867 +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) @@ -12177,59 +12465,11 @@ diff -Nur linux-4.4.13.orig/include/linux/irqflags.h linux-4.4.13/include/linux/ +#endif + #endif -diff -Nur linux-4.4.13.orig/include/linux/irq.h linux-4.4.13/include/linux/irq.h ---- linux-4.4.13.orig/include/linux/irq.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/linux/irq.h 2016-06-22 21:55:08.030523867 +0200 -@@ -72,6 +72,7 @@ - * IRQ_IS_POLLED - Always polled by another interrupt. Exclude - * it from the spurious interrupt detection - * mechanism and from core side polling. -+ * IRQ_NO_SOFTIRQ_CALL - No softirq processing in the irq thread context (RT) - * IRQ_DISABLE_UNLAZY - Disable lazy irq disable - */ - enum { -@@ -99,13 +100,14 @@ - IRQ_PER_CPU_DEVID = (1 << 17), - IRQ_IS_POLLED = (1 << 18), - IRQ_DISABLE_UNLAZY = (1 << 19), -+ IRQ_NO_SOFTIRQ_CALL = (1 << 20), - }; - - #define IRQF_MODIFY_MASK \ - (IRQ_TYPE_SENSE_MASK | IRQ_NOPROBE | IRQ_NOREQUEST | \ - IRQ_NOAUTOEN | IRQ_MOVE_PCNTXT | IRQ_LEVEL | IRQ_NO_BALANCING | \ - IRQ_PER_CPU | IRQ_NESTED_THREAD | IRQ_NOTHREAD | IRQ_PER_CPU_DEVID | \ -- IRQ_IS_POLLED | IRQ_DISABLE_UNLAZY) -+ IRQ_IS_POLLED | IRQ_DISABLE_UNLAZY | IRQ_NO_SOFTIRQ_CALL) - - #define IRQ_NO_BALANCING_MASK (IRQ_PER_CPU | IRQ_NO_BALANCING) - -diff -Nur linux-4.4.13.orig/include/linux/irq_work.h linux-4.4.13/include/linux/irq_work.h ---- linux-4.4.13.orig/include/linux/irq_work.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/linux/irq_work.h 2016-06-22 21:55:08.030523867 +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.4.13.orig/include/linux/jbd2.h linux-4.4.13/include/linux/jbd2.h ---- linux-4.4.13.orig/include/linux/jbd2.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/linux/jbd2.h 2016-06-22 21:55:08.030523867 +0200 -@@ -352,32 +352,56 @@ +diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h +index 65407f6c9120..eb5aabe4e18c 100644 +--- a/include/linux/jbd2.h ++++ b/include/linux/jbd2.h +@@ -352,32 +352,56 @@ static inline struct journal_head *bh2jh(struct buffer_head *bh) static inline void jbd_lock_bh_state(struct buffer_head *bh) { @@ -12286,10 +12526,11 @@ diff -Nur linux-4.4.13.orig/include/linux/jbd2.h linux-4.4.13/include/linux/jbd2 } #define J_ASSERT(assert) BUG_ON(!(assert)) -diff -Nur linux-4.4.13.orig/include/linux/kdb.h linux-4.4.13/include/linux/kdb.h ---- linux-4.4.13.orig/include/linux/kdb.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/linux/kdb.h 2016-06-22 21:55:08.030523867 +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 *, ...); @@ -12297,7 +12538,7 @@ diff -Nur linux-4.4.13.orig/include/linux/kdb.h linux-4.4.13/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; } @@ -12305,10 +12546,11 @@ diff -Nur linux-4.4.13.orig/include/linux/kdb.h linux-4.4.13/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.4.13.orig/include/linux/kernel.h linux-4.4.13/include/linux/kernel.h ---- linux-4.4.13.orig/include/linux/kernel.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/linux/kernel.h 2016-06-22 21:55:08.030523867 +0200 -@@ -188,6 +188,9 @@ +diff --git a/include/linux/kernel.h b/include/linux/kernel.h +index 924853d33a13..c84b10d6527d 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) @@ -12318,7 +12560,7 @@ diff -Nur linux-4.4.13.orig/include/linux/kernel.h linux-4.4.13/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) @@ -12326,7 +12568,7 @@ diff -Nur linux-4.4.13.orig/include/linux/kernel.h linux-4.4.13/include/linux/ke # define sched_annotate_sleep() do { } while (0) #endif -@@ -255,6 +259,7 @@ +@@ -255,6 +259,7 @@ extern long (*panic_blink)(int state); __printf(1, 2) void panic(const char *fmt, ...) __noreturn __cold; @@ -12334,7 +12576,7 @@ diff -Nur linux-4.4.13.orig/include/linux/kernel.h linux-4.4.13/include/linux/ke extern void oops_enter(void); extern void oops_exit(void); void print_oops_end_marker(void); -@@ -446,6 +451,14 @@ +@@ -446,6 +451,14 @@ extern int sysctl_panic_on_stackoverflow; extern bool crash_kexec_post_notifiers; /* @@ -12349,7 +12591,7 @@ diff -Nur linux-4.4.13.orig/include/linux/kernel.h linux-4.4.13/include/linux/ke * Only to be used by arch init code. If the user over-wrote the default * CONFIG_PANIC_TIMEOUT, honor it. */ -@@ -473,6 +486,7 @@ +@@ -473,6 +486,7 @@ extern enum system_states { SYSTEM_HALT, SYSTEM_POWER_OFF, SYSTEM_RESTART, @@ -12357,9 +12599,10 @@ diff -Nur linux-4.4.13.orig/include/linux/kernel.h linux-4.4.13/include/linux/ke } system_state; #define TAINT_PROPRIETARY_MODULE 0 -diff -Nur linux-4.4.13.orig/include/linux/kvm_host.h linux-4.4.13/include/linux/kvm_host.h ---- linux-4.4.13.orig/include/linux/kvm_host.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/linux/kvm_host.h 2016-06-22 21:55:08.030523867 +0200 +diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h +index c923350ca20a..c690acc6900e 100644 +--- a/include/linux/kvm_host.h ++++ b/include/linux/kvm_host.h @@ -25,6 +25,7 @@ #include <linux/irqflags.h> #include <linux/context_tracking.h> @@ -12368,7 +12611,7 @@ diff -Nur linux-4.4.13.orig/include/linux/kvm_host.h linux-4.4.13/include/linux/ #include <asm/signal.h> #include <linux/kvm.h> -@@ -243,7 +244,7 @@ +@@ -243,7 +244,7 @@ struct kvm_vcpu { int fpu_active; int guest_fpu_loaded, guest_xcr0_loaded; unsigned char fpu_counter; @@ -12377,7 +12620,7 @@ diff -Nur linux-4.4.13.orig/include/linux/kvm_host.h linux-4.4.13/include/linux/ struct pid *pid; int sigset_active; sigset_t sigset; -@@ -794,7 +795,7 @@ +@@ -794,7 +795,7 @@ static inline bool kvm_arch_has_assigned_device(struct kvm *kvm) } #endif @@ -12386,9 +12629,10 @@ diff -Nur linux-4.4.13.orig/include/linux/kvm_host.h linux-4.4.13/include/linux/ { #ifdef __KVM_HAVE_ARCH_WQP return vcpu->arch.wqp; -diff -Nur linux-4.4.13.orig/include/linux/lglock.h linux-4.4.13/include/linux/lglock.h ---- linux-4.4.13.orig/include/linux/lglock.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/linux/lglock.h 2016-06-22 21:55:08.030523867 +0200 +diff --git a/include/linux/lglock.h b/include/linux/lglock.h +index c92ebd100d9b..6f035f635d0e 100644 +--- a/include/linux/lglock.h ++++ b/include/linux/lglock.h @@ -34,13 +34,30 @@ #endif @@ -12420,7 +12664,7 @@ diff -Nur linux-4.4.13.orig/include/linux/lglock.h linux-4.4.13/include/linux/lg #define DEFINE_LGLOCK(name) \ static DEFINE_PER_CPU(arch_spinlock_t, name ## _lock) \ = __ARCH_SPIN_LOCK_UNLOCKED; \ -@@ -50,6 +67,7 @@ +@@ -50,6 +67,7 @@ struct lglock { static DEFINE_PER_CPU(arch_spinlock_t, name ## _lock) \ = __ARCH_SPIN_LOCK_UNLOCKED; \ static struct lglock name = { .lock = &name ## _lock } @@ -12428,7 +12672,7 @@ diff -Nur linux-4.4.13.orig/include/linux/lglock.h linux-4.4.13/include/linux/lg void lg_lock_init(struct lglock *lg, char *name); -@@ -64,6 +82,12 @@ +@@ -64,6 +82,12 @@ void lg_double_unlock(struct lglock *lg, int cpu1, int cpu2); void lg_global_lock(struct lglock *lg); void lg_global_unlock(struct lglock *lg); @@ -12441,9 +12685,10 @@ diff -Nur linux-4.4.13.orig/include/linux/lglock.h linux-4.4.13/include/linux/lg #else /* When !CONFIG_SMP, map lglock to spinlock */ #define lglock spinlock -diff -Nur linux-4.4.13.orig/include/linux/list_bl.h linux-4.4.13/include/linux/list_bl.h ---- linux-4.4.13.orig/include/linux/list_bl.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/linux/list_bl.h 2016-06-22 21:55:08.030523867 +0200 +diff --git a/include/linux/list_bl.h b/include/linux/list_bl.h +index 8132214e8efd..89ffaa7bd342 100644 +--- a/include/linux/list_bl.h ++++ b/include/linux/list_bl.h @@ -2,6 +2,7 @@ #define _LINUX_LIST_BL_H @@ -12479,7 +12724,7 @@ diff -Nur linux-4.4.13.orig/include/linux/list_bl.h linux-4.4.13/include/linux/l static inline void INIT_HLIST_BL_NODE(struct hlist_bl_node *h) { -@@ -118,12 +130,26 @@ +@@ -118,12 +130,26 @@ static inline void hlist_bl_del_init(struct hlist_bl_node *n) static inline void hlist_bl_lock(struct hlist_bl_head *b) { @@ -12506,10 +12751,12 @@ diff -Nur linux-4.4.13.orig/include/linux/list_bl.h linux-4.4.13/include/linux/l } static inline bool hlist_bl_is_locked(struct hlist_bl_head *b) -diff -Nur linux-4.4.13.orig/include/linux/locallock.h linux-4.4.13/include/linux/locallock.h ---- linux-4.4.13.orig/include/linux/locallock.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-4.4.13/include/linux/locallock.h 2016-06-22 21:55:08.030523867 +0200 -@@ -0,0 +1,270 @@ +diff --git a/include/linux/locallock.h b/include/linux/locallock.h +new file mode 100644 +index 000000000000..e572a3971631 +--- /dev/null ++++ b/include/linux/locallock.h +@@ -0,0 +1,276 @@ +#ifndef _LINUX_LOCALLOCK_H +#define _LINUX_LOCALLOCK_H + @@ -12578,6 +12825,9 @@ diff -Nur linux-4.4.13.orig/include/linux/locallock.h linux-4.4.13/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)) { @@ -12616,6 +12866,9 @@ diff -Nur linux-4.4.13.orig/include/linux/locallock.h linux-4.4.13/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); @@ -12780,9 +13033,10 @@ diff -Nur linux-4.4.13.orig/include/linux/locallock.h linux-4.4.13/include/linux +#endif + +#endif -diff -Nur linux-4.4.13.orig/include/linux/mm_types.h linux-4.4.13/include/linux/mm_types.h ---- linux-4.4.13.orig/include/linux/mm_types.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/linux/mm_types.h 2016-06-22 21:55:08.030523867 +0200 +diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h +index f8d1492a114f..b238ebfbb4d6 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> @@ -12791,7 +13045,7 @@ diff -Nur linux-4.4.13.orig/include/linux/mm_types.h linux-4.4.13/include/linux/ #include <linux/page-flags-layout.h> #include <asm/page.h> #include <asm/mmu.h> -@@ -504,6 +505,9 @@ +@@ -504,6 +505,9 @@ struct mm_struct { bool tlb_flush_pending; #endif struct uprobes_state uprobes_state; @@ -12801,9 +13055,10 @@ diff -Nur linux-4.4.13.orig/include/linux/mm_types.h linux-4.4.13/include/linux/ #ifdef CONFIG_X86_INTEL_MPX /* address of the bounds directory */ void __user *bd_addr; -diff -Nur linux-4.4.13.orig/include/linux/mutex.h linux-4.4.13/include/linux/mutex.h ---- linux-4.4.13.orig/include/linux/mutex.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/linux/mutex.h 2016-06-22 21:55:08.034523867 +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> @@ -12822,7 +13077,7 @@ diff -Nur linux-4.4.13.orig/include/linux/mutex.h linux-4.4.13/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 @@ -12836,7 +13091,7 @@ diff -Nur linux-4.4.13.orig/include/linux/mutex.h linux-4.4.13/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); @@ -12845,9 +13100,11 @@ diff -Nur linux-4.4.13.orig/include/linux/mutex.h linux-4.4.13/include/linux/mut extern int atomic_dec_and_mutex_lock(atomic_t *cnt, struct mutex *lock); #endif /* __LINUX_MUTEX_H */ -diff -Nur linux-4.4.13.orig/include/linux/mutex_rt.h linux-4.4.13/include/linux/mutex_rt.h ---- linux-4.4.13.orig/include/linux/mutex_rt.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-4.4.13/include/linux/mutex_rt.h 2016-06-22 21:55:08.034523867 +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 @@ -12933,10 +13190,11 @@ diff -Nur linux-4.4.13.orig/include/linux/mutex_rt.h linux-4.4.13/include/linux/ +} while (0) + +#endif -diff -Nur linux-4.4.13.orig/include/linux/netdevice.h linux-4.4.13/include/linux/netdevice.h ---- linux-4.4.13.orig/include/linux/netdevice.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/linux/netdevice.h 2016-06-22 21:55:08.034523867 +0200 -@@ -2249,11 +2249,20 @@ +diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h +index 04c068e55353..530529e820f3 100644 +--- a/include/linux/netdevice.h ++++ b/include/linux/netdevice.h +@@ -2249,11 +2249,20 @@ void netdev_freemem(struct net_device *dev); void synchronize_net(void); int init_dummy_netdev(struct net_device *dev); @@ -12957,7 +13215,7 @@ diff -Nur linux-4.4.13.orig/include/linux/netdevice.h linux-4.4.13/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); -@@ -2564,6 +2573,7 @@ +@@ -2564,6 +2573,7 @@ struct softnet_data { unsigned int dropped; struct sk_buff_head input_pkt_queue; struct napi_struct backlog; @@ -12965,9 +13223,10 @@ diff -Nur linux-4.4.13.orig/include/linux/netdevice.h linux-4.4.13/include/linux }; -diff -Nur linux-4.4.13.orig/include/linux/netfilter/x_tables.h linux-4.4.13/include/linux/netfilter/x_tables.h ---- linux-4.4.13.orig/include/linux/netfilter/x_tables.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/linux/netfilter/x_tables.h 2016-06-22 21:55:08.034523867 +0200 +diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h +index 04078e8a4803..a61c9609e32f 100644 +--- a/include/linux/netfilter/x_tables.h ++++ b/include/linux/netfilter/x_tables.h @@ -4,6 +4,7 @@ #include <linux/netdevice.h> @@ -12976,7 +13235,7 @@ diff -Nur linux-4.4.13.orig/include/linux/netfilter/x_tables.h linux-4.4.13/incl #include <uapi/linux/netfilter/x_tables.h> /** -@@ -282,6 +283,8 @@ +@@ -289,6 +290,8 @@ void xt_free_table_info(struct xt_table_info *info); */ DECLARE_PER_CPU(seqcount_t, xt_recseq); @@ -12985,7 +13244,7 @@ diff -Nur linux-4.4.13.orig/include/linux/netfilter/x_tables.h linux-4.4.13/incl /* xt_tee_enabled - true if x_tables needs to handle reentrancy * * Enabled if current ip(6)tables ruleset has at least one -j TEE rule. -@@ -302,6 +305,9 @@ +@@ -309,6 +312,9 @@ static inline unsigned int xt_write_recseq_begin(void) { unsigned int addend; @@ -12995,7 +13254,7 @@ diff -Nur linux-4.4.13.orig/include/linux/netfilter/x_tables.h linux-4.4.13/incl /* * Low order bit of sequence is set if we already * called xt_write_recseq_begin(). -@@ -332,6 +338,7 @@ +@@ -339,6 +345,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); @@ -13003,9 +13262,10 @@ diff -Nur linux-4.4.13.orig/include/linux/netfilter/x_tables.h linux-4.4.13/incl } /* -diff -Nur linux-4.4.13.orig/include/linux/notifier.h linux-4.4.13/include/linux/notifier.h ---- linux-4.4.13.orig/include/linux/notifier.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/linux/notifier.h 2016-06-22 21:55:08.034523867 +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> @@ -13026,7 +13286,7 @@ diff -Nur linux-4.4.13.orig/include/linux/notifier.h linux-4.4.13/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) @@ -13035,7 +13295,7 @@ diff -Nur linux-4.4.13.orig/include/linux/notifier.h linux-4.4.13/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 } @@ -13050,7 +13310,7 @@ diff -Nur linux-4.4.13.orig/include/linux/notifier.h linux-4.4.13/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) @@ -13069,7 +13329,7 @@ diff -Nur linux-4.4.13.orig/include/linux/notifier.h linux-4.4.13/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 @@ -13085,9 +13345,10 @@ diff -Nur linux-4.4.13.orig/include/linux/notifier.h linux-4.4.13/include/linux/ /* CPU notfiers are defined in include/linux/cpu.h. */ /* netdevice notifiers are defined in include/linux/netdevice.h */ -diff -Nur linux-4.4.13.orig/include/linux/percpu.h linux-4.4.13/include/linux/percpu.h ---- linux-4.4.13.orig/include/linux/percpu.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/linux/percpu.h 2016-06-22 21:55:08.034523867 +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 @@ -13124,9 +13385,10 @@ diff -Nur linux-4.4.13.orig/include/linux/percpu.h linux-4.4.13/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.4.13.orig/include/linux/pid.h linux-4.4.13/include/linux/pid.h ---- linux-4.4.13.orig/include/linux/pid.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/linux/pid.h 2016-06-22 21:55:08.034523867 +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 @@ -13135,9 +13397,10 @@ diff -Nur linux-4.4.13.orig/include/linux/pid.h linux-4.4.13/include/linux/pid.h enum pid_type { -diff -Nur linux-4.4.13.orig/include/linux/preempt.h linux-4.4.13/include/linux/preempt.h ---- linux-4.4.13.orig/include/linux/preempt.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/linux/preempt.h 2016-06-22 21:55:08.034523867 +0200 +diff --git a/include/linux/preempt.h b/include/linux/preempt.h +index 75e4e30677f1..1cfb1cb72354 100644 +--- a/include/linux/preempt.h ++++ b/include/linux/preempt.h @@ -50,7 +50,11 @@ #define HARDIRQ_OFFSET (1UL << HARDIRQ_SHIFT) #define NMI_OFFSET (1UL << NMI_SHIFT) @@ -13188,7 +13451,7 @@ diff -Nur linux-4.4.13.orig/include/linux/preempt.h linux-4.4.13/include/linux/p /* * The preempt_count offset needed for things like: -@@ -140,6 +153,20 @@ +@@ -140,6 +153,20 @@ extern void preempt_count_sub(int val); #define preempt_count_inc() preempt_count_add(1) #define preempt_count_dec() preempt_count_sub(1) @@ -13209,7 +13472,7 @@ diff -Nur linux-4.4.13.orig/include/linux/preempt.h linux-4.4.13/include/linux/p #ifdef CONFIG_PREEMPT_COUNT #define preempt_disable() \ -@@ -148,13 +175,25 @@ +@@ -148,13 +175,25 @@ do { \ barrier(); \ } while (0) @@ -13236,7 +13499,7 @@ diff -Nur linux-4.4.13.orig/include/linux/preempt.h linux-4.4.13/include/linux/p #define preemptible() (preempt_count() == 0 && !irqs_disabled()) -@@ -179,6 +218,13 @@ +@@ -179,6 +218,13 @@ do { \ __preempt_schedule(); \ } while (0) @@ -13250,7 +13513,7 @@ diff -Nur linux-4.4.13.orig/include/linux/preempt.h linux-4.4.13/include/linux/p #else /* !CONFIG_PREEMPT */ #define preempt_enable() \ do { \ -@@ -224,6 +270,7 @@ +@@ -224,6 +270,7 @@ do { \ #define preempt_disable_notrace() barrier() #define preempt_enable_no_resched_notrace() barrier() #define preempt_enable_notrace() barrier() @@ -13258,7 +13521,7 @@ diff -Nur linux-4.4.13.orig/include/linux/preempt.h linux-4.4.13/include/linux/p #define preemptible() 0 #endif /* CONFIG_PREEMPT_COUNT */ -@@ -244,10 +291,31 @@ +@@ -244,10 +291,31 @@ do { \ } while (0) #define preempt_fold_need_resched() \ do { \ @@ -13291,10 +13554,11 @@ diff -Nur linux-4.4.13.orig/include/linux/preempt.h linux-4.4.13/include/linux/p #ifdef CONFIG_PREEMPT_NOTIFIERS struct preempt_notifier; -diff -Nur linux-4.4.13.orig/include/linux/printk.h linux-4.4.13/include/linux/printk.h ---- linux-4.4.13.orig/include/linux/printk.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/linux/printk.h 2016-06-22 21:55:08.034523867 +0200 -@@ -117,9 +117,11 @@ +diff --git a/include/linux/printk.h b/include/linux/printk.h +index 9729565c25ff..9cdca696b718 100644 +--- a/include/linux/printk.h ++++ b/include/linux/printk.h +@@ -117,9 +117,11 @@ int no_printk(const char *fmt, ...) #ifdef CONFIG_EARLY_PRINTK extern asmlinkage __printf(1, 2) void early_printk(const char *fmt, ...); @@ -13306,10 +13570,11 @@ diff -Nur linux-4.4.13.orig/include/linux/printk.h linux-4.4.13/include/linux/pr #endif typedef __printf(1, 0) int (*printk_func_t)(const char *fmt, va_list args); -diff -Nur linux-4.4.13.orig/include/linux/radix-tree.h linux-4.4.13/include/linux/radix-tree.h ---- linux-4.4.13.orig/include/linux/radix-tree.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/linux/radix-tree.h 2016-06-22 21:55:08.034523867 +0200 -@@ -277,8 +277,13 @@ +diff --git a/include/linux/radix-tree.h b/include/linux/radix-tree.h +index 5d5174b59802..8ddbd6e15a3c 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); @@ -13323,7 +13588,7 @@ diff -Nur linux-4.4.13.orig/include/linux/radix-tree.h linux-4.4.13/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) { @@ -13332,10 +13597,11 @@ diff -Nur linux-4.4.13.orig/include/linux/radix-tree.h linux-4.4.13/include/linu } /** -diff -Nur linux-4.4.13.orig/include/linux/random.h linux-4.4.13/include/linux/random.h ---- linux-4.4.13.orig/include/linux/random.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/linux/random.h 2016-06-22 21:55:08.034523867 +0200 -@@ -20,7 +20,7 @@ +diff --git a/include/linux/random.h b/include/linux/random.h +index a75840c1aa71..1a804361670c 100644 +--- a/include/linux/random.h ++++ b/include/linux/random.h +@@ -20,7 +20,7 @@ struct random_ready_callback { extern void add_device_randomness(const void *, unsigned int); extern void add_input_randomness(unsigned int type, unsigned int code, unsigned int value); @@ -13344,9 +13610,10 @@ diff -Nur linux-4.4.13.orig/include/linux/random.h linux-4.4.13/include/linux/ra extern void get_random_bytes(void *buf, int nbytes); extern int add_random_ready_callback(struct random_ready_callback *rdy); -diff -Nur linux-4.4.13.orig/include/linux/rbtree.h linux-4.4.13/include/linux/rbtree.h ---- linux-4.4.13.orig/include/linux/rbtree.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/linux/rbtree.h 2016-06-22 21:55:08.034523867 +0200 +diff --git a/include/linux/rbtree.h b/include/linux/rbtree.h +index a5aa7ae671f4..24ddffd25492 100644 +--- a/include/linux/rbtree.h ++++ b/include/linux/rbtree.h @@ -31,7 +31,6 @@ #include <linux/kernel.h> @@ -13355,7 +13622,7 @@ diff -Nur linux-4.4.13.orig/include/linux/rbtree.h linux-4.4.13/include/linux/rb struct rb_node { unsigned long __rb_parent_color; -@@ -86,14 +85,8 @@ +@@ -86,14 +85,8 @@ static inline void rb_link_node(struct rb_node *node, struct rb_node *parent, *rb_link = node; } @@ -13372,10 +13639,11 @@ diff -Nur linux-4.4.13.orig/include/linux/rbtree.h linux-4.4.13/include/linux/rb #define rb_entry_safe(ptr, type, member) \ ({ typeof(ptr) ____ptr = (ptr); \ -diff -Nur linux-4.4.13.orig/include/linux/rcupdate.h linux-4.4.13/include/linux/rcupdate.h ---- linux-4.4.13.orig/include/linux/rcupdate.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/linux/rcupdate.h 2016-06-22 21:55:08.034523867 +0200 -@@ -169,6 +169,9 @@ +diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h +index a0189ba67fde..c2f5f955163d 100644 +--- a/include/linux/rcupdate.h ++++ b/include/linux/rcupdate.h +@@ -169,6 +169,9 @@ void call_rcu(struct rcu_head *head, #endif /* #else #ifdef CONFIG_PREEMPT_RCU */ @@ -13385,7 +13653,7 @@ diff -Nur linux-4.4.13.orig/include/linux/rcupdate.h linux-4.4.13/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. -@@ -192,6 +195,7 @@ +@@ -192,6 +195,7 @@ void call_rcu(struct rcu_head *head, */ void call_rcu_bh(struct rcu_head *head, rcu_callback_t func); @@ -13393,7 +13661,7 @@ diff -Nur linux-4.4.13.orig/include/linux/rcupdate.h linux-4.4.13/include/linux/ /** * call_rcu_sched() - Queue an RCU for invocation after sched grace period. -@@ -292,6 +296,11 @@ +@@ -292,6 +296,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) @@ -13405,7 +13673,7 @@ diff -Nur linux-4.4.13.orig/include/linux/rcupdate.h linux-4.4.13/include/linux/ #else /* #ifdef CONFIG_PREEMPT_RCU */ -@@ -317,6 +326,8 @@ +@@ -317,6 +326,8 @@ static inline int rcu_preempt_depth(void) return 0; } @@ -13414,7 +13682,7 @@ diff -Nur linux-4.4.13.orig/include/linux/rcupdate.h linux-4.4.13/include/linux/ #endif /* #else #ifdef CONFIG_PREEMPT_RCU */ /* Internal to kernel */ -@@ -489,7 +500,14 @@ +@@ -489,7 +500,14 @@ extern struct lockdep_map rcu_callback_map; int debug_lockdep_rcu_enabled(void); int rcu_read_lock_held(void); @@ -13429,7 +13697,7 @@ diff -Nur linux-4.4.13.orig/include/linux/rcupdate.h linux-4.4.13/include/linux/ /** * rcu_read_lock_sched_held() - might we be in RCU-sched read-side critical section? -@@ -937,10 +955,14 @@ +@@ -937,10 +955,14 @@ static inline void rcu_read_unlock(void) static inline void rcu_read_lock_bh(void) { local_bh_disable(); @@ -13444,7 +13712,7 @@ diff -Nur linux-4.4.13.orig/include/linux/rcupdate.h linux-4.4.13/include/linux/ } /* -@@ -950,10 +972,14 @@ +@@ -950,10 +972,14 @@ static inline void rcu_read_lock_bh(void) */ static inline void rcu_read_unlock_bh(void) { @@ -13459,10 +13727,11 @@ diff -Nur linux-4.4.13.orig/include/linux/rcupdate.h linux-4.4.13/include/linux/ local_bh_enable(); } -diff -Nur linux-4.4.13.orig/include/linux/rcutree.h linux-4.4.13/include/linux/rcutree.h ---- linux-4.4.13.orig/include/linux/rcutree.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/linux/rcutree.h 2016-06-22 21:55:08.034523867 +0200 -@@ -44,7 +44,11 @@ +diff --git a/include/linux/rcutree.h b/include/linux/rcutree.h +index 60d15a080d7c..436c9e62bfc6 100644 +--- a/include/linux/rcutree.h ++++ b/include/linux/rcutree.h +@@ -44,7 +44,11 @@ static inline void rcu_virt_note_context_switch(int cpu) rcu_note_context_switch(); } @@ -13474,7 +13743,7 @@ diff -Nur linux-4.4.13.orig/include/linux/rcutree.h linux-4.4.13/include/linux/r void synchronize_sched_expedited(void); void synchronize_rcu_expedited(void); -@@ -72,7 +76,11 @@ +@@ -72,7 +76,11 @@ static inline void synchronize_rcu_bh_expedited(void) } void rcu_barrier(void); @@ -13486,7 +13755,7 @@ diff -Nur linux-4.4.13.orig/include/linux/rcutree.h linux-4.4.13/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); @@ -13499,7 +13768,7 @@ diff -Nur linux-4.4.13.orig/include/linux/rcutree.h linux-4.4.13/include/linux/r void rcu_sched_force_quiescent_state(void); void rcu_idle_enter(void); -@@ -105,6 +111,14 @@ +@@ -105,6 +111,14 @@ extern int rcu_scheduler_active __read_mostly; bool rcu_is_watching(void); @@ -13514,9 +13783,10 @@ diff -Nur linux-4.4.13.orig/include/linux/rcutree.h linux-4.4.13/include/linux/r void rcu_all_qs(void); #endif /* __LINUX_RCUTREE_H */ -diff -Nur linux-4.4.13.orig/include/linux/rtmutex.h linux-4.4.13/include/linux/rtmutex.h ---- linux-4.4.13.orig/include/linux/rtmutex.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/linux/rtmutex.h 2016-06-22 21:55:08.034523867 +0200 +diff --git a/include/linux/rtmutex.h b/include/linux/rtmutex.h +index 1abba5ce2a2f..30211c627511 100644 +--- a/include/linux/rtmutex.h ++++ b/include/linux/rtmutex.h @@ -13,11 +13,15 @@ #define __LINUX_RT_MUTEX_H @@ -13534,7 +13804,7 @@ diff -Nur linux-4.4.13.orig/include/linux/rtmutex.h linux-4.4.13/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; @@ -13544,7 +13814,7 @@ diff -Nur linux-4.4.13.orig/include/linux/rtmutex.h linux-4.4.13/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 @@ -13583,7 +13853,7 @@ diff -Nur linux-4.4.13.orig/include/linux/rtmutex.h linux-4.4.13/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); @@ -13591,9 +13861,11 @@ diff -Nur linux-4.4.13.orig/include/linux/rtmutex.h linux-4.4.13/include/linux/r extern int rt_mutex_timed_lock(struct rt_mutex *lock, struct hrtimer_sleeper *timeout); -diff -Nur linux-4.4.13.orig/include/linux/rwlock_rt.h linux-4.4.13/include/linux/rwlock_rt.h ---- linux-4.4.13.orig/include/linux/rwlock_rt.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-4.4.13/include/linux/rwlock_rt.h 2016-06-22 21:55:08.034523867 +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 @@ -13694,9 +13966,10 @@ diff -Nur linux-4.4.13.orig/include/linux/rwlock_rt.h linux-4.4.13/include/linux + } while (0) + +#endif -diff -Nur linux-4.4.13.orig/include/linux/rwlock_types.h linux-4.4.13/include/linux/rwlock_types.h ---- linux-4.4.13.orig/include/linux/rwlock_types.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/linux/rwlock_types.h 2016-06-22 21:55:08.034523867 +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 @@ -13708,7 +13981,7 @@ diff -Nur linux-4.4.13.orig/include/linux/rwlock_types.h linux-4.4.13/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 @@ -13717,9 +13990,11 @@ diff -Nur linux-4.4.13.orig/include/linux/rwlock_types.h linux-4.4.13/include/li + rwlock_t name __cacheline_aligned_in_smp = __RW_LOCK_UNLOCKED(name) #endif /* __LINUX_RWLOCK_TYPES_H */ -diff -Nur linux-4.4.13.orig/include/linux/rwlock_types_rt.h linux-4.4.13/include/linux/rwlock_types_rt.h ---- linux-4.4.13.orig/include/linux/rwlock_types_rt.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-4.4.13/include/linux/rwlock_types_rt.h 2016-06-22 21:55:08.034523867 +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 @@ -13754,9 +14029,10 @@ diff -Nur linux-4.4.13.orig/include/linux/rwlock_types_rt.h linux-4.4.13/include + rwlock_t name __cacheline_aligned_in_smp = __RW_LOCK_UNLOCKED(name) + +#endif -diff -Nur linux-4.4.13.orig/include/linux/rwsem.h linux-4.4.13/include/linux/rwsem.h ---- linux-4.4.13.orig/include/linux/rwsem.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/linux/rwsem.h 2016-06-22 21:55:08.034523867 +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 @@ -13768,16 +14044,18 @@ diff -Nur linux-4.4.13.orig/include/linux/rwsem.h linux-4.4.13/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.4.13.orig/include/linux/rwsem_rt.h linux-4.4.13/include/linux/rwsem_rt.h ---- linux-4.4.13.orig/include/linux/rwsem_rt.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-4.4.13/include/linux/rwsem_rt.h 2016-06-22 21:55:08.034523867 +0200 +diff --git a/include/linux/rwsem_rt.h b/include/linux/rwsem_rt.h +new file mode 100644 +index 000000000000..f97860b2e2a4 +--- /dev/null ++++ b/include/linux/rwsem_rt.h @@ -0,0 +1,152 @@ +#ifndef _LINUX_RWSEM_RT_H +#define _LINUX_RWSEM_RT_H @@ -13931,10 +14209,11 @@ diff -Nur linux-4.4.13.orig/include/linux/rwsem_rt.h linux-4.4.13/include/linux/ +} +#endif +#endif -diff -Nur linux-4.4.13.orig/include/linux/sched.h linux-4.4.13/include/linux/sched.h ---- linux-4.4.13.orig/include/linux/sched.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/linux/sched.h 2016-06-22 21:55:08.038523867 +0200 -@@ -26,6 +26,7 @@ +diff --git a/include/linux/sched.h b/include/linux/sched.h +index 1c0193baea2a..0570d8e022ec 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.h> @@ -13942,7 +14221,7 @@ diff -Nur linux-4.4.13.orig/include/linux/sched.h linux-4.4.13/include/linux/sch #include <asm/page.h> #include <asm/ptrace.h> -@@ -182,8 +183,6 @@ +@@ -182,8 +183,6 @@ extern void update_cpu_load_nohz(void); static inline void update_cpu_load_nohz(void) { } #endif @@ -13951,7 +14230,7 @@ diff -Nur linux-4.4.13.orig/include/linux/sched.h linux-4.4.13/include/linux/sch extern void dump_cpu_task(int cpu); struct seq_file; -@@ -242,10 +241,7 @@ +@@ -242,10 +241,7 @@ extern char ___assert_task_state[1 - 2*!!( TASK_UNINTERRUPTIBLE | __TASK_STOPPED | \ __TASK_TRACED | EXIT_ZOMBIE | EXIT_DEAD) @@ -13962,7 +14241,7 @@ diff -Nur linux-4.4.13.orig/include/linux/sched.h linux-4.4.13/include/linux/sch #define task_contributes_to_load(task) \ ((task->state & TASK_UNINTERRUPTIBLE) != 0 && \ (task->flags & PF_FROZEN) == 0 && \ -@@ -311,6 +307,11 @@ +@@ -311,6 +307,11 @@ extern char ___assert_task_state[1 - 2*!!( #endif @@ -13974,7 +14253,7 @@ diff -Nur linux-4.4.13.orig/include/linux/sched.h linux-4.4.13/include/linux/sch /* Task command name length */ #define TASK_COMM_LEN 16 -@@ -970,8 +971,18 @@ +@@ -970,8 +971,18 @@ struct wake_q_head { struct wake_q_head name = { WAKE_Q_TAIL, &name.first } extern void wake_q_add(struct wake_q_head *head, @@ -13995,7 +14274,7 @@ diff -Nur linux-4.4.13.orig/include/linux/sched.h linux-4.4.13/include/linux/sch /* * sched-domains (multiprocessor balancing) declarations: -@@ -1379,6 +1390,7 @@ +@@ -1379,6 +1390,7 @@ struct tlbflush_unmap_batch { struct task_struct { volatile long state; /* -1 unrunnable, 0 runnable, >0 stopped */ @@ -14003,7 +14282,7 @@ diff -Nur linux-4.4.13.orig/include/linux/sched.h linux-4.4.13/include/linux/sch void *stack; atomic_t usage; unsigned int flags; /* per process flags, defined below */ -@@ -1415,6 +1427,12 @@ +@@ -1415,6 +1427,12 @@ struct task_struct { #endif unsigned int policy; @@ -14016,7 +14295,7 @@ diff -Nur linux-4.4.13.orig/include/linux/sched.h linux-4.4.13/include/linux/sch int nr_cpus_allowed; cpumask_t cpus_allowed; -@@ -1522,11 +1540,14 @@ +@@ -1522,11 +1540,14 @@ struct task_struct { cputime_t gtime; struct prev_cputime prev_cputime; #ifdef CONFIG_VIRT_CPU_ACCOUNTING_GEN @@ -14033,7 +14312,7 @@ diff -Nur linux-4.4.13.orig/include/linux/sched.h linux-4.4.13/include/linux/sch VTIME_SYS, } vtime_snap_whence; #endif -@@ -1538,6 +1559,9 @@ +@@ -1538,6 +1559,9 @@ struct task_struct { struct task_cputime cputime_expires; struct list_head cpu_timers[3]; @@ -14043,7 +14322,7 @@ diff -Nur linux-4.4.13.orig/include/linux/sched.h linux-4.4.13/include/linux/sch /* process credentials */ const struct cred __rcu *real_cred; /* objective and real subjective task -@@ -1568,10 +1592,15 @@ +@@ -1568,10 +1592,15 @@ struct task_struct { /* signal handlers */ struct signal_struct *signal; struct sighand_struct *sighand; @@ -14059,7 +14338,7 @@ diff -Nur linux-4.4.13.orig/include/linux/sched.h linux-4.4.13/include/linux/sch unsigned long sas_ss_sp; size_t sas_ss_size; -@@ -1795,6 +1824,12 @@ +@@ -1795,6 +1824,12 @@ struct task_struct { unsigned long trace; /* bitmask and counter of trace recursion */ unsigned long trace_recursion; @@ -14072,7 +14351,7 @@ diff -Nur linux-4.4.13.orig/include/linux/sched.h linux-4.4.13/include/linux/sch #endif /* CONFIG_TRACING */ #ifdef CONFIG_MEMCG struct mem_cgroup *memcg_in_oom; -@@ -1811,9 +1846,23 @@ +@@ -1811,9 +1846,23 @@ struct task_struct { unsigned int sequential_io; unsigned int sequential_io_avg; #endif @@ -14096,7 +14375,7 @@ diff -Nur linux-4.4.13.orig/include/linux/sched.h linux-4.4.13/include/linux/sch int pagefault_disabled; /* CPU-specific state of this task */ struct thread_struct thread; -@@ -1831,9 +1880,6 @@ +@@ -1831,9 +1880,6 @@ extern int arch_task_struct_size __read_mostly; # define arch_task_struct_size (sizeof(struct task_struct)) #endif @@ -14106,7 +14385,7 @@ diff -Nur linux-4.4.13.orig/include/linux/sched.h linux-4.4.13/include/linux/sch #define TNF_MIGRATED 0x01 #define TNF_NO_GROUP 0x02 #define TNF_SHARED 0x04 -@@ -2023,6 +2069,15 @@ +@@ -2023,6 +2069,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) @@ -14122,7 +14401,7 @@ diff -Nur linux-4.4.13.orig/include/linux/sched.h linux-4.4.13/include/linux/sch extern void __put_task_struct(struct task_struct *t); static inline void put_task_struct(struct task_struct *t) -@@ -2030,6 +2085,7 @@ +@@ -2030,6 +2085,7 @@ static inline void put_task_struct(struct task_struct *t) if (atomic_dec_and_test(&t->usage)) __put_task_struct(t); } @@ -14130,7 +14409,7 @@ diff -Nur linux-4.4.13.orig/include/linux/sched.h linux-4.4.13/include/linux/sch #ifdef CONFIG_VIRT_CPU_ACCOUNTING_GEN extern void task_cputime(struct task_struct *t, -@@ -2068,6 +2124,7 @@ +@@ -2068,6 +2124,7 @@ extern void thread_group_cputime_adjusted(struct task_struct *p, cputime_t *ut, /* * Per process flags */ @@ -14138,7 +14417,7 @@ diff -Nur linux-4.4.13.orig/include/linux/sched.h linux-4.4.13/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 */ -@@ -2232,6 +2289,10 @@ +@@ -2232,6 +2289,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); @@ -14149,7 +14428,7 @@ diff -Nur linux-4.4.13.orig/include/linux/sched.h linux-4.4.13/include/linux/sch #else static inline void do_set_cpus_allowed(struct task_struct *p, const struct cpumask *new_mask) -@@ -2244,6 +2305,9 @@ +@@ -2244,6 +2305,9 @@ static inline int set_cpus_allowed_ptr(struct task_struct *p, return -EINVAL; return 0; } @@ -14159,7 +14438,7 @@ diff -Nur linux-4.4.13.orig/include/linux/sched.h linux-4.4.13/include/linux/sch #endif #ifdef CONFIG_NO_HZ_COMMON -@@ -2453,6 +2517,7 @@ +@@ -2453,6 +2517,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); @@ -14167,7 +14446,7 @@ diff -Nur linux-4.4.13.orig/include/linux/sched.h linux-4.4.13/include/linux/sch extern void wake_up_new_task(struct task_struct *tsk); #ifdef CONFIG_SMP extern void kick_process(struct task_struct *tsk); -@@ -2576,12 +2641,24 @@ +@@ -2576,12 +2641,24 @@ extern struct mm_struct * mm_alloc(void); /* mmdrop drops the mm and the page tables */ extern void __mmdrop(struct mm_struct *); @@ -14192,7 +14471,7 @@ diff -Nur linux-4.4.13.orig/include/linux/sched.h linux-4.4.13/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 */ -@@ -2891,6 +2968,43 @@ +@@ -2891,6 +2968,43 @@ static inline int test_tsk_need_resched(struct task_struct *tsk) return unlikely(test_tsk_thread_flag(tsk,TIF_NEED_RESCHED)); } @@ -14236,7 +14515,7 @@ diff -Nur linux-4.4.13.orig/include/linux/sched.h linux-4.4.13/include/linux/sch static inline int restart_syscall(void) { set_tsk_thread_flag(current, TIF_SIGPENDING); -@@ -2922,6 +3036,51 @@ +@@ -2922,6 +3036,51 @@ static inline int signal_pending_state(long state, struct task_struct *p) return (state & TASK_INTERRUPTIBLE) || __fatal_signal_pending(p); } @@ -14288,7 +14567,7 @@ diff -Nur linux-4.4.13.orig/include/linux/sched.h linux-4.4.13/include/linux/sch /* * cond_resched() and cond_resched_lock(): latency reduction via * explicit rescheduling in places that are safe. The return -@@ -2943,12 +3102,16 @@ +@@ -2943,12 +3102,16 @@ extern int __cond_resched_lock(spinlock_t *lock); __cond_resched_lock(lock); \ }) @@ -14305,7 +14584,7 @@ diff -Nur linux-4.4.13.orig/include/linux/sched.h linux-4.4.13/include/linux/sch static inline void cond_resched_rcu(void) { -@@ -3110,6 +3273,31 @@ +@@ -3110,6 +3273,31 @@ static inline void set_task_cpu(struct task_struct *p, unsigned int cpu) #endif /* CONFIG_SMP */ @@ -14337,10 +14616,11 @@ diff -Nur linux-4.4.13.orig/include/linux/sched.h linux-4.4.13/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.4.13.orig/include/linux/seqlock.h linux-4.4.13/include/linux/seqlock.h ---- linux-4.4.13.orig/include/linux/seqlock.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/linux/seqlock.h 2016-06-22 21:55:08.038523867 +0200 -@@ -220,20 +220,30 @@ +diff --git a/include/linux/seqlock.h b/include/linux/seqlock.h +index e0582106ef4f..b14f4d2368aa 100644 +--- a/include/linux/seqlock.h ++++ b/include/linux/seqlock.h +@@ -220,20 +220,30 @@ static inline int read_seqcount_retry(const seqcount_t *s, unsigned start) return __read_seqcount_retry(s, start); } @@ -14375,7 +14655,7 @@ diff -Nur linux-4.4.13.orig/include/linux/seqlock.h linux-4.4.13/include/linux/s /** * raw_write_seqcount_barrier - do a seq write barrier * @s: pointer to seqcount_t -@@ -425,10 +435,32 @@ +@@ -425,10 +435,32 @@ typedef struct { /* * Read side functions for starting and finalizing a read side section. */ @@ -14408,7 +14688,7 @@ diff -Nur linux-4.4.13.orig/include/linux/seqlock.h linux-4.4.13/include/linux/s static inline unsigned read_seqretry(const seqlock_t *sl, unsigned start) { -@@ -443,36 +475,36 @@ +@@ -443,36 +475,36 @@ static inline unsigned read_seqretry(const seqlock_t *sl, unsigned start) static inline void write_seqlock(seqlock_t *sl) { spin_lock(&sl->lock); @@ -14451,7 +14731,7 @@ diff -Nur linux-4.4.13.orig/include/linux/seqlock.h linux-4.4.13/include/linux/s spin_unlock_irq(&sl->lock); } -@@ -481,7 +513,7 @@ +@@ -481,7 +513,7 @@ static inline unsigned long __write_seqlock_irqsave(seqlock_t *sl) unsigned long flags; spin_lock_irqsave(&sl->lock, flags); @@ -14460,7 +14740,7 @@ diff -Nur linux-4.4.13.orig/include/linux/seqlock.h linux-4.4.13/include/linux/s return flags; } -@@ -491,7 +523,7 @@ +@@ -491,7 +523,7 @@ static inline unsigned long __write_seqlock_irqsave(seqlock_t *sl) static inline void write_sequnlock_irqrestore(seqlock_t *sl, unsigned long flags) { @@ -14469,10 +14749,11 @@ diff -Nur linux-4.4.13.orig/include/linux/seqlock.h linux-4.4.13/include/linux/s spin_unlock_irqrestore(&sl->lock, flags); } -diff -Nur linux-4.4.13.orig/include/linux/signal.h linux-4.4.13/include/linux/signal.h ---- linux-4.4.13.orig/include/linux/signal.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/linux/signal.h 2016-06-22 21:55:08.038523867 +0200 -@@ -233,6 +233,7 @@ +diff --git a/include/linux/signal.h b/include/linux/signal.h +index d80259afb9e5..ddd1e6866a54 100644 +--- a/include/linux/signal.h ++++ b/include/linux/signal.h +@@ -233,6 +233,7 @@ static inline void init_sigpending(struct sigpending *sig) } extern void flush_sigqueue(struct sigpending *queue); @@ -14480,10 +14761,11 @@ diff -Nur linux-4.4.13.orig/include/linux/signal.h linux-4.4.13/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.4.13.orig/include/linux/skbuff.h linux-4.4.13/include/linux/skbuff.h ---- linux-4.4.13.orig/include/linux/skbuff.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/linux/skbuff.h 2016-06-22 21:55:08.038523867 +0200 -@@ -203,6 +203,7 @@ +diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h +index d443d9ab0236..2d1c7f9b7fd0 100644 +--- a/include/linux/skbuff.h ++++ b/include/linux/skbuff.h +@@ -203,6 +203,7 @@ struct sk_buff_head { __u32 qlen; spinlock_t lock; @@ -14491,7 +14773,7 @@ diff -Nur linux-4.4.13.orig/include/linux/skbuff.h linux-4.4.13/include/linux/sk }; struct sk_buff; -@@ -1464,6 +1465,12 @@ +@@ -1465,6 +1466,12 @@ static inline void skb_queue_head_init(struct sk_buff_head *list) __skb_queue_head_init(list); } @@ -14504,10 +14786,11 @@ diff -Nur linux-4.4.13.orig/include/linux/skbuff.h linux-4.4.13/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.4.13.orig/include/linux/smp.h linux-4.4.13/include/linux/smp.h ---- linux-4.4.13.orig/include/linux/smp.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/linux/smp.h 2016-06-22 21:55:08.038523867 +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() @@ -14517,23 +14800,11 @@ diff -Nur linux-4.4.13.orig/include/linux/smp.h linux-4.4.13/include/linux/smp.h /* * Callback to arch code if there's nosmp or maxcpus=0 on the * boot command line: -diff -Nur linux-4.4.13.orig/include/linux/spinlock_api_smp.h linux-4.4.13/include/linux/spinlock_api_smp.h ---- linux-4.4.13.orig/include/linux/spinlock_api_smp.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/linux/spinlock_api_smp.h 2016-06-22 21:55:08.038523867 +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.4.13.orig/include/linux/spinlock.h linux-4.4.13/include/linux/spinlock.h ---- linux-4.4.13.orig/include/linux/spinlock.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/linux/spinlock.h 2016-06-22 21:55:08.038523867 +0200 -@@ -271,7 +271,11 @@ +diff --git a/include/linux/spinlock.h b/include/linux/spinlock.h +index 47dd0cebd204..b241cc044bd3 100644 +--- a/include/linux/spinlock.h ++++ b/include/linux/spinlock.h +@@ -271,7 +271,11 @@ static inline void do_raw_spin_unlock(raw_spinlock_t *lock) __releases(lock) #define raw_spin_can_lock(lock) (!raw_spin_is_locked(lock)) /* Include rwlock functions */ @@ -14546,7 +14817,7 @@ diff -Nur linux-4.4.13.orig/include/linux/spinlock.h linux-4.4.13/include/linux/ /* * Pull the _spin_*()/_read_*()/_write_*() functions/declarations: -@@ -282,6 +286,10 @@ +@@ -282,6 +286,10 @@ static inline void do_raw_spin_unlock(raw_spinlock_t *lock) __releases(lock) # include <linux/spinlock_api_up.h> #endif @@ -14557,16 +14828,32 @@ diff -Nur linux-4.4.13.orig/include/linux/spinlock.h linux-4.4.13/include/linux/ /* * Map the spin_lock functions to the raw variants for PREEMPT_RT=n */ -@@ -416,4 +424,6 @@ +@@ -416,4 +424,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.4.13.orig/include/linux/spinlock_rt.h linux-4.4.13/include/linux/spinlock_rt.h ---- linux-4.4.13.orig/include/linux/spinlock_rt.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-4.4.13/include/linux/spinlock_rt.h 2016-06-22 21:55:08.038523867 +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..3b2825537531 +--- /dev/null ++++ b/include/linux/spinlock_rt.h @@ -0,0 +1,163 @@ +#ifndef __LINUX_SPINLOCK_RT_H +#define __LINUX_SPINLOCK_RT_H @@ -14731,9 +15018,10 @@ diff -Nur linux-4.4.13.orig/include/linux/spinlock_rt.h linux-4.4.13/include/lin + atomic_dec_and_spin_lock(atomic, lock) + +#endif -diff -Nur linux-4.4.13.orig/include/linux/spinlock_types.h linux-4.4.13/include/linux/spinlock_types.h ---- linux-4.4.13.orig/include/linux/spinlock_types.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/linux/spinlock_types.h 2016-06-22 21:55:08.038523867 +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). */ @@ -14822,9 +15110,11 @@ diff -Nur linux-4.4.13.orig/include/linux/spinlock_types.h linux-4.4.13/include/ -#include <linux/rwlock_types.h> - #endif /* __LINUX_SPINLOCK_TYPES_H */ -diff -Nur linux-4.4.13.orig/include/linux/spinlock_types_nort.h linux-4.4.13/include/linux/spinlock_types_nort.h ---- linux-4.4.13.orig/include/linux/spinlock_types_nort.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-4.4.13/include/linux/spinlock_types_nort.h 2016-06-22 21:55:08.038523867 +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 @@ -14859,9 +15149,11 @@ diff -Nur linux-4.4.13.orig/include/linux/spinlock_types_nort.h linux-4.4.13/inc +#define DEFINE_SPINLOCK(x) spinlock_t x = __SPIN_LOCK_UNLOCKED(x) + +#endif -diff -Nur linux-4.4.13.orig/include/linux/spinlock_types_raw.h linux-4.4.13/include/linux/spinlock_types_raw.h ---- linux-4.4.13.orig/include/linux/spinlock_types_raw.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-4.4.13/include/linux/spinlock_types_raw.h 2016-06-22 21:55:08.038523867 +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 @@ -14919,9 +15211,11 @@ diff -Nur linux-4.4.13.orig/include/linux/spinlock_types_raw.h linux-4.4.13/incl +#define DEFINE_RAW_SPINLOCK(x) raw_spinlock_t x = __RAW_SPIN_LOCK_UNLOCKED(x) + +#endif -diff -Nur linux-4.4.13.orig/include/linux/spinlock_types_rt.h linux-4.4.13/include/linux/spinlock_types_rt.h ---- linux-4.4.13.orig/include/linux/spinlock_types_rt.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-4.4.13/include/linux/spinlock_types_rt.h 2016-06-22 21:55:08.038523867 +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 @@ -14974,10 +15268,11 @@ diff -Nur linux-4.4.13.orig/include/linux/spinlock_types_rt.h linux-4.4.13/inclu + spinlock_t name __cacheline_aligned_in_smp = __SPIN_LOCK_UNLOCKED(name) + +#endif -diff -Nur linux-4.4.13.orig/include/linux/srcu.h linux-4.4.13/include/linux/srcu.h ---- linux-4.4.13.orig/include/linux/srcu.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/linux/srcu.h 2016-06-22 21:55:08.038523867 +0200 -@@ -84,10 +84,10 @@ +diff --git a/include/linux/srcu.h b/include/linux/srcu.h +index f5f80c5643ac..ec1a8f01563c 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); @@ -14990,7 +15285,7 @@ diff -Nur linux-4.4.13.orig/include/linux/srcu.h linux-4.4.13/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);\ @@ -14999,10 +15294,11 @@ diff -Nur linux-4.4.13.orig/include/linux/srcu.h linux-4.4.13/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.4.13.orig/include/linux/suspend.h linux-4.4.13/include/linux/suspend.h ---- linux-4.4.13.orig/include/linux/suspend.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/linux/suspend.h 2016-06-22 21:55:08.038523867 +0200 -@@ -194,6 +194,12 @@ +diff --git a/include/linux/suspend.h b/include/linux/suspend.h +index 8b6ec7ef0854..9b77d4cc929f 100644 +--- a/include/linux/suspend.h ++++ b/include/linux/suspend.h +@@ -194,6 +194,12 @@ struct platform_freeze_ops { void (*end)(void); }; @@ -15015,9 +15311,11 @@ diff -Nur linux-4.4.13.orig/include/linux/suspend.h linux-4.4.13/include/linux/s #ifdef CONFIG_SUSPEND /** * suspend_set_ops - set platform dependent suspend operations -diff -Nur linux-4.4.13.orig/include/linux/swait.h linux-4.4.13/include/linux/swait.h ---- linux-4.4.13.orig/include/linux/swait.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-4.4.13/include/linux/swait.h 2016-06-22 21:55:08.038523867 +0200 +diff --git a/include/linux/swait.h b/include/linux/swait.h +new file mode 100644 +index 000000000000..83f004a72320 +--- /dev/null ++++ b/include/linux/swait.h @@ -0,0 +1,173 @@ +#ifndef _LINUX_SWAIT_H +#define _LINUX_SWAIT_H @@ -15192,9 +15490,10 @@ diff -Nur linux-4.4.13.orig/include/linux/swait.h linux-4.4.13/include/linux/swa +}) + +#endif /* _LINUX_SWAIT_H */ -diff -Nur linux-4.4.13.orig/include/linux/swap.h linux-4.4.13/include/linux/swap.h ---- linux-4.4.13.orig/include/linux/swap.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/linux/swap.h 2016-06-22 21:55:08.038523867 +0200 +diff --git a/include/linux/swap.h b/include/linux/swap.h +index 7ba7dccaf0e7..da646f2eb3c6 100644 +--- a/include/linux/swap.h ++++ b/include/linux/swap.h @@ -11,6 +11,7 @@ #include <linux/fs.h> #include <linux/atomic.h> @@ -15203,7 +15502,7 @@ diff -Nur linux-4.4.13.orig/include/linux/swap.h linux-4.4.13/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); @@ -15213,7 +15512,7 @@ diff -Nur linux-4.4.13.orig/include/linux/swap.h linux-4.4.13/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 */ @@ -15221,10 +15520,41 @@ diff -Nur linux-4.4.13.orig/include/linux/swap.h linux-4.4.13/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.4.13.orig/include/linux/thread_info.h linux-4.4.13/include/linux/thread_info.h ---- linux-4.4.13.orig/include/linux/thread_info.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/linux/thread_info.h 2016-06-22 21:55:08.038523867 +0200 -@@ -102,7 +102,17 @@ +diff --git a/include/linux/swork.h b/include/linux/swork.h +new file mode 100644 +index 000000000000..f175fa9a6016 +--- /dev/null ++++ b/include/linux/swork.h +@@ -0,0 +1,24 @@ ++#ifndef _LINUX_SWORK_H ++#define _LINUX_SWORK_H ++ ++#include <linux/list.h> ++ ++struct swork_event { ++ struct list_head item; ++ unsigned long flags; ++ void (*func)(struct swork_event *); ++}; ++ ++static inline void INIT_SWORK(struct swork_event *event, ++ void (*func)(struct swork_event *)) ++{ ++ event->flags = 0; ++ event->func = func; ++} ++ ++bool swork_queue(struct swork_event *sev); ++ ++int swork_get(void); ++void swork_put(void); ++ ++#endif /* _LINUX_SWORK_H */ +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) @@ -15243,10 +15573,11 @@ diff -Nur linux-4.4.13.orig/include/linux/thread_info.h linux-4.4.13/include/lin #if defined TIF_RESTORE_SIGMASK && !defined HAVE_SET_RESTORE_SIGMASK /* -diff -Nur linux-4.4.13.orig/include/linux/timer.h linux-4.4.13/include/linux/timer.h ---- linux-4.4.13.orig/include/linux/timer.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/linux/timer.h 2016-06-22 21:55:08.038523867 +0200 -@@ -225,7 +225,7 @@ +diff --git a/include/linux/timer.h b/include/linux/timer.h +index 61aa61dc410c..299d2b78591f 100644 +--- a/include/linux/timer.h ++++ b/include/linux/timer.h +@@ -225,7 +225,7 @@ extern void add_timer(struct timer_list *timer); extern int try_to_del_timer_sync(struct timer_list *timer); @@ -15255,10 +15586,11 @@ diff -Nur linux-4.4.13.orig/include/linux/timer.h linux-4.4.13/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.4.13.orig/include/linux/trace_events.h linux-4.4.13/include/linux/trace_events.h ---- linux-4.4.13.orig/include/linux/trace_events.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/linux/trace_events.h 2016-06-22 21:55:08.038523867 +0200 -@@ -66,6 +66,9 @@ +diff --git a/include/linux/trace_events.h b/include/linux/trace_events.h +index 925730bc9fc1..a591f414da6f 100644 +--- a/include/linux/trace_events.h ++++ b/include/linux/trace_events.h +@@ -66,6 +66,9 @@ struct trace_entry { unsigned char flags; unsigned char preempt_count; int pid; @@ -15268,10 +15600,11 @@ diff -Nur linux-4.4.13.orig/include/linux/trace_events.h linux-4.4.13/include/li }; #define TRACE_EVENT_TYPE_MAX \ -diff -Nur linux-4.4.13.orig/include/linux/uaccess.h linux-4.4.13/include/linux/uaccess.h ---- linux-4.4.13.orig/include/linux/uaccess.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/linux/uaccess.h 2016-06-22 21:55:08.038523867 +0200 -@@ -24,6 +24,7 @@ +diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h +index 558129af828a..cf5c472bbc79 100644 +--- a/include/linux/uaccess.h ++++ b/include/linux/uaccess.h +@@ -24,6 +24,7 @@ static __always_inline void pagefault_disabled_dec(void) */ static inline void pagefault_disable(void) { @@ -15279,7 +15612,7 @@ diff -Nur linux-4.4.13.orig/include/linux/uaccess.h linux-4.4.13/include/linux/u pagefault_disabled_inc(); /* * make sure to have issued the store before a pagefault -@@ -40,6 +41,7 @@ +@@ -40,6 +41,7 @@ static inline void pagefault_enable(void) */ barrier(); pagefault_disabled_dec(); @@ -15287,9 +15620,10 @@ diff -Nur linux-4.4.13.orig/include/linux/uaccess.h linux-4.4.13/include/linux/u } /* -diff -Nur linux-4.4.13.orig/include/linux/uprobes.h linux-4.4.13/include/linux/uprobes.h ---- linux-4.4.13.orig/include/linux/uprobes.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/linux/uprobes.h 2016-06-22 21:55:08.038523867 +0200 +diff --git a/include/linux/uprobes.h b/include/linux/uprobes.h +index 4a29c75b146e..0a294e950df8 100644 +--- a/include/linux/uprobes.h ++++ b/include/linux/uprobes.h @@ -27,6 +27,7 @@ #include <linux/errno.h> #include <linux/rbtree.h> @@ -15298,10 +15632,11 @@ diff -Nur linux-4.4.13.orig/include/linux/uprobes.h linux-4.4.13/include/linux/u struct vm_area_struct; struct mm_struct; -diff -Nur linux-4.4.13.orig/include/linux/vmstat.h linux-4.4.13/include/linux/vmstat.h ---- linux-4.4.13.orig/include/linux/vmstat.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/linux/vmstat.h 2016-06-22 21:55:08.042523867 +0200 -@@ -33,7 +33,9 @@ +diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h +index 3e5d9075960f..7eaa847cd5a5 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) { @@ -15311,7 +15646,7 @@ diff -Nur linux-4.4.13.orig/include/linux/vmstat.h linux-4.4.13/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) { @@ -15321,9 +15656,10 @@ diff -Nur linux-4.4.13.orig/include/linux/vmstat.h linux-4.4.13/include/linux/vm } static inline void count_vm_events(enum vm_event_item item, long delta) -diff -Nur linux-4.4.13.orig/include/linux/wait.h linux-4.4.13/include/linux/wait.h ---- linux-4.4.13.orig/include/linux/wait.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/linux/wait.h 2016-06-22 21:55:08.042523867 +0200 +diff --git a/include/linux/wait.h b/include/linux/wait.h +index 513b36f04dfd..981c8a840f96 100644 +--- a/include/linux/wait.h ++++ b/include/linux/wait.h @@ -8,6 +8,7 @@ #include <linux/spinlock.h> #include <asm/current.h> @@ -15332,38 +15668,11 @@ diff -Nur linux-4.4.13.orig/include/linux/wait.h linux-4.4.13/include/linux/wait 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.4.13.orig/include/linux/work-simple.h linux-4.4.13/include/linux/work-simple.h ---- linux-4.4.13.orig/include/linux/work-simple.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-4.4.13/include/linux/work-simple.h 2016-06-22 21:55:08.042523867 +0200 -@@ -0,0 +1,24 @@ -+#ifndef _LINUX_SWORK_H -+#define _LINUX_SWORK_H -+ -+#include <linux/list.h> -+ -+struct swork_event { -+ struct list_head item; -+ unsigned long flags; -+ void (*func)(struct swork_event *); -+}; -+ -+static inline void INIT_SWORK(struct swork_event *event, -+ void (*func)(struct swork_event *)) -+{ -+ event->flags = 0; -+ event->func = func; -+} -+ -+bool swork_queue(struct swork_event *sev); -+ -+int swork_get(void); -+void swork_put(void); -+ -+#endif /* _LINUX_SWORK_H */ -diff -Nur linux-4.4.13.orig/include/net/dst.h linux-4.4.13/include/net/dst.h ---- linux-4.4.13.orig/include/net/dst.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/net/dst.h 2016-06-22 21:55:08.042523867 +0200 -@@ -437,7 +437,7 @@ +diff --git a/include/net/dst.h b/include/net/dst.h +index c7329dcd90cc..35c3dba16728 100644 +--- a/include/net/dst.h ++++ b/include/net/dst.h +@@ -437,7 +437,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) { @@ -15372,10 +15681,11 @@ diff -Nur linux-4.4.13.orig/include/net/dst.h linux-4.4.13/include/net/dst.h if (dst->pending_confirm) { unsigned long now = jiffies; -diff -Nur linux-4.4.13.orig/include/net/neighbour.h linux-4.4.13/include/net/neighbour.h ---- linux-4.4.13.orig/include/net/neighbour.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/net/neighbour.h 2016-06-22 21:55:08.042523867 +0200 -@@ -446,7 +446,7 @@ +diff --git a/include/net/neighbour.h b/include/net/neighbour.h +index 8b683841e574..bf656008f6e7 100644 +--- a/include/net/neighbour.h ++++ b/include/net/neighbour.h +@@ -446,7 +446,7 @@ static inline int neigh_hh_bridge(struct hh_cache *hh, struct sk_buff *skb) } #endif @@ -15384,7 +15694,7 @@ diff -Nur linux-4.4.13.orig/include/net/neighbour.h linux-4.4.13/include/net/nei { unsigned int seq; int hh_len; -@@ -501,7 +501,7 @@ +@@ -501,7 +501,7 @@ struct neighbour_cb { #define NEIGH_CB(skb) ((struct neighbour_cb *)(skb)->cb) @@ -15393,10 +15703,11 @@ diff -Nur linux-4.4.13.orig/include/net/neighbour.h linux-4.4.13/include/net/nei const struct net_device *dev) { unsigned int seq; -diff -Nur linux-4.4.13.orig/include/net/netns/ipv4.h linux-4.4.13/include/net/netns/ipv4.h ---- linux-4.4.13.orig/include/net/netns/ipv4.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/net/netns/ipv4.h 2016-06-22 21:55:08.042523867 +0200 -@@ -70,6 +70,7 @@ +diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h +index c68926b4899c..dd0751e76065 100644 +--- a/include/net/netns/ipv4.h ++++ b/include/net/netns/ipv4.h +@@ -70,6 +70,7 @@ struct netns_ipv4 { int sysctl_icmp_echo_ignore_all; int sysctl_icmp_echo_ignore_broadcasts; @@ -15404,9 +15715,11 @@ diff -Nur linux-4.4.13.orig/include/net/netns/ipv4.h linux-4.4.13/include/net/ne int sysctl_icmp_ignore_bogus_error_responses; int sysctl_icmp_ratelimit; int sysctl_icmp_ratemask; -diff -Nur linux-4.4.13.orig/include/trace/events/hist.h linux-4.4.13/include/trace/events/hist.h ---- linux-4.4.13.orig/include/trace/events/hist.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-4.4.13/include/trace/events/hist.h 2016-06-22 21:55:08.042523867 +0200 +diff --git a/include/trace/events/hist.h b/include/trace/events/hist.h +new file mode 100644 +index 000000000000..f7710de1b1f3 +--- /dev/null ++++ b/include/trace/events/hist.h @@ -0,0 +1,73 @@ +#undef TRACE_SYSTEM +#define TRACE_SYSTEM hist @@ -15481,9 +15794,11 @@ diff -Nur linux-4.4.13.orig/include/trace/events/hist.h linux-4.4.13/include/tra + +/* This part must be outside protection */ +#include <trace/define_trace.h> -diff -Nur linux-4.4.13.orig/include/trace/events/latency_hist.h linux-4.4.13/include/trace/events/latency_hist.h ---- linux-4.4.13.orig/include/trace/events/latency_hist.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-4.4.13/include/trace/events/latency_hist.h 2016-06-22 21:55:08.042523867 +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 @@ -15514,10 +15829,11 @@ diff -Nur linux-4.4.13.orig/include/trace/events/latency_hist.h linux-4.4.13/inc +} + +#endif /* _LATENCY_HIST_H */ -diff -Nur linux-4.4.13.orig/include/trace/events/writeback.h linux-4.4.13/include/trace/events/writeback.h ---- linux-4.4.13.orig/include/trace/events/writeback.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/include/trace/events/writeback.h 2016-06-22 21:55:08.042523867 +0200 -@@ -134,58 +134,28 @@ +diff --git a/include/trace/events/writeback.h b/include/trace/events/writeback.h +index fff846b512e6..73614ce1d204 100644 +--- a/include/trace/events/writeback.h ++++ b/include/trace/events/writeback.h +@@ -134,58 +134,28 @@ DEFINE_EVENT(writeback_dirty_inode_template, writeback_dirty_inode, #ifdef CREATE_TRACE_POINTS #ifdef CONFIG_CGROUP_WRITEBACK @@ -15585,7 +15901,7 @@ diff -Nur linux-4.4.13.orig/include/trace/events/writeback.h linux-4.4.13/includ } #endif /* CONFIG_CGROUP_WRITEBACK */ -@@ -201,7 +171,7 @@ +@@ -201,7 +171,7 @@ DECLARE_EVENT_CLASS(writeback_write_inode_template, __array(char, name, 32) __field(unsigned long, ino) __field(int, sync_mode) @@ -15594,7 +15910,7 @@ diff -Nur linux-4.4.13.orig/include/trace/events/writeback.h linux-4.4.13/includ ), TP_fast_assign( -@@ -209,14 +179,14 @@ +@@ -209,14 +179,14 @@ DECLARE_EVENT_CLASS(writeback_write_inode_template, dev_name(inode_to_bdi(inode)->dev), 32); __entry->ino = inode->i_ino; __entry->sync_mode = wbc->sync_mode; @@ -15612,7 +15928,7 @@ diff -Nur linux-4.4.13.orig/include/trace/events/writeback.h linux-4.4.13/includ ) ); -@@ -246,7 +216,7 @@ +@@ -246,7 +216,7 @@ DECLARE_EVENT_CLASS(writeback_work_class, __field(int, range_cyclic) __field(int, for_background) __field(int, reason) @@ -15621,7 +15937,7 @@ diff -Nur linux-4.4.13.orig/include/trace/events/writeback.h linux-4.4.13/includ ), TP_fast_assign( strncpy(__entry->name, -@@ -258,10 +228,10 @@ +@@ -258,10 +228,10 @@ DECLARE_EVENT_CLASS(writeback_work_class, __entry->range_cyclic = work->range_cyclic; __entry->for_background = work->for_background; __entry->reason = work->reason; @@ -15634,7 +15950,7 @@ diff -Nur linux-4.4.13.orig/include/trace/events/writeback.h linux-4.4.13/includ __entry->name, MAJOR(__entry->sb_dev), MINOR(__entry->sb_dev), __entry->nr_pages, -@@ -270,7 +240,7 @@ +@@ -270,7 +240,7 @@ DECLARE_EVENT_CLASS(writeback_work_class, __entry->range_cyclic, __entry->for_background, __print_symbolic(__entry->reason, WB_WORK_REASON), @@ -15643,7 +15959,7 @@ diff -Nur linux-4.4.13.orig/include/trace/events/writeback.h linux-4.4.13/includ ) ); #define DEFINE_WRITEBACK_WORK_EVENT(name) \ -@@ -300,15 +270,15 @@ +@@ -300,15 +270,15 @@ DECLARE_EVENT_CLASS(writeback_class, TP_ARGS(wb), TP_STRUCT__entry( __array(char, name, 32) @@ -15663,7 +15979,7 @@ diff -Nur linux-4.4.13.orig/include/trace/events/writeback.h linux-4.4.13/includ ) ); #define DEFINE_WRITEBACK_EVENT(name) \ -@@ -347,7 +317,7 @@ +@@ -347,7 +317,7 @@ DECLARE_EVENT_CLASS(wbc_class, __field(int, range_cyclic) __field(long, range_start) __field(long, range_end) @@ -15672,7 +15988,7 @@ diff -Nur linux-4.4.13.orig/include/trace/events/writeback.h linux-4.4.13/includ ), TP_fast_assign( -@@ -361,12 +331,12 @@ +@@ -361,12 +331,12 @@ DECLARE_EVENT_CLASS(wbc_class, __entry->range_cyclic = wbc->range_cyclic; __entry->range_start = (long)wbc->range_start; __entry->range_end = (long)wbc->range_end; @@ -15687,7 +16003,7 @@ diff -Nur linux-4.4.13.orig/include/trace/events/writeback.h linux-4.4.13/includ __entry->name, __entry->nr_to_write, __entry->pages_skipped, -@@ -377,7 +347,7 @@ +@@ -377,7 +347,7 @@ DECLARE_EVENT_CLASS(wbc_class, __entry->range_cyclic, __entry->range_start, __entry->range_end, @@ -15696,7 +16012,7 @@ diff -Nur linux-4.4.13.orig/include/trace/events/writeback.h linux-4.4.13/includ ) ) -@@ -398,7 +368,7 @@ +@@ -398,7 +368,7 @@ TRACE_EVENT(writeback_queue_io, __field(long, age) __field(int, moved) __field(int, reason) @@ -15705,7 +16021,7 @@ diff -Nur linux-4.4.13.orig/include/trace/events/writeback.h linux-4.4.13/includ ), TP_fast_assign( unsigned long *older_than_this = work->older_than_this; -@@ -408,15 +378,15 @@ +@@ -408,15 +378,15 @@ TRACE_EVENT(writeback_queue_io, (jiffies - *older_than_this) * 1000 / HZ : -1; __entry->moved = moved; __entry->reason = work->reason; @@ -15724,7 +16040,7 @@ diff -Nur linux-4.4.13.orig/include/trace/events/writeback.h linux-4.4.13/includ ) ); -@@ -484,7 +454,7 @@ +@@ -484,7 +454,7 @@ TRACE_EVENT(bdi_dirty_ratelimit, __field(unsigned long, dirty_ratelimit) __field(unsigned long, task_ratelimit) __field(unsigned long, balanced_dirty_ratelimit) @@ -15733,7 +16049,7 @@ diff -Nur linux-4.4.13.orig/include/trace/events/writeback.h linux-4.4.13/includ ), TP_fast_assign( -@@ -496,13 +466,13 @@ +@@ -496,13 +466,13 @@ TRACE_EVENT(bdi_dirty_ratelimit, __entry->task_ratelimit = KBps(task_ratelimit); __entry->balanced_dirty_ratelimit = KBps(wb->balanced_dirty_ratelimit); @@ -15749,7 +16065,7 @@ diff -Nur linux-4.4.13.orig/include/trace/events/writeback.h linux-4.4.13/includ __entry->bdi, __entry->write_bw, /* write bandwidth */ __entry->avg_write_bw, /* avg write bandwidth */ -@@ -510,7 +480,7 @@ +@@ -510,7 +480,7 @@ TRACE_EVENT(bdi_dirty_ratelimit, __entry->dirty_ratelimit, /* base ratelimit */ __entry->task_ratelimit, /* ratelimit with position control */ __entry->balanced_dirty_ratelimit, /* the balanced ratelimit */ @@ -15758,7 +16074,7 @@ diff -Nur linux-4.4.13.orig/include/trace/events/writeback.h linux-4.4.13/includ ) ); -@@ -548,7 +518,7 @@ +@@ -548,7 +518,7 @@ TRACE_EVENT(balance_dirty_pages, __field( long, pause) __field(unsigned long, period) __field( long, think) @@ -15767,7 +16083,7 @@ diff -Nur linux-4.4.13.orig/include/trace/events/writeback.h linux-4.4.13/includ ), TP_fast_assign( -@@ -571,7 +541,7 @@ +@@ -571,7 +541,7 @@ TRACE_EVENT(balance_dirty_pages, __entry->period = period * 1000 / HZ; __entry->pause = pause * 1000 / HZ; __entry->paused = (jiffies - start_time) * 1000 / HZ; @@ -15776,7 +16092,7 @@ diff -Nur linux-4.4.13.orig/include/trace/events/writeback.h linux-4.4.13/includ ), -@@ -580,7 +550,7 @@ +@@ -580,7 +550,7 @@ TRACE_EVENT(balance_dirty_pages, "bdi_setpoint=%lu bdi_dirty=%lu " "dirty_ratelimit=%lu task_ratelimit=%lu " "dirtied=%u dirtied_pause=%u " @@ -15785,7 +16101,7 @@ diff -Nur linux-4.4.13.orig/include/trace/events/writeback.h linux-4.4.13/includ __entry->bdi, __entry->limit, __entry->setpoint, -@@ -595,7 +565,7 @@ +@@ -595,7 +565,7 @@ TRACE_EVENT(balance_dirty_pages, __entry->pause, /* ms */ __entry->period, /* ms */ __entry->think, /* ms */ @@ -15794,7 +16110,7 @@ diff -Nur linux-4.4.13.orig/include/trace/events/writeback.h linux-4.4.13/includ ) ); -@@ -609,8 +579,7 @@ +@@ -609,8 +579,7 @@ TRACE_EVENT(writeback_sb_inodes_requeue, __field(unsigned long, ino) __field(unsigned long, state) __field(unsigned long, dirtied_when) @@ -15804,7 +16120,7 @@ diff -Nur linux-4.4.13.orig/include/trace/events/writeback.h linux-4.4.13/includ ), TP_fast_assign( -@@ -619,16 +588,16 @@ +@@ -619,16 +588,16 @@ TRACE_EVENT(writeback_sb_inodes_requeue, __entry->ino = inode->i_ino; __entry->state = inode->i_state; __entry->dirtied_when = inode->dirtied_when; @@ -15824,7 +16140,7 @@ diff -Nur linux-4.4.13.orig/include/trace/events/writeback.h linux-4.4.13/includ ) ); -@@ -684,7 +653,7 @@ +@@ -684,7 +653,7 @@ DECLARE_EVENT_CLASS(writeback_single_inode_template, __field(unsigned long, writeback_index) __field(long, nr_to_write) __field(unsigned long, wrote) @@ -15833,7 +16149,7 @@ diff -Nur linux-4.4.13.orig/include/trace/events/writeback.h linux-4.4.13/includ ), TP_fast_assign( -@@ -696,11 +665,11 @@ +@@ -696,11 +665,11 @@ DECLARE_EVENT_CLASS(writeback_single_inode_template, __entry->writeback_index = inode->i_mapping->writeback_index; __entry->nr_to_write = nr_to_write; __entry->wrote = nr_to_write - wbc->nr_to_write; @@ -15847,7 +16163,7 @@ diff -Nur linux-4.4.13.orig/include/trace/events/writeback.h linux-4.4.13/includ __entry->name, __entry->ino, show_inode_state(__entry->state), -@@ -709,7 +678,7 @@ +@@ -709,7 +678,7 @@ DECLARE_EVENT_CLASS(writeback_single_inode_template, __entry->writeback_index, __entry->nr_to_write, __entry->wrote, @@ -15856,10 +16172,11 @@ diff -Nur linux-4.4.13.orig/include/trace/events/writeback.h linux-4.4.13/includ ) ); -diff -Nur linux-4.4.13.orig/init/Kconfig linux-4.4.13/init/Kconfig ---- linux-4.4.13.orig/init/Kconfig 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/init/Kconfig 2016-06-22 21:55:08.042523867 +0200 -@@ -498,7 +498,7 @@ +diff --git a/init/Kconfig b/init/Kconfig +index 235c7a2c0d20..a7c81c0911da 100644 +--- a/init/Kconfig ++++ b/init/Kconfig +@@ -498,7 +498,7 @@ config TINY_RCU config RCU_EXPERT bool "Make expert-level adjustments to RCU configuration" @@ -15868,7 +16185,7 @@ diff -Nur linux-4.4.13.orig/init/Kconfig linux-4.4.13/init/Kconfig help This option needs to be enabled if you wish to make expert-level adjustments to RCU configuration. By default, -@@ -614,7 +614,7 @@ +@@ -614,7 +614,7 @@ config RCU_FANOUT_LEAF config RCU_FAST_NO_HZ bool "Accelerate last non-dyntick-idle CPU's grace periods" @@ -15877,7 +16194,7 @@ diff -Nur linux-4.4.13.orig/init/Kconfig linux-4.4.13/init/Kconfig default n help This option permits CPUs to enter dynticks-idle state even if -@@ -641,7 +641,7 @@ +@@ -641,7 +641,7 @@ config TREE_RCU_TRACE config RCU_BOOST bool "Enable RCU priority boosting" depends on RT_MUTEXES && PREEMPT_RCU && RCU_EXPERT @@ -15886,7 +16203,7 @@ diff -Nur linux-4.4.13.orig/init/Kconfig linux-4.4.13/init/Kconfig help This option boosts the priority of preempted RCU readers that block the current preemptible RCU grace period for too long. -@@ -1106,6 +1106,7 @@ +@@ -1106,6 +1106,7 @@ config CFS_BANDWIDTH config RT_GROUP_SCHED bool "Group scheduling for SCHED_RR/FIFO" depends on CGROUP_SCHED @@ -15894,7 +16211,7 @@ diff -Nur linux-4.4.13.orig/init/Kconfig linux-4.4.13/init/Kconfig default n help This feature lets you explicitly allocate real CPU bandwidth -@@ -1719,6 +1720,7 @@ +@@ -1719,6 +1720,7 @@ choice config SLAB bool "SLAB" @@ -15902,7 +16219,7 @@ diff -Nur linux-4.4.13.orig/init/Kconfig linux-4.4.13/init/Kconfig help The regular slab allocator that is established and known to work well in all environments. It organizes cache hot objects in -@@ -1737,6 +1739,7 @@ +@@ -1737,6 +1739,7 @@ config SLUB config SLOB depends on EXPERT bool "SLOB (Simple Allocator)" @@ -15910,7 +16227,7 @@ diff -Nur linux-4.4.13.orig/init/Kconfig linux-4.4.13/init/Kconfig help SLOB replaces the stock allocator with a drastically simpler allocator. SLOB is generally more space efficient but -@@ -1746,7 +1749,7 @@ +@@ -1746,7 +1749,7 @@ endchoice config SLUB_CPU_PARTIAL default y @@ -15919,10 +16236,21 @@ diff -Nur linux-4.4.13.orig/init/Kconfig linux-4.4.13/init/Kconfig bool "SLUB per cpu partial cache" help Per cpu partial caches accellerate objects allocation and freeing -diff -Nur linux-4.4.13.orig/init/main.c linux-4.4.13/init/main.c ---- linux-4.4.13.orig/init/main.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/init/main.c 2016-06-22 21:55:08.042523867 +0200 -@@ -530,6 +530,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 9e64d7097f1a..4a76e629c137 100644 +--- a/init/main.c ++++ b/init/main.c +@@ -530,6 +530,7 @@ asmlinkage __visible void __init start_kernel(void) setup_command_line(command_line); setup_nr_cpu_ids(); setup_per_cpu_areas(); @@ -15930,19 +16258,11 @@ diff -Nur linux-4.4.13.orig/init/main.c linux-4.4.13/init/main.c smp_prepare_boot_cpu(); /* arch-specific boot-cpu hooks */ build_all_zonelists(NULL, NULL); -diff -Nur linux-4.4.13.orig/init/Makefile linux-4.4.13/init/Makefile ---- linux-4.4.13.orig/init/Makefile 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/init/Makefile 2016-06-22 21:55:08.042523867 +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.4.13.orig/ipc/msg.c linux-4.4.13/ipc/msg.c ---- linux-4.4.13.orig/ipc/msg.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/ipc/msg.c 2016-06-22 21:55:08.042523867 +0200 -@@ -183,20 +183,14 @@ +diff --git a/ipc/msg.c b/ipc/msg.c +index c6521c205cb4..996d89023552 100644 +--- a/ipc/msg.c ++++ b/ipc/msg.c +@@ -183,20 +183,14 @@ static void ss_wakeup(struct list_head *h, int kill) } } @@ -15967,7 +16287,7 @@ diff -Nur linux-4.4.13.orig/ipc/msg.c linux-4.4.13/ipc/msg.c msr->r_msg = ERR_PTR(res); } } -@@ -213,11 +207,13 @@ +@@ -213,11 +207,13 @@ static void freeque(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp) { struct msg_msg *msg, *t; struct msg_queue *msq = container_of(ipcp, struct msg_queue, q_perm); @@ -15982,7 +16302,7 @@ diff -Nur linux-4.4.13.orig/ipc/msg.c linux-4.4.13/ipc/msg.c rcu_read_unlock(); list_for_each_entry_safe(msg, t, &msq->q_messages, m_list) { -@@ -342,6 +338,7 @@ +@@ -342,6 +338,7 @@ static int msgctl_down(struct ipc_namespace *ns, int msqid, int cmd, struct kern_ipc_perm *ipcp; struct msqid64_ds uninitialized_var(msqid64); struct msg_queue *msq; @@ -15990,7 +16310,7 @@ diff -Nur linux-4.4.13.orig/ipc/msg.c linux-4.4.13/ipc/msg.c int err; if (cmd == IPC_SET) { -@@ -389,7 +386,7 @@ +@@ -389,7 +386,7 @@ static int msgctl_down(struct ipc_namespace *ns, int msqid, int cmd, /* sleeping receivers might be excluded by * stricter permissions. */ @@ -15999,7 +16319,7 @@ diff -Nur linux-4.4.13.orig/ipc/msg.c linux-4.4.13/ipc/msg.c /* sleeping senders might be able to send * due to a larger queue size. */ -@@ -402,6 +399,7 @@ +@@ -402,6 +399,7 @@ static int msgctl_down(struct ipc_namespace *ns, int msqid, int cmd, out_unlock0: ipc_unlock_object(&msq->q_perm); @@ -16007,7 +16327,7 @@ diff -Nur linux-4.4.13.orig/ipc/msg.c linux-4.4.13/ipc/msg.c out_unlock1: rcu_read_unlock(); out_up: -@@ -566,7 +564,8 @@ +@@ -566,7 +564,8 @@ static int testmsg(struct msg_msg *msg, long type, int mode) return 0; } @@ -16017,7 +16337,7 @@ diff -Nur linux-4.4.13.orig/ipc/msg.c linux-4.4.13/ipc/msg.c { struct msg_receiver *msr, *t; -@@ -577,27 +576,13 @@ +@@ -577,27 +576,13 @@ static inline int pipelined_send(struct msg_queue *msq, struct msg_msg *msg) list_del(&msr->r_list); if (msr->r_maxsize < msg->m_ts) { @@ -16047,7 +16367,7 @@ diff -Nur linux-4.4.13.orig/ipc/msg.c linux-4.4.13/ipc/msg.c return 1; } } -@@ -613,6 +598,7 @@ +@@ -613,6 +598,7 @@ long do_msgsnd(int msqid, long mtype, void __user *mtext, struct msg_msg *msg; int err; struct ipc_namespace *ns; @@ -16055,7 +16375,7 @@ diff -Nur linux-4.4.13.orig/ipc/msg.c linux-4.4.13/ipc/msg.c ns = current->nsproxy->ipc_ns; -@@ -698,7 +684,7 @@ +@@ -698,7 +684,7 @@ long do_msgsnd(int msqid, long mtype, void __user *mtext, msq->q_lspid = task_tgid_vnr(current); msq->q_stime = get_seconds(); @@ -16064,7 +16384,7 @@ diff -Nur linux-4.4.13.orig/ipc/msg.c linux-4.4.13/ipc/msg.c /* no one is waiting for this message, enqueue it */ list_add_tail(&msg->m_list, &msq->q_messages); msq->q_cbytes += msgsz; -@@ -712,6 +698,7 @@ +@@ -712,6 +698,7 @@ long do_msgsnd(int msqid, long mtype, void __user *mtext, out_unlock0: ipc_unlock_object(&msq->q_perm); @@ -16072,7 +16392,7 @@ diff -Nur linux-4.4.13.orig/ipc/msg.c linux-4.4.13/ipc/msg.c out_unlock1: rcu_read_unlock(); if (msg != NULL) -@@ -932,57 +919,25 @@ +@@ -932,57 +919,25 @@ long do_msgrcv(int msqid, void __user *buf, size_t bufsz, long msgtyp, int msgfl rcu_read_lock(); /* Lockless receive, part 2: @@ -16141,10 +16461,11 @@ diff -Nur linux-4.4.13.orig/ipc/msg.c linux-4.4.13/ipc/msg.c msg = (struct msg_msg *)msr_d.r_msg; if (msg != ERR_PTR(-EAGAIN)) goto out_unlock0; -diff -Nur linux-4.4.13.orig/ipc/sem.c linux-4.4.13/ipc/sem.c ---- linux-4.4.13.orig/ipc/sem.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/ipc/sem.c 2016-06-22 21:55:08.042523867 +0200 -@@ -690,6 +690,13 @@ +diff --git a/ipc/sem.c b/ipc/sem.c +index 20d07008ad5e..40b5cc070720 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) { @@ -16158,7 +16479,7 @@ diff -Nur linux-4.4.13.orig/ipc/sem.c linux-4.4.13/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); @@ -16166,7 +16487,7 @@ diff -Nur linux-4.4.13.orig/ipc/sem.c linux-4.4.13/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) { @@ -16174,7 +16495,7 @@ diff -Nur linux-4.4.13.orig/ipc/sem.c linux-4.4.13/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(); @@ -16182,10 +16503,85 @@ diff -Nur linux-4.4.13.orig/ipc/sem.c linux-4.4.13/ipc/sem.c } static void unlink_queue(struct sem_array *sma, struct sem_queue *q) -diff -Nur linux-4.4.13.orig/kernel/cgroup.c linux-4.4.13/kernel/cgroup.c ---- linux-4.4.13.orig/kernel/cgroup.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/cgroup.c 2016-06-22 21:55:08.042523867 +0200 -@@ -4737,10 +4737,10 @@ +diff --git a/kernel/Kconfig.locks b/kernel/Kconfig.locks +index ebdb0043203a..b9e6aa7e5aa6 100644 +--- a/kernel/Kconfig.locks ++++ b/kernel/Kconfig.locks +@@ -225,11 +225,11 @@ config ARCH_SUPPORTS_ATOMIC_RMW + + config MUTEX_SPIN_ON_OWNER + def_bool y +- depends on SMP && !DEBUG_MUTEXES && ARCH_SUPPORTS_ATOMIC_RMW ++ depends on SMP && !DEBUG_MUTEXES && ARCH_SUPPORTS_ATOMIC_RMW && !PREEMPT_RT_FULL + + config RWSEM_SPIN_ON_OWNER + def_bool y +- depends on SMP && RWSEM_XCHGADD_ALGORITHM && ARCH_SUPPORTS_ATOMIC_RMW ++ depends on SMP && RWSEM_XCHGADD_ALGORITHM && ARCH_SUPPORTS_ATOMIC_RMW && !PREEMPT_RT_FULL + + config LOCK_SPIN_ON_OWNER + def_bool y +diff --git a/kernel/Kconfig.preempt b/kernel/Kconfig.preempt +index 3f9c97419f02..11dbe26a8279 100644 +--- a/kernel/Kconfig.preempt ++++ b/kernel/Kconfig.preempt +@@ -1,3 +1,16 @@ ++config PREEMPT ++ bool ++ select PREEMPT_COUNT ++ ++config PREEMPT_RT_BASE ++ bool ++ select PREEMPT ++ ++config HAVE_PREEMPT_LAZY ++ bool ++ ++config PREEMPT_LAZY ++ def_bool y if HAVE_PREEMPT_LAZY && PREEMPT_RT_FULL + + choice + prompt "Preemption Model" +@@ -33,9 +46,9 @@ config PREEMPT_VOLUNTARY + + Select this if you are building a kernel for a desktop system. + +-config PREEMPT ++config PREEMPT__LL + bool "Preemptible Kernel (Low-Latency Desktop)" +- select PREEMPT_COUNT ++ select PREEMPT + select UNINLINE_SPIN_UNLOCK if !ARCH_INLINE_SPIN_UNLOCK + help + This option reduces the latency of the kernel by making +@@ -52,6 +65,22 @@ config PREEMPT + embedded system with latency requirements in the milliseconds + range. + ++config PREEMPT_RTB ++ bool "Preemptible Kernel (Basic RT)" ++ select PREEMPT_RT_BASE ++ help ++ This option is basically the same as (Low-Latency Desktop) but ++ enables changes which are preliminary for the full preemptible ++ RT kernel. ++ ++config PREEMPT_RT_FULL ++ bool "Fully Preemptible Kernel (RT)" ++ depends on IRQ_FORCED_THREADING ++ select PREEMPT_RT_BASE ++ select PREEMPT_RCU ++ help ++ All and everything ++ + endchoice + + config PREEMPT_COUNT +diff --git a/kernel/cgroup.c b/kernel/cgroup.c +index a3424f28aaf4..69434d231e21 100644 +--- a/kernel/cgroup.c ++++ b/kernel/cgroup.c +@@ -4737,10 +4737,10 @@ static void css_free_rcu_fn(struct rcu_head *rcu_head) queue_work(cgroup_destroy_wq, &css->destroy_work); } @@ -16198,7 +16594,7 @@ diff -Nur linux-4.4.13.orig/kernel/cgroup.c linux-4.4.13/kernel/cgroup.c struct cgroup_subsys *ss = css->ss; struct cgroup *cgrp = css->cgroup; -@@ -4779,8 +4779,8 @@ +@@ -4779,8 +4779,8 @@ static void css_release(struct percpu_ref *ref) struct cgroup_subsys_state *css = container_of(ref, struct cgroup_subsys_state, refcnt); @@ -16209,7 +16605,7 @@ diff -Nur linux-4.4.13.orig/kernel/cgroup.c linux-4.4.13/kernel/cgroup.c } static void init_and_link_css(struct cgroup_subsys_state *css, -@@ -5396,6 +5396,7 @@ +@@ -5397,6 +5397,7 @@ static int __init cgroup_wq_init(void) */ cgroup_destroy_wq = alloc_workqueue("cgroup_destroy", 0, 1); BUG_ON(!cgroup_destroy_wq); @@ -16217,10 +16613,11 @@ diff -Nur linux-4.4.13.orig/kernel/cgroup.c linux-4.4.13/kernel/cgroup.c /* * Used to destroy pidlists and separate to serve as flush domain. -diff -Nur linux-4.4.13.orig/kernel/cpu.c linux-4.4.13/kernel/cpu.c ---- linux-4.4.13.orig/kernel/cpu.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/cpu.c 2016-06-22 21:55:08.046523867 +0200 -@@ -75,8 +75,8 @@ +diff --git a/kernel/cpu.c b/kernel/cpu.c +index 85ff5e26e23b..8edd3c716092 100644 +--- a/kernel/cpu.c ++++ b/kernel/cpu.c +@@ -75,8 +75,8 @@ static struct { #endif } cpu_hotplug = { .active_writer = NULL, @@ -16230,7 +16627,7 @@ diff -Nur linux-4.4.13.orig/kernel/cpu.c linux-4.4.13/kernel/cpu.c #ifdef CONFIG_DEBUG_LOCK_ALLOC .dep_map = {.name = "cpu_hotplug.lock" }, #endif -@@ -89,6 +89,289 @@ +@@ -89,6 +89,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) @@ -16520,7 +16917,7 @@ diff -Nur linux-4.4.13.orig/kernel/cpu.c linux-4.4.13/kernel/cpu.c void get_online_cpus(void) { -@@ -338,13 +621,15 @@ +@@ -338,13 +621,15 @@ static int take_cpu_down(void *_param) /* Requires cpu_add_remove_lock to be held */ static int _cpu_down(unsigned int cpu, int tasks_frozen) { @@ -16537,7 +16934,7 @@ diff -Nur linux-4.4.13.orig/kernel/cpu.c linux-4.4.13/kernel/cpu.c if (num_online_cpus() == 1) return -EBUSY; -@@ -352,7 +637,34 @@ +@@ -352,7 +637,34 @@ static int _cpu_down(unsigned int cpu, int tasks_frozen) if (!cpu_online(cpu)) return -EINVAL; @@ -16572,7 +16969,7 @@ diff -Nur linux-4.4.13.orig/kernel/cpu.c linux-4.4.13/kernel/cpu.c err = __cpu_notify(CPU_DOWN_PREPARE | mod, hcpu, -1, &nr_calls); if (err) { -@@ -378,8 +690,12 @@ +@@ -378,8 +690,12 @@ static int _cpu_down(unsigned int cpu, int tasks_frozen) else synchronize_rcu(); @@ -16585,7 +16982,7 @@ diff -Nur linux-4.4.13.orig/kernel/cpu.c linux-4.4.13/kernel/cpu.c /* * Prevent irq alloc/free while the dying cpu reorganizes the * interrupt affinities. -@@ -424,9 +740,14 @@ +@@ -424,9 +740,14 @@ static int _cpu_down(unsigned int cpu, int tasks_frozen) check_for_tasks(cpu); out_release: @@ -16600,10 +16997,11 @@ diff -Nur linux-4.4.13.orig/kernel/cpu.c linux-4.4.13/kernel/cpu.c return err; } -diff -Nur linux-4.4.13.orig/kernel/debug/kdb/kdb_io.c linux-4.4.13/kernel/debug/kdb/kdb_io.c ---- linux-4.4.13.orig/kernel/debug/kdb/kdb_io.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/debug/kdb/kdb_io.c 2016-06-22 21:55:08.046523867 +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; @@ -16611,7 +17009,7 @@ diff -Nur linux-4.4.13.orig/kernel/debug/kdb/kdb_io.c linux-4.4.13/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(); @@ -16620,7 +17018,7 @@ diff -Nur linux-4.4.13.orig/kernel/debug/kdb/kdb_io.c linux-4.4.13/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); } @@ -16628,7 +17026,7 @@ diff -Nur linux-4.4.13.orig/kernel/debug/kdb/kdb_io.c linux-4.4.13/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; @@ -16640,10 +17038,11 @@ diff -Nur linux-4.4.13.orig/kernel/debug/kdb/kdb_io.c linux-4.4.13/kernel/debug/ return r; } -diff -Nur linux-4.4.13.orig/kernel/events/core.c linux-4.4.13/kernel/events/core.c ---- linux-4.4.13.orig/kernel/events/core.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/events/core.c 2016-06-22 21:55:08.046523867 +0200 -@@ -802,6 +802,7 @@ +diff --git a/kernel/events/core.c b/kernel/events/core.c +index 12ecd4f0329f..560ea99875d3 100644 +--- a/kernel/events/core.c ++++ b/kernel/events/core.c +@@ -802,6 +802,7 @@ static void __perf_mux_hrtimer_init(struct perf_cpu_context *cpuctx, int cpu) raw_spin_lock_init(&cpuctx->hrtimer_lock); hrtimer_init(timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS_PINNED); timer->function = perf_mux_hrtimer_handler; @@ -16651,7 +17050,7 @@ diff -Nur linux-4.4.13.orig/kernel/events/core.c linux-4.4.13/kernel/events/core } static int perf_mux_hrtimer_restart(struct perf_cpu_context *cpuctx) -@@ -7219,6 +7220,7 @@ +@@ -7219,6 +7220,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; @@ -16659,10 +17058,11 @@ diff -Nur linux-4.4.13.orig/kernel/events/core.c linux-4.4.13/kernel/events/core /* * Since hrtimers have a fixed rate, we can do a static freq->period -diff -Nur linux-4.4.13.orig/kernel/exit.c linux-4.4.13/kernel/exit.c ---- linux-4.4.13.orig/kernel/exit.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/exit.c 2016-06-22 21:55:08.046523867 +0200 -@@ -144,7 +144,7 @@ +diff --git a/kernel/exit.c b/kernel/exit.c +index ffba5df4abd5..e199407f8831 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. */ @@ -16671,10 +17071,11 @@ diff -Nur linux-4.4.13.orig/kernel/exit.c linux-4.4.13/kernel/exit.c tsk->sighand = NULL; spin_unlock(&sighand->siglock); -diff -Nur linux-4.4.13.orig/kernel/fork.c linux-4.4.13/kernel/fork.c ---- linux-4.4.13.orig/kernel/fork.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/fork.c 2016-06-22 21:55:08.046523867 +0200 -@@ -108,7 +108,7 @@ +diff --git a/kernel/fork.c b/kernel/fork.c +index 1155eac61687..4e93b4ea33f7 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; @@ -16683,7 +17084,7 @@ diff -Nur linux-4.4.13.orig/kernel/fork.c linux-4.4.13/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); } @@ -16694,7 +17095,7 @@ diff -Nur linux-4.4.13.orig/kernel/fork.c linux-4.4.13/kernel/fork.c void __put_task_struct(struct task_struct *tsk) { WARN_ON(!tsk->exit_state); -@@ -261,7 +263,18 @@ +@@ -261,7 +263,18 @@ void __put_task_struct(struct task_struct *tsk) if (!profile_handoff_task(tsk)) free_task(tsk); } @@ -16713,7 +17114,7 @@ diff -Nur linux-4.4.13.orig/kernel/fork.c linux-4.4.13/kernel/fork.c void __init __weak arch_task_cache_init(void) { } -@@ -689,6 +702,19 @@ +@@ -689,6 +702,19 @@ void __mmdrop(struct mm_struct *mm) } EXPORT_SYMBOL_GPL(__mmdrop); @@ -16733,7 +17134,7 @@ diff -Nur linux-4.4.13.orig/kernel/fork.c linux-4.4.13/kernel/fork.c /* * Decrement the use count and release all resources for an mm. */ -@@ -1218,6 +1244,9 @@ +@@ -1218,6 +1244,9 @@ static void rt_mutex_init_task(struct task_struct *p) */ static void posix_cpu_timers_init(struct task_struct *tsk) { @@ -16743,7 +17144,7 @@ diff -Nur linux-4.4.13.orig/kernel/fork.c linux-4.4.13/kernel/fork.c tsk->cputime_expires.prof_exp = 0; tsk->cputime_expires.virt_exp = 0; tsk->cputime_expires.sched_exp = 0; -@@ -1343,15 +1372,16 @@ +@@ -1343,15 +1372,16 @@ static struct task_struct *copy_process(unsigned long clone_flags, spin_lock_init(&p->alloc_lock); init_sigpending(&p->pending); @@ -16762,10 +17163,11 @@ diff -Nur linux-4.4.13.orig/kernel/fork.c linux-4.4.13/kernel/fork.c #endif #if defined(SPLIT_RSS_COUNTING) -diff -Nur linux-4.4.13.orig/kernel/futex.c linux-4.4.13/kernel/futex.c ---- linux-4.4.13.orig/kernel/futex.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/futex.c 2016-06-22 21:55:08.046523867 +0200 -@@ -815,7 +815,9 @@ +diff --git a/kernel/futex.c b/kernel/futex.c +index 9d8163afd87c..ad38af0bcff3 100644 +--- a/kernel/futex.c ++++ b/kernel/futex.c +@@ -815,7 +815,9 @@ void exit_pi_state_list(struct task_struct *curr) * task still owns the PI-state: */ if (head->next != next) { @@ -16775,7 +17177,7 @@ diff -Nur linux-4.4.13.orig/kernel/futex.c linux-4.4.13/kernel/futex.c continue; } -@@ -1210,6 +1212,7 @@ +@@ -1210,6 +1212,7 @@ static int wake_futex_pi(u32 __user *uaddr, u32 uval, struct futex_q *this, struct futex_pi_state *pi_state = this->pi_state; u32 uninitialized_var(curval), newval; WAKE_Q(wake_q); @@ -16783,7 +17185,7 @@ diff -Nur linux-4.4.13.orig/kernel/futex.c linux-4.4.13/kernel/futex.c bool deboost; int ret = 0; -@@ -1223,7 +1226,7 @@ +@@ -1223,7 +1226,7 @@ static int wake_futex_pi(u32 __user *uaddr, u32 uval, struct futex_q *this, if (pi_state->owner != current) return -EINVAL; @@ -16792,7 +17194,7 @@ diff -Nur linux-4.4.13.orig/kernel/futex.c linux-4.4.13/kernel/futex.c new_owner = rt_mutex_next_owner(&pi_state->pi_mutex); /* -@@ -1259,24 +1262,25 @@ +@@ -1259,24 +1262,25 @@ static int wake_futex_pi(u32 __user *uaddr, u32 uval, struct futex_q *this, ret = -EINVAL; } if (ret) { @@ -16825,7 +17227,7 @@ diff -Nur linux-4.4.13.orig/kernel/futex.c linux-4.4.13/kernel/futex.c /* * First unlock HB so the waiter does not spin on it once he got woken -@@ -1286,6 +1290,7 @@ +@@ -1286,6 +1290,7 @@ static int wake_futex_pi(u32 __user *uaddr, u32 uval, struct futex_q *this, */ spin_unlock(&hb->lock); wake_up_q(&wake_q); @@ -16833,7 +17235,7 @@ diff -Nur linux-4.4.13.orig/kernel/futex.c linux-4.4.13/kernel/futex.c if (deboost) rt_mutex_adjust_prio(current); -@@ -1822,6 +1827,16 @@ +@@ -1822,6 +1827,16 @@ retry_private: requeue_pi_wake_futex(this, &key2, hb2); drop_count++; continue; @@ -16850,7 +17252,7 @@ diff -Nur linux-4.4.13.orig/kernel/futex.c linux-4.4.13/kernel/futex.c } else if (ret) { /* -EDEADLK */ this->pi_state = NULL; -@@ -2139,11 +2154,11 @@ +@@ -2139,11 +2154,11 @@ static int fixup_owner(u32 __user *uaddr, struct futex_q *q, int locked) * we returned due to timeout or signal without taking the * rt_mutex. Too late. */ @@ -16864,7 +17266,7 @@ diff -Nur linux-4.4.13.orig/kernel/futex.c linux-4.4.13/kernel/futex.c ret = fixup_pi_state_owner(uaddr, q, owner); goto out; } -@@ -2691,7 +2706,7 @@ +@@ -2691,7 +2706,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; @@ -16873,7 +17275,7 @@ diff -Nur linux-4.4.13.orig/kernel/futex.c linux-4.4.13/kernel/futex.c union futex_key key2 = FUTEX_KEY_INIT; struct futex_q q = futex_q_init; int res, ret; -@@ -2716,10 +2731,7 @@ +@@ -2716,10 +2731,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. */ @@ -16885,7 +17287,7 @@ diff -Nur linux-4.4.13.orig/kernel/futex.c linux-4.4.13/kernel/futex.c ret = get_futex_key(uaddr2, flags & FLAGS_SHARED, &key2, VERIFY_WRITE); if (unlikely(ret != 0)) -@@ -2750,20 +2762,55 @@ +@@ -2750,20 +2762,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); @@ -16952,7 +17354,7 @@ diff -Nur linux-4.4.13.orig/kernel/futex.c linux-4.4.13/kernel/futex.c /* Check if the requeue code acquired the second futex for us. */ if (!q.rt_waiter) { -@@ -2772,14 +2819,15 @@ +@@ -2772,14 +2819,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)) { @@ -16970,7 +17372,7 @@ diff -Nur linux-4.4.13.orig/kernel/futex.c linux-4.4.13/kernel/futex.c } } else { /* -@@ -2792,7 +2840,8 @@ +@@ -2792,7 +2840,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); @@ -16980,10 +17382,11 @@ diff -Nur linux-4.4.13.orig/kernel/futex.c linux-4.4.13/kernel/futex.c /* * Fixup the pi_state owner and possibly acquire the lock if we * haven't already. -diff -Nur linux-4.4.13.orig/kernel/irq/handle.c linux-4.4.13/kernel/irq/handle.c ---- linux-4.4.13.orig/kernel/irq/handle.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/irq/handle.c 2016-06-22 21:55:08.046523867 +0200 -@@ -134,6 +134,8 @@ +diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c +index 57bff7857e87..6c65c9252991 100644 +--- a/kernel/irq/handle.c ++++ b/kernel/irq/handle.c +@@ -134,6 +134,8 @@ void __irq_wake_thread(struct irq_desc *desc, struct irqaction *action) irqreturn_t handle_irq_event_percpu(struct irq_desc *desc) { @@ -16992,7 +17395,7 @@ diff -Nur linux-4.4.13.orig/kernel/irq/handle.c linux-4.4.13/kernel/irq/handle.c irqreturn_t retval = IRQ_NONE; unsigned int flags = 0, irq = desc->irq_data.irq; struct irqaction *action = desc->action; -@@ -176,7 +178,11 @@ +@@ -176,7 +178,11 @@ irqreturn_t handle_irq_event_percpu(struct irq_desc *desc) action = action->next; } @@ -17005,9 +17408,10 @@ diff -Nur linux-4.4.13.orig/kernel/irq/handle.c linux-4.4.13/kernel/irq/handle.c if (!noirqdebug) note_interrupt(desc, retval); -diff -Nur linux-4.4.13.orig/kernel/irq/irqdesc.c linux-4.4.13/kernel/irq/irqdesc.c ---- linux-4.4.13.orig/kernel/irq/irqdesc.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/irq/irqdesc.c 2016-06-22 21:55:08.046523867 +0200 +diff --git a/kernel/irq/irqdesc.c b/kernel/irq/irqdesc.c +index 239e2ae2c947..0b73349a42d5 100644 +--- a/kernel/irq/irqdesc.c ++++ b/kernel/irq/irqdesc.c @@ -24,10 +24,27 @@ static struct lock_class_key irq_desc_lock_class; @@ -17038,9 +17442,10 @@ diff -Nur linux-4.4.13.orig/kernel/irq/irqdesc.c linux-4.4.13/kernel/irq/irqdesc } #else static void __init init_irq_default_affinity(void) -diff -Nur linux-4.4.13.orig/kernel/irq/manage.c linux-4.4.13/kernel/irq/manage.c ---- linux-4.4.13.orig/kernel/irq/manage.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/irq/manage.c 2016-06-22 21:55:08.046523867 +0200 +diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c +index 6ead200370da..8e89554aa345 100644 +--- a/kernel/irq/manage.c ++++ b/kernel/irq/manage.c @@ -22,6 +22,7 @@ #include "internals.h" @@ -17049,7 +17454,7 @@ diff -Nur linux-4.4.13.orig/kernel/irq/manage.c linux-4.4.13/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); @@ -17057,7 +17462,7 @@ diff -Nur linux-4.4.13.orig/kernel/irq/manage.c linux-4.4.13/kernel/irq/manage.c #endif static void __synchronize_hardirq(struct irq_desc *desc) -@@ -181,6 +183,62 @@ +@@ -181,6 +183,62 @@ static inline void irq_get_pending(struct cpumask *mask, struct irq_desc *desc) { } #endif @@ -17120,7 +17525,7 @@ diff -Nur linux-4.4.13.orig/kernel/irq/manage.c linux-4.4.13/kernel/irq/manage.c int irq_do_set_affinity(struct irq_data *data, const struct cpumask *mask, bool force) { -@@ -220,7 +278,17 @@ +@@ -220,7 +278,17 @@ int irq_set_affinity_locked(struct irq_data *data, const struct cpumask *mask, if (desc->affinity_notify) { kref_get(&desc->affinity_notify->kref); @@ -17138,7 +17543,7 @@ diff -Nur linux-4.4.13.orig/kernel/irq/manage.c linux-4.4.13/kernel/irq/manage.c } irqd_set(data, IRQD_AFFINITY_SET); -@@ -258,10 +326,8 @@ +@@ -258,10 +326,8 @@ int irq_set_affinity_hint(unsigned int irq, const struct cpumask *m) } EXPORT_SYMBOL_GPL(irq_set_affinity_hint); @@ -17150,7 +17555,7 @@ diff -Nur linux-4.4.13.orig/kernel/irq/manage.c linux-4.4.13/kernel/irq/manage.c struct irq_desc *desc = irq_to_desc(notify->irq); cpumask_var_t cpumask; unsigned long flags; -@@ -283,6 +349,13 @@ +@@ -283,6 +349,13 @@ out: kref_put(¬ify->kref, notify->release); } @@ -17164,7 +17569,7 @@ diff -Nur linux-4.4.13.orig/kernel/irq/manage.c linux-4.4.13/kernel/irq/manage.c /** * irq_set_affinity_notifier - control notification of IRQ affinity changes * @irq: Interrupt for which to enable/disable notification -@@ -312,6 +385,8 @@ +@@ -312,6 +385,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); @@ -17173,7 +17578,7 @@ diff -Nur linux-4.4.13.orig/kernel/irq/manage.c linux-4.4.13/kernel/irq/manage.c } raw_spin_lock_irqsave(&desc->lock, flags); -@@ -865,7 +940,15 @@ +@@ -865,7 +940,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); @@ -17190,7 +17595,7 @@ diff -Nur linux-4.4.13.orig/kernel/irq/manage.c linux-4.4.13/kernel/irq/manage.c return ret; } -@@ -962,6 +1045,12 @@ +@@ -962,6 +1045,12 @@ static int irq_thread(void *data) if (action_ret == IRQ_WAKE_THREAD) irq_wake_secondary(desc, action); @@ -17203,7 +17608,7 @@ diff -Nur linux-4.4.13.orig/kernel/irq/manage.c linux-4.4.13/kernel/irq/manage.c wake_threads_waitq(desc); } -@@ -1315,6 +1404,9 @@ +@@ -1315,6 +1404,9 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new) irqd_set(&desc->irq_data, IRQD_NO_BALANCING); } @@ -17213,7 +17618,7 @@ diff -Nur linux-4.4.13.orig/kernel/irq/manage.c linux-4.4.13/kernel/irq/manage.c /* Set default affinity mask once everything is setup */ setup_affinity(desc, mask); -@@ -1968,7 +2060,7 @@ +@@ -1968,7 +2060,7 @@ EXPORT_SYMBOL_GPL(irq_get_irqchip_state); * This call sets the internal irqchip state of an interrupt, * depending on the value of @which. * @@ -17222,10 +17627,11 @@ diff -Nur linux-4.4.13.orig/kernel/irq/manage.c linux-4.4.13/kernel/irq/manage.c * interrupt controller has per-cpu registers. */ int irq_set_irqchip_state(unsigned int irq, enum irqchip_irq_state which, -diff -Nur linux-4.4.13.orig/kernel/irq/settings.h linux-4.4.13/kernel/irq/settings.h ---- linux-4.4.13.orig/kernel/irq/settings.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/irq/settings.h 2016-06-22 21:55:08.046523867 +0200 -@@ -16,6 +16,7 @@ +diff --git a/kernel/irq/settings.h b/kernel/irq/settings.h +index 320579d89091..2df2d4445b1e 100644 +--- a/kernel/irq/settings.h ++++ b/kernel/irq/settings.h +@@ -16,6 +16,7 @@ enum { _IRQ_PER_CPU_DEVID = IRQ_PER_CPU_DEVID, _IRQ_IS_POLLED = IRQ_IS_POLLED, _IRQ_DISABLE_UNLAZY = IRQ_DISABLE_UNLAZY, @@ -17233,7 +17639,7 @@ diff -Nur linux-4.4.13.orig/kernel/irq/settings.h linux-4.4.13/kernel/irq/settin _IRQF_MODIFY_MASK = IRQF_MODIFY_MASK, }; -@@ -30,6 +31,7 @@ +@@ -30,6 +31,7 @@ enum { #define IRQ_PER_CPU_DEVID GOT_YOU_MORON #define IRQ_IS_POLLED GOT_YOU_MORON #define IRQ_DISABLE_UNLAZY GOT_YOU_MORON @@ -17241,7 +17647,7 @@ diff -Nur linux-4.4.13.orig/kernel/irq/settings.h linux-4.4.13/kernel/irq/settin #undef IRQF_MODIFY_MASK #define IRQF_MODIFY_MASK GOT_YOU_MORON -@@ -40,6 +42,16 @@ +@@ -40,6 +42,16 @@ irq_settings_clr_and_set(struct irq_desc *desc, u32 clr, u32 set) desc->status_use_accessors |= (set & _IRQF_MODIFY_MASK); } @@ -17258,10 +17664,11 @@ diff -Nur linux-4.4.13.orig/kernel/irq/settings.h linux-4.4.13/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.4.13.orig/kernel/irq/spurious.c linux-4.4.13/kernel/irq/spurious.c ---- linux-4.4.13.orig/kernel/irq/spurious.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/irq/spurious.c 2016-06-22 21:55:08.050523867 +0200 -@@ -444,6 +444,10 @@ +diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c +index 32144175458d..ed26f2554972 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) { @@ -17272,7 +17679,7 @@ diff -Nur linux-4.4.13.orig/kernel/irq/spurious.c linux-4.4.13/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) { @@ -17283,9 +17690,10 @@ diff -Nur linux-4.4.13.orig/kernel/irq/spurious.c linux-4.4.13/kernel/irq/spurio irqfixup = 2; printk(KERN_WARNING "Misrouted IRQ fixup and polling support " "enabled\n"); -diff -Nur linux-4.4.13.orig/kernel/irq_work.c linux-4.4.13/kernel/irq_work.c ---- linux-4.4.13.orig/kernel/irq_work.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/irq_work.c 2016-06-22 21:55:08.050523867 +0200 +diff --git a/kernel/irq_work.c b/kernel/irq_work.c +index bcf107ce0854..2899ba0d23d1 100644 +--- a/kernel/irq_work.c ++++ b/kernel/irq_work.c @@ -17,6 +17,7 @@ #include <linux/cpu.h> #include <linux/notifier.h> @@ -17294,7 +17702,7 @@ diff -Nur linux-4.4.13.orig/kernel/irq_work.c linux-4.4.13/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) { @@ -17303,7 +17711,7 @@ diff -Nur linux-4.4.13.orig/kernel/irq_work.c linux-4.4.13/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; @@ -17317,7 +17725,7 @@ diff -Nur linux-4.4.13.orig/kernel/irq_work.c linux-4.4.13/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) { @@ -17327,7 +17735,7 @@ diff -Nur linux-4.4.13.orig/kernel/irq_work.c linux-4.4.13/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(); @@ -17350,7 +17758,7 @@ diff -Nur linux-4.4.13.orig/kernel/irq_work.c linux-4.4.13/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); @@ -17362,7 +17770,7 @@ diff -Nur linux-4.4.13.orig/kernel/irq_work.c linux-4.4.13/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; @@ -17371,7 +17779,7 @@ diff -Nur linux-4.4.13.orig/kernel/irq_work.c linux-4.4.13/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)); @@ -17389,7 +17797,7 @@ diff -Nur linux-4.4.13.orig/kernel/irq_work.c linux-4.4.13/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); @@ -17407,82 +17815,11 @@ diff -Nur linux-4.4.13.orig/kernel/irq_work.c linux-4.4.13/kernel/irq_work.c /* * Synchronize against the irq_work @entry, ensures the entry is not -diff -Nur linux-4.4.13.orig/kernel/Kconfig.locks linux-4.4.13/kernel/Kconfig.locks ---- linux-4.4.13.orig/kernel/Kconfig.locks 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/Kconfig.locks 2016-06-22 21:55:08.050523867 +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.4.13.orig/kernel/Kconfig.preempt linux-4.4.13/kernel/Kconfig.preempt ---- linux-4.4.13.orig/kernel/Kconfig.preempt 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/Kconfig.preempt 2016-06-22 21:55:08.050523867 +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.4.13.orig/kernel/ksysfs.c linux-4.4.13/kernel/ksysfs.c ---- linux-4.4.13.orig/kernel/ksysfs.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/ksysfs.c 2016-06-22 21:55:08.050523867 +0200 -@@ -136,6 +136,15 @@ +diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c +index e83b26464061..c0e08d1cf33e 100644 +--- a/kernel/ksysfs.c ++++ b/kernel/ksysfs.c +@@ -136,6 +136,15 @@ KERNEL_ATTR_RO(vmcoreinfo); #endif /* CONFIG_KEXEC_CORE */ @@ -17498,7 +17835,7 @@ diff -Nur linux-4.4.13.orig/kernel/ksysfs.c linux-4.4.13/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, @@ -17508,9 +17845,44 @@ diff -Nur linux-4.4.13.orig/kernel/ksysfs.c linux-4.4.13/kernel/ksysfs.c NULL }; -diff -Nur linux-4.4.13.orig/kernel/locking/lglock.c linux-4.4.13/kernel/locking/lglock.c ---- linux-4.4.13.orig/kernel/locking/lglock.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/locking/lglock.c 2016-06-22 21:55:08.050523867 +0200 +diff --git a/kernel/locking/Makefile b/kernel/locking/Makefile +index 8e96f6cc2a4a..447b03082d88 100644 +--- a/kernel/locking/Makefile ++++ b/kernel/locking/Makefile +@@ -1,5 +1,5 @@ + +-obj-y += mutex.o semaphore.o rwsem.o percpu-rwsem.o ++obj-y += semaphore.o percpu-rwsem.o + + ifdef CONFIG_FUNCTION_TRACER + CFLAGS_REMOVE_lockdep.o = $(CC_FLAGS_FTRACE) +@@ -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,7 +26,10 @@ obj-$(CONFIG_RT_MUTEXES) += rtmutex.o + obj-$(CONFIG_DEBUG_RT_MUTEXES) += rtmutex-debug.o + obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock.o + obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock_debug.o ++ifneq ($(CONFIG_PREEMPT_RT_FULL),y) + obj-$(CONFIG_RWSEM_GENERIC_SPINLOCK) += rwsem-spinlock.o + obj-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += rwsem-xadd.o ++endif ++obj-$(CONFIG_PREEMPT_RT_FULL) += rt.o + obj-$(CONFIG_QUEUED_RWLOCKS) += qrwlock.o + obj-$(CONFIG_LOCK_TORTURE_TEST) += locktorture.o +diff --git a/kernel/locking/lglock.c b/kernel/locking/lglock.c +index 951cfcd10b4a..57e0ea72c28a 100644 +--- a/kernel/locking/lglock.c ++++ b/kernel/locking/lglock.c @@ -4,6 +4,15 @@ #include <linux/cpu.h> #include <linux/string.h> @@ -17600,7 +17972,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/lglock.c linux-4.4.13/kernel/locking/ } EXPORT_SYMBOL(lg_local_unlock_cpu); -@@ -68,30 +86,30 @@ +@@ -68,30 +86,30 @@ void lg_double_lock(struct lglock *lg, int cpu1, int cpu2) if (cpu2 < cpu1) swap(cpu1, cpu2); @@ -17640,7 +18012,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/lglock.c linux-4.4.13/kernel/locking/ } } EXPORT_SYMBOL(lg_global_lock); -@@ -102,10 +120,35 @@ +@@ -102,10 +120,35 @@ void lg_global_unlock(struct lglock *lg) lock_release(&lg->lock_dep_map, 1, _RET_IP_); for_each_possible_cpu(i) { @@ -17679,10 +18051,11 @@ diff -Nur linux-4.4.13.orig/kernel/locking/lglock.c linux-4.4.13/kernel/locking/ + } +} +#endif -diff -Nur linux-4.4.13.orig/kernel/locking/lockdep.c linux-4.4.13/kernel/locking/lockdep.c ---- linux-4.4.13.orig/kernel/locking/lockdep.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/locking/lockdep.c 2016-06-22 21:55:08.050523867 +0200 -@@ -3525,6 +3525,7 @@ +diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c +index 60ace56618f6..e98ee958a353 100644 +--- a/kernel/locking/lockdep.c ++++ b/kernel/locking/lockdep.c +@@ -3525,6 +3525,7 @@ static void check_flags(unsigned long flags) } } @@ -17690,7 +18063,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/lockdep.c linux-4.4.13/kernel/locking /* * We dont accurately track softirq state in e.g. * hardirq contexts (such as on 4KSTACKS), so only -@@ -3539,6 +3540,7 @@ +@@ -3539,6 +3540,7 @@ static void check_flags(unsigned long flags) DEBUG_LOCKS_WARN_ON(!current->softirqs_enabled); } } @@ -17698,9 +18071,10 @@ diff -Nur linux-4.4.13.orig/kernel/locking/lockdep.c linux-4.4.13/kernel/locking if (!debug_locks) print_irqtrace_events(current); -diff -Nur linux-4.4.13.orig/kernel/locking/locktorture.c linux-4.4.13/kernel/locking/locktorture.c ---- linux-4.4.13.orig/kernel/locking/locktorture.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/locking/locktorture.c 2016-06-22 21:55:08.050523867 +0200 +diff --git a/kernel/locking/locktorture.c b/kernel/locking/locktorture.c +index 8ef1919d63b2..291fc19e28e0 100644 +--- a/kernel/locking/locktorture.c ++++ b/kernel/locking/locktorture.c @@ -26,7 +26,6 @@ #include <linux/kthread.h> #include <linux/sched/rt.h> @@ -17709,42 +18083,11 @@ diff -Nur linux-4.4.13.orig/kernel/locking/locktorture.c linux-4.4.13/kernel/loc #include <linux/mutex.h> #include <linux/rwsem.h> #include <linux/smp.h> -diff -Nur linux-4.4.13.orig/kernel/locking/Makefile linux-4.4.13/kernel/locking/Makefile ---- linux-4.4.13.orig/kernel/locking/Makefile 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/locking/Makefile 2016-06-22 21:55:08.050523867 +0200 -@@ -1,5 +1,5 @@ - --obj-y += mutex.o semaphore.o rwsem.o percpu-rwsem.o -+obj-y += semaphore.o percpu-rwsem.o - - ifdef CONFIG_FUNCTION_TRACER - CFLAGS_REMOVE_lockdep.o = $(CC_FLAGS_FTRACE) -@@ -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,7 +26,10 @@ - obj-$(CONFIG_DEBUG_RT_MUTEXES) += rtmutex-debug.o - obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock.o - obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock_debug.o -+ifneq ($(CONFIG_PREEMPT_RT_FULL),y) - obj-$(CONFIG_RWSEM_GENERIC_SPINLOCK) += rwsem-spinlock.o - obj-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += rwsem-xadd.o -+endif -+obj-$(CONFIG_PREEMPT_RT_FULL) += rt.o - obj-$(CONFIG_QUEUED_RWLOCKS) += qrwlock.o - obj-$(CONFIG_LOCK_TORTURE_TEST) += locktorture.o -diff -Nur linux-4.4.13.orig/kernel/locking/rt.c linux-4.4.13/kernel/locking/rt.c ---- linux-4.4.13.orig/kernel/locking/rt.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-4.4.13/kernel/locking/rt.c 2016-06-22 21:55:08.050523867 +0200 +diff --git a/kernel/locking/rt.c b/kernel/locking/rt.c +new file mode 100644 +index 000000000000..d4ab61c1848b +--- /dev/null ++++ b/kernel/locking/rt.c @@ -0,0 +1,474 @@ +/* + * kernel/rt.c @@ -18220,9 +18563,10 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rt.c linux-4.4.13/kernel/locking/rt.c + return 1; +} +EXPORT_SYMBOL(atomic_dec_and_mutex_lock); -diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex.c linux-4.4.13/kernel/locking/rtmutex.c ---- linux-4.4.13.orig/kernel/locking/rtmutex.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/locking/rtmutex.c 2016-06-22 21:55:08.050523867 +0200 +diff --git a/kernel/locking/rtmutex.c b/kernel/locking/rtmutex.c +index 8251e75dd9c0..fde5e54f1096 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 @@ -18243,7 +18587,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex.c linux-4.4.13/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); } @@ -18256,7 +18600,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex.c linux-4.4.13/kernel/locking /* * We can speed up the acquire/release, if there's no debugging state to be * set up. -@@ -99,13 +111,14 @@ +@@ -99,13 +111,14 @@ static inline void mark_rt_mutex_waiters(struct rt_mutex *lock) * 2) Drop lock->wait_lock * 3) Try to unlock the lock with cmpxchg */ @@ -18273,7 +18617,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex.c linux-4.4.13/kernel/locking /* * If a new waiter comes in between the unlock and the cmpxchg * we have two situations: -@@ -147,11 +160,12 @@ +@@ -147,11 +160,12 @@ static inline void mark_rt_mutex_waiters(struct rt_mutex *lock) /* * Simple slow path only version: lock->owner is protected by lock->wait_lock. */ @@ -18288,7 +18632,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex.c linux-4.4.13/kernel/locking return true; } #endif -@@ -348,6 +362,14 @@ +@@ -348,6 +362,14 @@ static bool rt_mutex_cond_detect_deadlock(struct rt_mutex_waiter *waiter, return debug_rt_mutex_detect_deadlock(waiter, chwalk); } @@ -18303,7 +18647,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex.c linux-4.4.13/kernel/locking /* * Max number of times we'll walk the boosting chain: */ -@@ -355,7 +377,8 @@ +@@ -355,7 +377,8 @@ int max_lock_depth = 1024; static inline struct rt_mutex *task_blocked_on_lock(struct task_struct *p) { @@ -18313,7 +18657,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex.c linux-4.4.13/kernel/locking } /* -@@ -433,7 +456,6 @@ +@@ -433,7 +456,6 @@ static int rt_mutex_adjust_prio_chain(struct task_struct *task, int ret = 0, depth = 0; struct rt_mutex *lock; bool detect_deadlock; @@ -18321,7 +18665,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex.c linux-4.4.13/kernel/locking bool requeue = true; detect_deadlock = rt_mutex_cond_detect_deadlock(orig_waiter, chwalk); -@@ -476,7 +498,7 @@ +@@ -476,7 +498,7 @@ static int rt_mutex_adjust_prio_chain(struct task_struct *task, /* * [1] Task cannot go away as we did a get_task() before ! */ @@ -18330,7 +18674,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex.c linux-4.4.13/kernel/locking /* * [2] Get the waiter on which @task is blocked on. -@@ -492,7 +514,7 @@ +@@ -492,7 +514,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. */ @@ -18339,7 +18683,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex.c linux-4.4.13/kernel/locking goto out_unlock_pi; /* -@@ -560,7 +582,7 @@ +@@ -560,7 +582,7 @@ static int rt_mutex_adjust_prio_chain(struct task_struct *task, * operations. */ if (!raw_spin_trylock(&lock->wait_lock)) { @@ -18348,7 +18692,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex.c linux-4.4.13/kernel/locking cpu_relax(); goto retry; } -@@ -591,7 +613,7 @@ +@@ -591,7 +613,7 @@ static int rt_mutex_adjust_prio_chain(struct task_struct *task, /* * No requeue[7] here. Just release @task [8] */ @@ -18357,7 +18701,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex.c linux-4.4.13/kernel/locking put_task_struct(task); /* -@@ -599,14 +621,14 @@ +@@ -599,14 +621,14 @@ static int rt_mutex_adjust_prio_chain(struct task_struct *task, * If there is no owner of the lock, end of chain. */ if (!rt_mutex_owner(lock)) { @@ -18374,7 +18718,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex.c linux-4.4.13/kernel/locking /* * No requeue [11] here. We just do deadlock detection. -@@ -621,8 +643,8 @@ +@@ -621,8 +643,8 @@ static int rt_mutex_adjust_prio_chain(struct task_struct *task, top_waiter = rt_mutex_top_waiter(lock); /* [13] Drop locks */ @@ -18385,7 +18729,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex.c linux-4.4.13/kernel/locking /* If owner is not blocked, end of chain. */ if (!next_lock) -@@ -643,7 +665,7 @@ +@@ -643,7 +665,7 @@ static int rt_mutex_adjust_prio_chain(struct task_struct *task, rt_mutex_enqueue(lock, waiter); /* [8] Release the task */ @@ -18394,7 +18738,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex.c linux-4.4.13/kernel/locking put_task_struct(task); /* -@@ -654,21 +676,24 @@ +@@ -654,21 +676,24 @@ 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)) { @@ -18423,7 +18767,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex.c linux-4.4.13/kernel/locking /* [11] requeue the pi waiters if necessary */ if (waiter == rt_mutex_top_waiter(lock)) { -@@ -722,8 +747,8 @@ +@@ -722,8 +747,8 @@ static int rt_mutex_adjust_prio_chain(struct task_struct *task, top_waiter = rt_mutex_top_waiter(lock); /* [13] Drop the locks */ @@ -18434,7 +18778,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex.c linux-4.4.13/kernel/locking /* * Make the actual exit decisions [12], based on the stored -@@ -746,28 +771,46 @@ +@@ -746,28 +771,46 @@ static int rt_mutex_adjust_prio_chain(struct task_struct *task, goto again; out_unlock_pi: @@ -18487,7 +18831,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex.c linux-4.4.13/kernel/locking /* * Before testing whether we can acquire @lock, we set the * RT_MUTEX_HAS_WAITERS bit in @lock->owner. This forces all -@@ -803,8 +846,10 @@ +@@ -803,8 +846,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. */ @@ -18499,7 +18843,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex.c linux-4.4.13/kernel/locking /* * We can acquire the lock. Remove the waiter from the -@@ -822,14 +867,10 @@ +@@ -822,14 +867,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)) { @@ -18517,7 +18861,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex.c linux-4.4.13/kernel/locking /* * The current top waiter stays enqueued. We * don't have to change anything in the lock -@@ -852,7 +893,7 @@ +@@ -852,7 +893,7 @@ static int try_to_take_rt_mutex(struct rt_mutex *lock, struct task_struct *task, * case, but conditionals are more expensive than a redundant * store. */ @@ -18526,7 +18870,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex.c linux-4.4.13/kernel/locking task->pi_blocked_on = NULL; /* * Finish the lock acquisition. @task is the new owner. If -@@ -861,7 +902,7 @@ +@@ -861,7 +902,7 @@ static int try_to_take_rt_mutex(struct rt_mutex *lock, struct task_struct *task, */ if (rt_mutex_has_waiters(lock)) rt_mutex_enqueue_pi(task, rt_mutex_top_waiter(lock)); @@ -18535,7 +18879,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex.c linux-4.4.13/kernel/locking takeit: /* We got the lock. */ -@@ -878,12 +919,405 @@ +@@ -878,12 +919,405 @@ takeit: return 1; } @@ -18942,7 +19286,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex.c linux-4.4.13/kernel/locking */ static int task_blocks_on_rt_mutex(struct rt_mutex *lock, struct rt_mutex_waiter *waiter, -@@ -894,7 +1328,6 @@ +@@ -894,7 +1328,6 @@ static int task_blocks_on_rt_mutex(struct rt_mutex *lock, struct rt_mutex_waiter *top_waiter = waiter; struct rt_mutex *next_lock; int chain_walk = 0, res; @@ -18950,7 +19294,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex.c linux-4.4.13/kernel/locking /* * Early deadlock detection. We really don't want the task to -@@ -908,7 +1341,24 @@ +@@ -908,7 +1341,24 @@ static int task_blocks_on_rt_mutex(struct rt_mutex *lock, if (owner == task) return -EDEADLK; @@ -18976,7 +19320,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex.c linux-4.4.13/kernel/locking __rt_mutex_adjust_prio(task); waiter->task = task; waiter->lock = lock; -@@ -921,18 +1371,18 @@ +@@ -921,18 +1371,18 @@ static int task_blocks_on_rt_mutex(struct rt_mutex *lock, task->pi_blocked_on = waiter; @@ -18998,7 +19342,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex.c linux-4.4.13/kernel/locking chain_walk = 1; } else if (rt_mutex_cond_detect_deadlock(waiter, chwalk)) { chain_walk = 1; -@@ -941,7 +1391,7 @@ +@@ -941,7 +1391,7 @@ static int task_blocks_on_rt_mutex(struct rt_mutex *lock, /* Store the lock on which owner is blocked or NULL */ next_lock = task_blocked_on_lock(owner); @@ -19007,7 +19351,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex.c linux-4.4.13/kernel/locking /* * Even if full deadlock detection is on, if the owner is not * blocked itself, we can avoid finding this out in the chain -@@ -957,12 +1407,12 @@ +@@ -957,12 +1407,12 @@ static int task_blocks_on_rt_mutex(struct rt_mutex *lock, */ get_task_struct(owner); @@ -19022,7 +19366,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex.c linux-4.4.13/kernel/locking return res; } -@@ -971,15 +1421,15 @@ +@@ -971,15 +1421,15 @@ static int task_blocks_on_rt_mutex(struct rt_mutex *lock, * Remove the top waiter from the current tasks pi waiter tree and * queue it up. * @@ -19041,7 +19385,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex.c linux-4.4.13/kernel/locking waiter = rt_mutex_top_waiter(lock); -@@ -1001,15 +1451,18 @@ +@@ -1001,15 +1451,18 @@ static void mark_wakeup_next_waiter(struct wake_q_head *wake_q, */ lock->owner = (void *) RT_MUTEX_HAS_WAITERS; @@ -19063,7 +19407,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex.c linux-4.4.13/kernel/locking * have just failed to try_to_take_rt_mutex(). */ static void remove_waiter(struct rt_mutex *lock, -@@ -1017,13 +1470,12 @@ +@@ -1017,13 +1470,12 @@ 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); @@ -19080,7 +19424,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex.c linux-4.4.13/kernel/locking /* * Only update priority if the waiter was the highest priority -@@ -1032,7 +1484,7 @@ +@@ -1032,7 +1484,7 @@ static void remove_waiter(struct rt_mutex *lock, if (!owner || !is_top_waiter) return; @@ -19089,7 +19433,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex.c linux-4.4.13/kernel/locking rt_mutex_dequeue_pi(owner, waiter); -@@ -1042,9 +1494,10 @@ +@@ -1042,9 +1494,10 @@ static void remove_waiter(struct rt_mutex *lock, __rt_mutex_adjust_prio(owner); /* Store the lock on which owner is blocked or NULL */ @@ -19102,7 +19446,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex.c linux-4.4.13/kernel/locking /* * Don't walk the chain, if the owner task is not blocked -@@ -1056,12 +1509,12 @@ +@@ -1056,12 +1509,12 @@ static void remove_waiter(struct rt_mutex *lock, /* gets dropped in rt_mutex_adjust_prio_chain()! */ get_task_struct(owner); @@ -19117,7 +19461,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex.c linux-4.4.13/kernel/locking } /* -@@ -1078,17 +1531,17 @@ +@@ -1078,17 +1531,17 @@ void rt_mutex_adjust_pi(struct task_struct *task) raw_spin_lock_irqsave(&task->pi_lock, flags); waiter = task->pi_blocked_on; @@ -19137,7 +19481,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex.c linux-4.4.13/kernel/locking rt_mutex_adjust_prio_chain(task, RT_MUTEX_MIN_CHAINWALK, NULL, next_lock, NULL, task); } -@@ -1097,16 +1550,17 @@ +@@ -1097,16 +1550,17 @@ void rt_mutex_adjust_pi(struct task_struct *task) * __rt_mutex_slowlock() - Perform the wait-wake-try-to-take loop * @lock: the rt_mutex to take * @state: the state the task should block in (TASK_INTERRUPTIBLE @@ -19158,7 +19502,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex.c linux-4.4.13/kernel/locking { int ret = 0; -@@ -1129,13 +1583,19 @@ +@@ -1129,13 +1583,19 @@ __rt_mutex_slowlock(struct rt_mutex *lock, int state, break; } @@ -19180,7 +19524,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex.c linux-4.4.13/kernel/locking set_current_state(state); } -@@ -1163,26 +1623,112 @@ +@@ -1163,26 +1623,112 @@ static void rt_mutex_handle_deadlock(int res, int detect_deadlock, } } @@ -19299,7 +19643,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex.c linux-4.4.13/kernel/locking return 0; } -@@ -1196,13 +1742,23 @@ +@@ -1196,13 +1742,23 @@ rt_mutex_slowlock(struct rt_mutex *lock, int state, if (likely(!ret)) /* sleep on the mutex */ @@ -19325,7 +19669,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex.c linux-4.4.13/kernel/locking } /* -@@ -1211,7 +1767,7 @@ +@@ -1211,7 +1767,7 @@ rt_mutex_slowlock(struct rt_mutex *lock, int state, */ fixup_rt_mutex_waiters(lock); @@ -19334,7 +19678,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex.c linux-4.4.13/kernel/locking /* Remove pending timer: */ if (unlikely(timeout)) -@@ -1227,6 +1783,7 @@ +@@ -1227,6 +1783,7 @@ rt_mutex_slowlock(struct rt_mutex *lock, int state, */ static inline int rt_mutex_slowtrylock(struct rt_mutex *lock) { @@ -19342,7 +19686,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex.c linux-4.4.13/kernel/locking int ret; /* -@@ -1238,10 +1795,10 @@ +@@ -1238,10 +1795,10 @@ static inline int rt_mutex_slowtrylock(struct rt_mutex *lock) return 0; /* @@ -19356,7 +19700,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex.c linux-4.4.13/kernel/locking ret = try_to_take_rt_mutex(lock, current, NULL); -@@ -1251,7 +1808,7 @@ +@@ -1251,7 +1808,7 @@ static inline int rt_mutex_slowtrylock(struct rt_mutex *lock) */ fixup_rt_mutex_waiters(lock); @@ -19365,7 +19709,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex.c linux-4.4.13/kernel/locking return ret; } -@@ -1261,9 +1818,13 @@ +@@ -1261,9 +1818,13 @@ static inline int rt_mutex_slowtrylock(struct rt_mutex *lock) * Return whether the current task needs to undo a potential priority boosting. */ static bool __sched rt_mutex_slowunlock(struct rt_mutex *lock, @@ -19381,7 +19725,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex.c linux-4.4.13/kernel/locking debug_rt_mutex_unlock(lock); -@@ -1302,10 +1863,10 @@ +@@ -1302,10 +1863,10 @@ static bool __sched rt_mutex_slowunlock(struct rt_mutex *lock, */ while (!rt_mutex_has_waiters(lock)) { /* Drops lock->wait_lock ! */ @@ -19394,7 +19738,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex.c linux-4.4.13/kernel/locking } /* -@@ -1314,9 +1875,9 @@ +@@ -1314,9 +1875,9 @@ static bool __sched rt_mutex_slowunlock(struct rt_mutex *lock, * * Queue the next waiter for wakeup once we release the wait_lock. */ @@ -19406,7 +19750,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex.c linux-4.4.13/kernel/locking /* check PI boosting */ return true; -@@ -1330,31 +1891,36 @@ +@@ -1330,31 +1891,36 @@ static bool __sched rt_mutex_slowunlock(struct rt_mutex *lock, */ static inline int rt_mutex_fastlock(struct rt_mutex *lock, int state, @@ -19447,7 +19791,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex.c linux-4.4.13/kernel/locking } static inline int -@@ -1371,17 +1937,20 @@ +@@ -1371,17 +1937,20 @@ rt_mutex_fasttrylock(struct rt_mutex *lock, static inline void rt_mutex_fastunlock(struct rt_mutex *lock, bool (*slowfn)(struct rt_mutex *lock, @@ -19470,7 +19814,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex.c linux-4.4.13/kernel/locking /* Undo pi boosting if necessary: */ if (deboost) -@@ -1398,7 +1967,7 @@ +@@ -1398,7 +1967,7 @@ void __sched rt_mutex_lock(struct rt_mutex *lock) { might_sleep(); @@ -19479,7 +19823,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex.c linux-4.4.13/kernel/locking } EXPORT_SYMBOL_GPL(rt_mutex_lock); -@@ -1415,7 +1984,7 @@ +@@ -1415,7 +1984,7 @@ int __sched rt_mutex_lock_interruptible(struct rt_mutex *lock) { might_sleep(); @@ -19488,7 +19832,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex.c linux-4.4.13/kernel/locking } EXPORT_SYMBOL_GPL(rt_mutex_lock_interruptible); -@@ -1428,11 +1997,30 @@ +@@ -1428,11 +1997,30 @@ int rt_mutex_timed_futex_lock(struct rt_mutex *lock, might_sleep(); return rt_mutex_timed_fastlock(lock, TASK_INTERRUPTIBLE, timeout, @@ -19520,7 +19864,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex.c linux-4.4.13/kernel/locking * rt_mutex_timed_lock - lock a rt_mutex interruptible * the timeout structure is provided * by the caller -@@ -1452,6 +2040,7 @@ +@@ -1452,6 +2040,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, @@ -19528,7 +19872,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex.c linux-4.4.13/kernel/locking rt_mutex_slowlock); } EXPORT_SYMBOL_GPL(rt_mutex_timed_lock); -@@ -1469,7 +2058,11 @@ +@@ -1469,7 +2058,11 @@ EXPORT_SYMBOL_GPL(rt_mutex_timed_lock); */ int __sched rt_mutex_trylock(struct rt_mutex *lock) { @@ -19540,7 +19884,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex.c linux-4.4.13/kernel/locking return 0; return rt_mutex_fasttrylock(lock, rt_mutex_slowtrylock); -@@ -1495,13 +2088,14 @@ +@@ -1495,13 +2088,14 @@ EXPORT_SYMBOL_GPL(rt_mutex_unlock); * required or not. */ bool __sched rt_mutex_futex_unlock(struct rt_mutex *lock, @@ -19557,7 +19901,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex.c linux-4.4.13/kernel/locking } /** -@@ -1534,13 +2128,12 @@ +@@ -1534,13 +2128,12 @@ EXPORT_SYMBOL_GPL(rt_mutex_destroy); void __rt_mutex_init(struct rt_mutex *lock, const char *name) { lock->owner = NULL; @@ -19572,7 +19916,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex.c linux-4.4.13/kernel/locking /** * rt_mutex_init_proxy_locked - initialize and lock a rt_mutex on behalf of a -@@ -1555,7 +2148,7 @@ +@@ -1555,7 +2148,7 @@ EXPORT_SYMBOL_GPL(__rt_mutex_init); void rt_mutex_init_proxy_locked(struct rt_mutex *lock, struct task_struct *proxy_owner) { @@ -19581,7 +19925,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex.c linux-4.4.13/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); -@@ -1596,13 +2189,42 @@ +@@ -1596,13 +2189,42 @@ int rt_mutex_start_proxy_lock(struct rt_mutex *lock, { int ret; @@ -19626,7 +19970,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex.c linux-4.4.13/kernel/locking /* We enforce deadlock detection for futexes */ ret = task_blocks_on_rt_mutex(lock, waiter, task, RT_MUTEX_FULL_CHAINWALK); -@@ -1617,10 +2239,10 @@ +@@ -1617,10 +2239,10 @@ int rt_mutex_start_proxy_lock(struct rt_mutex *lock, ret = 0; } @@ -19639,7 +19983,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex.c linux-4.4.13/kernel/locking debug_rt_mutex_print_deadlock(waiter); -@@ -1668,12 +2290,12 @@ +@@ -1668,12 +2290,12 @@ int rt_mutex_finish_proxy_lock(struct rt_mutex *lock, { int ret; @@ -19654,7 +19998,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex.c linux-4.4.13/kernel/locking if (unlikely(ret)) remove_waiter(lock, waiter); -@@ -1684,7 +2306,93 @@ +@@ -1684,7 +2306,93 @@ int rt_mutex_finish_proxy_lock(struct rt_mutex *lock, */ fixup_rt_mutex_waiters(lock); @@ -19749,10 +20093,11 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex.c linux-4.4.13/kernel/locking +} +EXPORT_SYMBOL(ww_mutex_unlock); +#endif -diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex_common.h linux-4.4.13/kernel/locking/rtmutex_common.h ---- linux-4.4.13.orig/kernel/locking/rtmutex_common.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/locking/rtmutex_common.h 2016-06-22 21:55:08.050523867 +0200 -@@ -27,6 +27,7 @@ +diff --git a/kernel/locking/rtmutex_common.h b/kernel/locking/rtmutex_common.h +index 4f5f83c7d2d3..289f062f26cd 100644 +--- a/kernel/locking/rtmutex_common.h ++++ b/kernel/locking/rtmutex_common.h +@@ -27,6 +27,7 @@ struct rt_mutex_waiter { struct rb_node pi_tree_entry; struct task_struct *task; struct rt_mutex *lock; @@ -19760,7 +20105,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex_common.h linux-4.4.13/kernel/ #ifdef CONFIG_DEBUG_RT_MUTEXES unsigned long ip; struct pid *deadlock_task_pid; -@@ -97,6 +98,9 @@ +@@ -97,6 +98,9 @@ enum rtmutex_chainwalk { /* * PI-futex support (proxy locking functions, etc.): */ @@ -19770,7 +20115,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex_common.h linux-4.4.13/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); -@@ -110,7 +114,8 @@ +@@ -110,7 +114,8 @@ 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); extern bool rt_mutex_futex_unlock(struct rt_mutex *lock, @@ -19780,7 +20125,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex_common.h linux-4.4.13/kernel/ extern void rt_mutex_adjust_prio(struct task_struct *task); #ifdef CONFIG_DEBUG_RT_MUTEXES -@@ -119,4 +124,14 @@ +@@ -119,4 +124,14 @@ extern void rt_mutex_adjust_prio(struct task_struct *task); # include "rtmutex.h" #endif @@ -19795,10 +20140,11 @@ diff -Nur linux-4.4.13.orig/kernel/locking/rtmutex_common.h linux-4.4.13/kernel/ +} + #endif -diff -Nur linux-4.4.13.orig/kernel/locking/spinlock.c linux-4.4.13/kernel/locking/spinlock.c ---- linux-4.4.13.orig/kernel/locking/spinlock.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/locking/spinlock.c 2016-06-22 21:55:08.050523867 +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); @@ -19810,7 +20156,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/spinlock.c linux-4.4.13/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 @@ -19819,7 +20165,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/spinlock.c linux-4.4.13/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 @@ -19828,10 +20174,11 @@ diff -Nur linux-4.4.13.orig/kernel/locking/spinlock.c linux-4.4.13/kernel/lockin #ifdef CONFIG_DEBUG_LOCK_ALLOC void __lockfunc _raw_spin_lock_nested(raw_spinlock_t *lock, int subclass) -diff -Nur linux-4.4.13.orig/kernel/locking/spinlock_debug.c linux-4.4.13/kernel/locking/spinlock_debug.c ---- linux-4.4.13.orig/kernel/locking/spinlock_debug.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/locking/spinlock_debug.c 2016-06-22 21:55:08.050523867 +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); @@ -19839,7 +20186,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/spinlock_debug.c linux-4.4.13/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); @@ -19847,7 +20194,7 @@ diff -Nur linux-4.4.13.orig/kernel/locking/spinlock_debug.c linux-4.4.13/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); } @@ -19855,16 +20202,17 @@ diff -Nur linux-4.4.13.orig/kernel/locking/spinlock_debug.c linux-4.4.13/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.4.13.orig/kernel/panic.c linux-4.4.13/kernel/panic.c ---- linux-4.4.13.orig/kernel/panic.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/panic.c 2016-06-22 21:55:08.050523867 +0200 -@@ -61,6 +61,37 @@ +diff --git a/kernel/panic.c b/kernel/panic.c +index 41e2b54f36b5..3535f802953a 100644 +--- a/kernel/panic.c ++++ b/kernel/panic.c +@@ -61,6 +61,37 @@ void __weak panic_smp_self_stop(void) cpu_relax(); } @@ -19902,7 +20250,7 @@ diff -Nur linux-4.4.13.orig/kernel/panic.c linux-4.4.13/kernel/panic.c /** * panic - halt the system * @fmt: The text string to print -@@ -71,17 +102,17 @@ +@@ -71,17 +102,17 @@ void __weak panic_smp_self_stop(void) */ void panic(const char *fmt, ...) { @@ -19922,7 +20270,7 @@ diff -Nur linux-4.4.13.orig/kernel/panic.c linux-4.4.13/kernel/panic.c */ local_irq_disable(); -@@ -94,8 +125,16 @@ +@@ -94,8 +125,16 @@ void panic(const char *fmt, ...) * multiple parallel invocations of panic, all other CPUs either * stop themself or will wait until they are stopped by the 1st CPU * with smp_send_stop(). @@ -19940,7 +20288,7 @@ diff -Nur linux-4.4.13.orig/kernel/panic.c linux-4.4.13/kernel/panic.c panic_smp_self_stop(); console_verbose(); -@@ -400,9 +439,11 @@ +@@ -400,9 +439,11 @@ static u64 oops_id; static int init_oops_id(void) { @@ -19952,10 +20300,11 @@ diff -Nur linux-4.4.13.orig/kernel/panic.c linux-4.4.13/kernel/panic.c oops_id++; return 0; -diff -Nur linux-4.4.13.orig/kernel/power/hibernate.c linux-4.4.13/kernel/power/hibernate.c ---- linux-4.4.13.orig/kernel/power/hibernate.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/power/hibernate.c 2016-06-22 21:55:08.054523867 +0200 -@@ -285,6 +285,8 @@ +diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c +index b7dd5718836e..908ee58cc11c 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(); @@ -19964,7 +20313,7 @@ diff -Nur linux-4.4.13.orig/kernel/power/hibernate.c linux-4.4.13/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: @@ -19972,7 +20321,7 @@ diff -Nur linux-4.4.13.orig/kernel/power/hibernate.c linux-4.4.13/kernel/power/h local_irq_enable(); Enable_cpus: -@@ -438,6 +441,7 @@ +@@ -438,6 +441,7 @@ static int resume_target_kernel(bool platform_mode) goto Enable_cpus; local_irq_disable(); @@ -19980,7 +20329,7 @@ diff -Nur linux-4.4.13.orig/kernel/power/hibernate.c linux-4.4.13/kernel/power/h error = syscore_suspend(); if (error) -@@ -471,6 +475,7 @@ +@@ -471,6 +475,7 @@ static int resume_target_kernel(bool platform_mode) syscore_resume(); Enable_irqs: @@ -19988,7 +20337,7 @@ diff -Nur linux-4.4.13.orig/kernel/power/hibernate.c linux-4.4.13/kernel/power/h local_irq_enable(); Enable_cpus: -@@ -556,6 +561,7 @@ +@@ -556,6 +561,7 @@ int hibernation_platform_enter(void) goto Enable_cpus; local_irq_disable(); @@ -19996,7 +20345,7 @@ diff -Nur linux-4.4.13.orig/kernel/power/hibernate.c linux-4.4.13/kernel/power/h syscore_suspend(); if (pm_wakeup_pending()) { error = -EAGAIN; -@@ -568,6 +574,7 @@ +@@ -568,6 +574,7 @@ int hibernation_platform_enter(void) Power_up: syscore_resume(); @@ -20004,7 +20353,7 @@ diff -Nur linux-4.4.13.orig/kernel/power/hibernate.c linux-4.4.13/kernel/power/h local_irq_enable(); Enable_cpus: -@@ -642,6 +649,10 @@ +@@ -642,6 +649,10 @@ static void power_down(void) cpu_relax(); } @@ -20015,7 +20364,7 @@ diff -Nur linux-4.4.13.orig/kernel/power/hibernate.c linux-4.4.13/kernel/power/h /** * hibernate - Carry out system hibernation, including saving the image. */ -@@ -654,6 +665,8 @@ +@@ -654,6 +665,8 @@ int hibernate(void) return -EPERM; } @@ -20024,7 +20373,7 @@ diff -Nur linux-4.4.13.orig/kernel/power/hibernate.c linux-4.4.13/kernel/power/h lock_system_sleep(); /* The snapshot device should not be opened while we're running */ if (!atomic_add_unless(&snapshot_device_available, -1, 0)) { -@@ -719,6 +732,7 @@ +@@ -719,6 +732,7 @@ int hibernate(void) atomic_inc(&snapshot_device_available); Unlock: unlock_system_sleep(); @@ -20032,10 +20381,11 @@ diff -Nur linux-4.4.13.orig/kernel/power/hibernate.c linux-4.4.13/kernel/power/h return error; } -diff -Nur linux-4.4.13.orig/kernel/power/suspend.c linux-4.4.13/kernel/power/suspend.c ---- linux-4.4.13.orig/kernel/power/suspend.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/power/suspend.c 2016-06-22 21:55:08.054523867 +0200 -@@ -359,6 +359,8 @@ +diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c +index f9fe133c13e2..393bc342c586 100644 +--- a/kernel/power/suspend.c ++++ b/kernel/power/suspend.c +@@ -359,6 +359,8 @@ static int suspend_enter(suspend_state_t state, bool *wakeup) arch_suspend_disable_irqs(); BUG_ON(!irqs_disabled()); @@ -20044,7 +20394,7 @@ diff -Nur linux-4.4.13.orig/kernel/power/suspend.c linux-4.4.13/kernel/power/sus error = syscore_suspend(); if (!error) { *wakeup = pm_wakeup_pending(); -@@ -375,6 +377,8 @@ +@@ -375,6 +377,8 @@ static int suspend_enter(suspend_state_t state, bool *wakeup) syscore_resume(); } @@ -20053,7 +20403,7 @@ diff -Nur linux-4.4.13.orig/kernel/power/suspend.c linux-4.4.13/kernel/power/sus arch_suspend_enable_irqs(); BUG_ON(irqs_disabled()); -@@ -518,6 +522,8 @@ +@@ -518,6 +522,8 @@ static int enter_state(suspend_state_t state) return error; } @@ -20062,7 +20412,7 @@ diff -Nur linux-4.4.13.orig/kernel/power/suspend.c linux-4.4.13/kernel/power/sus /** * pm_suspend - Externally visible function for suspending the system. * @state: System sleep state to enter. -@@ -532,6 +538,8 @@ +@@ -532,6 +538,8 @@ int pm_suspend(suspend_state_t state) if (state <= PM_SUSPEND_ON || state >= PM_SUSPEND_MAX) return -EINVAL; @@ -20071,7 +20421,7 @@ diff -Nur linux-4.4.13.orig/kernel/power/suspend.c linux-4.4.13/kernel/power/sus error = enter_state(state); if (error) { suspend_stats.fail++; -@@ -539,6 +547,7 @@ +@@ -539,6 +547,7 @@ int pm_suspend(suspend_state_t state) } else { suspend_stats.success++; } @@ -20079,10 +20429,11 @@ diff -Nur linux-4.4.13.orig/kernel/power/suspend.c linux-4.4.13/kernel/power/sus return error; } EXPORT_SYMBOL(pm_suspend); -diff -Nur linux-4.4.13.orig/kernel/printk/printk.c linux-4.4.13/kernel/printk/printk.c ---- linux-4.4.13.orig/kernel/printk/printk.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/printk/printk.c 2016-06-22 21:55:08.054523867 +0200 -@@ -241,6 +241,65 @@ +diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c +index c048e34b177f..c747bdfa199e 100644 +--- a/kernel/printk/printk.c ++++ b/kernel/printk/printk.c +@@ -241,6 +241,65 @@ struct printk_log { */ static DEFINE_RAW_SPINLOCK(logbuf_lock); @@ -20148,7 +20499,7 @@ diff -Nur linux-4.4.13.orig/kernel/printk/printk.c linux-4.4.13/kernel/printk/pr #ifdef CONFIG_PRINTK DECLARE_WAIT_QUEUE_HEAD(log_wait); /* the next printk record to read by syslog(READ) or /proc/kmsg */ -@@ -1203,6 +1262,7 @@ +@@ -1203,6 +1262,7 @@ static int syslog_print_all(char __user *buf, int size, bool clear) { char *text; int len = 0; @@ -20156,7 +20507,7 @@ diff -Nur linux-4.4.13.orig/kernel/printk/printk.c linux-4.4.13/kernel/printk/pr text = kmalloc(LOG_LINE_MAX + PREFIX_MAX, GFP_KERNEL); if (!text) -@@ -1214,7 +1274,14 @@ +@@ -1214,7 +1274,14 @@ static int syslog_print_all(char __user *buf, int size, bool clear) u64 seq; u32 idx; enum log_flags prev; @@ -20172,7 +20523,7 @@ diff -Nur linux-4.4.13.orig/kernel/printk/printk.c linux-4.4.13/kernel/printk/pr if (clear_seq < log_first_seq) { /* messages are gone, move to first available one */ clear_seq = log_first_seq; -@@ -1235,6 +1302,14 @@ +@@ -1235,6 +1302,14 @@ static int syslog_print_all(char __user *buf, int size, bool clear) prev = msg->flags; idx = log_next(idx); seq++; @@ -20187,7 +20538,7 @@ diff -Nur linux-4.4.13.orig/kernel/printk/printk.c linux-4.4.13/kernel/printk/pr } /* move first record forward until length fits into the buffer */ -@@ -1248,6 +1323,14 @@ +@@ -1248,6 +1323,14 @@ static int syslog_print_all(char __user *buf, int size, bool clear) prev = msg->flags; idx = log_next(idx); seq++; @@ -20202,7 +20553,7 @@ diff -Nur linux-4.4.13.orig/kernel/printk/printk.c linux-4.4.13/kernel/printk/pr } /* last message fitting into this dump */ -@@ -1288,6 +1371,7 @@ +@@ -1288,6 +1371,7 @@ static int syslog_print_all(char __user *buf, int size, bool clear) clear_seq = log_next_seq; clear_idx = log_next_idx; } @@ -20210,7 +20561,7 @@ diff -Nur linux-4.4.13.orig/kernel/printk/printk.c linux-4.4.13/kernel/printk/pr raw_spin_unlock_irq(&logbuf_lock); kfree(text); -@@ -1443,6 +1527,12 @@ +@@ -1443,6 +1527,12 @@ static void call_console_drivers(int level, if (!console_drivers) return; @@ -20223,7 +20574,7 @@ diff -Nur linux-4.4.13.orig/kernel/printk/printk.c linux-4.4.13/kernel/printk/pr for_each_console(con) { if (exclusive_console && con != exclusive_console) continue; -@@ -1458,6 +1548,7 @@ +@@ -1458,6 +1548,7 @@ static void call_console_drivers(int level, else con->write(con, text, len); } @@ -20231,7 +20582,7 @@ diff -Nur linux-4.4.13.orig/kernel/printk/printk.c linux-4.4.13/kernel/printk/pr } /* -@@ -1518,6 +1609,15 @@ +@@ -1518,6 +1609,15 @@ static inline int can_use_console(unsigned int cpu) static int console_trylock_for_printk(void) { unsigned int cpu = smp_processor_id(); @@ -20247,7 +20598,7 @@ diff -Nur linux-4.4.13.orig/kernel/printk/printk.c linux-4.4.13/kernel/printk/pr if (!console_trylock()) return 0; -@@ -1672,6 +1772,13 @@ +@@ -1672,6 +1772,13 @@ asmlinkage int vprintk_emit(int facility, int level, /* cpu currently holding logbuf_lock in this function */ static unsigned int logbuf_cpu = UINT_MAX; @@ -20261,7 +20612,7 @@ diff -Nur linux-4.4.13.orig/kernel/printk/printk.c linux-4.4.13/kernel/printk/pr if (level == LOGLEVEL_SCHED) { level = LOGLEVEL_DEFAULT; in_sched = true; -@@ -1813,8 +1920,7 @@ +@@ -1813,8 +1920,7 @@ asmlinkage int vprintk_emit(int facility, int level, * console_sem which would prevent anyone from printing to * console */ @@ -20271,7 +20622,7 @@ diff -Nur linux-4.4.13.orig/kernel/printk/printk.c linux-4.4.13/kernel/printk/pr /* * Try to acquire and then immediately release the console * semaphore. The release will print out buffers and wake up -@@ -1822,7 +1928,7 @@ +@@ -1822,7 +1928,7 @@ asmlinkage int vprintk_emit(int facility, int level, */ if (console_trylock_for_printk()) console_unlock(); @@ -20280,7 +20631,7 @@ diff -Nur linux-4.4.13.orig/kernel/printk/printk.c linux-4.4.13/kernel/printk/pr lockdep_on(); } -@@ -1961,26 +2067,6 @@ +@@ -1961,26 +2067,6 @@ DEFINE_PER_CPU(printk_func_t, printk_func); #endif /* CONFIG_PRINTK */ @@ -20307,7 +20658,7 @@ diff -Nur linux-4.4.13.orig/kernel/printk/printk.c linux-4.4.13/kernel/printk/pr static int __add_preferred_console(char *name, int idx, char *options, char *brl_options) { -@@ -2202,11 +2288,16 @@ +@@ -2202,11 +2288,16 @@ static void console_cont_flush(char *text, size_t size) goto out; len = cont_print_text(text, size); @@ -20324,7 +20675,7 @@ diff -Nur linux-4.4.13.orig/kernel/printk/printk.c linux-4.4.13/kernel/printk/pr return; out: raw_spin_unlock_irqrestore(&logbuf_lock, flags); -@@ -2316,13 +2407,17 @@ +@@ -2316,13 +2407,17 @@ skip: console_idx = log_next(console_idx); console_seq++; console_prev = msg->flags; @@ -20343,7 +20694,7 @@ diff -Nur linux-4.4.13.orig/kernel/printk/printk.c linux-4.4.13/kernel/printk/pr if (do_cond_resched) cond_resched(); } -@@ -2374,6 +2469,11 @@ +@@ -2374,6 +2469,11 @@ void console_unblank(void) { struct console *c; @@ -20355,10 +20706,11 @@ diff -Nur linux-4.4.13.orig/kernel/printk/printk.c linux-4.4.13/kernel/printk/pr /* * console_unblank can no longer be called in interrupt context unless * oops_in_progress is set to 1.. -diff -Nur linux-4.4.13.orig/kernel/ptrace.c linux-4.4.13/kernel/ptrace.c ---- linux-4.4.13.orig/kernel/ptrace.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/ptrace.c 2016-06-22 21:55:08.054523867 +0200 -@@ -129,7 +129,14 @@ +diff --git a/kernel/ptrace.c b/kernel/ptrace.c +index 3189e51db7e8..1004af706be7 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)) { @@ -20374,10 +20726,11 @@ diff -Nur linux-4.4.13.orig/kernel/ptrace.c linux-4.4.13/kernel/ptrace.c ret = true; } spin_unlock_irq(&task->sighand->siglock); -diff -Nur linux-4.4.13.orig/kernel/rcu/rcutorture.c linux-4.4.13/kernel/rcu/rcutorture.c ---- linux-4.4.13.orig/kernel/rcu/rcutorture.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/rcu/rcutorture.c 2016-06-22 21:55:08.054523867 +0200 -@@ -390,6 +390,7 @@ +diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c +index d89328e260df..5bb3364a6284 100644 +--- a/kernel/rcu/rcutorture.c ++++ b/kernel/rcu/rcutorture.c +@@ -390,6 +390,7 @@ static struct rcu_torture_ops rcu_ops = { .name = "rcu" }; @@ -20385,7 +20738,7 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/rcutorture.c linux-4.4.13/kernel/rcu/rcut /* * Definitions for rcu_bh torture testing. */ -@@ -429,6 +430,12 @@ +@@ -429,6 +430,12 @@ static struct rcu_torture_ops rcu_bh_ops = { .name = "rcu_bh" }; @@ -20398,9 +20751,10 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/rcutorture.c linux-4.4.13/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.4.13.orig/kernel/rcu/tree.c linux-4.4.13/kernel/rcu/tree.c ---- linux-4.4.13.orig/kernel/rcu/tree.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/rcu/tree.c 2016-06-22 21:55:08.054523867 +0200 +diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c +index f07343b54fe5..d862a203fce0 100644 +--- a/kernel/rcu/tree.c ++++ b/kernel/rcu/tree.c @@ -56,6 +56,11 @@ #include <linux/random.h> #include <linux/trace_events.h> @@ -20413,7 +20767,7 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree.c linux-4.4.13/kernel/rcu/tree.c #include "tree.h" #include "rcu.h" -@@ -266,6 +271,19 @@ +@@ -266,6 +271,19 @@ void rcu_sched_qs(void) } } @@ -20433,7 +20787,7 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree.c linux-4.4.13/kernel/rcu/tree.c void rcu_bh_qs(void) { if (__this_cpu_read(rcu_bh_data.cpu_no_qs.s)) { -@@ -275,6 +293,7 @@ +@@ -275,6 +293,7 @@ void rcu_bh_qs(void) __this_cpu_write(rcu_bh_data.cpu_no_qs.b.norm, false); } } @@ -20441,7 +20795,7 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree.c linux-4.4.13/kernel/rcu/tree.c static DEFINE_PER_CPU(int, rcu_sched_qs_mask); -@@ -435,11 +454,13 @@ +@@ -435,11 +454,13 @@ EXPORT_SYMBOL_GPL(rcu_batches_started_sched); /* * Return the number of RCU BH batches started thus far for debug & stats. */ @@ -20455,7 +20809,7 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree.c linux-4.4.13/kernel/rcu/tree.c /* * Return the number of RCU batches completed thus far for debug & stats. -@@ -459,6 +480,7 @@ +@@ -459,6 +480,7 @@ unsigned long rcu_batches_completed_sched(void) } EXPORT_SYMBOL_GPL(rcu_batches_completed_sched); @@ -20463,7 +20817,7 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree.c linux-4.4.13/kernel/rcu/tree.c /* * Return the number of RCU BH batches completed thus far for debug & stats. */ -@@ -486,6 +508,13 @@ +@@ -486,6 +508,13 @@ void rcu_bh_force_quiescent_state(void) } EXPORT_SYMBOL_GPL(rcu_bh_force_quiescent_state); @@ -20477,7 +20831,7 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree.c linux-4.4.13/kernel/rcu/tree.c /* * Force a quiescent state for RCU-sched. */ -@@ -536,9 +565,11 @@ +@@ -536,9 +565,11 @@ void rcutorture_get_gp_data(enum rcutorture_type test_type, int *flags, case RCU_FLAVOR: rsp = rcu_state_p; break; @@ -20489,7 +20843,7 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree.c linux-4.4.13/kernel/rcu/tree.c case RCU_SCHED_FLAVOR: rsp = &rcu_sched_state; break; -@@ -1590,7 +1621,6 @@ +@@ -1590,7 +1621,6 @@ static int rcu_future_gp_cleanup(struct rcu_state *rsp, struct rcu_node *rnp) int needmore; struct rcu_data *rdp = this_cpu_ptr(rsp->rda); @@ -20497,7 +20851,7 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree.c linux-4.4.13/kernel/rcu/tree.c rnp->need_future_gp[c & 0x1] = 0; needmore = rnp->need_future_gp[(c + 1) & 0x1]; trace_rcu_future_gp(rnp, rdp, c, -@@ -1611,7 +1641,7 @@ +@@ -1611,7 +1641,7 @@ static void rcu_gp_kthread_wake(struct rcu_state *rsp) !READ_ONCE(rsp->gp_flags) || !rsp->gp_kthread) return; @@ -20506,7 +20860,7 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree.c linux-4.4.13/kernel/rcu/tree.c } /* -@@ -1991,6 +2021,7 @@ +@@ -1991,6 +2021,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp) int nocb = 0; struct rcu_data *rdp; struct rcu_node *rnp = rcu_get_root(rsp); @@ -20514,7 +20868,7 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree.c linux-4.4.13/kernel/rcu/tree.c WRITE_ONCE(rsp->gp_activity, jiffies); raw_spin_lock_irq(&rnp->lock); -@@ -2029,7 +2060,9 @@ +@@ -2029,7 +2060,9 @@ static void rcu_gp_cleanup(struct rcu_state *rsp) needgp = __note_gp_changes(rsp, rnp, rdp) || needgp; /* smp_mb() provided by prior unlock-lock pair. */ nocb += rcu_future_gp_cleanup(rsp, rnp); @@ -20524,7 +20878,7 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree.c linux-4.4.13/kernel/rcu/tree.c cond_resched_rcu_qs(); WRITE_ONCE(rsp->gp_activity, jiffies); rcu_gp_slow(rsp, gp_cleanup_delay); -@@ -2076,7 +2109,7 @@ +@@ -2076,7 +2109,7 @@ static int __noreturn rcu_gp_kthread(void *arg) READ_ONCE(rsp->gpnum), TPS("reqwait")); rsp->gp_state = RCU_GP_WAIT_GPS; @@ -20533,7 +20887,7 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree.c linux-4.4.13/kernel/rcu/tree.c READ_ONCE(rsp->gp_flags) & RCU_GP_FLAG_INIT); rsp->gp_state = RCU_GP_DONE_GPS; -@@ -2106,7 +2139,7 @@ +@@ -2106,7 +2139,7 @@ static int __noreturn rcu_gp_kthread(void *arg) READ_ONCE(rsp->gpnum), TPS("fqswait")); rsp->gp_state = RCU_GP_WAIT_FQS; @@ -20542,7 +20896,7 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree.c linux-4.4.13/kernel/rcu/tree.c rcu_gp_fqs_check_wake(rsp, &gf), j); rsp->gp_state = RCU_GP_DOING_FQS; /* Locking provides needed memory barriers. */ -@@ -2230,7 +2263,7 @@ +@@ -2230,7 +2263,7 @@ static void rcu_report_qs_rsp(struct rcu_state *rsp, unsigned long flags) WARN_ON_ONCE(!rcu_gp_in_progress(rsp)); WRITE_ONCE(rsp->gp_flags, READ_ONCE(rsp->gp_flags) | RCU_GP_FLAG_FQS); raw_spin_unlock_irqrestore(&rcu_get_root(rsp)->lock, flags); @@ -20551,7 +20905,7 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree.c linux-4.4.13/kernel/rcu/tree.c } /* -@@ -2891,7 +2924,7 @@ +@@ -2891,7 +2924,7 @@ static void force_quiescent_state(struct rcu_state *rsp) } WRITE_ONCE(rsp->gp_flags, READ_ONCE(rsp->gp_flags) | RCU_GP_FLAG_FQS); raw_spin_unlock_irqrestore(&rnp_old->lock, flags); @@ -20560,7 +20914,7 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree.c linux-4.4.13/kernel/rcu/tree.c } /* -@@ -2934,18 +2967,17 @@ +@@ -2934,18 +2967,17 @@ __rcu_process_callbacks(struct rcu_state *rsp) /* * Do RCU core processing for the current CPU. */ @@ -20581,15 +20935,18 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree.c linux-4.4.13/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, -@@ -2957,18 +2989,105 @@ +@@ -2957,18 +2989,105 @@ static void invoke_rcu_callbacks(struct rcu_state *rsp, struct rcu_data *rdp) { if (unlikely(!READ_ONCE(rcu_scheduler_fully_active))) return; - if (likely(!rsp->boost)) { - rcu_do_batch(rsp, rdp); +- return; +- } +- invoke_rcu_callbacks_kthread(); + rcu_do_batch(rsp, rdp); -+} -+ + } + +static void rcu_wake_cond(struct task_struct *t, int status) +{ + /* @@ -20603,13 +20960,15 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree.c linux-4.4.13/kernel/rcu/tree.c +/* + * Wake up this CPU's rcuc kthread to do RCU core processing. + */ -+static void invoke_rcu_core(void) -+{ + static void invoke_rcu_core(void) + { +- if (cpu_online(smp_processor_id())) +- raise_softirq(RCU_SOFTIRQ); + unsigned long flags; + struct task_struct *t; + + if (!cpu_online(smp_processor_id())) - return; ++ return; + local_irq_save(flags); + __this_cpu_write(rcu_cpu_has_work, 1); + t = __this_cpu_read(rcu_cpu_kthread_task); @@ -20656,16 +21015,14 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree.c linux-4.4.13/kernel/rcu/tree.c + *statusp = RCU_KTHREAD_WAITING; + return; + } - } -- invoke_rcu_callbacks_kthread(); ++ } + *statusp = RCU_KTHREAD_YIELDING; + trace_rcu_utilization(TPS("Start CPU kthread@rcu_yield")); + schedule_timeout_interruptible(2); + trace_rcu_utilization(TPS("End CPU kthread@rcu_yield")); + *statusp = RCU_KTHREAD_WAITING; - } - --static void invoke_rcu_core(void) ++} ++ +static struct smp_hotplug_thread rcu_cpu_thread_spec = { + .store = &rcu_cpu_kthread_task, + .thread_should_run = rcu_cpu_kthread_should_run, @@ -20679,9 +21036,7 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree.c linux-4.4.13/kernel/rcu/tree.c + * Spawn per-CPU RCU core processing kthreads. + */ +static int __init rcu_spawn_core_kthreads(void) - { -- if (cpu_online(smp_processor_id())) -- raise_softirq(RCU_SOFTIRQ); ++{ + int cpu; + + for_each_possible_cpu(cpu) @@ -20693,7 +21048,7 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree.c linux-4.4.13/kernel/rcu/tree.c /* * Handle any core-RCU processing required by a call_rcu() invocation. -@@ -3114,6 +3233,7 @@ +@@ -3114,6 +3233,7 @@ void call_rcu_sched(struct rcu_head *head, rcu_callback_t func) } EXPORT_SYMBOL_GPL(call_rcu_sched); @@ -20701,7 +21056,7 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree.c linux-4.4.13/kernel/rcu/tree.c /* * Queue an RCU callback for invocation after a quicker grace period. */ -@@ -3122,6 +3242,7 @@ +@@ -3122,6 +3242,7 @@ void call_rcu_bh(struct rcu_head *head, rcu_callback_t func) __call_rcu(head, func, &rcu_bh_state, -1, 0); } EXPORT_SYMBOL_GPL(call_rcu_bh); @@ -20709,7 +21064,7 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree.c linux-4.4.13/kernel/rcu/tree.c /* * Queue an RCU callback for lazy invocation after a grace period. -@@ -3213,6 +3334,7 @@ +@@ -3213,6 +3334,7 @@ void synchronize_sched(void) } EXPORT_SYMBOL_GPL(synchronize_sched); @@ -20717,7 +21072,7 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree.c linux-4.4.13/kernel/rcu/tree.c /** * synchronize_rcu_bh - wait until an rcu_bh grace period has elapsed. * -@@ -3239,6 +3361,7 @@ +@@ -3239,6 +3361,7 @@ void synchronize_rcu_bh(void) wait_rcu_gp(call_rcu_bh); } EXPORT_SYMBOL_GPL(synchronize_rcu_bh); @@ -20725,7 +21080,7 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree.c linux-4.4.13/kernel/rcu/tree.c /** * get_state_synchronize_rcu - Snapshot current RCU state -@@ -3524,7 +3647,7 @@ +@@ -3524,7 +3647,7 @@ static void __rcu_report_exp_rnp(struct rcu_state *rsp, struct rcu_node *rnp, raw_spin_unlock_irqrestore(&rnp->lock, flags); if (wake) { smp_mb(); /* EGP done before wake_up(). */ @@ -20734,7 +21089,7 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree.c linux-4.4.13/kernel/rcu/tree.c } break; } -@@ -3781,7 +3904,7 @@ +@@ -3781,7 +3904,7 @@ static void synchronize_sched_expedited_wait(struct rcu_state *rsp) jiffies_start = jiffies; for (;;) { @@ -20743,7 +21098,7 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree.c linux-4.4.13/kernel/rcu/tree.c rsp->expedited_wq, sync_rcu_preempt_exp_done(rnp_root), jiffies_stall); -@@ -3789,7 +3912,7 @@ +@@ -3789,7 +3912,7 @@ static void synchronize_sched_expedited_wait(struct rcu_state *rsp) return; if (ret < 0) { /* Hit a signal, disable CPU stall warnings. */ @@ -20752,7 +21107,7 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree.c linux-4.4.13/kernel/rcu/tree.c sync_rcu_preempt_exp_done(rnp_root)); return; } -@@ -4101,6 +4224,7 @@ +@@ -4101,6 +4224,7 @@ static void _rcu_barrier(struct rcu_state *rsp) mutex_unlock(&rsp->barrier_mutex); } @@ -20760,7 +21115,7 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree.c linux-4.4.13/kernel/rcu/tree.c /** * rcu_barrier_bh - Wait until all in-flight call_rcu_bh() callbacks complete. */ -@@ -4109,6 +4233,7 @@ +@@ -4109,6 +4233,7 @@ void rcu_barrier_bh(void) _rcu_barrier(&rcu_bh_state); } EXPORT_SYMBOL_GPL(rcu_barrier_bh); @@ -20768,7 +21123,7 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree.c linux-4.4.13/kernel/rcu/tree.c /** * rcu_barrier_sched - Wait for in-flight call_rcu_sched() callbacks. -@@ -4455,8 +4580,8 @@ +@@ -4455,8 +4580,8 @@ static void __init rcu_init_one(struct rcu_state *rsp, } } @@ -20779,7 +21134,7 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree.c linux-4.4.13/kernel/rcu/tree.c rnp = rsp->level[rcu_num_lvls - 1]; for_each_possible_cpu(i) { while (i > rnp->grphi) -@@ -4576,12 +4701,13 @@ +@@ -4576,12 +4701,13 @@ void __init rcu_init(void) rcu_bootup_announce(); rcu_init_geometry(); @@ -20794,9 +21149,10 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree.c linux-4.4.13/kernel/rcu/tree.c /* * We don't need protection against CPU-hotplug here because -diff -Nur linux-4.4.13.orig/kernel/rcu/tree.h linux-4.4.13/kernel/rcu/tree.h ---- linux-4.4.13.orig/kernel/rcu/tree.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/rcu/tree.h 2016-06-22 21:55:08.054523867 +0200 +diff --git a/kernel/rcu/tree.h b/kernel/rcu/tree.h +index 9fb4e238d4dc..c75834d8de24 100644 +--- a/kernel/rcu/tree.h ++++ b/kernel/rcu/tree.h @@ -27,6 +27,7 @@ #include <linux/threads.h> #include <linux/cpumask.h> @@ -20805,7 +21161,7 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree.h linux-4.4.13/kernel/rcu/tree.h #include <linux/stop_machine.h> /* -@@ -241,7 +242,7 @@ +@@ -241,7 +242,7 @@ struct rcu_node { /* Refused to boost: not sure why, though. */ /* This can happen due to race conditions. */ #ifdef CONFIG_RCU_NOCB_CPU @@ -20814,7 +21170,7 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree.h linux-4.4.13/kernel/rcu/tree.h /* Place for rcu_nocb_kthread() to wait GP. */ #endif /* #ifdef CONFIG_RCU_NOCB_CPU */ int need_future_gp[2]; -@@ -393,7 +394,7 @@ +@@ -393,7 +394,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; @@ -20823,7 +21179,7 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree.h linux-4.4.13/kernel/rcu/tree.h struct task_struct *nocb_kthread; int nocb_defer_wakeup; /* Defer wakeup of nocb_kthread. */ -@@ -472,7 +473,7 @@ +@@ -472,7 +473,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. */ @@ -20832,7 +21188,7 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree.h linux-4.4.13/kernel/rcu/tree.h short gp_flags; /* Commands for GP task. */ short gp_state; /* GP kthread sleep state. */ -@@ -504,7 +505,7 @@ +@@ -504,7 +505,7 @@ struct rcu_state { atomic_long_t expedited_workdone3; /* # done by others #3. */ atomic_long_t expedited_normal; /* # fallbacks to normal. */ atomic_t expedited_need_qs; /* # CPUs left to check in. */ @@ -20841,7 +21197,7 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree.h linux-4.4.13/kernel/rcu/tree.h int ncpus_snap; /* # CPUs seen last time. */ unsigned long jiffies_force_qs; /* Time at which to invoke */ -@@ -556,18 +557,18 @@ +@@ -556,18 +557,18 @@ extern struct list_head rcu_struct_flavors; */ extern struct rcu_state rcu_sched_state; @@ -20862,7 +21218,7 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree.h linux-4.4.13/kernel/rcu/tree.h #ifndef RCU_TREE_NONCORE -@@ -587,10 +588,9 @@ +@@ -587,10 +588,9 @@ void call_rcu(struct rcu_head *head, rcu_callback_t func); 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); @@ -20874,7 +21230,7 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree.h linux-4.4.13/kernel/rcu/tree.h static int rcu_spawn_one_boost_kthread(struct rcu_state *rsp, struct rcu_node *rnp); #endif /* #ifdef CONFIG_RCU_BOOST */ -@@ -607,7 +607,8 @@ +@@ -607,7 +607,8 @@ static void zero_cpu_stall_ticks(struct rcu_data *rdp); static void increment_cpu_stall_ticks(void); static bool rcu_nocb_cpu_needs_barrier(struct rcu_state *rsp, int cpu); static void rcu_nocb_gp_set(struct rcu_node *rnp, int nrq); @@ -20884,9 +21240,10 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree.h linux-4.4.13/kernel/rcu/tree.h static void rcu_init_one_nocb(struct rcu_node *rnp); static bool __call_rcu_nocb(struct rcu_data *rdp, struct rcu_head *rhp, bool lazy, unsigned long flags); -diff -Nur linux-4.4.13.orig/kernel/rcu/tree_plugin.h linux-4.4.13/kernel/rcu/tree_plugin.h ---- linux-4.4.13.orig/kernel/rcu/tree_plugin.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/rcu/tree_plugin.h 2016-06-22 21:55:08.054523867 +0200 +diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h +index 630c19772630..8e119cf647ba 100644 +--- a/kernel/rcu/tree_plugin.h ++++ b/kernel/rcu/tree_plugin.h @@ -24,25 +24,10 @@ * Paul E. McKenney <paulmck@linux.vnet.ibm.com> */ @@ -20913,7 +21270,7 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree_plugin.h linux-4.4.13/kernel/rcu/tre #else /* #ifdef CONFIG_RCU_BOOST */ /* -@@ -55,6 +40,14 @@ +@@ -55,6 +40,14 @@ DEFINE_PER_CPU(char, rcu_cpu_has_work); #endif /* #else #ifdef CONFIG_RCU_BOOST */ @@ -20928,7 +21285,7 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree_plugin.h linux-4.4.13/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? */ -@@ -432,7 +425,7 @@ +@@ -432,7 +425,7 @@ void rcu_read_unlock_special(struct task_struct *t) } /* Hardware IRQ handlers cannot block, complain if they get here. */ @@ -20937,7 +21294,7 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree_plugin.h linux-4.4.13/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, enq: %d nq: %d)\n", -@@ -645,15 +638,6 @@ +@@ -645,15 +638,6 @@ static void rcu_preempt_check_callbacks(void) t->rcu_read_unlock_special.b.need_qs = true; } @@ -20953,7 +21310,7 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree_plugin.h linux-4.4.13/kernel/rcu/tre /* * Queue a preemptible-RCU callback for invocation after a grace period. */ -@@ -930,6 +914,19 @@ +@@ -930,6 +914,19 @@ void exit_rcu(void) #endif /* #else #ifdef CONFIG_PREEMPT_RCU */ @@ -20973,7 +21330,7 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree_plugin.h linux-4.4.13/kernel/rcu/tre #ifdef CONFIG_RCU_BOOST #include "../locking/rtmutex_common.h" -@@ -961,16 +958,6 @@ +@@ -961,16 +958,6 @@ static void rcu_initiate_boost_trace(struct rcu_node *rnp) #endif /* #else #ifdef CONFIG_RCU_TRACE */ @@ -20990,7 +21347,7 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree_plugin.h linux-4.4.13/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 -@@ -1115,23 +1102,6 @@ +@@ -1115,23 +1102,6 @@ static void rcu_initiate_boost(struct rcu_node *rnp, unsigned long flags) } /* @@ -21014,7 +21371,7 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree_plugin.h linux-4.4.13/kernel/rcu/tre * Is the current CPU running the RCU-callbacks kthread? * Caller must have preemption disabled. */ -@@ -1186,67 +1156,6 @@ +@@ -1186,67 +1156,6 @@ static int rcu_spawn_one_boost_kthread(struct rcu_state *rsp, return 0; } @@ -21082,7 +21439,7 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree_plugin.h linux-4.4.13/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 -@@ -1276,26 +1185,12 @@ +@@ -1276,26 +1185,12 @@ static void rcu_boost_kthread_setaffinity(struct rcu_node *rnp, int outgoingcpu) free_cpumask_var(cm); } @@ -21109,7 +21466,7 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree_plugin.h linux-4.4.13/kernel/rcu/tre rcu_for_each_leaf_node(rcu_state_p, rnp) (void)rcu_spawn_one_boost_kthread(rcu_state_p, rnp); } -@@ -1318,11 +1213,6 @@ +@@ -1318,11 +1213,6 @@ static void rcu_initiate_boost(struct rcu_node *rnp, unsigned long flags) raw_spin_unlock_irqrestore(&rnp->lock, flags); } @@ -21121,7 +21478,7 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree_plugin.h linux-4.4.13/kernel/rcu/tre static bool rcu_is_callbacks_kthread(void) { return false; -@@ -1346,7 +1236,7 @@ +@@ -1346,7 +1236,7 @@ static void rcu_prepare_kthreads(int cpu) #endif /* #else #ifdef CONFIG_RCU_BOOST */ @@ -21130,7 +21487,7 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree_plugin.h linux-4.4.13/kernel/rcu/tre /* * Check to see if any future RCU-related work will need to be done -@@ -1363,7 +1253,9 @@ +@@ -1363,7 +1253,9 @@ int rcu_needs_cpu(u64 basemono, u64 *nextevt) return IS_ENABLED(CONFIG_RCU_NOCB_CPU_ALL) ? 0 : rcu_cpu_has_callbacks(NULL); } @@ -21140,7 +21497,7 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree_plugin.h linux-4.4.13/kernel/rcu/tre /* * Because we do not have RCU_FAST_NO_HZ, don't bother cleaning up * after it. -@@ -1459,6 +1351,8 @@ +@@ -1459,6 +1351,8 @@ static bool __maybe_unused rcu_try_advance_all_cbs(void) return cbs_ready; } @@ -21149,7 +21506,7 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree_plugin.h linux-4.4.13/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 -@@ -1504,6 +1398,7 @@ +@@ -1504,6 +1398,7 @@ int rcu_needs_cpu(u64 basemono, u64 *nextevt) *nextevt = basemono + dj * TICK_NSEC; return 0; } @@ -21157,7 +21514,7 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree_plugin.h linux-4.4.13/kernel/rcu/tre /* * Prepare a CPU for idle from an RCU perspective. The first major task -@@ -1822,9 +1717,9 @@ +@@ -1822,9 +1717,9 @@ early_param("rcu_nocb_poll", parse_rcu_nocb_poll); * Wake up any no-CBs CPUs' kthreads that were waiting on the just-ended * grace period. */ @@ -21169,7 +21526,7 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree_plugin.h linux-4.4.13/kernel/rcu/tre } /* -@@ -1840,10 +1735,15 @@ +@@ -1840,10 +1735,15 @@ static void rcu_nocb_gp_set(struct rcu_node *rnp, int nrq) rnp->need_future_gp[(rnp->completed + 1) & 0x1] += nrq; } @@ -21187,7 +21544,7 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree_plugin.h linux-4.4.13/kernel/rcu/tre } #ifndef CONFIG_RCU_NOCB_CPU_ALL -@@ -1868,7 +1768,7 @@ +@@ -1868,7 +1768,7 @@ static void wake_nocb_leader(struct rcu_data *rdp, bool force) if (READ_ONCE(rdp_leader->nocb_leader_sleep) || force) { /* Prior smp_mb__after_atomic() orders against prior enqueue. */ WRITE_ONCE(rdp_leader->nocb_leader_sleep, false); @@ -21196,7 +21553,7 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree_plugin.h linux-4.4.13/kernel/rcu/tre } } -@@ -2081,7 +1981,7 @@ +@@ -2081,7 +1981,7 @@ static void rcu_nocb_wait_gp(struct rcu_data *rdp) */ trace_rcu_future_gp(rnp, rdp, c, TPS("StartWait")); for (;;) { @@ -21205,7 +21562,7 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree_plugin.h linux-4.4.13/kernel/rcu/tre rnp->nocb_gp_wq[c & 0x1], (d = ULONG_CMP_GE(READ_ONCE(rnp->completed), c))); if (likely(d)) -@@ -2109,7 +2009,7 @@ +@@ -2109,7 +2009,7 @@ wait_again: /* Wait for callbacks to appear. */ if (!rcu_nocb_poll) { trace_rcu_nocb_wake(my_rdp->rsp->name, my_rdp->cpu, "Sleep"); @@ -21214,7 +21571,7 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree_plugin.h linux-4.4.13/kernel/rcu/tre !READ_ONCE(my_rdp->nocb_leader_sleep)); /* Memory barrier handled by smp_mb() calls below and repoll. */ } else if (firsttime) { -@@ -2184,7 +2084,7 @@ +@@ -2184,7 +2084,7 @@ wait_again: * List was empty, wake up the follower. * Memory barriers supplied by atomic_long_add(). */ @@ -21223,7 +21580,7 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree_plugin.h linux-4.4.13/kernel/rcu/tre } } -@@ -2205,7 +2105,7 @@ +@@ -2205,7 +2105,7 @@ static void nocb_follower_wait(struct rcu_data *rdp) if (!rcu_nocb_poll) { trace_rcu_nocb_wake(rdp->rsp->name, rdp->cpu, "FollowerSleep"); @@ -21232,7 +21589,7 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree_plugin.h linux-4.4.13/kernel/rcu/tre READ_ONCE(rdp->nocb_follower_head)); } else if (firsttime) { /* Don't drown trace log with "Poll"! */ -@@ -2364,7 +2264,7 @@ +@@ -2364,7 +2264,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; @@ -21241,7 +21598,7 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree_plugin.h linux-4.4.13/kernel/rcu/tre rdp->nocb_follower_tail = &rdp->nocb_follower_head; } -@@ -2514,7 +2414,7 @@ +@@ -2514,7 +2414,7 @@ static bool rcu_nocb_cpu_needs_barrier(struct rcu_state *rsp, int cpu) return false; } @@ -21250,7 +21607,7 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree_plugin.h linux-4.4.13/kernel/rcu/tre { } -@@ -2522,6 +2422,11 @@ +@@ -2522,6 +2422,11 @@ static void rcu_nocb_gp_set(struct rcu_node *rnp, int nrq) { } @@ -21262,10 +21619,11 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/tree_plugin.h linux-4.4.13/kernel/rcu/tre static void rcu_init_one_nocb(struct rcu_node *rnp) { } -diff -Nur linux-4.4.13.orig/kernel/rcu/update.c linux-4.4.13/kernel/rcu/update.c ---- linux-4.4.13.orig/kernel/rcu/update.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/rcu/update.c 2016-06-22 21:55:08.054523867 +0200 -@@ -276,6 +276,7 @@ +diff --git a/kernel/rcu/update.c b/kernel/rcu/update.c +index 5f748c5a40f0..9a3904603ff6 100644 +--- a/kernel/rcu/update.c ++++ b/kernel/rcu/update.c +@@ -276,6 +276,7 @@ int rcu_read_lock_held(void) } EXPORT_SYMBOL_GPL(rcu_read_lock_held); @@ -21273,7 +21631,7 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/update.c linux-4.4.13/kernel/rcu/update.c /** * rcu_read_lock_bh_held() - might we be in RCU-bh read-side critical section? * -@@ -302,6 +303,7 @@ +@@ -302,6 +303,7 @@ int rcu_read_lock_bh_held(void) return in_softirq() || irqs_disabled(); } EXPORT_SYMBOL_GPL(rcu_read_lock_bh_held); @@ -21281,10 +21639,11 @@ diff -Nur linux-4.4.13.orig/kernel/rcu/update.c linux-4.4.13/kernel/rcu/update.c #endif /* #ifdef CONFIG_DEBUG_LOCK_ALLOC */ -diff -Nur linux-4.4.13.orig/kernel/relay.c linux-4.4.13/kernel/relay.c ---- linux-4.4.13.orig/kernel/relay.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/relay.c 2016-06-22 21:55:08.058523867 +0200 -@@ -336,6 +336,10 @@ +diff --git a/kernel/relay.c b/kernel/relay.c +index 0b4570cfacae..60684be39f22 100644 +--- a/kernel/relay.c ++++ b/kernel/relay.c +@@ -336,6 +336,10 @@ static void wakeup_readers(unsigned long data) { struct rchan_buf *buf = (struct rchan_buf *)data; wake_up_interruptible(&buf->read_wait); @@ -21295,7 +21654,7 @@ diff -Nur linux-4.4.13.orig/kernel/relay.c linux-4.4.13/kernel/relay.c } /** -@@ -353,6 +357,7 @@ +@@ -353,6 +357,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); @@ -21303,7 +21662,7 @@ diff -Nur linux-4.4.13.orig/kernel/relay.c linux-4.4.13/kernel/relay.c } else del_timer_sync(&buf->timer); -@@ -736,15 +741,6 @@ +@@ -736,15 +741,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]; @@ -21319,10 +21678,24 @@ diff -Nur linux-4.4.13.orig/kernel/relay.c linux-4.4.13/kernel/relay.c } old = buf->data; -diff -Nur linux-4.4.13.orig/kernel/sched/completion.c linux-4.4.13/kernel/sched/completion.c ---- linux-4.4.13.orig/kernel/sched/completion.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/sched/completion.c 2016-06-22 21:55:08.058523867 +0200 -@@ -30,10 +30,10 @@ +diff --git a/kernel/sched/Makefile b/kernel/sched/Makefile +index 67687973ce80..01b9994b367a 100644 +--- a/kernel/sched/Makefile ++++ b/kernel/sched/Makefile +@@ -13,7 +13,7 @@ endif + + obj-y += core.o loadavg.o clock.o cputime.o + obj-y += idle_task.o fair.o rt.o deadline.o stop_task.o +-obj-y += wait.o completion.o idle.o ++obj-y += wait.o swait.o swork.o completion.o idle.o + obj-$(CONFIG_SMP) += cpupri.o cpudeadline.o + obj-$(CONFIG_SCHED_AUTOGROUP) += auto_group.o + obj-$(CONFIG_SCHEDSTATS) += stats.o +diff --git a/kernel/sched/completion.c b/kernel/sched/completion.c +index 8d0f35debf35..b62cf6400fe0 100644 +--- a/kernel/sched/completion.c ++++ b/kernel/sched/completion.c +@@ -30,10 +30,10 @@ void complete(struct completion *x) { unsigned long flags; @@ -21336,7 +21709,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/completion.c linux-4.4.13/kernel/sched/ } EXPORT_SYMBOL(complete); -@@ -50,10 +50,10 @@ +@@ -50,10 +50,10 @@ void complete_all(struct completion *x) { unsigned long flags; @@ -21350,7 +21723,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/completion.c linux-4.4.13/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) { @@ -21376,7 +21749,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/completion.c linux-4.4.13/kernel/sched/ if (!x->done) return timeout; } -@@ -89,9 +89,9 @@ +@@ -89,9 +89,9 @@ __wait_for_common(struct completion *x, { might_sleep(); @@ -21388,7 +21761,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/completion.c linux-4.4.13/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; @@ -21403,7 +21776,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/completion.c linux-4.4.13/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(); @@ -21412,10 +21785,11 @@ diff -Nur linux-4.4.13.orig/kernel/sched/completion.c linux-4.4.13/kernel/sched/ return true; } EXPORT_SYMBOL(completion_done); -diff -Nur linux-4.4.13.orig/kernel/sched/core.c linux-4.4.13/kernel/sched/core.c ---- linux-4.4.13.orig/kernel/sched/core.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/sched/core.c 2016-06-22 21:55:08.058523867 +0200 -@@ -260,7 +260,11 @@ +diff --git a/kernel/sched/core.c b/kernel/sched/core.c +index 67d1e1597d9c..42ce49aa3ad5 100644 +--- a/kernel/sched/core.c ++++ b/kernel/sched/core.c +@@ -260,7 +260,11 @@ late_initcall(sched_init_debug); * Number of tasks to iterate in a single balance run. * Limited because this is done with IRQs disabled. */ @@ -21427,7 +21801,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/core.c linux-4.4.13/kernel/sched/core.c /* * period over which we average the RT time consumption, measured -@@ -438,6 +442,7 @@ +@@ -438,6 +442,7 @@ static void init_rq_hrtick(struct rq *rq) hrtimer_init(&rq->hrtick_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); rq->hrtick_timer.function = hrtick; @@ -21435,7 +21809,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/core.c linux-4.4.13/kernel/sched/core.c } #else /* CONFIG_SCHED_HRTICK */ static inline void hrtick_clear(struct rq *rq) -@@ -542,7 +547,7 @@ +@@ -542,7 +547,7 @@ void wake_q_add(struct wake_q_head *head, struct task_struct *task) head->lastp = &node->next; } @@ -21444,7 +21818,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/core.c linux-4.4.13/kernel/sched/core.c { struct wake_q_node *node = head->first; -@@ -559,7 +564,10 @@ +@@ -559,7 +564,10 @@ void wake_up_q(struct wake_q_head *head) * wake_up_process() implies a wmb() to pair with the queueing * in wake_q_add() so as not to miss wakeups. */ @@ -21456,7 +21830,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/core.c linux-4.4.13/kernel/sched/core.c put_task_struct(task); } } -@@ -595,6 +603,38 @@ +@@ -595,6 +603,38 @@ void resched_curr(struct rq *rq) trace_sched_wake_idle_without_ipi(cpu); } @@ -21495,7 +21869,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/core.c linux-4.4.13/kernel/sched/core.c void resched_cpu(int cpu) { struct rq *rq = cpu_rq(cpu); -@@ -618,11 +658,14 @@ +@@ -618,11 +658,14 @@ void resched_cpu(int cpu) */ int get_nohz_timer_target(void) { @@ -21512,7 +21886,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/core.c linux-4.4.13/kernel/sched/core.c rcu_read_lock(); for_each_domain(cpu, sd) { -@@ -638,6 +681,8 @@ +@@ -638,6 +681,8 @@ int get_nohz_timer_target(void) cpu = housekeeping_any_cpu(); unlock: rcu_read_unlock(); @@ -21521,7 +21895,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/core.c linux-4.4.13/kernel/sched/core.c return cpu; } /* -@@ -1171,6 +1216,11 @@ +@@ -1171,6 +1216,11 @@ void do_set_cpus_allowed(struct task_struct *p, const struct cpumask *new_mask) lockdep_assert_held(&p->pi_lock); @@ -21533,7 +21907,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/core.c linux-4.4.13/kernel/sched/core.c queued = task_on_rq_queued(p); running = task_current(rq, p); -@@ -1193,6 +1243,84 @@ +@@ -1193,6 +1243,84 @@ void do_set_cpus_allowed(struct task_struct *p, const struct cpumask *new_mask) enqueue_task(rq, p, ENQUEUE_RESTORE); } @@ -21618,7 +21992,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/core.c linux-4.4.13/kernel/sched/core.c /* * Change a given task's CPU affinity. Migrate the thread to a * proper CPU and schedule it away if the CPU it's executing on -@@ -1232,7 +1360,7 @@ +@@ -1232,7 +1360,7 @@ static int __set_cpus_allowed_ptr(struct task_struct *p, do_set_cpus_allowed(p, new_mask); /* Can the task run on the task's current CPU? If so, we're done */ @@ -21627,7 +22001,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/core.c linux-4.4.13/kernel/sched/core.c goto out; dest_cpu = cpumask_any_and(cpu_active_mask, new_mask); -@@ -1408,6 +1536,18 @@ +@@ -1408,6 +1536,18 @@ out: return ret; } @@ -21646,7 +22020,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/core.c linux-4.4.13/kernel/sched/core.c /* * wait_task_inactive - wait for a thread to unschedule. * -@@ -1452,7 +1592,7 @@ +@@ -1452,7 +1592,7 @@ unsigned long wait_task_inactive(struct task_struct *p, long match_state) * is actually now running somewhere else! */ while (task_running(rq, p)) { @@ -21655,7 +22029,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/core.c linux-4.4.13/kernel/sched/core.c return 0; cpu_relax(); } -@@ -1467,7 +1607,8 @@ +@@ -1467,7 +1607,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; @@ -21665,7 +22039,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/core.c linux-4.4.13/kernel/sched/core.c ncsw = p->nvcsw | LONG_MIN; /* sets MSB */ task_rq_unlock(rq, p, &flags); -@@ -1624,7 +1765,7 @@ +@@ -1624,7 +1765,7 @@ int select_task_rq(struct task_struct *p, int cpu, int sd_flags, int wake_flags) { lockdep_assert_held(&p->pi_lock); @@ -21674,7 +22048,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/core.c linux-4.4.13/kernel/sched/core.c cpu = p->sched_class->select_task_rq(p, cpu, sd_flags, wake_flags); /* -@@ -1704,10 +1845,6 @@ +@@ -1704,10 +1845,6 @@ static inline void ttwu_activate(struct rq *rq, struct task_struct *p, int en_fl { activate_task(rq, p, en_flags); p->on_rq = TASK_ON_RQ_QUEUED; @@ -21685,7 +22059,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/core.c linux-4.4.13/kernel/sched/core.c } /* -@@ -1934,8 +2071,27 @@ +@@ -1934,8 +2071,27 @@ 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); @@ -21714,7 +22088,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/core.c linux-4.4.13/kernel/sched/core.c trace_sched_waking(p); -@@ -2005,52 +2161,6 @@ +@@ -2005,52 +2161,6 @@ out: } /** @@ -21767,7 +22141,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/core.c linux-4.4.13/kernel/sched/core.c * wake_up_process - Wake up a specific process * @p: The process to be woken up. * -@@ -2068,6 +2178,18 @@ +@@ -2068,6 +2178,18 @@ int wake_up_process(struct task_struct *p) } EXPORT_SYMBOL(wake_up_process); @@ -21786,7 +22160,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/core.c linux-4.4.13/kernel/sched/core.c int wake_up_state(struct task_struct *p, unsigned int state) { return try_to_wake_up(p, state, 0); -@@ -2254,6 +2376,9 @@ +@@ -2254,6 +2376,9 @@ int sched_fork(unsigned long clone_flags, struct task_struct *p) p->on_cpu = 0; #endif init_task_preempt_count(p); @@ -21796,7 +22170,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/core.c linux-4.4.13/kernel/sched/core.c #ifdef CONFIG_SMP plist_node_init(&p->pushable_tasks, MAX_PRIO); RB_CLEAR_NODE(&p->pushable_dl_tasks); -@@ -2578,8 +2703,12 @@ +@@ -2578,8 +2703,12 @@ static struct rq *finish_task_switch(struct task_struct *prev) finish_arch_post_lock_switch(); fire_sched_in_preempt_notifiers(current); @@ -21810,7 +22184,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/core.c linux-4.4.13/kernel/sched/core.c if (unlikely(prev_state == TASK_DEAD)) { if (prev->sched_class->task_dead) prev->sched_class->task_dead(prev); -@@ -2910,16 +3039,6 @@ +@@ -2910,16 +3039,6 @@ u64 scheduler_tick_max_deferment(void) } #endif @@ -21827,7 +22201,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/core.c linux-4.4.13/kernel/sched/core.c #if defined(CONFIG_PREEMPT) && (defined(CONFIG_DEBUG_PREEMPT) || \ defined(CONFIG_PREEMPT_TRACER)) -@@ -2941,7 +3060,7 @@ +@@ -2941,7 +3060,7 @@ void preempt_count_add(int val) PREEMPT_MASK - 10); #endif if (preempt_count() == val) { @@ -21836,7 +22210,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/core.c linux-4.4.13/kernel/sched/core.c #ifdef CONFIG_DEBUG_PREEMPT current->preempt_disable_ip = ip; #endif -@@ -2968,7 +3087,7 @@ +@@ -2968,7 +3087,7 @@ void preempt_count_sub(int val) #endif if (preempt_count() == val) @@ -21845,7 +22219,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/core.c linux-4.4.13/kernel/sched/core.c __preempt_count_sub(val); } EXPORT_SYMBOL(preempt_count_sub); -@@ -3022,6 +3141,77 @@ +@@ -3023,6 +3142,77 @@ static inline void schedule_debug(struct task_struct *prev) schedstat_inc(this_rq(), sched_count); } @@ -21923,7 +22297,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/core.c linux-4.4.13/kernel/sched/core.c /* * Pick up the highest-prio task: */ -@@ -3146,19 +3336,6 @@ +@@ -3147,19 +3337,6 @@ static void __sched notrace __schedule(bool preempt) } else { deactivate_task(rq, prev, DEQUEUE_SLEEP); prev->on_rq = 0; @@ -21943,7 +22317,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/core.c linux-4.4.13/kernel/sched/core.c } switch_count = &prev->nvcsw; } -@@ -3168,6 +3345,7 @@ +@@ -3169,6 +3346,7 @@ static void __sched notrace __schedule(bool preempt) next = pick_next_task(rq, prev); clear_tsk_need_resched(prev); @@ -21951,7 +22325,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/core.c linux-4.4.13/kernel/sched/core.c clear_preempt_need_resched(); rq->clock_skip_update = 0; -@@ -3189,9 +3367,20 @@ +@@ -3190,9 +3368,20 @@ static void __sched notrace __schedule(bool preempt) static inline void sched_submit_work(struct task_struct *tsk) { @@ -21973,7 +22347,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/core.c linux-4.4.13/kernel/sched/core.c * If we are going to sleep and we have plugged IO queued, * make sure to submit it to avoid deadlocks. */ -@@ -3199,6 +3388,12 @@ +@@ -3200,6 +3389,12 @@ static inline void sched_submit_work(struct task_struct *tsk) blk_schedule_flush_plug(tsk); } @@ -21986,7 +22360,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/core.c linux-4.4.13/kernel/sched/core.c asmlinkage __visible void __sched schedule(void) { struct task_struct *tsk = current; -@@ -3209,6 +3404,7 @@ +@@ -3210,6 +3405,7 @@ asmlinkage __visible void __sched schedule(void) __schedule(false); sched_preempt_enable_no_resched(); } while (need_resched()); @@ -21994,7 +22368,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/core.c linux-4.4.13/kernel/sched/core.c } EXPORT_SYMBOL(schedule); -@@ -3257,6 +3453,30 @@ +@@ -3258,6 +3454,30 @@ static void __sched notrace preempt_schedule_common(void) } while (need_resched()); } @@ -22025,7 +22399,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/core.c linux-4.4.13/kernel/sched/core.c #ifdef CONFIG_PREEMPT /* * this is the entry point to schedule() from in-kernel preemption -@@ -3271,6 +3491,8 @@ +@@ -3272,6 +3492,8 @@ asmlinkage __visible void __sched notrace preempt_schedule(void) */ if (likely(!preemptible())) return; @@ -22034,7 +22408,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/core.c linux-4.4.13/kernel/sched/core.c preempt_schedule_common(); } -@@ -3297,6 +3519,8 @@ +@@ -3298,6 +3520,8 @@ asmlinkage __visible void __sched notrace preempt_schedule_notrace(void) if (likely(!preemptible())) return; @@ -22043,7 +22417,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/core.c linux-4.4.13/kernel/sched/core.c do { preempt_disable_notrace(); -@@ -3306,7 +3530,16 @@ +@@ -3307,7 +3531,16 @@ asmlinkage __visible void __sched notrace preempt_schedule_notrace(void) * an infinite recursion. */ prev_ctx = exception_enter(); @@ -22060,7 +22434,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/core.c linux-4.4.13/kernel/sched/core.c exception_exit(prev_ctx); preempt_enable_no_resched_notrace(); -@@ -4650,6 +4883,7 @@ +@@ -4651,6 +4884,7 @@ int __cond_resched_lock(spinlock_t *lock) } EXPORT_SYMBOL(__cond_resched_lock); @@ -22068,7 +22442,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/core.c linux-4.4.13/kernel/sched/core.c int __sched __cond_resched_softirq(void) { BUG_ON(!in_softirq()); -@@ -4663,6 +4897,7 @@ +@@ -4664,6 +4898,7 @@ int __sched __cond_resched_softirq(void) return 0; } EXPORT_SYMBOL(__cond_resched_softirq); @@ -22076,7 +22450,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/core.c linux-4.4.13/kernel/sched/core.c /** * yield - yield the current processor to other threads. -@@ -5027,7 +5262,9 @@ +@@ -5030,7 +5265,9 @@ void init_idle(struct task_struct *idle, int cpu) /* Set the preempt count _outside_ the spinlocks! */ init_idle_preempt_count(idle, cpu); @@ -22087,7 +22461,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/core.c linux-4.4.13/kernel/sched/core.c /* * The idle tasks have their own, simple scheduling class: */ -@@ -5168,6 +5405,8 @@ +@@ -5171,6 +5408,8 @@ void sched_setnuma(struct task_struct *p, int nid) #endif /* CONFIG_NUMA_BALANCING */ #ifdef CONFIG_HOTPLUG_CPU @@ -22096,7 +22470,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/core.c linux-4.4.13/kernel/sched/core.c /* * Ensures that the idle task is using init_mm right before its cpu goes * offline. -@@ -5182,7 +5421,11 @@ +@@ -5185,7 +5424,11 @@ void idle_task_exit(void) switch_mm(mm, &init_mm, current); finish_arch_post_lock_switch(); } @@ -22109,7 +22483,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/core.c linux-4.4.13/kernel/sched/core.c } /* -@@ -5555,6 +5798,10 @@ +@@ -5558,6 +5801,10 @@ migration_call(struct notifier_block *nfb, unsigned long action, void *hcpu) case CPU_DEAD: calc_load_migrate(rq); @@ -22120,7 +22494,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/core.c linux-4.4.13/kernel/sched/core.c break; #endif } -@@ -7538,7 +7785,7 @@ +@@ -7541,7 +7788,7 @@ void __init sched_init(void) #ifdef CONFIG_DEBUG_ATOMIC_SLEEP static inline int preempt_count_equals(int preempt_offset) { @@ -22129,10 +22503,11 @@ diff -Nur linux-4.4.13.orig/kernel/sched/core.c linux-4.4.13/kernel/sched/core.c return (nested == preempt_offset); } -diff -Nur linux-4.4.13.orig/kernel/sched/cpudeadline.c linux-4.4.13/kernel/sched/cpudeadline.c ---- linux-4.4.13.orig/kernel/sched/cpudeadline.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/sched/cpudeadline.c 2016-06-22 21:55:08.058523867 +0200 -@@ -103,10 +103,10 @@ +diff --git a/kernel/sched/cpudeadline.c b/kernel/sched/cpudeadline.c +index 5a75b08cfd85..5be58820465c 100644 +--- a/kernel/sched/cpudeadline.c ++++ b/kernel/sched/cpudeadline.c +@@ -103,10 +103,10 @@ int cpudl_find(struct cpudl *cp, struct task_struct *p, const struct sched_dl_entity *dl_se = &p->dl; if (later_mask && @@ -22145,10 +22520,11 @@ diff -Nur linux-4.4.13.orig/kernel/sched/cpudeadline.c linux-4.4.13/kernel/sched dl_time_before(dl_se->deadline, cp->elements[0].dl)) { best_cpu = cpudl_maximum(cp); if (later_mask) -diff -Nur linux-4.4.13.orig/kernel/sched/cpupri.c linux-4.4.13/kernel/sched/cpupri.c ---- linux-4.4.13.orig/kernel/sched/cpupri.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/sched/cpupri.c 2016-06-22 21:55:08.058523867 +0200 -@@ -103,11 +103,11 @@ +diff --git a/kernel/sched/cpupri.c b/kernel/sched/cpupri.c +index 981fcd7dc394..11e9705bf937 100644 +--- a/kernel/sched/cpupri.c ++++ b/kernel/sched/cpupri.c +@@ -103,11 +103,11 @@ int cpupri_find(struct cpupri *cp, struct task_struct *p, if (skip) continue; @@ -22162,10 +22538,11 @@ diff -Nur linux-4.4.13.orig/kernel/sched/cpupri.c linux-4.4.13/kernel/sched/cpup /* * We have to ensure that we have at least one bit -diff -Nur linux-4.4.13.orig/kernel/sched/cputime.c linux-4.4.13/kernel/sched/cputime.c ---- linux-4.4.13.orig/kernel/sched/cputime.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/sched/cputime.c 2016-06-22 21:55:08.058523867 +0200 -@@ -680,7 +680,7 @@ +diff --git a/kernel/sched/cputime.c b/kernel/sched/cputime.c +index f74ea89e77a8..4611b1c1cb12 100644 +--- a/kernel/sched/cputime.c ++++ b/kernel/sched/cputime.c +@@ -680,7 +680,7 @@ static cputime_t get_vtime_delta(struct task_struct *tsk) { unsigned long long delta = vtime_delta(tsk); @@ -22174,7 +22551,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/cputime.c linux-4.4.13/kernel/sched/cpu tsk->vtime_snap += delta; /* CHECKME: always safe to convert nsecs to cputime? */ -@@ -696,37 +696,37 @@ +@@ -696,37 +696,37 @@ static void __vtime_account_system(struct task_struct *tsk) void vtime_account_system(struct task_struct *tsk) { @@ -22220,7 +22597,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/cputime.c linux-4.4.13/kernel/sched/cpu } void vtime_guest_enter(struct task_struct *tsk) -@@ -738,19 +738,19 @@ +@@ -738,19 +738,19 @@ void vtime_guest_enter(struct task_struct *tsk) * synchronization against the reader (task_gtime()) * that can thus safely catch up with a tickless delta. */ @@ -22244,7 +22621,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/cputime.c linux-4.4.13/kernel/sched/cpu } EXPORT_SYMBOL_GPL(vtime_guest_exit); -@@ -763,24 +763,26 @@ +@@ -763,24 +763,26 @@ void vtime_account_idle(struct task_struct *tsk) void arch_vtime_task_switch(struct task_struct *prev) { @@ -22278,7 +22655,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/cputime.c linux-4.4.13/kernel/sched/cpu } cputime_t task_gtime(struct task_struct *t) -@@ -792,13 +794,13 @@ +@@ -792,13 +794,13 @@ cputime_t task_gtime(struct task_struct *t) return t->gtime; do { @@ -22294,7 +22671,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/cputime.c linux-4.4.13/kernel/sched/cpu return gtime; } -@@ -821,7 +823,7 @@ +@@ -821,7 +823,7 @@ fetch_task_cputime(struct task_struct *t, *udelta = 0; *sdelta = 0; @@ -22303,7 +22680,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/cputime.c linux-4.4.13/kernel/sched/cpu if (u_dst) *u_dst = *u_src; -@@ -829,7 +831,7 @@ +@@ -829,7 +831,7 @@ fetch_task_cputime(struct task_struct *t, *s_dst = *s_src; /* Task is sleeping, nothing to add */ @@ -22312,7 +22689,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/cputime.c linux-4.4.13/kernel/sched/cpu is_idle_task(t)) continue; -@@ -845,7 +847,7 @@ +@@ -845,7 +847,7 @@ fetch_task_cputime(struct task_struct *t, if (t->vtime_snap_whence == VTIME_SYS) *sdelta = delta; } @@ -22321,10 +22698,11 @@ diff -Nur linux-4.4.13.orig/kernel/sched/cputime.c linux-4.4.13/kernel/sched/cpu } -diff -Nur linux-4.4.13.orig/kernel/sched/deadline.c linux-4.4.13/kernel/sched/deadline.c ---- linux-4.4.13.orig/kernel/sched/deadline.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/sched/deadline.c 2016-06-22 21:55:08.058523867 +0200 -@@ -134,7 +134,7 @@ +diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c +index 8b0a15e285f9..7a72e69fcf65 100644 +--- a/kernel/sched/deadline.c ++++ b/kernel/sched/deadline.c +@@ -134,7 +134,7 @@ static void inc_dl_migration(struct sched_dl_entity *dl_se, struct dl_rq *dl_rq) { struct task_struct *p = dl_task_of(dl_se); @@ -22333,7 +22711,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/deadline.c linux-4.4.13/kernel/sched/de dl_rq->dl_nr_migratory++; update_dl_migration(dl_rq); -@@ -144,7 +144,7 @@ +@@ -144,7 +144,7 @@ static void dec_dl_migration(struct sched_dl_entity *dl_se, struct dl_rq *dl_rq) { struct task_struct *p = dl_task_of(dl_se); @@ -22342,7 +22720,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/deadline.c linux-4.4.13/kernel/sched/de dl_rq->dl_nr_migratory--; update_dl_migration(dl_rq); -@@ -697,6 +697,7 @@ +@@ -697,6 +697,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; @@ -22350,7 +22728,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/deadline.c linux-4.4.13/kernel/sched/de } static -@@ -989,7 +990,7 @@ +@@ -989,7 +990,7 @@ static void enqueue_task_dl(struct rq *rq, struct task_struct *p, int flags) enqueue_dl_entity(&p->dl, pi_se, flags); @@ -22359,7 +22737,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/deadline.c linux-4.4.13/kernel/sched/de enqueue_pushable_dl_task(rq, p); } -@@ -1067,9 +1068,9 @@ +@@ -1067,9 +1068,9 @@ select_task_rq_dl(struct task_struct *p, int cpu, int sd_flag, int flags) * try to make it stay here, it might be important. */ if (unlikely(dl_task(curr)) && @@ -22371,7 +22749,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/deadline.c linux-4.4.13/kernel/sched/de int target = find_later_rq(p); if (target != -1 && -@@ -1090,7 +1091,7 @@ +@@ -1090,7 +1091,7 @@ static void check_preempt_equal_dl(struct rq *rq, struct task_struct *p) * Current can't be migrated, useless to reschedule, * let's hope p can move out. */ @@ -22380,7 +22758,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/deadline.c linux-4.4.13/kernel/sched/de cpudl_find(&rq->rd->cpudl, rq->curr, NULL) == -1) return; -@@ -1098,7 +1099,7 @@ +@@ -1098,7 +1099,7 @@ static void check_preempt_equal_dl(struct rq *rq, struct task_struct *p) * p is migratable, so let's not schedule it and * see if it is pushed or pulled somewhere else. */ @@ -22389,7 +22767,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/deadline.c linux-4.4.13/kernel/sched/de cpudl_find(&rq->rd->cpudl, p, NULL) != -1) return; -@@ -1212,7 +1213,7 @@ +@@ -1212,7 +1213,7 @@ static void put_prev_task_dl(struct rq *rq, struct task_struct *p) { update_curr_dl(rq); @@ -22398,7 +22776,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/deadline.c linux-4.4.13/kernel/sched/de enqueue_pushable_dl_task(rq, p); } -@@ -1335,7 +1336,7 @@ +@@ -1335,7 +1336,7 @@ static int find_later_rq(struct task_struct *task) if (unlikely(!later_mask)) return -1; @@ -22407,7 +22785,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/deadline.c linux-4.4.13/kernel/sched/de return -1; /* -@@ -1441,7 +1442,7 @@ +@@ -1441,7 +1442,7 @@ static struct rq *find_lock_later_rq(struct task_struct *task, struct rq *rq) if (double_lock_balance(rq, later_rq)) { if (unlikely(task_rq(task) != rq || !cpumask_test_cpu(later_rq->cpu, @@ -22416,7 +22794,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/deadline.c linux-4.4.13/kernel/sched/de task_running(rq, task) || !task_on_rq_queued(task))) { double_unlock_balance(rq, later_rq); -@@ -1480,7 +1481,7 @@ +@@ -1480,7 +1481,7 @@ static struct task_struct *pick_next_pushable_dl_task(struct rq *rq) BUG_ON(rq->cpu != task_cpu(p)); BUG_ON(task_current(rq, p)); @@ -22425,7 +22803,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/deadline.c linux-4.4.13/kernel/sched/de BUG_ON(!task_on_rq_queued(p)); BUG_ON(!dl_task(p)); -@@ -1519,7 +1520,7 @@ +@@ -1519,7 +1520,7 @@ retry: */ if (dl_task(rq->curr) && dl_time_before(next_task->dl.deadline, rq->curr->dl.deadline) && @@ -22434,7 +22812,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/deadline.c linux-4.4.13/kernel/sched/de resched_curr(rq); return 0; } -@@ -1666,9 +1667,9 @@ +@@ -1666,9 +1667,9 @@ static void task_woken_dl(struct rq *rq, struct task_struct *p) { if (!task_running(rq, p) && !test_tsk_need_resched(rq->curr) && @@ -22446,7 +22824,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/deadline.c linux-4.4.13/kernel/sched/de !dl_entity_preempt(&p->dl, &rq->curr->dl))) { push_dl_tasks(rq); } -@@ -1769,7 +1770,7 @@ +@@ -1769,7 +1770,7 @@ static void switched_to_dl(struct rq *rq, struct task_struct *p) { if (task_on_rq_queued(p) && rq->curr != p) { #ifdef CONFIG_SMP @@ -22455,10 +22833,11 @@ diff -Nur linux-4.4.13.orig/kernel/sched/deadline.c linux-4.4.13/kernel/sched/de queue_push_tasks(rq); #else if (dl_task(rq->curr)) -diff -Nur linux-4.4.13.orig/kernel/sched/debug.c linux-4.4.13/kernel/sched/debug.c ---- linux-4.4.13.orig/kernel/sched/debug.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/sched/debug.c 2016-06-22 21:55:08.058523867 +0200 -@@ -251,6 +251,9 @@ +diff --git a/kernel/sched/debug.c b/kernel/sched/debug.c +index 641511771ae6..a2d69b883623 100644 +--- a/kernel/sched/debug.c ++++ b/kernel/sched/debug.c +@@ -251,6 +251,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); @@ -22468,7 +22847,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/debug.c linux-4.4.13/kernel/sched/debug #undef PN #undef P -@@ -635,6 +638,10 @@ +@@ -635,6 +638,10 @@ void proc_sched_show_task(struct task_struct *p, struct seq_file *m) #endif P(policy); P(prio); @@ -22479,10 +22858,11 @@ diff -Nur linux-4.4.13.orig/kernel/sched/debug.c linux-4.4.13/kernel/sched/debug #undef PN #undef __PN #undef P -diff -Nur linux-4.4.13.orig/kernel/sched/fair.c linux-4.4.13/kernel/sched/fair.c ---- linux-4.4.13.orig/kernel/sched/fair.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/sched/fair.c 2016-06-22 21:55:08.058523867 +0200 -@@ -3135,7 +3135,7 @@ +diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c +index b8b516c37bf1..5e8dcb4615f4 100644 +--- a/kernel/sched/fair.c ++++ b/kernel/sched/fair.c +@@ -3150,7 +3150,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) { @@ -22491,7 +22871,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/fair.c linux-4.4.13/kernel/sched/fair.c /* * The current task ran long enough, ensure it doesn't get * re-elected due to buddy favours. -@@ -3159,7 +3159,7 @@ +@@ -3174,7 +3174,7 @@ check_preempt_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr) return; if (delta > ideal_runtime) @@ -22500,7 +22880,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/fair.c linux-4.4.13/kernel/sched/fair.c } static void -@@ -3299,7 +3299,7 @@ +@@ -3314,7 +3314,7 @@ entity_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr, int queued) * validating it and just reschedule. */ if (queued) { @@ -22509,7 +22889,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/fair.c linux-4.4.13/kernel/sched/fair.c return; } /* -@@ -3481,7 +3481,7 @@ +@@ -3496,7 +3496,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)) @@ -22518,7 +22898,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/fair.c linux-4.4.13/kernel/sched/fair.c } static __always_inline -@@ -4093,7 +4093,7 @@ +@@ -4108,7 +4108,7 @@ static void hrtick_start_fair(struct rq *rq, struct task_struct *p) if (delta < 0) { if (rq->curr == p) @@ -22527,7 +22907,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/fair.c linux-4.4.13/kernel/sched/fair.c return; } hrtick_start(rq, delta); -@@ -5177,7 +5177,7 @@ +@@ -5197,7 +5197,7 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_ return; preempt: @@ -22536,7 +22916,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/fair.c linux-4.4.13/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 -@@ -7928,7 +7928,7 @@ +@@ -7948,7 +7948,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); @@ -22545,7 +22925,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/fair.c linux-4.4.13/kernel/sched/fair.c } se->vruntime -= cfs_rq->min_vruntime; -@@ -7953,7 +7953,7 @@ +@@ -7973,7 +7973,7 @@ prio_changed_fair(struct rq *rq, struct task_struct *p, int oldprio) */ if (rq->curr == p) { if (p->prio > oldprio) @@ -22554,10 +22934,11 @@ diff -Nur linux-4.4.13.orig/kernel/sched/fair.c linux-4.4.13/kernel/sched/fair.c } else check_preempt_curr(rq, p, 0); } -diff -Nur linux-4.4.13.orig/kernel/sched/features.h linux-4.4.13/kernel/sched/features.h ---- linux-4.4.13.orig/kernel/sched/features.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/sched/features.h 2016-06-22 21:55:08.062523867 +0200 -@@ -45,11 +45,19 @@ +diff --git a/kernel/sched/features.h b/kernel/sched/features.h +index 69631fa46c2f..6d28fcd08872 100644 +--- a/kernel/sched/features.h ++++ b/kernel/sched/features.h +@@ -45,11 +45,19 @@ SCHED_FEAT(LB_BIAS, true) */ SCHED_FEAT(NONTASK_CAPACITY, true) @@ -22577,22 +22958,11 @@ diff -Nur linux-4.4.13.orig/kernel/sched/features.h linux-4.4.13/kernel/sched/fe #ifdef HAVE_RT_PUSH_IPI /* -diff -Nur linux-4.4.13.orig/kernel/sched/Makefile linux-4.4.13/kernel/sched/Makefile ---- linux-4.4.13.orig/kernel/sched/Makefile 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/sched/Makefile 2016-06-22 21:55:08.062523867 +0200 -@@ -13,7 +13,7 @@ - - obj-y += core.o loadavg.o clock.o cputime.o - obj-y += idle_task.o fair.o rt.o deadline.o stop_task.o --obj-y += wait.o completion.o idle.o -+obj-y += wait.o swait.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.4.13.orig/kernel/sched/rt.c linux-4.4.13/kernel/sched/rt.c ---- linux-4.4.13.orig/kernel/sched/rt.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/sched/rt.c 2016-06-22 21:55:08.062523867 +0200 -@@ -47,6 +47,7 @@ +diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c +index 8ec86abe0ea1..8cf360d309ec 100644 +--- a/kernel/sched/rt.c ++++ b/kernel/sched/rt.c +@@ -47,6 +47,7 @@ void init_rt_bandwidth(struct rt_bandwidth *rt_b, u64 period, u64 runtime) hrtimer_init(&rt_b->rt_period_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); @@ -22600,7 +22970,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/rt.c linux-4.4.13/kernel/sched/rt.c rt_b->rt_period_timer.function = sched_rt_period_timer; } -@@ -93,6 +94,7 @@ +@@ -93,6 +94,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); @@ -22608,7 +22978,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/rt.c linux-4.4.13/kernel/sched/rt.c #endif #endif /* CONFIG_SMP */ /* We start is dequeued state, because no RT tasks are queued */ -@@ -326,7 +328,7 @@ +@@ -326,7 +328,7 @@ static void inc_rt_migration(struct sched_rt_entity *rt_se, struct rt_rq *rt_rq) rt_rq = &rq_of_rt_rq(rt_rq)->rt; rt_rq->rt_nr_total++; @@ -22617,7 +22987,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/rt.c linux-4.4.13/kernel/sched/rt.c rt_rq->rt_nr_migratory++; update_rt_migration(rt_rq); -@@ -343,7 +345,7 @@ +@@ -343,7 +345,7 @@ static void dec_rt_migration(struct sched_rt_entity *rt_se, struct rt_rq *rt_rq) rt_rq = &rq_of_rt_rq(rt_rq)->rt; rt_rq->rt_nr_total--; @@ -22626,7 +22996,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/rt.c linux-4.4.13/kernel/sched/rt.c rt_rq->rt_nr_migratory--; update_rt_migration(rt_rq); -@@ -1262,7 +1264,7 @@ +@@ -1262,7 +1264,7 @@ enqueue_task_rt(struct rq *rq, struct task_struct *p, int flags) enqueue_rt_entity(rt_se, flags & ENQUEUE_HEAD); @@ -22635,7 +23005,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/rt.c linux-4.4.13/kernel/sched/rt.c enqueue_pushable_task(rq, p); } -@@ -1351,7 +1353,7 @@ +@@ -1351,7 +1353,7 @@ select_task_rq_rt(struct task_struct *p, int cpu, int sd_flag, int flags) * will have to sort it out. */ if (curr && unlikely(rt_task(curr)) && @@ -22644,7 +23014,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/rt.c linux-4.4.13/kernel/sched/rt.c curr->prio <= p->prio)) { int target = find_lowest_rq(p); -@@ -1375,7 +1377,7 @@ +@@ -1375,7 +1377,7 @@ static void check_preempt_equal_prio(struct rq *rq, struct task_struct *p) * Current can't be migrated, useless to reschedule, * let's hope p can move out. */ @@ -22653,7 +23023,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/rt.c linux-4.4.13/kernel/sched/rt.c !cpupri_find(&rq->rd->cpupri, rq->curr, NULL)) return; -@@ -1383,7 +1385,7 @@ +@@ -1383,7 +1385,7 @@ static void check_preempt_equal_prio(struct rq *rq, struct task_struct *p) * p is migratable, so let's not schedule it and * see if it is pushed or pulled somewhere else. */ @@ -22662,7 +23032,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/rt.c linux-4.4.13/kernel/sched/rt.c && cpupri_find(&rq->rd->cpupri, p, NULL)) return; -@@ -1517,7 +1519,7 @@ +@@ -1517,7 +1519,7 @@ static void put_prev_task_rt(struct rq *rq, struct task_struct *p) * The previous task needs to be made eligible for pushing * if it is still active */ @@ -22671,7 +23041,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/rt.c linux-4.4.13/kernel/sched/rt.c enqueue_pushable_task(rq, p); } -@@ -1567,7 +1569,7 @@ +@@ -1567,7 +1569,7 @@ static int find_lowest_rq(struct task_struct *task) if (unlikely(!lowest_mask)) return -1; @@ -22680,7 +23050,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/rt.c linux-4.4.13/kernel/sched/rt.c return -1; /* No other targets possible */ if (!cpupri_find(&task_rq(task)->rd->cpupri, task, lowest_mask)) -@@ -1699,7 +1701,7 @@ +@@ -1699,7 +1701,7 @@ static struct task_struct *pick_next_pushable_task(struct rq *rq) BUG_ON(rq->cpu != task_cpu(p)); BUG_ON(task_current(rq, p)); @@ -22689,7 +23059,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/rt.c linux-4.4.13/kernel/sched/rt.c BUG_ON(!task_on_rq_queued(p)); BUG_ON(!rt_task(p)); -@@ -2059,9 +2061,9 @@ +@@ -2059,9 +2061,9 @@ static void task_woken_rt(struct rq *rq, struct task_struct *p) { if (!task_running(rq, p) && !test_tsk_need_resched(rq->curr) && @@ -22701,7 +23071,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/rt.c linux-4.4.13/kernel/sched/rt.c rq->curr->prio <= p->prio)) push_rt_tasks(rq); } -@@ -2134,7 +2136,7 @@ +@@ -2134,7 +2136,7 @@ static void switched_to_rt(struct rq *rq, struct task_struct *p) */ if (task_on_rq_queued(p) && rq->curr != p) { #ifdef CONFIG_SMP @@ -22710,10 +23080,11 @@ diff -Nur linux-4.4.13.orig/kernel/sched/rt.c linux-4.4.13/kernel/sched/rt.c queue_push_tasks(rq); #else if (p->prio < rq->curr->prio) -diff -Nur linux-4.4.13.orig/kernel/sched/sched.h linux-4.4.13/kernel/sched/sched.h ---- linux-4.4.13.orig/kernel/sched/sched.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/sched/sched.h 2016-06-22 21:55:08.062523867 +0200 -@@ -1100,6 +1100,7 @@ +diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h +index 0517abd7dd73..a8a9b156ea15 100644 +--- a/kernel/sched/sched.h ++++ b/kernel/sched/sched.h +@@ -1100,6 +1100,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 */ @@ -22721,7 +23092,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/sched.h linux-4.4.13/kernel/sched/sched /* * To aid in avoiding the subversion of "niceness" due to uneven distribution -@@ -1299,6 +1300,15 @@ +@@ -1299,6 +1300,15 @@ extern void init_sched_fair_class(void); extern void resched_curr(struct rq *rq); extern void resched_cpu(int cpu); @@ -22737,9 +23108,11 @@ diff -Nur linux-4.4.13.orig/kernel/sched/sched.h linux-4.4.13/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.4.13.orig/kernel/sched/swait.c linux-4.4.13/kernel/sched/swait.c ---- linux-4.4.13.orig/kernel/sched/swait.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-4.4.13/kernel/sched/swait.c 2016-06-22 21:55:08.062523867 +0200 +diff --git a/kernel/sched/swait.c b/kernel/sched/swait.c +new file mode 100644 +index 000000000000..205fe36868f9 +--- /dev/null ++++ b/kernel/sched/swait.c @@ -0,0 +1,143 @@ +#include <linux/sched.h> +#include <linux/swait.h> @@ -22884,9 +23257,11 @@ diff -Nur linux-4.4.13.orig/kernel/sched/swait.c linux-4.4.13/kernel/sched/swait + } +} +EXPORT_SYMBOL(finish_swait); -diff -Nur linux-4.4.13.orig/kernel/sched/work-simple.c linux-4.4.13/kernel/sched/work-simple.c ---- linux-4.4.13.orig/kernel/sched/work-simple.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-4.4.13/kernel/sched/work-simple.c 2016-06-22 21:55:08.062523867 +0200 +diff --git a/kernel/sched/swork.c b/kernel/sched/swork.c +new file mode 100644 +index 000000000000..1950f40ca725 +--- /dev/null ++++ b/kernel/sched/swork.c @@ -0,0 +1,173 @@ +/* + * Copyright (C) 2014 BMW Car IT GmbH, Daniel Wagner daniel.wagner@bmw-carit.de @@ -22896,7 +23271,7 @@ diff -Nur linux-4.4.13.orig/kernel/sched/work-simple.c linux-4.4.13/kernel/sched + */ + +#include <linux/swait.h> -+#include <linux/work-simple.h> ++#include <linux/swork.h> +#include <linux/kthread.h> +#include <linux/slab.h> +#include <linux/spinlock.h> @@ -23061,9 +23436,10 @@ diff -Nur linux-4.4.13.orig/kernel/sched/work-simple.c linux-4.4.13/kernel/sched + mutex_unlock(&worker_mutex); +} +EXPORT_SYMBOL_GPL(swork_put); -diff -Nur linux-4.4.13.orig/kernel/signal.c linux-4.4.13/kernel/signal.c ---- linux-4.4.13.orig/kernel/signal.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/signal.c 2016-06-22 21:55:08.062523867 +0200 +diff --git a/kernel/signal.c b/kernel/signal.c +index f3f1f7a972fd..bc2c990f3f63 100644 +--- a/kernel/signal.c ++++ b/kernel/signal.c @@ -14,6 +14,7 @@ #include <linux/export.h> #include <linux/init.h> @@ -23072,7 +23448,7 @@ diff -Nur linux-4.4.13.orig/kernel/signal.c linux-4.4.13/kernel/signal.c #include <linux/fs.h> #include <linux/tty.h> #include <linux/binfmts.h> -@@ -352,13 +353,30 @@ +@@ -352,13 +353,30 @@ static bool task_participate_group_stop(struct task_struct *task) return false; } @@ -23104,7 +23480,7 @@ diff -Nur linux-4.4.13.orig/kernel/signal.c linux-4.4.13/kernel/signal.c { struct sigqueue *q = NULL; struct user_struct *user; -@@ -375,7 +393,10 @@ +@@ -375,7 +393,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)) { @@ -23116,7 +23492,7 @@ diff -Nur linux-4.4.13.orig/kernel/signal.c linux-4.4.13/kernel/signal.c } else { print_dropped_signal(sig); } -@@ -392,6 +413,13 @@ +@@ -392,6 +413,13 @@ __sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimi return q; } @@ -23130,7 +23506,7 @@ diff -Nur linux-4.4.13.orig/kernel/signal.c linux-4.4.13/kernel/signal.c static void __sigqueue_free(struct sigqueue *q) { if (q->flags & SIGQUEUE_PREALLOC) -@@ -401,6 +429,21 @@ +@@ -401,6 +429,21 @@ static void __sigqueue_free(struct sigqueue *q) kmem_cache_free(sigqueue_cachep, q); } @@ -23152,7 +23528,7 @@ diff -Nur linux-4.4.13.orig/kernel/signal.c linux-4.4.13/kernel/signal.c void flush_sigqueue(struct sigpending *queue) { struct sigqueue *q; -@@ -414,6 +457,21 @@ +@@ -414,6 +457,21 @@ void flush_sigqueue(struct sigpending *queue) } /* @@ -23174,7 +23550,7 @@ diff -Nur linux-4.4.13.orig/kernel/signal.c linux-4.4.13/kernel/signal.c * Flush all pending signals for this kthread. */ void flush_signals(struct task_struct *t) -@@ -525,7 +583,7 @@ +@@ -525,7 +583,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); @@ -23183,7 +23559,7 @@ diff -Nur linux-4.4.13.orig/kernel/signal.c linux-4.4.13/kernel/signal.c } else { /* * Ok, it wasn't in the queue. This must be -@@ -560,6 +618,8 @@ +@@ -560,6 +618,8 @@ int dequeue_signal(struct task_struct *tsk, sigset_t *mask, siginfo_t *info) { int signr; @@ -23192,7 +23568,7 @@ diff -Nur linux-4.4.13.orig/kernel/signal.c linux-4.4.13/kernel/signal.c /* We only dequeue private signals from ourselves, we don't let * signalfd steal them */ -@@ -1156,8 +1216,8 @@ +@@ -1156,8 +1216,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. */ @@ -23203,7 +23579,7 @@ diff -Nur linux-4.4.13.orig/kernel/signal.c linux-4.4.13/kernel/signal.c { unsigned long int flags; int ret, blocked, ignored; -@@ -1182,6 +1242,39 @@ +@@ -1182,6 +1242,39 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t) return ret; } @@ -23243,7 +23619,7 @@ diff -Nur linux-4.4.13.orig/kernel/signal.c linux-4.4.13/kernel/signal.c /* * Nuke all other threads in the group. */ -@@ -1216,12 +1309,12 @@ +@@ -1216,12 +1309,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. */ @@ -23258,7 +23634,7 @@ diff -Nur linux-4.4.13.orig/kernel/signal.c linux-4.4.13/kernel/signal.c break; } /* -@@ -1242,7 +1335,7 @@ +@@ -1242,7 +1335,7 @@ struct sighand_struct *__lock_task_sighand(struct task_struct *tsk, } spin_unlock(&sighand->siglock); rcu_read_unlock(); @@ -23267,7 +23643,7 @@ diff -Nur linux-4.4.13.orig/kernel/signal.c linux-4.4.13/kernel/signal.c } return sighand; -@@ -1485,7 +1578,8 @@ +@@ -1485,7 +1578,8 @@ EXPORT_SYMBOL(kill_pid); */ struct sigqueue *sigqueue_alloc(void) { @@ -23277,7 +23653,7 @@ diff -Nur linux-4.4.13.orig/kernel/signal.c linux-4.4.13/kernel/signal.c if (q) q->flags |= SIGQUEUE_PREALLOC; -@@ -1846,15 +1940,7 @@ +@@ -1846,15 +1940,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); @@ -23293,9 +23669,10 @@ diff -Nur linux-4.4.13.orig/kernel/signal.c linux-4.4.13/kernel/signal.c freezable_schedule(); } else { /* -diff -Nur linux-4.4.13.orig/kernel/softirq.c linux-4.4.13/kernel/softirq.c ---- linux-4.4.13.orig/kernel/softirq.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/softirq.c 2016-06-22 21:55:08.062523867 +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> @@ -23309,7 +23686,7 @@ diff -Nur linux-4.4.13.orig/kernel/softirq.c linux-4.4.13/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); @@ -23418,7 +23795,7 @@ diff -Nur linux-4.4.13.orig/kernel/softirq.c linux-4.4.13/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); } @@ -23498,7 +23875,7 @@ diff -Nur linux-4.4.13.orig/kernel/softirq.c linux-4.4.13/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 @@ -23510,7 +23887,7 @@ diff -Nur linux-4.4.13.orig/kernel/softirq.c linux-4.4.13/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; @@ -23521,7 +23898,7 @@ diff -Nur linux-4.4.13.orig/kernel/softirq.c linux-4.4.13/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); @@ -23559,7 +23936,7 @@ diff -Nur linux-4.4.13.orig/kernel/softirq.c linux-4.4.13/kernel/softirq.c pending = local_softirq_pending(); if (pending) { -@@ -320,6 +460,310 @@ +@@ -320,6 +460,310 @@ asmlinkage __visible void do_softirq(void) } /* @@ -23870,7 +24247,7 @@ diff -Nur linux-4.4.13.orig/kernel/softirq.c linux-4.4.13/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. */ @@ -23882,7 +24259,7 @@ diff -Nur linux-4.4.13.orig/kernel/softirq.c linux-4.4.13/kernel/softirq.c } __irq_enter(); -@@ -340,6 +784,7 @@ +@@ -340,6 +784,7 @@ void irq_enter(void) static inline void invoke_softirq(void) { @@ -23890,7 +24267,7 @@ diff -Nur linux-4.4.13.orig/kernel/softirq.c linux-4.4.13/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(); } @@ -23909,7 +24286,7 @@ diff -Nur linux-4.4.13.orig/kernel/softirq.c linux-4.4.13/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! */ } @@ -23936,7 +24313,7 @@ diff -Nur linux-4.4.13.orig/kernel/softirq.c linux-4.4.13/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); } @@ -23949,7 +24326,7 @@ diff -Nur linux-4.4.13.orig/kernel/softirq.c linux-4.4.13/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); @@ -23999,7 +24376,7 @@ diff -Nur linux-4.4.13.orig/kernel/softirq.c linux-4.4.13/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); @@ -24011,7 +24388,7 @@ diff -Nur linux-4.4.13.orig/kernel/softirq.c linux-4.4.13/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()); @@ -24183,7 +24560,7 @@ diff -Nur linux-4.4.13.orig/kernel/softirq.c linux-4.4.13/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 { @@ -24192,7 +24569,7 @@ diff -Nur linux-4.4.13.orig/kernel/softirq.c linux-4.4.13/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); } @@ -24234,7 +24611,7 @@ diff -Nur linux-4.4.13.orig/kernel/softirq.c linux-4.4.13/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, @@ -24266,10 +24643,11 @@ diff -Nur linux-4.4.13.orig/kernel/softirq.c linux-4.4.13/kernel/softirq.c return 0; } -diff -Nur linux-4.4.13.orig/kernel/stop_machine.c linux-4.4.13/kernel/stop_machine.c ---- linux-4.4.13.orig/kernel/stop_machine.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/stop_machine.c 2016-06-22 21:55:08.062523867 +0200 -@@ -37,7 +37,7 @@ +diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c +index a3bbaee77c58..f84d3b45cda7 100644 +--- a/kernel/stop_machine.c ++++ b/kernel/stop_machine.c +@@ -37,7 +37,7 @@ struct cpu_stop_done { struct cpu_stopper { struct task_struct *thread; @@ -24278,7 +24656,7 @@ diff -Nur linux-4.4.13.orig/kernel/stop_machine.c linux-4.4.13/kernel/stop_machi bool enabled; /* is this stopper enabled? */ struct list_head works; /* list of pending works */ -@@ -86,12 +86,12 @@ +@@ -86,12 +86,12 @@ static void cpu_stop_queue_work(unsigned int cpu, struct cpu_stop_work *work) struct cpu_stopper *stopper = &per_cpu(cpu_stopper, cpu); unsigned long flags; @@ -24293,7 +24671,7 @@ diff -Nur linux-4.4.13.orig/kernel/stop_machine.c linux-4.4.13/kernel/stop_machi } /** -@@ -224,8 +224,8 @@ +@@ -224,8 +224,8 @@ static int cpu_stop_queue_two_works(int cpu1, struct cpu_stop_work *work1, int err; lg_double_lock(&stop_cpus_lock, cpu1, cpu2); @@ -24304,7 +24682,7 @@ diff -Nur linux-4.4.13.orig/kernel/stop_machine.c linux-4.4.13/kernel/stop_machi err = -ENOENT; if (!stopper1->enabled || !stopper2->enabled) -@@ -235,8 +235,8 @@ +@@ -235,8 +235,8 @@ static int cpu_stop_queue_two_works(int cpu1, struct cpu_stop_work *work1, __cpu_stop_queue_work(stopper1, work1); __cpu_stop_queue_work(stopper2, work2); unlock: @@ -24315,7 +24693,7 @@ diff -Nur linux-4.4.13.orig/kernel/stop_machine.c linux-4.4.13/kernel/stop_machi lg_double_unlock(&stop_cpus_lock, cpu1, cpu2); return err; -@@ -258,7 +258,7 @@ +@@ -258,7 +258,7 @@ int stop_two_cpus(unsigned int cpu1, unsigned int cpu2, cpu_stop_fn_t fn, void * struct cpu_stop_work work1, work2; struct multi_stop_data msdata; @@ -24324,7 +24702,7 @@ diff -Nur linux-4.4.13.orig/kernel/stop_machine.c linux-4.4.13/kernel/stop_machi msdata = (struct multi_stop_data){ .fn = fn, .data = arg, -@@ -278,11 +278,11 @@ +@@ -278,11 +278,11 @@ int stop_two_cpus(unsigned int cpu1, unsigned int cpu2, cpu_stop_fn_t fn, void * if (cpu1 > cpu2) swap(cpu1, cpu2); if (cpu_stop_queue_two_works(cpu1, &work1, cpu2, &work2)) { @@ -24338,7 +24716,7 @@ diff -Nur linux-4.4.13.orig/kernel/stop_machine.c linux-4.4.13/kernel/stop_machi wait_for_completion(&done.completion); -@@ -315,17 +315,20 @@ +@@ -315,17 +315,20 @@ static DEFINE_MUTEX(stop_cpus_mutex); static void queue_stop_cpus_work(const struct cpumask *cpumask, cpu_stop_fn_t fn, void *arg, @@ -24364,7 +24742,7 @@ diff -Nur linux-4.4.13.orig/kernel/stop_machine.c linux-4.4.13/kernel/stop_machi for_each_cpu(cpu, cpumask) { work = &per_cpu(cpu_stopper.stop_work, cpu); work->fn = fn; -@@ -342,7 +345,7 @@ +@@ -342,7 +345,7 @@ static int __stop_cpus(const struct cpumask *cpumask, struct cpu_stop_done done; cpu_stop_init_done(&done, cpumask_weight(cpumask)); @@ -24373,7 +24751,7 @@ diff -Nur linux-4.4.13.orig/kernel/stop_machine.c linux-4.4.13/kernel/stop_machi wait_for_completion(&done.completion); return done.executed ? done.ret : -ENOENT; } -@@ -422,9 +425,9 @@ +@@ -422,9 +425,9 @@ static int cpu_stop_should_run(unsigned int cpu) unsigned long flags; int run; @@ -24385,7 +24763,7 @@ diff -Nur linux-4.4.13.orig/kernel/stop_machine.c linux-4.4.13/kernel/stop_machi return run; } -@@ -436,13 +439,13 @@ +@@ -436,13 +439,13 @@ static void cpu_stopper_thread(unsigned int cpu) repeat: work = NULL; @@ -24401,7 +24779,7 @@ diff -Nur linux-4.4.13.orig/kernel/stop_machine.c linux-4.4.13/kernel/stop_machi if (work) { cpu_stop_fn_t fn = work->fn; -@@ -450,6 +453,16 @@ +@@ -450,6 +453,16 @@ repeat: struct cpu_stop_done *done = work->done; char ksym_buf[KSYM_NAME_LEN] __maybe_unused; @@ -24418,7 +24796,7 @@ diff -Nur linux-4.4.13.orig/kernel/stop_machine.c linux-4.4.13/kernel/stop_machi /* cpu stop callbacks are not allowed to sleep */ preempt_disable(); -@@ -520,10 +533,12 @@ +@@ -520,10 +533,12 @@ static int __init cpu_stop_init(void) for_each_possible_cpu(cpu) { struct cpu_stopper *stopper = &per_cpu(cpu_stopper, cpu); @@ -24432,7 +24810,7 @@ diff -Nur linux-4.4.13.orig/kernel/stop_machine.c linux-4.4.13/kernel/stop_machi BUG_ON(smpboot_register_percpu_thread(&cpu_stop_threads)); stop_machine_unpark(raw_smp_processor_id()); stop_machine_initialized = true; -@@ -620,7 +635,7 @@ +@@ -620,7 +635,7 @@ int stop_machine_from_inactive_cpu(cpu_stop_fn_t fn, 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, @@ -24441,9 +24819,10 @@ diff -Nur linux-4.4.13.orig/kernel/stop_machine.c linux-4.4.13/kernel/stop_machi ret = multi_cpu_stop(&msdata); /* Busy wait for completion. */ -diff -Nur linux-4.4.13.orig/kernel/time/hrtimer.c linux-4.4.13/kernel/time/hrtimer.c ---- linux-4.4.13.orig/kernel/time/hrtimer.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/time/hrtimer.c 2016-06-22 21:55:08.062523867 +0200 +diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c +index fa909f9fd559..2cc3675e6864 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> @@ -24458,7 +24837,7 @@ diff -Nur linux-4.4.13.orig/kernel/time/hrtimer.c linux-4.4.13/kernel/time/hrtim #include "tick-internal.h" -@@ -712,6 +714,44 @@ +@@ -712,6 +714,44 @@ static void clock_was_set_work(struct work_struct *work) static DECLARE_WORK(hrtimer_work, clock_was_set_work); @@ -24503,7 +24882,7 @@ diff -Nur linux-4.4.13.orig/kernel/time/hrtimer.c linux-4.4.13/kernel/time/hrtim /* * Called from timekeeping and resume code to reprogramm the hrtimer * interrupt device on all cpus. -@@ -720,6 +760,7 @@ +@@ -720,6 +760,7 @@ void clock_was_set_delayed(void) { schedule_work(&hrtimer_work); } @@ -24511,7 +24890,7 @@ diff -Nur linux-4.4.13.orig/kernel/time/hrtimer.c linux-4.4.13/kernel/time/hrtim #else -@@ -729,11 +770,8 @@ +@@ -729,11 +770,8 @@ static inline int hrtimer_is_hres_enabled(void) { return 0; } static inline void hrtimer_switch_to_hres(void) { } static inline void hrtimer_force_reprogram(struct hrtimer_cpu_base *base, int skip_equal) { } @@ -24525,7 +24904,7 @@ diff -Nur linux-4.4.13.orig/kernel/time/hrtimer.c linux-4.4.13/kernel/time/hrtim static inline void hrtimer_init_hres(struct hrtimer_cpu_base *base) { } static inline void retrigger_next_event(void *arg) { } -@@ -865,6 +903,32 @@ +@@ -865,6 +903,32 @@ u64 hrtimer_forward(struct hrtimer *timer, ktime_t now, ktime_t interval) } EXPORT_SYMBOL_GPL(hrtimer_forward); @@ -24558,7 +24937,7 @@ diff -Nur linux-4.4.13.orig/kernel/time/hrtimer.c linux-4.4.13/kernel/time/hrtim /* * enqueue_hrtimer - internal function to (re)start a timer * -@@ -906,6 +970,11 @@ +@@ -906,6 +970,11 @@ static void __remove_hrtimer(struct hrtimer *timer, if (!(state & HRTIMER_STATE_ENQUEUED)) return; @@ -24570,7 +24949,7 @@ diff -Nur linux-4.4.13.orig/kernel/time/hrtimer.c linux-4.4.13/kernel/time/hrtim if (!timerqueue_del(&base->active, &timer->node)) cpu_base->active_bases &= ~(1 << base->index); -@@ -1001,7 +1070,16 @@ +@@ -1001,7 +1070,16 @@ void 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); @@ -24587,7 +24966,7 @@ diff -Nur linux-4.4.13.orig/kernel/time/hrtimer.c linux-4.4.13/kernel/time/hrtim leftmost = enqueue_hrtimer(timer, new_base); if (!leftmost) goto unlock; -@@ -1073,7 +1151,7 @@ +@@ -1073,7 +1151,7 @@ int hrtimer_cancel(struct hrtimer *timer) if (ret >= 0) return ret; @@ -24596,7 +24975,7 @@ diff -Nur linux-4.4.13.orig/kernel/time/hrtimer.c linux-4.4.13/kernel/time/hrtim } } EXPORT_SYMBOL_GPL(hrtimer_cancel); -@@ -1137,6 +1215,7 @@ +@@ -1137,6 +1215,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]; @@ -24604,7 +24983,7 @@ diff -Nur linux-4.4.13.orig/kernel/time/hrtimer.c linux-4.4.13/kernel/time/hrtim timerqueue_init(&timer->node); #ifdef CONFIG_TIMER_STATS -@@ -1177,6 +1256,7 @@ +@@ -1177,6 +1256,7 @@ bool hrtimer_active(const struct hrtimer *timer) seq = raw_read_seqcount_begin(&cpu_base->seq); if (timer->state != HRTIMER_STATE_INACTIVE || @@ -24612,7 +24991,7 @@ diff -Nur linux-4.4.13.orig/kernel/time/hrtimer.c linux-4.4.13/kernel/time/hrtim cpu_base->running == timer) return true; -@@ -1275,10 +1355,112 @@ +@@ -1275,10 +1355,112 @@ static void __run_hrtimer(struct hrtimer_cpu_base *cpu_base, cpu_base->running = NULL; } @@ -24725,7 +25104,7 @@ diff -Nur linux-4.4.13.orig/kernel/time/hrtimer.c linux-4.4.13/kernel/time/hrtim for (; active; base++, active >>= 1) { struct timerqueue_node *node; -@@ -1294,6 +1476,15 @@ +@@ -1294,6 +1476,15 @@ static void __hrtimer_run_queues(struct hrtimer_cpu_base *cpu_base, ktime_t now) timer = container_of(node, struct hrtimer, node); @@ -24741,7 +25120,7 @@ diff -Nur linux-4.4.13.orig/kernel/time/hrtimer.c linux-4.4.13/kernel/time/hrtim /* * The immediate goal for using the softexpires is * minimizing wakeups, not running timers at the -@@ -1309,9 +1500,14 @@ +@@ -1309,9 +1500,14 @@ static void __hrtimer_run_queues(struct hrtimer_cpu_base *cpu_base, ktime_t now) if (basenow.tv64 < hrtimer_get_softexpires_tv64(timer)) break; @@ -24757,7 +25136,7 @@ diff -Nur linux-4.4.13.orig/kernel/time/hrtimer.c linux-4.4.13/kernel/time/hrtim } #ifdef CONFIG_HIGH_RES_TIMERS -@@ -1474,16 +1670,18 @@ +@@ -1474,16 +1670,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; @@ -24778,7 +25157,7 @@ diff -Nur linux-4.4.13.orig/kernel/time/hrtimer.c linux-4.4.13/kernel/time/hrtim hrtimer_start_expires(&t->timer, mode); if (likely(t->task)) -@@ -1525,7 +1723,8 @@ +@@ -1525,7 +1723,8 @@ long __sched hrtimer_nanosleep_restart(struct restart_block *restart) HRTIMER_MODE_ABS); hrtimer_set_expires_tv64(&t.timer, restart->nanosleep.expires); @@ -24788,7 +25167,7 @@ diff -Nur linux-4.4.13.orig/kernel/time/hrtimer.c linux-4.4.13/kernel/time/hrtim goto out; rmtp = restart->nanosleep.rmtp; -@@ -1542,8 +1741,10 @@ +@@ -1542,8 +1741,10 @@ out: return ret; } @@ -24801,7 +25180,7 @@ diff -Nur linux-4.4.13.orig/kernel/time/hrtimer.c linux-4.4.13/kernel/time/hrtim { struct restart_block *restart; struct hrtimer_sleeper t; -@@ -1556,7 +1757,7 @@ +@@ -1556,7 +1757,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); @@ -24810,7 +25189,7 @@ diff -Nur linux-4.4.13.orig/kernel/time/hrtimer.c linux-4.4.13/kernel/time/hrtim goto out; /* Absolute timers do not update the rmtp value and restart: */ -@@ -1583,6 +1784,12 @@ +@@ -1583,6 +1784,12 @@ out: return ret; } @@ -24823,7 +25202,7 @@ diff -Nur linux-4.4.13.orig/kernel/time/hrtimer.c linux-4.4.13/kernel/time/hrtim SYSCALL_DEFINE2(nanosleep, struct timespec __user *, rqtp, struct timespec __user *, rmtp) { -@@ -1597,6 +1804,26 @@ +@@ -1597,6 +1804,26 @@ SYSCALL_DEFINE2(nanosleep, struct timespec __user *, rqtp, return hrtimer_nanosleep(&tu, rmtp, HRTIMER_MODE_REL, CLOCK_MONOTONIC); } @@ -24850,7 +25229,7 @@ diff -Nur linux-4.4.13.orig/kernel/time/hrtimer.c linux-4.4.13/kernel/time/hrtim /* * Functions related to boot-time initialization: */ -@@ -1608,10 +1835,14 @@ +@@ -1608,10 +1835,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); @@ -24865,7 +25244,7 @@ diff -Nur linux-4.4.13.orig/kernel/time/hrtimer.c linux-4.4.13/kernel/time/hrtim } #ifdef CONFIG_HOTPLUG_CPU -@@ -1709,11 +1940,21 @@ +@@ -1709,11 +1940,21 @@ static struct notifier_block hrtimers_nb = { .notifier_call = hrtimer_cpu_notify, }; @@ -24887,10 +25266,11 @@ diff -Nur linux-4.4.13.orig/kernel/time/hrtimer.c linux-4.4.13/kernel/time/hrtim } /** -diff -Nur linux-4.4.13.orig/kernel/time/itimer.c linux-4.4.13/kernel/time/itimer.c ---- linux-4.4.13.orig/kernel/time/itimer.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/time/itimer.c 2016-06-22 21:55:08.062523867 +0200 -@@ -213,6 +213,7 @@ +diff --git a/kernel/time/itimer.c b/kernel/time/itimer.c +index 1d5c7204ddc9..184de6751180 100644 +--- a/kernel/time/itimer.c ++++ b/kernel/time/itimer.c +@@ -213,6 +213,7 @@ again: /* We are sharing ->siglock with it_real_fn() */ if (hrtimer_try_to_cancel(timer) < 0) { spin_unlock_irq(&tsk->sighand->siglock); @@ -24898,10 +25278,11 @@ diff -Nur linux-4.4.13.orig/kernel/time/itimer.c linux-4.4.13/kernel/time/itimer goto again; } expires = timeval_to_ktime(value->it_value); -diff -Nur linux-4.4.13.orig/kernel/time/jiffies.c linux-4.4.13/kernel/time/jiffies.c ---- linux-4.4.13.orig/kernel/time/jiffies.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/time/jiffies.c 2016-06-22 21:55:08.062523867 +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, }; @@ -24911,7 +25292,7 @@ diff -Nur linux-4.4.13.orig/kernel/time/jiffies.c linux-4.4.13/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 { @@ -24923,9 +25304,10 @@ diff -Nur linux-4.4.13.orig/kernel/time/jiffies.c linux-4.4.13/kernel/time/jiffi return ret; } EXPORT_SYMBOL(get_jiffies_64); -diff -Nur linux-4.4.13.orig/kernel/time/ntp.c linux-4.4.13/kernel/time/ntp.c ---- linux-4.4.13.orig/kernel/time/ntp.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/time/ntp.c 2016-06-22 21:55:08.062523867 +0200 +diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c +index 149cc8086aea..cd925efb239a 100644 +--- a/kernel/time/ntp.c ++++ b/kernel/time/ntp.c @@ -10,6 +10,7 @@ #include <linux/workqueue.h> #include <linux/hrtimer.h> @@ -24934,7 +25316,7 @@ diff -Nur linux-4.4.13.orig/kernel/time/ntp.c linux-4.4.13/kernel/time/ntp.c #include <linux/math64.h> #include <linux/timex.h> #include <linux/time.h> -@@ -562,10 +563,52 @@ +@@ -562,10 +563,52 @@ static void sync_cmos_clock(struct work_struct *work) &sync_cmos_work, timespec64_to_jiffies(&next)); } @@ -24987,9 +25369,10 @@ diff -Nur linux-4.4.13.orig/kernel/time/ntp.c linux-4.4.13/kernel/time/ntp.c #else void ntp_notify_cmos_timer(void) { } -diff -Nur linux-4.4.13.orig/kernel/time/posix-cpu-timers.c linux-4.4.13/kernel/time/posix-cpu-timers.c ---- linux-4.4.13.orig/kernel/time/posix-cpu-timers.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/time/posix-cpu-timers.c 2016-06-22 21:55:08.066523867 +0200 +diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c +index 80016b329d94..b7342b6e6a5a 100644 +--- a/kernel/time/posix-cpu-timers.c ++++ b/kernel/time/posix-cpu-timers.c @@ -3,6 +3,7 @@ */ @@ -24998,7 +25381,7 @@ diff -Nur linux-4.4.13.orig/kernel/time/posix-cpu-timers.c linux-4.4.13/kernel/t #include <linux/posix-timers.h> #include <linux/errno.h> #include <linux/math64.h> -@@ -650,7 +651,7 @@ +@@ -650,7 +651,7 @@ static int posix_cpu_timer_set(struct k_itimer *timer, int timer_flags, /* * Disarm any old timer after extracting its expiry time. */ @@ -25007,7 +25390,7 @@ diff -Nur linux-4.4.13.orig/kernel/time/posix-cpu-timers.c linux-4.4.13/kernel/t ret = 0; old_incr = timer->it.cpu.incr; -@@ -1091,7 +1092,7 @@ +@@ -1092,7 +1093,7 @@ void posix_cpu_timer_schedule(struct k_itimer *timer) /* * Now re-arm for the new expiry time. */ @@ -25016,7 +25399,7 @@ diff -Nur linux-4.4.13.orig/kernel/time/posix-cpu-timers.c linux-4.4.13/kernel/t arm_timer(timer); unlock_task_sighand(p, &flags); -@@ -1182,13 +1183,13 @@ +@@ -1183,13 +1184,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. */ @@ -25032,7 +25415,7 @@ diff -Nur linux-4.4.13.orig/kernel/time/posix-cpu-timers.c linux-4.4.13/kernel/t /* * The fast path checks that there are no expired thread or thread -@@ -1242,6 +1243,190 @@ +@@ -1243,6 +1244,190 @@ void run_posix_cpu_timers(struct task_struct *tsk) } } @@ -25223,10 +25606,11 @@ diff -Nur linux-4.4.13.orig/kernel/time/posix-cpu-timers.c linux-4.4.13/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.4.13.orig/kernel/time/posix-timers.c linux-4.4.13/kernel/time/posix-timers.c ---- linux-4.4.13.orig/kernel/time/posix-timers.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/time/posix-timers.c 2016-06-22 21:55:08.066523867 +0200 -@@ -506,6 +506,7 @@ +diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c +index f2826c35e918..464a98155a0e 100644 +--- a/kernel/time/posix-timers.c ++++ b/kernel/time/posix-timers.c +@@ -506,6 +506,7 @@ static enum hrtimer_restart posix_timer_fn(struct hrtimer *timer) static struct pid *good_sigevent(sigevent_t * event) { struct task_struct *rtn = current->group_leader; @@ -25234,7 +25618,7 @@ diff -Nur linux-4.4.13.orig/kernel/time/posix-timers.c linux-4.4.13/kernel/time/ if ((event->sigev_notify & SIGEV_THREAD_ID ) && (!(rtn = find_task_by_vpid(event->sigev_notify_thread_id)) || -@@ -514,7 +515,8 @@ +@@ -514,7 +515,8 @@ static struct pid *good_sigevent(sigevent_t * event) return NULL; if (((event->sigev_notify & ~SIGEV_THREAD_ID) != SIGEV_NONE) && @@ -25244,7 +25628,7 @@ diff -Nur linux-4.4.13.orig/kernel/time/posix-timers.c linux-4.4.13/kernel/time/ return NULL; return task_pid(rtn); -@@ -826,6 +828,20 @@ +@@ -826,6 +828,20 @@ SYSCALL_DEFINE1(timer_getoverrun, timer_t, timer_id) return overrun; } @@ -25265,7 +25649,7 @@ diff -Nur linux-4.4.13.orig/kernel/time/posix-timers.c linux-4.4.13/kernel/time/ /* Set a POSIX.1b interval timer. */ /* timr->it_lock is taken. */ static int -@@ -903,6 +919,7 @@ +@@ -903,6 +919,7 @@ retry: if (!timr) return -EINVAL; @@ -25273,7 +25657,7 @@ diff -Nur linux-4.4.13.orig/kernel/time/posix-timers.c linux-4.4.13/kernel/time/ kc = clockid_to_kclock(timr->it_clock); if (WARN_ON_ONCE(!kc || !kc->timer_set)) error = -EINVAL; -@@ -911,9 +928,12 @@ +@@ -911,9 +928,12 @@ retry: unlock_timer(timr, flag); if (error == TIMER_RETRY) { @@ -25286,7 +25670,7 @@ diff -Nur linux-4.4.13.orig/kernel/time/posix-timers.c linux-4.4.13/kernel/time/ if (old_setting && !error && copy_to_user(old_setting, &old_spec, sizeof (old_spec))) -@@ -951,10 +971,15 @@ +@@ -951,10 +971,15 @@ retry_delete: if (!timer) return -EINVAL; @@ -25302,7 +25686,7 @@ diff -Nur linux-4.4.13.orig/kernel/time/posix-timers.c linux-4.4.13/kernel/time/ spin_lock(¤t->sighand->siglock); list_del(&timer->list); -@@ -980,8 +1005,18 @@ +@@ -980,8 +1005,18 @@ static void itimer_delete(struct k_itimer *timer) retry_delete: spin_lock_irqsave(&timer->it_lock, flags); @@ -25321,20 +25705,22 @@ diff -Nur linux-4.4.13.orig/kernel/time/posix-timers.c linux-4.4.13/kernel/time/ goto retry_delete; } list_del(&timer->list); -diff -Nur linux-4.4.13.orig/kernel/time/tick-broadcast-hrtimer.c linux-4.4.13/kernel/time/tick-broadcast-hrtimer.c ---- linux-4.4.13.orig/kernel/time/tick-broadcast-hrtimer.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/time/tick-broadcast-hrtimer.c 2016-06-22 21:55:08.066523867 +0200 -@@ -106,5 +106,6 @@ +diff --git a/kernel/time/tick-broadcast-hrtimer.c b/kernel/time/tick-broadcast-hrtimer.c +index 53d7184da0be..1b4ac3361c3f 100644 +--- a/kernel/time/tick-broadcast-hrtimer.c ++++ b/kernel/time/tick-broadcast-hrtimer.c +@@ -106,5 +106,6 @@ void tick_setup_hrtimer_broadcast(void) { 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.4.13.orig/kernel/time/tick-common.c linux-4.4.13/kernel/time/tick-common.c ---- linux-4.4.13.orig/kernel/time/tick-common.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/time/tick-common.c 2016-06-22 21:55:08.066523867 +0200 -@@ -79,13 +79,15 @@ +diff --git a/kernel/time/tick-common.c b/kernel/time/tick-common.c +index 4fcd99e12aa0..5a47f2e98faf 100644 +--- a/kernel/time/tick-common.c ++++ b/kernel/time/tick-common.c +@@ -79,13 +79,15 @@ int tick_is_oneshot_available(void) static void tick_periodic(int cpu) { if (tick_do_timer_cpu == cpu) { @@ -25352,7 +25738,7 @@ diff -Nur linux-4.4.13.orig/kernel/time/tick-common.c linux-4.4.13/kernel/time/t update_wall_time(); } -@@ -157,9 +159,9 @@ +@@ -157,9 +159,9 @@ void tick_setup_periodic(struct clock_event_device *dev, int broadcast) ktime_t next; do { @@ -25364,10 +25750,11 @@ diff -Nur linux-4.4.13.orig/kernel/time/tick-common.c linux-4.4.13/kernel/time/t clockevents_switch_state(dev, CLOCK_EVT_STATE_ONESHOT); -diff -Nur linux-4.4.13.orig/kernel/time/tick-sched.c linux-4.4.13/kernel/time/tick-sched.c ---- linux-4.4.13.orig/kernel/time/tick-sched.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/time/tick-sched.c 2016-06-22 21:55:08.066523867 +0200 -@@ -62,7 +62,8 @@ +diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c +index 22c57e191a23..d536824cbd36 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 */ @@ -25377,7 +25764,7 @@ diff -Nur linux-4.4.13.orig/kernel/time/tick-sched.c linux-4.4.13/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 { @@ -25392,7 +25779,7 @@ diff -Nur linux-4.4.13.orig/kernel/time/tick-sched.c linux-4.4.13/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; @@ -25409,7 +25796,7 @@ diff -Nur linux-4.4.13.orig/kernel/time/tick-sched.c linux-4.4.13/kernel/time/ti return period; } -@@ -176,6 +181,11 @@ +@@ -176,6 +181,11 @@ static bool can_stop_full_tick(void) return false; } @@ -25421,7 +25808,7 @@ diff -Nur linux-4.4.13.orig/kernel/time/tick-sched.c linux-4.4.13/kernel/time/ti /* sched_clock_tick() needs us? */ #ifdef CONFIG_HAVE_UNSTABLE_SCHED_CLOCK /* -@@ -204,6 +214,7 @@ +@@ -204,6 +214,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, @@ -25429,7 +25816,7 @@ diff -Nur linux-4.4.13.orig/kernel/time/tick-sched.c linux-4.4.13/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 { @@ -25442,7 +25829,7 @@ diff -Nur linux-4.4.13.orig/kernel/time/tick-sched.c linux-4.4.13/kernel/time/ti ts->last_jiffies = basejiff; if (rcu_needs_cpu(basemono, &next_rcu) || -@@ -753,14 +764,7 @@ +@@ -753,14 +764,7 @@ static bool can_stop_idle_tick(int cpu, struct tick_sched *ts) return false; if (unlikely(local_softirq_pending() && cpu_online(cpu))) { @@ -25458,7 +25845,7 @@ diff -Nur linux-4.4.13.orig/kernel/time/tick-sched.c linux-4.4.13/kernel/time/ti return false; } -@@ -1100,6 +1104,7 @@ +@@ -1100,6 +1104,7 @@ void tick_setup_sched_timer(void) * Emulate tick processing via per-CPU hrtimers: */ hrtimer_init(&ts->sched_timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS); @@ -25466,10 +25853,11 @@ diff -Nur linux-4.4.13.orig/kernel/time/tick-sched.c linux-4.4.13/kernel/time/ti ts->sched_timer.function = tick_sched_timer; /* Get the next period (per cpu) */ -diff -Nur linux-4.4.13.orig/kernel/time/timekeeping.c linux-4.4.13/kernel/time/timekeeping.c ---- linux-4.4.13.orig/kernel/time/timekeeping.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/time/timekeeping.c 2016-06-22 21:55:08.066523867 +0200 -@@ -2047,8 +2047,10 @@ +diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c +index 99188ee5d9d0..a1c5c6fc233a 100644 +--- a/kernel/time/timekeeping.c ++++ b/kernel/time/timekeeping.c +@@ -2047,8 +2047,10 @@ EXPORT_SYMBOL(hardpps); */ void xtime_update(unsigned long ticks) { @@ -25482,10 +25870,11 @@ diff -Nur linux-4.4.13.orig/kernel/time/timekeeping.c linux-4.4.13/kernel/time/t + raw_spin_unlock(&jiffies_lock); update_wall_time(); } -diff -Nur linux-4.4.13.orig/kernel/time/timekeeping.h linux-4.4.13/kernel/time/timekeeping.h ---- linux-4.4.13.orig/kernel/time/timekeeping.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/time/timekeeping.h 2016-06-22 21:55:08.066523867 +0200 -@@ -19,7 +19,8 @@ +diff --git a/kernel/time/timekeeping.h b/kernel/time/timekeeping.h +index 704f595ce83f..763a3e5121ff 100644 +--- a/kernel/time/timekeeping.h ++++ b/kernel/time/timekeeping.h +@@ -19,7 +19,8 @@ extern void timekeeping_resume(void); extern void do_timer(unsigned long ticks); extern void update_wall_time(void); @@ -25495,10 +25884,11 @@ diff -Nur linux-4.4.13.orig/kernel/time/timekeeping.h linux-4.4.13/kernel/time/t #define CS_NAME_LEN 32 -diff -Nur linux-4.4.13.orig/kernel/time/timer.c linux-4.4.13/kernel/time/timer.c ---- linux-4.4.13.orig/kernel/time/timer.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/time/timer.c 2016-06-22 21:55:08.066523867 +0200 -@@ -80,6 +80,9 @@ +diff --git a/kernel/time/timer.c b/kernel/time/timer.c +index bbc5d1114583..fee8682c209e 100644 +--- a/kernel/time/timer.c ++++ b/kernel/time/timer.c +@@ -80,6 +80,9 @@ struct tvec_root { struct tvec_base { spinlock_t lock; struct timer_list *running_timer; @@ -25508,7 +25898,7 @@ diff -Nur linux-4.4.13.orig/kernel/time/timer.c linux-4.4.13/kernel/time/timer.c unsigned long timer_jiffies; unsigned long next_timer; unsigned long active_timers; -@@ -777,6 +780,39 @@ +@@ -777,6 +780,39 @@ static struct tvec_base *lock_timer_base(struct timer_list *timer, cpu_relax(); } } @@ -25548,7 +25938,7 @@ diff -Nur linux-4.4.13.orig/kernel/time/timer.c linux-4.4.13/kernel/time/timer.c static inline int __mod_timer(struct timer_list *timer, unsigned long expires, -@@ -807,16 +843,8 @@ +@@ -807,16 +843,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. */ @@ -25567,7 +25957,7 @@ diff -Nur linux-4.4.13.orig/kernel/time/timer.c linux-4.4.13/kernel/time/timer.c } timer->expires = expires; -@@ -1006,6 +1034,33 @@ +@@ -1006,6 +1034,33 @@ void add_timer_on(struct timer_list *timer, int cpu) } EXPORT_SYMBOL_GPL(add_timer_on); @@ -25601,7 +25991,7 @@ diff -Nur linux-4.4.13.orig/kernel/time/timer.c linux-4.4.13/kernel/time/timer.c /** * del_timer - deactive a timer. * @timer: the timer to be deactivated -@@ -1063,7 +1118,7 @@ +@@ -1063,7 +1118,7 @@ int try_to_del_timer_sync(struct timer_list *timer) } EXPORT_SYMBOL(try_to_del_timer_sync); @@ -25610,7 +26000,7 @@ diff -Nur linux-4.4.13.orig/kernel/time/timer.c linux-4.4.13/kernel/time/timer.c /** * del_timer_sync - deactivate a timer and wait for the handler to finish. * @timer: the timer to be deactivated -@@ -1123,7 +1178,7 @@ +@@ -1123,7 +1178,7 @@ int del_timer_sync(struct timer_list *timer) int ret = try_to_del_timer_sync(timer); if (ret >= 0) return ret; @@ -25619,7 +26009,7 @@ diff -Nur linux-4.4.13.orig/kernel/time/timer.c linux-4.4.13/kernel/time/timer.c } } EXPORT_SYMBOL(del_timer_sync); -@@ -1248,15 +1303,17 @@ +@@ -1248,15 +1303,17 @@ static inline void __run_timers(struct tvec_base *base) if (irqsafe) { spin_unlock(&base->lock); call_timer_fn(timer, fn, data); @@ -25638,7 +26028,7 @@ diff -Nur linux-4.4.13.orig/kernel/time/timer.c linux-4.4.13/kernel/time/timer.c spin_unlock_irq(&base->lock); } -@@ -1390,6 +1447,14 @@ +@@ -1390,6 +1447,14 @@ u64 get_next_timer_interrupt(unsigned long basej, u64 basem) if (cpu_is_offline(smp_processor_id())) return expires; @@ -25653,7 +26043,7 @@ diff -Nur linux-4.4.13.orig/kernel/time/timer.c linux-4.4.13/kernel/time/timer.c spin_lock(&base->lock); if (base->active_timers) { if (time_before_eq(base->next_timer, base->timer_jiffies)) -@@ -1416,13 +1481,13 @@ +@@ -1416,13 +1481,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); @@ -25669,7 +26059,7 @@ diff -Nur linux-4.4.13.orig/kernel/time/timer.c linux-4.4.13/kernel/time/timer.c run_posix_cpu_timers(p); } -@@ -1433,6 +1498,8 @@ +@@ -1433,6 +1498,8 @@ static void run_timer_softirq(struct softirq_action *h) { struct tvec_base *base = this_cpu_ptr(&tvec_bases); @@ -25678,7 +26068,7 @@ diff -Nur linux-4.4.13.orig/kernel/time/timer.c linux-4.4.13/kernel/time/timer.c if (time_after_eq(jiffies, base->timer_jiffies)) __run_timers(base); } -@@ -1589,7 +1656,7 @@ +@@ -1589,7 +1656,7 @@ static void migrate_timers(int cpu) BUG_ON(cpu_online(cpu)); old_base = per_cpu_ptr(&tvec_bases, cpu); @@ -25687,7 +26077,7 @@ diff -Nur linux-4.4.13.orig/kernel/time/timer.c linux-4.4.13/kernel/time/timer.c /* * The caller is globally serialized and nobody else * takes two locks at once, deadlock is not possible. -@@ -1613,7 +1680,7 @@ +@@ -1613,7 +1680,7 @@ static void migrate_timers(int cpu) spin_unlock(&old_base->lock); spin_unlock_irq(&new_base->lock); @@ -25696,7 +26086,7 @@ diff -Nur linux-4.4.13.orig/kernel/time/timer.c linux-4.4.13/kernel/time/timer.c } static int timer_cpu_notify(struct notifier_block *self, -@@ -1645,6 +1712,9 @@ +@@ -1645,6 +1712,9 @@ static void __init init_timer_cpu(int cpu) base->cpu = cpu; spin_lock_init(&base->lock); @@ -25706,10 +26096,11 @@ diff -Nur linux-4.4.13.orig/kernel/time/timer.c linux-4.4.13/kernel/time/timer.c base->timer_jiffies = jiffies; base->next_timer = base->timer_jiffies; -diff -Nur linux-4.4.13.orig/kernel/trace/Kconfig linux-4.4.13/kernel/trace/Kconfig ---- linux-4.4.13.orig/kernel/trace/Kconfig 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/trace/Kconfig 2016-06-22 21:55:08.066523867 +0200 -@@ -187,6 +187,24 @@ +diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig +index e45db6b0d878..364ccd0eb57b 100644 +--- a/kernel/trace/Kconfig ++++ b/kernel/trace/Kconfig +@@ -187,6 +187,24 @@ config IRQSOFF_TRACER enabled. This option and the preempt-off timing option can be used together or separately.) @@ -25734,7 +26125,7 @@ diff -Nur linux-4.4.13.orig/kernel/trace/Kconfig linux-4.4.13/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.) @@ -25759,7 +26150,7 @@ diff -Nur linux-4.4.13.orig/kernel/trace/Kconfig linux-4.4.13/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. @@ -25834,9 +26225,26 @@ diff -Nur linux-4.4.13.orig/kernel/trace/Kconfig linux-4.4.13/kernel/trace/Kconf config ENABLE_DEFAULT_TRACERS bool "Trace process context switches and events" depends on !GENERIC_TRACER -diff -Nur linux-4.4.13.orig/kernel/trace/latency_hist.c linux-4.4.13/kernel/trace/latency_hist.c ---- linux-4.4.13.orig/kernel/trace/latency_hist.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-4.4.13/kernel/trace/latency_hist.c 2016-06-22 21:55:08.066523867 +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..7f6ee70dea41 +--- /dev/null ++++ b/kernel/trace/latency_hist.c @@ -0,0 +1,1178 @@ +/* + * kernel/trace/latency_hist.c @@ -27016,24 +27424,11 @@ diff -Nur linux-4.4.13.orig/kernel/trace/latency_hist.c linux-4.4.13/kernel/trac +} + +device_initcall(latency_hist_init); -diff -Nur linux-4.4.13.orig/kernel/trace/Makefile linux-4.4.13/kernel/trace/Makefile ---- linux-4.4.13.orig/kernel/trace/Makefile 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/trace/Makefile 2016-06-22 21:55:08.066523867 +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.4.13.orig/kernel/trace/trace.c linux-4.4.13/kernel/trace/trace.c ---- linux-4.4.13.orig/kernel/trace/trace.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/trace/trace.c 2016-06-22 21:55:08.066523867 +0200 -@@ -1652,6 +1652,7 @@ +diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c +index 8305cbb2d5a2..8b0ae7d893cc 100644 +--- a/kernel/trace/trace.c ++++ b/kernel/trace/trace.c +@@ -1652,6 +1652,7 @@ tracing_generic_entry_update(struct trace_entry *entry, unsigned long flags, struct task_struct *tsk = current; entry->preempt_count = pc & 0xff; @@ -27041,7 +27436,7 @@ diff -Nur linux-4.4.13.orig/kernel/trace/trace.c linux-4.4.13/kernel/trace/trace entry->pid = (tsk) ? tsk->pid : 0; entry->flags = #ifdef CONFIG_TRACE_IRQFLAGS_SUPPORT -@@ -1661,8 +1662,11 @@ +@@ -1661,8 +1662,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) | @@ -27054,7 +27449,7 @@ diff -Nur linux-4.4.13.orig/kernel/trace/trace.c linux-4.4.13/kernel/trace/trace } EXPORT_SYMBOL_GPL(tracing_generic_entry_update); -@@ -2555,14 +2559,17 @@ +@@ -2555,14 +2559,17 @@ get_total_entries(struct trace_buffer *buf, static void print_lat_help_header(struct seq_file *m) { @@ -27080,7 +27475,7 @@ diff -Nur linux-4.4.13.orig/kernel/trace/trace.c linux-4.4.13/kernel/trace/trace } static void print_event_info(struct trace_buffer *buf, struct seq_file *m) -@@ -2588,11 +2595,14 @@ +@@ -2588,11 +2595,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" @@ -27100,22 +27495,11 @@ diff -Nur linux-4.4.13.orig/kernel/trace/trace.c linux-4.4.13/kernel/trace/trace } void -diff -Nur linux-4.4.13.orig/kernel/trace/trace_events.c linux-4.4.13/kernel/trace/trace_events.c ---- linux-4.4.13.orig/kernel/trace/trace_events.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/trace/trace_events.c 2016-06-22 21:55:08.070523867 +0200 -@@ -188,6 +188,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.4.13.orig/kernel/trace/trace.h linux-4.4.13/kernel/trace/trace.h ---- linux-4.4.13.orig/kernel/trace/trace.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/trace/trace.h 2016-06-22 21:55:08.070523867 +0200 -@@ -117,6 +117,7 @@ +diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h +index 919d9d07686f..3bf86ece683c 100644 +--- a/kernel/trace/trace.h ++++ b/kernel/trace/trace.h +@@ -117,6 +117,7 @@ struct kretprobe_trace_entry_head { * NEED_RESCHED - reschedule is requested * HARDIRQ - inside an interrupt handler * SOFTIRQ - inside a softirq handler @@ -27123,7 +27507,7 @@ diff -Nur linux-4.4.13.orig/kernel/trace/trace.h linux-4.4.13/kernel/trace/trace */ enum trace_flag_type { TRACE_FLAG_IRQS_OFF = 0x01, -@@ -125,6 +126,7 @@ +@@ -125,6 +126,7 @@ enum trace_flag_type { TRACE_FLAG_HARDIRQ = 0x08, TRACE_FLAG_SOFTIRQ = 0x10, TRACE_FLAG_PREEMPT_RESCHED = 0x20, @@ -27131,9 +27515,38 @@ diff -Nur linux-4.4.13.orig/kernel/trace/trace.h linux-4.4.13/kernel/trace/trace }; #define TRACE_BUF_SIZE 1024 -diff -Nur linux-4.4.13.orig/kernel/trace/trace_irqsoff.c linux-4.4.13/kernel/trace/trace_irqsoff.c ---- linux-4.4.13.orig/kernel/trace/trace_irqsoff.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/trace/trace_irqsoff.c 2016-06-22 21:55:08.070523867 +0200 +diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c +index 996f0fd34312..5bd79b347398 100644 +--- a/kernel/trace/trace_events.c ++++ b/kernel/trace/trace_events.c +@@ -188,6 +188,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; + } +@@ -244,6 +246,14 @@ void *trace_event_buffer_reserve(struct trace_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->trace_file = trace_file; + + fbuffer->event = +diff --git a/kernel/trace/trace_irqsoff.c b/kernel/trace/trace_irqsoff.c +index be3222b7d72e..553e71254ad6 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> @@ -27142,7 +27555,7 @@ diff -Nur linux-4.4.13.orig/kernel/trace/trace_irqsoff.c linux-4.4.13/kernel/tra #include "trace.h" -@@ -424,11 +425,13 @@ +@@ -424,11 +425,13 @@ void start_critical_timings(void) { if (preempt_trace() || irq_trace()) start_critical_timing(CALLER_ADDR0, CALLER_ADDR1); @@ -27156,7 +27569,7 @@ diff -Nur linux-4.4.13.orig/kernel/trace/trace_irqsoff.c linux-4.4.13/kernel/tra if (preempt_trace() || irq_trace()) stop_critical_timing(CALLER_ADDR0, CALLER_ADDR1); } -@@ -438,6 +441,7 @@ +@@ -438,6 +441,7 @@ EXPORT_SYMBOL_GPL(stop_critical_timings); #ifdef CONFIG_PROVE_LOCKING void time_hardirqs_on(unsigned long a0, unsigned long a1) { @@ -27164,7 +27577,7 @@ diff -Nur linux-4.4.13.orig/kernel/trace/trace_irqsoff.c linux-4.4.13/kernel/tra if (!preempt_trace() && irq_trace()) stop_critical_timing(a0, a1); } -@@ -446,6 +450,7 @@ +@@ -446,6 +450,7 @@ void time_hardirqs_off(unsigned long a0, unsigned long a1) { if (!preempt_trace() && irq_trace()) start_critical_timing(a0, a1); @@ -27172,7 +27585,7 @@ diff -Nur linux-4.4.13.orig/kernel/trace/trace_irqsoff.c linux-4.4.13/kernel/tra } #else /* !CONFIG_PROVE_LOCKING */ -@@ -471,6 +476,7 @@ +@@ -471,6 +476,7 @@ inline void print_irqtrace_events(struct task_struct *curr) */ void trace_hardirqs_on(void) { @@ -27180,7 +27593,7 @@ diff -Nur linux-4.4.13.orig/kernel/trace/trace_irqsoff.c linux-4.4.13/kernel/tra if (!preempt_trace() && irq_trace()) stop_critical_timing(CALLER_ADDR0, CALLER_ADDR1); } -@@ -480,11 +486,13 @@ +@@ -480,11 +486,13 @@ void trace_hardirqs_off(void) { if (!preempt_trace() && irq_trace()) start_critical_timing(CALLER_ADDR0, CALLER_ADDR1); @@ -27194,7 +27607,7 @@ diff -Nur linux-4.4.13.orig/kernel/trace/trace_irqsoff.c linux-4.4.13/kernel/tra if (!preempt_trace() && irq_trace()) stop_critical_timing(CALLER_ADDR0, caller_addr); } -@@ -494,6 +502,7 @@ +@@ -494,6 +502,7 @@ __visible void trace_hardirqs_off_caller(unsigned long caller_addr) { if (!preempt_trace() && irq_trace()) start_critical_timing(CALLER_ADDR0, caller_addr); @@ -27202,7 +27615,7 @@ diff -Nur linux-4.4.13.orig/kernel/trace/trace_irqsoff.c linux-4.4.13/kernel/tra } EXPORT_SYMBOL(trace_hardirqs_off_caller); -@@ -503,12 +512,14 @@ +@@ -503,12 +512,14 @@ EXPORT_SYMBOL(trace_hardirqs_off_caller); #ifdef CONFIG_PREEMPT_TRACER void trace_preempt_on(unsigned long a0, unsigned long a1) { @@ -27217,10 +27630,11 @@ diff -Nur linux-4.4.13.orig/kernel/trace/trace_irqsoff.c linux-4.4.13/kernel/tra if (preempt_trace() && !irq_trace()) start_critical_timing(a0, a1); } -diff -Nur linux-4.4.13.orig/kernel/trace/trace_output.c linux-4.4.13/kernel/trace/trace_output.c ---- linux-4.4.13.orig/kernel/trace/trace_output.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/trace/trace_output.c 2016-06-22 21:55:08.070523867 +0200 -@@ -386,6 +386,7 @@ +diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c +index 282982195e09..9f19d839a756 100644 +--- a/kernel/trace/trace_output.c ++++ b/kernel/trace/trace_output.c +@@ -386,6 +386,7 @@ int trace_print_lat_fmt(struct trace_seq *s, struct trace_entry *entry) { char hardsoft_irq; char need_resched; @@ -27228,7 +27642,7 @@ diff -Nur linux-4.4.13.orig/kernel/trace/trace_output.c linux-4.4.13/kernel/trac char irqs_off; int hardirq; int softirq; -@@ -413,6 +414,8 @@ +@@ -413,6 +414,8 @@ int trace_print_lat_fmt(struct trace_seq *s, struct trace_entry *entry) need_resched = '.'; break; } @@ -27237,7 +27651,7 @@ diff -Nur linux-4.4.13.orig/kernel/trace/trace_output.c linux-4.4.13/kernel/trac hardsoft_irq = (hardirq && softirq) ? 'H' : -@@ -420,14 +423,25 @@ +@@ -420,14 +423,25 @@ int trace_print_lat_fmt(struct trace_seq *s, struct trace_entry *entry) softirq ? 's' : '.'; @@ -27265,10 +27679,11 @@ diff -Nur linux-4.4.13.orig/kernel/trace/trace_output.c linux-4.4.13/kernel/trac return !trace_seq_has_overflowed(s); } -diff -Nur linux-4.4.13.orig/kernel/user.c linux-4.4.13/kernel/user.c ---- linux-4.4.13.orig/kernel/user.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/user.c 2016-06-22 21:55:08.070523867 +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; @@ -27282,10 +27697,11 @@ diff -Nur linux-4.4.13.orig/kernel/user.c linux-4.4.13/kernel/user.c } struct user_struct *alloc_uid(kuid_t uid) -diff -Nur linux-4.4.13.orig/kernel/watchdog.c linux-4.4.13/kernel/watchdog.c ---- linux-4.4.13.orig/kernel/watchdog.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/watchdog.c 2016-06-22 21:55:08.070523867 +0200 -@@ -299,6 +299,8 @@ +diff --git a/kernel/watchdog.c b/kernel/watchdog.c +index 198137b1cadc..47d143740774 100644 +--- a/kernel/watchdog.c ++++ b/kernel/watchdog.c +@@ -299,6 +299,8 @@ static int is_softlockup(unsigned long touch_ts) #ifdef CONFIG_HARDLOCKUP_DETECTOR @@ -27294,7 +27710,7 @@ diff -Nur linux-4.4.13.orig/kernel/watchdog.c linux-4.4.13/kernel/watchdog.c static struct perf_event_attr wd_hw_attr = { .type = PERF_TYPE_HARDWARE, .config = PERF_COUNT_HW_CPU_CYCLES, -@@ -333,6 +335,13 @@ +@@ -333,6 +335,13 @@ static void watchdog_overflow_callback(struct perf_event *event, /* only print hardlockups once */ if (__this_cpu_read(hard_watchdog_warn) == true) return; @@ -27308,7 +27724,7 @@ diff -Nur linux-4.4.13.orig/kernel/watchdog.c linux-4.4.13/kernel/watchdog.c pr_emerg("Watchdog detected hard LOCKUP on cpu %d", this_cpu); print_modules(); -@@ -350,8 +359,9 @@ +@@ -350,8 +359,9 @@ static void watchdog_overflow_callback(struct perf_event *event, !test_and_set_bit(0, &hardlockup_allcpu_dumped)) trigger_allbutself_cpu_backtrace(); @@ -27319,7 +27735,7 @@ diff -Nur linux-4.4.13.orig/kernel/watchdog.c linux-4.4.13/kernel/watchdog.c __this_cpu_write(hard_watchdog_warn, true); return; -@@ -497,6 +507,7 @@ +@@ -497,6 +507,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; @@ -27327,9 +27743,10 @@ diff -Nur linux-4.4.13.orig/kernel/watchdog.c linux-4.4.13/kernel/watchdog.c /* Enable the perf event */ watchdog_nmi_enable(cpu); -diff -Nur linux-4.4.13.orig/kernel/workqueue.c linux-4.4.13/kernel/workqueue.c ---- linux-4.4.13.orig/kernel/workqueue.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/workqueue.c 2016-06-22 21:55:08.070523867 +0200 +diff --git a/kernel/workqueue.c b/kernel/workqueue.c +index 2c2f971f3e75..965d5f65e847 100644 +--- a/kernel/workqueue.c ++++ b/kernel/workqueue.c @@ -48,6 +48,8 @@ #include <linux/nodemask.h> #include <linux/moduleparam.h> @@ -27339,7 +27756,7 @@ diff -Nur linux-4.4.13.orig/kernel/workqueue.c linux-4.4.13/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. * @@ -27357,7 +27774,7 @@ diff -Nur linux-4.4.13.orig/kernel/workqueue.c linux-4.4.13/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. * @@ -27366,7 +27783,7 @@ diff -Nur linux-4.4.13.orig/kernel/workqueue.c linux-4.4.13/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; /* @@ -27375,7 +27792,7 @@ diff -Nur linux-4.4.13.orig/kernel/workqueue.c linux-4.4.13/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 @@ -27384,7 +27801,7 @@ diff -Nur linux-4.4.13.orig/kernel/workqueue.c linux-4.4.13/kernel/workqueue.c * determined without grabbing wq->mutex. */ struct work_struct unbound_release_work; -@@ -331,6 +338,8 @@ +@@ -331,6 +338,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); @@ -27393,7 +27810,7 @@ diff -Nur linux-4.4.13.orig/kernel/workqueue.c linux-4.4.13/kernel/workqueue.c static int worker_thread(void *__worker); static void workqueue_sysfs_unregister(struct workqueue_struct *wq); -@@ -338,20 +347,20 @@ +@@ -338,20 +347,20 @@ static void workqueue_sysfs_unregister(struct workqueue_struct *wq); #include <trace/events/workqueue.h> #define assert_rcu_or_pool_mutex() \ @@ -27420,7 +27837,7 @@ diff -Nur linux-4.4.13.orig/kernel/workqueue.c linux-4.4.13/kernel/workqueue.c #define for_each_cpu_worker_pool(pool, cpu) \ for ((pool) = &per_cpu(cpu_worker_pools, cpu)[0]; \ -@@ -363,7 +372,7 @@ +@@ -363,7 +372,7 @@ static void workqueue_sysfs_unregister(struct workqueue_struct *wq); * @pool: iteration cursor * @pi: integer used for iteration * @@ -27429,7 +27846,7 @@ diff -Nur linux-4.4.13.orig/kernel/workqueue.c linux-4.4.13/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. * -@@ -395,7 +404,7 @@ +@@ -395,7 +404,7 @@ static void workqueue_sysfs_unregister(struct workqueue_struct *wq); * @pwq: iteration cursor * @wq: the target workqueue * @@ -27438,7 +27855,7 @@ diff -Nur linux-4.4.13.orig/kernel/workqueue.c linux-4.4.13/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. * -@@ -407,6 +416,31 @@ +@@ -407,6 +416,31 @@ static void workqueue_sysfs_unregister(struct workqueue_struct *wq); if (({ assert_rcu_or_wq_mutex(wq); false; })) { } \ else @@ -27470,7 +27887,7 @@ diff -Nur linux-4.4.13.orig/kernel/workqueue.c linux-4.4.13/kernel/workqueue.c #ifdef CONFIG_DEBUG_OBJECTS_WORK static struct debug_obj_descr work_debug_descr; -@@ -557,7 +591,7 @@ +@@ -557,7 +591,7 @@ static int worker_pool_assign_id(struct worker_pool *pool) * @wq: the target workqueue * @node: the node ID * @@ -27479,7 +27896,7 @@ diff -Nur linux-4.4.13.orig/kernel/workqueue.c linux-4.4.13/kernel/workqueue.c * read locked. * If the pwq needs to be used beyond the locking in effect, the caller is * responsible for guaranteeing that the pwq stays online. -@@ -701,8 +735,8 @@ +@@ -701,8 +735,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 @@ -27490,7 +27907,7 @@ diff -Nur linux-4.4.13.orig/kernel/workqueue.c linux-4.4.13/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 -@@ -839,51 +873,44 @@ +@@ -839,51 +873,44 @@ static struct worker *first_idle_worker(struct worker_pool *pool) */ static void wake_up_worker(struct worker_pool *pool) { @@ -27561,7 +27978,7 @@ diff -Nur linux-4.4.13.orig/kernel/workqueue.c linux-4.4.13/kernel/workqueue.c struct worker_pool *pool; /* -@@ -892,29 +919,26 @@ +@@ -892,29 +919,26 @@ struct task_struct *wq_worker_sleeping(struct task_struct *task, int cpu) * checking NOT_RUNNING. */ if (worker->flags & WORKER_NOT_RUNNING) @@ -27601,7 +28018,7 @@ diff -Nur linux-4.4.13.orig/kernel/workqueue.c linux-4.4.13/kernel/workqueue.c } /** -@@ -1108,12 +1132,12 @@ +@@ -1108,12 +1132,12 @@ static void put_pwq_unlocked(struct pool_workqueue *pwq) { if (pwq) { /* @@ -27617,7 +28034,7 @@ diff -Nur linux-4.4.13.orig/kernel/workqueue.c linux-4.4.13/kernel/workqueue.c } } -@@ -1215,7 +1239,7 @@ +@@ -1215,7 +1239,7 @@ static int try_to_grab_pending(struct work_struct *work, bool is_dwork, struct worker_pool *pool; struct pool_workqueue *pwq; @@ -27626,7 +28043,7 @@ diff -Nur linux-4.4.13.orig/kernel/workqueue.c linux-4.4.13/kernel/workqueue.c /* try to steal the timer if it exists */ if (is_dwork) { -@@ -1234,6 +1258,7 @@ +@@ -1234,6 +1258,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; @@ -27634,7 +28051,7 @@ diff -Nur linux-4.4.13.orig/kernel/workqueue.c linux-4.4.13/kernel/workqueue.c /* * The queueing is in progress, or it is already queued. Try to * steal it from ->worklist without clearing WORK_STRUCT_PENDING. -@@ -1272,14 +1297,16 @@ +@@ -1272,14 +1297,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); @@ -27653,7 +28070,7 @@ diff -Nur linux-4.4.13.orig/kernel/workqueue.c linux-4.4.13/kernel/workqueue.c return -EAGAIN; } -@@ -1348,7 +1375,7 @@ +@@ -1348,7 +1375,7 @@ static void __queue_work(int cpu, struct workqueue_struct *wq, * queued or lose PENDING. Grabbing PENDING and queueing should * happen with IRQ disabled. */ @@ -27662,7 +28079,7 @@ diff -Nur linux-4.4.13.orig/kernel/workqueue.c linux-4.4.13/kernel/workqueue.c debug_work_activate(work); -@@ -1356,6 +1383,8 @@ +@@ -1356,6 +1383,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; @@ -27671,7 +28088,7 @@ diff -Nur linux-4.4.13.orig/kernel/workqueue.c linux-4.4.13/kernel/workqueue.c retry: if (req_cpu == WORK_CPU_UNBOUND) cpu = raw_smp_processor_id(); -@@ -1412,10 +1441,8 @@ +@@ -1412,10 +1441,8 @@ retry: /* pwq determined, queue */ trace_workqueue_queue_work(req_cpu, pwq, work); @@ -27684,7 +28101,7 @@ diff -Nur linux-4.4.13.orig/kernel/workqueue.c linux-4.4.13/kernel/workqueue.c pwq->nr_in_flight[pwq->work_color]++; work_flags = work_color_to_flags(pwq->work_color); -@@ -1431,7 +1458,9 @@ +@@ -1431,7 +1458,9 @@ retry: insert_work(pwq, work, worklist, work_flags); @@ -27694,7 +28111,7 @@ diff -Nur linux-4.4.13.orig/kernel/workqueue.c linux-4.4.13/kernel/workqueue.c } /** -@@ -1451,14 +1480,14 @@ +@@ -1451,14 +1480,14 @@ bool queue_work_on(int cpu, struct workqueue_struct *wq, bool ret = false; unsigned long flags; @@ -27711,7 +28128,7 @@ diff -Nur linux-4.4.13.orig/kernel/workqueue.c linux-4.4.13/kernel/workqueue.c return ret; } EXPORT_SYMBOL(queue_work_on); -@@ -1525,14 +1554,14 @@ +@@ -1525,14 +1554,14 @@ bool queue_delayed_work_on(int cpu, struct workqueue_struct *wq, unsigned long flags; /* read the comment in __queue_work() */ @@ -27728,7 +28145,7 @@ diff -Nur linux-4.4.13.orig/kernel/workqueue.c linux-4.4.13/kernel/workqueue.c return ret; } EXPORT_SYMBOL(queue_delayed_work_on); -@@ -1567,7 +1596,7 @@ +@@ -1567,7 +1596,7 @@ bool mod_delayed_work_on(int cpu, struct workqueue_struct *wq, if (likely(ret >= 0)) { __queue_delayed_work(cpu, wq, dwork, delay); @@ -27737,7 +28154,7 @@ diff -Nur linux-4.4.13.orig/kernel/workqueue.c linux-4.4.13/kernel/workqueue.c } /* -ENOENT from try_to_grab_pending() becomes %true */ -@@ -1600,7 +1629,9 @@ +@@ -1600,7 +1629,9 @@ static void worker_enter_idle(struct worker *worker) worker->last_active = jiffies; /* idle_list is LIFO */ @@ -27747,7 +28164,7 @@ diff -Nur linux-4.4.13.orig/kernel/workqueue.c linux-4.4.13/kernel/workqueue.c if (too_many_workers(pool) && !timer_pending(&pool->idle_timer)) mod_timer(&pool->idle_timer, jiffies + IDLE_WORKER_TIMEOUT); -@@ -1633,7 +1664,9 @@ +@@ -1633,7 +1664,9 @@ static void worker_leave_idle(struct worker *worker) return; worker_clr_flags(worker, WORKER_IDLE); pool->nr_idle--; @@ -27757,7 +28174,7 @@ diff -Nur linux-4.4.13.orig/kernel/workqueue.c linux-4.4.13/kernel/workqueue.c } static struct worker *alloc_worker(int node) -@@ -1799,7 +1832,9 @@ +@@ -1799,7 +1832,9 @@ static void destroy_worker(struct worker *worker) pool->nr_workers--; pool->nr_idle--; @@ -27767,7 +28184,7 @@ diff -Nur linux-4.4.13.orig/kernel/workqueue.c linux-4.4.13/kernel/workqueue.c worker->flags |= WORKER_DIE; wake_up_process(worker->task); } -@@ -2716,14 +2751,14 @@ +@@ -2716,14 +2751,14 @@ static bool start_flush_work(struct work_struct *work, struct wq_barrier *barr) might_sleep(); @@ -27785,7 +28202,7 @@ diff -Nur linux-4.4.13.orig/kernel/workqueue.c linux-4.4.13/kernel/workqueue.c /* see the comment in try_to_grab_pending() with the same code */ pwq = get_work_pwq(work); if (pwq) { -@@ -2750,10 +2785,11 @@ +@@ -2750,10 +2785,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); @@ -27798,7 +28215,7 @@ diff -Nur linux-4.4.13.orig/kernel/workqueue.c linux-4.4.13/kernel/workqueue.c return false; } -@@ -2840,7 +2876,7 @@ +@@ -2840,7 +2876,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); @@ -27807,7 +28224,7 @@ diff -Nur linux-4.4.13.orig/kernel/workqueue.c linux-4.4.13/kernel/workqueue.c flush_work(work); clear_work_data(work); -@@ -2895,10 +2931,10 @@ +@@ -2895,10 +2931,10 @@ EXPORT_SYMBOL_GPL(cancel_work_sync); */ bool flush_delayed_work(struct delayed_work *dwork) { @@ -27820,7 +28237,7 @@ diff -Nur linux-4.4.13.orig/kernel/workqueue.c linux-4.4.13/kernel/workqueue.c return flush_work(&dwork->work); } EXPORT_SYMBOL(flush_delayed_work); -@@ -2933,7 +2969,7 @@ +@@ -2933,7 +2969,7 @@ bool cancel_delayed_work(struct delayed_work *dwork) set_work_pool_and_clear_pending(&dwork->work, get_work_pool_id(&dwork->work)); @@ -27829,7 +28246,7 @@ diff -Nur linux-4.4.13.orig/kernel/workqueue.c linux-4.4.13/kernel/workqueue.c return ret; } EXPORT_SYMBOL(cancel_delayed_work); -@@ -3161,7 +3197,7 @@ +@@ -3161,7 +3197,7 @@ static void rcu_free_pool(struct rcu_head *rcu) * put_unbound_pool - put a worker_pool * @pool: worker_pool to put * @@ -27838,7 +28255,7 @@ diff -Nur linux-4.4.13.orig/kernel/workqueue.c linux-4.4.13/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(). -@@ -3215,8 +3251,8 @@ +@@ -3215,8 +3251,8 @@ static void put_unbound_pool(struct worker_pool *pool) del_timer_sync(&pool->idle_timer); del_timer_sync(&pool->mayday_timer); @@ -27849,7 +28266,7 @@ diff -Nur linux-4.4.13.orig/kernel/workqueue.c linux-4.4.13/kernel/workqueue.c } /** -@@ -3323,14 +3359,14 @@ +@@ -3323,14 +3359,14 @@ static void pwq_unbound_release_workfn(struct work_struct *work) put_unbound_pool(pool); mutex_unlock(&wq_pool_mutex); @@ -27866,7 +28283,7 @@ diff -Nur linux-4.4.13.orig/kernel/workqueue.c linux-4.4.13/kernel/workqueue.c } /** -@@ -3983,7 +4019,7 @@ +@@ -3983,7 +4019,7 @@ void destroy_workqueue(struct workqueue_struct *wq) * The base ref is never dropped on per-cpu pwqs. Directly * schedule RCU free. */ @@ -27875,7 +28292,7 @@ diff -Nur linux-4.4.13.orig/kernel/workqueue.c linux-4.4.13/kernel/workqueue.c } else { /* * We're the sole accessor of @wq at this point. Directly -@@ -4076,7 +4112,8 @@ +@@ -4076,7 +4112,8 @@ bool workqueue_congested(int cpu, struct workqueue_struct *wq) struct pool_workqueue *pwq; bool ret; @@ -27885,7 +28302,7 @@ diff -Nur linux-4.4.13.orig/kernel/workqueue.c linux-4.4.13/kernel/workqueue.c if (cpu == WORK_CPU_UNBOUND) cpu = smp_processor_id(); -@@ -4087,7 +4124,8 @@ +@@ -4087,7 +4124,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); @@ -27895,7 +28312,7 @@ diff -Nur linux-4.4.13.orig/kernel/workqueue.c linux-4.4.13/kernel/workqueue.c return ret; } -@@ -4113,15 +4151,15 @@ +@@ -4113,15 +4151,15 @@ unsigned int work_busy(struct work_struct *work) if (work_pending(work)) ret |= WORK_BUSY_PENDING; @@ -27915,7 +28332,7 @@ diff -Nur linux-4.4.13.orig/kernel/workqueue.c linux-4.4.13/kernel/workqueue.c return ret; } -@@ -4310,7 +4348,7 @@ +@@ -4310,7 +4348,7 @@ void show_workqueue_state(void) unsigned long flags; int pi; @@ -27924,7 +28341,7 @@ diff -Nur linux-4.4.13.orig/kernel/workqueue.c linux-4.4.13/kernel/workqueue.c pr_info("Showing busy workqueues and worker pools:\n"); -@@ -4361,7 +4399,7 @@ +@@ -4361,7 +4399,7 @@ void show_workqueue_state(void) spin_unlock_irqrestore(&pool->lock, flags); } @@ -27933,7 +28350,7 @@ diff -Nur linux-4.4.13.orig/kernel/workqueue.c linux-4.4.13/kernel/workqueue.c } /* -@@ -4722,16 +4760,16 @@ +@@ -4722,16 +4760,16 @@ bool freeze_workqueues_busy(void) * nr_active is monotonically decreasing. It's safe * to peek without lock. */ @@ -27953,7 +28370,7 @@ diff -Nur linux-4.4.13.orig/kernel/workqueue.c linux-4.4.13/kernel/workqueue.c } out_unlock: mutex_unlock(&wq_pool_mutex); -@@ -4921,7 +4959,8 @@ +@@ -4921,7 +4959,8 @@ static ssize_t wq_pool_ids_show(struct device *dev, const char *delim = ""; int node, written = 0; @@ -27963,7 +28380,7 @@ diff -Nur linux-4.4.13.orig/kernel/workqueue.c linux-4.4.13/kernel/workqueue.c for_each_node(node) { written += scnprintf(buf + written, PAGE_SIZE - written, "%s%d:%d", delim, node, -@@ -4929,7 +4968,8 @@ +@@ -4929,7 +4968,8 @@ static ssize_t wq_pool_ids_show(struct device *dev, delim = " "; } written += scnprintf(buf + written, PAGE_SIZE - written, "\n"); @@ -27973,10 +28390,11 @@ diff -Nur linux-4.4.13.orig/kernel/workqueue.c linux-4.4.13/kernel/workqueue.c return written; } -diff -Nur linux-4.4.13.orig/kernel/workqueue_internal.h linux-4.4.13/kernel/workqueue_internal.h ---- linux-4.4.13.orig/kernel/workqueue_internal.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/kernel/workqueue_internal.h 2016-06-22 21:55:08.070523867 +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 */ @@ -27984,7 +28402,7 @@ diff -Nur linux-4.4.13.orig/kernel/workqueue_internal.h linux-4.4.13/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. */ @@ -27994,10 +28412,23 @@ diff -Nur linux-4.4.13.orig/kernel/workqueue_internal.h linux-4.4.13/kernel/work +void wq_worker_sleeping(struct task_struct *task); #endif /* _KERNEL_WORKQUEUE_INTERNAL_H */ -diff -Nur linux-4.4.13.orig/lib/debugobjects.c linux-4.4.13/lib/debugobjects.c ---- linux-4.4.13.orig/lib/debugobjects.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/lib/debugobjects.c 2016-06-22 21:55:08.070523867 +0200 -@@ -309,7 +309,10 @@ +diff --git a/lib/Kconfig b/lib/Kconfig +index 1a48744253d7..f75de578cca8 100644 +--- a/lib/Kconfig ++++ b/lib/Kconfig +@@ -397,6 +397,7 @@ config CHECK_SIGNATURE + + config CPUMASK_OFFSTACK + bool "Force CPU masks off stack" if DEBUG_PER_CPU_MAPS ++ depends on !PREEMPT_RT_FULL + help + Use dynamic allocation for cpumask_var_t, instead of putting + them on the stack. This is a bit more expensive, but avoids +diff --git a/lib/debugobjects.c b/lib/debugobjects.c +index 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; @@ -28009,9 +28440,10 @@ diff -Nur linux-4.4.13.orig/lib/debugobjects.c linux-4.4.13/lib/debugobjects.c db = get_bucket((unsigned long) addr); -diff -Nur linux-4.4.13.orig/lib/idr.c linux-4.4.13/lib/idr.c ---- linux-4.4.13.orig/lib/idr.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/lib/idr.c 2016-06-22 21:55:08.070523867 +0200 +diff --git a/lib/idr.c b/lib/idr.c +index 6098336df267..9decbe914595 100644 +--- a/lib/idr.c ++++ b/lib/idr.c @@ -30,6 +30,7 @@ #include <linux/idr.h> #include <linux/spinlock.h> @@ -28020,7 +28452,7 @@ diff -Nur linux-4.4.13.orig/lib/idr.c linux-4.4.13/lib/idr.c #define MAX_IDR_SHIFT (sizeof(int) * 8 - 1) #define MAX_IDR_BIT (1U << MAX_IDR_SHIFT) -@@ -45,6 +46,37 @@ +@@ -45,6 +46,37 @@ static DEFINE_PER_CPU(struct idr_layer *, idr_preload_head); static DEFINE_PER_CPU(int, idr_preload_cnt); static DEFINE_SPINLOCK(simple_ida_lock); @@ -28058,7 +28490,7 @@ diff -Nur linux-4.4.13.orig/lib/idr.c linux-4.4.13/lib/idr.c /* the maximum ID which can be allocated given idr->layers */ static int idr_max(int layers) { -@@ -115,14 +147,14 @@ +@@ -115,14 +147,14 @@ static struct idr_layer *idr_layer_alloc(gfp_t gfp_mask, struct idr *layer_idr) * context. See idr_preload() for details. */ if (!in_interrupt()) { @@ -28075,7 +28507,7 @@ diff -Nur linux-4.4.13.orig/lib/idr.c linux-4.4.13/lib/idr.c if (new) return new; } -@@ -366,7 +398,6 @@ +@@ -366,7 +398,6 @@ static void idr_fill_slot(struct idr *idr, void *ptr, int id, idr_mark_full(pa, id); } @@ -28083,7 +28515,7 @@ diff -Nur linux-4.4.13.orig/lib/idr.c linux-4.4.13/lib/idr.c /** * idr_preload - preload for idr_alloc() * @gfp_mask: allocation mask to use for preloading -@@ -401,7 +432,7 @@ +@@ -401,7 +432,7 @@ void idr_preload(gfp_t gfp_mask) WARN_ON_ONCE(in_interrupt()); might_sleep_if(gfpflags_allow_blocking(gfp_mask)); @@ -28092,7 +28524,7 @@ diff -Nur linux-4.4.13.orig/lib/idr.c linux-4.4.13/lib/idr.c /* * idr_alloc() is likely to succeed w/o full idr_layer buffer and -@@ -413,9 +444,9 @@ +@@ -413,9 +444,9 @@ void idr_preload(gfp_t gfp_mask) while (__this_cpu_read(idr_preload_cnt) < MAX_IDR_FREE) { struct idr_layer *new; @@ -28104,21 +28536,11 @@ diff -Nur linux-4.4.13.orig/lib/idr.c linux-4.4.13/lib/idr.c if (!new) break; -diff -Nur linux-4.4.13.orig/lib/Kconfig linux-4.4.13/lib/Kconfig ---- linux-4.4.13.orig/lib/Kconfig 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/lib/Kconfig 2016-06-22 21:55:08.070523867 +0200 -@@ -397,6 +397,7 @@ - - config CPUMASK_OFFSTACK - bool "Force CPU masks off stack" if DEBUG_PER_CPU_MAPS -+ depends on !PREEMPT_RT_FULL - help - Use dynamic allocation for cpumask_var_t, instead of putting - them on the stack. This is a bit more expensive, but avoids -diff -Nur linux-4.4.13.orig/lib/locking-selftest.c linux-4.4.13/lib/locking-selftest.c ---- linux-4.4.13.orig/lib/locking-selftest.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/lib/locking-selftest.c 2016-06-22 21:55:08.070523867 +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) @@ -28127,7 +28549,7 @@ diff -Nur linux-4.4.13.orig/lib/locking-selftest.c linux-4.4.13/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) @@ -28140,7 +28562,7 @@ diff -Nur linux-4.4.13.orig/lib/locking-selftest.c linux-4.4.13/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 @@ -28149,7 +28571,7 @@ diff -Nur linux-4.4.13.orig/lib/locking-selftest.c linux-4.4.13/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) @@ -28158,7 +28580,7 @@ diff -Nur linux-4.4.13.orig/lib/locking-selftest.c linux-4.4.13/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) @@ -28167,7 +28589,7 @@ diff -Nur linux-4.4.13.orig/lib/locking-selftest.c linux-4.4.13/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) @@ -28176,7 +28598,7 @@ diff -Nur linux-4.4.13.orig/lib/locking-selftest.c linux-4.4.13/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) @@ -28185,7 +28607,7 @@ diff -Nur linux-4.4.13.orig/lib/locking-selftest.c linux-4.4.13/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) @@ -28194,7 +28616,7 @@ diff -Nur linux-4.4.13.orig/lib/locking-selftest.c linux-4.4.13/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) @@ -28209,7 +28631,7 @@ diff -Nur linux-4.4.13.orig/lib/locking-selftest.c linux-4.4.13/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 @@ -28220,7 +28642,7 @@ diff -Nur linux-4.4.13.orig/lib/locking-selftest.c linux-4.4.13/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 @@ -28229,7 +28651,7 @@ diff -Nur linux-4.4.13.orig/lib/locking-selftest.c linux-4.4.13/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"); @@ -28237,7 +28659,7 @@ diff -Nur linux-4.4.13.orig/lib/locking-selftest.c linux-4.4.13/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); @@ -28266,9 +28688,10 @@ diff -Nur linux-4.4.13.orig/lib/locking-selftest.c linux-4.4.13/lib/locking-self ww_tests(); -diff -Nur linux-4.4.13.orig/lib/percpu_ida.c linux-4.4.13/lib/percpu_ida.c ---- linux-4.4.13.orig/lib/percpu_ida.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/lib/percpu_ida.c 2016-06-22 21:55:08.074523867 +0200 +diff --git a/lib/percpu_ida.c b/lib/percpu_ida.c +index 6d40944960de..822a2c027e72 100644 +--- a/lib/percpu_ida.c ++++ b/lib/percpu_ida.c @@ -26,6 +26,9 @@ #include <linux/string.h> #include <linux/spinlock.h> @@ -28279,7 +28702,7 @@ diff -Nur linux-4.4.13.orig/lib/percpu_ida.c linux-4.4.13/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; @@ -28295,7 +28718,7 @@ diff -Nur linux-4.4.13.orig/lib/percpu_ida.c linux-4.4.13/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); @@ -28303,7 +28726,7 @@ diff -Nur linux-4.4.13.orig/lib/percpu_ida.c linux-4.4.13/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); @@ -28312,7 +28735,7 @@ diff -Nur linux-4.4.13.orig/lib/percpu_ida.c linux-4.4.13/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(); @@ -28321,7 +28744,7 @@ diff -Nur linux-4.4.13.orig/lib/percpu_ida.c linux-4.4.13/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); @@ -28330,7 +28753,7 @@ diff -Nur linux-4.4.13.orig/lib/percpu_ida.c linux-4.4.13/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); } @@ -28339,7 +28762,7 @@ diff -Nur linux-4.4.13.orig/lib/percpu_ida.c linux-4.4.13/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; @@ -28348,7 +28771,7 @@ diff -Nur linux-4.4.13.orig/lib/percpu_ida.c linux-4.4.13/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: @@ -28357,10 +28780,11 @@ diff -Nur linux-4.4.13.orig/lib/percpu_ida.c linux-4.4.13/lib/percpu_ida.c return err; } EXPORT_SYMBOL_GPL(percpu_ida_for_each_free); -diff -Nur linux-4.4.13.orig/lib/radix-tree.c linux-4.4.13/lib/radix-tree.c ---- linux-4.4.13.orig/lib/radix-tree.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/lib/radix-tree.c 2016-06-22 21:55:08.074523867 +0200 -@@ -196,13 +196,14 @@ +diff --git a/lib/radix-tree.c b/lib/radix-tree.c +index 6b79e9026e24..f27e0bcb74f7 100644 +--- a/lib/radix-tree.c ++++ b/lib/radix-tree.c +@@ -196,13 +196,14 @@ radix_tree_node_alloc(struct radix_tree_root *root) * succeed in getting a node here (and never reach * kmem_cache_alloc) */ @@ -28376,7 +28800,7 @@ diff -Nur linux-4.4.13.orig/lib/radix-tree.c linux-4.4.13/lib/radix-tree.c /* * Update the allocation stack trace as this is more useful * for debugging. -@@ -242,6 +243,7 @@ +@@ -242,6 +243,7 @@ radix_tree_node_free(struct radix_tree_node *node) call_rcu(&node->rcu_head, radix_tree_node_rcu_free); } @@ -28384,7 +28808,7 @@ diff -Nur linux-4.4.13.orig/lib/radix-tree.c linux-4.4.13/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 -@@ -310,6 +312,7 @@ +@@ -310,6 +312,7 @@ int radix_tree_maybe_preload(gfp_t gfp_mask) return 0; } EXPORT_SYMBOL(radix_tree_maybe_preload); @@ -28392,9 +28816,10 @@ diff -Nur linux-4.4.13.orig/lib/radix-tree.c linux-4.4.13/lib/radix-tree.c /* * Return the maximum key which can be store into a -diff -Nur linux-4.4.13.orig/lib/rbtree.c linux-4.4.13/lib/rbtree.c ---- linux-4.4.13.orig/lib/rbtree.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/lib/rbtree.c 2016-06-22 21:55:08.074523867 +0200 +diff --git a/lib/rbtree.c b/lib/rbtree.c +index 1356454e36de..d15d6c4327f1 100644 +--- a/lib/rbtree.c ++++ b/lib/rbtree.c @@ -23,6 +23,7 @@ #include <linux/rbtree_augmented.h> @@ -28403,7 +28828,7 @@ diff -Nur linux-4.4.13.orig/lib/rbtree.c linux-4.4.13/lib/rbtree.c /* * red-black trees properties: http://en.wikipedia.org/wiki/Rbtree -@@ -590,3 +591,13 @@ +@@ -590,3 +591,13 @@ struct rb_node *rb_first_postorder(const struct rb_root *root) return rb_left_deepest_node(root->rb_node); } EXPORT_SYMBOL(rb_first_postorder); @@ -28417,10 +28842,11 @@ diff -Nur linux-4.4.13.orig/lib/rbtree.c linux-4.4.13/lib/rbtree.c + rcu_assign_pointer(*rb_link, node); +} +EXPORT_SYMBOL(rb_link_node_rcu); -diff -Nur linux-4.4.13.orig/lib/scatterlist.c linux-4.4.13/lib/scatterlist.c ---- linux-4.4.13.orig/lib/scatterlist.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/lib/scatterlist.c 2016-06-22 21:55:08.074523867 +0200 -@@ -620,7 +620,7 @@ +diff --git a/lib/scatterlist.c b/lib/scatterlist.c +index bafa9933fa76..ebe3b7edd086 100644 +--- a/lib/scatterlist.c ++++ b/lib/scatterlist.c +@@ -620,7 +620,7 @@ void sg_miter_stop(struct sg_mapping_iter *miter) flush_kernel_dcache_page(miter->page); if (miter->__flags & SG_MITER_ATOMIC) { @@ -28429,7 +28855,7 @@ diff -Nur linux-4.4.13.orig/lib/scatterlist.c linux-4.4.13/lib/scatterlist.c kunmap_atomic(miter->addr); } else kunmap(miter->page); -@@ -664,7 +664,7 @@ +@@ -664,7 +664,7 @@ size_t sg_copy_buffer(struct scatterlist *sgl, unsigned int nents, void *buf, if (!sg_miter_skip(&miter, skip)) return false; @@ -28438,7 +28864,7 @@ diff -Nur linux-4.4.13.orig/lib/scatterlist.c linux-4.4.13/lib/scatterlist.c while (sg_miter_next(&miter) && offset < buflen) { unsigned int len; -@@ -681,7 +681,7 @@ +@@ -681,7 +681,7 @@ size_t sg_copy_buffer(struct scatterlist *sgl, unsigned int nents, void *buf, sg_miter_stop(&miter); @@ -28447,10 +28873,11 @@ diff -Nur linux-4.4.13.orig/lib/scatterlist.c linux-4.4.13/lib/scatterlist.c return offset; } EXPORT_SYMBOL(sg_copy_buffer); -diff -Nur linux-4.4.13.orig/lib/smp_processor_id.c linux-4.4.13/lib/smp_processor_id.c ---- linux-4.4.13.orig/lib/smp_processor_id.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/lib/smp_processor_id.c 2016-06-22 21:55:08.074523867 +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; @@ -28462,23 +28889,24 @@ diff -Nur linux-4.4.13.orig/lib/smp_processor_id.c linux-4.4.13/lib/smp_processo print_symbol("caller is %s\n", (long)__builtin_return_address(0)); dump_stack(); -diff -Nur linux-4.4.13.orig/Makefile linux-4.4.13/Makefile ---- linux-4.4.13.orig/Makefile 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/Makefile 2016-06-22 21:55:08.074523867 +0200 -@@ -768,6 +768,9 @@ - # Prohibit date/time macros, which would make the build non-deterministic - KBUILD_CFLAGS += $(call cc-option,-Werror=date-time) - -+# enforce correct pointer usage -+KBUILD_CFLAGS += $(call cc-option,-Werror=incompatible-pointer-types) -+ - # use the deterministic mode of AR if available - KBUILD_ARFLAGS := $(call ar-option,D) +diff --git a/mm/Kconfig b/mm/Kconfig +index 97a4e06b15c0..9614351e68b8 100644 +--- a/mm/Kconfig ++++ b/mm/Kconfig +@@ -392,7 +392,7 @@ config NOMMU_INITIAL_TRIM_EXCESS -diff -Nur linux-4.4.13.orig/mm/backing-dev.c linux-4.4.13/mm/backing-dev.c ---- linux-4.4.13.orig/mm/backing-dev.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/mm/backing-dev.c 2016-06-22 21:55:08.074523867 +0200 -@@ -457,9 +457,9 @@ + config TRANSPARENT_HUGEPAGE + bool "Transparent Hugepage Support" +- depends on HAVE_ARCH_TRANSPARENT_HUGEPAGE ++ depends on HAVE_ARCH_TRANSPARENT_HUGEPAGE && !PREEMPT_RT_FULL + select COMPACTION + help + Transparent Hugepages allows the kernel to use huge pages and +diff --git a/mm/backing-dev.c b/mm/backing-dev.c +index 9ef80bf441b3..826fed55c1cc 100644 +--- a/mm/backing-dev.c ++++ b/mm/backing-dev.c +@@ -457,9 +457,9 @@ void wb_congested_put(struct bdi_writeback_congested *congested) { unsigned long flags; @@ -28490,10 +28918,11 @@ diff -Nur linux-4.4.13.orig/mm/backing-dev.c linux-4.4.13/mm/backing-dev.c return; } -diff -Nur linux-4.4.13.orig/mm/compaction.c linux-4.4.13/mm/compaction.c ---- linux-4.4.13.orig/mm/compaction.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/mm/compaction.c 2016-06-22 21:55:08.074523867 +0200 -@@ -1435,10 +1435,12 @@ +diff --git a/mm/compaction.c b/mm/compaction.c +index dba02dec7195..51963f58a29b 100644 +--- a/mm/compaction.c ++++ b/mm/compaction.c +@@ -1430,10 +1430,12 @@ check_drain: cc->migrate_pfn & ~((1UL << cc->order) - 1); if (cc->last_migrated_pfn < current_block_start) { @@ -28508,10 +28937,11 @@ diff -Nur linux-4.4.13.orig/mm/compaction.c linux-4.4.13/mm/compaction.c /* No more flushing until we migrate again */ cc->last_migrated_pfn = 0; } -diff -Nur linux-4.4.13.orig/mm/filemap.c linux-4.4.13/mm/filemap.c ---- linux-4.4.13.orig/mm/filemap.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/mm/filemap.c 2016-06-22 21:55:08.074523867 +0200 -@@ -168,7 +168,9 @@ +diff --git a/mm/filemap.c b/mm/filemap.c +index 1bb007624b53..44301361c100 100644 +--- a/mm/filemap.c ++++ b/mm/filemap.c +@@ -168,7 +168,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; @@ -28522,7 +28952,7 @@ diff -Nur linux-4.4.13.orig/mm/filemap.c linux-4.4.13/mm/filemap.c } } -@@ -597,9 +599,12 @@ +@@ -597,9 +599,12 @@ static int page_cache_tree_insert(struct address_space *mapping, * node->private_list is protected by * mapping->tree_lock. */ @@ -28537,9 +28967,10 @@ diff -Nur linux-4.4.13.orig/mm/filemap.c linux-4.4.13/mm/filemap.c } return 0; } -diff -Nur linux-4.4.13.orig/mm/highmem.c linux-4.4.13/mm/highmem.c ---- linux-4.4.13.orig/mm/highmem.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/mm/highmem.c 2016-06-22 21:55:08.074523867 +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> @@ -28553,7 +28984,7 @@ diff -Nur linux-4.4.13.orig/mm/highmem.c linux-4.4.13/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); @@ -28564,21 +28995,10 @@ diff -Nur linux-4.4.13.orig/mm/highmem.c linux-4.4.13/mm/highmem.c unsigned int nr_free_highpages (void) { -diff -Nur linux-4.4.13.orig/mm/Kconfig linux-4.4.13/mm/Kconfig ---- linux-4.4.13.orig/mm/Kconfig 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/mm/Kconfig 2016-06-22 21:55:08.074523867 +0200 -@@ -392,7 +392,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.4.13.orig/mm/memcontrol.c linux-4.4.13/mm/memcontrol.c ---- linux-4.4.13.orig/mm/memcontrol.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/mm/memcontrol.c 2016-06-22 21:55:08.074523867 +0200 +diff --git a/mm/memcontrol.c b/mm/memcontrol.c +index 6b90d184e9c0..ed7aa011ad70 100644 +--- a/mm/memcontrol.c ++++ b/mm/memcontrol.c @@ -67,6 +67,8 @@ #include <net/sock.h> #include <net/ip.h> @@ -28588,7 +29008,7 @@ diff -Nur linux-4.4.13.orig/mm/memcontrol.c linux-4.4.13/mm/memcontrol.c #include "slab.h" #include <asm/uaccess.h> -@@ -87,6 +89,7 @@ +@@ -87,6 +89,7 @@ int do_swap_account __read_mostly; #define do_swap_account 0 #endif @@ -28596,7 +29016,7 @@ diff -Nur linux-4.4.13.orig/mm/memcontrol.c linux-4.4.13/mm/memcontrol.c static const char * const mem_cgroup_stat_names[] = { "cache", "rss", -@@ -1936,14 +1939,17 @@ +@@ -1922,14 +1925,17 @@ static void drain_local_stock(struct work_struct *dummy) */ static void refill_stock(struct mem_cgroup *memcg, unsigned int nr_pages) { @@ -28616,7 +29036,7 @@ diff -Nur linux-4.4.13.orig/mm/memcontrol.c linux-4.4.13/mm/memcontrol.c } /* -@@ -1959,7 +1965,7 @@ +@@ -1945,7 +1951,7 @@ static void drain_all_stock(struct mem_cgroup *root_memcg) return; /* Notify other cpus that system-wide "drain" is running */ get_online_cpus(); @@ -28625,7 +29045,7 @@ diff -Nur linux-4.4.13.orig/mm/memcontrol.c linux-4.4.13/mm/memcontrol.c for_each_online_cpu(cpu) { struct memcg_stock_pcp *stock = &per_cpu(memcg_stock, cpu); struct mem_cgroup *memcg; -@@ -1976,7 +1982,7 @@ +@@ -1962,7 +1968,7 @@ static void drain_all_stock(struct mem_cgroup *root_memcg) schedule_work_on(cpu, &stock->work); } } @@ -28634,7 +29054,7 @@ diff -Nur linux-4.4.13.orig/mm/memcontrol.c linux-4.4.13/mm/memcontrol.c put_online_cpus(); mutex_unlock(&percpu_charge_mutex); } -@@ -4618,12 +4624,12 @@ +@@ -4700,12 +4706,12 @@ static int mem_cgroup_move_account(struct page *page, ret = 0; @@ -28649,7 +29069,7 @@ diff -Nur linux-4.4.13.orig/mm/memcontrol.c linux-4.4.13/mm/memcontrol.c out_unlock: unlock_page(page); out: -@@ -5411,10 +5417,10 @@ +@@ -5495,10 +5501,10 @@ void mem_cgroup_commit_charge(struct page *page, struct mem_cgroup *memcg, VM_BUG_ON_PAGE(!PageTransHuge(page), page); } @@ -28662,7 +29082,7 @@ diff -Nur linux-4.4.13.orig/mm/memcontrol.c linux-4.4.13/mm/memcontrol.c if (do_swap_account && PageSwapCache(page)) { swp_entry_t entry = { .val = page_private(page) }; -@@ -5470,14 +5476,14 @@ +@@ -5554,14 +5560,14 @@ static void uncharge_batch(struct mem_cgroup *memcg, unsigned long pgpgout, memcg_oom_recover(memcg); } @@ -28679,15 +29099,15 @@ diff -Nur linux-4.4.13.orig/mm/memcontrol.c linux-4.4.13/mm/memcontrol.c if (!mem_cgroup_is_root(memcg)) css_put_many(&memcg->css, nr_pages); -@@ -5669,6 +5675,7 @@ +@@ -5753,6 +5759,7 @@ void mem_cgroup_swapout(struct page *page, swp_entry_t entry) { - struct mem_cgroup *memcg; + struct mem_cgroup *memcg, *swap_memcg; unsigned short oldid; + unsigned long flags; VM_BUG_ON_PAGE(PageLRU(page), page); VM_BUG_ON_PAGE(page_count(page), page); -@@ -5697,9 +5704,13 @@ +@@ -5793,12 +5800,16 @@ void mem_cgroup_swapout(struct page *page, swp_entry_t entry) * important here to have the interrupts disabled because it is the * only synchronisation we have for udpating the per-CPU variables. */ @@ -28697,14 +29117,18 @@ diff -Nur linux-4.4.13.orig/mm/memcontrol.c linux-4.4.13/mm/memcontrol.c +#endif mem_cgroup_charge_statistics(memcg, page, -1); memcg_check_events(memcg, page); + + if (!mem_cgroup_is_root(memcg)) + css_put(&memcg->css); + local_unlock_irqrestore(event_lock, flags); } /** -diff -Nur linux-4.4.13.orig/mm/mmu_context.c linux-4.4.13/mm/mmu_context.c ---- linux-4.4.13.orig/mm/mmu_context.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/mm/mmu_context.c 2016-06-22 21:55:08.074523867 +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); @@ -28712,7 +29136,7 @@ diff -Nur linux-4.4.13.orig/mm/mmu_context.c linux-4.4.13/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); @@ -28720,9 +29144,10 @@ diff -Nur linux-4.4.13.orig/mm/mmu_context.c linux-4.4.13/mm/mmu_context.c task_unlock(tsk); #ifdef finish_arch_post_lock_switch finish_arch_post_lock_switch(); -diff -Nur linux-4.4.13.orig/mm/page_alloc.c linux-4.4.13/mm/page_alloc.c ---- linux-4.4.13.orig/mm/page_alloc.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/mm/page_alloc.c 2016-06-22 21:55:08.078523867 +0200 +diff --git a/mm/page_alloc.c b/mm/page_alloc.c +index 2bcdfbf8c36d..a500c9e740dd 100644 +--- a/mm/page_alloc.c ++++ b/mm/page_alloc.c @@ -60,6 +60,7 @@ #include <linux/page_ext.h> #include <linux/hugetlb.h> @@ -28731,7 +29156,7 @@ diff -Nur linux-4.4.13.orig/mm/page_alloc.c linux-4.4.13/mm/page_alloc.c #include <linux/page_owner.h> #include <linux/kthread.h> -@@ -264,6 +265,18 @@ +@@ -264,6 +265,18 @@ EXPORT_SYMBOL(nr_node_ids); EXPORT_SYMBOL(nr_online_nodes); #endif @@ -28750,7 +29175,7 @@ diff -Nur linux-4.4.13.orig/mm/page_alloc.c linux-4.4.13/mm/page_alloc.c int page_group_by_mobility_disabled __read_mostly; #ifdef CONFIG_DEFERRED_STRUCT_PAGE_INIT -@@ -784,7 +797,7 @@ +@@ -786,7 +799,7 @@ static inline int free_pages_check(struct page *page) } /* @@ -28759,7 +29184,7 @@ diff -Nur linux-4.4.13.orig/mm/page_alloc.c linux-4.4.13/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. * -@@ -795,18 +808,53 @@ +@@ -797,18 +810,53 @@ static inline int free_pages_check(struct page *page) * pinned" detection logic. */ static void free_pcppages_bulk(struct zone *zone, int count, @@ -28817,7 +29242,7 @@ diff -Nur linux-4.4.13.orig/mm/page_alloc.c linux-4.4.13/mm/page_alloc.c while (to_free) { struct page *page; struct list_head *list; -@@ -822,7 +870,7 @@ +@@ -824,7 +872,7 @@ static void free_pcppages_bulk(struct zone *zone, int count, batch_free++; if (++migratetype == MIGRATE_PCPTYPES) migratetype = 0; @@ -28826,7 +29251,7 @@ diff -Nur linux-4.4.13.orig/mm/page_alloc.c linux-4.4.13/mm/page_alloc.c } while (list_empty(list)); /* This is the only non-empty list. Free them all. */ -@@ -830,24 +878,12 @@ +@@ -832,24 +880,12 @@ static void free_pcppages_bulk(struct zone *zone, int count, batch_free = to_free; do { @@ -28853,7 +29278,7 @@ diff -Nur linux-4.4.13.orig/mm/page_alloc.c linux-4.4.13/mm/page_alloc.c } static void free_one_page(struct zone *zone, -@@ -856,7 +892,9 @@ +@@ -858,7 +894,9 @@ static void free_one_page(struct zone *zone, int migratetype) { unsigned long nr_scanned; @@ -28864,7 +29289,7 @@ diff -Nur linux-4.4.13.orig/mm/page_alloc.c linux-4.4.13/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); -@@ -866,7 +904,7 @@ +@@ -868,7 +906,7 @@ static void free_one_page(struct zone *zone, migratetype = get_pfnblock_migratetype(page, pfn); } __free_one_page(page, pfn, zone, order, migratetype); @@ -28873,7 +29298,7 @@ diff -Nur linux-4.4.13.orig/mm/page_alloc.c linux-4.4.13/mm/page_alloc.c } static int free_tail_pages_check(struct page *head_page, struct page *page) -@@ -1017,10 +1055,10 @@ +@@ -1019,10 +1057,10 @@ static void __free_pages_ok(struct page *page, unsigned int order) return; migratetype = get_pfnblock_migratetype(page, pfn); @@ -28886,7 +29311,7 @@ diff -Nur linux-4.4.13.orig/mm/page_alloc.c linux-4.4.13/mm/page_alloc.c } static void __init __free_pages_boot_core(struct page *page, -@@ -1877,16 +1915,18 @@ +@@ -1879,16 +1917,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; @@ -28908,7 +29333,7 @@ diff -Nur linux-4.4.13.orig/mm/page_alloc.c linux-4.4.13/mm/page_alloc.c } #endif -@@ -1902,16 +1942,21 @@ +@@ -1904,16 +1944,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; @@ -28934,7 +29359,7 @@ diff -Nur linux-4.4.13.orig/mm/page_alloc.c linux-4.4.13/mm/page_alloc.c } /* -@@ -1997,8 +2042,17 @@ +@@ -1999,8 +2044,17 @@ void drain_all_pages(struct zone *zone) else cpumask_clear_cpu(cpu, &cpus_with_pcps); } @@ -28952,7 +29377,7 @@ diff -Nur linux-4.4.13.orig/mm/page_alloc.c linux-4.4.13/mm/page_alloc.c } #ifdef CONFIG_HIBERNATION -@@ -2054,7 +2108,7 @@ +@@ -2056,7 +2110,7 @@ void free_hot_cold_page(struct page *page, bool cold) migratetype = get_pfnblock_migratetype(page, pfn); set_pcppage_migratetype(page, migratetype); @@ -28961,7 +29386,7 @@ diff -Nur linux-4.4.13.orig/mm/page_alloc.c linux-4.4.13/mm/page_alloc.c __count_vm_event(PGFREE); /* -@@ -2080,12 +2134,17 @@ +@@ -2082,12 +2136,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); @@ -28981,7 +29406,7 @@ diff -Nur linux-4.4.13.orig/mm/page_alloc.c linux-4.4.13/mm/page_alloc.c } /* -@@ -2220,7 +2279,7 @@ +@@ -2222,7 +2281,7 @@ struct page *buffered_rmqueue(struct zone *preferred_zone, struct per_cpu_pages *pcp; struct list_head *list; @@ -28990,7 +29415,7 @@ diff -Nur linux-4.4.13.orig/mm/page_alloc.c linux-4.4.13/mm/page_alloc.c pcp = &this_cpu_ptr(zone->pageset)->pcp; list = &pcp->lists[migratetype]; if (list_empty(list)) { -@@ -2252,7 +2311,7 @@ +@@ -2254,7 +2313,7 @@ struct page *buffered_rmqueue(struct zone *preferred_zone, */ WARN_ON_ONCE(order > 1); } @@ -28999,7 +29424,7 @@ diff -Nur linux-4.4.13.orig/mm/page_alloc.c linux-4.4.13/mm/page_alloc.c page = NULL; if (alloc_flags & ALLOC_HARDER) { -@@ -2262,11 +2321,13 @@ +@@ -2264,11 +2323,13 @@ struct page *buffered_rmqueue(struct zone *preferred_zone, } if (!page) page = __rmqueue(zone, order, migratetype, gfp_flags); @@ -29015,7 +29440,7 @@ diff -Nur linux-4.4.13.orig/mm/page_alloc.c linux-4.4.13/mm/page_alloc.c } __mod_zone_page_state(zone, NR_ALLOC_BATCH, -(1 << order)); -@@ -2276,13 +2337,13 @@ +@@ -2278,13 +2339,13 @@ struct page *buffered_rmqueue(struct zone *preferred_zone, __count_zone_vm_events(PGALLOC, zone, 1 << order); zone_statistics(preferred_zone, zone, gfp_flags); @@ -29031,7 +29456,7 @@ diff -Nur linux-4.4.13.orig/mm/page_alloc.c linux-4.4.13/mm/page_alloc.c return NULL; } -@@ -5948,6 +6009,7 @@ +@@ -5950,6 +6011,7 @@ static int page_alloc_cpu_notify(struct notifier_block *self, void __init page_alloc_init(void) { hotcpu_notifier(page_alloc_cpu_notify, 0); @@ -29039,7 +29464,7 @@ diff -Nur linux-4.4.13.orig/mm/page_alloc.c linux-4.4.13/mm/page_alloc.c } /* -@@ -6842,7 +6904,7 @@ +@@ -6844,7 +6906,7 @@ void zone_pcp_reset(struct zone *zone) struct per_cpu_pageset *pset; /* avoid races with drain_pages() */ @@ -29048,7 +29473,7 @@ diff -Nur linux-4.4.13.orig/mm/page_alloc.c linux-4.4.13/mm/page_alloc.c if (zone->pageset != &boot_pageset) { for_each_online_cpu(cpu) { pset = per_cpu_ptr(zone->pageset, cpu); -@@ -6851,7 +6913,7 @@ +@@ -6853,7 +6915,7 @@ void zone_pcp_reset(struct zone *zone) free_percpu(zone->pageset); zone->pageset = &boot_pageset; } @@ -29057,10 +29482,11 @@ diff -Nur linux-4.4.13.orig/mm/page_alloc.c linux-4.4.13/mm/page_alloc.c } #ifdef CONFIG_MEMORY_HOTREMOVE -diff -Nur linux-4.4.13.orig/mm/slab.h linux-4.4.13/mm/slab.h ---- linux-4.4.13.orig/mm/slab.h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/mm/slab.h 2016-06-22 21:55:08.078523867 +0200 -@@ -324,7 +324,11 @@ +diff --git a/mm/slab.h b/mm/slab.h +index 7b6087197997..afdc57941179 100644 +--- a/mm/slab.h ++++ b/mm/slab.h +@@ -324,7 +324,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 { @@ -29072,10 +29498,11 @@ diff -Nur linux-4.4.13.orig/mm/slab.h linux-4.4.13/mm/slab.h #ifdef CONFIG_SLAB struct list_head slabs_partial; /* partial list first, better asm code */ -diff -Nur linux-4.4.13.orig/mm/slub.c linux-4.4.13/mm/slub.c ---- linux-4.4.13.orig/mm/slub.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/mm/slub.c 2016-06-22 21:55:08.078523867 +0200 -@@ -1075,7 +1075,7 @@ +diff --git a/mm/slub.c b/mm/slub.c +index 65d5f92d51d2..feb4a445a546 100644 +--- a/mm/slub.c ++++ b/mm/slub.c +@@ -1075,7 +1075,7 @@ static noinline struct kmem_cache_node *free_debug_processing( void *object = head; int cnt = 0; @@ -29084,7 +29511,7 @@ diff -Nur linux-4.4.13.orig/mm/slub.c linux-4.4.13/mm/slub.c slab_lock(page); if (!check_slab(s, page)) -@@ -1136,7 +1136,7 @@ +@@ -1136,7 +1136,7 @@ out: fail: slab_unlock(page); @@ -29093,7 +29520,7 @@ diff -Nur linux-4.4.13.orig/mm/slub.c linux-4.4.13/mm/slub.c slab_fix(s, "Object at 0x%p not freed", object); return NULL; } -@@ -1263,6 +1263,12 @@ +@@ -1263,6 +1263,12 @@ static inline void dec_slabs_node(struct kmem_cache *s, int node, #endif /* CONFIG_SLUB_DEBUG */ @@ -29106,7 +29533,7 @@ diff -Nur linux-4.4.13.orig/mm/slub.c linux-4.4.13/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. -@@ -1399,10 +1405,17 @@ +@@ -1399,10 +1405,17 @@ static struct page *allocate_slab(struct kmem_cache *s, gfp_t flags, int node) gfp_t alloc_gfp; void *start, *p; int idx, order; @@ -29124,7 +29551,7 @@ diff -Nur linux-4.4.13.orig/mm/slub.c linux-4.4.13/mm/slub.c local_irq_enable(); flags |= s->allocflags; -@@ -1473,7 +1486,7 @@ +@@ -1473,7 +1486,7 @@ static struct page *allocate_slab(struct kmem_cache *s, gfp_t flags, int node) page->frozen = 1; out: @@ -29133,7 +29560,7 @@ diff -Nur linux-4.4.13.orig/mm/slub.c linux-4.4.13/mm/slub.c local_irq_disable(); if (!page) return NULL; -@@ -1529,6 +1542,16 @@ +@@ -1529,6 +1542,16 @@ static void __free_slab(struct kmem_cache *s, struct page *page) __free_kmem_pages(page, order); } @@ -29150,7 +29577,7 @@ diff -Nur linux-4.4.13.orig/mm/slub.c linux-4.4.13/mm/slub.c #define need_reserve_slab_rcu \ (sizeof(((struct page *)NULL)->lru) < sizeof(struct rcu_head)) -@@ -1560,6 +1583,12 @@ +@@ -1560,6 +1583,12 @@ static void free_slab(struct kmem_cache *s, struct page *page) } call_rcu(head, rcu_free_slab); @@ -29163,7 +29590,7 @@ diff -Nur linux-4.4.13.orig/mm/slub.c linux-4.4.13/mm/slub.c } else __free_slab(s, page); } -@@ -1673,7 +1702,7 @@ +@@ -1673,7 +1702,7 @@ static void *get_partial_node(struct kmem_cache *s, struct kmem_cache_node *n, if (!n || !n->nr_partial) return NULL; @@ -29172,7 +29599,7 @@ diff -Nur linux-4.4.13.orig/mm/slub.c linux-4.4.13/mm/slub.c list_for_each_entry_safe(page, page2, &n->partial, lru) { void *t; -@@ -1698,7 +1727,7 @@ +@@ -1698,7 +1727,7 @@ static void *get_partial_node(struct kmem_cache *s, struct kmem_cache_node *n, break; } @@ -29181,7 +29608,7 @@ diff -Nur linux-4.4.13.orig/mm/slub.c linux-4.4.13/mm/slub.c return object; } -@@ -1944,7 +1973,7 @@ +@@ -1944,7 +1973,7 @@ redo: * that acquire_slab() will see a slab page that * is frozen */ @@ -29190,7 +29617,7 @@ diff -Nur linux-4.4.13.orig/mm/slub.c linux-4.4.13/mm/slub.c } } else { m = M_FULL; -@@ -1955,7 +1984,7 @@ +@@ -1955,7 +1984,7 @@ redo: * slabs from diagnostic functions will not see * any frozen slabs. */ @@ -29199,7 +29626,7 @@ diff -Nur linux-4.4.13.orig/mm/slub.c linux-4.4.13/mm/slub.c } } -@@ -1990,7 +2019,7 @@ +@@ -1990,7 +2019,7 @@ redo: goto redo; if (lock) @@ -29208,7 +29635,7 @@ diff -Nur linux-4.4.13.orig/mm/slub.c linux-4.4.13/mm/slub.c if (m == M_FREE) { stat(s, DEACTIVATE_EMPTY); -@@ -2022,10 +2051,10 @@ +@@ -2022,10 +2051,10 @@ static void unfreeze_partials(struct kmem_cache *s, n2 = get_node(s, page_to_nid(page)); if (n != n2) { if (n) @@ -29221,7 +29648,7 @@ diff -Nur linux-4.4.13.orig/mm/slub.c linux-4.4.13/mm/slub.c } do { -@@ -2054,7 +2083,7 @@ +@@ -2054,7 +2083,7 @@ static void unfreeze_partials(struct kmem_cache *s, } if (n) @@ -29230,7 +29657,7 @@ diff -Nur linux-4.4.13.orig/mm/slub.c linux-4.4.13/mm/slub.c while (discard_page) { page = discard_page; -@@ -2093,14 +2122,21 @@ +@@ -2093,14 +2122,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) { @@ -29252,7 +29679,7 @@ diff -Nur linux-4.4.13.orig/mm/slub.c linux-4.4.13/mm/slub.c oldpage = NULL; pobjects = 0; pages = 0; -@@ -2172,7 +2208,22 @@ +@@ -2172,7 +2208,22 @@ static bool has_cpu_slab(int cpu, void *info) static void flush_all(struct kmem_cache *s) { @@ -29275,7 +29702,7 @@ diff -Nur linux-4.4.13.orig/mm/slub.c linux-4.4.13/mm/slub.c } /* -@@ -2208,10 +2259,10 @@ +@@ -2208,10 +2259,10 @@ static unsigned long count_partial(struct kmem_cache_node *n, unsigned long x = 0; struct page *page; @@ -29288,7 +29715,7 @@ diff -Nur linux-4.4.13.orig/mm/slub.c linux-4.4.13/mm/slub.c return x; } #endif /* CONFIG_SLUB_DEBUG || CONFIG_SYSFS */ -@@ -2349,8 +2400,10 @@ +@@ -2349,8 +2400,10 @@ static inline void *get_freelist(struct kmem_cache *s, struct page *page) * already disabled (which is the case for bulk allocation). */ static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node, @@ -29300,7 +29727,7 @@ diff -Nur linux-4.4.13.orig/mm/slub.c linux-4.4.13/mm/slub.c void *freelist; struct page *page; -@@ -2410,6 +2463,13 @@ +@@ -2410,6 +2463,13 @@ load_freelist: VM_BUG_ON(!c->page->frozen); c->freelist = get_freepointer(s, freelist); c->tid = next_tid(c->tid); @@ -29314,7 +29741,7 @@ diff -Nur linux-4.4.13.orig/mm/slub.c linux-4.4.13/mm/slub.c return freelist; new_slab: -@@ -2441,7 +2501,7 @@ +@@ -2441,7 +2501,7 @@ new_slab: deactivate_slab(s, page, get_freepointer(s, freelist)); c->page = NULL; c->freelist = NULL; @@ -29323,7 +29750,7 @@ diff -Nur linux-4.4.13.orig/mm/slub.c linux-4.4.13/mm/slub.c } /* -@@ -2453,6 +2513,7 @@ +@@ -2453,6 +2513,7 @@ static void *__slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node, { void *p; unsigned long flags; @@ -29331,7 +29758,7 @@ diff -Nur linux-4.4.13.orig/mm/slub.c linux-4.4.13/mm/slub.c local_irq_save(flags); #ifdef CONFIG_PREEMPT -@@ -2464,8 +2525,9 @@ +@@ -2464,8 +2525,9 @@ static void *__slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node, c = this_cpu_ptr(s->cpu_slab); #endif @@ -29342,7 +29769,7 @@ diff -Nur linux-4.4.13.orig/mm/slub.c linux-4.4.13/mm/slub.c return p; } -@@ -2652,7 +2714,7 @@ +@@ -2652,7 +2714,7 @@ static void __slab_free(struct kmem_cache *s, struct page *page, do { if (unlikely(n)) { @@ -29351,7 +29778,7 @@ diff -Nur linux-4.4.13.orig/mm/slub.c linux-4.4.13/mm/slub.c n = NULL; } prior = page->freelist; -@@ -2684,7 +2746,7 @@ +@@ -2684,7 +2746,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. */ @@ -29360,7 +29787,7 @@ diff -Nur linux-4.4.13.orig/mm/slub.c linux-4.4.13/mm/slub.c } } -@@ -2726,7 +2788,7 @@ +@@ -2726,7 +2788,7 @@ static void __slab_free(struct kmem_cache *s, struct page *page, add_partial(n, page, DEACTIVATE_TO_TAIL); stat(s, FREE_ADD_PARTIAL); } @@ -29369,7 +29796,7 @@ diff -Nur linux-4.4.13.orig/mm/slub.c linux-4.4.13/mm/slub.c return; slab_empty: -@@ -2741,7 +2803,7 @@ +@@ -2741,7 +2803,7 @@ slab_empty: remove_full(s, n, page); } @@ -29378,7 +29805,7 @@ diff -Nur linux-4.4.13.orig/mm/slub.c linux-4.4.13/mm/slub.c stat(s, FREE_SLAB); discard_slab(s, page); } -@@ -2913,6 +2975,7 @@ +@@ -2913,6 +2975,7 @@ int kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size, void **p) { struct kmem_cache_cpu *c; @@ -29386,7 +29813,7 @@ diff -Nur linux-4.4.13.orig/mm/slub.c linux-4.4.13/mm/slub.c int i; /* memcg and kmem_cache debug support */ -@@ -2936,7 +2999,7 @@ +@@ -2936,7 +2999,7 @@ int kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size, * of re-populating per CPU c->freelist */ p[i] = ___slab_alloc(s, flags, NUMA_NO_NODE, @@ -29395,7 +29822,7 @@ diff -Nur linux-4.4.13.orig/mm/slub.c linux-4.4.13/mm/slub.c if (unlikely(!p[i])) goto error; -@@ -2948,6 +3011,7 @@ +@@ -2948,6 +3011,7 @@ int kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size, } c->tid = next_tid(c->tid); local_irq_enable(); @@ -29403,7 +29830,7 @@ diff -Nur linux-4.4.13.orig/mm/slub.c linux-4.4.13/mm/slub.c /* Clear memory outside IRQ disabled fastpath loop */ if (unlikely(flags & __GFP_ZERO)) { -@@ -3095,7 +3159,7 @@ +@@ -3095,7 +3159,7 @@ static void init_kmem_cache_node(struct kmem_cache_node *n) { n->nr_partial = 0; @@ -29412,7 +29839,7 @@ diff -Nur linux-4.4.13.orig/mm/slub.c linux-4.4.13/mm/slub.c INIT_LIST_HEAD(&n->partial); #ifdef CONFIG_SLUB_DEBUG atomic_long_set(&n->nr_slabs, 0); -@@ -3677,7 +3741,7 @@ +@@ -3677,7 +3741,7 @@ int __kmem_cache_shrink(struct kmem_cache *s, bool deactivate) for (i = 0; i < SHRINK_PROMOTE_MAX; i++) INIT_LIST_HEAD(promote + i); @@ -29421,7 +29848,7 @@ diff -Nur linux-4.4.13.orig/mm/slub.c linux-4.4.13/mm/slub.c /* * Build lists of slabs to discard or promote. -@@ -3708,7 +3772,7 @@ +@@ -3708,7 +3772,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); @@ -29430,7 +29857,7 @@ diff -Nur linux-4.4.13.orig/mm/slub.c linux-4.4.13/mm/slub.c /* Release empty slabs */ list_for_each_entry_safe(page, t, &discard, lru) -@@ -3884,6 +3948,12 @@ +@@ -3884,6 +3948,12 @@ void __init kmem_cache_init(void) { static __initdata struct kmem_cache boot_kmem_cache, boot_kmem_cache_node; @@ -29443,7 +29870,7 @@ diff -Nur linux-4.4.13.orig/mm/slub.c linux-4.4.13/mm/slub.c if (debug_guardpage_minorder()) slub_max_order = 0; -@@ -4127,7 +4197,7 @@ +@@ -4127,7 +4197,7 @@ static int validate_slab_node(struct kmem_cache *s, struct page *page; unsigned long flags; @@ -29452,7 +29879,7 @@ diff -Nur linux-4.4.13.orig/mm/slub.c linux-4.4.13/mm/slub.c list_for_each_entry(page, &n->partial, lru) { validate_slab_slab(s, page, map); -@@ -4149,7 +4219,7 @@ +@@ -4149,7 +4219,7 @@ static int validate_slab_node(struct kmem_cache *s, s->name, count, atomic_long_read(&n->nr_slabs)); out: @@ -29461,7 +29888,7 @@ diff -Nur linux-4.4.13.orig/mm/slub.c linux-4.4.13/mm/slub.c return count; } -@@ -4337,12 +4407,12 @@ +@@ -4337,12 +4407,12 @@ static int list_locations(struct kmem_cache *s, char *buf, if (!atomic_long_read(&n->nr_slabs)) continue; @@ -29476,9 +29903,10 @@ diff -Nur linux-4.4.13.orig/mm/slub.c linux-4.4.13/mm/slub.c } for (i = 0; i < t.count; i++) { -diff -Nur linux-4.4.13.orig/mm/swap.c linux-4.4.13/mm/swap.c ---- linux-4.4.13.orig/mm/swap.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/mm/swap.c 2016-06-22 21:55:08.078523867 +0200 +diff --git a/mm/swap.c b/mm/swap.c +index 39395fb549c0..ad16649221d7 100644 +--- a/mm/swap.c ++++ b/mm/swap.c @@ -31,6 +31,7 @@ #include <linux/memcontrol.h> #include <linux/gfp.h> @@ -29487,7 +29915,7 @@ diff -Nur linux-4.4.13.orig/mm/swap.c linux-4.4.13/mm/swap.c #include <linux/hugetlb.h> #include <linux/page_idle.h> -@@ -46,6 +47,9 @@ +@@ -46,6 +47,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); @@ -29497,7 +29925,7 @@ diff -Nur linux-4.4.13.orig/mm/swap.c linux-4.4.13/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); @@ -29511,7 +29939,7 @@ diff -Nur linux-4.4.13.orig/mm/swap.c linux-4.4.13/mm/swap.c } } -@@ -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)) { @@ -29527,7 +29955,7 @@ diff -Nur linux-4.4.13.orig/mm/swap.c linux-4.4.13/mm/swap.c } } -@@ -567,7 +572,7 @@ +@@ -567,7 +572,7 @@ void activate_page(struct page *page) static void __lru_cache_activate_page(struct page *page) { @@ -29536,7 +29964,7 @@ diff -Nur linux-4.4.13.orig/mm/swap.c linux-4.4.13/mm/swap.c int i; /* -@@ -589,7 +594,7 @@ +@@ -589,7 +594,7 @@ static void __lru_cache_activate_page(struct page *page) } } @@ -29545,7 +29973,7 @@ diff -Nur linux-4.4.13.orig/mm/swap.c linux-4.4.13/mm/swap.c } /* -@@ -630,13 +635,13 @@ +@@ -630,13 +635,13 @@ EXPORT_SYMBOL(mark_page_accessed); static void __lru_cache_add(struct page *page) { @@ -29561,19 +29989,25 @@ diff -Nur linux-4.4.13.orig/mm/swap.c linux-4.4.13/mm/swap.c } /** -@@ -816,9 +821,9 @@ +@@ -816,9 +821,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); -@@ -846,18 +851,19 @@ +@@ -846,26 +857,47 @@ void deactivate_file_page(struct page *page) return; if (likely(get_page_unless_zero(page))) { @@ -29596,11 +30030,65 @@ diff -Nur linux-4.4.13.orig/mm/swap.c linux-4.4.13/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.4.13.orig/mm/truncate.c linux-4.4.13/mm/truncate.c ---- linux-4.4.13.orig/mm/truncate.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/mm/truncate.c 2016-06-22 21:55:08.078523867 +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) + { +@@ -878,20 +910,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 76e35ad97102..5f196420020c 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) && @@ -29614,10 +30102,11 @@ diff -Nur linux-4.4.13.orig/mm/truncate.c linux-4.4.13/mm/truncate.c __radix_tree_delete_node(&mapping->page_tree, node); unlock: spin_unlock_irq(&mapping->tree_lock); -diff -Nur linux-4.4.13.orig/mm/vmalloc.c linux-4.4.13/mm/vmalloc.c ---- linux-4.4.13.orig/mm/vmalloc.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/mm/vmalloc.c 2016-06-22 21:55:08.078523867 +0200 -@@ -821,7 +821,7 @@ +diff --git a/mm/vmalloc.c b/mm/vmalloc.c +index 8e3c9c5a3042..68740314ad54 100644 +--- a/mm/vmalloc.c ++++ b/mm/vmalloc.c +@@ -821,7 +821,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; @@ -29626,7 +30115,7 @@ diff -Nur linux-4.4.13.orig/mm/vmalloc.c linux-4.4.13/mm/vmalloc.c void *vaddr; node = numa_node_id(); -@@ -864,11 +864,12 @@ +@@ -864,11 +864,12 @@ static void *new_vmap_block(unsigned int order, gfp_t gfp_mask) BUG_ON(err); radix_tree_preload_end(); @@ -29641,7 +30130,7 @@ diff -Nur linux-4.4.13.orig/mm/vmalloc.c linux-4.4.13/mm/vmalloc.c return vaddr; } -@@ -937,6 +938,7 @@ +@@ -937,6 +938,7 @@ static void *vb_alloc(unsigned long size, gfp_t gfp_mask) struct vmap_block *vb; void *vaddr = NULL; unsigned int order; @@ -29649,7 +30138,7 @@ diff -Nur linux-4.4.13.orig/mm/vmalloc.c linux-4.4.13/mm/vmalloc.c BUG_ON(offset_in_page(size)); BUG_ON(size > PAGE_SIZE*VMAP_MAX_ALLOC); -@@ -951,7 +953,8 @@ +@@ -951,7 +953,8 @@ static void *vb_alloc(unsigned long size, gfp_t gfp_mask) order = get_order(size); rcu_read_lock(); @@ -29659,7 +30148,7 @@ diff -Nur linux-4.4.13.orig/mm/vmalloc.c linux-4.4.13/mm/vmalloc.c list_for_each_entry_rcu(vb, &vbq->free, free_list) { unsigned long pages_off; -@@ -974,7 +977,7 @@ +@@ -974,7 +977,7 @@ static void *vb_alloc(unsigned long size, gfp_t gfp_mask) break; } @@ -29668,10 +30157,11 @@ diff -Nur linux-4.4.13.orig/mm/vmalloc.c linux-4.4.13/mm/vmalloc.c rcu_read_unlock(); /* Allocate new block if nothing was found */ -diff -Nur linux-4.4.13.orig/mm/vmstat.c linux-4.4.13/mm/vmstat.c ---- linux-4.4.13.orig/mm/vmstat.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/mm/vmstat.c 2016-06-22 21:55:08.078523867 +0200 -@@ -226,6 +226,7 @@ +diff --git a/mm/vmstat.c b/mm/vmstat.c +index c54fd2924f25..64416fd7c209 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; @@ -29679,7 +30169,7 @@ diff -Nur linux-4.4.13.orig/mm/vmstat.c linux-4.4.13/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); @@ -29687,7 +30177,7 @@ diff -Nur linux-4.4.13.orig/mm/vmstat.c linux-4.4.13/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; @@ -29695,7 +30185,7 @@ diff -Nur linux-4.4.13.orig/mm/vmstat.c linux-4.4.13/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); } @@ -29703,7 +30193,7 @@ diff -Nur linux-4.4.13.orig/mm/vmstat.c linux-4.4.13/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; @@ -29711,7 +30201,7 @@ diff -Nur linux-4.4.13.orig/mm/vmstat.c linux-4.4.13/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); } @@ -29719,10 +30209,11 @@ diff -Nur linux-4.4.13.orig/mm/vmstat.c linux-4.4.13/mm/vmstat.c } void __dec_zone_page_state(struct page *page, enum zone_stat_item item) -diff -Nur linux-4.4.13.orig/mm/workingset.c linux-4.4.13/mm/workingset.c ---- linux-4.4.13.orig/mm/workingset.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/mm/workingset.c 2016-06-22 21:55:08.078523867 +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. */ @@ -29732,7 +30223,7 @@ diff -Nur linux-4.4.13.orig/mm/workingset.c linux-4.4.13/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 */ @@ -29745,7 +30236,7 @@ diff -Nur linux-4.4.13.orig/mm/workingset.c linux-4.4.13/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: @@ -29757,7 +30248,7 @@ diff -Nur linux-4.4.13.orig/mm/workingset.c linux-4.4.13/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 */ @@ -29771,7 +30262,7 @@ diff -Nur linux-4.4.13.orig/mm/workingset.c linux-4.4.13/mm/workingset.c return ret; } -@@ -400,7 +401,7 @@ +@@ -400,7 +401,7 @@ static int __init workingset_init(void) { int ret; @@ -29780,7 +30271,7 @@ diff -Nur linux-4.4.13.orig/mm/workingset.c linux-4.4.13/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: @@ -29789,10 +30280,11 @@ diff -Nur linux-4.4.13.orig/mm/workingset.c linux-4.4.13/mm/workingset.c err: return ret; } -diff -Nur linux-4.4.13.orig/mm/zsmalloc.c linux-4.4.13/mm/zsmalloc.c ---- linux-4.4.13.orig/mm/zsmalloc.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/mm/zsmalloc.c 2016-06-22 21:55:08.078523867 +0200 -@@ -1289,7 +1289,7 @@ +diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c +index c1ea19478119..b552fd607df8 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); @@ -29801,7 +30293,7 @@ diff -Nur linux-4.4.13.orig/mm/zsmalloc.c linux-4.4.13/mm/zsmalloc.c area->vm_mm = mm; if (off + class->size <= PAGE_SIZE) { /* this object is contained entirely within a page */ -@@ -1342,7 +1342,7 @@ +@@ -1342,7 +1342,7 @@ void zs_unmap_object(struct zs_pool *pool, unsigned long handle) __zs_unmap_object(area, pages, off, class->size); } @@ -29810,10 +30302,11 @@ diff -Nur linux-4.4.13.orig/mm/zsmalloc.c linux-4.4.13/mm/zsmalloc.c unpin_tag(handle); } EXPORT_SYMBOL_GPL(zs_unmap_object); -diff -Nur linux-4.4.13.orig/net/core/dev.c linux-4.4.13/net/core/dev.c ---- linux-4.4.13.orig/net/core/dev.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/net/core/dev.c 2016-06-22 21:55:08.082523867 +0200 -@@ -186,6 +186,7 @@ +diff --git a/net/core/dev.c b/net/core/dev.c +index 9efbdb3ff78a..0e17592adbff 100644 +--- a/net/core/dev.c ++++ b/net/core/dev.c +@@ -186,6 +186,7 @@ static unsigned int napi_gen_id; static DEFINE_HASHTABLE(napi_hash, 8); static seqcount_t devnet_rename_seq; @@ -29821,7 +30314,7 @@ diff -Nur linux-4.4.13.orig/net/core/dev.c linux-4.4.13/net/core/dev.c static inline void dev_base_seq_inc(struct net *net) { -@@ -207,14 +208,14 @@ +@@ -207,14 +208,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 @@ -29838,7 +30331,7 @@ diff -Nur linux-4.4.13.orig/net/core/dev.c linux-4.4.13/net/core/dev.c #endif } -@@ -884,7 +885,8 @@ +@@ -884,7 +885,8 @@ retry: strcpy(name, dev->name); rcu_read_unlock(); if (read_seqcount_retry(&devnet_rename_seq, seq)) { @@ -29848,7 +30341,7 @@ diff -Nur linux-4.4.13.orig/net/core/dev.c linux-4.4.13/net/core/dev.c goto retry; } -@@ -1153,20 +1155,17 @@ +@@ -1153,20 +1155,17 @@ int dev_change_name(struct net_device *dev, const char *newname) if (dev->flags & IFF_UP) return -EBUSY; @@ -29875,7 +30368,7 @@ diff -Nur linux-4.4.13.orig/net/core/dev.c linux-4.4.13/net/core/dev.c if (oldname[0] && !strchr(oldname, '%')) netdev_info(dev, "renamed from %s\n", oldname); -@@ -1179,11 +1178,12 @@ +@@ -1179,11 +1178,12 @@ rollback: if (ret) { memcpy(dev->name, oldname, IFNAMSIZ); dev->name_assign_type = old_assign_type; @@ -29891,7 +30384,7 @@ diff -Nur linux-4.4.13.orig/net/core/dev.c linux-4.4.13/net/core/dev.c netdev_adjacent_rename_links(dev, oldname); -@@ -1204,7 +1204,8 @@ +@@ -1204,7 +1204,8 @@ rollback: /* err >= 0 after dev_alloc_name() or stores the first errno */ if (err >= 0) { err = ret; @@ -29901,7 +30394,7 @@ diff -Nur linux-4.4.13.orig/net/core/dev.c linux-4.4.13/net/core/dev.c memcpy(dev->name, oldname, IFNAMSIZ); memcpy(oldname, newname, IFNAMSIZ); dev->name_assign_type = old_assign_type; -@@ -1217,6 +1218,11 @@ +@@ -1217,6 +1218,11 @@ rollback: } return err; @@ -29913,7 +30406,7 @@ diff -Nur linux-4.4.13.orig/net/core/dev.c linux-4.4.13/net/core/dev.c } /** -@@ -2246,6 +2252,7 @@ +@@ -2246,6 +2252,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); @@ -29921,7 +30414,7 @@ diff -Nur linux-4.4.13.orig/net/core/dev.c linux-4.4.13/net/core/dev.c } void __netif_schedule(struct Qdisc *q) -@@ -2327,6 +2334,7 @@ +@@ -2327,6 +2334,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); @@ -29929,7 +30422,7 @@ diff -Nur linux-4.4.13.orig/net/core/dev.c linux-4.4.13/net/core/dev.c } EXPORT_SYMBOL(__dev_kfree_skb_irq); -@@ -2883,7 +2891,11 @@ +@@ -2883,7 +2891,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. */ @@ -29941,7 +30434,7 @@ diff -Nur linux-4.4.13.orig/net/core/dev.c linux-4.4.13/net/core/dev.c if (unlikely(contended)) spin_lock(&q->busylock); -@@ -2943,9 +2955,44 @@ +@@ -2943,9 +2955,44 @@ static void skb_update_prio(struct sk_buff *skb) #define skb_update_prio(skb) #endif @@ -29986,7 +30479,7 @@ diff -Nur linux-4.4.13.orig/net/core/dev.c linux-4.4.13/net/core/dev.c #define RECURSION_LIMIT 10 /** -@@ -3138,7 +3185,7 @@ +@@ -3138,7 +3185,7 @@ static int __dev_queue_xmit(struct sk_buff *skb, void *accel_priv) if (txq->xmit_lock_owner != cpu) { @@ -29995,7 +30488,7 @@ diff -Nur linux-4.4.13.orig/net/core/dev.c linux-4.4.13/net/core/dev.c goto recursion_alert; skb = validate_xmit_skb(skb, dev); -@@ -3148,9 +3195,9 @@ +@@ -3148,9 +3195,9 @@ static int __dev_queue_xmit(struct sk_buff *skb, void *accel_priv) HARD_TX_LOCK(dev, txq, cpu); if (!netif_xmit_stopped(txq)) { @@ -30007,7 +30500,7 @@ diff -Nur linux-4.4.13.orig/net/core/dev.c linux-4.4.13/net/core/dev.c if (dev_xmit_complete(rc)) { HARD_TX_UNLOCK(dev, txq); goto out; -@@ -3524,6 +3571,7 @@ +@@ -3524,6 +3571,7 @@ drop: rps_unlock(sd); local_irq_restore(flags); @@ -30015,7 +30508,7 @@ diff -Nur linux-4.4.13.orig/net/core/dev.c linux-4.4.13/net/core/dev.c atomic_long_inc(&skb->dev->rx_dropped); kfree_skb(skb); -@@ -3542,7 +3590,7 @@ +@@ -3542,7 +3590,7 @@ static int netif_rx_internal(struct sk_buff *skb) struct rps_dev_flow voidflow, *rflow = &voidflow; int cpu; @@ -30024,7 +30517,7 @@ diff -Nur linux-4.4.13.orig/net/core/dev.c linux-4.4.13/net/core/dev.c rcu_read_lock(); cpu = get_rps_cpu(skb->dev, skb, &rflow); -@@ -3552,13 +3600,13 @@ +@@ -3552,13 +3600,13 @@ static int netif_rx_internal(struct sk_buff *skb) ret = enqueue_to_backlog(skb, cpu, &rflow->last_qtail); rcu_read_unlock(); @@ -30041,7 +30534,7 @@ diff -Nur linux-4.4.13.orig/net/core/dev.c linux-4.4.13/net/core/dev.c } return ret; } -@@ -3592,16 +3640,44 @@ +@@ -3592,16 +3640,44 @@ int netif_rx_ni(struct sk_buff *skb) trace_netif_rx_ni_entry(skb); @@ -30090,7 +30583,7 @@ diff -Nur linux-4.4.13.orig/net/core/dev.c linux-4.4.13/net/core/dev.c static void net_tx_action(struct softirq_action *h) { struct softnet_data *sd = this_cpu_ptr(&softnet_data); -@@ -3643,7 +3719,7 @@ +@@ -3643,7 +3719,7 @@ static void net_tx_action(struct softirq_action *h) head = head->next_sched; root_lock = qdisc_lock(q); @@ -30099,7 +30592,7 @@ diff -Nur linux-4.4.13.orig/net/core/dev.c linux-4.4.13/net/core/dev.c smp_mb__before_atomic(); clear_bit(__QDISC_STATE_SCHED, &q->state); -@@ -4049,7 +4125,7 @@ +@@ -4049,7 +4125,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); @@ -30108,7 +30601,7 @@ diff -Nur linux-4.4.13.orig/net/core/dev.c linux-4.4.13/net/core/dev.c input_queue_head_incr(sd); } } -@@ -4058,10 +4134,13 @@ +@@ -4058,10 +4134,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); @@ -30123,7 +30616,7 @@ diff -Nur linux-4.4.13.orig/net/core/dev.c linux-4.4.13/net/core/dev.c } static int napi_gro_complete(struct sk_buff *skb) -@@ -4515,6 +4594,7 @@ +@@ -4515,6 +4594,7 @@ static void net_rps_action_and_irq_enable(struct softnet_data *sd) sd->rps_ipi_list = NULL; local_irq_enable(); @@ -30131,7 +30624,7 @@ diff -Nur linux-4.4.13.orig/net/core/dev.c linux-4.4.13/net/core/dev.c /* Send pending IPI's to kick RPS processing on remote cpus. */ while (remsd) { -@@ -4528,6 +4608,7 @@ +@@ -4528,6 +4608,7 @@ static void net_rps_action_and_irq_enable(struct softnet_data *sd) } else #endif local_irq_enable(); @@ -30139,7 +30632,7 @@ diff -Nur linux-4.4.13.orig/net/core/dev.c linux-4.4.13/net/core/dev.c } static bool sd_has_rps_ipi_waiting(struct softnet_data *sd) -@@ -4609,6 +4690,7 @@ +@@ -4609,6 +4690,7 @@ void __napi_schedule(struct napi_struct *n) local_irq_save(flags); ____napi_schedule(this_cpu_ptr(&softnet_data), n); local_irq_restore(flags); @@ -30147,7 +30640,7 @@ diff -Nur linux-4.4.13.orig/net/core/dev.c linux-4.4.13/net/core/dev.c } EXPORT_SYMBOL(__napi_schedule); -@@ -4885,7 +4967,7 @@ +@@ -4885,7 +4967,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)) @@ -30156,7 +30649,7 @@ diff -Nur linux-4.4.13.orig/net/core/dev.c linux-4.4.13/net/core/dev.c net_rps_action_and_irq_enable(sd); } -@@ -7218,7 +7300,7 @@ +@@ -7218,7 +7300,7 @@ EXPORT_SYMBOL(free_netdev); void synchronize_net(void) { might_sleep(); @@ -30165,7 +30658,7 @@ diff -Nur linux-4.4.13.orig/net/core/dev.c linux-4.4.13/net/core/dev.c synchronize_rcu_expedited(); else synchronize_rcu(); -@@ -7459,16 +7541,20 @@ +@@ -7459,16 +7541,20 @@ static int dev_cpu_callback(struct notifier_block *nfb, raise_softirq_irqoff(NET_TX_SOFTIRQ); local_irq_enable(); @@ -30187,7 +30680,7 @@ diff -Nur linux-4.4.13.orig/net/core/dev.c linux-4.4.13/net/core/dev.c return NOTIFY_OK; } -@@ -7770,8 +7856,9 @@ +@@ -7770,8 +7856,9 @@ static int __init net_dev_init(void) for_each_possible_cpu(i) { struct softnet_data *sd = &per_cpu(softnet_data, i); @@ -30199,9 +30692,10 @@ diff -Nur linux-4.4.13.orig/net/core/dev.c linux-4.4.13/net/core/dev.c INIT_LIST_HEAD(&sd->poll_list); sd->output_queue_tailp = &sd->output_queue; #ifdef CONFIG_RPS -diff -Nur linux-4.4.13.orig/net/core/skbuff.c linux-4.4.13/net/core/skbuff.c ---- linux-4.4.13.orig/net/core/skbuff.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/net/core/skbuff.c 2016-06-22 21:55:08.082523867 +0200 +diff --git a/net/core/skbuff.c b/net/core/skbuff.c +index 4968b5ddea69..c8d778f405dc 100644 +--- a/net/core/skbuff.c ++++ b/net/core/skbuff.c @@ -63,6 +63,7 @@ #include <linux/errqueue.h> #include <linux/prefetch.h> @@ -30210,7 +30704,7 @@ diff -Nur linux-4.4.13.orig/net/core/skbuff.c linux-4.4.13/net/core/skbuff.c #include <net/protocol.h> #include <net/dst.h> -@@ -351,6 +352,8 @@ +@@ -351,6 +352,8 @@ EXPORT_SYMBOL(build_skb); static DEFINE_PER_CPU(struct page_frag_cache, netdev_alloc_cache); static DEFINE_PER_CPU(struct page_frag_cache, napi_alloc_cache); @@ -30219,7 +30713,7 @@ diff -Nur linux-4.4.13.orig/net/core/skbuff.c linux-4.4.13/net/core/skbuff.c static void *__netdev_alloc_frag(unsigned int fragsz, gfp_t gfp_mask) { -@@ -358,10 +361,10 @@ +@@ -358,10 +361,10 @@ static void *__netdev_alloc_frag(unsigned int fragsz, gfp_t gfp_mask) unsigned long flags; void *data; @@ -30232,7 +30726,7 @@ diff -Nur linux-4.4.13.orig/net/core/skbuff.c linux-4.4.13/net/core/skbuff.c return data; } -@@ -380,9 +383,13 @@ +@@ -380,9 +383,13 @@ EXPORT_SYMBOL(netdev_alloc_frag); static void *__napi_alloc_frag(unsigned int fragsz, gfp_t gfp_mask) { @@ -30248,7 +30742,7 @@ diff -Nur linux-4.4.13.orig/net/core/skbuff.c linux-4.4.13/net/core/skbuff.c } void *napi_alloc_frag(unsigned int fragsz) -@@ -429,13 +436,13 @@ +@@ -429,13 +436,13 @@ struct sk_buff *__netdev_alloc_skb(struct net_device *dev, unsigned int len, if (sk_memalloc_socks()) gfp_mask |= __GFP_MEMALLOC; @@ -30264,7 +30758,7 @@ diff -Nur linux-4.4.13.orig/net/core/skbuff.c linux-4.4.13/net/core/skbuff.c if (unlikely(!data)) return NULL; -@@ -476,9 +483,10 @@ +@@ -476,9 +483,10 @@ EXPORT_SYMBOL(__netdev_alloc_skb); struct sk_buff *__napi_alloc_skb(struct napi_struct *napi, unsigned int len, gfp_t gfp_mask) { @@ -30276,7 +30770,7 @@ diff -Nur linux-4.4.13.orig/net/core/skbuff.c linux-4.4.13/net/core/skbuff.c len += NET_SKB_PAD + NET_IP_ALIGN; -@@ -496,7 +504,11 @@ +@@ -496,7 +504,11 @@ struct sk_buff *__napi_alloc_skb(struct napi_struct *napi, unsigned int len, if (sk_memalloc_socks()) gfp_mask |= __GFP_MEMALLOC; @@ -30288,7 +30782,7 @@ diff -Nur linux-4.4.13.orig/net/core/skbuff.c linux-4.4.13/net/core/skbuff.c if (unlikely(!data)) return NULL; -@@ -507,7 +519,7 @@ +@@ -507,7 +519,7 @@ struct sk_buff *__napi_alloc_skb(struct napi_struct *napi, unsigned int len, } /* use OR instead of assignment to avoid clearing of bits in mask */ @@ -30297,10 +30791,11 @@ diff -Nur linux-4.4.13.orig/net/core/skbuff.c linux-4.4.13/net/core/skbuff.c skb->pfmemalloc = 1; skb->head_frag = 1; -diff -Nur linux-4.4.13.orig/net/core/sock.c linux-4.4.13/net/core/sock.c ---- linux-4.4.13.orig/net/core/sock.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/net/core/sock.c 2016-06-22 21:55:08.082523867 +0200 -@@ -2435,12 +2435,11 @@ +diff --git a/net/core/sock.c b/net/core/sock.c +index 0d91f7dca751..9c3234299fc3 100644 +--- a/net/core/sock.c ++++ b/net/core/sock.c +@@ -2435,12 +2435,11 @@ void lock_sock_nested(struct sock *sk, int subclass) if (sk->sk_lock.owned) __lock_sock(sk); sk->sk_lock.owned = 1; @@ -30314,9 +30809,10 @@ diff -Nur linux-4.4.13.orig/net/core/sock.c linux-4.4.13/net/core/sock.c } EXPORT_SYMBOL(lock_sock_nested); -diff -Nur linux-4.4.13.orig/net/ipv4/icmp.c linux-4.4.13/net/ipv4/icmp.c ---- linux-4.4.13.orig/net/ipv4/icmp.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/net/ipv4/icmp.c 2016-06-22 21:55:08.082523867 +0200 +diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c +index 36e26977c908..74314d95d0f8 100644 +--- a/net/ipv4/icmp.c ++++ b/net/ipv4/icmp.c @@ -69,6 +69,7 @@ #include <linux/jiffies.h> #include <linux/kernel.h> @@ -30325,7 +30821,7 @@ diff -Nur linux-4.4.13.orig/net/ipv4/icmp.c linux-4.4.13/net/ipv4/icmp.c #include <linux/socket.h> #include <linux/in.h> #include <linux/inet.h> -@@ -891,6 +892,30 @@ +@@ -891,6 +892,30 @@ static bool icmp_redirect(struct sk_buff *skb) } /* @@ -30356,7 +30852,7 @@ diff -Nur linux-4.4.13.orig/net/ipv4/icmp.c linux-4.4.13/net/ipv4/icmp.c * Handle ICMP_ECHO ("ping") requests. * * RFC 1122: 3.2.2.6 MUST have an echo server that answers ICMP echo -@@ -917,6 +942,11 @@ +@@ -917,6 +942,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); @@ -30368,10 +30864,11 @@ diff -Nur linux-4.4.13.orig/net/ipv4/icmp.c linux-4.4.13/net/ipv4/icmp.c } /* should there be an ICMP stat for ignored echos? */ return true; -diff -Nur linux-4.4.13.orig/net/ipv4/sysctl_net_ipv4.c linux-4.4.13/net/ipv4/sysctl_net_ipv4.c ---- linux-4.4.13.orig/net/ipv4/sysctl_net_ipv4.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/net/ipv4/sysctl_net_ipv4.c 2016-06-22 21:55:08.082523867 +0200 -@@ -818,6 +818,13 @@ +diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c +index a0bd7a55193e..1866f910263f 100644 +--- a/net/ipv4/sysctl_net_ipv4.c ++++ b/net/ipv4/sysctl_net_ipv4.c +@@ -818,6 +818,13 @@ static struct ctl_table ipv4_net_table[] = { .proc_handler = proc_dointvec }, { @@ -30385,10 +30882,11 @@ diff -Nur linux-4.4.13.orig/net/ipv4/sysctl_net_ipv4.c linux-4.4.13/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.4.13.orig/net/mac80211/rx.c linux-4.4.13/net/mac80211/rx.c ---- linux-4.4.13.orig/net/mac80211/rx.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/net/mac80211/rx.c 2016-06-22 21:55:08.082523867 +0200 -@@ -3574,7 +3574,7 @@ +diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c +index a3bb8f7f5fc5..3be977394a80 100644 +--- a/net/mac80211/rx.c ++++ b/net/mac80211/rx.c +@@ -3574,7 +3574,7 @@ void ieee80211_rx_napi(struct ieee80211_hw *hw, struct sk_buff *skb, struct ieee80211_supported_band *sband; struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb); @@ -30397,9 +30895,10 @@ diff -Nur linux-4.4.13.orig/net/mac80211/rx.c linux-4.4.13/net/mac80211/rx.c if (WARN_ON(status->band >= IEEE80211_NUM_BANDS)) goto drop; -diff -Nur linux-4.4.13.orig/net/netfilter/core.c linux-4.4.13/net/netfilter/core.c ---- linux-4.4.13.orig/net/netfilter/core.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/net/netfilter/core.c 2016-06-22 21:55:08.082523867 +0200 +diff --git a/net/netfilter/core.c b/net/netfilter/core.c +index f39276d1c2d7..10880c89d62f 100644 +--- a/net/netfilter/core.c ++++ b/net/netfilter/core.c @@ -22,11 +22,17 @@ #include <linux/proc_fs.h> #include <linux/mutex.h> @@ -30418,9 +30917,10 @@ diff -Nur linux-4.4.13.orig/net/netfilter/core.c linux-4.4.13/net/netfilter/core static DEFINE_MUTEX(afinfo_mutex); const struct nf_afinfo __rcu *nf_afinfo[NFPROTO_NUMPROTO] __read_mostly; -diff -Nur linux-4.4.13.orig/net/packet/af_packet.c linux-4.4.13/net/packet/af_packet.c ---- linux-4.4.13.orig/net/packet/af_packet.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/net/packet/af_packet.c 2016-06-22 21:55:08.086523867 +0200 +diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c +index a86f26d05bc2..77276e3ff2a2 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> @@ -30429,7 +30929,7 @@ diff -Nur linux-4.4.13.orig/net/packet/af_packet.c linux-4.4.13/net/packet/af_pa #include <linux/kmod.h> #include <linux/slab.h> #include <linux/vmalloc.h> -@@ -695,7 +696,7 @@ +@@ -695,7 +696,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... */ @@ -30438,7 +30938,7 @@ diff -Nur linux-4.4.13.orig/net/packet/af_packet.c linux-4.4.13/net/packet/af_pa } } -@@ -957,7 +958,7 @@ +@@ -957,7 +958,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... */ @@ -30447,9 +30947,10 @@ diff -Nur linux-4.4.13.orig/net/packet/af_packet.c linux-4.4.13/net/packet/af_pa } } prb_close_block(pkc, pbd, po, status); -diff -Nur linux-4.4.13.orig/net/rds/ib_rdma.c linux-4.4.13/net/rds/ib_rdma.c ---- linux-4.4.13.orig/net/rds/ib_rdma.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/net/rds/ib_rdma.c 2016-06-22 21:55:08.086523867 +0200 +diff --git a/net/rds/ib_rdma.c b/net/rds/ib_rdma.c +index a2340748ec86..19123a97b354 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> @@ -30458,7 +30959,7 @@ diff -Nur linux-4.4.13.orig/net/rds/ib_rdma.c linux-4.4.13/net/rds/ib_rdma.c #include "rds.h" #include "ib.h" -@@ -313,7 +314,7 @@ +@@ -313,7 +314,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)) @@ -30467,10 +30968,11 @@ diff -Nur linux-4.4.13.orig/net/rds/ib_rdma.c linux-4.4.13/net/rds/ib_rdma.c } } -diff -Nur linux-4.4.13.orig/net/sched/sch_generic.c linux-4.4.13/net/sched/sch_generic.c ---- linux-4.4.13.orig/net/sched/sch_generic.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/net/sched/sch_generic.c 2016-06-22 21:55:08.086523867 +0200 -@@ -893,7 +893,7 @@ +diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c +index aa4725038f94..00b81cab28f3 100644 +--- a/net/sched/sch_generic.c ++++ b/net/sched/sch_generic.c +@@ -893,7 +893,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)) @@ -30479,10 +30981,11 @@ diff -Nur linux-4.4.13.orig/net/sched/sch_generic.c linux-4.4.13/net/sched/sch_g } void dev_deactivate(struct net_device *dev) -diff -Nur linux-4.4.13.orig/net/sunrpc/svc_xprt.c linux-4.4.13/net/sunrpc/svc_xprt.c ---- linux-4.4.13.orig/net/sunrpc/svc_xprt.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/net/sunrpc/svc_xprt.c 2016-06-22 21:55:08.086523867 +0200 -@@ -340,7 +340,7 @@ +diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c +index a6cbb2104667..5b69bb580617 100644 +--- a/net/sunrpc/svc_xprt.c ++++ b/net/sunrpc/svc_xprt.c +@@ -340,7 +340,7 @@ void svc_xprt_do_enqueue(struct svc_xprt *xprt) goto out; } @@ -30491,7 +30994,7 @@ diff -Nur linux-4.4.13.orig/net/sunrpc/svc_xprt.c linux-4.4.13/net/sunrpc/svc_xp pool = svc_pool_for_cpu(xprt->xpt_server, cpu); atomic_long_inc(&pool->sp_stats.packets); -@@ -376,7 +376,7 @@ +@@ -376,7 +376,7 @@ redo_search: atomic_long_inc(&pool->sp_stats.threads_woken); wake_up_process(rqstp->rq_task); @@ -30500,7 +31003,7 @@ diff -Nur linux-4.4.13.orig/net/sunrpc/svc_xprt.c linux-4.4.13/net/sunrpc/svc_xp goto out; } rcu_read_unlock(); -@@ -397,7 +397,7 @@ +@@ -397,7 +397,7 @@ redo_search: goto redo_search; } rqstp = NULL; @@ -30509,10 +31012,11 @@ diff -Nur linux-4.4.13.orig/net/sunrpc/svc_xprt.c linux-4.4.13/net/sunrpc/svc_xp out: trace_svc_xprt_do_enqueue(xprt, rqstp); } -diff -Nur linux-4.4.13.orig/scripts/mkcompile_h linux-4.4.13/scripts/mkcompile_h ---- linux-4.4.13.orig/scripts/mkcompile_h 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/scripts/mkcompile_h 2016-06-22 21:55:08.086523867 +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 @@ -30522,7 +31026,7 @@ diff -Nur linux-4.4.13.orig/scripts/mkcompile_h linux-4.4.13/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 @@ -30530,10 +31034,11 @@ diff -Nur linux-4.4.13.orig/scripts/mkcompile_h linux-4.4.13/scripts/mkcompile_h UTS_VERSION="$UTS_VERSION $CONFIG_FLAGS $TIMESTAMP" # Truncate to maximum length -diff -Nur linux-4.4.13.orig/sound/core/pcm_native.c linux-4.4.13/sound/core/pcm_native.c ---- linux-4.4.13.orig/sound/core/pcm_native.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/sound/core/pcm_native.c 2016-06-22 21:55:08.086523867 +0200 -@@ -135,7 +135,7 @@ +diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c +index 4ba64fd49759..34e50186885d 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) @@ -30542,7 +31047,7 @@ diff -Nur linux-4.4.13.orig/sound/core/pcm_native.c linux-4.4.13/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) @@ -30551,7 +31056,7 @@ diff -Nur linux-4.4.13.orig/sound/core/pcm_native.c linux-4.4.13/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) @@ -30560,7 +31065,7 @@ diff -Nur linux-4.4.13.orig/sound/core/pcm_native.c linux-4.4.13/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) @@ -30569,10 +31074,11 @@ diff -Nur linux-4.4.13.orig/sound/core/pcm_native.c linux-4.4.13/sound/core/pcm_ } EXPORT_SYMBOL_GPL(snd_pcm_stream_unlock_irqrestore); -diff -Nur linux-4.4.13.orig/virt/kvm/async_pf.c linux-4.4.13/virt/kvm/async_pf.c ---- linux-4.4.13.orig/virt/kvm/async_pf.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/virt/kvm/async_pf.c 2016-06-22 21:55:08.086523867 +0200 -@@ -98,8 +98,8 @@ +diff --git a/virt/kvm/async_pf.c b/virt/kvm/async_pf.c +index 4f70d12e392d..9378d0919ed8 100644 +--- a/virt/kvm/async_pf.c ++++ b/virt/kvm/async_pf.c +@@ -98,8 +98,8 @@ static void async_pf_execute(struct work_struct *work) * This memory barrier pairs with prepare_to_wait's set_current_state() */ smp_mb(); @@ -30583,10 +31089,11 @@ diff -Nur linux-4.4.13.orig/virt/kvm/async_pf.c linux-4.4.13/virt/kvm/async_pf.c mmput(mm); kvm_put_kvm(vcpu->kvm); -diff -Nur linux-4.4.13.orig/virt/kvm/kvm_main.c linux-4.4.13/virt/kvm/kvm_main.c ---- linux-4.4.13.orig/virt/kvm/kvm_main.c 2016-06-08 03:14:51.000000000 +0200 -+++ linux-4.4.13/virt/kvm/kvm_main.c 2016-06-22 21:55:08.086523867 +0200 -@@ -226,8 +226,7 @@ +diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c +index 336ed267c407..7748ca386e60 100644 +--- a/virt/kvm/kvm_main.c ++++ b/virt/kvm/kvm_main.c +@@ -228,8 +228,7 @@ int kvm_vcpu_init(struct kvm_vcpu *vcpu, struct kvm *kvm, unsigned id) vcpu->kvm = kvm; vcpu->vcpu_id = id; vcpu->pid = NULL; @@ -30596,7 +31103,7 @@ diff -Nur linux-4.4.13.orig/virt/kvm/kvm_main.c linux-4.4.13/virt/kvm/kvm_main.c kvm_async_pf_vcpu_init(vcpu); vcpu->pre_pcpu = -1; -@@ -2003,7 +2002,7 @@ +@@ -2005,7 +2004,7 @@ static int kvm_vcpu_check_block(struct kvm_vcpu *vcpu) void kvm_vcpu_block(struct kvm_vcpu *vcpu) { ktime_t start, cur; @@ -30605,7 +31112,7 @@ diff -Nur linux-4.4.13.orig/virt/kvm/kvm_main.c linux-4.4.13/virt/kvm/kvm_main.c bool waited = false; u64 block_ns; -@@ -2028,7 +2027,7 @@ +@@ -2030,7 +2029,7 @@ void kvm_vcpu_block(struct kvm_vcpu *vcpu) kvm_arch_vcpu_blocking(vcpu); for (;;) { @@ -30614,7 +31121,7 @@ diff -Nur linux-4.4.13.orig/virt/kvm/kvm_main.c linux-4.4.13/virt/kvm/kvm_main.c if (kvm_vcpu_check_block(vcpu) < 0) break; -@@ -2037,7 +2036,7 @@ +@@ -2039,7 +2038,7 @@ void kvm_vcpu_block(struct kvm_vcpu *vcpu) schedule(); } @@ -30623,7 +31130,7 @@ diff -Nur linux-4.4.13.orig/virt/kvm/kvm_main.c linux-4.4.13/virt/kvm/kvm_main.c cur = ktime_get(); kvm_arch_vcpu_unblocking(vcpu); -@@ -2069,11 +2068,11 @@ +@@ -2071,11 +2070,11 @@ void kvm_vcpu_kick(struct kvm_vcpu *vcpu) { int me; int cpu = vcpu->cpu; @@ -30638,7 +31145,7 @@ diff -Nur linux-4.4.13.orig/virt/kvm/kvm_main.c linux-4.4.13/virt/kvm/kvm_main.c ++vcpu->stat.halt_wakeup; } -@@ -2174,7 +2173,7 @@ +@@ -2176,7 +2175,7 @@ void kvm_vcpu_on_spin(struct kvm_vcpu *me) continue; if (vcpu == me) continue; |