summaryrefslogtreecommitdiff
path: root/target/linux
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/patches/4.1.13/aufs.patch (renamed from target/linux/patches/4.1.10/aufs.patch)0
-rw-r--r--target/linux/patches/4.1.13/cleankernel.patch (renamed from target/linux/patches/4.1.10/cleankernel.patch)0
-rw-r--r--target/linux/patches/4.1.13/cris-header.patch (renamed from target/linux/patches/4.1.10/cris-header.patch)0
-rw-r--r--target/linux/patches/4.1.13/initramfs-nosizelimit.patch (renamed from target/linux/patches/4.1.10/initramfs-nosizelimit.patch)0
-rw-r--r--target/linux/patches/4.1.13/realtime.patch (renamed from target/linux/patches/4.1.10/realtime.patch)3028
-rw-r--r--target/linux/patches/4.1.13/regmap-default-on.patch (renamed from target/linux/patches/4.1.10/regmap-default-on.patch)0
-rw-r--r--target/linux/patches/4.1.13/remove-warn.patch (renamed from target/linux/patches/4.1.10/remove-warn.patch)0
-rw-r--r--target/linux/patches/4.1.13/startup.patch (renamed from target/linux/patches/4.1.10/startup.patch)0
8 files changed, 1664 insertions, 1364 deletions
diff --git a/target/linux/patches/4.1.10/aufs.patch b/target/linux/patches/4.1.13/aufs.patch
index 749c90989..749c90989 100644
--- a/target/linux/patches/4.1.10/aufs.patch
+++ b/target/linux/patches/4.1.13/aufs.patch
diff --git a/target/linux/patches/4.1.10/cleankernel.patch b/target/linux/patches/4.1.13/cleankernel.patch
index 59693f426..59693f426 100644
--- a/target/linux/patches/4.1.10/cleankernel.patch
+++ b/target/linux/patches/4.1.13/cleankernel.patch
diff --git a/target/linux/patches/4.1.10/cris-header.patch b/target/linux/patches/4.1.13/cris-header.patch
index 2b5a88461..2b5a88461 100644
--- a/target/linux/patches/4.1.10/cris-header.patch
+++ b/target/linux/patches/4.1.13/cris-header.patch
diff --git a/target/linux/patches/4.1.10/initramfs-nosizelimit.patch b/target/linux/patches/4.1.13/initramfs-nosizelimit.patch
index 40d2f6bd8..40d2f6bd8 100644
--- a/target/linux/patches/4.1.10/initramfs-nosizelimit.patch
+++ b/target/linux/patches/4.1.13/initramfs-nosizelimit.patch
diff --git a/target/linux/patches/4.1.10/realtime.patch b/target/linux/patches/4.1.13/realtime.patch
index fef472a8b..3b65f6148 100644
--- a/target/linux/patches/4.1.10/realtime.patch
+++ b/target/linux/patches/4.1.13/realtime.patch
@@ -1,6 +1,6 @@
-diff -Nur linux-4.1.10.orig/arch/alpha/mm/fault.c linux-4.1.10/arch/alpha/mm/fault.c
---- linux-4.1.10.orig/arch/alpha/mm/fault.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/alpha/mm/fault.c 2015-10-12 22:33:32.144685475 +0200
+diff -Nur linux-4.1.13.orig/arch/alpha/mm/fault.c linux-4.1.13/arch/alpha/mm/fault.c
+--- linux-4.1.13.orig/arch/alpha/mm/fault.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/alpha/mm/fault.c 2015-11-29 09:23:09.477622951 +0100
@@ -23,8 +23,7 @@
#include <linux/smp.h>
#include <linux/interrupt.h>
@@ -20,9 +20,9 @@ diff -Nur linux-4.1.10.orig/arch/alpha/mm/fault.c linux-4.1.10/arch/alpha/mm/fau
goto no_context;
#ifdef CONFIG_ALPHA_LARGE_VMALLOC
-diff -Nur linux-4.1.10.orig/arch/arc/include/asm/futex.h linux-4.1.10/arch/arc/include/asm/futex.h
---- linux-4.1.10.orig/arch/arc/include/asm/futex.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/arc/include/asm/futex.h 2015-10-12 22:33:32.144685475 +0200
+diff -Nur linux-4.1.13.orig/arch/arc/include/asm/futex.h linux-4.1.13/arch/arc/include/asm/futex.h
+--- linux-4.1.13.orig/arch/arc/include/asm/futex.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/arc/include/asm/futex.h 2015-11-29 09:23:09.477622951 +0100
@@ -53,7 +53,7 @@
if (!access_ok(VERIFY_WRITE, uaddr, sizeof(int)))
return -EFAULT;
@@ -68,9 +68,9 @@ diff -Nur linux-4.1.10.orig/arch/arc/include/asm/futex.h linux-4.1.10/arch/arc/i
*uval = val;
return val;
-diff -Nur linux-4.1.10.orig/arch/arc/mm/fault.c linux-4.1.10/arch/arc/mm/fault.c
---- linux-4.1.10.orig/arch/arc/mm/fault.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/arc/mm/fault.c 2015-10-12 22:33:32.144685475 +0200
+diff -Nur linux-4.1.13.orig/arch/arc/mm/fault.c linux-4.1.13/arch/arc/mm/fault.c
+--- linux-4.1.13.orig/arch/arc/mm/fault.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/arc/mm/fault.c 2015-11-29 09:23:09.477622951 +0100
@@ -86,7 +86,7 @@
* If we're in an interrupt or have no user
* context, we must not take the fault..
@@ -80,9 +80,9 @@ diff -Nur linux-4.1.10.orig/arch/arc/mm/fault.c linux-4.1.10/arch/arc/mm/fault.c
goto no_context;
if (user_mode(regs))
-diff -Nur linux-4.1.10.orig/arch/arm/include/asm/cmpxchg.h linux-4.1.10/arch/arm/include/asm/cmpxchg.h
---- linux-4.1.10.orig/arch/arm/include/asm/cmpxchg.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/arm/include/asm/cmpxchg.h 2015-10-12 22:33:32.148685211 +0200
+diff -Nur linux-4.1.13.orig/arch/arm/include/asm/cmpxchg.h linux-4.1.13/arch/arm/include/asm/cmpxchg.h
+--- linux-4.1.13.orig/arch/arm/include/asm/cmpxchg.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/arm/include/asm/cmpxchg.h 2015-11-29 09:23:09.477622951 +0100
@@ -129,6 +129,8 @@
#else /* min ARCH >= ARMv6 */
@@ -92,9 +92,9 @@ diff -Nur linux-4.1.10.orig/arch/arm/include/asm/cmpxchg.h linux-4.1.10/arch/arm
extern void __bad_cmpxchg(volatile void *ptr, int size);
/*
-diff -Nur linux-4.1.10.orig/arch/arm/include/asm/futex.h linux-4.1.10/arch/arm/include/asm/futex.h
---- linux-4.1.10.orig/arch/arm/include/asm/futex.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/arm/include/asm/futex.h 2015-10-12 22:33:32.148685211 +0200
+diff -Nur linux-4.1.13.orig/arch/arm/include/asm/futex.h linux-4.1.13/arch/arm/include/asm/futex.h
+--- linux-4.1.13.orig/arch/arm/include/asm/futex.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/arm/include/asm/futex.h 2015-11-29 09:23:09.477622951 +0100
@@ -93,6 +93,7 @@
if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
return -EFAULT;
@@ -136,9 +136,9 @@ diff -Nur linux-4.1.10.orig/arch/arm/include/asm/futex.h linux-4.1.10/arch/arm/i
if (!ret) {
switch (cmp) {
-diff -Nur linux-4.1.10.orig/arch/arm/include/asm/switch_to.h linux-4.1.10/arch/arm/include/asm/switch_to.h
---- linux-4.1.10.orig/arch/arm/include/asm/switch_to.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/arm/include/asm/switch_to.h 2015-10-12 22:33:32.148685211 +0200
+diff -Nur linux-4.1.13.orig/arch/arm/include/asm/switch_to.h linux-4.1.13/arch/arm/include/asm/switch_to.h
+--- linux-4.1.13.orig/arch/arm/include/asm/switch_to.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/arm/include/asm/switch_to.h 2015-11-29 09:23:09.477622951 +0100
@@ -3,6 +3,13 @@
#include <linux/thread_info.h>
@@ -161,9 +161,9 @@ diff -Nur linux-4.1.10.orig/arch/arm/include/asm/switch_to.h linux-4.1.10/arch/a
last = __switch_to(prev,task_thread_info(prev), task_thread_info(next)); \
} while (0)
-diff -Nur linux-4.1.10.orig/arch/arm/include/asm/thread_info.h linux-4.1.10/arch/arm/include/asm/thread_info.h
---- linux-4.1.10.orig/arch/arm/include/asm/thread_info.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/arm/include/asm/thread_info.h 2015-10-12 22:33:32.148685211 +0200
+diff -Nur linux-4.1.13.orig/arch/arm/include/asm/thread_info.h linux-4.1.13/arch/arm/include/asm/thread_info.h
+--- linux-4.1.13.orig/arch/arm/include/asm/thread_info.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/arm/include/asm/thread_info.h 2015-11-29 09:23:09.477622951 +0100
@@ -50,6 +50,7 @@
struct thread_info {
unsigned long flags; /* low level flags */
@@ -188,9 +188,9 @@ diff -Nur linux-4.1.10.orig/arch/arm/include/asm/thread_info.h linux-4.1.10/arch
#define _TIF_UPROBE (1 << TIF_UPROBE)
#define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE)
#define _TIF_SYSCALL_AUDIT (1 << TIF_SYSCALL_AUDIT)
-diff -Nur linux-4.1.10.orig/arch/arm/Kconfig linux-4.1.10/arch/arm/Kconfig
---- linux-4.1.10.orig/arch/arm/Kconfig 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/arm/Kconfig 2015-10-12 22:33:32.148685211 +0200
+diff -Nur linux-4.1.13.orig/arch/arm/Kconfig linux-4.1.13/arch/arm/Kconfig
+--- linux-4.1.13.orig/arch/arm/Kconfig 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/arm/Kconfig 2015-11-29 09:23:09.477622951 +0100
@@ -31,7 +31,7 @@
select HARDIRQS_SW_RESEND
select HAVE_ARCH_AUDITSYSCALL if (AEABI && !OABI_COMPAT)
@@ -208,9 +208,9 @@ diff -Nur linux-4.1.10.orig/arch/arm/Kconfig linux-4.1.10/arch/arm/Kconfig
select HAVE_RCU_TABLE_FREE if (SMP && ARM_LPAE)
select HAVE_REGS_AND_STACK_ACCESS_API
select HAVE_SYSCALL_TRACEPOINTS
-diff -Nur linux-4.1.10.orig/arch/arm/kernel/asm-offsets.c linux-4.1.10/arch/arm/kernel/asm-offsets.c
---- linux-4.1.10.orig/arch/arm/kernel/asm-offsets.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/arm/kernel/asm-offsets.c 2015-10-12 22:33:32.148685211 +0200
+diff -Nur linux-4.1.13.orig/arch/arm/kernel/asm-offsets.c linux-4.1.13/arch/arm/kernel/asm-offsets.c
+--- linux-4.1.13.orig/arch/arm/kernel/asm-offsets.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/arm/kernel/asm-offsets.c 2015-11-29 09:23:09.477622951 +0100
@@ -65,6 +65,7 @@
BLANK();
DEFINE(TI_FLAGS, offsetof(struct thread_info, flags));
@@ -219,9 +219,9 @@ diff -Nur linux-4.1.10.orig/arch/arm/kernel/asm-offsets.c linux-4.1.10/arch/arm/
DEFINE(TI_ADDR_LIMIT, offsetof(struct thread_info, addr_limit));
DEFINE(TI_TASK, offsetof(struct thread_info, task));
DEFINE(TI_CPU, offsetof(struct thread_info, cpu));
-diff -Nur linux-4.1.10.orig/arch/arm/kernel/entry-armv.S linux-4.1.10/arch/arm/kernel/entry-armv.S
---- linux-4.1.10.orig/arch/arm/kernel/entry-armv.S 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/arm/kernel/entry-armv.S 2015-10-12 22:33:32.152684946 +0200
+diff -Nur linux-4.1.13.orig/arch/arm/kernel/entry-armv.S linux-4.1.13/arch/arm/kernel/entry-armv.S
+--- linux-4.1.13.orig/arch/arm/kernel/entry-armv.S 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/arm/kernel/entry-armv.S 2015-11-29 09:23:09.477622951 +0100
@@ -208,11 +208,18 @@
#ifdef CONFIG_PREEMPT
get_thread_info tsk
@@ -252,9 +252,9 @@ diff -Nur linux-4.1.10.orig/arch/arm/kernel/entry-armv.S linux-4.1.10/arch/arm/k
reteq r8 @ go again
b 1b
#endif
-diff -Nur linux-4.1.10.orig/arch/arm/kernel/process.c linux-4.1.10/arch/arm/kernel/process.c
---- linux-4.1.10.orig/arch/arm/kernel/process.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/arm/kernel/process.c 2015-10-12 22:33:32.152684946 +0200
+diff -Nur linux-4.1.13.orig/arch/arm/kernel/process.c linux-4.1.13/arch/arm/kernel/process.c
+--- linux-4.1.13.orig/arch/arm/kernel/process.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/arm/kernel/process.c 2015-11-29 09:23:09.477622951 +0100
@@ -290,6 +290,30 @@
}
@@ -286,10 +286,10 @@ diff -Nur linux-4.1.10.orig/arch/arm/kernel/process.c linux-4.1.10/arch/arm/kern
#ifdef CONFIG_KUSER_HELPERS
/*
* The vectors page is always readable from user space for the
-diff -Nur linux-4.1.10.orig/arch/arm/kernel/signal.c linux-4.1.10/arch/arm/kernel/signal.c
---- linux-4.1.10.orig/arch/arm/kernel/signal.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/arm/kernel/signal.c 2015-10-12 22:33:32.152684946 +0200
-@@ -563,7 +563,8 @@
+diff -Nur linux-4.1.13.orig/arch/arm/kernel/signal.c linux-4.1.13/arch/arm/kernel/signal.c
+--- linux-4.1.13.orig/arch/arm/kernel/signal.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/arm/kernel/signal.c 2015-11-29 09:23:09.477622951 +0100
+@@ -568,7 +568,8 @@
do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall)
{
do {
@@ -299,9 +299,9 @@ diff -Nur linux-4.1.10.orig/arch/arm/kernel/signal.c linux-4.1.10/arch/arm/kerne
schedule();
} else {
if (unlikely(!user_mode(regs)))
-diff -Nur linux-4.1.10.orig/arch/arm/kernel/smp.c linux-4.1.10/arch/arm/kernel/smp.c
---- linux-4.1.10.orig/arch/arm/kernel/smp.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/arm/kernel/smp.c 2015-10-12 22:33:32.152684946 +0200
+diff -Nur linux-4.1.13.orig/arch/arm/kernel/smp.c linux-4.1.13/arch/arm/kernel/smp.c
+--- linux-4.1.13.orig/arch/arm/kernel/smp.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/arm/kernel/smp.c 2015-11-29 09:23:09.481622687 +0100
@@ -213,8 +213,6 @@
flush_cache_louis();
local_flush_tlb_all();
@@ -321,9 +321,9 @@ diff -Nur linux-4.1.10.orig/arch/arm/kernel/smp.c linux-4.1.10/arch/arm/kernel/s
pr_notice("CPU%u: shutdown\n", cpu);
/*
-diff -Nur linux-4.1.10.orig/arch/arm/kernel/unwind.c linux-4.1.10/arch/arm/kernel/unwind.c
---- linux-4.1.10.orig/arch/arm/kernel/unwind.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/arm/kernel/unwind.c 2015-10-12 22:33:32.152684946 +0200
+diff -Nur linux-4.1.13.orig/arch/arm/kernel/unwind.c linux-4.1.13/arch/arm/kernel/unwind.c
+--- linux-4.1.13.orig/arch/arm/kernel/unwind.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/arm/kernel/unwind.c 2015-11-29 09:23:09.481622687 +0100
@@ -93,7 +93,7 @@
static const struct unwind_idx *__origin_unwind_idx;
extern const struct unwind_idx __stop_unwind_idx[];
@@ -375,9 +375,9 @@ diff -Nur linux-4.1.10.orig/arch/arm/kernel/unwind.c linux-4.1.10/arch/arm/kerne
kfree(tab);
}
-diff -Nur linux-4.1.10.orig/arch/arm/kvm/arm.c linux-4.1.10/arch/arm/kvm/arm.c
---- linux-4.1.10.orig/arch/arm/kvm/arm.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/arm/kvm/arm.c 2015-10-12 22:33:32.156684682 +0200
+diff -Nur linux-4.1.13.orig/arch/arm/kvm/arm.c linux-4.1.13/arch/arm/kvm/arm.c
+--- linux-4.1.13.orig/arch/arm/kvm/arm.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/arm/kvm/arm.c 2015-11-29 09:23:09.481622687 +0100
@@ -474,9 +474,9 @@
static void vcpu_pause(struct kvm_vcpu *vcpu)
@@ -390,9 +390,9 @@ diff -Nur linux-4.1.10.orig/arch/arm/kvm/arm.c linux-4.1.10/arch/arm/kvm/arm.c
}
static int kvm_vcpu_initialized(struct kvm_vcpu *vcpu)
-diff -Nur linux-4.1.10.orig/arch/arm/kvm/psci.c linux-4.1.10/arch/arm/kvm/psci.c
---- linux-4.1.10.orig/arch/arm/kvm/psci.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/arm/kvm/psci.c 2015-10-12 22:33:32.156684682 +0200
+diff -Nur linux-4.1.13.orig/arch/arm/kvm/psci.c linux-4.1.13/arch/arm/kvm/psci.c
+--- linux-4.1.13.orig/arch/arm/kvm/psci.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/arm/kvm/psci.c 2015-11-29 09:23:09.501621354 +0100
@@ -68,7 +68,7 @@
{
struct kvm *kvm = source_vcpu->kvm;
@@ -411,9 +411,9 @@ diff -Nur linux-4.1.10.orig/arch/arm/kvm/psci.c linux-4.1.10/arch/arm/kvm/psci.c
return PSCI_RET_SUCCESS;
}
-diff -Nur linux-4.1.10.orig/arch/arm/mach-exynos/platsmp.c linux-4.1.10/arch/arm/mach-exynos/platsmp.c
---- linux-4.1.10.orig/arch/arm/mach-exynos/platsmp.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/arm/mach-exynos/platsmp.c 2015-10-12 22:33:32.156684682 +0200
+diff -Nur linux-4.1.13.orig/arch/arm/mach-exynos/platsmp.c linux-4.1.13/arch/arm/mach-exynos/platsmp.c
+--- linux-4.1.13.orig/arch/arm/mach-exynos/platsmp.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/arm/mach-exynos/platsmp.c 2015-11-29 09:23:09.501621354 +0100
@@ -231,7 +231,7 @@
return (void __iomem *)(S5P_VA_SCU);
}
@@ -461,9 +461,9 @@ diff -Nur linux-4.1.10.orig/arch/arm/mach-exynos/platsmp.c linux-4.1.10/arch/arm
return pen_release != -1 ? ret : 0;
}
-diff -Nur linux-4.1.10.orig/arch/arm/mach-hisi/platmcpm.c linux-4.1.10/arch/arm/mach-hisi/platmcpm.c
---- linux-4.1.10.orig/arch/arm/mach-hisi/platmcpm.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/arm/mach-hisi/platmcpm.c 2015-10-12 22:33:32.156684682 +0200
+diff -Nur linux-4.1.13.orig/arch/arm/mach-hisi/platmcpm.c linux-4.1.13/arch/arm/mach-hisi/platmcpm.c
+--- linux-4.1.13.orig/arch/arm/mach-hisi/platmcpm.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/arm/mach-hisi/platmcpm.c 2015-11-29 09:23:09.501621354 +0100
@@ -57,7 +57,7 @@
static void __iomem *sysctrl, *fabric;
@@ -566,9 +566,9 @@ diff -Nur linux-4.1.10.orig/arch/arm/mach-hisi/platmcpm.c linux-4.1.10/arch/arm/
}
static void __naked hip04_mcpm_power_up_setup(unsigned int affinity_level)
-diff -Nur linux-4.1.10.orig/arch/arm/mach-omap2/omap-smp.c linux-4.1.10/arch/arm/mach-omap2/omap-smp.c
---- linux-4.1.10.orig/arch/arm/mach-omap2/omap-smp.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/arm/mach-omap2/omap-smp.c 2015-10-12 22:33:32.156684682 +0200
+diff -Nur linux-4.1.13.orig/arch/arm/mach-omap2/omap-smp.c linux-4.1.13/arch/arm/mach-omap2/omap-smp.c
+--- linux-4.1.13.orig/arch/arm/mach-omap2/omap-smp.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/arm/mach-omap2/omap-smp.c 2015-11-29 09:23:09.501621354 +0100
@@ -43,7 +43,7 @@
/* SCU base address */
static void __iomem *scu_base;
@@ -607,9 +607,9 @@ diff -Nur linux-4.1.10.orig/arch/arm/mach-omap2/omap-smp.c linux-4.1.10/arch/arm
return 0;
}
-diff -Nur linux-4.1.10.orig/arch/arm/mach-prima2/platsmp.c linux-4.1.10/arch/arm/mach-prima2/platsmp.c
---- linux-4.1.10.orig/arch/arm/mach-prima2/platsmp.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/arm/mach-prima2/platsmp.c 2015-10-12 22:33:32.156684682 +0200
+diff -Nur linux-4.1.13.orig/arch/arm/mach-prima2/platsmp.c linux-4.1.13/arch/arm/mach-prima2/platsmp.c
+--- linux-4.1.13.orig/arch/arm/mach-prima2/platsmp.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/arm/mach-prima2/platsmp.c 2015-11-29 09:23:09.501621354 +0100
@@ -22,7 +22,7 @@
static void __iomem *clk_base;
@@ -648,9 +648,9 @@ diff -Nur linux-4.1.10.orig/arch/arm/mach-prima2/platsmp.c linux-4.1.10/arch/arm
return pen_release != -1 ? -ENOSYS : 0;
}
-diff -Nur linux-4.1.10.orig/arch/arm/mach-qcom/platsmp.c linux-4.1.10/arch/arm/mach-qcom/platsmp.c
---- linux-4.1.10.orig/arch/arm/mach-qcom/platsmp.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/arm/mach-qcom/platsmp.c 2015-10-12 22:33:32.160684418 +0200
+diff -Nur linux-4.1.13.orig/arch/arm/mach-qcom/platsmp.c linux-4.1.13/arch/arm/mach-qcom/platsmp.c
+--- linux-4.1.13.orig/arch/arm/mach-qcom/platsmp.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/arm/mach-qcom/platsmp.c 2015-11-29 09:23:09.501621354 +0100
@@ -46,7 +46,7 @@
extern void secondary_startup_arm(void);
@@ -689,9 +689,9 @@ diff -Nur linux-4.1.10.orig/arch/arm/mach-qcom/platsmp.c linux-4.1.10/arch/arm/m
return ret;
}
-diff -Nur linux-4.1.10.orig/arch/arm/mach-spear/platsmp.c linux-4.1.10/arch/arm/mach-spear/platsmp.c
---- linux-4.1.10.orig/arch/arm/mach-spear/platsmp.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/arm/mach-spear/platsmp.c 2015-10-12 22:33:32.160684418 +0200
+diff -Nur linux-4.1.13.orig/arch/arm/mach-spear/platsmp.c linux-4.1.13/arch/arm/mach-spear/platsmp.c
+--- linux-4.1.13.orig/arch/arm/mach-spear/platsmp.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/arm/mach-spear/platsmp.c 2015-11-29 09:23:09.501621354 +0100
@@ -32,7 +32,7 @@
sync_cache_w(&pen_release);
}
@@ -730,9 +730,9 @@ diff -Nur linux-4.1.10.orig/arch/arm/mach-spear/platsmp.c linux-4.1.10/arch/arm/
return pen_release != -1 ? -ENOSYS : 0;
}
-diff -Nur linux-4.1.10.orig/arch/arm/mach-sti/platsmp.c linux-4.1.10/arch/arm/mach-sti/platsmp.c
---- linux-4.1.10.orig/arch/arm/mach-sti/platsmp.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/arm/mach-sti/platsmp.c 2015-10-12 22:33:32.160684418 +0200
+diff -Nur linux-4.1.13.orig/arch/arm/mach-sti/platsmp.c linux-4.1.13/arch/arm/mach-sti/platsmp.c
+--- linux-4.1.13.orig/arch/arm/mach-sti/platsmp.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/arm/mach-sti/platsmp.c 2015-11-29 09:23:09.501621354 +0100
@@ -34,7 +34,7 @@
sync_cache_w(&pen_release);
}
@@ -771,9 +771,9 @@ diff -Nur linux-4.1.10.orig/arch/arm/mach-sti/platsmp.c linux-4.1.10/arch/arm/ma
return pen_release != -1 ? -ENOSYS : 0;
}
-diff -Nur linux-4.1.10.orig/arch/arm/mach-ux500/platsmp.c linux-4.1.10/arch/arm/mach-ux500/platsmp.c
---- linux-4.1.10.orig/arch/arm/mach-ux500/platsmp.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/arm/mach-ux500/platsmp.c 2015-10-12 22:33:32.160684418 +0200
+diff -Nur linux-4.1.13.orig/arch/arm/mach-ux500/platsmp.c linux-4.1.13/arch/arm/mach-ux500/platsmp.c
+--- linux-4.1.13.orig/arch/arm/mach-ux500/platsmp.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/arm/mach-ux500/platsmp.c 2015-11-29 09:23:09.501621354 +0100
@@ -51,7 +51,7 @@
return NULL;
}
@@ -812,9 +812,9 @@ diff -Nur linux-4.1.10.orig/arch/arm/mach-ux500/platsmp.c linux-4.1.10/arch/arm/
return pen_release != -1 ? -ENOSYS : 0;
}
-diff -Nur linux-4.1.10.orig/arch/arm/mm/fault.c linux-4.1.10/arch/arm/mm/fault.c
---- linux-4.1.10.orig/arch/arm/mm/fault.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/arm/mm/fault.c 2015-10-12 22:33:32.160684418 +0200
+diff -Nur linux-4.1.13.orig/arch/arm/mm/fault.c linux-4.1.13/arch/arm/mm/fault.c
+--- linux-4.1.13.orig/arch/arm/mm/fault.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/arm/mm/fault.c 2015-11-29 09:23:09.501621354 +0100
@@ -276,7 +276,7 @@
* If we're in an interrupt or have no user
* context, we must not take the fault..
@@ -844,9 +844,9 @@ diff -Nur linux-4.1.10.orig/arch/arm/mm/fault.c linux-4.1.10/arch/arm/mm/fault.c
do_bad_area(addr, fsr, regs);
return 0;
}
-diff -Nur linux-4.1.10.orig/arch/arm/mm/highmem.c linux-4.1.10/arch/arm/mm/highmem.c
---- linux-4.1.10.orig/arch/arm/mm/highmem.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/arm/mm/highmem.c 2015-10-12 22:33:32.160684418 +0200
+diff -Nur linux-4.1.13.orig/arch/arm/mm/highmem.c linux-4.1.13/arch/arm/mm/highmem.c
+--- linux-4.1.13.orig/arch/arm/mm/highmem.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/arm/mm/highmem.c 2015-11-29 09:23:09.505621090 +0100
@@ -54,11 +54,13 @@
void *kmap_atomic(struct page *page)
@@ -949,9 +949,9 @@ diff -Nur linux-4.1.10.orig/arch/arm/mm/highmem.c linux-4.1.10/arch/arm/mm/highm
+ }
+}
+#endif
-diff -Nur linux-4.1.10.orig/arch/arm/plat-versatile/platsmp.c linux-4.1.10/arch/arm/plat-versatile/platsmp.c
---- linux-4.1.10.orig/arch/arm/plat-versatile/platsmp.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/arm/plat-versatile/platsmp.c 2015-10-12 22:33:32.160684418 +0200
+diff -Nur linux-4.1.13.orig/arch/arm/plat-versatile/platsmp.c linux-4.1.13/arch/arm/plat-versatile/platsmp.c
+--- linux-4.1.13.orig/arch/arm/plat-versatile/platsmp.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/arm/plat-versatile/platsmp.c 2015-11-29 09:23:09.505621090 +0100
@@ -30,7 +30,7 @@
sync_cache_w(&pen_release);
}
@@ -990,9 +990,9 @@ diff -Nur linux-4.1.10.orig/arch/arm/plat-versatile/platsmp.c linux-4.1.10/arch/
return pen_release != -1 ? -ENOSYS : 0;
}
-diff -Nur linux-4.1.10.orig/arch/arm64/include/asm/futex.h linux-4.1.10/arch/arm64/include/asm/futex.h
---- linux-4.1.10.orig/arch/arm64/include/asm/futex.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/arm64/include/asm/futex.h 2015-10-12 22:33:32.160684418 +0200
+diff -Nur linux-4.1.13.orig/arch/arm64/include/asm/futex.h linux-4.1.13/arch/arm64/include/asm/futex.h
+--- linux-4.1.13.orig/arch/arm64/include/asm/futex.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/arm64/include/asm/futex.h 2015-11-29 09:23:09.505621090 +0100
@@ -58,7 +58,7 @@
if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
return -EFAULT;
@@ -1011,9 +1011,9 @@ diff -Nur linux-4.1.10.orig/arch/arm64/include/asm/futex.h linux-4.1.10/arch/arm
if (!ret) {
switch (cmp) {
-diff -Nur linux-4.1.10.orig/arch/arm64/include/asm/thread_info.h linux-4.1.10/arch/arm64/include/asm/thread_info.h
---- linux-4.1.10.orig/arch/arm64/include/asm/thread_info.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/arm64/include/asm/thread_info.h 2015-10-12 22:33:32.164684154 +0200
+diff -Nur linux-4.1.13.orig/arch/arm64/include/asm/thread_info.h linux-4.1.13/arch/arm64/include/asm/thread_info.h
+--- linux-4.1.13.orig/arch/arm64/include/asm/thread_info.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/arm64/include/asm/thread_info.h 2015-11-29 09:23:09.505621090 +0100
@@ -47,6 +47,7 @@
mm_segment_t addr_limit; /* address limit */
struct task_struct *task; /* main task structure */
@@ -1038,9 +1038,9 @@ diff -Nur linux-4.1.10.orig/arch/arm64/include/asm/thread_info.h linux-4.1.10/ar
#define _TIF_NOHZ (1 << TIF_NOHZ)
#define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE)
#define _TIF_SYSCALL_AUDIT (1 << TIF_SYSCALL_AUDIT)
-diff -Nur linux-4.1.10.orig/arch/arm64/Kconfig linux-4.1.10/arch/arm64/Kconfig
---- linux-4.1.10.orig/arch/arm64/Kconfig 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/arm64/Kconfig 2015-10-12 22:33:32.164684154 +0200
+diff -Nur linux-4.1.13.orig/arch/arm64/Kconfig linux-4.1.13/arch/arm64/Kconfig
+--- linux-4.1.13.orig/arch/arm64/Kconfig 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/arm64/Kconfig 2015-11-29 09:23:09.505621090 +0100
@@ -69,8 +69,10 @@
select HAVE_PERF_REGS
select HAVE_PERF_USER_STACK_DUMP
@@ -1052,9 +1052,18 @@ diff -Nur linux-4.1.10.orig/arch/arm64/Kconfig linux-4.1.10/arch/arm64/Kconfig
select MODULES_USE_ELF_RELA
select NO_BOOTMEM
select OF
-diff -Nur linux-4.1.10.orig/arch/arm64/kernel/asm-offsets.c linux-4.1.10/arch/arm64/kernel/asm-offsets.c
---- linux-4.1.10.orig/arch/arm64/kernel/asm-offsets.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/arm64/kernel/asm-offsets.c 2015-10-12 22:33:32.164684154 +0200
+@@ -599,7 +601,7 @@
+
+ config XEN
+ bool "Xen guest support on ARM64"
+- depends on ARM64 && OF
++ depends on ARM64 && OF && !PREEMPT_RT_FULL
+ select SWIOTLB_XEN
+ help
+ Say Y if you want to run Linux in a Virtual Machine on Xen on ARM64.
+diff -Nur linux-4.1.13.orig/arch/arm64/kernel/asm-offsets.c linux-4.1.13/arch/arm64/kernel/asm-offsets.c
+--- linux-4.1.13.orig/arch/arm64/kernel/asm-offsets.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/arm64/kernel/asm-offsets.c 2015-11-29 09:23:09.505621090 +0100
@@ -35,6 +35,7 @@
BLANK();
DEFINE(TI_FLAGS, offsetof(struct thread_info, flags));
@@ -1063,9 +1072,56 @@ diff -Nur linux-4.1.10.orig/arch/arm64/kernel/asm-offsets.c linux-4.1.10/arch/ar
DEFINE(TI_ADDR_LIMIT, offsetof(struct thread_info, addr_limit));
DEFINE(TI_TASK, offsetof(struct thread_info, task));
DEFINE(TI_CPU, offsetof(struct thread_info, cpu));
-diff -Nur linux-4.1.10.orig/arch/arm64/kernel/entry.S linux-4.1.10/arch/arm64/kernel/entry.S
---- linux-4.1.10.orig/arch/arm64/kernel/entry.S 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/arm64/kernel/entry.S 2015-10-12 22:33:32.164684154 +0200
+diff -Nur linux-4.1.13.orig/arch/arm64/kernel/debug-monitors.c linux-4.1.13/arch/arm64/kernel/debug-monitors.c
+--- linux-4.1.13.orig/arch/arm64/kernel/debug-monitors.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/arm64/kernel/debug-monitors.c 2015-11-29 09:23:09.505621090 +0100
+@@ -271,20 +271,21 @@
+ * Use reader/writer locks instead of plain spinlock.
+ */
+ static LIST_HEAD(break_hook);
+-static DEFINE_RWLOCK(break_hook_lock);
++static DEFINE_SPINLOCK(break_hook_lock);
+
+ void register_break_hook(struct break_hook *hook)
+ {
+- write_lock(&break_hook_lock);
+- list_add(&hook->node, &break_hook);
+- write_unlock(&break_hook_lock);
++ spin_lock(&break_hook_lock);
++ list_add_rcu(&hook->node, &break_hook);
++ spin_unlock(&break_hook_lock);
+ }
+
+ void unregister_break_hook(struct break_hook *hook)
+ {
+- write_lock(&break_hook_lock);
+- list_del(&hook->node);
+- write_unlock(&break_hook_lock);
++ spin_lock(&break_hook_lock);
++ list_del_rcu(&hook->node);
++ spin_unlock(&break_hook_lock);
++ synchronize_rcu();
+ }
+
+ static int call_break_hook(struct pt_regs *regs, unsigned int esr)
+@@ -292,11 +293,11 @@
+ struct break_hook *hook;
+ int (*fn)(struct pt_regs *regs, unsigned int esr) = NULL;
+
+- read_lock(&break_hook_lock);
+- list_for_each_entry(hook, &break_hook, node)
++ rcu_read_lock();
++ list_for_each_entry_rcu(hook, &break_hook, node)
+ if ((esr & hook->esr_mask) == hook->esr_val)
+ fn = hook->fn;
+- read_unlock(&break_hook_lock);
++ rcu_read_unlock();
+
+ return fn ? fn(regs, esr) : DBG_HOOK_ERROR;
+ }
+diff -Nur linux-4.1.13.orig/arch/arm64/kernel/entry.S linux-4.1.13/arch/arm64/kernel/entry.S
+--- linux-4.1.13.orig/arch/arm64/kernel/entry.S 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/arm64/kernel/entry.S 2015-11-29 09:23:09.505621090 +0100
@@ -367,11 +367,16 @@
#ifdef CONFIG_PREEMPT
get_thread_info tsk
@@ -1102,9 +1158,37 @@ diff -Nur linux-4.1.10.orig/arch/arm64/kernel/entry.S linux-4.1.10/arch/arm64/ke
/* TIF_SIGPENDING, TIF_NOTIFY_RESUME or TIF_FOREIGN_FPSTATE case */
ldr x2, [sp, #S_PSTATE]
mov x0, sp // 'regs'
-diff -Nur linux-4.1.10.orig/arch/arm64/kernel/perf_event.c linux-4.1.10/arch/arm64/kernel/perf_event.c
---- linux-4.1.10.orig/arch/arm64/kernel/perf_event.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/arm64/kernel/perf_event.c 2015-10-12 22:33:32.164684154 +0200
+diff -Nur linux-4.1.13.orig/arch/arm64/kernel/insn.c linux-4.1.13/arch/arm64/kernel/insn.c
+--- linux-4.1.13.orig/arch/arm64/kernel/insn.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/arm64/kernel/insn.c 2015-11-29 09:23:09.505621090 +0100
+@@ -77,7 +77,7 @@
+ }
+ }
+
+-static DEFINE_SPINLOCK(patch_lock);
++static DEFINE_RAW_SPINLOCK(patch_lock);
+
+ static void __kprobes *patch_map(void *addr, int fixmap)
+ {
+@@ -124,13 +124,13 @@
+ unsigned long flags = 0;
+ int ret;
+
+- spin_lock_irqsave(&patch_lock, flags);
++ raw_spin_lock_irqsave(&patch_lock, flags);
+ waddr = patch_map(addr, FIX_TEXT_POKE0);
+
+ ret = probe_kernel_write(waddr, &insn, AARCH64_INSN_SIZE);
+
+ patch_unmap(FIX_TEXT_POKE0);
+- spin_unlock_irqrestore(&patch_lock, flags);
++ raw_spin_unlock_irqrestore(&patch_lock, flags);
+
+ return ret;
+ }
+diff -Nur linux-4.1.13.orig/arch/arm64/kernel/perf_event.c linux-4.1.13/arch/arm64/kernel/perf_event.c
+--- linux-4.1.13.orig/arch/arm64/kernel/perf_event.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/arm64/kernel/perf_event.c 2015-11-29 09:23:09.505621090 +0100
@@ -488,7 +488,7 @@
}
@@ -1114,9 +1198,9 @@ diff -Nur linux-4.1.10.orig/arch/arm64/kernel/perf_event.c linux-4.1.10/arch/arm
"arm-pmu", armpmu);
if (err) {
pr_err("unable to request IRQ%d for ARM PMU counters\n",
-diff -Nur linux-4.1.10.orig/arch/arm64/mm/fault.c linux-4.1.10/arch/arm64/mm/fault.c
---- linux-4.1.10.orig/arch/arm64/mm/fault.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/arm64/mm/fault.c 2015-10-12 22:33:32.168683889 +0200
+diff -Nur linux-4.1.13.orig/arch/arm64/mm/fault.c linux-4.1.13/arch/arm64/mm/fault.c
+--- linux-4.1.13.orig/arch/arm64/mm/fault.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/arm64/mm/fault.c 2015-11-29 09:23:09.505621090 +0100
@@ -211,7 +211,7 @@
* If we're in an interrupt or have no user context, we must not take
* the fault.
@@ -1126,9 +1210,9 @@ diff -Nur linux-4.1.10.orig/arch/arm64/mm/fault.c linux-4.1.10/arch/arm64/mm/fau
goto no_context;
if (user_mode(regs))
-diff -Nur linux-4.1.10.orig/arch/avr32/include/asm/uaccess.h linux-4.1.10/arch/avr32/include/asm/uaccess.h
---- linux-4.1.10.orig/arch/avr32/include/asm/uaccess.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/avr32/include/asm/uaccess.h 2015-10-12 22:33:32.180683097 +0200
+diff -Nur linux-4.1.13.orig/arch/avr32/include/asm/uaccess.h linux-4.1.13/arch/avr32/include/asm/uaccess.h
+--- linux-4.1.13.orig/arch/avr32/include/asm/uaccess.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/avr32/include/asm/uaccess.h 2015-11-29 09:23:09.505621090 +0100
@@ -97,7 +97,8 @@
* @x: Value to copy to user space.
* @ptr: Destination address, in user space.
@@ -1169,9 +1253,9 @@ diff -Nur linux-4.1.10.orig/arch/avr32/include/asm/uaccess.h linux-4.1.10/arch/a
*
* This macro copies a single simple variable from user space to kernel
* space. It supports simple types like char and int, but not larger
-diff -Nur linux-4.1.10.orig/arch/avr32/mm/fault.c linux-4.1.10/arch/avr32/mm/fault.c
---- linux-4.1.10.orig/arch/avr32/mm/fault.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/avr32/mm/fault.c 2015-10-12 22:33:32.180683097 +0200
+diff -Nur linux-4.1.13.orig/arch/avr32/mm/fault.c linux-4.1.13/arch/avr32/mm/fault.c
+--- linux-4.1.13.orig/arch/avr32/mm/fault.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/avr32/mm/fault.c 2015-11-29 09:23:09.505621090 +0100
@@ -14,11 +14,11 @@
#include <linux/pagemap.h>
#include <linux/kdebug.h>
@@ -1194,9 +1278,9 @@ diff -Nur linux-4.1.10.orig/arch/avr32/mm/fault.c linux-4.1.10/arch/avr32/mm/fau
goto no_context;
local_irq_enable();
-diff -Nur linux-4.1.10.orig/arch/cris/mm/fault.c linux-4.1.10/arch/cris/mm/fault.c
---- linux-4.1.10.orig/arch/cris/mm/fault.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/cris/mm/fault.c 2015-10-12 22:33:32.180683097 +0200
+diff -Nur linux-4.1.13.orig/arch/cris/mm/fault.c linux-4.1.13/arch/cris/mm/fault.c
+--- linux-4.1.13.orig/arch/cris/mm/fault.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/cris/mm/fault.c 2015-11-29 09:23:09.505621090 +0100
@@ -8,7 +8,7 @@
#include <linux/interrupt.h>
#include <linux/module.h>
@@ -1220,9 +1304,9 @@ diff -Nur linux-4.1.10.orig/arch/cris/mm/fault.c linux-4.1.10/arch/cris/mm/fault
goto no_context;
if (user_mode(regs))
-diff -Nur linux-4.1.10.orig/arch/frv/mm/fault.c linux-4.1.10/arch/frv/mm/fault.c
---- linux-4.1.10.orig/arch/frv/mm/fault.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/frv/mm/fault.c 2015-10-12 22:33:32.180683097 +0200
+diff -Nur linux-4.1.13.orig/arch/frv/mm/fault.c linux-4.1.13/arch/frv/mm/fault.c
+--- linux-4.1.13.orig/arch/frv/mm/fault.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/frv/mm/fault.c 2015-11-29 09:23:09.505621090 +0100
@@ -19,9 +19,9 @@
#include <linux/kernel.h>
#include <linux/ptrace.h>
@@ -1243,9 +1327,9 @@ diff -Nur linux-4.1.10.orig/arch/frv/mm/fault.c linux-4.1.10/arch/frv/mm/fault.c
goto no_context;
if (user_mode(__frame))
-diff -Nur linux-4.1.10.orig/arch/frv/mm/highmem.c linux-4.1.10/arch/frv/mm/highmem.c
---- linux-4.1.10.orig/arch/frv/mm/highmem.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/frv/mm/highmem.c 2015-10-12 22:33:32.180683097 +0200
+diff -Nur linux-4.1.13.orig/arch/frv/mm/highmem.c linux-4.1.13/arch/frv/mm/highmem.c
+--- linux-4.1.13.orig/arch/frv/mm/highmem.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/frv/mm/highmem.c 2015-11-29 09:23:09.505621090 +0100
@@ -42,6 +42,7 @@
unsigned long paddr;
int type;
@@ -1261,9 +1345,9 @@ diff -Nur linux-4.1.10.orig/arch/frv/mm/highmem.c linux-4.1.10/arch/frv/mm/highm
+ preempt_enable();
}
EXPORT_SYMBOL(__kunmap_atomic);
-diff -Nur linux-4.1.10.orig/arch/hexagon/include/asm/uaccess.h linux-4.1.10/arch/hexagon/include/asm/uaccess.h
---- linux-4.1.10.orig/arch/hexagon/include/asm/uaccess.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/hexagon/include/asm/uaccess.h 2015-10-12 22:33:32.180683097 +0200
+diff -Nur linux-4.1.13.orig/arch/hexagon/include/asm/uaccess.h linux-4.1.13/arch/hexagon/include/asm/uaccess.h
+--- linux-4.1.13.orig/arch/hexagon/include/asm/uaccess.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/hexagon/include/asm/uaccess.h 2015-11-29 09:23:09.505621090 +0100
@@ -36,7 +36,8 @@
* @addr: User space pointer to start of block to check
* @size: Size of block to check
@@ -1274,9 +1358,9 @@ diff -Nur linux-4.1.10.orig/arch/hexagon/include/asm/uaccess.h linux-4.1.10/arch
*
* Checks if a pointer to a block of memory in user space is valid.
*
-diff -Nur linux-4.1.10.orig/arch/ia64/mm/fault.c linux-4.1.10/arch/ia64/mm/fault.c
---- linux-4.1.10.orig/arch/ia64/mm/fault.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/ia64/mm/fault.c 2015-10-12 22:33:32.184682832 +0200
+diff -Nur linux-4.1.13.orig/arch/ia64/mm/fault.c linux-4.1.13/arch/ia64/mm/fault.c
+--- linux-4.1.13.orig/arch/ia64/mm/fault.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/ia64/mm/fault.c 2015-11-29 09:23:09.505621090 +0100
@@ -11,10 +11,10 @@
#include <linux/kprobes.h>
#include <linux/kdebug.h>
@@ -1298,9 +1382,9 @@ diff -Nur linux-4.1.10.orig/arch/ia64/mm/fault.c linux-4.1.10/arch/ia64/mm/fault
goto no_context;
#ifdef CONFIG_VIRTUAL_MEM_MAP
-diff -Nur linux-4.1.10.orig/arch/Kconfig linux-4.1.10/arch/Kconfig
---- linux-4.1.10.orig/arch/Kconfig 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/Kconfig 2015-10-12 22:33:32.184682832 +0200
+diff -Nur linux-4.1.13.orig/arch/Kconfig linux-4.1.13/arch/Kconfig
+--- linux-4.1.13.orig/arch/Kconfig 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/Kconfig 2015-11-29 09:23:09.477622951 +0100
@@ -6,6 +6,7 @@
tristate "OProfile system profiling"
depends on PROFILING
@@ -1309,9 +1393,9 @@ diff -Nur linux-4.1.10.orig/arch/Kconfig linux-4.1.10/arch/Kconfig
select RING_BUFFER
select RING_BUFFER_ALLOW_SWAP
help
-diff -Nur linux-4.1.10.orig/arch/m32r/include/asm/uaccess.h linux-4.1.10/arch/m32r/include/asm/uaccess.h
---- linux-4.1.10.orig/arch/m32r/include/asm/uaccess.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/m32r/include/asm/uaccess.h 2015-10-12 22:33:32.184682832 +0200
+diff -Nur linux-4.1.13.orig/arch/m32r/include/asm/uaccess.h linux-4.1.13/arch/m32r/include/asm/uaccess.h
+--- linux-4.1.13.orig/arch/m32r/include/asm/uaccess.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/m32r/include/asm/uaccess.h 2015-11-29 09:23:09.509620826 +0100
@@ -91,7 +91,8 @@
* @addr: User space pointer to start of block to check
* @size: Size of block to check
@@ -1412,9 +1496,9 @@ diff -Nur linux-4.1.10.orig/arch/m32r/include/asm/uaccess.h linux-4.1.10/arch/m3
*
* Get the size of a NUL-terminated string in user space.
*
-diff -Nur linux-4.1.10.orig/arch/m32r/mm/fault.c linux-4.1.10/arch/m32r/mm/fault.c
---- linux-4.1.10.orig/arch/m32r/mm/fault.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/m32r/mm/fault.c 2015-10-12 22:33:32.184682832 +0200
+diff -Nur linux-4.1.13.orig/arch/m32r/mm/fault.c linux-4.1.13/arch/m32r/mm/fault.c
+--- linux-4.1.13.orig/arch/m32r/mm/fault.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/m32r/mm/fault.c 2015-11-29 09:23:09.509620826 +0100
@@ -24,9 +24,9 @@
#include <linux/vt_kern.h> /* For unblank_screen() */
#include <linux/highmem.h>
@@ -1440,9 +1524,9 @@ diff -Nur linux-4.1.10.orig/arch/m32r/mm/fault.c linux-4.1.10/arch/m32r/mm/fault
goto bad_area_nosemaphore;
if (error_code & ACE_USERMODE)
-diff -Nur linux-4.1.10.orig/arch/m68k/mm/fault.c linux-4.1.10/arch/m68k/mm/fault.c
---- linux-4.1.10.orig/arch/m68k/mm/fault.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/m68k/mm/fault.c 2015-10-12 22:33:32.184682832 +0200
+diff -Nur linux-4.1.13.orig/arch/m68k/mm/fault.c linux-4.1.13/arch/m68k/mm/fault.c
+--- linux-4.1.13.orig/arch/m68k/mm/fault.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/m68k/mm/fault.c 2015-11-29 09:23:09.509620826 +0100
@@ -10,10 +10,10 @@
#include <linux/ptrace.h>
#include <linux/interrupt.h>
@@ -1464,9 +1548,9 @@ diff -Nur linux-4.1.10.orig/arch/m68k/mm/fault.c linux-4.1.10/arch/m68k/mm/fault
goto no_context;
if (user_mode(regs))
-diff -Nur linux-4.1.10.orig/arch/metag/mm/fault.c linux-4.1.10/arch/metag/mm/fault.c
---- linux-4.1.10.orig/arch/metag/mm/fault.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/metag/mm/fault.c 2015-10-12 22:33:32.184682832 +0200
+diff -Nur linux-4.1.13.orig/arch/metag/mm/fault.c linux-4.1.13/arch/metag/mm/fault.c
+--- linux-4.1.13.orig/arch/metag/mm/fault.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/metag/mm/fault.c 2015-11-29 09:23:09.509620826 +0100
@@ -105,7 +105,7 @@
mm = tsk->mm;
@@ -1476,9 +1560,9 @@ diff -Nur linux-4.1.10.orig/arch/metag/mm/fault.c linux-4.1.10/arch/metag/mm/fau
goto no_context;
if (user_mode(regs))
-diff -Nur linux-4.1.10.orig/arch/metag/mm/highmem.c linux-4.1.10/arch/metag/mm/highmem.c
---- linux-4.1.10.orig/arch/metag/mm/highmem.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/metag/mm/highmem.c 2015-10-12 22:33:32.184682832 +0200
+diff -Nur linux-4.1.13.orig/arch/metag/mm/highmem.c linux-4.1.13/arch/metag/mm/highmem.c
+--- linux-4.1.13.orig/arch/metag/mm/highmem.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/metag/mm/highmem.c 2015-11-29 09:23:09.509620826 +0100
@@ -43,7 +43,7 @@
unsigned long vaddr;
int type;
@@ -1504,9 +1588,9 @@ diff -Nur linux-4.1.10.orig/arch/metag/mm/highmem.c linux-4.1.10/arch/metag/mm/h
pagefault_disable();
type = kmap_atomic_idx_push();
-diff -Nur linux-4.1.10.orig/arch/microblaze/include/asm/uaccess.h linux-4.1.10/arch/microblaze/include/asm/uaccess.h
---- linux-4.1.10.orig/arch/microblaze/include/asm/uaccess.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/microblaze/include/asm/uaccess.h 2015-10-12 22:33:32.188682568 +0200
+diff -Nur linux-4.1.13.orig/arch/microblaze/include/asm/uaccess.h linux-4.1.13/arch/microblaze/include/asm/uaccess.h
+--- linux-4.1.13.orig/arch/microblaze/include/asm/uaccess.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/microblaze/include/asm/uaccess.h 2015-11-29 09:23:09.509620826 +0100
@@ -178,7 +178,8 @@
* @x: Variable to store result.
* @ptr: Source address, in user space.
@@ -1527,9 +1611,9 @@ diff -Nur linux-4.1.10.orig/arch/microblaze/include/asm/uaccess.h linux-4.1.10/a
*
* This macro copies a single simple value from kernel space to user
* space. It supports simple types like char and int, but not larger
-diff -Nur linux-4.1.10.orig/arch/microblaze/mm/fault.c linux-4.1.10/arch/microblaze/mm/fault.c
---- linux-4.1.10.orig/arch/microblaze/mm/fault.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/microblaze/mm/fault.c 2015-10-12 22:33:32.188682568 +0200
+diff -Nur linux-4.1.13.orig/arch/microblaze/mm/fault.c linux-4.1.13/arch/microblaze/mm/fault.c
+--- linux-4.1.13.orig/arch/microblaze/mm/fault.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/microblaze/mm/fault.c 2015-11-29 09:23:09.509620826 +0100
@@ -107,14 +107,14 @@
if ((error_code & 0x13) == 0x13 || (error_code & 0x11) == 0x11)
is_write = 0;
@@ -1549,9 +1633,9 @@ diff -Nur linux-4.1.10.orig/arch/microblaze/mm/fault.c linux-4.1.10/arch/microbl
pr_emerg("r15 = %lx MSR = %lx\n",
regs->r15, regs->msr);
die("Weird page fault", regs, SIGSEGV);
-diff -Nur linux-4.1.10.orig/arch/microblaze/mm/highmem.c linux-4.1.10/arch/microblaze/mm/highmem.c
---- linux-4.1.10.orig/arch/microblaze/mm/highmem.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/microblaze/mm/highmem.c 2015-10-12 22:33:32.188682568 +0200
+diff -Nur linux-4.1.13.orig/arch/microblaze/mm/highmem.c linux-4.1.13/arch/microblaze/mm/highmem.c
+--- linux-4.1.13.orig/arch/microblaze/mm/highmem.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/microblaze/mm/highmem.c 2015-11-29 09:23:09.509620826 +0100
@@ -37,7 +37,7 @@
unsigned long vaddr;
int idx, type;
@@ -1576,9 +1660,9 @@ diff -Nur linux-4.1.10.orig/arch/microblaze/mm/highmem.c linux-4.1.10/arch/micro
+ preempt_enable();
}
EXPORT_SYMBOL(__kunmap_atomic);
-diff -Nur linux-4.1.10.orig/arch/mips/include/asm/uaccess.h linux-4.1.10/arch/mips/include/asm/uaccess.h
---- linux-4.1.10.orig/arch/mips/include/asm/uaccess.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/mips/include/asm/uaccess.h 2015-10-12 22:33:32.188682568 +0200
+diff -Nur linux-4.1.13.orig/arch/mips/include/asm/uaccess.h linux-4.1.13/arch/mips/include/asm/uaccess.h
+--- linux-4.1.13.orig/arch/mips/include/asm/uaccess.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/mips/include/asm/uaccess.h 2015-11-29 09:23:09.513620562 +0100
@@ -103,7 +103,8 @@
* @addr: User space pointer to start of block to check
* @size: Size of block to check
@@ -1729,9 +1813,9 @@ diff -Nur linux-4.1.10.orig/arch/mips/include/asm/uaccess.h linux-4.1.10/arch/mi
*
* Get the size of a NUL-terminated string in user space.
*
-diff -Nur linux-4.1.10.orig/arch/mips/Kconfig linux-4.1.10/arch/mips/Kconfig
---- linux-4.1.10.orig/arch/mips/Kconfig 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/mips/Kconfig 2015-10-12 22:33:32.192682304 +0200
+diff -Nur linux-4.1.13.orig/arch/mips/Kconfig linux-4.1.13/arch/mips/Kconfig
+--- linux-4.1.13.orig/arch/mips/Kconfig 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/mips/Kconfig 2015-11-29 09:23:09.513620562 +0100
@@ -2366,7 +2366,7 @@
#
config HIGHMEM
@@ -1741,9 +1825,9 @@ diff -Nur linux-4.1.10.orig/arch/mips/Kconfig linux-4.1.10/arch/mips/Kconfig
config CPU_SUPPORTS_HIGHMEM
bool
-diff -Nur linux-4.1.10.orig/arch/mips/kernel/signal-common.h linux-4.1.10/arch/mips/kernel/signal-common.h
---- linux-4.1.10.orig/arch/mips/kernel/signal-common.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/mips/kernel/signal-common.h 2015-10-12 22:33:32.192682304 +0200
+diff -Nur linux-4.1.13.orig/arch/mips/kernel/signal-common.h linux-4.1.13/arch/mips/kernel/signal-common.h
+--- linux-4.1.13.orig/arch/mips/kernel/signal-common.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/mips/kernel/signal-common.h 2015-11-29 09:23:09.513620562 +0100
@@ -28,12 +28,7 @@
extern int fpcsr_pending(unsigned int __user *fpcsr);
@@ -1759,9 +1843,9 @@ diff -Nur linux-4.1.10.orig/arch/mips/kernel/signal-common.h linux-4.1.10/arch/m
+#define unlock_fpu_owner() ({ pagefault_enable(); preempt_enable(); })
#endif /* __SIGNAL_COMMON_H */
-diff -Nur linux-4.1.10.orig/arch/mips/mm/fault.c linux-4.1.10/arch/mips/mm/fault.c
---- linux-4.1.10.orig/arch/mips/mm/fault.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/mips/mm/fault.c 2015-10-12 22:33:32.192682304 +0200
+diff -Nur linux-4.1.13.orig/arch/mips/mm/fault.c linux-4.1.13/arch/mips/mm/fault.c
+--- linux-4.1.13.orig/arch/mips/mm/fault.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/mips/mm/fault.c 2015-11-29 09:23:09.513620562 +0100
@@ -21,10 +21,10 @@
#include <linux/module.h>
#include <linux/kprobes.h>
@@ -1783,9 +1867,9 @@ diff -Nur linux-4.1.10.orig/arch/mips/mm/fault.c linux-4.1.10/arch/mips/mm/fault
goto bad_area_nosemaphore;
if (user_mode(regs))
-diff -Nur linux-4.1.10.orig/arch/mips/mm/highmem.c linux-4.1.10/arch/mips/mm/highmem.c
---- linux-4.1.10.orig/arch/mips/mm/highmem.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/mips/mm/highmem.c 2015-10-12 22:33:32.192682304 +0200
+diff -Nur linux-4.1.13.orig/arch/mips/mm/highmem.c linux-4.1.13/arch/mips/mm/highmem.c
+--- linux-4.1.13.orig/arch/mips/mm/highmem.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/mips/mm/highmem.c 2015-11-29 09:23:09.513620562 +0100
@@ -47,7 +47,7 @@
unsigned long vaddr;
int idx, type;
@@ -1819,9 +1903,9 @@ diff -Nur linux-4.1.10.orig/arch/mips/mm/highmem.c linux-4.1.10/arch/mips/mm/hig
pagefault_disable();
type = kmap_atomic_idx_push();
-diff -Nur linux-4.1.10.orig/arch/mips/mm/init.c linux-4.1.10/arch/mips/mm/init.c
---- linux-4.1.10.orig/arch/mips/mm/init.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/mips/mm/init.c 2015-10-12 22:33:32.192682304 +0200
+diff -Nur linux-4.1.13.orig/arch/mips/mm/init.c linux-4.1.13/arch/mips/mm/init.c
+--- linux-4.1.13.orig/arch/mips/mm/init.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/mips/mm/init.c 2015-11-29 09:23:09.513620562 +0100
@@ -90,6 +90,7 @@
BUG_ON(Page_dcache_dirty(page));
@@ -1838,9 +1922,9 @@ diff -Nur linux-4.1.10.orig/arch/mips/mm/init.c linux-4.1.10/arch/mips/mm/init.c
}
void copy_user_highpage(struct page *to, struct page *from,
-diff -Nur linux-4.1.10.orig/arch/mn10300/include/asm/highmem.h linux-4.1.10/arch/mn10300/include/asm/highmem.h
---- linux-4.1.10.orig/arch/mn10300/include/asm/highmem.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/mn10300/include/asm/highmem.h 2015-10-12 22:33:32.192682304 +0200
+diff -Nur linux-4.1.13.orig/arch/mn10300/include/asm/highmem.h linux-4.1.13/arch/mn10300/include/asm/highmem.h
+--- linux-4.1.13.orig/arch/mn10300/include/asm/highmem.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/mn10300/include/asm/highmem.h 2015-11-29 09:23:09.513620562 +0100
@@ -75,6 +75,7 @@
unsigned long vaddr;
int idx, type;
@@ -1865,9 +1949,9 @@ diff -Nur linux-4.1.10.orig/arch/mn10300/include/asm/highmem.h linux-4.1.10/arch
}
#endif /* __KERNEL__ */
-diff -Nur linux-4.1.10.orig/arch/mn10300/mm/fault.c linux-4.1.10/arch/mn10300/mm/fault.c
---- linux-4.1.10.orig/arch/mn10300/mm/fault.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/mn10300/mm/fault.c 2015-10-12 22:33:32.192682304 +0200
+diff -Nur linux-4.1.13.orig/arch/mn10300/mm/fault.c linux-4.1.13/arch/mn10300/mm/fault.c
+--- linux-4.1.13.orig/arch/mn10300/mm/fault.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/mn10300/mm/fault.c 2015-11-29 09:23:09.513620562 +0100
@@ -23,8 +23,8 @@
#include <linux/interrupt.h>
#include <linux/init.h>
@@ -1887,9 +1971,9 @@ diff -Nur linux-4.1.10.orig/arch/mn10300/mm/fault.c linux-4.1.10/arch/mn10300/mm
goto no_context;
if ((fault_code & MMUFCR_xFC_ACCESS) == MMUFCR_xFC_ACCESS_USR)
-diff -Nur linux-4.1.10.orig/arch/nios2/mm/fault.c linux-4.1.10/arch/nios2/mm/fault.c
---- linux-4.1.10.orig/arch/nios2/mm/fault.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/nios2/mm/fault.c 2015-10-12 22:33:32.192682304 +0200
+diff -Nur linux-4.1.13.orig/arch/nios2/mm/fault.c linux-4.1.13/arch/nios2/mm/fault.c
+--- linux-4.1.13.orig/arch/nios2/mm/fault.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/nios2/mm/fault.c 2015-11-29 09:23:09.513620562 +0100
@@ -77,7 +77,7 @@
* If we're in an interrupt or have no user
* context, we must not take the fault..
@@ -1899,9 +1983,9 @@ diff -Nur linux-4.1.10.orig/arch/nios2/mm/fault.c linux-4.1.10/arch/nios2/mm/fau
goto bad_area_nosemaphore;
if (user_mode(regs))
-diff -Nur linux-4.1.10.orig/arch/parisc/include/asm/cacheflush.h linux-4.1.10/arch/parisc/include/asm/cacheflush.h
---- linux-4.1.10.orig/arch/parisc/include/asm/cacheflush.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/parisc/include/asm/cacheflush.h 2015-10-12 22:33:32.192682304 +0200
+diff -Nur linux-4.1.13.orig/arch/parisc/include/asm/cacheflush.h linux-4.1.13/arch/parisc/include/asm/cacheflush.h
+--- linux-4.1.13.orig/arch/parisc/include/asm/cacheflush.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/parisc/include/asm/cacheflush.h 2015-11-29 09:23:09.513620562 +0100
@@ -142,6 +142,7 @@
static inline void *kmap_atomic(struct page *page)
@@ -1918,9 +2002,9 @@ diff -Nur linux-4.1.10.orig/arch/parisc/include/asm/cacheflush.h linux-4.1.10/ar
}
#define kmap_atomic_prot(page, prot) kmap_atomic(page)
-diff -Nur linux-4.1.10.orig/arch/parisc/kernel/traps.c linux-4.1.10/arch/parisc/kernel/traps.c
---- linux-4.1.10.orig/arch/parisc/kernel/traps.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/parisc/kernel/traps.c 2015-10-12 22:33:32.196682039 +0200
+diff -Nur linux-4.1.13.orig/arch/parisc/kernel/traps.c linux-4.1.13/arch/parisc/kernel/traps.c
+--- linux-4.1.13.orig/arch/parisc/kernel/traps.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/parisc/kernel/traps.c 2015-11-29 09:23:09.513620562 +0100
@@ -26,9 +26,9 @@
#include <linux/console.h>
#include <linux/bug.h>
@@ -1941,9 +2025,9 @@ diff -Nur linux-4.1.10.orig/arch/parisc/kernel/traps.c linux-4.1.10/arch/parisc/
{
pdc_chassis_send_status(PDC_CHASSIS_DIRECT_PANIC);
parisc_terminate("Kernel Fault", regs, code, fault_address);
-diff -Nur linux-4.1.10.orig/arch/parisc/mm/fault.c linux-4.1.10/arch/parisc/mm/fault.c
---- linux-4.1.10.orig/arch/parisc/mm/fault.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/parisc/mm/fault.c 2015-10-12 22:33:32.196682039 +0200
+diff -Nur linux-4.1.13.orig/arch/parisc/mm/fault.c linux-4.1.13/arch/parisc/mm/fault.c
+--- linux-4.1.13.orig/arch/parisc/mm/fault.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/parisc/mm/fault.c 2015-11-29 09:23:09.513620562 +0100
@@ -15,8 +15,8 @@
#include <linux/sched.h>
#include <linux/interrupt.h>
@@ -1963,9 +2047,9 @@ diff -Nur linux-4.1.10.orig/arch/parisc/mm/fault.c linux-4.1.10/arch/parisc/mm/f
goto no_context;
tsk = current;
-diff -Nur linux-4.1.10.orig/arch/powerpc/include/asm/kvm_host.h linux-4.1.10/arch/powerpc/include/asm/kvm_host.h
---- linux-4.1.10.orig/arch/powerpc/include/asm/kvm_host.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/powerpc/include/asm/kvm_host.h 2015-10-12 22:33:32.196682039 +0200
+diff -Nur linux-4.1.13.orig/arch/powerpc/include/asm/kvm_host.h linux-4.1.13/arch/powerpc/include/asm/kvm_host.h
+--- linux-4.1.13.orig/arch/powerpc/include/asm/kvm_host.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/powerpc/include/asm/kvm_host.h 2015-11-29 09:23:09.517620297 +0100
@@ -280,7 +280,7 @@
u8 in_guest;
struct list_head runnable_threads;
@@ -1984,9 +2068,9 @@ diff -Nur linux-4.1.10.orig/arch/powerpc/include/asm/kvm_host.h linux-4.1.10/arc
struct kvmppc_vcore *vcore;
int ret;
int trap;
-diff -Nur linux-4.1.10.orig/arch/powerpc/include/asm/thread_info.h linux-4.1.10/arch/powerpc/include/asm/thread_info.h
---- linux-4.1.10.orig/arch/powerpc/include/asm/thread_info.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/powerpc/include/asm/thread_info.h 2015-10-12 22:33:32.196682039 +0200
+diff -Nur linux-4.1.13.orig/arch/powerpc/include/asm/thread_info.h linux-4.1.13/arch/powerpc/include/asm/thread_info.h
+--- linux-4.1.13.orig/arch/powerpc/include/asm/thread_info.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/powerpc/include/asm/thread_info.h 2015-11-29 09:23:09.517620297 +0100
@@ -42,6 +42,8 @@
int cpu; /* cpu we're on */
int preempt_count; /* 0 => preemptable,
@@ -2033,9 +2117,9 @@ diff -Nur linux-4.1.10.orig/arch/powerpc/include/asm/thread_info.h linux-4.1.10/
/* Bits in local_flags */
/* Don't move TLF_NAPPING without adjusting the code in entry_32.S */
-diff -Nur linux-4.1.10.orig/arch/powerpc/Kconfig linux-4.1.10/arch/powerpc/Kconfig
---- linux-4.1.10.orig/arch/powerpc/Kconfig 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/powerpc/Kconfig 2015-10-12 22:33:32.196682039 +0200
+diff -Nur linux-4.1.13.orig/arch/powerpc/Kconfig linux-4.1.13/arch/powerpc/Kconfig
+--- linux-4.1.13.orig/arch/powerpc/Kconfig 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/powerpc/Kconfig 2015-11-29 09:23:09.513620562 +0100
@@ -60,10 +60,11 @@
config RWSEM_GENERIC_SPINLOCK
@@ -2066,9 +2150,9 @@ diff -Nur linux-4.1.10.orig/arch/powerpc/Kconfig linux-4.1.10/arch/powerpc/Kconf
source kernel/Kconfig.hz
source kernel/Kconfig.preempt
-diff -Nur linux-4.1.10.orig/arch/powerpc/kernel/asm-offsets.c linux-4.1.10/arch/powerpc/kernel/asm-offsets.c
---- linux-4.1.10.orig/arch/powerpc/kernel/asm-offsets.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/powerpc/kernel/asm-offsets.c 2015-10-12 22:33:32.196682039 +0200
+diff -Nur linux-4.1.13.orig/arch/powerpc/kernel/asm-offsets.c linux-4.1.13/arch/powerpc/kernel/asm-offsets.c
+--- linux-4.1.13.orig/arch/powerpc/kernel/asm-offsets.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/powerpc/kernel/asm-offsets.c 2015-11-29 09:23:09.517620297 +0100
@@ -160,6 +160,7 @@
DEFINE(TI_FLAGS, offsetof(struct thread_info, flags));
DEFINE(TI_LOCAL_FLAGS, offsetof(struct thread_info, local_flags));
@@ -2077,9 +2161,9 @@ diff -Nur linux-4.1.10.orig/arch/powerpc/kernel/asm-offsets.c linux-4.1.10/arch/
DEFINE(TI_TASK, offsetof(struct thread_info, task));
DEFINE(TI_CPU, offsetof(struct thread_info, cpu));
-diff -Nur linux-4.1.10.orig/arch/powerpc/kernel/entry_32.S linux-4.1.10/arch/powerpc/kernel/entry_32.S
---- linux-4.1.10.orig/arch/powerpc/kernel/entry_32.S 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/powerpc/kernel/entry_32.S 2015-10-12 22:33:32.196682039 +0200
+diff -Nur linux-4.1.13.orig/arch/powerpc/kernel/entry_32.S linux-4.1.13/arch/powerpc/kernel/entry_32.S
+--- linux-4.1.13.orig/arch/powerpc/kernel/entry_32.S 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/powerpc/kernel/entry_32.S 2015-11-29 09:23:09.517620297 +0100
@@ -813,7 +813,14 @@
cmpwi 0,r0,0 /* if non-zero, just restore regs and return */
bne restore
@@ -2128,9 +2212,9 @@ diff -Nur linux-4.1.10.orig/arch/powerpc/kernel/entry_32.S linux-4.1.10/arch/pow
bne- do_resched
andi. r0,r9,_TIF_USER_WORK_MASK
beq restore_user
-diff -Nur linux-4.1.10.orig/arch/powerpc/kernel/entry_64.S linux-4.1.10/arch/powerpc/kernel/entry_64.S
---- linux-4.1.10.orig/arch/powerpc/kernel/entry_64.S 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/powerpc/kernel/entry_64.S 2015-10-12 22:33:32.196682039 +0200
+diff -Nur linux-4.1.13.orig/arch/powerpc/kernel/entry_64.S linux-4.1.13/arch/powerpc/kernel/entry_64.S
+--- linux-4.1.13.orig/arch/powerpc/kernel/entry_64.S 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/powerpc/kernel/entry_64.S 2015-11-29 09:23:09.517620297 +0100
@@ -636,7 +636,7 @@
#else
beq restore
@@ -2169,9 +2253,9 @@ diff -Nur linux-4.1.10.orig/arch/powerpc/kernel/entry_64.S linux-4.1.10/arch/pow
bne 1b
/*
-diff -Nur linux-4.1.10.orig/arch/powerpc/kernel/irq.c linux-4.1.10/arch/powerpc/kernel/irq.c
---- linux-4.1.10.orig/arch/powerpc/kernel/irq.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/powerpc/kernel/irq.c 2015-10-12 22:33:32.196682039 +0200
+diff -Nur linux-4.1.13.orig/arch/powerpc/kernel/irq.c linux-4.1.13/arch/powerpc/kernel/irq.c
+--- linux-4.1.13.orig/arch/powerpc/kernel/irq.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/powerpc/kernel/irq.c 2015-11-29 09:23:09.517620297 +0100
@@ -614,6 +614,7 @@
}
}
@@ -2188,9 +2272,9 @@ diff -Nur linux-4.1.10.orig/arch/powerpc/kernel/irq.c linux-4.1.10/arch/powerpc/
irq_hw_number_t virq_to_hw(unsigned int virq)
{
-diff -Nur linux-4.1.10.orig/arch/powerpc/kernel/misc_32.S linux-4.1.10/arch/powerpc/kernel/misc_32.S
---- linux-4.1.10.orig/arch/powerpc/kernel/misc_32.S 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/powerpc/kernel/misc_32.S 2015-10-12 22:33:32.196682039 +0200
+diff -Nur linux-4.1.13.orig/arch/powerpc/kernel/misc_32.S linux-4.1.13/arch/powerpc/kernel/misc_32.S
+--- linux-4.1.13.orig/arch/powerpc/kernel/misc_32.S 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/powerpc/kernel/misc_32.S 2015-11-29 09:23:09.517620297 +0100
@@ -40,6 +40,7 @@
* We store the saved ksp_limit in the unused part
* of the STACK_FRAME_OVERHEAD
@@ -2207,9 +2291,9 @@ diff -Nur linux-4.1.10.orig/arch/powerpc/kernel/misc_32.S linux-4.1.10/arch/powe
/*
* void call_do_irq(struct pt_regs *regs, struct thread_info *irqtp);
-diff -Nur linux-4.1.10.orig/arch/powerpc/kernel/misc_64.S linux-4.1.10/arch/powerpc/kernel/misc_64.S
---- linux-4.1.10.orig/arch/powerpc/kernel/misc_64.S 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/powerpc/kernel/misc_64.S 2015-10-12 22:33:32.208681247 +0200
+diff -Nur linux-4.1.13.orig/arch/powerpc/kernel/misc_64.S linux-4.1.13/arch/powerpc/kernel/misc_64.S
+--- linux-4.1.13.orig/arch/powerpc/kernel/misc_64.S 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/powerpc/kernel/misc_64.S 2015-11-29 09:23:09.517620297 +0100
@@ -29,6 +29,7 @@
.text
@@ -2226,9 +2310,9 @@ diff -Nur linux-4.1.10.orig/arch/powerpc/kernel/misc_64.S linux-4.1.10/arch/powe
_GLOBAL(call_do_irq)
mflr r0
-diff -Nur linux-4.1.10.orig/arch/powerpc/kvm/book3s_hv.c linux-4.1.10/arch/powerpc/kvm/book3s_hv.c
---- linux-4.1.10.orig/arch/powerpc/kvm/book3s_hv.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/powerpc/kvm/book3s_hv.c 2015-10-12 22:33:32.208681247 +0200
+diff -Nur linux-4.1.13.orig/arch/powerpc/kvm/book3s_hv.c linux-4.1.13/arch/powerpc/kvm/book3s_hv.c
+--- linux-4.1.13.orig/arch/powerpc/kvm/book3s_hv.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/powerpc/kvm/book3s_hv.c 2015-11-29 09:23:09.517620297 +0100
@@ -115,11 +115,11 @@
static void kvmppc_fast_vcpu_kick_hv(struct kvm_vcpu *vcpu)
{
@@ -2304,9 +2388,9 @@ diff -Nur linux-4.1.10.orig/arch/powerpc/kvm/book3s_hv.c linux-4.1.10/arch/power
}
}
-diff -Nur linux-4.1.10.orig/arch/powerpc/kvm/Kconfig linux-4.1.10/arch/powerpc/kvm/Kconfig
---- linux-4.1.10.orig/arch/powerpc/kvm/Kconfig 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/powerpc/kvm/Kconfig 2015-10-12 22:33:32.208681247 +0200
+diff -Nur linux-4.1.13.orig/arch/powerpc/kvm/Kconfig linux-4.1.13/arch/powerpc/kvm/Kconfig
+--- linux-4.1.13.orig/arch/powerpc/kvm/Kconfig 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/powerpc/kvm/Kconfig 2015-11-29 09:23:09.517620297 +0100
@@ -172,6 +172,7 @@
config KVM_MPIC
bool "KVM in-kernel MPIC emulation"
@@ -2315,9 +2399,9 @@ diff -Nur linux-4.1.10.orig/arch/powerpc/kvm/Kconfig linux-4.1.10/arch/powerpc/k
select HAVE_KVM_IRQCHIP
select HAVE_KVM_IRQFD
select HAVE_KVM_IRQ_ROUTING
-diff -Nur linux-4.1.10.orig/arch/powerpc/mm/fault.c linux-4.1.10/arch/powerpc/mm/fault.c
---- linux-4.1.10.orig/arch/powerpc/mm/fault.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/powerpc/mm/fault.c 2015-10-12 22:33:32.212680982 +0200
+diff -Nur linux-4.1.13.orig/arch/powerpc/mm/fault.c linux-4.1.13/arch/powerpc/mm/fault.c
+--- linux-4.1.13.orig/arch/powerpc/mm/fault.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/powerpc/mm/fault.c 2015-11-29 09:23:09.517620297 +0100
@@ -33,13 +33,13 @@
#include <linux/ratelimit.h>
#include <linux/context_tracking.h>
@@ -2353,9 +2437,9 @@ diff -Nur linux-4.1.10.orig/arch/powerpc/mm/fault.c linux-4.1.10/arch/powerpc/mm
printk(KERN_EMERG "NIP = %lx MSR = %lx\n",
regs->nip, regs->msr);
die("Weird page fault", regs, SIGSEGV);
-diff -Nur linux-4.1.10.orig/arch/powerpc/mm/highmem.c linux-4.1.10/arch/powerpc/mm/highmem.c
---- linux-4.1.10.orig/arch/powerpc/mm/highmem.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/powerpc/mm/highmem.c 2015-10-12 22:33:32.212680982 +0200
+diff -Nur linux-4.1.13.orig/arch/powerpc/mm/highmem.c linux-4.1.13/arch/powerpc/mm/highmem.c
+--- linux-4.1.13.orig/arch/powerpc/mm/highmem.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/powerpc/mm/highmem.c 2015-11-29 09:23:09.517620297 +0100
@@ -34,7 +34,7 @@
unsigned long vaddr;
int idx, type;
@@ -2380,9 +2464,9 @@ diff -Nur linux-4.1.10.orig/arch/powerpc/mm/highmem.c linux-4.1.10/arch/powerpc/
+ preempt_enable();
}
EXPORT_SYMBOL(__kunmap_atomic);
-diff -Nur linux-4.1.10.orig/arch/powerpc/platforms/ps3/device-init.c linux-4.1.10/arch/powerpc/platforms/ps3/device-init.c
---- linux-4.1.10.orig/arch/powerpc/platforms/ps3/device-init.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/powerpc/platforms/ps3/device-init.c 2015-10-12 22:33:32.212680982 +0200
+diff -Nur linux-4.1.13.orig/arch/powerpc/platforms/ps3/device-init.c linux-4.1.13/arch/powerpc/platforms/ps3/device-init.c
+--- linux-4.1.13.orig/arch/powerpc/platforms/ps3/device-init.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/powerpc/platforms/ps3/device-init.c 2015-11-29 09:23:09.521620031 +0100
@@ -752,7 +752,7 @@
}
pr_debug("%s:%u: notification %s issued\n", __func__, __LINE__, op);
@@ -2392,9 +2476,9 @@ diff -Nur linux-4.1.10.orig/arch/powerpc/platforms/ps3/device-init.c linux-4.1.1
dev->done.done || kthread_should_stop());
if (kthread_should_stop())
res = -EINTR;
-diff -Nur linux-4.1.10.orig/arch/s390/include/asm/kvm_host.h linux-4.1.10/arch/s390/include/asm/kvm_host.h
---- linux-4.1.10.orig/arch/s390/include/asm/kvm_host.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/s390/include/asm/kvm_host.h 2015-10-12 22:33:32.212680982 +0200
+diff -Nur linux-4.1.13.orig/arch/s390/include/asm/kvm_host.h linux-4.1.13/arch/s390/include/asm/kvm_host.h
+--- linux-4.1.13.orig/arch/s390/include/asm/kvm_host.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/s390/include/asm/kvm_host.h 2015-11-29 09:23:09.521620031 +0100
@@ -419,7 +419,7 @@
struct kvm_s390_local_interrupt {
spinlock_t lock;
@@ -2404,9 +2488,9 @@ diff -Nur linux-4.1.10.orig/arch/s390/include/asm/kvm_host.h linux-4.1.10/arch/s
atomic_t *cpuflags;
DECLARE_BITMAP(sigp_emerg_pending, KVM_MAX_VCPUS);
struct kvm_s390_irq_payload irq;
-diff -Nur linux-4.1.10.orig/arch/s390/include/asm/uaccess.h linux-4.1.10/arch/s390/include/asm/uaccess.h
---- linux-4.1.10.orig/arch/s390/include/asm/uaccess.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/s390/include/asm/uaccess.h 2015-10-12 22:33:32.212680982 +0200
+diff -Nur linux-4.1.13.orig/arch/s390/include/asm/uaccess.h linux-4.1.13/arch/s390/include/asm/uaccess.h
+--- linux-4.1.13.orig/arch/s390/include/asm/uaccess.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/s390/include/asm/uaccess.h 2015-11-29 09:23:09.521620031 +0100
@@ -98,7 +98,8 @@
* @from: Source address, in user space.
* @n: Number of bytes to copy.
@@ -2457,9 +2541,9 @@ diff -Nur linux-4.1.10.orig/arch/s390/include/asm/uaccess.h linux-4.1.10/arch/s3
*
* Get the size of a NUL-terminated string in user space.
*
-diff -Nur linux-4.1.10.orig/arch/s390/kvm/interrupt.c linux-4.1.10/arch/s390/kvm/interrupt.c
---- linux-4.1.10.orig/arch/s390/kvm/interrupt.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/s390/kvm/interrupt.c 2015-10-12 22:33:32.212680982 +0200
+diff -Nur linux-4.1.13.orig/arch/s390/kvm/interrupt.c linux-4.1.13/arch/s390/kvm/interrupt.c
+--- linux-4.1.13.orig/arch/s390/kvm/interrupt.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/s390/kvm/interrupt.c 2015-11-29 09:23:09.521620031 +0100
@@ -875,13 +875,13 @@
void kvm_s390_vcpu_wakeup(struct kvm_vcpu *vcpu)
@@ -2494,9 +2578,9 @@ diff -Nur linux-4.1.10.orig/arch/s390/kvm/interrupt.c linux-4.1.10/arch/s390/kvm
spin_unlock(&li->lock);
return rc;
}
-diff -Nur linux-4.1.10.orig/arch/s390/mm/fault.c linux-4.1.10/arch/s390/mm/fault.c
---- linux-4.1.10.orig/arch/s390/mm/fault.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/s390/mm/fault.c 2015-10-12 22:33:32.212680982 +0200
+diff -Nur linux-4.1.13.orig/arch/s390/mm/fault.c linux-4.1.13/arch/s390/mm/fault.c
+--- linux-4.1.13.orig/arch/s390/mm/fault.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/s390/mm/fault.c 2015-11-29 09:23:09.521620031 +0100
@@ -399,7 +399,7 @@
* user context.
*/
@@ -2506,9 +2590,9 @@ diff -Nur linux-4.1.10.orig/arch/s390/mm/fault.c linux-4.1.10/arch/s390/mm/fault
goto out;
address = trans_exc_code & __FAIL_ADDR_MASK;
-diff -Nur linux-4.1.10.orig/arch/score/include/asm/uaccess.h linux-4.1.10/arch/score/include/asm/uaccess.h
---- linux-4.1.10.orig/arch/score/include/asm/uaccess.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/score/include/asm/uaccess.h 2015-10-12 22:33:32.212680982 +0200
+diff -Nur linux-4.1.13.orig/arch/score/include/asm/uaccess.h linux-4.1.13/arch/score/include/asm/uaccess.h
+--- linux-4.1.13.orig/arch/score/include/asm/uaccess.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/score/include/asm/uaccess.h 2015-11-29 09:23:09.521620031 +0100
@@ -36,7 +36,8 @@
* @addr: User space pointer to start of block to check
* @size: Size of block to check
@@ -2559,9 +2643,9 @@ diff -Nur linux-4.1.10.orig/arch/score/include/asm/uaccess.h linux-4.1.10/arch/s
*
* This macro copies a single simple variable from user space to kernel
* space. It supports simple types like char and int, but not larger
-diff -Nur linux-4.1.10.orig/arch/score/mm/fault.c linux-4.1.10/arch/score/mm/fault.c
---- linux-4.1.10.orig/arch/score/mm/fault.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/score/mm/fault.c 2015-10-12 22:33:32.212680982 +0200
+diff -Nur linux-4.1.13.orig/arch/score/mm/fault.c linux-4.1.13/arch/score/mm/fault.c
+--- linux-4.1.13.orig/arch/score/mm/fault.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/score/mm/fault.c 2015-11-29 09:23:09.521620031 +0100
@@ -34,6 +34,7 @@
#include <linux/string.h>
#include <linux/types.h>
@@ -2579,9 +2663,9 @@ diff -Nur linux-4.1.10.orig/arch/score/mm/fault.c linux-4.1.10/arch/score/mm/fau
goto bad_area_nosemaphore;
if (user_mode(regs))
-diff -Nur linux-4.1.10.orig/arch/sh/kernel/irq.c linux-4.1.10/arch/sh/kernel/irq.c
---- linux-4.1.10.orig/arch/sh/kernel/irq.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/sh/kernel/irq.c 2015-10-12 22:33:32.212680982 +0200
+diff -Nur linux-4.1.13.orig/arch/sh/kernel/irq.c linux-4.1.13/arch/sh/kernel/irq.c
+--- linux-4.1.13.orig/arch/sh/kernel/irq.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/sh/kernel/irq.c 2015-11-29 09:23:09.521620031 +0100
@@ -147,6 +147,7 @@
hardirq_ctx[cpu] = NULL;
}
@@ -2598,9 +2682,9 @@ diff -Nur linux-4.1.10.orig/arch/sh/kernel/irq.c linux-4.1.10/arch/sh/kernel/irq
#else
static inline void handle_one_irq(unsigned int irq)
{
-diff -Nur linux-4.1.10.orig/arch/sh/mm/fault.c linux-4.1.10/arch/sh/mm/fault.c
---- linux-4.1.10.orig/arch/sh/mm/fault.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/sh/mm/fault.c 2015-10-12 22:33:32.212680982 +0200
+diff -Nur linux-4.1.13.orig/arch/sh/mm/fault.c linux-4.1.13/arch/sh/mm/fault.c
+--- linux-4.1.13.orig/arch/sh/mm/fault.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/sh/mm/fault.c 2015-11-29 09:23:09.521620031 +0100
@@ -17,6 +17,7 @@
#include <linux/kprobes.h>
#include <linux/perf_event.h>
@@ -2621,9 +2705,9 @@ diff -Nur linux-4.1.10.orig/arch/sh/mm/fault.c linux-4.1.10/arch/sh/mm/fault.c
bad_area_nosemaphore(regs, error_code, address);
return;
}
-diff -Nur linux-4.1.10.orig/arch/sparc/Kconfig linux-4.1.10/arch/sparc/Kconfig
---- linux-4.1.10.orig/arch/sparc/Kconfig 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/sparc/Kconfig 2015-10-12 22:33:32.212680982 +0200
+diff -Nur linux-4.1.13.orig/arch/sparc/Kconfig linux-4.1.13/arch/sparc/Kconfig
+--- linux-4.1.13.orig/arch/sparc/Kconfig 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/sparc/Kconfig 2015-11-29 09:23:09.521620031 +0100
@@ -189,12 +189,10 @@
source kernel/Kconfig.hz
@@ -2639,9 +2723,9 @@ diff -Nur linux-4.1.10.orig/arch/sparc/Kconfig linux-4.1.10/arch/sparc/Kconfig
config GENERIC_HWEIGHT
bool
-diff -Nur linux-4.1.10.orig/arch/sparc/kernel/irq_64.c linux-4.1.10/arch/sparc/kernel/irq_64.c
---- linux-4.1.10.orig/arch/sparc/kernel/irq_64.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/sparc/kernel/irq_64.c 2015-10-12 22:33:32.212680982 +0200
+diff -Nur linux-4.1.13.orig/arch/sparc/kernel/irq_64.c linux-4.1.13/arch/sparc/kernel/irq_64.c
+--- linux-4.1.13.orig/arch/sparc/kernel/irq_64.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/sparc/kernel/irq_64.c 2015-11-29 09:23:09.521620031 +0100
@@ -849,6 +849,7 @@
set_irq_regs(old_regs);
}
@@ -2658,9 +2742,9 @@ diff -Nur linux-4.1.10.orig/arch/sparc/kernel/irq_64.c linux-4.1.10/arch/sparc/k
#ifdef CONFIG_HOTPLUG_CPU
void fixup_irqs(void)
-diff -Nur linux-4.1.10.orig/arch/sparc/mm/fault_32.c linux-4.1.10/arch/sparc/mm/fault_32.c
---- linux-4.1.10.orig/arch/sparc/mm/fault_32.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/sparc/mm/fault_32.c 2015-10-12 22:33:32.212680982 +0200
+diff -Nur linux-4.1.13.orig/arch/sparc/mm/fault_32.c linux-4.1.13/arch/sparc/mm/fault_32.c
+--- linux-4.1.13.orig/arch/sparc/mm/fault_32.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/sparc/mm/fault_32.c 2015-11-29 09:23:09.521620031 +0100
@@ -21,6 +21,7 @@
#include <linux/perf_event.h>
#include <linux/interrupt.h>
@@ -2686,9 +2770,9 @@ diff -Nur linux-4.1.10.orig/arch/sparc/mm/fault_32.c linux-4.1.10/arch/sparc/mm/
goto no_context;
perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, address);
-diff -Nur linux-4.1.10.orig/arch/sparc/mm/fault_64.c linux-4.1.10/arch/sparc/mm/fault_64.c
---- linux-4.1.10.orig/arch/sparc/mm/fault_64.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/sparc/mm/fault_64.c 2015-10-12 22:33:32.212680982 +0200
+diff -Nur linux-4.1.13.orig/arch/sparc/mm/fault_64.c linux-4.1.13/arch/sparc/mm/fault_64.c
+--- linux-4.1.13.orig/arch/sparc/mm/fault_64.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/sparc/mm/fault_64.c 2015-11-29 09:23:09.521620031 +0100
@@ -22,12 +22,12 @@
#include <linux/kdebug.h>
#include <linux/percpu.h>
@@ -2712,9 +2796,9 @@ diff -Nur linux-4.1.10.orig/arch/sparc/mm/fault_64.c linux-4.1.10/arch/sparc/mm/
goto intr_or_no_mm;
perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, address);
-diff -Nur linux-4.1.10.orig/arch/sparc/mm/highmem.c linux-4.1.10/arch/sparc/mm/highmem.c
---- linux-4.1.10.orig/arch/sparc/mm/highmem.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/sparc/mm/highmem.c 2015-10-12 22:33:32.216680718 +0200
+diff -Nur linux-4.1.13.orig/arch/sparc/mm/highmem.c linux-4.1.13/arch/sparc/mm/highmem.c
+--- linux-4.1.13.orig/arch/sparc/mm/highmem.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/sparc/mm/highmem.c 2015-11-29 09:23:09.521620031 +0100
@@ -53,7 +53,7 @@
unsigned long vaddr;
long idx, type;
@@ -2739,9 +2823,9 @@ diff -Nur linux-4.1.10.orig/arch/sparc/mm/highmem.c linux-4.1.10/arch/sparc/mm/h
+ preempt_enable();
}
EXPORT_SYMBOL(__kunmap_atomic);
-diff -Nur linux-4.1.10.orig/arch/sparc/mm/init_64.c linux-4.1.10/arch/sparc/mm/init_64.c
---- linux-4.1.10.orig/arch/sparc/mm/init_64.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/sparc/mm/init_64.c 2015-10-12 22:33:32.216680718 +0200
+diff -Nur linux-4.1.13.orig/arch/sparc/mm/init_64.c linux-4.1.13/arch/sparc/mm/init_64.c
+--- linux-4.1.13.orig/arch/sparc/mm/init_64.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/sparc/mm/init_64.c 2015-11-29 09:23:09.521620031 +0100
@@ -2738,7 +2738,7 @@
struct mm_struct *mm = current->mm;
struct tsb_config *tp;
@@ -2751,9 +2835,9 @@ diff -Nur linux-4.1.10.orig/arch/sparc/mm/init_64.c linux-4.1.10/arch/sparc/mm/i
const struct exception_table_entry *entry;
entry = search_exception_tables(regs->tpc);
-diff -Nur linux-4.1.10.orig/arch/tile/include/asm/uaccess.h linux-4.1.10/arch/tile/include/asm/uaccess.h
---- linux-4.1.10.orig/arch/tile/include/asm/uaccess.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/tile/include/asm/uaccess.h 2015-10-12 22:33:32.216680718 +0200
+diff -Nur linux-4.1.13.orig/arch/tile/include/asm/uaccess.h linux-4.1.13/arch/tile/include/asm/uaccess.h
+--- linux-4.1.13.orig/arch/tile/include/asm/uaccess.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/tile/include/asm/uaccess.h 2015-11-29 09:23:09.521620031 +0100
@@ -78,7 +78,8 @@
* @addr: User space pointer to start of block to check
* @size: Size of block to check
@@ -2814,9 +2898,9 @@ diff -Nur linux-4.1.10.orig/arch/tile/include/asm/uaccess.h linux-4.1.10/arch/ti
*
* Copy data from user space to user space. Caller must check
* the specified blocks with access_ok() before calling this function.
-diff -Nur linux-4.1.10.orig/arch/tile/mm/fault.c linux-4.1.10/arch/tile/mm/fault.c
---- linux-4.1.10.orig/arch/tile/mm/fault.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/tile/mm/fault.c 2015-10-12 22:33:32.216680718 +0200
+diff -Nur linux-4.1.13.orig/arch/tile/mm/fault.c linux-4.1.13/arch/tile/mm/fault.c
+--- linux-4.1.13.orig/arch/tile/mm/fault.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/tile/mm/fault.c 2015-11-29 09:23:09.521620031 +0100
@@ -354,9 +354,9 @@
/*
@@ -2829,9 +2913,9 @@ diff -Nur linux-4.1.10.orig/arch/tile/mm/fault.c linux-4.1.10/arch/tile/mm/fault
vma = NULL; /* happy compiler */
goto bad_area_nosemaphore;
}
-diff -Nur linux-4.1.10.orig/arch/tile/mm/highmem.c linux-4.1.10/arch/tile/mm/highmem.c
---- linux-4.1.10.orig/arch/tile/mm/highmem.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/tile/mm/highmem.c 2015-10-12 22:33:32.216680718 +0200
+diff -Nur linux-4.1.13.orig/arch/tile/mm/highmem.c linux-4.1.13/arch/tile/mm/highmem.c
+--- linux-4.1.13.orig/arch/tile/mm/highmem.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/tile/mm/highmem.c 2015-11-29 09:23:09.521620031 +0100
@@ -201,7 +201,7 @@
int idx, type;
pte_t *pte;
@@ -2849,9 +2933,9 @@ diff -Nur linux-4.1.10.orig/arch/tile/mm/highmem.c linux-4.1.10/arch/tile/mm/hig
}
EXPORT_SYMBOL(__kunmap_atomic);
-diff -Nur linux-4.1.10.orig/arch/um/kernel/trap.c linux-4.1.10/arch/um/kernel/trap.c
---- linux-4.1.10.orig/arch/um/kernel/trap.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/um/kernel/trap.c 2015-10-12 22:33:32.216680718 +0200
+diff -Nur linux-4.1.13.orig/arch/um/kernel/trap.c linux-4.1.13/arch/um/kernel/trap.c
+--- linux-4.1.13.orig/arch/um/kernel/trap.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/um/kernel/trap.c 2015-11-29 09:23:09.521620031 +0100
@@ -35,10 +35,10 @@
*code_out = SEGV_MAPERR;
@@ -2865,9 +2949,9 @@ diff -Nur linux-4.1.10.orig/arch/um/kernel/trap.c linux-4.1.10/arch/um/kernel/tr
goto out_nosemaphore;
if (is_user)
-diff -Nur linux-4.1.10.orig/arch/unicore32/mm/fault.c linux-4.1.10/arch/unicore32/mm/fault.c
---- linux-4.1.10.orig/arch/unicore32/mm/fault.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/unicore32/mm/fault.c 2015-10-12 22:33:32.216680718 +0200
+diff -Nur linux-4.1.13.orig/arch/unicore32/mm/fault.c linux-4.1.13/arch/unicore32/mm/fault.c
+--- linux-4.1.13.orig/arch/unicore32/mm/fault.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/unicore32/mm/fault.c 2015-11-29 09:23:09.525619763 +0100
@@ -218,7 +218,7 @@
* If we're in an interrupt or have no user
* context, we must not take the fault..
@@ -2877,9 +2961,9 @@ diff -Nur linux-4.1.10.orig/arch/unicore32/mm/fault.c linux-4.1.10/arch/unicore3
goto no_context;
if (user_mode(regs))
-diff -Nur linux-4.1.10.orig/arch/x86/crypto/aesni-intel_glue.c linux-4.1.10/arch/x86/crypto/aesni-intel_glue.c
---- linux-4.1.10.orig/arch/x86/crypto/aesni-intel_glue.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/x86/crypto/aesni-intel_glue.c 2015-10-12 22:33:32.216680718 +0200
+diff -Nur linux-4.1.13.orig/arch/x86/crypto/aesni-intel_glue.c linux-4.1.13/arch/x86/crypto/aesni-intel_glue.c
+--- linux-4.1.13.orig/arch/x86/crypto/aesni-intel_glue.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/x86/crypto/aesni-intel_glue.c 2015-11-29 09:23:09.525619763 +0100
@@ -382,14 +382,14 @@
err = blkcipher_walk_virt(desc, &walk);
desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;
@@ -2972,9 +3056,9 @@ diff -Nur linux-4.1.10.orig/arch/x86/crypto/aesni-intel_glue.c linux-4.1.10/arch
return err;
}
-diff -Nur linux-4.1.10.orig/arch/x86/crypto/cast5_avx_glue.c linux-4.1.10/arch/x86/crypto/cast5_avx_glue.c
---- linux-4.1.10.orig/arch/x86/crypto/cast5_avx_glue.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/x86/crypto/cast5_avx_glue.c 2015-10-12 22:33:32.216680718 +0200
+diff -Nur linux-4.1.13.orig/arch/x86/crypto/cast5_avx_glue.c linux-4.1.13/arch/x86/crypto/cast5_avx_glue.c
+--- linux-4.1.13.orig/arch/x86/crypto/cast5_avx_glue.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/x86/crypto/cast5_avx_glue.c 2015-11-29 09:23:09.525619763 +0100
@@ -60,7 +60,7 @@
static int ecb_crypt(struct blkcipher_desc *desc, struct blkcipher_walk *walk,
bool enc)
@@ -3054,9 +3138,9 @@ diff -Nur linux-4.1.10.orig/arch/x86/crypto/cast5_avx_glue.c linux-4.1.10/arch/x
if (walk.nbytes) {
ctr_crypt_final(desc, &walk);
err = blkcipher_walk_done(desc, &walk, 0);
-diff -Nur linux-4.1.10.orig/arch/x86/crypto/glue_helper.c linux-4.1.10/arch/x86/crypto/glue_helper.c
---- linux-4.1.10.orig/arch/x86/crypto/glue_helper.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/x86/crypto/glue_helper.c 2015-10-12 22:33:32.216680718 +0200
+diff -Nur linux-4.1.13.orig/arch/x86/crypto/glue_helper.c linux-4.1.13/arch/x86/crypto/glue_helper.c
+--- linux-4.1.13.orig/arch/x86/crypto/glue_helper.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/x86/crypto/glue_helper.c 2015-11-29 09:23:09.525619763 +0100
@@ -39,7 +39,7 @@
void *ctx = crypto_blkcipher_ctx(desc->tfm);
const unsigned int bsize = 128 / 8;
@@ -3172,9 +3256,9 @@ diff -Nur linux-4.1.10.orig/arch/x86/crypto/glue_helper.c linux-4.1.10/arch/x86/
return err;
}
EXPORT_SYMBOL_GPL(glue_xts_crypt_128bit);
-diff -Nur linux-4.1.10.orig/arch/x86/include/asm/preempt.h linux-4.1.10/arch/x86/include/asm/preempt.h
---- linux-4.1.10.orig/arch/x86/include/asm/preempt.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/x86/include/asm/preempt.h 2015-10-12 22:33:32.216680718 +0200
+diff -Nur linux-4.1.13.orig/arch/x86/include/asm/preempt.h linux-4.1.13/arch/x86/include/asm/preempt.h
+--- linux-4.1.13.orig/arch/x86/include/asm/preempt.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/x86/include/asm/preempt.h 2015-11-29 09:23:09.525619763 +0100
@@ -82,17 +82,33 @@
* a decrement which hits zero means we have no preempt_count and should
* reschedule.
@@ -3199,20 +3283,20 @@ diff -Nur linux-4.1.10.orig/arch/x86/include/asm/preempt.h linux-4.1.10/arch/x86
/*
* Returns true when we need to resched and can (barring IRQ state).
*/
- static __always_inline bool should_resched(void)
+ static __always_inline bool should_resched(int preempt_offset)
{
+#ifdef CONFIG_PREEMPT_LAZY
-+ return unlikely(!raw_cpu_read_4(__preempt_count) || \
++ return unlikely(raw_cpu_read_4(__preempt_count) == preempt_offset ||
+ test_thread_flag(TIF_NEED_RESCHED_LAZY));
+#else
- return unlikely(!raw_cpu_read_4(__preempt_count));
+ return unlikely(raw_cpu_read_4(__preempt_count) == preempt_offset);
+#endif
}
#ifdef CONFIG_PREEMPT
-diff -Nur linux-4.1.10.orig/arch/x86/include/asm/signal.h linux-4.1.10/arch/x86/include/asm/signal.h
---- linux-4.1.10.orig/arch/x86/include/asm/signal.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/x86/include/asm/signal.h 2015-10-12 22:33:32.216680718 +0200
+diff -Nur linux-4.1.13.orig/arch/x86/include/asm/signal.h linux-4.1.13/arch/x86/include/asm/signal.h
+--- linux-4.1.13.orig/arch/x86/include/asm/signal.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/x86/include/asm/signal.h 2015-11-29 09:23:09.525619763 +0100
@@ -23,6 +23,19 @@
unsigned long sig[_NSIG_WORDS];
} sigset_t;
@@ -3233,9 +3317,9 @@ diff -Nur linux-4.1.10.orig/arch/x86/include/asm/signal.h linux-4.1.10/arch/x86/
#ifndef CONFIG_COMPAT
typedef sigset_t compat_sigset_t;
#endif
-diff -Nur linux-4.1.10.orig/arch/x86/include/asm/stackprotector.h linux-4.1.10/arch/x86/include/asm/stackprotector.h
---- linux-4.1.10.orig/arch/x86/include/asm/stackprotector.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/x86/include/asm/stackprotector.h 2015-10-12 22:33:32.216680718 +0200
+diff -Nur linux-4.1.13.orig/arch/x86/include/asm/stackprotector.h linux-4.1.13/arch/x86/include/asm/stackprotector.h
+--- linux-4.1.13.orig/arch/x86/include/asm/stackprotector.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/x86/include/asm/stackprotector.h 2015-11-29 09:23:09.525619763 +0100
@@ -57,7 +57,7 @@
*/
static __always_inline void boot_init_stack_canary(void)
@@ -3262,9 +3346,9 @@ diff -Nur linux-4.1.10.orig/arch/x86/include/asm/stackprotector.h linux-4.1.10/a
tsc = __native_read_tsc();
canary += tsc + (tsc << 32UL);
-diff -Nur linux-4.1.10.orig/arch/x86/include/asm/thread_info.h linux-4.1.10/arch/x86/include/asm/thread_info.h
---- linux-4.1.10.orig/arch/x86/include/asm/thread_info.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/x86/include/asm/thread_info.h 2015-10-12 22:33:32.220680454 +0200
+diff -Nur linux-4.1.13.orig/arch/x86/include/asm/thread_info.h linux-4.1.13/arch/x86/include/asm/thread_info.h
+--- linux-4.1.13.orig/arch/x86/include/asm/thread_info.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/x86/include/asm/thread_info.h 2015-11-29 09:23:09.525619763 +0100
@@ -55,6 +55,8 @@
__u32 status; /* thread synchronous flags */
__u32 cpu; /* current CPU */
@@ -3299,9 +3383,9 @@ diff -Nur linux-4.1.10.orig/arch/x86/include/asm/thread_info.h linux-4.1.10/arch
#define STACK_WARN (THREAD_SIZE/8)
/*
-diff -Nur linux-4.1.10.orig/arch/x86/include/asm/uaccess_32.h linux-4.1.10/arch/x86/include/asm/uaccess_32.h
---- linux-4.1.10.orig/arch/x86/include/asm/uaccess_32.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/x86/include/asm/uaccess_32.h 2015-10-12 22:33:32.220680454 +0200
+diff -Nur linux-4.1.13.orig/arch/x86/include/asm/uaccess_32.h linux-4.1.13/arch/x86/include/asm/uaccess_32.h
+--- linux-4.1.13.orig/arch/x86/include/asm/uaccess_32.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/x86/include/asm/uaccess_32.h 2015-11-29 09:23:09.525619763 +0100
@@ -70,7 +70,8 @@
* @from: Source address, in kernel space.
* @n: Number of bytes to copy.
@@ -3322,9 +3406,9 @@ diff -Nur linux-4.1.10.orig/arch/x86/include/asm/uaccess_32.h linux-4.1.10/arch/
*
* Copy data from user space to kernel space. Caller must check
* the specified block with access_ok() before calling this function.
-diff -Nur linux-4.1.10.orig/arch/x86/include/asm/uaccess.h linux-4.1.10/arch/x86/include/asm/uaccess.h
---- linux-4.1.10.orig/arch/x86/include/asm/uaccess.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/x86/include/asm/uaccess.h 2015-10-12 22:33:32.220680454 +0200
+diff -Nur linux-4.1.13.orig/arch/x86/include/asm/uaccess.h linux-4.1.13/arch/x86/include/asm/uaccess.h
+--- linux-4.1.13.orig/arch/x86/include/asm/uaccess.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/x86/include/asm/uaccess.h 2015-11-29 09:23:09.525619763 +0100
@@ -74,7 +74,8 @@
* @addr: User space pointer to start of block to check
* @size: Size of block to check
@@ -3375,9 +3459,9 @@ diff -Nur linux-4.1.10.orig/arch/x86/include/asm/uaccess.h linux-4.1.10/arch/x86
*
* This macro copies a single simple value from kernel space to user
* space. It supports simple types like char and int, but not larger
-diff -Nur linux-4.1.10.orig/arch/x86/include/asm/uv/uv_bau.h linux-4.1.10/arch/x86/include/asm/uv/uv_bau.h
---- linux-4.1.10.orig/arch/x86/include/asm/uv/uv_bau.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/x86/include/asm/uv/uv_bau.h 2015-10-12 22:33:32.220680454 +0200
+diff -Nur linux-4.1.13.orig/arch/x86/include/asm/uv/uv_bau.h linux-4.1.13/arch/x86/include/asm/uv/uv_bau.h
+--- linux-4.1.13.orig/arch/x86/include/asm/uv/uv_bau.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/x86/include/asm/uv/uv_bau.h 2015-11-29 09:23:09.525619763 +0100
@@ -615,9 +615,9 @@
cycles_t send_message;
cycles_t period_end;
@@ -3411,9 +3495,9 @@ diff -Nur linux-4.1.10.orig/arch/x86/include/asm/uv/uv_bau.h linux-4.1.10/arch/x
return 1;
}
-diff -Nur linux-4.1.10.orig/arch/x86/include/asm/uv/uv_hub.h linux-4.1.10/arch/x86/include/asm/uv/uv_hub.h
---- linux-4.1.10.orig/arch/x86/include/asm/uv/uv_hub.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/x86/include/asm/uv/uv_hub.h 2015-10-12 22:33:32.220680454 +0200
+diff -Nur linux-4.1.13.orig/arch/x86/include/asm/uv/uv_hub.h linux-4.1.13/arch/x86/include/asm/uv/uv_hub.h
+--- linux-4.1.13.orig/arch/x86/include/asm/uv/uv_hub.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/x86/include/asm/uv/uv_hub.h 2015-11-29 09:23:09.525619763 +0100
@@ -492,7 +492,7 @@
unsigned short nr_online_cpus;
unsigned short pnode;
@@ -3423,9 +3507,9 @@ diff -Nur linux-4.1.10.orig/arch/x86/include/asm/uv/uv_hub.h linux-4.1.10/arch/x
unsigned long nmi_count; /* obsolete, see uv_hub_nmi */
};
extern struct uv_blade_info *uv_blade_info;
-diff -Nur linux-4.1.10.orig/arch/x86/Kconfig linux-4.1.10/arch/x86/Kconfig
---- linux-4.1.10.orig/arch/x86/Kconfig 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/x86/Kconfig 2015-10-12 22:33:32.220680454 +0200
+diff -Nur linux-4.1.13.orig/arch/x86/Kconfig linux-4.1.13/arch/x86/Kconfig
+--- linux-4.1.13.orig/arch/x86/Kconfig 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/x86/Kconfig 2015-11-29 09:23:09.525619763 +0100
@@ -22,6 +22,7 @@
### Arch settings
config X86
@@ -3456,9 +3540,9 @@ diff -Nur linux-4.1.10.orig/arch/x86/Kconfig linux-4.1.10/arch/x86/Kconfig
---help---
Enable maximum number of CPUS and NUMA Nodes for this architecture.
If unsure, say N.
-diff -Nur linux-4.1.10.orig/arch/x86/kernel/apic/io_apic.c linux-4.1.10/arch/x86/kernel/apic/io_apic.c
---- linux-4.1.10.orig/arch/x86/kernel/apic/io_apic.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/x86/kernel/apic/io_apic.c 2015-10-12 22:33:32.220680454 +0200
+diff -Nur linux-4.1.13.orig/arch/x86/kernel/apic/io_apic.c linux-4.1.13/arch/x86/kernel/apic/io_apic.c
+--- linux-4.1.13.orig/arch/x86/kernel/apic/io_apic.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/x86/kernel/apic/io_apic.c 2015-11-29 09:23:09.525619763 +0100
@@ -1891,7 +1891,8 @@
static inline bool ioapic_irqd_mask(struct irq_data *data, struct irq_cfg *cfg)
{
@@ -3469,9 +3553,9 @@ diff -Nur linux-4.1.10.orig/arch/x86/kernel/apic/io_apic.c linux-4.1.10/arch/x86
mask_ioapic(cfg);
return true;
}
-diff -Nur linux-4.1.10.orig/arch/x86/kernel/apic/x2apic_uv_x.c linux-4.1.10/arch/x86/kernel/apic/x2apic_uv_x.c
---- linux-4.1.10.orig/arch/x86/kernel/apic/x2apic_uv_x.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/x86/kernel/apic/x2apic_uv_x.c 2015-10-12 22:33:32.220680454 +0200
+diff -Nur linux-4.1.13.orig/arch/x86/kernel/apic/x2apic_uv_x.c linux-4.1.13/arch/x86/kernel/apic/x2apic_uv_x.c
+--- linux-4.1.13.orig/arch/x86/kernel/apic/x2apic_uv_x.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/x86/kernel/apic/x2apic_uv_x.c 2015-11-29 09:23:09.525619763 +0100
@@ -949,7 +949,7 @@
uv_blade_info[blade].pnode = pnode;
uv_blade_info[blade].nr_possible_cpus = 0;
@@ -3481,9 +3565,9 @@ diff -Nur linux-4.1.10.orig/arch/x86/kernel/apic/x2apic_uv_x.c linux-4.1.10/arch
min_pnode = min(pnode, min_pnode);
max_pnode = max(pnode, max_pnode);
blade++;
-diff -Nur linux-4.1.10.orig/arch/x86/kernel/asm-offsets.c linux-4.1.10/arch/x86/kernel/asm-offsets.c
---- linux-4.1.10.orig/arch/x86/kernel/asm-offsets.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/x86/kernel/asm-offsets.c 2015-10-12 22:33:32.220680454 +0200
+diff -Nur linux-4.1.13.orig/arch/x86/kernel/asm-offsets.c linux-4.1.13/arch/x86/kernel/asm-offsets.c
+--- linux-4.1.13.orig/arch/x86/kernel/asm-offsets.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/x86/kernel/asm-offsets.c 2015-11-29 09:23:09.525619763 +0100
@@ -32,6 +32,7 @@
OFFSET(TI_flags, thread_info, flags);
OFFSET(TI_status, thread_info, status);
@@ -3498,9 +3582,9 @@ diff -Nur linux-4.1.10.orig/arch/x86/kernel/asm-offsets.c linux-4.1.10/arch/x86/
DEFINE(PTREGS_SIZE, sizeof(struct pt_regs));
+ DEFINE(_PREEMPT_ENABLED, PREEMPT_ENABLED);
}
-diff -Nur linux-4.1.10.orig/arch/x86/kernel/cpu/mcheck/mce.c linux-4.1.10/arch/x86/kernel/cpu/mcheck/mce.c
---- linux-4.1.10.orig/arch/x86/kernel/cpu/mcheck/mce.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/x86/kernel/cpu/mcheck/mce.c 2015-10-12 22:33:32.220680454 +0200
+diff -Nur linux-4.1.13.orig/arch/x86/kernel/cpu/mcheck/mce.c linux-4.1.13/arch/x86/kernel/cpu/mcheck/mce.c
+--- linux-4.1.13.orig/arch/x86/kernel/cpu/mcheck/mce.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/x86/kernel/cpu/mcheck/mce.c 2015-11-29 09:23:09.529619496 +0100
@@ -41,6 +41,8 @@
#include <linux/debugfs.h>
#include <linux/irq_work.h>
@@ -3742,9 +3826,9 @@ diff -Nur linux-4.1.10.orig/arch/x86/kernel/cpu/mcheck/mce.c linux-4.1.10/arch/x
if (!zalloc_cpumask_var(&mce_device_initialized, GFP_KERNEL)) {
err = -ENOMEM;
goto err_out;
-diff -Nur linux-4.1.10.orig/arch/x86/kernel/dumpstack_32.c linux-4.1.10/arch/x86/kernel/dumpstack_32.c
---- linux-4.1.10.orig/arch/x86/kernel/dumpstack_32.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/x86/kernel/dumpstack_32.c 2015-10-12 22:33:32.224680189 +0200
+diff -Nur linux-4.1.13.orig/arch/x86/kernel/dumpstack_32.c linux-4.1.13/arch/x86/kernel/dumpstack_32.c
+--- linux-4.1.13.orig/arch/x86/kernel/dumpstack_32.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/x86/kernel/dumpstack_32.c 2015-11-29 09:23:09.529619496 +0100
@@ -42,7 +42,7 @@
unsigned long *stack, unsigned long bp,
const struct stacktrace_ops *ops, void *data)
@@ -3763,9 +3847,9 @@ diff -Nur linux-4.1.10.orig/arch/x86/kernel/dumpstack_32.c linux-4.1.10/arch/x86
}
EXPORT_SYMBOL(dump_trace);
-diff -Nur linux-4.1.10.orig/arch/x86/kernel/dumpstack_64.c linux-4.1.10/arch/x86/kernel/dumpstack_64.c
---- linux-4.1.10.orig/arch/x86/kernel/dumpstack_64.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/x86/kernel/dumpstack_64.c 2015-10-12 22:33:32.224680189 +0200
+diff -Nur linux-4.1.13.orig/arch/x86/kernel/dumpstack_64.c linux-4.1.13/arch/x86/kernel/dumpstack_64.c
+--- linux-4.1.13.orig/arch/x86/kernel/dumpstack_64.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/x86/kernel/dumpstack_64.c 2015-11-29 09:23:09.529619496 +0100
@@ -152,7 +152,7 @@
unsigned long *stack, unsigned long bp,
const struct stacktrace_ops *ops, void *data)
@@ -3802,9 +3886,9 @@ diff -Nur linux-4.1.10.orig/arch/x86/kernel/dumpstack_64.c linux-4.1.10/arch/x86
pr_cont("\n");
show_trace_log_lvl(task, regs, sp, bp, log_lvl);
-diff -Nur linux-4.1.10.orig/arch/x86/kernel/entry_32.S linux-4.1.10/arch/x86/kernel/entry_32.S
---- linux-4.1.10.orig/arch/x86/kernel/entry_32.S 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/x86/kernel/entry_32.S 2015-10-12 22:33:32.224680189 +0200
+diff -Nur linux-4.1.13.orig/arch/x86/kernel/entry_32.S linux-4.1.13/arch/x86/kernel/entry_32.S
+--- linux-4.1.13.orig/arch/x86/kernel/entry_32.S 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/x86/kernel/entry_32.S 2015-11-29 09:23:09.529619496 +0100
@@ -359,8 +359,24 @@
ENTRY(resume_kernel)
DISABLE_INTERRUPTS(CLBR_ANY)
@@ -3848,9 +3932,9 @@ diff -Nur linux-4.1.10.orig/arch/x86/kernel/entry_32.S linux-4.1.10/arch/x86/ker
jnz work_resched
work_notifysig: # deal with pending signals and
-diff -Nur linux-4.1.10.orig/arch/x86/kernel/entry_64.S linux-4.1.10/arch/x86/kernel/entry_64.S
---- linux-4.1.10.orig/arch/x86/kernel/entry_64.S 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/x86/kernel/entry_64.S 2015-10-12 22:33:32.224680189 +0200
+diff -Nur linux-4.1.13.orig/arch/x86/kernel/entry_64.S linux-4.1.13/arch/x86/kernel/entry_64.S
+--- linux-4.1.13.orig/arch/x86/kernel/entry_64.S 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/x86/kernel/entry_64.S 2015-11-29 09:23:09.529619496 +0100
@@ -370,8 +370,8 @@
/* First do a reschedule test. */
/* edx: work, edi: workmask */
@@ -3913,9 +3997,9 @@ diff -Nur linux-4.1.10.orig/arch/x86/kernel/entry_64.S linux-4.1.10/arch/x86/ker
#ifdef CONFIG_XEN
idtentry xen_hypervisor_callback xen_do_hypervisor_callback has_error_code=0
-diff -Nur linux-4.1.10.orig/arch/x86/kernel/irq_32.c linux-4.1.10/arch/x86/kernel/irq_32.c
---- linux-4.1.10.orig/arch/x86/kernel/irq_32.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/x86/kernel/irq_32.c 2015-10-12 22:33:32.224680189 +0200
+diff -Nur linux-4.1.13.orig/arch/x86/kernel/irq_32.c linux-4.1.13/arch/x86/kernel/irq_32.c
+--- linux-4.1.13.orig/arch/x86/kernel/irq_32.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/x86/kernel/irq_32.c 2015-11-29 09:23:09.529619496 +0100
@@ -135,6 +135,7 @@
cpu, per_cpu(hardirq_stack, cpu), per_cpu(softirq_stack, cpu));
}
@@ -3932,9 +4016,9 @@ diff -Nur linux-4.1.10.orig/arch/x86/kernel/irq_32.c linux-4.1.10/arch/x86/kerne
bool handle_irq(unsigned irq, struct pt_regs *regs)
{
-diff -Nur linux-4.1.10.orig/arch/x86/kernel/process_32.c linux-4.1.10/arch/x86/kernel/process_32.c
---- linux-4.1.10.orig/arch/x86/kernel/process_32.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/x86/kernel/process_32.c 2015-10-12 22:33:32.224680189 +0200
+diff -Nur linux-4.1.13.orig/arch/x86/kernel/process_32.c linux-4.1.13/arch/x86/kernel/process_32.c
+--- linux-4.1.13.orig/arch/x86/kernel/process_32.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/x86/kernel/process_32.c 2015-11-29 09:23:09.529619496 +0100
@@ -35,6 +35,7 @@
#include <linux/uaccess.h>
#include <linux/io.h>
@@ -3988,9 +4072,9 @@ diff -Nur linux-4.1.10.orig/arch/x86/kernel/process_32.c linux-4.1.10/arch/x86/k
/*
* Leave lazy mode, flushing any hypercalls made here.
* This must be done before restoring TLS segments so
-diff -Nur linux-4.1.10.orig/arch/x86/kernel/signal.c linux-4.1.10/arch/x86/kernel/signal.c
---- linux-4.1.10.orig/arch/x86/kernel/signal.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/x86/kernel/signal.c 2015-10-12 22:33:32.224680189 +0200
+diff -Nur linux-4.1.13.orig/arch/x86/kernel/signal.c linux-4.1.13/arch/x86/kernel/signal.c
+--- linux-4.1.13.orig/arch/x86/kernel/signal.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/x86/kernel/signal.c 2015-11-29 09:23:09.529619496 +0100
@@ -723,6 +723,14 @@
{
user_exit();
@@ -4006,9 +4090,9 @@ diff -Nur linux-4.1.10.orig/arch/x86/kernel/signal.c linux-4.1.10/arch/x86/kerne
if (thread_info_flags & _TIF_UPROBE)
uprobe_notify_resume(regs);
-diff -Nur linux-4.1.10.orig/arch/x86/kernel/traps.c linux-4.1.10/arch/x86/kernel/traps.c
---- linux-4.1.10.orig/arch/x86/kernel/traps.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/x86/kernel/traps.c 2015-10-12 22:33:32.224680189 +0200
+diff -Nur linux-4.1.13.orig/arch/x86/kernel/traps.c linux-4.1.13/arch/x86/kernel/traps.c
+--- linux-4.1.13.orig/arch/x86/kernel/traps.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/x86/kernel/traps.c 2015-11-29 09:23:09.529619496 +0100
@@ -88,9 +88,21 @@
local_irq_enable();
}
@@ -4083,9 +4167,9 @@ diff -Nur linux-4.1.10.orig/arch/x86/kernel/traps.c linux-4.1.10/arch/x86/kernel
debug_stack_usage_dec();
exit:
-diff -Nur linux-4.1.10.orig/arch/x86/kvm/lapic.c linux-4.1.10/arch/x86/kvm/lapic.c
---- linux-4.1.10.orig/arch/x86/kvm/lapic.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/x86/kvm/lapic.c 2015-10-12 22:33:32.224680189 +0200
+diff -Nur linux-4.1.13.orig/arch/x86/kvm/lapic.c linux-4.1.13/arch/x86/kvm/lapic.c
+--- linux-4.1.13.orig/arch/x86/kvm/lapic.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/x86/kvm/lapic.c 2015-11-29 09:23:09.529619496 +0100
@@ -1104,7 +1104,7 @@
static void apic_timer_expired(struct kvm_lapic *apic)
{
@@ -4186,9 +4270,9 @@ diff -Nur linux-4.1.10.orig/arch/x86/kvm/lapic.c linux-4.1.10/arch/x86/kvm/lapic
}
/*
-diff -Nur linux-4.1.10.orig/arch/x86/kvm/x86.c linux-4.1.10/arch/x86/kvm/x86.c
---- linux-4.1.10.orig/arch/x86/kvm/x86.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/x86/kvm/x86.c 2015-10-12 22:33:32.228679925 +0200
+diff -Nur linux-4.1.13.orig/arch/x86/kvm/x86.c linux-4.1.13/arch/x86/kvm/x86.c
+--- linux-4.1.13.orig/arch/x86/kvm/x86.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/x86/kvm/x86.c 2015-11-29 09:23:09.529619496 +0100
@@ -5813,6 +5813,13 @@
goto out;
}
@@ -4203,9 +4287,9 @@ diff -Nur linux-4.1.10.orig/arch/x86/kvm/x86.c linux-4.1.10/arch/x86/kvm/x86.c
r = kvm_mmu_module_init();
if (r)
goto out_free_percpu;
-diff -Nur linux-4.1.10.orig/arch/x86/lib/usercopy_32.c linux-4.1.10/arch/x86/lib/usercopy_32.c
---- linux-4.1.10.orig/arch/x86/lib/usercopy_32.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/x86/lib/usercopy_32.c 2015-10-12 22:33:32.228679925 +0200
+diff -Nur linux-4.1.13.orig/arch/x86/lib/usercopy_32.c linux-4.1.13/arch/x86/lib/usercopy_32.c
+--- linux-4.1.13.orig/arch/x86/lib/usercopy_32.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/x86/lib/usercopy_32.c 2015-11-29 09:23:09.533619230 +0100
@@ -647,7 +647,8 @@
* @from: Source address, in kernel space.
* @n: Number of bytes to copy.
@@ -4226,9 +4310,9 @@ diff -Nur linux-4.1.10.orig/arch/x86/lib/usercopy_32.c linux-4.1.10/arch/x86/lib
*
* Copy data from user space to kernel space.
*
-diff -Nur linux-4.1.10.orig/arch/x86/mm/fault.c linux-4.1.10/arch/x86/mm/fault.c
---- linux-4.1.10.orig/arch/x86/mm/fault.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/x86/mm/fault.c 2015-10-12 22:33:32.228679925 +0200
+diff -Nur linux-4.1.13.orig/arch/x86/mm/fault.c linux-4.1.13/arch/x86/mm/fault.c
+--- linux-4.1.13.orig/arch/x86/mm/fault.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/x86/mm/fault.c 2015-11-29 09:23:09.533619230 +0100
@@ -13,6 +13,7 @@
#include <linux/hugetlb.h> /* hstate_index_to_shift */
#include <linux/prefetch.h> /* prefetchw */
@@ -4249,9 +4333,9 @@ diff -Nur linux-4.1.10.orig/arch/x86/mm/fault.c linux-4.1.10/arch/x86/mm/fault.c
bad_area_nosemaphore(regs, error_code, address);
return;
}
-diff -Nur linux-4.1.10.orig/arch/x86/mm/highmem_32.c linux-4.1.10/arch/x86/mm/highmem_32.c
---- linux-4.1.10.orig/arch/x86/mm/highmem_32.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/x86/mm/highmem_32.c 2015-10-12 22:33:32.228679925 +0200
+diff -Nur linux-4.1.13.orig/arch/x86/mm/highmem_32.c linux-4.1.13/arch/x86/mm/highmem_32.c
+--- linux-4.1.13.orig/arch/x86/mm/highmem_32.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/x86/mm/highmem_32.c 2015-11-29 09:23:09.533619230 +0100
@@ -32,10 +32,11 @@
*/
void *kmap_atomic_prot(struct page *page, pgprot_t prot)
@@ -4295,9 +4379,9 @@ diff -Nur linux-4.1.10.orig/arch/x86/mm/highmem_32.c linux-4.1.10/arch/x86/mm/hi
}
EXPORT_SYMBOL(__kunmap_atomic);
-diff -Nur linux-4.1.10.orig/arch/x86/mm/iomap_32.c linux-4.1.10/arch/x86/mm/iomap_32.c
---- linux-4.1.10.orig/arch/x86/mm/iomap_32.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/x86/mm/iomap_32.c 2015-10-12 22:33:32.228679925 +0200
+diff -Nur linux-4.1.13.orig/arch/x86/mm/iomap_32.c linux-4.1.13/arch/x86/mm/iomap_32.c
+--- linux-4.1.13.orig/arch/x86/mm/iomap_32.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/x86/mm/iomap_32.c 2015-11-29 09:23:09.533619230 +0100
@@ -56,15 +56,22 @@
void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot)
@@ -4337,9 +4421,9 @@ diff -Nur linux-4.1.10.orig/arch/x86/mm/iomap_32.c linux-4.1.10/arch/x86/mm/ioma
+ preempt_enable();
}
EXPORT_SYMBOL_GPL(iounmap_atomic);
-diff -Nur linux-4.1.10.orig/arch/x86/platform/uv/tlb_uv.c linux-4.1.10/arch/x86/platform/uv/tlb_uv.c
---- linux-4.1.10.orig/arch/x86/platform/uv/tlb_uv.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/x86/platform/uv/tlb_uv.c 2015-10-12 22:33:32.228679925 +0200
+diff -Nur linux-4.1.13.orig/arch/x86/platform/uv/tlb_uv.c linux-4.1.13/arch/x86/platform/uv/tlb_uv.c
+--- linux-4.1.13.orig/arch/x86/platform/uv/tlb_uv.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/x86/platform/uv/tlb_uv.c 2015-11-29 09:23:09.533619230 +0100
@@ -714,9 +714,9 @@
quiesce_local_uvhub(hmaster);
@@ -4426,9 +4510,9 @@ diff -Nur linux-4.1.10.orig/arch/x86/platform/uv/tlb_uv.c linux-4.1.10/arch/x86/
}
}
-diff -Nur linux-4.1.10.orig/arch/x86/platform/uv/uv_time.c linux-4.1.10/arch/x86/platform/uv/uv_time.c
---- linux-4.1.10.orig/arch/x86/platform/uv/uv_time.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/x86/platform/uv/uv_time.c 2015-10-12 22:33:32.228679925 +0200
+diff -Nur linux-4.1.13.orig/arch/x86/platform/uv/uv_time.c linux-4.1.13/arch/x86/platform/uv/uv_time.c
+--- linux-4.1.13.orig/arch/x86/platform/uv/uv_time.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/x86/platform/uv/uv_time.c 2015-11-29 09:23:09.533619230 +0100
@@ -58,7 +58,7 @@
/* There is one of these allocated per node */
@@ -4509,9 +4593,9 @@ diff -Nur linux-4.1.10.orig/arch/x86/platform/uv/uv_time.c linux-4.1.10/arch/x86
}
/*
-diff -Nur linux-4.1.10.orig/arch/xtensa/mm/fault.c linux-4.1.10/arch/xtensa/mm/fault.c
---- linux-4.1.10.orig/arch/xtensa/mm/fault.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/xtensa/mm/fault.c 2015-10-12 22:33:32.228679925 +0200
+diff -Nur linux-4.1.13.orig/arch/xtensa/mm/fault.c linux-4.1.13/arch/xtensa/mm/fault.c
+--- linux-4.1.13.orig/arch/xtensa/mm/fault.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/xtensa/mm/fault.c 2015-11-29 09:23:09.533619230 +0100
@@ -15,10 +15,10 @@
#include <linux/mm.h>
#include <linux/module.h>
@@ -4533,9 +4617,9 @@ diff -Nur linux-4.1.10.orig/arch/xtensa/mm/fault.c linux-4.1.10/arch/xtensa/mm/f
bad_page_fault(regs, address, SIGSEGV);
return;
}
-diff -Nur linux-4.1.10.orig/arch/xtensa/mm/highmem.c linux-4.1.10/arch/xtensa/mm/highmem.c
---- linux-4.1.10.orig/arch/xtensa/mm/highmem.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/arch/xtensa/mm/highmem.c 2015-10-12 22:33:32.228679925 +0200
+diff -Nur linux-4.1.13.orig/arch/xtensa/mm/highmem.c linux-4.1.13/arch/xtensa/mm/highmem.c
+--- linux-4.1.13.orig/arch/xtensa/mm/highmem.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/arch/xtensa/mm/highmem.c 2015-11-29 09:23:09.533619230 +0100
@@ -42,6 +42,7 @@
enum fixed_addresses idx;
unsigned long vaddr;
@@ -4552,9 +4636,9 @@ diff -Nur linux-4.1.10.orig/arch/xtensa/mm/highmem.c linux-4.1.10/arch/xtensa/mm
}
EXPORT_SYMBOL(__kunmap_atomic);
-diff -Nur linux-4.1.10.orig/block/blk-core.c linux-4.1.10/block/blk-core.c
---- linux-4.1.10.orig/block/blk-core.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/block/blk-core.c 2015-10-12 22:33:32.228679925 +0200
+diff -Nur linux-4.1.13.orig/block/blk-core.c linux-4.1.13/block/blk-core.c
+--- linux-4.1.13.orig/block/blk-core.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/block/blk-core.c 2015-11-29 09:23:09.533619230 +0100
@@ -100,6 +100,9 @@
INIT_LIST_HEAD(&rq->queuelist);
@@ -4630,9 +4714,9 @@ diff -Nur linux-4.1.10.orig/block/blk-core.c linux-4.1.10/block/blk-core.c
}
void blk_finish_plug(struct blk_plug *plug)
-diff -Nur linux-4.1.10.orig/block/blk-ioc.c linux-4.1.10/block/blk-ioc.c
---- linux-4.1.10.orig/block/blk-ioc.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/block/blk-ioc.c 2015-10-12 22:33:32.228679925 +0200
+diff -Nur linux-4.1.13.orig/block/blk-ioc.c linux-4.1.13/block/blk-ioc.c
+--- linux-4.1.13.orig/block/blk-ioc.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/block/blk-ioc.c 2015-11-29 09:23:09.533619230 +0100
@@ -7,6 +7,7 @@
#include <linux/bio.h>
#include <linux/blkdev.h>
@@ -4659,9 +4743,9 @@ diff -Nur linux-4.1.10.orig/block/blk-ioc.c linux-4.1.10/block/blk-ioc.c
goto retry;
}
}
-diff -Nur linux-4.1.10.orig/block/blk-iopoll.c linux-4.1.10/block/blk-iopoll.c
---- linux-4.1.10.orig/block/blk-iopoll.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/block/blk-iopoll.c 2015-10-12 22:33:32.228679925 +0200
+diff -Nur linux-4.1.13.orig/block/blk-iopoll.c linux-4.1.13/block/blk-iopoll.c
+--- linux-4.1.13.orig/block/blk-iopoll.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/block/blk-iopoll.c 2015-11-29 09:23:09.533619230 +0100
@@ -35,6 +35,7 @@
list_add_tail(&iop->list, this_cpu_ptr(&blk_cpu_iopoll));
__raise_softirq_irqoff(BLOCK_IOPOLL_SOFTIRQ);
@@ -4686,9 +4770,9 @@ diff -Nur linux-4.1.10.orig/block/blk-iopoll.c linux-4.1.10/block/blk-iopoll.c
}
return NOTIFY_OK;
-diff -Nur linux-4.1.10.orig/block/blk-mq.c linux-4.1.10/block/blk-mq.c
---- linux-4.1.10.orig/block/blk-mq.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/block/blk-mq.c 2015-10-12 22:33:32.228679925 +0200
+diff -Nur linux-4.1.13.orig/block/blk-mq.c linux-4.1.13/block/blk-mq.c
+--- linux-4.1.13.orig/block/blk-mq.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/block/blk-mq.c 2015-11-29 09:23:09.533619230 +0100
@@ -88,7 +88,7 @@
if (!(gfp & __GFP_WAIT))
return -EBUSY;
@@ -4824,9 +4908,9 @@ diff -Nur linux-4.1.10.orig/block/blk-mq.c linux-4.1.10/block/blk-mq.c
return blk_mq_hctx_cpu_offline(hctx, cpu);
/*
-diff -Nur linux-4.1.10.orig/block/blk-mq-cpu.c linux-4.1.10/block/blk-mq-cpu.c
---- linux-4.1.10.orig/block/blk-mq-cpu.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/block/blk-mq-cpu.c 2015-10-12 22:33:32.228679925 +0200
+diff -Nur linux-4.1.13.orig/block/blk-mq-cpu.c linux-4.1.13/block/blk-mq-cpu.c
+--- linux-4.1.13.orig/block/blk-mq-cpu.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/block/blk-mq-cpu.c 2015-11-29 09:23:09.533619230 +0100
@@ -16,7 +16,7 @@
#include "blk-mq.h"
@@ -4878,9 +4962,9 @@ diff -Nur linux-4.1.10.orig/block/blk-mq-cpu.c linux-4.1.10/block/blk-mq-cpu.c
}
void blk_mq_init_cpu_notifier(struct blk_mq_cpu_notifier *notifier,
-diff -Nur linux-4.1.10.orig/block/blk-mq.h linux-4.1.10/block/blk-mq.h
---- linux-4.1.10.orig/block/blk-mq.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/block/blk-mq.h 2015-10-12 22:33:32.228679925 +0200
+diff -Nur linux-4.1.13.orig/block/blk-mq.h linux-4.1.13/block/blk-mq.h
+--- linux-4.1.13.orig/block/blk-mq.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/block/blk-mq.h 2015-11-29 09:23:09.533619230 +0100
@@ -76,7 +76,10 @@
static inline struct blk_mq_ctx *__blk_mq_get_ctx(struct request_queue *q,
unsigned int cpu)
@@ -4908,9 +4992,9 @@ diff -Nur linux-4.1.10.orig/block/blk-mq.h linux-4.1.10/block/blk-mq.h
}
struct blk_mq_alloc_data {
-diff -Nur linux-4.1.10.orig/block/blk-softirq.c linux-4.1.10/block/blk-softirq.c
---- linux-4.1.10.orig/block/blk-softirq.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/block/blk-softirq.c 2015-10-12 22:33:32.228679925 +0200
+diff -Nur linux-4.1.13.orig/block/blk-softirq.c linux-4.1.13/block/blk-softirq.c
+--- linux-4.1.13.orig/block/blk-softirq.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/block/blk-softirq.c 2015-11-29 09:23:09.533619230 +0100
@@ -51,6 +51,7 @@
raise_softirq_irqoff(BLOCK_SOFTIRQ);
@@ -4935,9 +5019,9 @@ diff -Nur linux-4.1.10.orig/block/blk-softirq.c linux-4.1.10/block/blk-softirq.c
}
/**
-diff -Nur linux-4.1.10.orig/block/bounce.c linux-4.1.10/block/bounce.c
---- linux-4.1.10.orig/block/bounce.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/block/bounce.c 2015-10-12 22:33:32.228679925 +0200
+diff -Nur linux-4.1.13.orig/block/bounce.c linux-4.1.13/block/bounce.c
+--- linux-4.1.13.orig/block/bounce.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/block/bounce.c 2015-11-29 09:23:09.537618965 +0100
@@ -54,11 +54,11 @@
unsigned long flags;
unsigned char *vto;
@@ -4952,9 +5036,9 @@ diff -Nur linux-4.1.10.orig/block/bounce.c linux-4.1.10/block/bounce.c
}
#else /* CONFIG_HIGHMEM */
-diff -Nur linux-4.1.10.orig/crypto/algapi.c linux-4.1.10/crypto/algapi.c
---- linux-4.1.10.orig/crypto/algapi.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/crypto/algapi.c 2015-10-12 22:33:32.232679661 +0200
+diff -Nur linux-4.1.13.orig/crypto/algapi.c linux-4.1.13/crypto/algapi.c
+--- linux-4.1.13.orig/crypto/algapi.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/crypto/algapi.c 2015-11-29 09:23:09.537618965 +0100
@@ -695,13 +695,13 @@
int crypto_register_notifier(struct notifier_block *nb)
@@ -4971,9 +5055,9 @@ diff -Nur linux-4.1.10.orig/crypto/algapi.c linux-4.1.10/crypto/algapi.c
}
EXPORT_SYMBOL_GPL(crypto_unregister_notifier);
-diff -Nur linux-4.1.10.orig/crypto/api.c linux-4.1.10/crypto/api.c
---- linux-4.1.10.orig/crypto/api.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/crypto/api.c 2015-10-12 22:33:32.232679661 +0200
+diff -Nur linux-4.1.13.orig/crypto/api.c linux-4.1.13/crypto/api.c
+--- linux-4.1.13.orig/crypto/api.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/crypto/api.c 2015-11-29 09:23:09.537618965 +0100
@@ -31,7 +31,7 @@
DECLARE_RWSEM(crypto_alg_sem);
EXPORT_SYMBOL_GPL(crypto_alg_sem);
@@ -4996,9 +5080,9 @@ diff -Nur linux-4.1.10.orig/crypto/api.c linux-4.1.10/crypto/api.c
}
return ok;
-diff -Nur linux-4.1.10.orig/crypto/internal.h linux-4.1.10/crypto/internal.h
---- linux-4.1.10.orig/crypto/internal.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/crypto/internal.h 2015-10-12 22:33:32.232679661 +0200
+diff -Nur linux-4.1.13.orig/crypto/internal.h linux-4.1.13/crypto/internal.h
+--- linux-4.1.13.orig/crypto/internal.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/crypto/internal.h 2015-11-29 09:23:09.537618965 +0100
@@ -48,7 +48,7 @@
extern struct list_head crypto_alg_list;
@@ -5017,9 +5101,9 @@ diff -Nur linux-4.1.10.orig/crypto/internal.h linux-4.1.10/crypto/internal.h
}
#endif /* _CRYPTO_INTERNAL_H */
-diff -Nur linux-4.1.10.orig/Documentation/hwlat_detector.txt linux-4.1.10/Documentation/hwlat_detector.txt
---- linux-4.1.10.orig/Documentation/hwlat_detector.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.1.10/Documentation/hwlat_detector.txt 2015-10-12 22:33:32.232679661 +0200
+diff -Nur linux-4.1.13.orig/Documentation/hwlat_detector.txt linux-4.1.13/Documentation/hwlat_detector.txt
+--- linux-4.1.13.orig/Documentation/hwlat_detector.txt 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.13/Documentation/hwlat_detector.txt 2015-11-29 09:23:09.477622951 +0100
@@ -0,0 +1,64 @@
+Introduction:
+-------------
@@ -5085,9 +5169,9 @@ diff -Nur linux-4.1.10.orig/Documentation/hwlat_detector.txt linux-4.1.10/Docume
+observe any latencies that exceed the threshold (initially 100 usecs),
+then we write to a global sample ring buffer of 8K samples, which is
+consumed by reading from the "sample" (pipe) debugfs file interface.
-diff -Nur linux-4.1.10.orig/Documentation/sysrq.txt linux-4.1.10/Documentation/sysrq.txt
---- linux-4.1.10.orig/Documentation/sysrq.txt 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/Documentation/sysrq.txt 2015-10-12 22:33:32.232679661 +0200
+diff -Nur linux-4.1.13.orig/Documentation/sysrq.txt linux-4.1.13/Documentation/sysrq.txt
+--- linux-4.1.13.orig/Documentation/sysrq.txt 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/Documentation/sysrq.txt 2015-11-29 09:23:09.477622951 +0100
@@ -59,10 +59,17 @@
On other - If you know of the key combos for other architectures, please
let me know so I can add them to this section.
@@ -5108,9 +5192,9 @@ diff -Nur linux-4.1.10.orig/Documentation/sysrq.txt linux-4.1.10/Documentation/s
* What are the 'command' keys?
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
'b' - Will immediately reboot the system without syncing or unmounting
-diff -Nur linux-4.1.10.orig/Documentation/trace/histograms.txt linux-4.1.10/Documentation/trace/histograms.txt
---- linux-4.1.10.orig/Documentation/trace/histograms.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.1.10/Documentation/trace/histograms.txt 2015-10-12 22:33:32.232679661 +0200
+diff -Nur linux-4.1.13.orig/Documentation/trace/histograms.txt linux-4.1.13/Documentation/trace/histograms.txt
+--- linux-4.1.13.orig/Documentation/trace/histograms.txt 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.13/Documentation/trace/histograms.txt 2015-11-29 09:23:09.477622951 +0100
@@ -0,0 +1,186 @@
+ Using the Linux Kernel Latency Histograms
+
@@ -5298,9 +5382,9 @@ diff -Nur linux-4.1.10.orig/Documentation/trace/histograms.txt linux-4.1.10/Docu
+is provided.
+
+These data are also reset when the wakeup histogram is reset.
-diff -Nur linux-4.1.10.orig/drivers/acpi/acpica/acglobal.h linux-4.1.10/drivers/acpi/acpica/acglobal.h
---- linux-4.1.10.orig/drivers/acpi/acpica/acglobal.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/drivers/acpi/acpica/acglobal.h 2015-10-12 22:33:32.232679661 +0200
+diff -Nur linux-4.1.13.orig/drivers/acpi/acpica/acglobal.h linux-4.1.13/drivers/acpi/acpica/acglobal.h
+--- linux-4.1.13.orig/drivers/acpi/acpica/acglobal.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/drivers/acpi/acpica/acglobal.h 2015-11-29 09:23:09.537618965 +0100
@@ -112,7 +112,7 @@
* interrupt level
*/
@@ -5310,9 +5394,9 @@ diff -Nur linux-4.1.10.orig/drivers/acpi/acpica/acglobal.h linux-4.1.10/drivers/
ACPI_GLOBAL(acpi_spinlock, acpi_gbl_reference_count_lock);
/* Mutex for _OSI support */
-diff -Nur linux-4.1.10.orig/drivers/acpi/acpica/hwregs.c linux-4.1.10/drivers/acpi/acpica/hwregs.c
---- linux-4.1.10.orig/drivers/acpi/acpica/hwregs.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/drivers/acpi/acpica/hwregs.c 2015-10-12 22:33:32.232679661 +0200
+diff -Nur linux-4.1.13.orig/drivers/acpi/acpica/hwregs.c linux-4.1.13/drivers/acpi/acpica/hwregs.c
+--- linux-4.1.13.orig/drivers/acpi/acpica/hwregs.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/drivers/acpi/acpica/hwregs.c 2015-11-29 09:23:09.537618965 +0100
@@ -269,14 +269,14 @@
ACPI_BITMASK_ALL_FIXED_STATUS,
ACPI_FORMAT_UINT64(acpi_gbl_xpm1a_status.address)));
@@ -5330,9 +5414,9 @@ diff -Nur linux-4.1.10.orig/drivers/acpi/acpica/hwregs.c linux-4.1.10/drivers/ac
if (ACPI_FAILURE(status)) {
goto exit;
-diff -Nur linux-4.1.10.orig/drivers/acpi/acpica/hwxface.c linux-4.1.10/drivers/acpi/acpica/hwxface.c
---- linux-4.1.10.orig/drivers/acpi/acpica/hwxface.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/drivers/acpi/acpica/hwxface.c 2015-10-12 22:33:32.232679661 +0200
+diff -Nur linux-4.1.13.orig/drivers/acpi/acpica/hwxface.c linux-4.1.13/drivers/acpi/acpica/hwxface.c
+--- linux-4.1.13.orig/drivers/acpi/acpica/hwxface.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/drivers/acpi/acpica/hwxface.c 2015-11-29 09:23:09.537618965 +0100
@@ -374,7 +374,7 @@
return_ACPI_STATUS(AE_BAD_PARAMETER);
}
@@ -5351,9 +5435,9 @@ diff -Nur linux-4.1.10.orig/drivers/acpi/acpica/hwxface.c linux-4.1.10/drivers/a
return_ACPI_STATUS(status);
}
-diff -Nur linux-4.1.10.orig/drivers/acpi/acpica/utmutex.c linux-4.1.10/drivers/acpi/acpica/utmutex.c
---- linux-4.1.10.orig/drivers/acpi/acpica/utmutex.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/drivers/acpi/acpica/utmutex.c 2015-10-12 22:33:32.232679661 +0200
+diff -Nur linux-4.1.13.orig/drivers/acpi/acpica/utmutex.c linux-4.1.13/drivers/acpi/acpica/utmutex.c
+--- linux-4.1.13.orig/drivers/acpi/acpica/utmutex.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/drivers/acpi/acpica/utmutex.c 2015-11-29 09:23:09.537618965 +0100
@@ -88,7 +88,7 @@
return_ACPI_STATUS (status);
}
@@ -5372,9 +5456,9 @@ diff -Nur linux-4.1.10.orig/drivers/acpi/acpica/utmutex.c linux-4.1.10/drivers/a
acpi_os_delete_lock(acpi_gbl_reference_count_lock);
/* Delete the reader/writer lock */
-diff -Nur linux-4.1.10.orig/drivers/ata/libata-sff.c linux-4.1.10/drivers/ata/libata-sff.c
---- linux-4.1.10.orig/drivers/ata/libata-sff.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/drivers/ata/libata-sff.c 2015-10-12 22:33:32.232679661 +0200
+diff -Nur linux-4.1.13.orig/drivers/ata/libata-sff.c linux-4.1.13/drivers/ata/libata-sff.c
+--- linux-4.1.13.orig/drivers/ata/libata-sff.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/drivers/ata/libata-sff.c 2015-11-29 09:23:09.537618965 +0100
@@ -678,9 +678,9 @@
unsigned long flags;
unsigned int consumed;
@@ -5423,9 +5507,9 @@ diff -Nur linux-4.1.10.orig/drivers/ata/libata-sff.c linux-4.1.10/drivers/ata/li
} else {
buf = page_address(page);
consumed = ap->ops->sff_data_xfer(dev, buf + offset,
-diff -Nur linux-4.1.10.orig/drivers/char/random.c linux-4.1.10/drivers/char/random.c
---- linux-4.1.10.orig/drivers/char/random.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/drivers/char/random.c 2015-10-12 22:33:32.232679661 +0200
+diff -Nur linux-4.1.13.orig/drivers/char/random.c linux-4.1.13/drivers/char/random.c
+--- linux-4.1.13.orig/drivers/char/random.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/drivers/char/random.c 2015-11-29 09:23:09.537618965 +0100
@@ -776,8 +776,6 @@
} sample;
long delta, delta2, delta3;
@@ -5477,9 +5561,9 @@ diff -Nur linux-4.1.10.orig/drivers/char/random.c linux-4.1.10/drivers/char/rand
fast_mix(fast_pool);
add_interrupt_bench(cycles);
-diff -Nur linux-4.1.10.orig/drivers/clocksource/tcb_clksrc.c linux-4.1.10/drivers/clocksource/tcb_clksrc.c
---- linux-4.1.10.orig/drivers/clocksource/tcb_clksrc.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/drivers/clocksource/tcb_clksrc.c 2015-10-12 22:33:32.232679661 +0200
+diff -Nur linux-4.1.13.orig/drivers/clocksource/tcb_clksrc.c linux-4.1.13/drivers/clocksource/tcb_clksrc.c
+--- linux-4.1.13.orig/drivers/clocksource/tcb_clksrc.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/drivers/clocksource/tcb_clksrc.c 2015-11-29 09:23:09.537618965 +0100
@@ -23,8 +23,7 @@
* this 32 bit free-running counter. the second channel is not used.
*
@@ -5594,9 +5678,9 @@ diff -Nur linux-4.1.10.orig/drivers/clocksource/tcb_clksrc.c linux-4.1.10/driver
if (ret)
goto err_unregister_clksrc;
-diff -Nur linux-4.1.10.orig/drivers/clocksource/timer-atmel-pit.c linux-4.1.10/drivers/clocksource/timer-atmel-pit.c
---- linux-4.1.10.orig/drivers/clocksource/timer-atmel-pit.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/drivers/clocksource/timer-atmel-pit.c 2015-10-12 22:33:32.232679661 +0200
+diff -Nur linux-4.1.13.orig/drivers/clocksource/timer-atmel-pit.c linux-4.1.13/drivers/clocksource/timer-atmel-pit.c
+--- linux-4.1.13.orig/drivers/clocksource/timer-atmel-pit.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/drivers/clocksource/timer-atmel-pit.c 2015-11-29 09:23:09.537618965 +0100
@@ -90,6 +90,7 @@
return elapsed;
}
@@ -5622,9 +5706,9 @@ diff -Nur linux-4.1.10.orig/drivers/clocksource/timer-atmel-pit.c linux-4.1.10/d
break;
case CLOCK_EVT_MODE_RESUME:
break;
-diff -Nur linux-4.1.10.orig/drivers/clocksource/timer-atmel-st.c linux-4.1.10/drivers/clocksource/timer-atmel-st.c
---- linux-4.1.10.orig/drivers/clocksource/timer-atmel-st.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/drivers/clocksource/timer-atmel-st.c 2015-10-12 22:33:32.232679661 +0200
+diff -Nur linux-4.1.13.orig/drivers/clocksource/timer-atmel-st.c linux-4.1.13/drivers/clocksource/timer-atmel-st.c
+--- linux-4.1.13.orig/drivers/clocksource/timer-atmel-st.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/drivers/clocksource/timer-atmel-st.c 2015-11-29 09:23:09.537618965 +0100
@@ -131,6 +131,7 @@
break;
case CLOCK_EVT_MODE_SHUTDOWN:
@@ -5633,9 +5717,9 @@ diff -Nur linux-4.1.10.orig/drivers/clocksource/timer-atmel-st.c linux-4.1.10/dr
case CLOCK_EVT_MODE_RESUME:
irqmask = 0;
break;
-diff -Nur linux-4.1.10.orig/drivers/cpufreq/cpufreq.c linux-4.1.10/drivers/cpufreq/cpufreq.c
---- linux-4.1.10.orig/drivers/cpufreq/cpufreq.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/drivers/cpufreq/cpufreq.c 2015-10-12 22:33:32.232679661 +0200
+diff -Nur linux-4.1.13.orig/drivers/cpufreq/cpufreq.c linux-4.1.13/drivers/cpufreq/cpufreq.c
+--- linux-4.1.13.orig/drivers/cpufreq/cpufreq.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/drivers/cpufreq/cpufreq.c 2015-11-29 09:23:09.545618436 +0100
@@ -64,12 +64,6 @@
return cpufreq_driver->target_index || cpufreq_driver->target;
}
@@ -5772,9 +5856,9 @@ diff -Nur linux-4.1.10.orig/drivers/cpufreq/cpufreq.c linux-4.1.10/drivers/cpufr
return 0;
}
-diff -Nur linux-4.1.10.orig/drivers/cpufreq/Kconfig.x86 linux-4.1.10/drivers/cpufreq/Kconfig.x86
---- linux-4.1.10.orig/drivers/cpufreq/Kconfig.x86 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/drivers/cpufreq/Kconfig.x86 2015-10-12 22:33:32.232679661 +0200
+diff -Nur linux-4.1.13.orig/drivers/cpufreq/Kconfig.x86 linux-4.1.13/drivers/cpufreq/Kconfig.x86
+--- linux-4.1.13.orig/drivers/cpufreq/Kconfig.x86 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/drivers/cpufreq/Kconfig.x86 2015-11-29 09:23:09.545618436 +0100
@@ -123,7 +123,7 @@
config X86_POWERNOW_K8
@@ -5784,9 +5868,9 @@ diff -Nur linux-4.1.10.orig/drivers/cpufreq/Kconfig.x86 linux-4.1.10/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.1.10.orig/drivers/gpio/gpio-omap.c linux-4.1.10/drivers/gpio/gpio-omap.c
---- linux-4.1.10.orig/drivers/gpio/gpio-omap.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/drivers/gpio/gpio-omap.c 2015-10-12 22:33:32.236679397 +0200
+diff -Nur linux-4.1.13.orig/drivers/gpio/gpio-omap.c linux-4.1.13/drivers/gpio/gpio-omap.c
+--- linux-4.1.13.orig/drivers/gpio/gpio-omap.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/drivers/gpio/gpio-omap.c 2015-11-29 09:23:09.545618436 +0100
@@ -57,7 +57,7 @@
u32 saved_datain;
u32 level_mask;
@@ -6067,9 +6151,9 @@ diff -Nur linux-4.1.10.orig/drivers/gpio/gpio-omap.c linux-4.1.10/drivers/gpio/g
return 0;
}
-diff -Nur linux-4.1.10.orig/drivers/gpu/drm/i915/i915_gem_execbuffer.c linux-4.1.10/drivers/gpu/drm/i915/i915_gem_execbuffer.c
---- linux-4.1.10.orig/drivers/gpu/drm/i915/i915_gem_execbuffer.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/drivers/gpu/drm/i915/i915_gem_execbuffer.c 2015-10-12 22:33:32.236679397 +0200
+diff -Nur linux-4.1.13.orig/drivers/gpu/drm/i915/i915_gem_execbuffer.c linux-4.1.13/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+--- linux-4.1.13.orig/drivers/gpu/drm/i915/i915_gem_execbuffer.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/drivers/gpu/drm/i915/i915_gem_execbuffer.c 2015-11-29 09:23:09.545618436 +0100
@@ -32,6 +32,7 @@
#include "i915_trace.h"
#include "intel_drv.h"
@@ -6097,9 +6181,9 @@ diff -Nur linux-4.1.10.orig/drivers/gpu/drm/i915/i915_gem_execbuffer.c linux-4.1
i915_gem_execbuffer_move_to_active(vmas, ring);
i915_gem_execbuffer_retire_commands(dev, file, ring, batch_obj);
-diff -Nur linux-4.1.10.orig/drivers/gpu/drm/i915/i915_gem_shrinker.c linux-4.1.10/drivers/gpu/drm/i915/i915_gem_shrinker.c
---- linux-4.1.10.orig/drivers/gpu/drm/i915/i915_gem_shrinker.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/drivers/gpu/drm/i915/i915_gem_shrinker.c 2015-10-12 22:33:32.236679397 +0200
+diff -Nur linux-4.1.13.orig/drivers/gpu/drm/i915/i915_gem_shrinker.c linux-4.1.13/drivers/gpu/drm/i915/i915_gem_shrinker.c
+--- linux-4.1.13.orig/drivers/gpu/drm/i915/i915_gem_shrinker.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/drivers/gpu/drm/i915/i915_gem_shrinker.c 2015-11-29 09:23:09.545618436 +0100
@@ -39,7 +39,7 @@
if (!mutex_is_locked(mutex))
return false;
@@ -6109,10 +6193,10 @@ diff -Nur linux-4.1.10.orig/drivers/gpu/drm/i915/i915_gem_shrinker.c linux-4.1.1
return mutex->owner == task;
#else
/* Since UP may be pre-empted, we cannot assume that we own the lock */
-diff -Nur linux-4.1.10.orig/drivers/gpu/drm/i915/intel_display.c linux-4.1.10/drivers/gpu/drm/i915/intel_display.c
---- linux-4.1.10.orig/drivers/gpu/drm/i915/intel_display.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/drivers/gpu/drm/i915/intel_display.c 2015-10-12 22:33:32.236679397 +0200
-@@ -10086,7 +10086,7 @@
+diff -Nur linux-4.1.13.orig/drivers/gpu/drm/i915/intel_display.c linux-4.1.13/drivers/gpu/drm/i915/intel_display.c
+--- linux-4.1.13.orig/drivers/gpu/drm/i915/intel_display.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/drivers/gpu/drm/i915/intel_display.c 2015-11-29 09:23:09.549618170 +0100
+@@ -10088,7 +10088,7 @@
struct drm_crtc *crtc = dev_priv->pipe_to_crtc_mapping[pipe];
struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
@@ -6121,9 +6205,9 @@ diff -Nur linux-4.1.10.orig/drivers/gpu/drm/i915/intel_display.c linux-4.1.10/dr
if (crtc == NULL)
return;
-diff -Nur linux-4.1.10.orig/drivers/i2c/busses/i2c-omap.c linux-4.1.10/drivers/i2c/busses/i2c-omap.c
---- linux-4.1.10.orig/drivers/i2c/busses/i2c-omap.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/drivers/i2c/busses/i2c-omap.c 2015-10-12 22:33:32.244678868 +0200
+diff -Nur linux-4.1.13.orig/drivers/i2c/busses/i2c-omap.c linux-4.1.13/drivers/i2c/busses/i2c-omap.c
+--- linux-4.1.13.orig/drivers/i2c/busses/i2c-omap.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/drivers/i2c/busses/i2c-omap.c 2015-11-29 09:23:09.549618170 +0100
@@ -996,15 +996,12 @@
u16 mask;
u16 stat;
@@ -6141,9 +6225,9 @@ diff -Nur linux-4.1.10.orig/drivers/i2c/busses/i2c-omap.c linux-4.1.10/drivers/i
return ret;
}
-diff -Nur linux-4.1.10.orig/drivers/ide/alim15x3.c linux-4.1.10/drivers/ide/alim15x3.c
---- linux-4.1.10.orig/drivers/ide/alim15x3.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/drivers/ide/alim15x3.c 2015-10-12 22:33:32.244678868 +0200
+diff -Nur linux-4.1.13.orig/drivers/ide/alim15x3.c linux-4.1.13/drivers/ide/alim15x3.c
+--- linux-4.1.13.orig/drivers/ide/alim15x3.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/drivers/ide/alim15x3.c 2015-11-29 09:23:09.549618170 +0100
@@ -234,7 +234,7 @@
isa_dev = pci_get_device(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1533, NULL);
@@ -6162,9 +6246,9 @@ diff -Nur linux-4.1.10.orig/drivers/ide/alim15x3.c linux-4.1.10/drivers/ide/alim
return 0;
}
-diff -Nur linux-4.1.10.orig/drivers/ide/hpt366.c linux-4.1.10/drivers/ide/hpt366.c
---- linux-4.1.10.orig/drivers/ide/hpt366.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/drivers/ide/hpt366.c 2015-10-12 22:33:32.244678868 +0200
+diff -Nur linux-4.1.13.orig/drivers/ide/hpt366.c linux-4.1.13/drivers/ide/hpt366.c
+--- linux-4.1.13.orig/drivers/ide/hpt366.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/drivers/ide/hpt366.c 2015-11-29 09:23:09.557617634 +0100
@@ -1241,7 +1241,7 @@
dma_old = inb(base + 2);
@@ -6183,9 +6267,9 @@ diff -Nur linux-4.1.10.orig/drivers/ide/hpt366.c linux-4.1.10/drivers/ide/hpt366
printk(KERN_INFO " %s: BM-DMA at 0x%04lx-0x%04lx\n",
hwif->name, base, base + 7);
-diff -Nur linux-4.1.10.orig/drivers/ide/ide-io.c linux-4.1.10/drivers/ide/ide-io.c
---- linux-4.1.10.orig/drivers/ide/ide-io.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/drivers/ide/ide-io.c 2015-10-12 22:33:32.244678868 +0200
+diff -Nur linux-4.1.13.orig/drivers/ide/ide-io.c linux-4.1.13/drivers/ide/ide-io.c
+--- linux-4.1.13.orig/drivers/ide/ide-io.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/drivers/ide/ide-io.c 2015-11-29 09:23:09.557617634 +0100
@@ -659,7 +659,7 @@
/* disable_irq_nosync ?? */
disable_irq(hwif->irq);
@@ -6195,9 +6279,9 @@ diff -Nur linux-4.1.10.orig/drivers/ide/ide-io.c linux-4.1.10/drivers/ide/ide-io
if (hwif->polling) {
startstop = handler(drive);
} else if (drive_is_ready(drive)) {
-diff -Nur linux-4.1.10.orig/drivers/ide/ide-iops.c linux-4.1.10/drivers/ide/ide-iops.c
---- linux-4.1.10.orig/drivers/ide/ide-iops.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/drivers/ide/ide-iops.c 2015-10-12 22:33:32.244678868 +0200
+diff -Nur linux-4.1.13.orig/drivers/ide/ide-iops.c linux-4.1.13/drivers/ide/ide-iops.c
+--- linux-4.1.13.orig/drivers/ide/ide-iops.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/drivers/ide/ide-iops.c 2015-11-29 09:23:09.557617634 +0100
@@ -129,12 +129,12 @@
if ((stat & ATA_BUSY) == 0)
break;
@@ -6213,9 +6297,9 @@ diff -Nur linux-4.1.10.orig/drivers/ide/ide-iops.c linux-4.1.10/drivers/ide/ide-
}
/*
* Allow status to settle, then read it again.
-diff -Nur linux-4.1.10.orig/drivers/ide/ide-io-std.c linux-4.1.10/drivers/ide/ide-io-std.c
---- linux-4.1.10.orig/drivers/ide/ide-io-std.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/drivers/ide/ide-io-std.c 2015-10-12 22:33:32.244678868 +0200
+diff -Nur linux-4.1.13.orig/drivers/ide/ide-io-std.c linux-4.1.13/drivers/ide/ide-io-std.c
+--- linux-4.1.13.orig/drivers/ide/ide-io-std.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/drivers/ide/ide-io-std.c 2015-11-29 09:23:09.557617634 +0100
@@ -175,7 +175,7 @@
unsigned long uninitialized_var(flags);
@@ -6252,9 +6336,9 @@ diff -Nur linux-4.1.10.orig/drivers/ide/ide-io-std.c linux-4.1.10/drivers/ide/id
if (((len + 1) & 3) < 2)
return;
-diff -Nur linux-4.1.10.orig/drivers/ide/ide-probe.c linux-4.1.10/drivers/ide/ide-probe.c
---- linux-4.1.10.orig/drivers/ide/ide-probe.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/drivers/ide/ide-probe.c 2015-10-12 22:33:32.244678868 +0200
+diff -Nur linux-4.1.13.orig/drivers/ide/ide-probe.c linux-4.1.13/drivers/ide/ide-probe.c
+--- linux-4.1.13.orig/drivers/ide/ide-probe.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/drivers/ide/ide-probe.c 2015-11-29 09:23:09.557617634 +0100
@@ -196,10 +196,10 @@
int bswap = 1;
@@ -6268,9 +6352,9 @@ diff -Nur linux-4.1.10.orig/drivers/ide/ide-probe.c linux-4.1.10/drivers/ide/ide
drive->dev_flags |= IDE_DFLAG_ID_READ;
#ifdef DEBUG
-diff -Nur linux-4.1.10.orig/drivers/ide/ide-taskfile.c linux-4.1.10/drivers/ide/ide-taskfile.c
---- linux-4.1.10.orig/drivers/ide/ide-taskfile.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/drivers/ide/ide-taskfile.c 2015-10-12 22:33:32.244678868 +0200
+diff -Nur linux-4.1.13.orig/drivers/ide/ide-taskfile.c linux-4.1.13/drivers/ide/ide-taskfile.c
+--- linux-4.1.13.orig/drivers/ide/ide-taskfile.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/drivers/ide/ide-taskfile.c 2015-11-29 09:23:09.557617634 +0100
@@ -250,7 +250,7 @@
page_is_high = PageHighMem(page);
@@ -6298,9 +6382,9 @@ diff -Nur linux-4.1.10.orig/drivers/ide/ide-taskfile.c linux-4.1.10/drivers/ide/
ide_set_handler(drive, &task_pio_intr, WAIT_WORSTCASE);
-diff -Nur linux-4.1.10.orig/drivers/infiniband/ulp/ipoib/ipoib_multicast.c linux-4.1.10/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
---- linux-4.1.10.orig/drivers/infiniband/ulp/ipoib/ipoib_multicast.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/drivers/infiniband/ulp/ipoib/ipoib_multicast.c 2015-10-12 22:33:32.244678868 +0200
+diff -Nur linux-4.1.13.orig/drivers/infiniband/ulp/ipoib/ipoib_multicast.c linux-4.1.13/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
+--- linux-4.1.13.orig/drivers/infiniband/ulp/ipoib/ipoib_multicast.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/drivers/infiniband/ulp/ipoib/ipoib_multicast.c 2015-11-29 09:23:09.557617634 +0100
@@ -821,7 +821,7 @@
ipoib_dbg_mcast(priv, "restarting multicast task\n");
@@ -6319,9 +6403,9 @@ diff -Nur linux-4.1.10.orig/drivers/infiniband/ulp/ipoib/ipoib_multicast.c linux
/*
* make sure the in-flight joins have finished before we attempt
-diff -Nur linux-4.1.10.orig/drivers/input/gameport/gameport.c linux-4.1.10/drivers/input/gameport/gameport.c
---- linux-4.1.10.orig/drivers/input/gameport/gameport.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/drivers/input/gameport/gameport.c 2015-10-12 22:33:32.244678868 +0200
+diff -Nur linux-4.1.13.orig/drivers/input/gameport/gameport.c linux-4.1.13/drivers/input/gameport/gameport.c
+--- linux-4.1.13.orig/drivers/input/gameport/gameport.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/drivers/input/gameport/gameport.c 2015-11-29 09:23:09.557617634 +0100
@@ -124,12 +124,12 @@
tx = 1 << 30;
@@ -6351,9 +6435,9 @@ diff -Nur linux-4.1.10.orig/drivers/input/gameport/gameport.c linux-4.1.10/drive
udelay(i * 10);
if (t2 - t1 < tx) tx = t2 - t1;
}
-diff -Nur linux-4.1.10.orig/drivers/leds/trigger/Kconfig linux-4.1.10/drivers/leds/trigger/Kconfig
---- linux-4.1.10.orig/drivers/leds/trigger/Kconfig 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/drivers/leds/trigger/Kconfig 2015-10-12 22:33:32.244678868 +0200
+diff -Nur linux-4.1.13.orig/drivers/leds/trigger/Kconfig linux-4.1.13/drivers/leds/trigger/Kconfig
+--- linux-4.1.13.orig/drivers/leds/trigger/Kconfig 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/drivers/leds/trigger/Kconfig 2015-11-29 09:23:09.557617634 +0100
@@ -61,7 +61,7 @@
config LEDS_TRIGGER_CPU
@@ -6363,9 +6447,9 @@ diff -Nur linux-4.1.10.orig/drivers/leds/trigger/Kconfig linux-4.1.10/drivers/le
help
This allows LEDs to be controlled by active CPUs. This shows
the active CPUs across an array of LEDs so you can see which
-diff -Nur linux-4.1.10.orig/drivers/md/bcache/Kconfig linux-4.1.10/drivers/md/bcache/Kconfig
---- linux-4.1.10.orig/drivers/md/bcache/Kconfig 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/drivers/md/bcache/Kconfig 2015-10-12 22:33:32.244678868 +0200
+diff -Nur linux-4.1.13.orig/drivers/md/bcache/Kconfig linux-4.1.13/drivers/md/bcache/Kconfig
+--- linux-4.1.13.orig/drivers/md/bcache/Kconfig 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/drivers/md/bcache/Kconfig 2015-11-29 09:23:09.557617634 +0100
@@ -1,6 +1,7 @@
config BCACHE
@@ -6374,9 +6458,9 @@ diff -Nur linux-4.1.10.orig/drivers/md/bcache/Kconfig linux-4.1.10/drivers/md/bc
---help---
Allows a block device to be used as cache for other devices; uses
a btree for indexing and the layout is optimized for SSDs.
-diff -Nur linux-4.1.10.orig/drivers/md/dm.c linux-4.1.10/drivers/md/dm.c
---- linux-4.1.10.orig/drivers/md/dm.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/drivers/md/dm.c 2015-10-12 22:33:32.244678868 +0200
+diff -Nur linux-4.1.13.orig/drivers/md/dm.c linux-4.1.13/drivers/md/dm.c
+--- linux-4.1.13.orig/drivers/md/dm.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/drivers/md/dm.c 2015-11-29 09:23:09.557617634 +0100
@@ -2132,7 +2132,7 @@
/* Establish tio->ti before queuing work (map_tio_request) */
tio->ti = ti;
@@ -6386,9 +6470,9 @@ diff -Nur linux-4.1.10.orig/drivers/md/dm.c linux-4.1.10/drivers/md/dm.c
}
goto out;
-diff -Nur linux-4.1.10.orig/drivers/md/raid5.c linux-4.1.10/drivers/md/raid5.c
---- linux-4.1.10.orig/drivers/md/raid5.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/drivers/md/raid5.c 2015-10-12 22:33:32.248678604 +0200
+diff -Nur linux-4.1.13.orig/drivers/md/raid5.c linux-4.1.13/drivers/md/raid5.c
+--- linux-4.1.13.orig/drivers/md/raid5.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/drivers/md/raid5.c 2015-11-29 09:23:09.561617368 +0100
@@ -1918,8 +1918,9 @@
struct raid5_percpu *percpu;
unsigned long cpu;
@@ -6410,7 +6494,7 @@ diff -Nur linux-4.1.10.orig/drivers/md/raid5.c linux-4.1.10/drivers/md/raid5.c
}
static struct stripe_head *alloc_stripe(struct kmem_cache *sc, gfp_t gfp)
-@@ -6361,6 +6363,7 @@
+@@ -6363,6 +6365,7 @@
__func__, cpu);
break;
}
@@ -6418,9 +6502,9 @@ diff -Nur linux-4.1.10.orig/drivers/md/raid5.c linux-4.1.10/drivers/md/raid5.c
}
put_online_cpus();
-diff -Nur linux-4.1.10.orig/drivers/md/raid5.h linux-4.1.10/drivers/md/raid5.h
---- linux-4.1.10.orig/drivers/md/raid5.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/drivers/md/raid5.h 2015-10-12 22:33:32.252678339 +0200
+diff -Nur linux-4.1.13.orig/drivers/md/raid5.h linux-4.1.13/drivers/md/raid5.h
+--- linux-4.1.13.orig/drivers/md/raid5.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/drivers/md/raid5.h 2015-11-29 09:23:09.561617368 +0100
@@ -495,6 +495,7 @@
int recovery_disabled;
/* per cpu variables */
@@ -6429,9 +6513,9 @@ diff -Nur linux-4.1.10.orig/drivers/md/raid5.h linux-4.1.10/drivers/md/raid5.h
struct page *spare_page; /* Used when checking P/Q in raid6 */
struct flex_array *scribble; /* space for constructing buffer
* lists and performing address
-diff -Nur linux-4.1.10.orig/drivers/misc/hwlat_detector.c linux-4.1.10/drivers/misc/hwlat_detector.c
---- linux-4.1.10.orig/drivers/misc/hwlat_detector.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.1.10/drivers/misc/hwlat_detector.c 2015-10-12 22:33:32.252678339 +0200
+diff -Nur linux-4.1.13.orig/drivers/misc/hwlat_detector.c linux-4.1.13/drivers/misc/hwlat_detector.c
+--- linux-4.1.13.orig/drivers/misc/hwlat_detector.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.13/drivers/misc/hwlat_detector.c 2015-11-29 09:23:09.561617368 +0100
@@ -0,0 +1,1240 @@
+/*
+ * hwlat_detector.c - A simple Hardware Latency detector.
@@ -7673,9 +7757,9 @@ diff -Nur linux-4.1.10.orig/drivers/misc/hwlat_detector.c linux-4.1.10/drivers/m
+
+module_init(detector_init);
+module_exit(detector_exit);
-diff -Nur linux-4.1.10.orig/drivers/misc/Kconfig linux-4.1.10/drivers/misc/Kconfig
---- linux-4.1.10.orig/drivers/misc/Kconfig 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/drivers/misc/Kconfig 2015-10-12 22:33:32.252678339 +0200
+diff -Nur linux-4.1.13.orig/drivers/misc/Kconfig linux-4.1.13/drivers/misc/Kconfig
+--- linux-4.1.13.orig/drivers/misc/Kconfig 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/drivers/misc/Kconfig 2015-11-29 09:23:09.561617368 +0100
@@ -54,6 +54,7 @@
config ATMEL_TCLIB
bool "Atmel AT32/AT91 Timer/Counter Library"
@@ -7746,9 +7830,9 @@ diff -Nur linux-4.1.10.orig/drivers/misc/Kconfig linux-4.1.10/drivers/misc/Kconf
config PHANTOM
tristate "Sensable PHANToM (PCI)"
depends on PCI
-diff -Nur linux-4.1.10.orig/drivers/misc/Makefile linux-4.1.10/drivers/misc/Makefile
---- linux-4.1.10.orig/drivers/misc/Makefile 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/drivers/misc/Makefile 2015-10-12 22:33:32.252678339 +0200
+diff -Nur linux-4.1.13.orig/drivers/misc/Makefile linux-4.1.13/drivers/misc/Makefile
+--- linux-4.1.13.orig/drivers/misc/Makefile 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/drivers/misc/Makefile 2015-11-29 09:23:09.561617368 +0100
@@ -38,6 +38,7 @@
obj-$(CONFIG_HMC6352) += hmc6352.o
obj-y += eeprom/
@@ -7757,9 +7841,9 @@ diff -Nur linux-4.1.10.orig/drivers/misc/Makefile linux-4.1.10/drivers/misc/Make
obj-$(CONFIG_SPEAR13XX_PCIE_GADGET) += spear13xx_pcie_gadget.o
obj-$(CONFIG_VMWARE_BALLOON) += vmw_balloon.o
obj-$(CONFIG_ARM_CHARLCD) += arm-charlcd.o
-diff -Nur linux-4.1.10.orig/drivers/mmc/host/mmci.c linux-4.1.10/drivers/mmc/host/mmci.c
---- linux-4.1.10.orig/drivers/mmc/host/mmci.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/drivers/mmc/host/mmci.c 2015-10-12 22:33:32.252678339 +0200
+diff -Nur linux-4.1.13.orig/drivers/mmc/host/mmci.c linux-4.1.13/drivers/mmc/host/mmci.c
+--- linux-4.1.13.orig/drivers/mmc/host/mmci.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/drivers/mmc/host/mmci.c 2015-11-29 09:23:09.561617368 +0100
@@ -1155,15 +1155,12 @@
struct sg_mapping_iter *sg_miter = &host->sg_miter;
struct variant_data *variant = host->variant;
@@ -7785,9 +7869,9 @@ diff -Nur linux-4.1.10.orig/drivers/mmc/host/mmci.c linux-4.1.10/drivers/mmc/hos
/*
* If we have less than the fifo 'half-full' threshold to transfer,
* trigger a PIO interrupt as soon as any data is available.
-diff -Nur linux-4.1.10.orig/drivers/net/ethernet/3com/3c59x.c linux-4.1.10/drivers/net/ethernet/3com/3c59x.c
---- linux-4.1.10.orig/drivers/net/ethernet/3com/3c59x.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/drivers/net/ethernet/3com/3c59x.c 2015-10-12 22:33:32.252678339 +0200
+diff -Nur linux-4.1.13.orig/drivers/net/ethernet/3com/3c59x.c linux-4.1.13/drivers/net/ethernet/3com/3c59x.c
+--- linux-4.1.13.orig/drivers/net/ethernet/3com/3c59x.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/drivers/net/ethernet/3com/3c59x.c 2015-11-29 09:23:09.561617368 +0100
@@ -842,9 +842,9 @@
{
struct vortex_private *vp = netdev_priv(dev);
@@ -7815,9 +7899,9 @@ diff -Nur linux-4.1.10.orig/drivers/net/ethernet/3com/3c59x.c linux-4.1.10/drive
}
}
-diff -Nur linux-4.1.10.orig/drivers/net/ethernet/atheros/atl1c/atl1c_main.c linux-4.1.10/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
---- linux-4.1.10.orig/drivers/net/ethernet/atheros/atl1c/atl1c_main.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/drivers/net/ethernet/atheros/atl1c/atl1c_main.c 2015-10-12 22:33:32.252678339 +0200
+diff -Nur linux-4.1.13.orig/drivers/net/ethernet/atheros/atl1c/atl1c_main.c linux-4.1.13/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
+--- linux-4.1.13.orig/drivers/net/ethernet/atheros/atl1c/atl1c_main.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/drivers/net/ethernet/atheros/atl1c/atl1c_main.c 2015-11-29 09:23:09.561617368 +0100
@@ -2213,11 +2213,7 @@
}
@@ -7831,9 +7915,9 @@ diff -Nur linux-4.1.10.orig/drivers/net/ethernet/atheros/atl1c/atl1c_main.c linu
if (atl1c_tpd_avail(adapter, type) < tpd_req) {
/* no enough descriptor, just stop queue */
-diff -Nur linux-4.1.10.orig/drivers/net/ethernet/atheros/atl1e/atl1e_main.c linux-4.1.10/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
---- linux-4.1.10.orig/drivers/net/ethernet/atheros/atl1e/atl1e_main.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/drivers/net/ethernet/atheros/atl1e/atl1e_main.c 2015-10-12 22:33:32.256678075 +0200
+diff -Nur linux-4.1.13.orig/drivers/net/ethernet/atheros/atl1e/atl1e_main.c linux-4.1.13/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
+--- linux-4.1.13.orig/drivers/net/ethernet/atheros/atl1e/atl1e_main.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/drivers/net/ethernet/atheros/atl1e/atl1e_main.c 2015-11-29 09:23:09.561617368 +0100
@@ -1880,8 +1880,7 @@
return NETDEV_TX_OK;
}
@@ -7844,9 +7928,9 @@ diff -Nur linux-4.1.10.orig/drivers/net/ethernet/atheros/atl1e/atl1e_main.c linu
if (atl1e_tpd_avail(adapter) < tpd_req) {
/* no enough descriptor, just stop queue */
-diff -Nur linux-4.1.10.orig/drivers/net/ethernet/chelsio/cxgb/sge.c linux-4.1.10/drivers/net/ethernet/chelsio/cxgb/sge.c
---- linux-4.1.10.orig/drivers/net/ethernet/chelsio/cxgb/sge.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/drivers/net/ethernet/chelsio/cxgb/sge.c 2015-10-12 22:33:32.256678075 +0200
+diff -Nur linux-4.1.13.orig/drivers/net/ethernet/chelsio/cxgb/sge.c linux-4.1.13/drivers/net/ethernet/chelsio/cxgb/sge.c
+--- linux-4.1.13.orig/drivers/net/ethernet/chelsio/cxgb/sge.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/drivers/net/ethernet/chelsio/cxgb/sge.c 2015-11-29 09:23:09.569616840 +0100
@@ -1664,8 +1664,7 @@
struct cmdQ *q = &sge->cmdQ[qid];
unsigned int credits, pidx, genbit, count, use_sched_skb = 0;
@@ -7857,9 +7941,9 @@ diff -Nur linux-4.1.10.orig/drivers/net/ethernet/chelsio/cxgb/sge.c linux-4.1.10
reclaim_completed_tx(sge, q);
-diff -Nur linux-4.1.10.orig/drivers/net/ethernet/freescale/gianfar.c linux-4.1.10/drivers/net/ethernet/freescale/gianfar.c
---- linux-4.1.10.orig/drivers/net/ethernet/freescale/gianfar.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/drivers/net/ethernet/freescale/gianfar.c 2015-10-12 22:33:32.256678075 +0200
+diff -Nur linux-4.1.13.orig/drivers/net/ethernet/freescale/gianfar.c linux-4.1.13/drivers/net/ethernet/freescale/gianfar.c
+--- linux-4.1.13.orig/drivers/net/ethernet/freescale/gianfar.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/drivers/net/ethernet/freescale/gianfar.c 2015-11-29 09:23:09.569616840 +0100
@@ -1540,7 +1540,7 @@
if (netif_running(ndev)) {
@@ -7913,9 +7997,9 @@ diff -Nur linux-4.1.10.orig/drivers/net/ethernet/freescale/gianfar.c linux-4.1.1
}
netif_dbg(priv, tx_err, dev, "Transmit Error\n");
}
-diff -Nur linux-4.1.10.orig/drivers/net/ethernet/neterion/s2io.c linux-4.1.10/drivers/net/ethernet/neterion/s2io.c
---- linux-4.1.10.orig/drivers/net/ethernet/neterion/s2io.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/drivers/net/ethernet/neterion/s2io.c 2015-10-12 22:33:32.256678075 +0200
+diff -Nur linux-4.1.13.orig/drivers/net/ethernet/neterion/s2io.c linux-4.1.13/drivers/net/ethernet/neterion/s2io.c
+--- linux-4.1.13.orig/drivers/net/ethernet/neterion/s2io.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/drivers/net/ethernet/neterion/s2io.c 2015-11-29 09:23:09.569616840 +0100
@@ -4084,12 +4084,7 @@
[skb->priority & (MAX_TX_FIFOS - 1)];
fifo = &mac_control->fifos[queue];
@@ -7930,9 +8014,9 @@ diff -Nur linux-4.1.10.orig/drivers/net/ethernet/neterion/s2io.c linux-4.1.10/dr
if (sp->config.multiq) {
if (__netif_subqueue_stopped(dev, fifo->fifo_no)) {
-diff -Nur linux-4.1.10.orig/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c linux-4.1.10/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
---- linux-4.1.10.orig/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c 2015-10-12 22:33:32.256678075 +0200
+diff -Nur linux-4.1.13.orig/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c linux-4.1.13/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
+--- linux-4.1.13.orig/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c 2015-11-29 09:23:09.569616840 +0100
@@ -2137,10 +2137,8 @@
struct pch_gbe_tx_ring *tx_ring = adapter->tx_ring;
unsigned long flags;
@@ -7946,9 +8030,9 @@ diff -Nur linux-4.1.10.orig/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
if (unlikely(!PCH_GBE_DESC_UNUSED(tx_ring))) {
netif_stop_queue(netdev);
spin_unlock_irqrestore(&tx_ring->tx_lock, flags);
-diff -Nur linux-4.1.10.orig/drivers/net/ethernet/realtek/8139too.c linux-4.1.10/drivers/net/ethernet/realtek/8139too.c
---- linux-4.1.10.orig/drivers/net/ethernet/realtek/8139too.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/drivers/net/ethernet/realtek/8139too.c 2015-10-12 22:33:32.260677811 +0200
+diff -Nur linux-4.1.13.orig/drivers/net/ethernet/realtek/8139too.c linux-4.1.13/drivers/net/ethernet/realtek/8139too.c
+--- linux-4.1.13.orig/drivers/net/ethernet/realtek/8139too.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/drivers/net/ethernet/realtek/8139too.c 2015-11-29 09:23:09.569616840 +0100
@@ -2229,7 +2229,7 @@
struct rtl8139_private *tp = netdev_priv(dev);
const int irq = tp->pci_dev->irq;
@@ -7958,9 +8042,9 @@ diff -Nur linux-4.1.10.orig/drivers/net/ethernet/realtek/8139too.c linux-4.1.10/
rtl8139_interrupt(irq, dev);
enable_irq(irq);
}
-diff -Nur linux-4.1.10.orig/drivers/net/ethernet/tehuti/tehuti.c linux-4.1.10/drivers/net/ethernet/tehuti/tehuti.c
---- linux-4.1.10.orig/drivers/net/ethernet/tehuti/tehuti.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/drivers/net/ethernet/tehuti/tehuti.c 2015-10-12 22:33:32.260677811 +0200
+diff -Nur linux-4.1.13.orig/drivers/net/ethernet/tehuti/tehuti.c linux-4.1.13/drivers/net/ethernet/tehuti/tehuti.c
+--- linux-4.1.13.orig/drivers/net/ethernet/tehuti/tehuti.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/drivers/net/ethernet/tehuti/tehuti.c 2015-11-29 09:23:09.569616840 +0100
@@ -1629,13 +1629,8 @@
unsigned long flags;
@@ -7977,9 +8061,9 @@ diff -Nur linux-4.1.10.orig/drivers/net/ethernet/tehuti/tehuti.c linux-4.1.10/dr
/* build tx descriptor */
BDX_ASSERT(f->m.wptr >= f->m.memsz); /* started with valid wptr */
-diff -Nur linux-4.1.10.orig/drivers/net/rionet.c linux-4.1.10/drivers/net/rionet.c
---- linux-4.1.10.orig/drivers/net/rionet.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/drivers/net/rionet.c 2015-10-12 22:33:32.260677811 +0200
+diff -Nur linux-4.1.13.orig/drivers/net/rionet.c linux-4.1.13/drivers/net/rionet.c
+--- linux-4.1.13.orig/drivers/net/rionet.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/drivers/net/rionet.c 2015-11-29 09:23:09.581616045 +0100
@@ -174,11 +174,7 @@
unsigned long flags;
int add_num = 1;
@@ -7993,9 +8077,9 @@ diff -Nur linux-4.1.10.orig/drivers/net/rionet.c linux-4.1.10/drivers/net/rionet
if (is_multicast_ether_addr(eth->h_dest))
add_num = nets[rnet->mport->id].nact;
-diff -Nur linux-4.1.10.orig/drivers/net/wireless/orinoco/orinoco_usb.c linux-4.1.10/drivers/net/wireless/orinoco/orinoco_usb.c
---- linux-4.1.10.orig/drivers/net/wireless/orinoco/orinoco_usb.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/drivers/net/wireless/orinoco/orinoco_usb.c 2015-10-12 22:33:32.260677811 +0200
+diff -Nur linux-4.1.13.orig/drivers/net/wireless/orinoco/orinoco_usb.c linux-4.1.13/drivers/net/wireless/orinoco/orinoco_usb.c
+--- linux-4.1.13.orig/drivers/net/wireless/orinoco/orinoco_usb.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/drivers/net/wireless/orinoco/orinoco_usb.c 2015-11-29 09:23:09.581616045 +0100
@@ -697,7 +697,7 @@
while (!ctx->done.done && msecs--)
udelay(1000);
@@ -8005,10 +8089,10 @@ diff -Nur linux-4.1.10.orig/drivers/net/wireless/orinoco/orinoco_usb.c linux-4.1
ctx->done.done);
}
break;
-diff -Nur linux-4.1.10.orig/drivers/pci/access.c linux-4.1.10/drivers/pci/access.c
---- linux-4.1.10.orig/drivers/pci/access.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/drivers/pci/access.c 2015-10-12 22:33:32.260677811 +0200
-@@ -580,7 +580,7 @@
+diff -Nur linux-4.1.13.orig/drivers/pci/access.c linux-4.1.13/drivers/pci/access.c
+--- linux-4.1.13.orig/drivers/pci/access.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/drivers/pci/access.c 2015-11-29 09:23:09.581616045 +0100
+@@ -561,7 +561,7 @@
WARN_ON(!dev->block_cfg_access);
dev->block_cfg_access = 0;
@@ -8017,9 +8101,9 @@ diff -Nur linux-4.1.10.orig/drivers/pci/access.c linux-4.1.10/drivers/pci/access
raw_spin_unlock_irqrestore(&pci_lock, flags);
}
EXPORT_SYMBOL_GPL(pci_cfg_access_unlock);
-diff -Nur linux-4.1.10.orig/drivers/scsi/fcoe/fcoe.c linux-4.1.10/drivers/scsi/fcoe/fcoe.c
---- linux-4.1.10.orig/drivers/scsi/fcoe/fcoe.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/drivers/scsi/fcoe/fcoe.c 2015-10-12 22:33:32.260677811 +0200
+diff -Nur linux-4.1.13.orig/drivers/scsi/fcoe/fcoe.c linux-4.1.13/drivers/scsi/fcoe/fcoe.c
+--- linux-4.1.13.orig/drivers/scsi/fcoe/fcoe.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/drivers/scsi/fcoe/fcoe.c 2015-11-29 09:23:09.581616045 +0100
@@ -1287,7 +1287,7 @@
struct sk_buff *skb;
#ifdef CONFIG_SMP
@@ -8083,9 +8167,9 @@ diff -Nur linux-4.1.10.orig/drivers/scsi/fcoe/fcoe.c linux-4.1.10/drivers/scsi/f
kfree_skb(skb);
}
-diff -Nur linux-4.1.10.orig/drivers/scsi/fcoe/fcoe_ctlr.c linux-4.1.10/drivers/scsi/fcoe/fcoe_ctlr.c
---- linux-4.1.10.orig/drivers/scsi/fcoe/fcoe_ctlr.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/drivers/scsi/fcoe/fcoe_ctlr.c 2015-10-12 22:33:32.260677811 +0200
+diff -Nur linux-4.1.13.orig/drivers/scsi/fcoe/fcoe_ctlr.c linux-4.1.13/drivers/scsi/fcoe/fcoe_ctlr.c
+--- linux-4.1.13.orig/drivers/scsi/fcoe/fcoe_ctlr.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/drivers/scsi/fcoe/fcoe_ctlr.c 2015-11-29 09:23:09.581616045 +0100
@@ -831,7 +831,7 @@
INIT_LIST_HEAD(&del_list);
@@ -8104,9 +8188,9 @@ diff -Nur linux-4.1.10.orig/drivers/scsi/fcoe/fcoe_ctlr.c linux-4.1.10/drivers/s
list_for_each_entry_safe(fcf, next, &del_list, list) {
/* Removes fcf from current list */
-diff -Nur linux-4.1.10.orig/drivers/scsi/libfc/fc_exch.c linux-4.1.10/drivers/scsi/libfc/fc_exch.c
---- linux-4.1.10.orig/drivers/scsi/libfc/fc_exch.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/drivers/scsi/libfc/fc_exch.c 2015-10-12 22:33:32.260677811 +0200
+diff -Nur linux-4.1.13.orig/drivers/scsi/libfc/fc_exch.c linux-4.1.13/drivers/scsi/libfc/fc_exch.c
+--- linux-4.1.13.orig/drivers/scsi/libfc/fc_exch.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/drivers/scsi/libfc/fc_exch.c 2015-11-29 09:23:09.581616045 +0100
@@ -814,10 +814,10 @@
}
memset(ep, 0, sizeof(*ep));
@@ -8120,9 +8204,9 @@ diff -Nur linux-4.1.10.orig/drivers/scsi/libfc/fc_exch.c linux-4.1.10/drivers/sc
/* peek cache of free slot */
if (pool->left != FC_XID_UNKNOWN) {
-diff -Nur linux-4.1.10.orig/drivers/scsi/libsas/sas_ata.c linux-4.1.10/drivers/scsi/libsas/sas_ata.c
---- linux-4.1.10.orig/drivers/scsi/libsas/sas_ata.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/drivers/scsi/libsas/sas_ata.c 2015-10-12 22:33:32.264677547 +0200
+diff -Nur linux-4.1.13.orig/drivers/scsi/libsas/sas_ata.c linux-4.1.13/drivers/scsi/libsas/sas_ata.c
+--- linux-4.1.13.orig/drivers/scsi/libsas/sas_ata.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/drivers/scsi/libsas/sas_ata.c 2015-11-29 09:23:09.581616045 +0100
@@ -190,7 +190,7 @@
/* TODO: audit callers to ensure they are ready for qc_issue to
* unconditionally re-enable interrupts
@@ -8141,9 +8225,9 @@ diff -Nur linux-4.1.10.orig/drivers/scsi/libsas/sas_ata.c linux-4.1.10/drivers/s
return ret;
}
-diff -Nur linux-4.1.10.orig/drivers/scsi/qla2xxx/qla_inline.h linux-4.1.10/drivers/scsi/qla2xxx/qla_inline.h
---- linux-4.1.10.orig/drivers/scsi/qla2xxx/qla_inline.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/drivers/scsi/qla2xxx/qla_inline.h 2015-10-12 22:33:32.264677547 +0200
+diff -Nur linux-4.1.13.orig/drivers/scsi/qla2xxx/qla_inline.h linux-4.1.13/drivers/scsi/qla2xxx/qla_inline.h
+--- linux-4.1.13.orig/drivers/scsi/qla2xxx/qla_inline.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/drivers/scsi/qla2xxx/qla_inline.h 2015-11-29 09:23:09.581616045 +0100
@@ -59,12 +59,12 @@
{
unsigned long flags;
@@ -8159,9 +8243,9 @@ diff -Nur linux-4.1.10.orig/drivers/scsi/qla2xxx/qla_inline.h linux-4.1.10/drive
}
static inline uint8_t *
-diff -Nur linux-4.1.10.orig/drivers/thermal/x86_pkg_temp_thermal.c linux-4.1.10/drivers/thermal/x86_pkg_temp_thermal.c
---- linux-4.1.10.orig/drivers/thermal/x86_pkg_temp_thermal.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/drivers/thermal/x86_pkg_temp_thermal.c 2015-10-12 22:33:32.264677547 +0200
+diff -Nur linux-4.1.13.orig/drivers/thermal/x86_pkg_temp_thermal.c linux-4.1.13/drivers/thermal/x86_pkg_temp_thermal.c
+--- linux-4.1.13.orig/drivers/thermal/x86_pkg_temp_thermal.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/drivers/thermal/x86_pkg_temp_thermal.c 2015-11-29 09:23:09.581616045 +0100
@@ -29,6 +29,7 @@
#include <linux/pm.h>
#include <linux/thermal.h>
@@ -8264,9 +8348,9 @@ diff -Nur linux-4.1.10.orig/drivers/thermal/x86_pkg_temp_thermal.c linux-4.1.10/
for_each_online_cpu(i)
cancel_delayed_work_sync(
&per_cpu(pkg_temp_thermal_threshold_work, i));
-diff -Nur linux-4.1.10.orig/drivers/tty/serial/8250/8250_core.c linux-4.1.10/drivers/tty/serial/8250/8250_core.c
---- linux-4.1.10.orig/drivers/tty/serial/8250/8250_core.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/drivers/tty/serial/8250/8250_core.c 2015-10-12 22:33:32.264677547 +0200
+diff -Nur linux-4.1.13.orig/drivers/tty/serial/8250/8250_core.c linux-4.1.13/drivers/tty/serial/8250/8250_core.c
+--- linux-4.1.13.orig/drivers/tty/serial/8250/8250_core.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/drivers/tty/serial/8250/8250_core.c 2015-11-29 09:23:09.581616045 +0100
@@ -36,6 +36,7 @@
#include <linux/nmi.h>
#include <linux/mutex.h>
@@ -8293,7 +8377,7 @@ diff -Nur linux-4.1.10.orig/drivers/tty/serial/8250/8250_core.c linux-4.1.10/dri
#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE)
-@@ -3364,7 +3374,7 @@
+@@ -3372,7 +3382,7 @@
if (port->sysrq)
locked = 0;
@@ -8302,9 +8386,9 @@ diff -Nur linux-4.1.10.orig/drivers/tty/serial/8250/8250_core.c linux-4.1.10/dri
locked = spin_trylock_irqsave(&port->lock, flags);
else
spin_lock_irqsave(&port->lock, flags);
-diff -Nur linux-4.1.10.orig/drivers/tty/serial/amba-pl011.c linux-4.1.10/drivers/tty/serial/amba-pl011.c
---- linux-4.1.10.orig/drivers/tty/serial/amba-pl011.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/drivers/tty/serial/amba-pl011.c 2015-10-12 22:33:32.264677547 +0200
+diff -Nur linux-4.1.13.orig/drivers/tty/serial/amba-pl011.c linux-4.1.13/drivers/tty/serial/amba-pl011.c
+--- linux-4.1.13.orig/drivers/tty/serial/amba-pl011.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/drivers/tty/serial/amba-pl011.c 2015-11-29 09:23:09.585615778 +0100
@@ -2000,13 +2000,19 @@
clk_enable(uap->clk);
@@ -8338,9 +8422,9 @@ diff -Nur linux-4.1.10.orig/drivers/tty/serial/amba-pl011.c linux-4.1.10/drivers
clk_disable(uap->clk);
}
-diff -Nur linux-4.1.10.orig/drivers/tty/serial/omap-serial.c linux-4.1.10/drivers/tty/serial/omap-serial.c
---- linux-4.1.10.orig/drivers/tty/serial/omap-serial.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/drivers/tty/serial/omap-serial.c 2015-10-12 22:33:32.264677547 +0200
+diff -Nur linux-4.1.13.orig/drivers/tty/serial/omap-serial.c linux-4.1.13/drivers/tty/serial/omap-serial.c
+--- linux-4.1.13.orig/drivers/tty/serial/omap-serial.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/drivers/tty/serial/omap-serial.c 2015-11-29 09:23:09.585615778 +0100
@@ -1282,13 +1282,10 @@
pm_runtime_get_sync(up->dev);
@@ -8368,9 +8452,9 @@ diff -Nur linux-4.1.10.orig/drivers/tty/serial/omap-serial.c linux-4.1.10/driver
}
static int __init
-diff -Nur linux-4.1.10.orig/drivers/usb/core/hcd.c linux-4.1.10/drivers/usb/core/hcd.c
---- linux-4.1.10.orig/drivers/usb/core/hcd.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/drivers/usb/core/hcd.c 2015-10-12 22:33:32.264677547 +0200
+diff -Nur linux-4.1.13.orig/drivers/usb/core/hcd.c linux-4.1.13/drivers/usb/core/hcd.c
+--- linux-4.1.13.orig/drivers/usb/core/hcd.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/drivers/usb/core/hcd.c 2015-11-29 09:23:09.585615778 +0100
@@ -1684,9 +1684,9 @@
* and no one may trigger the above deadlock situation when
* running complete() in tasklet.
@@ -8383,9 +8467,9 @@ diff -Nur linux-4.1.10.orig/drivers/usb/core/hcd.c linux-4.1.10/drivers/usb/core
usb_anchor_resume_wakeups(anchor);
atomic_dec(&urb->use_count);
-diff -Nur linux-4.1.10.orig/drivers/usb/gadget/function/f_fs.c linux-4.1.10/drivers/usb/gadget/function/f_fs.c
---- linux-4.1.10.orig/drivers/usb/gadget/function/f_fs.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/drivers/usb/gadget/function/f_fs.c 2015-10-12 22:33:32.264677547 +0200
+diff -Nur linux-4.1.13.orig/drivers/usb/gadget/function/f_fs.c linux-4.1.13/drivers/usb/gadget/function/f_fs.c
+--- linux-4.1.13.orig/drivers/usb/gadget/function/f_fs.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/drivers/usb/gadget/function/f_fs.c 2015-11-29 09:23:09.585615778 +0100
@@ -1405,7 +1405,7 @@
pr_info("%s(): freeing\n", __func__);
ffs_data_clear(ffs);
@@ -8395,9 +8479,9 @@ diff -Nur linux-4.1.10.orig/drivers/usb/gadget/function/f_fs.c linux-4.1.10/driv
kfree(ffs->dev_name);
kfree(ffs);
}
-diff -Nur linux-4.1.10.orig/drivers/usb/gadget/legacy/inode.c linux-4.1.10/drivers/usb/gadget/legacy/inode.c
---- linux-4.1.10.orig/drivers/usb/gadget/legacy/inode.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/drivers/usb/gadget/legacy/inode.c 2015-10-12 22:33:32.264677547 +0200
+diff -Nur linux-4.1.13.orig/drivers/usb/gadget/legacy/inode.c linux-4.1.13/drivers/usb/gadget/legacy/inode.c
+--- linux-4.1.13.orig/drivers/usb/gadget/legacy/inode.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/drivers/usb/gadget/legacy/inode.c 2015-11-29 09:23:09.585615778 +0100
@@ -345,7 +345,7 @@
spin_unlock_irq (&epdata->dev->lock);
@@ -8416,9 +8500,9 @@ diff -Nur linux-4.1.10.orig/drivers/usb/gadget/legacy/inode.c linux-4.1.10/drive
if (epdata->status == -ECONNRESET)
epdata->status = -EINTR;
} else {
-diff -Nur linux-4.1.10.orig/fs/aio.c linux-4.1.10/fs/aio.c
---- linux-4.1.10.orig/fs/aio.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/fs/aio.c 2015-10-12 22:33:32.264677547 +0200
+diff -Nur linux-4.1.13.orig/fs/aio.c linux-4.1.13/fs/aio.c
+--- linux-4.1.13.orig/fs/aio.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/fs/aio.c 2015-11-29 09:23:09.585615778 +0100
@@ -40,6 +40,7 @@
#include <linux/ramfs.h>
#include <linux/percpu-refcount.h>
@@ -8494,9 +8578,9 @@ diff -Nur linux-4.1.10.orig/fs/aio.c linux-4.1.10/fs/aio.c
static int ioctx_add_table(struct kioctx *ctx, struct mm_struct *mm)
{
unsigned i, new_nr;
-diff -Nur linux-4.1.10.orig/fs/autofs4/autofs_i.h linux-4.1.10/fs/autofs4/autofs_i.h
---- linux-4.1.10.orig/fs/autofs4/autofs_i.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/fs/autofs4/autofs_i.h 2015-10-12 22:33:32.268677282 +0200
+diff -Nur linux-4.1.13.orig/fs/autofs4/autofs_i.h linux-4.1.13/fs/autofs4/autofs_i.h
+--- linux-4.1.13.orig/fs/autofs4/autofs_i.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/fs/autofs4/autofs_i.h 2015-11-29 09:23:09.585615778 +0100
@@ -34,6 +34,7 @@
#include <linux/sched.h>
#include <linux/mount.h>
@@ -8505,9 +8589,9 @@ diff -Nur linux-4.1.10.orig/fs/autofs4/autofs_i.h linux-4.1.10/fs/autofs4/autofs
#include <asm/current.h>
#include <asm/uaccess.h>
-diff -Nur linux-4.1.10.orig/fs/autofs4/expire.c linux-4.1.10/fs/autofs4/expire.c
---- linux-4.1.10.orig/fs/autofs4/expire.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/fs/autofs4/expire.c 2015-10-12 22:33:32.268677282 +0200
+diff -Nur linux-4.1.13.orig/fs/autofs4/expire.c linux-4.1.13/fs/autofs4/expire.c
+--- linux-4.1.13.orig/fs/autofs4/expire.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/fs/autofs4/expire.c 2015-11-29 09:23:09.585615778 +0100
@@ -150,7 +150,7 @@
parent = p->d_parent;
if (!spin_trylock(&parent->d_lock)) {
@@ -8517,9 +8601,9 @@ diff -Nur linux-4.1.10.orig/fs/autofs4/expire.c linux-4.1.10/fs/autofs4/expire.c
goto relock;
}
spin_unlock(&p->d_lock);
-diff -Nur linux-4.1.10.orig/fs/buffer.c linux-4.1.10/fs/buffer.c
---- linux-4.1.10.orig/fs/buffer.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/fs/buffer.c 2015-10-12 22:33:32.268677282 +0200
+diff -Nur linux-4.1.13.orig/fs/buffer.c linux-4.1.13/fs/buffer.c
+--- linux-4.1.13.orig/fs/buffer.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/fs/buffer.c 2015-11-29 09:23:09.585615778 +0100
@@ -301,8 +301,7 @@
* decide that the page is now completely done.
*/
@@ -8587,9 +8671,9 @@ diff -Nur linux-4.1.10.orig/fs/buffer.c linux-4.1.10/fs/buffer.c
preempt_disable();
__this_cpu_inc(bh_accounting.nr);
recalc_bh_state();
-diff -Nur linux-4.1.10.orig/fs/dcache.c linux-4.1.10/fs/dcache.c
---- linux-4.1.10.orig/fs/dcache.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/fs/dcache.c 2015-10-12 22:33:32.268677282 +0200
+diff -Nur linux-4.1.13.orig/fs/dcache.c linux-4.1.13/fs/dcache.c
+--- linux-4.1.13.orig/fs/dcache.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/fs/dcache.c 2015-11-29 09:23:09.585615778 +0100
@@ -19,6 +19,7 @@
#include <linux/mm.h>
#include <linux/fs.h>
@@ -8607,7 +8691,7 @@ diff -Nur linux-4.1.10.orig/fs/dcache.c linux-4.1.10/fs/dcache.c
return dentry; /* try again with same dentry */
}
-@@ -2395,7 +2396,7 @@
+@@ -2398,7 +2399,7 @@
if (dentry->d_lockref.count == 1) {
if (!spin_trylock(&inode->i_lock)) {
spin_unlock(&dentry->d_lock);
@@ -8616,9 +8700,9 @@ diff -Nur linux-4.1.10.orig/fs/dcache.c linux-4.1.10/fs/dcache.c
goto again;
}
dentry->d_flags &= ~DCACHE_CANT_MOUNT;
-diff -Nur linux-4.1.10.orig/fs/eventpoll.c linux-4.1.10/fs/eventpoll.c
---- linux-4.1.10.orig/fs/eventpoll.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/fs/eventpoll.c 2015-10-12 22:33:32.268677282 +0200
+diff -Nur linux-4.1.13.orig/fs/eventpoll.c linux-4.1.13/fs/eventpoll.c
+--- linux-4.1.13.orig/fs/eventpoll.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/fs/eventpoll.c 2015-11-29 09:23:09.585615778 +0100
@@ -505,12 +505,12 @@
*/
static void ep_poll_safewake(wait_queue_head_t *wq)
@@ -8634,9 +8718,9 @@ diff -Nur linux-4.1.10.orig/fs/eventpoll.c linux-4.1.10/fs/eventpoll.c
}
static void ep_remove_wait_queue(struct eppoll_entry *pwq)
-diff -Nur linux-4.1.10.orig/fs/exec.c linux-4.1.10/fs/exec.c
---- linux-4.1.10.orig/fs/exec.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/fs/exec.c 2015-10-12 22:33:32.268677282 +0200
+diff -Nur linux-4.1.13.orig/fs/exec.c linux-4.1.13/fs/exec.c
+--- linux-4.1.13.orig/fs/exec.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/fs/exec.c 2015-11-29 09:23:09.593615242 +0100
@@ -859,12 +859,14 @@
}
}
@@ -8652,9 +8736,9 @@ diff -Nur linux-4.1.10.orig/fs/exec.c linux-4.1.10/fs/exec.c
task_unlock(tsk);
if (old_mm) {
up_read(&old_mm->mmap_sem);
-diff -Nur linux-4.1.10.orig/fs/jbd/checkpoint.c linux-4.1.10/fs/jbd/checkpoint.c
---- linux-4.1.10.orig/fs/jbd/checkpoint.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/fs/jbd/checkpoint.c 2015-10-12 22:33:32.268677282 +0200
+diff -Nur linux-4.1.13.orig/fs/jbd/checkpoint.c linux-4.1.13/fs/jbd/checkpoint.c
+--- linux-4.1.13.orig/fs/jbd/checkpoint.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/fs/jbd/checkpoint.c 2015-11-29 09:23:09.593615242 +0100
@@ -129,6 +129,8 @@
if (journal->j_flags & JFS_ABORT)
return;
@@ -8664,9 +8748,9 @@ diff -Nur linux-4.1.10.orig/fs/jbd/checkpoint.c linux-4.1.10/fs/jbd/checkpoint.c
mutex_lock(&journal->j_checkpoint_mutex);
/*
-diff -Nur linux-4.1.10.orig/fs/jbd2/checkpoint.c linux-4.1.10/fs/jbd2/checkpoint.c
---- linux-4.1.10.orig/fs/jbd2/checkpoint.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/fs/jbd2/checkpoint.c 2015-10-12 22:33:32.268677282 +0200
+diff -Nur linux-4.1.13.orig/fs/jbd2/checkpoint.c linux-4.1.13/fs/jbd2/checkpoint.c
+--- linux-4.1.13.orig/fs/jbd2/checkpoint.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/fs/jbd2/checkpoint.c 2015-11-29 09:23:09.593615242 +0100
@@ -116,6 +116,8 @@
nblocks = jbd2_space_needed(journal);
while (jbd2_log_space_left(journal) < nblocks) {
@@ -8676,9 +8760,9 @@ diff -Nur linux-4.1.10.orig/fs/jbd2/checkpoint.c linux-4.1.10/fs/jbd2/checkpoint
mutex_lock(&journal->j_checkpoint_mutex);
/*
-diff -Nur linux-4.1.10.orig/fs/namespace.c linux-4.1.10/fs/namespace.c
---- linux-4.1.10.orig/fs/namespace.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/fs/namespace.c 2015-10-12 22:33:32.268677282 +0200
+diff -Nur linux-4.1.13.orig/fs/namespace.c linux-4.1.13/fs/namespace.c
+--- linux-4.1.13.orig/fs/namespace.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/fs/namespace.c 2015-11-29 09:23:09.593615242 +0100
@@ -14,6 +14,7 @@
#include <linux/mnt_namespace.h>
#include <linux/user_namespace.h>
@@ -8701,9 +8785,9 @@ diff -Nur linux-4.1.10.orig/fs/namespace.c linux-4.1.10/fs/namespace.c
/*
* After the slowpath clears MNT_WRITE_HOLD, mnt_is_readonly will
* be set to match its requirements. So we must not load that until
-diff -Nur linux-4.1.10.orig/fs/ntfs/aops.c linux-4.1.10/fs/ntfs/aops.c
---- linux-4.1.10.orig/fs/ntfs/aops.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/fs/ntfs/aops.c 2015-10-12 22:33:32.268677282 +0200
+diff -Nur linux-4.1.13.orig/fs/ntfs/aops.c linux-4.1.13/fs/ntfs/aops.c
+--- linux-4.1.13.orig/fs/ntfs/aops.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/fs/ntfs/aops.c 2015-11-29 09:23:09.593615242 +0100
@@ -107,8 +107,7 @@
"0x%llx.", (unsigned long long)bh->b_blocknr);
}
@@ -8751,9 +8835,9 @@ diff -Nur linux-4.1.10.orig/fs/ntfs/aops.c linux-4.1.10/fs/ntfs/aops.c
}
/**
-diff -Nur linux-4.1.10.orig/fs/timerfd.c linux-4.1.10/fs/timerfd.c
---- linux-4.1.10.orig/fs/timerfd.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/fs/timerfd.c 2015-10-12 22:33:32.268677282 +0200
+diff -Nur linux-4.1.13.orig/fs/timerfd.c linux-4.1.13/fs/timerfd.c
+--- linux-4.1.13.orig/fs/timerfd.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/fs/timerfd.c 2015-11-29 09:23:09.593615242 +0100
@@ -450,7 +450,10 @@
break;
}
@@ -8766,9 +8850,9 @@ diff -Nur linux-4.1.10.orig/fs/timerfd.c linux-4.1.10/fs/timerfd.c
}
/*
-diff -Nur linux-4.1.10.orig/fs/xfs/xfs_inode.c linux-4.1.10/fs/xfs/xfs_inode.c
---- linux-4.1.10.orig/fs/xfs/xfs_inode.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/fs/xfs/xfs_inode.c 2015-10-12 22:33:32.272677018 +0200
+diff -Nur linux-4.1.13.orig/fs/xfs/xfs_inode.c linux-4.1.13/fs/xfs/xfs_inode.c
+--- linux-4.1.13.orig/fs/xfs/xfs_inode.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/fs/xfs/xfs_inode.c 2015-11-29 09:23:09.593615242 +0100
@@ -164,7 +164,7 @@
(XFS_MMAPLOCK_SHARED | XFS_MMAPLOCK_EXCL));
ASSERT((lock_flags & (XFS_ILOCK_SHARED | XFS_ILOCK_EXCL)) !=
@@ -8891,9 +8975,9 @@ diff -Nur linux-4.1.10.orig/fs/xfs/xfs_inode.c linux-4.1.10/fs/xfs/xfs_inode.c
try_lock = 0;
i = 0;
-diff -Nur linux-4.1.10.orig/fs/xfs/xfs_inode.h linux-4.1.10/fs/xfs/xfs_inode.h
---- linux-4.1.10.orig/fs/xfs/xfs_inode.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/fs/xfs/xfs_inode.h 2015-10-12 22:33:32.272677018 +0200
+diff -Nur linux-4.1.13.orig/fs/xfs/xfs_inode.h linux-4.1.13/fs/xfs/xfs_inode.h
+--- linux-4.1.13.orig/fs/xfs/xfs_inode.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/fs/xfs/xfs_inode.h 2015-11-29 09:23:09.593615242 +0100
@@ -284,9 +284,9 @@
* Flags for lockdep annotations.
*
@@ -8991,9 +9075,9 @@ diff -Nur linux-4.1.10.orig/fs/xfs/xfs_inode.h linux-4.1.10/fs/xfs/xfs_inode.h
XFS_MMAPLOCK_DEP_MASK | \
XFS_ILOCK_DEP_MASK)
-diff -Nur linux-4.1.10.orig/include/acpi/platform/aclinux.h linux-4.1.10/include/acpi/platform/aclinux.h
---- linux-4.1.10.orig/include/acpi/platform/aclinux.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/acpi/platform/aclinux.h 2015-10-12 22:33:32.272677018 +0200
+diff -Nur linux-4.1.13.orig/include/acpi/platform/aclinux.h linux-4.1.13/include/acpi/platform/aclinux.h
+--- linux-4.1.13.orig/include/acpi/platform/aclinux.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/acpi/platform/aclinux.h 2015-11-29 09:23:09.593615242 +0100
@@ -123,6 +123,7 @@
#define acpi_cache_t struct kmem_cache
@@ -9023,9 +9107,9 @@ diff -Nur linux-4.1.10.orig/include/acpi/platform/aclinux.h linux-4.1.10/include
/*
* OSL interfaces used by debugger/disassembler
*/
-diff -Nur linux-4.1.10.orig/include/asm-generic/bug.h linux-4.1.10/include/asm-generic/bug.h
---- linux-4.1.10.orig/include/asm-generic/bug.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/asm-generic/bug.h 2015-10-12 22:33:32.272677018 +0200
+diff -Nur linux-4.1.13.orig/include/asm-generic/bug.h linux-4.1.13/include/asm-generic/bug.h
+--- linux-4.1.13.orig/include/asm-generic/bug.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/asm-generic/bug.h 2015-11-29 09:23:09.593615242 +0100
@@ -206,6 +206,20 @@
# define WARN_ON_SMP(x) ({0;})
#endif
@@ -9047,9 +9131,9 @@ diff -Nur linux-4.1.10.orig/include/asm-generic/bug.h linux-4.1.10/include/asm-g
#endif /* __ASSEMBLY__ */
#endif
-diff -Nur linux-4.1.10.orig/include/asm-generic/futex.h linux-4.1.10/include/asm-generic/futex.h
---- linux-4.1.10.orig/include/asm-generic/futex.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/asm-generic/futex.h 2015-10-12 22:33:32.272677018 +0200
+diff -Nur linux-4.1.13.orig/include/asm-generic/futex.h linux-4.1.13/include/asm-generic/futex.h
+--- linux-4.1.13.orig/include/asm-generic/futex.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/asm-generic/futex.h 2015-11-29 09:23:09.593615242 +0100
@@ -8,8 +8,7 @@
#ifndef CONFIG_SMP
/*
@@ -9092,9 +9176,9 @@ diff -Nur linux-4.1.10.orig/include/asm-generic/futex.h linux-4.1.10/include/asm
return 0;
}
-diff -Nur linux-4.1.10.orig/include/linux/blkdev.h linux-4.1.10/include/linux/blkdev.h
---- linux-4.1.10.orig/include/linux/blkdev.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/linux/blkdev.h 2015-10-12 22:33:32.272677018 +0200
+diff -Nur linux-4.1.13.orig/include/linux/blkdev.h linux-4.1.13/include/linux/blkdev.h
+--- linux-4.1.13.orig/include/linux/blkdev.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/linux/blkdev.h 2015-11-29 09:23:09.593615242 +0100
@@ -101,6 +101,7 @@
struct list_head queuelist;
union {
@@ -9112,9 +9196,9 @@ diff -Nur linux-4.1.10.orig/include/linux/blkdev.h linux-4.1.10/include/linux/bl
struct percpu_ref mq_usage_counter;
struct list_head all_q_node;
-diff -Nur linux-4.1.10.orig/include/linux/blk-mq.h linux-4.1.10/include/linux/blk-mq.h
---- linux-4.1.10.orig/include/linux/blk-mq.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/linux/blk-mq.h 2015-10-12 22:33:32.272677018 +0200
+diff -Nur linux-4.1.13.orig/include/linux/blk-mq.h linux-4.1.13/include/linux/blk-mq.h
+--- linux-4.1.13.orig/include/linux/blk-mq.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/linux/blk-mq.h 2015-11-29 09:23:09.593615242 +0100
@@ -202,6 +202,7 @@
struct blk_mq_hw_ctx *blk_mq_map_queue(struct request_queue *, const int ctx_index);
@@ -9123,37 +9207,59 @@ diff -Nur linux-4.1.10.orig/include/linux/blk-mq.h linux-4.1.10/include/linux/bl
int blk_mq_request_started(struct request *rq);
void blk_mq_start_request(struct request *rq);
-diff -Nur linux-4.1.10.orig/include/linux/bottom_half.h linux-4.1.10/include/linux/bottom_half.h
---- linux-4.1.10.orig/include/linux/bottom_half.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/linux/bottom_half.h 2015-10-12 22:33:32.272677018 +0200
-@@ -4,6 +4,17 @@
+diff -Nur linux-4.1.13.orig/include/linux/bottom_half.h linux-4.1.13/include/linux/bottom_half.h
+--- linux-4.1.13.orig/include/linux/bottom_half.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/linux/bottom_half.h 2015-11-29 09:23:09.593615242 +0100
+@@ -4,6 +4,39 @@
#include <linux/preempt.h>
#include <linux/preempt_mask.h>
+#ifdef CONFIG_PREEMPT_RT_FULL
+
-+extern void local_bh_disable(void);
++extern void __local_bh_disable(void);
+extern void _local_bh_enable(void);
-+extern void local_bh_enable(void);
-+extern void local_bh_enable_ip(unsigned long ip);
-+extern void __local_bh_disable_ip(unsigned long ip, unsigned int cnt);
-+extern void __local_bh_enable_ip(unsigned long ip, unsigned int cnt);
++extern void __local_bh_enable(void);
++
++static inline void local_bh_disable(void)
++{
++ __local_bh_disable();
++}
++
++static inline void __local_bh_disable_ip(unsigned long ip, unsigned int cnt)
++{
++ __local_bh_disable();
++}
++
++static inline void local_bh_enable(void)
++{
++ __local_bh_enable();
++}
++
++static inline void __local_bh_enable_ip(unsigned long ip, unsigned int cnt)
++{
++ __local_bh_enable();
++}
++
++static inline void local_bh_enable_ip(unsigned long ip)
++{
++ __local_bh_enable();
++}
+
+#else
+
#ifdef CONFIG_TRACE_IRQFLAGS
extern void __local_bh_disable_ip(unsigned long ip, unsigned int cnt);
#else
-@@ -31,5 +42,6 @@
+@@ -31,5 +64,6 @@
{
__local_bh_enable_ip(_THIS_IP_, SOFTIRQ_DISABLE_OFFSET);
}
+#endif
#endif /* _LINUX_BH_H */
-diff -Nur linux-4.1.10.orig/include/linux/buffer_head.h linux-4.1.10/include/linux/buffer_head.h
---- linux-4.1.10.orig/include/linux/buffer_head.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/linux/buffer_head.h 2015-10-12 22:33:32.272677018 +0200
+diff -Nur linux-4.1.13.orig/include/linux/buffer_head.h linux-4.1.13/include/linux/buffer_head.h
+--- linux-4.1.13.orig/include/linux/buffer_head.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/linux/buffer_head.h 2015-11-29 09:23:09.601614714 +0100
@@ -75,8 +75,52 @@
struct address_space *b_assoc_map; /* mapping this buffer is
associated with */
@@ -9207,9 +9313,9 @@ diff -Nur linux-4.1.10.orig/include/linux/buffer_head.h linux-4.1.10/include/lin
/*
* macro tricks to expand the set_buffer_foo(), clear_buffer_foo()
* and buffer_foo() functions.
-diff -Nur linux-4.1.10.orig/include/linux/cgroup.h linux-4.1.10/include/linux/cgroup.h
---- linux-4.1.10.orig/include/linux/cgroup.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/linux/cgroup.h 2015-10-12 22:33:32.272677018 +0200
+diff -Nur linux-4.1.13.orig/include/linux/cgroup.h linux-4.1.13/include/linux/cgroup.h
+--- linux-4.1.13.orig/include/linux/cgroup.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/linux/cgroup.h 2015-11-29 09:23:09.601614714 +0100
@@ -22,6 +22,7 @@
#include <linux/seq_file.h>
#include <linux/kernfs.h>
@@ -9226,9 +9332,9 @@ diff -Nur linux-4.1.10.orig/include/linux/cgroup.h linux-4.1.10/include/linux/cg
};
/* bits in struct cgroup_subsys_state flags field */
-diff -Nur linux-4.1.10.orig/include/linux/completion.h linux-4.1.10/include/linux/completion.h
---- linux-4.1.10.orig/include/linux/completion.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/linux/completion.h 2015-10-12 22:33:32.272677018 +0200
+diff -Nur linux-4.1.13.orig/include/linux/completion.h linux-4.1.13/include/linux/completion.h
+--- linux-4.1.13.orig/include/linux/completion.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/linux/completion.h 2015-11-29 09:23:09.601614714 +0100
@@ -7,8 +7,7 @@
* Atomic wait-for-completion handler data structures.
* See kernel/sched/completion.c for details.
@@ -9262,9 +9368,9 @@ diff -Nur linux-4.1.10.orig/include/linux/completion.h linux-4.1.10/include/linu
}
/**
-diff -Nur linux-4.1.10.orig/include/linux/cpu.h linux-4.1.10/include/linux/cpu.h
---- linux-4.1.10.orig/include/linux/cpu.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/linux/cpu.h 2015-10-12 22:33:32.272677018 +0200
+diff -Nur linux-4.1.13.orig/include/linux/cpu.h linux-4.1.13/include/linux/cpu.h
+--- linux-4.1.13.orig/include/linux/cpu.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/linux/cpu.h 2015-11-29 09:23:09.601614714 +0100
@@ -231,6 +231,8 @@
extern void put_online_cpus(void);
extern void cpu_hotplug_disable(void);
@@ -9283,9 +9389,9 @@ diff -Nur linux-4.1.10.orig/include/linux/cpu.h linux-4.1.10/include/linux/cpu.h
#define hotcpu_notifier(fn, pri) do { (void)(fn); } while (0)
#define __hotcpu_notifier(fn, pri) do { (void)(fn); } while (0)
/* These aren't inline functions due to a GCC bug. */
-diff -Nur linux-4.1.10.orig/include/linux/delay.h linux-4.1.10/include/linux/delay.h
---- linux-4.1.10.orig/include/linux/delay.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/linux/delay.h 2015-10-12 22:33:32.272677018 +0200
+diff -Nur linux-4.1.13.orig/include/linux/delay.h linux-4.1.13/include/linux/delay.h
+--- linux-4.1.13.orig/include/linux/delay.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/linux/delay.h 2015-11-29 09:23:09.601614714 +0100
@@ -52,4 +52,10 @@
msleep(seconds * 1000);
}
@@ -9297,9 +9403,9 @@ diff -Nur linux-4.1.10.orig/include/linux/delay.h linux-4.1.10/include/linux/del
+#endif
+
#endif /* defined(_LINUX_DELAY_H) */
-diff -Nur linux-4.1.10.orig/include/linux/ftrace_event.h linux-4.1.10/include/linux/ftrace_event.h
---- linux-4.1.10.orig/include/linux/ftrace_event.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/linux/ftrace_event.h 2015-10-12 22:33:32.272677018 +0200
+diff -Nur linux-4.1.13.orig/include/linux/ftrace_event.h linux-4.1.13/include/linux/ftrace_event.h
+--- linux-4.1.13.orig/include/linux/ftrace_event.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/linux/ftrace_event.h 2015-11-29 09:23:09.601614714 +0100
@@ -66,6 +66,9 @@
unsigned char flags;
unsigned char preempt_count;
@@ -9310,9 +9416,9 @@ diff -Nur linux-4.1.10.orig/include/linux/ftrace_event.h linux-4.1.10/include/li
};
#define FTRACE_MAX_EVENT \
-diff -Nur linux-4.1.10.orig/include/linux/highmem.h linux-4.1.10/include/linux/highmem.h
---- linux-4.1.10.orig/include/linux/highmem.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/linux/highmem.h 2015-10-12 22:33:32.272677018 +0200
+diff -Nur linux-4.1.13.orig/include/linux/highmem.h linux-4.1.13/include/linux/highmem.h
+--- linux-4.1.13.orig/include/linux/highmem.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/linux/highmem.h 2015-11-29 09:23:09.601614714 +0100
@@ -7,6 +7,7 @@
#include <linux/mm.h>
#include <linux/uaccess.h>
@@ -9393,9 +9499,9 @@ diff -Nur linux-4.1.10.orig/include/linux/highmem.h linux-4.1.10/include/linux/h
#endif
}
-diff -Nur linux-4.1.10.orig/include/linux/hrtimer.h linux-4.1.10/include/linux/hrtimer.h
---- linux-4.1.10.orig/include/linux/hrtimer.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/linux/hrtimer.h 2015-10-12 22:33:32.272677018 +0200
+diff -Nur linux-4.1.13.orig/include/linux/hrtimer.h linux-4.1.13/include/linux/hrtimer.h
+--- linux-4.1.13.orig/include/linux/hrtimer.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/linux/hrtimer.h 2015-11-29 09:23:09.601614714 +0100
@@ -111,6 +111,11 @@
enum hrtimer_restart (*function)(struct hrtimer *);
struct hrtimer_clock_base *base;
@@ -9440,9 +9546,9 @@ diff -Nur linux-4.1.10.orig/include/linux/hrtimer.h linux-4.1.10/include/linux/h
/* Query timers: */
extern ktime_t hrtimer_get_remaining(const struct hrtimer *timer);
extern int hrtimer_get_res(const clockid_t which_clock, struct timespec *tp);
-diff -Nur linux-4.1.10.orig/include/linux/idr.h linux-4.1.10/include/linux/idr.h
---- linux-4.1.10.orig/include/linux/idr.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/linux/idr.h 2015-10-12 22:33:32.272677018 +0200
+diff -Nur linux-4.1.13.orig/include/linux/idr.h linux-4.1.13/include/linux/idr.h
+--- linux-4.1.13.orig/include/linux/idr.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/linux/idr.h 2015-11-29 09:23:09.601614714 +0100
@@ -95,10 +95,14 @@
* Each idr_preload() should be matched with an invocation of this
* function. See idr_preload() for details.
@@ -9458,9 +9564,9 @@ diff -Nur linux-4.1.10.orig/include/linux/idr.h linux-4.1.10/include/linux/idr.h
/**
* idr_find - return pointer for given id
-diff -Nur linux-4.1.10.orig/include/linux/init_task.h linux-4.1.10/include/linux/init_task.h
---- linux-4.1.10.orig/include/linux/init_task.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/linux/init_task.h 2015-10-12 22:33:32.272677018 +0200
+diff -Nur linux-4.1.13.orig/include/linux/init_task.h linux-4.1.13/include/linux/init_task.h
+--- linux-4.1.13.orig/include/linux/init_task.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/linux/init_task.h 2015-11-29 09:23:09.601614714 +0100
@@ -147,9 +147,16 @@
# define INIT_PERF_EVENTS(tsk)
#endif
@@ -9487,9 +9593,9 @@ diff -Nur linux-4.1.10.orig/include/linux/init_task.h linux-4.1.10/include/linux
.pids = { \
[PIDTYPE_PID] = INIT_PID_LINK(PIDTYPE_PID), \
[PIDTYPE_PGID] = INIT_PID_LINK(PIDTYPE_PGID), \
-diff -Nur linux-4.1.10.orig/include/linux/interrupt.h linux-4.1.10/include/linux/interrupt.h
---- linux-4.1.10.orig/include/linux/interrupt.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/linux/interrupt.h 2015-10-12 22:33:32.272677018 +0200
+diff -Nur linux-4.1.13.orig/include/linux/interrupt.h linux-4.1.13/include/linux/interrupt.h
+--- linux-4.1.13.orig/include/linux/interrupt.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/linux/interrupt.h 2015-11-29 09:23:09.601614714 +0100
@@ -61,6 +61,7 @@
* interrupt handler after suspending interrupts. For system
* wakeup devices users need to implement wakeup detection in
@@ -9666,9 +9772,9 @@ diff -Nur linux-4.1.10.orig/include/linux/interrupt.h linux-4.1.10/include/linux
/*
* Autoprobing for irqs:
*
-diff -Nur linux-4.1.10.orig/include/linux/io-mapping.h linux-4.1.10/include/linux/io-mapping.h
---- linux-4.1.10.orig/include/linux/io-mapping.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/linux/io-mapping.h 2015-10-12 22:33:32.272677018 +0200
+diff -Nur linux-4.1.13.orig/include/linux/io-mapping.h linux-4.1.13/include/linux/io-mapping.h
+--- linux-4.1.13.orig/include/linux/io-mapping.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/linux/io-mapping.h 2015-11-29 09:23:09.601614714 +0100
@@ -141,6 +141,7 @@
io_mapping_map_atomic_wc(struct io_mapping *mapping,
unsigned long offset)
@@ -9685,9 +9791,9 @@ diff -Nur linux-4.1.10.orig/include/linux/io-mapping.h linux-4.1.10/include/linu
}
/* Non-atomic map/unmap */
-diff -Nur linux-4.1.10.orig/include/linux/irqdesc.h linux-4.1.10/include/linux/irqdesc.h
---- linux-4.1.10.orig/include/linux/irqdesc.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/linux/irqdesc.h 2015-10-12 22:33:32.272677018 +0200
+diff -Nur linux-4.1.13.orig/include/linux/irqdesc.h linux-4.1.13/include/linux/irqdesc.h
+--- linux-4.1.13.orig/include/linux/irqdesc.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/linux/irqdesc.h 2015-11-29 09:23:09.601614714 +0100
@@ -63,6 +63,7 @@
unsigned int irqs_unhandled;
atomic_t threads_handled;
@@ -9696,9 +9802,9 @@ diff -Nur linux-4.1.10.orig/include/linux/irqdesc.h linux-4.1.10/include/linux/i
raw_spinlock_t lock;
struct cpumask *percpu_enabled;
#ifdef CONFIG_SMP
-diff -Nur linux-4.1.10.orig/include/linux/irqflags.h linux-4.1.10/include/linux/irqflags.h
---- linux-4.1.10.orig/include/linux/irqflags.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/linux/irqflags.h 2015-10-12 22:33:32.272677018 +0200
+diff -Nur linux-4.1.13.orig/include/linux/irqflags.h linux-4.1.13/include/linux/irqflags.h
+--- linux-4.1.13.orig/include/linux/irqflags.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/linux/irqflags.h 2015-11-29 09:23:09.601614714 +0100
@@ -25,8 +25,6 @@
# define trace_softirqs_enabled(p) ((p)->softirqs_enabled)
# define trace_hardirq_enter() do { current->hardirq_context++; } while (0)
@@ -9749,9 +9855,9 @@ diff -Nur linux-4.1.10.orig/include/linux/irqflags.h linux-4.1.10/include/linux/
+#endif
+
#endif
-diff -Nur linux-4.1.10.orig/include/linux/irq.h linux-4.1.10/include/linux/irq.h
---- linux-4.1.10.orig/include/linux/irq.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/linux/irq.h 2015-10-12 22:33:32.276676754 +0200
+diff -Nur linux-4.1.13.orig/include/linux/irq.h linux-4.1.13/include/linux/irq.h
+--- linux-4.1.13.orig/include/linux/irq.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/linux/irq.h 2015-11-29 09:23:09.601614714 +0100
@@ -72,6 +72,7 @@
* IRQ_IS_POLLED - Always polled by another interrupt. Exclude
* it from the spurious interrupt detection
@@ -9776,9 +9882,9 @@ diff -Nur linux-4.1.10.orig/include/linux/irq.h linux-4.1.10/include/linux/irq.h
#define IRQ_NO_BALANCING_MASK (IRQ_PER_CPU | IRQ_NO_BALANCING)
-diff -Nur linux-4.1.10.orig/include/linux/irq_work.h linux-4.1.10/include/linux/irq_work.h
---- linux-4.1.10.orig/include/linux/irq_work.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/linux/irq_work.h 2015-10-12 22:33:32.276676754 +0200
+diff -Nur linux-4.1.13.orig/include/linux/irq_work.h linux-4.1.13/include/linux/irq_work.h
+--- linux-4.1.13.orig/include/linux/irq_work.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/linux/irq_work.h 2015-11-29 09:23:09.601614714 +0100
@@ -16,6 +16,7 @@
#define IRQ_WORK_BUSY 2UL
#define IRQ_WORK_FLAGS 3UL
@@ -9787,9 +9893,20 @@ diff -Nur linux-4.1.10.orig/include/linux/irq_work.h linux-4.1.10/include/linux/
struct irq_work {
unsigned long flags;
-diff -Nur linux-4.1.10.orig/include/linux/jbd_common.h linux-4.1.10/include/linux/jbd_common.h
---- linux-4.1.10.orig/include/linux/jbd_common.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/linux/jbd_common.h 2015-10-12 22:33:32.276676754 +0200
+@@ -51,4 +52,10 @@
+ static inline void irq_work_run(void) { }
+ #endif
+
++#if defined(CONFIG_IRQ_WORK) && defined(CONFIG_PREEMPT_RT_FULL)
++void irq_work_tick_soft(void);
++#else
++static inline void irq_work_tick_soft(void) { }
++#endif
++
+ #endif /* _LINUX_IRQ_WORK_H */
+diff -Nur linux-4.1.13.orig/include/linux/jbd_common.h linux-4.1.13/include/linux/jbd_common.h
+--- linux-4.1.13.orig/include/linux/jbd_common.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/linux/jbd_common.h 2015-11-29 09:23:09.601614714 +0100
@@ -15,32 +15,56 @@
static inline void jbd_lock_bh_state(struct buffer_head *bh)
@@ -9847,9 +9964,9 @@ diff -Nur linux-4.1.10.orig/include/linux/jbd_common.h linux-4.1.10/include/linu
}
#endif
-diff -Nur linux-4.1.10.orig/include/linux/kdb.h linux-4.1.10/include/linux/kdb.h
---- linux-4.1.10.orig/include/linux/kdb.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/linux/kdb.h 2015-10-12 22:33:32.276676754 +0200
+diff -Nur linux-4.1.13.orig/include/linux/kdb.h linux-4.1.13/include/linux/kdb.h
+--- linux-4.1.13.orig/include/linux/kdb.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/linux/kdb.h 2015-11-29 09:23:09.601614714 +0100
@@ -167,6 +167,7 @@
extern __printf(1, 2) int kdb_printf(const char *, ...);
typedef __printf(1, 2) int (*kdb_printf_t)(const char *, ...);
@@ -9866,9 +9983,9 @@ diff -Nur linux-4.1.10.orig/include/linux/kdb.h linux-4.1.10/include/linux/kdb.h
static inline void kdb_init(int level) {}
static inline int kdb_register(char *cmd, kdb_func_t func, char *usage,
char *help, short minlen) { return 0; }
-diff -Nur linux-4.1.10.orig/include/linux/kernel.h linux-4.1.10/include/linux/kernel.h
---- linux-4.1.10.orig/include/linux/kernel.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/linux/kernel.h 2015-10-12 22:33:32.276676754 +0200
+diff -Nur linux-4.1.13.orig/include/linux/kernel.h linux-4.1.13/include/linux/kernel.h
+--- linux-4.1.13.orig/include/linux/kernel.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/linux/kernel.h 2015-11-29 09:23:09.601614714 +0100
@@ -188,6 +188,9 @@
*/
# define might_sleep() \
@@ -9905,9 +10022,9 @@ diff -Nur linux-4.1.10.orig/include/linux/kernel.h linux-4.1.10/include/linux/ke
} system_state;
#define TAINT_PROPRIETARY_MODULE 0
-diff -Nur linux-4.1.10.orig/include/linux/kvm_host.h linux-4.1.10/include/linux/kvm_host.h
---- linux-4.1.10.orig/include/linux/kvm_host.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/linux/kvm_host.h 2015-10-12 22:33:32.276676754 +0200
+diff -Nur linux-4.1.13.orig/include/linux/kvm_host.h linux-4.1.13/include/linux/kvm_host.h
+--- linux-4.1.13.orig/include/linux/kvm_host.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/linux/kvm_host.h 2015-11-29 09:23:09.601614714 +0100
@@ -230,7 +230,7 @@
int fpu_active;
@@ -9926,9 +10043,9 @@ diff -Nur linux-4.1.10.orig/include/linux/kvm_host.h linux-4.1.10/include/linux/
{
#ifdef __KVM_HAVE_ARCH_WQP
return vcpu->arch.wqp;
-diff -Nur linux-4.1.10.orig/include/linux/lglock.h linux-4.1.10/include/linux/lglock.h
---- linux-4.1.10.orig/include/linux/lglock.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/linux/lglock.h 2015-10-12 22:33:32.276676754 +0200
+diff -Nur linux-4.1.13.orig/include/linux/lglock.h linux-4.1.13/include/linux/lglock.h
+--- linux-4.1.13.orig/include/linux/lglock.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/linux/lglock.h 2015-11-29 09:23:09.601614714 +0100
@@ -34,22 +34,39 @@
#endif
@@ -9984,9 +10101,9 @@ diff -Nur linux-4.1.10.orig/include/linux/lglock.h linux-4.1.10/include/linux/lg
#else
/* When !CONFIG_SMP, map lglock to spinlock */
#define lglock spinlock
-diff -Nur linux-4.1.10.orig/include/linux/list_bl.h linux-4.1.10/include/linux/list_bl.h
---- linux-4.1.10.orig/include/linux/list_bl.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/linux/list_bl.h 2015-10-12 22:33:32.276676754 +0200
+diff -Nur linux-4.1.13.orig/include/linux/list_bl.h linux-4.1.13/include/linux/list_bl.h
+--- linux-4.1.13.orig/include/linux/list_bl.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/linux/list_bl.h 2015-11-29 09:23:09.601614714 +0100
@@ -2,6 +2,7 @@
#define _LINUX_LIST_BL_H
@@ -10047,9 +10164,9 @@ diff -Nur linux-4.1.10.orig/include/linux/list_bl.h linux-4.1.10/include/linux/l
}
static inline bool hlist_bl_is_locked(struct hlist_bl_head *b)
-diff -Nur linux-4.1.10.orig/include/linux/locallock.h linux-4.1.10/include/linux/locallock.h
---- linux-4.1.10.orig/include/linux/locallock.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.1.10/include/linux/locallock.h 2015-10-12 22:33:32.276676754 +0200
+diff -Nur linux-4.1.13.orig/include/linux/locallock.h linux-4.1.13/include/linux/locallock.h
+--- linux-4.1.13.orig/include/linux/locallock.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.13/include/linux/locallock.h 2015-11-29 09:23:09.605614450 +0100
@@ -0,0 +1,270 @@
+#ifndef _LINUX_LOCALLOCK_H
+#define _LINUX_LOCALLOCK_H
@@ -10321,9 +10438,9 @@ diff -Nur linux-4.1.10.orig/include/linux/locallock.h linux-4.1.10/include/linux
+#endif
+
+#endif
-diff -Nur linux-4.1.10.orig/include/linux/mm_types.h linux-4.1.10/include/linux/mm_types.h
---- linux-4.1.10.orig/include/linux/mm_types.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/linux/mm_types.h 2015-10-12 22:33:32.276676754 +0200
+diff -Nur linux-4.1.13.orig/include/linux/mm_types.h linux-4.1.13/include/linux/mm_types.h
+--- linux-4.1.13.orig/include/linux/mm_types.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/linux/mm_types.h 2015-11-29 09:23:09.605614450 +0100
@@ -11,6 +11,7 @@
#include <linux/completion.h>
#include <linux/cpumask.h>
@@ -10342,9 +10459,9 @@ diff -Nur linux-4.1.10.orig/include/linux/mm_types.h linux-4.1.10/include/linux/
#ifdef CONFIG_X86_INTEL_MPX
/* address of the bounds directory */
void __user *bd_addr;
-diff -Nur linux-4.1.10.orig/include/linux/mutex.h linux-4.1.10/include/linux/mutex.h
---- linux-4.1.10.orig/include/linux/mutex.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/linux/mutex.h 2015-10-12 22:33:32.276676754 +0200
+diff -Nur linux-4.1.13.orig/include/linux/mutex.h linux-4.1.13/include/linux/mutex.h
+--- linux-4.1.13.orig/include/linux/mutex.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/linux/mutex.h 2015-11-29 09:23:09.609614185 +0100
@@ -19,6 +19,17 @@
#include <asm/processor.h>
#include <linux/osq_lock.h>
@@ -10386,9 +10503,9 @@ diff -Nur linux-4.1.10.orig/include/linux/mutex.h linux-4.1.10/include/linux/mut
extern int atomic_dec_and_mutex_lock(atomic_t *cnt, struct mutex *lock);
#endif /* __LINUX_MUTEX_H */
-diff -Nur linux-4.1.10.orig/include/linux/mutex_rt.h linux-4.1.10/include/linux/mutex_rt.h
---- linux-4.1.10.orig/include/linux/mutex_rt.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.1.10/include/linux/mutex_rt.h 2015-10-12 22:33:32.276676754 +0200
+diff -Nur linux-4.1.13.orig/include/linux/mutex_rt.h linux-4.1.13/include/linux/mutex_rt.h
+--- linux-4.1.13.orig/include/linux/mutex_rt.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.13/include/linux/mutex_rt.h 2015-11-29 09:23:09.609614185 +0100
@@ -0,0 +1,84 @@
+#ifndef __LINUX_MUTEX_RT_H
+#define __LINUX_MUTEX_RT_H
@@ -10474,9 +10591,9 @@ diff -Nur linux-4.1.10.orig/include/linux/mutex_rt.h linux-4.1.10/include/linux/
+} while (0)
+
+#endif
-diff -Nur linux-4.1.10.orig/include/linux/netdevice.h linux-4.1.10/include/linux/netdevice.h
---- linux-4.1.10.orig/include/linux/netdevice.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/linux/netdevice.h 2015-10-12 22:33:32.276676754 +0200
+diff -Nur linux-4.1.13.orig/include/linux/netdevice.h linux-4.1.13/include/linux/netdevice.h
+--- linux-4.1.13.orig/include/linux/netdevice.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/linux/netdevice.h 2015-11-29 09:23:09.609614185 +0100
@@ -2469,6 +2469,7 @@
unsigned int dropped;
struct sk_buff_head input_pkt_queue;
@@ -10485,9 +10602,9 @@ diff -Nur linux-4.1.10.orig/include/linux/netdevice.h linux-4.1.10/include/linux
};
-diff -Nur linux-4.1.10.orig/include/linux/netfilter/x_tables.h linux-4.1.10/include/linux/netfilter/x_tables.h
---- linux-4.1.10.orig/include/linux/netfilter/x_tables.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/linux/netfilter/x_tables.h 2015-10-12 22:33:32.276676754 +0200
+diff -Nur linux-4.1.13.orig/include/linux/netfilter/x_tables.h linux-4.1.13/include/linux/netfilter/x_tables.h
+--- linux-4.1.13.orig/include/linux/netfilter/x_tables.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/linux/netfilter/x_tables.h 2015-11-29 09:23:09.609614185 +0100
@@ -3,6 +3,7 @@
@@ -10523,9 +10640,9 @@ diff -Nur linux-4.1.10.orig/include/linux/netfilter/x_tables.h linux-4.1.10/incl
}
/*
-diff -Nur linux-4.1.10.orig/include/linux/notifier.h linux-4.1.10/include/linux/notifier.h
---- linux-4.1.10.orig/include/linux/notifier.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/linux/notifier.h 2015-10-12 22:33:32.276676754 +0200
+diff -Nur linux-4.1.13.orig/include/linux/notifier.h linux-4.1.13/include/linux/notifier.h
+--- linux-4.1.13.orig/include/linux/notifier.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/linux/notifier.h 2015-11-29 09:23:09.609614185 +0100
@@ -6,7 +6,7 @@
*
* Alan Cox <Alan.Cox@linux.org>
@@ -10605,9 +10722,9 @@ diff -Nur linux-4.1.10.orig/include/linux/notifier.h linux-4.1.10/include/linux/
/* CPU notfiers are defined in include/linux/cpu.h. */
/* netdevice notifiers are defined in include/linux/netdevice.h */
-diff -Nur linux-4.1.10.orig/include/linux/percpu.h linux-4.1.10/include/linux/percpu.h
---- linux-4.1.10.orig/include/linux/percpu.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/linux/percpu.h 2015-10-12 22:33:32.276676754 +0200
+diff -Nur linux-4.1.13.orig/include/linux/percpu.h linux-4.1.13/include/linux/percpu.h
+--- linux-4.1.13.orig/include/linux/percpu.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/linux/percpu.h 2015-11-29 09:23:09.609614185 +0100
@@ -24,6 +24,35 @@
PERCPU_MODULE_RESERVE)
#endif
@@ -10644,9 +10761,9 @@ diff -Nur linux-4.1.10.orig/include/linux/percpu.h linux-4.1.10/include/linux/pe
/* minimum unit size, also is the maximum supported allocation size */
#define PCPU_MIN_UNIT_SIZE PFN_ALIGN(32 << 10)
-diff -Nur linux-4.1.10.orig/include/linux/pid.h linux-4.1.10/include/linux/pid.h
---- linux-4.1.10.orig/include/linux/pid.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/linux/pid.h 2015-10-12 22:33:32.276676754 +0200
+diff -Nur linux-4.1.13.orig/include/linux/pid.h linux-4.1.13/include/linux/pid.h
+--- linux-4.1.13.orig/include/linux/pid.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/linux/pid.h 2015-11-29 09:23:09.609614185 +0100
@@ -2,6 +2,7 @@
#define _LINUX_PID_H
@@ -10655,10 +10772,10 @@ diff -Nur linux-4.1.10.orig/include/linux/pid.h linux-4.1.10/include/linux/pid.h
enum pid_type
{
-diff -Nur linux-4.1.10.orig/include/linux/preempt.h linux-4.1.10/include/linux/preempt.h
---- linux-4.1.10.orig/include/linux/preempt.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/linux/preempt.h 2015-10-12 22:33:32.276676754 +0200
-@@ -33,6 +33,20 @@
+diff -Nur linux-4.1.13.orig/include/linux/preempt.h linux-4.1.13/include/linux/preempt.h
+--- linux-4.1.13.orig/include/linux/preempt.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/linux/preempt.h 2015-11-29 09:23:09.609614185 +0100
+@@ -34,6 +34,20 @@
#define preempt_count_inc() preempt_count_add(1)
#define preempt_count_dec() preempt_count_sub(1)
@@ -10679,7 +10796,7 @@ diff -Nur linux-4.1.10.orig/include/linux/preempt.h linux-4.1.10/include/linux/p
#ifdef CONFIG_PREEMPT_COUNT
#define preempt_disable() \
-@@ -41,13 +55,25 @@
+@@ -42,13 +56,25 @@
barrier(); \
} while (0)
@@ -10706,7 +10823,7 @@ diff -Nur linux-4.1.10.orig/include/linux/preempt.h linux-4.1.10/include/linux/p
#ifdef CONFIG_PREEMPT
#define preempt_enable() \
-@@ -63,6 +89,13 @@
+@@ -64,6 +90,13 @@
__preempt_schedule(); \
} while (0)
@@ -10720,7 +10837,7 @@ diff -Nur linux-4.1.10.orig/include/linux/preempt.h linux-4.1.10/include/linux/p
#else
#define preempt_enable() \
do { \
-@@ -121,6 +154,7 @@
+@@ -122,6 +155,7 @@
#define preempt_disable_notrace() barrier()
#define preempt_enable_no_resched_notrace() barrier()
#define preempt_enable_notrace() barrier()
@@ -10728,7 +10845,7 @@ diff -Nur linux-4.1.10.orig/include/linux/preempt.h linux-4.1.10/include/linux/p
#endif /* CONFIG_PREEMPT_COUNT */
-@@ -140,10 +174,31 @@
+@@ -141,10 +175,31 @@
} while (0)
#define preempt_fold_need_resched() \
do { \
@@ -10761,9 +10878,9 @@ diff -Nur linux-4.1.10.orig/include/linux/preempt.h linux-4.1.10/include/linux/p
#ifdef CONFIG_PREEMPT_NOTIFIERS
struct preempt_notifier;
-diff -Nur linux-4.1.10.orig/include/linux/preempt_mask.h linux-4.1.10/include/linux/preempt_mask.h
---- linux-4.1.10.orig/include/linux/preempt_mask.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/linux/preempt_mask.h 2015-10-12 22:33:32.276676754 +0200
+diff -Nur linux-4.1.13.orig/include/linux/preempt_mask.h linux-4.1.13/include/linux/preempt_mask.h
+--- linux-4.1.13.orig/include/linux/preempt_mask.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/linux/preempt_mask.h 2015-11-29 09:23:09.609614185 +0100
@@ -44,16 +44,26 @@
#define HARDIRQ_OFFSET (1UL << HARDIRQ_SHIFT)
#define NMI_OFFSET (1UL << NMI_SHIFT)
@@ -10801,9 +10918,21 @@ diff -Nur linux-4.1.10.orig/include/linux/preempt_mask.h linux-4.1.10/include/li
/*
* Are we in NMI context?
-diff -Nur linux-4.1.10.orig/include/linux/printk.h linux-4.1.10/include/linux/printk.h
---- linux-4.1.10.orig/include/linux/printk.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/linux/printk.h 2015-10-12 22:33:32.276676754 +0200
+@@ -83,7 +92,11 @@
+ /*
+ * The preempt_count offset after spin_lock()
+ */
++#if !defined(CONFIG_PREEMPT_RT_FULL)
+ #define PREEMPT_LOCK_OFFSET PREEMPT_DISABLE_OFFSET
++#else
++#define PREEMPT_LOCK_OFFSET 0
++#endif
+
+ /*
+ * The preempt_count offset needed for things like:
+diff -Nur linux-4.1.13.orig/include/linux/printk.h linux-4.1.13/include/linux/printk.h
+--- linux-4.1.13.orig/include/linux/printk.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/linux/printk.h 2015-11-29 09:23:09.609614185 +0100
@@ -115,9 +115,11 @@
#ifdef CONFIG_EARLY_PRINTK
extern asmlinkage __printf(1, 2)
@@ -10816,9 +10945,9 @@ diff -Nur linux-4.1.10.orig/include/linux/printk.h linux-4.1.10/include/linux/pr
#endif
typedef int(*printk_func_t)(const char *fmt, va_list args);
-diff -Nur linux-4.1.10.orig/include/linux/radix-tree.h linux-4.1.10/include/linux/radix-tree.h
---- linux-4.1.10.orig/include/linux/radix-tree.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/linux/radix-tree.h 2015-10-12 22:33:32.280676490 +0200
+diff -Nur linux-4.1.13.orig/include/linux/radix-tree.h linux-4.1.13/include/linux/radix-tree.h
+--- linux-4.1.13.orig/include/linux/radix-tree.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/linux/radix-tree.h 2015-11-29 09:23:09.609614185 +0100
@@ -277,8 +277,13 @@
unsigned int radix_tree_gang_lookup_slot(struct radix_tree_root *root,
void ***results, unsigned long *indices,
@@ -10842,9 +10971,9 @@ diff -Nur linux-4.1.10.orig/include/linux/radix-tree.h linux-4.1.10/include/linu
}
/**
-diff -Nur linux-4.1.10.orig/include/linux/random.h linux-4.1.10/include/linux/random.h
---- linux-4.1.10.orig/include/linux/random.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/linux/random.h 2015-10-12 22:33:32.280676490 +0200
+diff -Nur linux-4.1.13.orig/include/linux/random.h linux-4.1.13/include/linux/random.h
+--- linux-4.1.13.orig/include/linux/random.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/linux/random.h 2015-11-29 09:23:09.609614185 +0100
@@ -11,7 +11,7 @@
extern void add_device_randomness(const void *, unsigned int);
extern void add_input_randomness(unsigned int type, unsigned int code,
@@ -10854,9 +10983,9 @@ diff -Nur linux-4.1.10.orig/include/linux/random.h linux-4.1.10/include/linux/ra
extern void get_random_bytes(void *buf, int nbytes);
extern void get_random_bytes_arch(void *buf, int nbytes);
-diff -Nur linux-4.1.10.orig/include/linux/rcupdate.h linux-4.1.10/include/linux/rcupdate.h
---- linux-4.1.10.orig/include/linux/rcupdate.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/linux/rcupdate.h 2015-10-12 22:33:32.280676490 +0200
+diff -Nur linux-4.1.13.orig/include/linux/rcupdate.h linux-4.1.13/include/linux/rcupdate.h
+--- linux-4.1.13.orig/include/linux/rcupdate.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/linux/rcupdate.h 2015-11-29 09:23:09.609614185 +0100
@@ -167,6 +167,9 @@
#endif /* #else #ifdef CONFIG_PREEMPT_RCU */
@@ -10941,9 +11070,9 @@ diff -Nur linux-4.1.10.orig/include/linux/rcupdate.h linux-4.1.10/include/linux/
local_bh_enable();
}
-diff -Nur linux-4.1.10.orig/include/linux/rcutree.h linux-4.1.10/include/linux/rcutree.h
---- linux-4.1.10.orig/include/linux/rcutree.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/linux/rcutree.h 2015-10-12 22:33:32.280676490 +0200
+diff -Nur linux-4.1.13.orig/include/linux/rcutree.h linux-4.1.13/include/linux/rcutree.h
+--- linux-4.1.13.orig/include/linux/rcutree.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/linux/rcutree.h 2015-11-29 09:23:09.609614185 +0100
@@ -46,7 +46,11 @@
rcu_note_context_switch();
}
@@ -10996,9 +11125,9 @@ diff -Nur linux-4.1.10.orig/include/linux/rcutree.h linux-4.1.10/include/linux/r
void rcu_all_qs(void);
#endif /* __LINUX_RCUTREE_H */
-diff -Nur linux-4.1.10.orig/include/linux/rtmutex.h linux-4.1.10/include/linux/rtmutex.h
---- linux-4.1.10.orig/include/linux/rtmutex.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/linux/rtmutex.h 2015-10-12 22:33:32.280676490 +0200
+diff -Nur linux-4.1.13.orig/include/linux/rtmutex.h linux-4.1.13/include/linux/rtmutex.h
+--- linux-4.1.13.orig/include/linux/rtmutex.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/linux/rtmutex.h 2015-11-29 09:23:09.609614185 +0100
@@ -14,10 +14,14 @@
#include <linux/linkage.h>
@@ -11072,9 +11201,9 @@ diff -Nur linux-4.1.10.orig/include/linux/rtmutex.h linux-4.1.10/include/linux/r
extern int rt_mutex_timed_lock(struct rt_mutex *lock,
struct hrtimer_sleeper *timeout);
-diff -Nur linux-4.1.10.orig/include/linux/rwlock_rt.h linux-4.1.10/include/linux/rwlock_rt.h
---- linux-4.1.10.orig/include/linux/rwlock_rt.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.1.10/include/linux/rwlock_rt.h 2015-10-12 22:33:32.280676490 +0200
+diff -Nur linux-4.1.13.orig/include/linux/rwlock_rt.h linux-4.1.13/include/linux/rwlock_rt.h
+--- linux-4.1.13.orig/include/linux/rwlock_rt.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.13/include/linux/rwlock_rt.h 2015-11-29 09:23:09.609614185 +0100
@@ -0,0 +1,99 @@
+#ifndef __LINUX_RWLOCK_RT_H
+#define __LINUX_RWLOCK_RT_H
@@ -11175,9 +11304,9 @@ diff -Nur linux-4.1.10.orig/include/linux/rwlock_rt.h linux-4.1.10/include/linux
+ } while (0)
+
+#endif
-diff -Nur linux-4.1.10.orig/include/linux/rwlock_types.h linux-4.1.10/include/linux/rwlock_types.h
---- linux-4.1.10.orig/include/linux/rwlock_types.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/linux/rwlock_types.h 2015-10-12 22:33:32.280676490 +0200
+diff -Nur linux-4.1.13.orig/include/linux/rwlock_types.h linux-4.1.13/include/linux/rwlock_types.h
+--- linux-4.1.13.orig/include/linux/rwlock_types.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/linux/rwlock_types.h 2015-11-29 09:23:09.609614185 +0100
@@ -1,6 +1,10 @@
#ifndef __LINUX_RWLOCK_TYPES_H
#define __LINUX_RWLOCK_TYPES_H
@@ -11198,9 +11327,9 @@ diff -Nur linux-4.1.10.orig/include/linux/rwlock_types.h linux-4.1.10/include/li
+ rwlock_t name __cacheline_aligned_in_smp = __RW_LOCK_UNLOCKED(name)
#endif /* __LINUX_RWLOCK_TYPES_H */
-diff -Nur linux-4.1.10.orig/include/linux/rwlock_types_rt.h linux-4.1.10/include/linux/rwlock_types_rt.h
---- linux-4.1.10.orig/include/linux/rwlock_types_rt.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.1.10/include/linux/rwlock_types_rt.h 2015-10-12 22:33:32.280676490 +0200
+diff -Nur linux-4.1.13.orig/include/linux/rwlock_types_rt.h linux-4.1.13/include/linux/rwlock_types_rt.h
+--- linux-4.1.13.orig/include/linux/rwlock_types_rt.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.13/include/linux/rwlock_types_rt.h 2015-11-29 09:23:09.609614185 +0100
@@ -0,0 +1,33 @@
+#ifndef __LINUX_RWLOCK_TYPES_RT_H
+#define __LINUX_RWLOCK_TYPES_RT_H
@@ -11235,9 +11364,9 @@ diff -Nur linux-4.1.10.orig/include/linux/rwlock_types_rt.h linux-4.1.10/include
+ rwlock_t name __cacheline_aligned_in_smp = __RW_LOCK_UNLOCKED(name)
+
+#endif
-diff -Nur linux-4.1.10.orig/include/linux/rwsem.h linux-4.1.10/include/linux/rwsem.h
---- linux-4.1.10.orig/include/linux/rwsem.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/linux/rwsem.h 2015-10-12 22:33:32.280676490 +0200
+diff -Nur linux-4.1.13.orig/include/linux/rwsem.h linux-4.1.13/include/linux/rwsem.h
+--- linux-4.1.13.orig/include/linux/rwsem.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/linux/rwsem.h 2015-11-29 09:23:09.609614185 +0100
@@ -18,6 +18,10 @@
#include <linux/osq_lock.h>
#endif
@@ -11256,9 +11385,9 @@ diff -Nur linux-4.1.10.orig/include/linux/rwsem.h linux-4.1.10/include/linux/rws
+#endif /* !PREEMPT_RT_FULL */
+
#endif /* _LINUX_RWSEM_H */
-diff -Nur linux-4.1.10.orig/include/linux/rwsem_rt.h linux-4.1.10/include/linux/rwsem_rt.h
---- linux-4.1.10.orig/include/linux/rwsem_rt.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.1.10/include/linux/rwsem_rt.h 2015-10-12 22:33:32.280676490 +0200
+diff -Nur linux-4.1.13.orig/include/linux/rwsem_rt.h linux-4.1.13/include/linux/rwsem_rt.h
+--- linux-4.1.13.orig/include/linux/rwsem_rt.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.13/include/linux/rwsem_rt.h 2015-11-29 09:23:09.609614185 +0100
@@ -0,0 +1,140 @@
+#ifndef _LINUX_RWSEM_RT_H
+#define _LINUX_RWSEM_RT_H
@@ -11400,9 +11529,9 @@ diff -Nur linux-4.1.10.orig/include/linux/rwsem_rt.h linux-4.1.10/include/linux/
+}
+#endif
+#endif
-diff -Nur linux-4.1.10.orig/include/linux/sched.h linux-4.1.10/include/linux/sched.h
---- linux-4.1.10.orig/include/linux/sched.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/linux/sched.h 2015-10-12 22:33:32.280676490 +0200
+diff -Nur linux-4.1.13.orig/include/linux/sched.h linux-4.1.13/include/linux/sched.h
+--- linux-4.1.13.orig/include/linux/sched.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/linux/sched.h 2015-11-29 09:23:09.617613651 +0100
@@ -26,6 +26,7 @@
#include <linux/nodemask.h>
#include <linux/mm_types.h>
@@ -11773,16 +11902,7 @@ diff -Nur linux-4.1.10.orig/include/linux/sched.h linux-4.1.10/include/linux/sch
/*
* cond_resched() and cond_resched_lock(): latency reduction via
* explicit rescheduling in places that are safe. The return
-@@ -2834,7 +3027,7 @@
-
- extern int __cond_resched_lock(spinlock_t *lock);
-
--#ifdef CONFIG_PREEMPT_COUNT
-+#if defined(CONFIG_PREEMPT_COUNT) && !defined(CONFIG_PREEMPT_RT_FULL)
- #define PREEMPT_LOCK_OFFSET PREEMPT_OFFSET
- #else
- #define PREEMPT_LOCK_OFFSET 0
-@@ -2845,12 +3038,16 @@
+@@ -2839,12 +3032,16 @@
__cond_resched_lock(lock); \
})
@@ -11799,7 +11919,7 @@ diff -Nur linux-4.1.10.orig/include/linux/sched.h linux-4.1.10/include/linux/sch
static inline void cond_resched_rcu(void)
{
-@@ -3017,6 +3214,26 @@
+@@ -3011,6 +3208,26 @@
#endif /* CONFIG_SMP */
@@ -11826,9 +11946,9 @@ diff -Nur linux-4.1.10.orig/include/linux/sched.h linux-4.1.10/include/linux/sch
extern long sched_setaffinity(pid_t pid, const struct cpumask *new_mask);
extern long sched_getaffinity(pid_t pid, struct cpumask *mask);
-diff -Nur linux-4.1.10.orig/include/linux/seqlock.h linux-4.1.10/include/linux/seqlock.h
---- linux-4.1.10.orig/include/linux/seqlock.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/linux/seqlock.h 2015-10-12 22:33:32.280676490 +0200
+diff -Nur linux-4.1.13.orig/include/linux/seqlock.h linux-4.1.13/include/linux/seqlock.h
+--- linux-4.1.13.orig/include/linux/seqlock.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/linux/seqlock.h 2015-11-29 09:23:09.617613651 +0100
@@ -219,20 +219,30 @@
return __read_seqcount_retry(s, start);
}
@@ -11958,9 +12078,9 @@ diff -Nur linux-4.1.10.orig/include/linux/seqlock.h linux-4.1.10/include/linux/s
spin_unlock_irqrestore(&sl->lock, flags);
}
-diff -Nur linux-4.1.10.orig/include/linux/signal.h linux-4.1.10/include/linux/signal.h
---- linux-4.1.10.orig/include/linux/signal.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/linux/signal.h 2015-10-12 22:33:32.280676490 +0200
+diff -Nur linux-4.1.13.orig/include/linux/signal.h linux-4.1.13/include/linux/signal.h
+--- linux-4.1.13.orig/include/linux/signal.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/linux/signal.h 2015-11-29 09:23:09.617613651 +0100
@@ -218,6 +218,7 @@
}
@@ -11969,9 +12089,9 @@ diff -Nur linux-4.1.10.orig/include/linux/signal.h linux-4.1.10/include/linux/si
/* Test if 'sig' is valid signal. Use this instead of testing _NSIG directly */
static inline int valid_signal(unsigned long sig)
-diff -Nur linux-4.1.10.orig/include/linux/skbuff.h linux-4.1.10/include/linux/skbuff.h
---- linux-4.1.10.orig/include/linux/skbuff.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/linux/skbuff.h 2015-10-12 22:33:32.280676490 +0200
+diff -Nur linux-4.1.13.orig/include/linux/skbuff.h linux-4.1.13/include/linux/skbuff.h
+--- linux-4.1.13.orig/include/linux/skbuff.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/linux/skbuff.h 2015-11-29 09:23:09.617613651 +0100
@@ -187,6 +187,7 @@
__u32 qlen;
@@ -11993,9 +12113,9 @@ diff -Nur linux-4.1.10.orig/include/linux/skbuff.h linux-4.1.10/include/linux/sk
static inline void skb_queue_head_init_class(struct sk_buff_head *list,
struct lock_class_key *class)
{
-diff -Nur linux-4.1.10.orig/include/linux/smp.h linux-4.1.10/include/linux/smp.h
---- linux-4.1.10.orig/include/linux/smp.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/linux/smp.h 2015-10-12 22:33:32.280676490 +0200
+diff -Nur linux-4.1.13.orig/include/linux/smp.h linux-4.1.13/include/linux/smp.h
+--- linux-4.1.13.orig/include/linux/smp.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/linux/smp.h 2015-11-29 09:23:09.617613651 +0100
@@ -185,6 +185,9 @@
#define get_cpu() ({ preempt_disable(); smp_processor_id(); })
#define put_cpu() preempt_enable()
@@ -12006,9 +12126,9 @@ diff -Nur linux-4.1.10.orig/include/linux/smp.h linux-4.1.10/include/linux/smp.h
/*
* Callback to arch code if there's nosmp or maxcpus=0 on the
* boot command line:
-diff -Nur linux-4.1.10.orig/include/linux/spinlock_api_smp.h linux-4.1.10/include/linux/spinlock_api_smp.h
---- linux-4.1.10.orig/include/linux/spinlock_api_smp.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/linux/spinlock_api_smp.h 2015-10-12 22:33:32.280676490 +0200
+diff -Nur linux-4.1.13.orig/include/linux/spinlock_api_smp.h linux-4.1.13/include/linux/spinlock_api_smp.h
+--- linux-4.1.13.orig/include/linux/spinlock_api_smp.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/linux/spinlock_api_smp.h 2015-11-29 09:23:09.617613651 +0100
@@ -189,6 +189,8 @@
return 0;
}
@@ -12019,9 +12139,9 @@ diff -Nur linux-4.1.10.orig/include/linux/spinlock_api_smp.h linux-4.1.10/includ
+#endif
#endif /* __LINUX_SPINLOCK_API_SMP_H */
-diff -Nur linux-4.1.10.orig/include/linux/spinlock.h linux-4.1.10/include/linux/spinlock.h
---- linux-4.1.10.orig/include/linux/spinlock.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/linux/spinlock.h 2015-10-12 22:33:32.280676490 +0200
+diff -Nur linux-4.1.13.orig/include/linux/spinlock.h linux-4.1.13/include/linux/spinlock.h
+--- linux-4.1.13.orig/include/linux/spinlock.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/linux/spinlock.h 2015-11-29 09:23:09.617613651 +0100
@@ -281,7 +281,11 @@
#define raw_spin_can_lock(lock) (!raw_spin_is_locked(lock))
@@ -12053,9 +12173,9 @@ diff -Nur linux-4.1.10.orig/include/linux/spinlock.h linux-4.1.10/include/linux/
+#endif /* !PREEMPT_RT_FULL */
+
#endif /* __LINUX_SPINLOCK_H */
-diff -Nur linux-4.1.10.orig/include/linux/spinlock_rt.h linux-4.1.10/include/linux/spinlock_rt.h
---- linux-4.1.10.orig/include/linux/spinlock_rt.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.1.10/include/linux/spinlock_rt.h 2015-10-12 22:33:32.280676490 +0200
+diff -Nur linux-4.1.13.orig/include/linux/spinlock_rt.h linux-4.1.13/include/linux/spinlock_rt.h
+--- linux-4.1.13.orig/include/linux/spinlock_rt.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.13/include/linux/spinlock_rt.h 2015-11-29 09:23:09.617613651 +0100
@@ -0,0 +1,174 @@
+#ifndef __LINUX_SPINLOCK_RT_H
+#define __LINUX_SPINLOCK_RT_H
@@ -12231,9 +12351,9 @@ diff -Nur linux-4.1.10.orig/include/linux/spinlock_rt.h linux-4.1.10/include/lin
+ atomic_dec_and_spin_lock(atomic, lock)
+
+#endif
-diff -Nur linux-4.1.10.orig/include/linux/spinlock_types.h linux-4.1.10/include/linux/spinlock_types.h
---- linux-4.1.10.orig/include/linux/spinlock_types.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/linux/spinlock_types.h 2015-10-12 22:33:32.280676490 +0200
+diff -Nur linux-4.1.13.orig/include/linux/spinlock_types.h linux-4.1.13/include/linux/spinlock_types.h
+--- linux-4.1.13.orig/include/linux/spinlock_types.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/linux/spinlock_types.h 2015-11-29 09:23:09.617613651 +0100
@@ -9,80 +9,15 @@
* Released under the General Public License (GPL).
*/
@@ -12322,9 +12442,9 @@ diff -Nur linux-4.1.10.orig/include/linux/spinlock_types.h linux-4.1.10/include/
-#include <linux/rwlock_types.h>
-
#endif /* __LINUX_SPINLOCK_TYPES_H */
-diff -Nur linux-4.1.10.orig/include/linux/spinlock_types_nort.h linux-4.1.10/include/linux/spinlock_types_nort.h
---- linux-4.1.10.orig/include/linux/spinlock_types_nort.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.1.10/include/linux/spinlock_types_nort.h 2015-10-12 22:33:32.280676490 +0200
+diff -Nur linux-4.1.13.orig/include/linux/spinlock_types_nort.h linux-4.1.13/include/linux/spinlock_types_nort.h
+--- linux-4.1.13.orig/include/linux/spinlock_types_nort.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.13/include/linux/spinlock_types_nort.h 2015-11-29 09:23:09.617613651 +0100
@@ -0,0 +1,33 @@
+#ifndef __LINUX_SPINLOCK_TYPES_NORT_H
+#define __LINUX_SPINLOCK_TYPES_NORT_H
@@ -12359,9 +12479,9 @@ diff -Nur linux-4.1.10.orig/include/linux/spinlock_types_nort.h linux-4.1.10/inc
+#define DEFINE_SPINLOCK(x) spinlock_t x = __SPIN_LOCK_UNLOCKED(x)
+
+#endif
-diff -Nur linux-4.1.10.orig/include/linux/spinlock_types_raw.h linux-4.1.10/include/linux/spinlock_types_raw.h
---- linux-4.1.10.orig/include/linux/spinlock_types_raw.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.1.10/include/linux/spinlock_types_raw.h 2015-10-12 22:33:32.284676225 +0200
+diff -Nur linux-4.1.13.orig/include/linux/spinlock_types_raw.h linux-4.1.13/include/linux/spinlock_types_raw.h
+--- linux-4.1.13.orig/include/linux/spinlock_types_raw.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.13/include/linux/spinlock_types_raw.h 2015-11-29 09:23:09.617613651 +0100
@@ -0,0 +1,56 @@
+#ifndef __LINUX_SPINLOCK_TYPES_RAW_H
+#define __LINUX_SPINLOCK_TYPES_RAW_H
@@ -12419,9 +12539,9 @@ diff -Nur linux-4.1.10.orig/include/linux/spinlock_types_raw.h linux-4.1.10/incl
+#define DEFINE_RAW_SPINLOCK(x) raw_spinlock_t x = __RAW_SPIN_LOCK_UNLOCKED(x)
+
+#endif
-diff -Nur linux-4.1.10.orig/include/linux/spinlock_types_rt.h linux-4.1.10/include/linux/spinlock_types_rt.h
---- linux-4.1.10.orig/include/linux/spinlock_types_rt.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.1.10/include/linux/spinlock_types_rt.h 2015-10-12 22:33:32.284676225 +0200
+diff -Nur linux-4.1.13.orig/include/linux/spinlock_types_rt.h linux-4.1.13/include/linux/spinlock_types_rt.h
+--- linux-4.1.13.orig/include/linux/spinlock_types_rt.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.13/include/linux/spinlock_types_rt.h 2015-11-29 09:23:09.617613651 +0100
@@ -0,0 +1,51 @@
+#ifndef __LINUX_SPINLOCK_TYPES_RT_H
+#define __LINUX_SPINLOCK_TYPES_RT_H
@@ -12474,9 +12594,9 @@ diff -Nur linux-4.1.10.orig/include/linux/spinlock_types_rt.h linux-4.1.10/inclu
+ spinlock_t name __cacheline_aligned_in_smp = __SPIN_LOCK_UNLOCKED(name)
+
+#endif
-diff -Nur linux-4.1.10.orig/include/linux/srcu.h linux-4.1.10/include/linux/srcu.h
---- linux-4.1.10.orig/include/linux/srcu.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/linux/srcu.h 2015-10-12 22:33:32.284676225 +0200
+diff -Nur linux-4.1.13.orig/include/linux/srcu.h linux-4.1.13/include/linux/srcu.h
+--- linux-4.1.13.orig/include/linux/srcu.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/linux/srcu.h 2015-11-29 09:23:09.617613651 +0100
@@ -84,10 +84,10 @@
void process_srcu(struct work_struct *work);
@@ -12499,9 +12619,9 @@ diff -Nur linux-4.1.10.orig/include/linux/srcu.h linux-4.1.10/include/linux/srcu
#define DEFINE_SRCU(name) __DEFINE_SRCU(name, /* not static */)
#define DEFINE_STATIC_SRCU(name) __DEFINE_SRCU(name, static)
-diff -Nur linux-4.1.10.orig/include/linux/swap.h linux-4.1.10/include/linux/swap.h
---- linux-4.1.10.orig/include/linux/swap.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/linux/swap.h 2015-10-12 22:33:32.284676225 +0200
+diff -Nur linux-4.1.13.orig/include/linux/swap.h linux-4.1.13/include/linux/swap.h
+--- linux-4.1.13.orig/include/linux/swap.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/linux/swap.h 2015-11-29 09:23:09.617613651 +0100
@@ -11,6 +11,7 @@
#include <linux/fs.h>
#include <linux/atomic.h>
@@ -12528,9 +12648,9 @@ diff -Nur linux-4.1.10.orig/include/linux/swap.h linux-4.1.10/include/linux/swap
extern void lru_cache_add(struct page *);
extern void lru_cache_add_anon(struct page *page);
extern void lru_cache_add_file(struct page *page);
-diff -Nur linux-4.1.10.orig/include/linux/thread_info.h linux-4.1.10/include/linux/thread_info.h
---- linux-4.1.10.orig/include/linux/thread_info.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/linux/thread_info.h 2015-10-12 22:33:32.284676225 +0200
+diff -Nur linux-4.1.13.orig/include/linux/thread_info.h linux-4.1.13/include/linux/thread_info.h
+--- linux-4.1.13.orig/include/linux/thread_info.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/linux/thread_info.h 2015-11-29 09:23:09.617613651 +0100
@@ -102,7 +102,17 @@
#define test_thread_flag(flag) \
test_ti_thread_flag(current_thread_info(), flag)
@@ -12550,9 +12670,9 @@ diff -Nur linux-4.1.10.orig/include/linux/thread_info.h linux-4.1.10/include/lin
#if defined TIF_RESTORE_SIGMASK && !defined HAVE_SET_RESTORE_SIGMASK
/*
-diff -Nur linux-4.1.10.orig/include/linux/timer.h linux-4.1.10/include/linux/timer.h
---- linux-4.1.10.orig/include/linux/timer.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/linux/timer.h 2015-10-12 22:33:32.284676225 +0200
+diff -Nur linux-4.1.13.orig/include/linux/timer.h linux-4.1.13/include/linux/timer.h
+--- linux-4.1.13.orig/include/linux/timer.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/linux/timer.h 2015-11-29 09:23:09.617613651 +0100
@@ -241,7 +241,7 @@
extern int try_to_del_timer_sync(struct timer_list *timer);
@@ -12562,9 +12682,9 @@ diff -Nur linux-4.1.10.orig/include/linux/timer.h linux-4.1.10/include/linux/tim
extern int del_timer_sync(struct timer_list *timer);
#else
# define del_timer_sync(t) del_timer(t)
-diff -Nur linux-4.1.10.orig/include/linux/uaccess.h linux-4.1.10/include/linux/uaccess.h
---- linux-4.1.10.orig/include/linux/uaccess.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/linux/uaccess.h 2015-10-12 22:33:32.284676225 +0200
+diff -Nur linux-4.1.13.orig/include/linux/uaccess.h linux-4.1.13/include/linux/uaccess.h
+--- linux-4.1.13.orig/include/linux/uaccess.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/linux/uaccess.h 2015-11-29 09:23:09.617613651 +0100
@@ -1,21 +1,31 @@
#ifndef __LINUX_UACCESS_H__
#define __LINUX_UACCESS_H__
@@ -12643,9 +12763,9 @@ diff -Nur linux-4.1.10.orig/include/linux/uaccess.h linux-4.1.10/include/linux/u
#ifndef ARCH_HAS_NOCACHE_UACCESS
static inline unsigned long __copy_from_user_inatomic_nocache(void *to,
-diff -Nur linux-4.1.10.orig/include/linux/uprobes.h linux-4.1.10/include/linux/uprobes.h
---- linux-4.1.10.orig/include/linux/uprobes.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/linux/uprobes.h 2015-10-12 22:33:32.284676225 +0200
+diff -Nur linux-4.1.13.orig/include/linux/uprobes.h linux-4.1.13/include/linux/uprobes.h
+--- linux-4.1.13.orig/include/linux/uprobes.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/linux/uprobes.h 2015-11-29 09:23:09.617613651 +0100
@@ -27,6 +27,7 @@
#include <linux/errno.h>
#include <linux/rbtree.h>
@@ -12654,9 +12774,9 @@ diff -Nur linux-4.1.10.orig/include/linux/uprobes.h linux-4.1.10/include/linux/u
struct vm_area_struct;
struct mm_struct;
-diff -Nur linux-4.1.10.orig/include/linux/vmstat.h linux-4.1.10/include/linux/vmstat.h
---- linux-4.1.10.orig/include/linux/vmstat.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/linux/vmstat.h 2015-10-12 22:33:32.284676225 +0200
+diff -Nur linux-4.1.13.orig/include/linux/vmstat.h linux-4.1.13/include/linux/vmstat.h
+--- linux-4.1.13.orig/include/linux/vmstat.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/linux/vmstat.h 2015-11-29 09:23:09.617613651 +0100
@@ -33,7 +33,9 @@
*/
static inline void __count_vm_event(enum vm_event_item item)
@@ -12677,9 +12797,9 @@ diff -Nur linux-4.1.10.orig/include/linux/vmstat.h linux-4.1.10/include/linux/vm
}
static inline void count_vm_events(enum vm_event_item item, long delta)
-diff -Nur linux-4.1.10.orig/include/linux/wait.h linux-4.1.10/include/linux/wait.h
---- linux-4.1.10.orig/include/linux/wait.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/linux/wait.h 2015-10-12 22:33:32.284676225 +0200
+diff -Nur linux-4.1.13.orig/include/linux/wait.h linux-4.1.13/include/linux/wait.h
+--- linux-4.1.13.orig/include/linux/wait.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/linux/wait.h 2015-11-29 09:23:09.621613384 +0100
@@ -8,6 +8,7 @@
#include <linux/spinlock.h>
#include <asm/current.h>
@@ -12688,9 +12808,9 @@ diff -Nur linux-4.1.10.orig/include/linux/wait.h linux-4.1.10/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.1.10.orig/include/linux/wait-simple.h linux-4.1.10/include/linux/wait-simple.h
---- linux-4.1.10.orig/include/linux/wait-simple.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.1.10/include/linux/wait-simple.h 2015-10-12 22:33:32.284676225 +0200
+diff -Nur linux-4.1.13.orig/include/linux/wait-simple.h linux-4.1.13/include/linux/wait-simple.h
+--- linux-4.1.13.orig/include/linux/wait-simple.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.13/include/linux/wait-simple.h 2015-11-29 09:23:09.617613651 +0100
@@ -0,0 +1,207 @@
+#ifndef _LINUX_WAIT_SIMPLE_H
+#define _LINUX_WAIT_SIMPLE_H
@@ -12899,9 +13019,9 @@ diff -Nur linux-4.1.10.orig/include/linux/wait-simple.h linux-4.1.10/include/lin
+})
+
+#endif
-diff -Nur linux-4.1.10.orig/include/linux/work-simple.h linux-4.1.10/include/linux/work-simple.h
---- linux-4.1.10.orig/include/linux/work-simple.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.1.10/include/linux/work-simple.h 2015-10-12 22:33:32.284676225 +0200
+diff -Nur linux-4.1.13.orig/include/linux/work-simple.h linux-4.1.13/include/linux/work-simple.h
+--- linux-4.1.13.orig/include/linux/work-simple.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.13/include/linux/work-simple.h 2015-11-29 09:23:09.621613384 +0100
@@ -0,0 +1,24 @@
+#ifndef _LINUX_SWORK_H
+#define _LINUX_SWORK_H
@@ -12927,9 +13047,9 @@ diff -Nur linux-4.1.10.orig/include/linux/work-simple.h linux-4.1.10/include/lin
+void swork_put(void);
+
+#endif /* _LINUX_SWORK_H */
-diff -Nur linux-4.1.10.orig/include/net/dst.h linux-4.1.10/include/net/dst.h
---- linux-4.1.10.orig/include/net/dst.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/net/dst.h 2015-10-12 22:33:32.284676225 +0200
+diff -Nur linux-4.1.13.orig/include/net/dst.h linux-4.1.13/include/net/dst.h
+--- linux-4.1.13.orig/include/net/dst.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/net/dst.h 2015-11-29 09:23:09.629612854 +0100
@@ -403,7 +403,7 @@
static inline int dst_neigh_output(struct dst_entry *dst, struct neighbour *n,
struct sk_buff *skb)
@@ -12939,9 +13059,9 @@ diff -Nur linux-4.1.10.orig/include/net/dst.h linux-4.1.10/include/net/dst.h
if (dst->pending_confirm) {
unsigned long now = jiffies;
-diff -Nur linux-4.1.10.orig/include/net/neighbour.h linux-4.1.10/include/net/neighbour.h
---- linux-4.1.10.orig/include/net/neighbour.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/net/neighbour.h 2015-10-12 22:33:32.284676225 +0200
+diff -Nur linux-4.1.13.orig/include/net/neighbour.h linux-4.1.13/include/net/neighbour.h
+--- linux-4.1.13.orig/include/net/neighbour.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/net/neighbour.h 2015-11-29 09:23:09.629612854 +0100
@@ -445,7 +445,7 @@
}
#endif
@@ -12960,9 +13080,9 @@ diff -Nur linux-4.1.10.orig/include/net/neighbour.h linux-4.1.10/include/net/nei
const struct net_device *dev)
{
unsigned int seq;
-diff -Nur linux-4.1.10.orig/include/net/netns/ipv4.h linux-4.1.10/include/net/netns/ipv4.h
---- linux-4.1.10.orig/include/net/netns/ipv4.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/include/net/netns/ipv4.h 2015-10-12 22:33:32.284676225 +0200
+diff -Nur linux-4.1.13.orig/include/net/netns/ipv4.h linux-4.1.13/include/net/netns/ipv4.h
+--- linux-4.1.13.orig/include/net/netns/ipv4.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/net/netns/ipv4.h 2015-11-29 09:23:09.629612854 +0100
@@ -69,6 +69,7 @@
int sysctl_icmp_echo_ignore_all;
@@ -12971,10 +13091,10 @@ diff -Nur linux-4.1.10.orig/include/net/netns/ipv4.h linux-4.1.10/include/net/ne
int sysctl_icmp_ignore_bogus_error_responses;
int sysctl_icmp_ratelimit;
int sysctl_icmp_ratemask;
-diff -Nur linux-4.1.10.orig/include/trace/events/hist.h linux-4.1.10/include/trace/events/hist.h
---- linux-4.1.10.orig/include/trace/events/hist.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.1.10/include/trace/events/hist.h 2015-10-12 22:33:32.284676225 +0200
-@@ -0,0 +1,72 @@
+diff -Nur linux-4.1.13.orig/include/trace/events/hist.h linux-4.1.13/include/trace/events/hist.h
+--- linux-4.1.13.orig/include/trace/events/hist.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.13/include/trace/events/hist.h 2015-11-29 09:23:09.629612854 +0100
+@@ -0,0 +1,74 @@
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM hist
+
@@ -12986,6 +13106,7 @@ diff -Nur linux-4.1.10.orig/include/trace/events/hist.h linux-4.1.10/include/tra
+
+#if !defined(CONFIG_PREEMPT_OFF_HIST) && !defined(CONFIG_INTERRUPT_OFF_HIST)
+#define trace_preemptirqsoff_hist(a, b)
++#define trace_preemptirqsoff_hist_rcuidle(a, b)
+#else
+TRACE_EVENT(preemptirqsoff_hist,
+
@@ -13010,6 +13131,7 @@ diff -Nur linux-4.1.10.orig/include/trace/events/hist.h linux-4.1.10/include/tra
+
+#ifndef CONFIG_MISSED_TIMER_OFFSETS_HIST
+#define trace_hrtimer_interrupt(a, b, c, d)
++#define trace_hrtimer_interrupt_rcuidle(a, b, c, d)
+#else
+TRACE_EVENT(hrtimer_interrupt,
+
@@ -13047,9 +13169,9 @@ diff -Nur linux-4.1.10.orig/include/trace/events/hist.h linux-4.1.10/include/tra
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>
-diff -Nur linux-4.1.10.orig/include/trace/events/latency_hist.h linux-4.1.10/include/trace/events/latency_hist.h
---- linux-4.1.10.orig/include/trace/events/latency_hist.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.1.10/include/trace/events/latency_hist.h 2015-10-12 22:33:32.284676225 +0200
+diff -Nur linux-4.1.13.orig/include/trace/events/latency_hist.h linux-4.1.13/include/trace/events/latency_hist.h
+--- linux-4.1.13.orig/include/trace/events/latency_hist.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.13/include/trace/events/latency_hist.h 2015-11-29 09:23:09.629612854 +0100
@@ -0,0 +1,29 @@
+#ifndef _LATENCY_HIST_H
+#define _LATENCY_HIST_H
@@ -13080,9 +13202,69 @@ diff -Nur linux-4.1.10.orig/include/trace/events/latency_hist.h linux-4.1.10/inc
+}
+
+#endif /* _LATENCY_HIST_H */
-diff -Nur linux-4.1.10.orig/init/Kconfig linux-4.1.10/init/Kconfig
---- linux-4.1.10.orig/init/Kconfig 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/init/Kconfig 2015-10-12 22:33:32.284676225 +0200
+diff -Nur linux-4.1.13.orig/include/trace/events/sched.h linux-4.1.13/include/trace/events/sched.h
+--- linux-4.1.13.orig/include/trace/events/sched.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/include/trace/events/sched.h 2015-11-29 09:23:09.629612854 +0100
+@@ -55,9 +55,9 @@
+ */
+ DECLARE_EVENT_CLASS(sched_wakeup_template,
+
+- TP_PROTO(struct task_struct *p, int success),
++ TP_PROTO(struct task_struct *p),
+
+- TP_ARGS(__perf_task(p), success),
++ TP_ARGS(__perf_task(p)),
+
+ TP_STRUCT__entry(
+ __array( char, comm, TASK_COMM_LEN )
+@@ -71,25 +71,37 @@
+ memcpy(__entry->comm, p->comm, TASK_COMM_LEN);
+ __entry->pid = p->pid;
+ __entry->prio = p->prio;
+- __entry->success = success;
++ __entry->success = 1; /* rudiment, kill when possible */
+ __entry->target_cpu = task_cpu(p);
+ ),
+
+- TP_printk("comm=%s pid=%d prio=%d success=%d target_cpu=%03d",
++ TP_printk("comm=%s pid=%d prio=%d target_cpu=%03d",
+ __entry->comm, __entry->pid, __entry->prio,
+- __entry->success, __entry->target_cpu)
++ __entry->target_cpu)
+ );
+
++/*
++ * Tracepoint called when waking a task; this tracepoint is guaranteed to be
++ * called from the waking context.
++ */
++DEFINE_EVENT(sched_wakeup_template, sched_waking,
++ TP_PROTO(struct task_struct *p),
++ TP_ARGS(p));
++
++/*
++ * Tracepoint called when the task is actually woken; p->state == TASK_RUNNNG.
++ * It it not always called from the waking context.
++ */
+ DEFINE_EVENT(sched_wakeup_template, sched_wakeup,
+- TP_PROTO(struct task_struct *p, int success),
+- TP_ARGS(p, success));
++ TP_PROTO(struct task_struct *p),
++ TP_ARGS(p));
+
+ /*
+ * Tracepoint for waking up a new task:
+ */
+ DEFINE_EVENT(sched_wakeup_template, sched_wakeup_new,
+- TP_PROTO(struct task_struct *p, int success),
+- TP_ARGS(p, success));
++ TP_PROTO(struct task_struct *p),
++ TP_ARGS(p));
+
+ #ifdef CREATE_TRACE_POINTS
+ static inline long __trace_sched_switch_state(struct task_struct *p)
+diff -Nur linux-4.1.13.orig/init/Kconfig linux-4.1.13/init/Kconfig
+--- linux-4.1.13.orig/init/Kconfig 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/init/Kconfig 2015-11-29 09:23:09.629612854 +0100
@@ -637,7 +637,7 @@
config RCU_FAST_NO_HZ
@@ -13134,9 +13316,9 @@ diff -Nur linux-4.1.10.orig/init/Kconfig linux-4.1.10/init/Kconfig
bool "SLUB per cpu partial cache"
help
Per cpu partial caches accellerate objects allocation and freeing
-diff -Nur linux-4.1.10.orig/init/main.c linux-4.1.10/init/main.c
---- linux-4.1.10.orig/init/main.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/init/main.c 2015-10-12 22:33:32.284676225 +0200
+diff -Nur linux-4.1.13.orig/init/main.c linux-4.1.13/init/main.c
+--- linux-4.1.13.orig/init/main.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/init/main.c 2015-11-29 09:23:09.629612854 +0100
@@ -525,6 +525,7 @@
setup_command_line(command_line);
setup_nr_cpu_ids();
@@ -13145,18 +13327,18 @@ diff -Nur linux-4.1.10.orig/init/main.c linux-4.1.10/init/main.c
smp_prepare_boot_cpu(); /* arch-specific boot-cpu hooks */
build_all_zonelists(NULL, NULL);
-diff -Nur linux-4.1.10.orig/init/Makefile linux-4.1.10/init/Makefile
---- linux-4.1.10.orig/init/Makefile 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/init/Makefile 2015-10-12 22:33:32.284676225 +0200
+diff -Nur linux-4.1.13.orig/init/Makefile linux-4.1.13/init/Makefile
+--- linux-4.1.13.orig/init/Makefile 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/init/Makefile 2015-11-29 09:23:09.629612854 +0100
@@ -33,4 +33,4 @@
include/generated/compile.h: FORCE
@$($(quiet)chk_compile.h)
$(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkcompile_h $@ \
- "$(UTS_MACHINE)" "$(CONFIG_SMP)" "$(CONFIG_PREEMPT)" "$(CC) $(KBUILD_CFLAGS)"
+ "$(UTS_MACHINE)" "$(CONFIG_SMP)" "$(CONFIG_PREEMPT)" "$(CONFIG_PREEMPT_RT_FULL)" "$(CC) $(KBUILD_CFLAGS)"
-diff -Nur linux-4.1.10.orig/ipc/mqueue.c linux-4.1.10/ipc/mqueue.c
---- linux-4.1.10.orig/ipc/mqueue.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/ipc/mqueue.c 2015-10-12 22:33:32.284676225 +0200
+diff -Nur linux-4.1.13.orig/ipc/mqueue.c linux-4.1.13/ipc/mqueue.c
+--- linux-4.1.13.orig/ipc/mqueue.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/ipc/mqueue.c 2015-11-29 09:23:09.629612854 +0100
@@ -47,8 +47,7 @@
#define RECV 1
@@ -13297,9 +13479,9 @@ diff -Nur linux-4.1.10.orig/ipc/mqueue.c linux-4.1.10/ipc/mqueue.c
ret = 0;
}
if (ret == 0) {
-diff -Nur linux-4.1.10.orig/ipc/msg.c linux-4.1.10/ipc/msg.c
---- linux-4.1.10.orig/ipc/msg.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/ipc/msg.c 2015-10-12 22:33:32.288675961 +0200
+diff -Nur linux-4.1.13.orig/ipc/msg.c linux-4.1.13/ipc/msg.c
+--- linux-4.1.13.orig/ipc/msg.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/ipc/msg.c 2015-11-29 09:23:09.629612854 +0100
@@ -188,6 +188,12 @@
struct msg_receiver *msr, *t;
@@ -13349,9 +13531,9 @@ diff -Nur linux-4.1.10.orig/ipc/msg.c linux-4.1.10/ipc/msg.c
return 0;
}
-diff -Nur linux-4.1.10.orig/ipc/sem.c linux-4.1.10/ipc/sem.c
---- linux-4.1.10.orig/ipc/sem.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/ipc/sem.c 2015-10-12 22:33:32.288675961 +0200
+diff -Nur linux-4.1.13.orig/ipc/sem.c linux-4.1.13/ipc/sem.c
+--- linux-4.1.13.orig/ipc/sem.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/ipc/sem.c 2015-11-29 09:23:09.629612854 +0100
@@ -690,6 +690,13 @@
static void wake_up_sem_queue_prepare(struct list_head *pt,
struct sem_queue *q, int error)
@@ -13390,9 +13572,71 @@ diff -Nur linux-4.1.10.orig/ipc/sem.c linux-4.1.10/ipc/sem.c
}
static void unlink_queue(struct sem_array *sma, struct sem_queue *q)
-diff -Nur linux-4.1.10.orig/kernel/cgroup.c linux-4.1.10/kernel/cgroup.c
---- linux-4.1.10.orig/kernel/cgroup.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/cgroup.c 2015-10-12 22:33:32.288675961 +0200
+diff -Nur linux-4.1.13.orig/kernel/bpf/hashtab.c linux-4.1.13/kernel/bpf/hashtab.c
+--- linux-4.1.13.orig/kernel/bpf/hashtab.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/bpf/hashtab.c 2015-11-29 09:23:09.629612854 +0100
+@@ -17,7 +17,7 @@
+ struct bpf_htab {
+ struct bpf_map map;
+ struct hlist_head *buckets;
+- spinlock_t lock;
++ raw_spinlock_t lock;
+ u32 count; /* number of elements in this hashtable */
+ u32 n_buckets; /* number of hash buckets */
+ u32 elem_size; /* size of each element in bytes */
+@@ -82,7 +82,7 @@
+ for (i = 0; i < htab->n_buckets; i++)
+ INIT_HLIST_HEAD(&htab->buckets[i]);
+
+- spin_lock_init(&htab->lock);
++ raw_spin_lock_init(&htab->lock);
+ htab->count = 0;
+
+ htab->elem_size = sizeof(struct htab_elem) +
+@@ -230,7 +230,7 @@
+ l_new->hash = htab_map_hash(l_new->key, key_size);
+
+ /* bpf_map_update_elem() can be called in_irq() */
+- spin_lock_irqsave(&htab->lock, flags);
++ raw_spin_lock_irqsave(&htab->lock, flags);
+
+ head = select_bucket(htab, l_new->hash);
+
+@@ -266,11 +266,11 @@
+ } else {
+ htab->count++;
+ }
+- spin_unlock_irqrestore(&htab->lock, flags);
++ raw_spin_unlock_irqrestore(&htab->lock, flags);
+
+ return 0;
+ err:
+- spin_unlock_irqrestore(&htab->lock, flags);
++ raw_spin_unlock_irqrestore(&htab->lock, flags);
+ kfree(l_new);
+ return ret;
+ }
+@@ -291,7 +291,7 @@
+
+ hash = htab_map_hash(key, key_size);
+
+- spin_lock_irqsave(&htab->lock, flags);
++ raw_spin_lock_irqsave(&htab->lock, flags);
+
+ head = select_bucket(htab, hash);
+
+@@ -304,7 +304,7 @@
+ ret = 0;
+ }
+
+- spin_unlock_irqrestore(&htab->lock, flags);
++ raw_spin_unlock_irqrestore(&htab->lock, flags);
+ return ret;
+ }
+
+diff -Nur linux-4.1.13.orig/kernel/cgroup.c linux-4.1.13/kernel/cgroup.c
+--- linux-4.1.13.orig/kernel/cgroup.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/cgroup.c 2015-11-29 09:23:09.629612854 +0100
@@ -4422,10 +4422,10 @@
queue_work(cgroup_destroy_wq, &css->destroy_work);
}
@@ -13425,9 +13669,9 @@ diff -Nur linux-4.1.10.orig/kernel/cgroup.c linux-4.1.10/kernel/cgroup.c
/*
* Used to destroy pidlists and separate to serve as flush domain.
-diff -Nur linux-4.1.10.orig/kernel/cpu.c linux-4.1.10/kernel/cpu.c
---- linux-4.1.10.orig/kernel/cpu.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/cpu.c 2015-10-12 22:33:32.292675697 +0200
+diff -Nur linux-4.1.13.orig/kernel/cpu.c linux-4.1.13/kernel/cpu.c
+--- linux-4.1.13.orig/kernel/cpu.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/cpu.c 2015-11-29 09:23:09.633612589 +0100
@@ -74,8 +74,8 @@
#endif
} cpu_hotplug = {
@@ -13808,9 +14052,9 @@ diff -Nur linux-4.1.10.orig/kernel/cpu.c linux-4.1.10/kernel/cpu.c
return err;
}
-diff -Nur linux-4.1.10.orig/kernel/debug/kdb/kdb_io.c linux-4.1.10/kernel/debug/kdb/kdb_io.c
---- linux-4.1.10.orig/kernel/debug/kdb/kdb_io.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/debug/kdb/kdb_io.c 2015-10-12 22:33:32.292675697 +0200
+diff -Nur linux-4.1.13.orig/kernel/debug/kdb/kdb_io.c linux-4.1.13/kernel/debug/kdb/kdb_io.c
+--- linux-4.1.13.orig/kernel/debug/kdb/kdb_io.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/debug/kdb/kdb_io.c 2015-11-29 09:23:09.633612589 +0100
@@ -554,7 +554,6 @@
int linecount;
int colcount;
@@ -13848,10 +14092,10 @@ diff -Nur linux-4.1.10.orig/kernel/debug/kdb/kdb_io.c linux-4.1.10/kernel/debug/
return r;
}
-diff -Nur linux-4.1.10.orig/kernel/events/core.c linux-4.1.10/kernel/events/core.c
---- linux-4.1.10.orig/kernel/events/core.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/events/core.c 2015-10-12 22:33:32.292675697 +0200
-@@ -6933,6 +6933,7 @@
+diff -Nur linux-4.1.13.orig/kernel/events/core.c linux-4.1.13/kernel/events/core.c
+--- linux-4.1.13.orig/kernel/events/core.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/events/core.c 2015-11-29 09:23:09.633612589 +0100
+@@ -6925,6 +6925,7 @@
hrtimer_init(&hwc->hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
hwc->hrtimer.function = perf_swevent_hrtimer;
@@ -13859,9 +14103,9 @@ diff -Nur linux-4.1.10.orig/kernel/events/core.c linux-4.1.10/kernel/events/core
/*
* Since hrtimers have a fixed rate, we can do a static freq->period
-diff -Nur linux-4.1.10.orig/kernel/exit.c linux-4.1.10/kernel/exit.c
---- linux-4.1.10.orig/kernel/exit.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/exit.c 2015-10-12 22:33:32.292675697 +0200
+diff -Nur linux-4.1.13.orig/kernel/exit.c linux-4.1.13/kernel/exit.c
+--- linux-4.1.13.orig/kernel/exit.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/exit.c 2015-11-29 09:23:09.633612589 +0100
@@ -144,7 +144,7 @@
* Do this under ->siglock, we can race with another thread
* doing sigqueue_free() if we have SIGQUEUE_PREALLOC signals.
@@ -13871,9 +14115,9 @@ diff -Nur linux-4.1.10.orig/kernel/exit.c linux-4.1.10/kernel/exit.c
tsk->sighand = NULL;
spin_unlock(&sighand->siglock);
-diff -Nur linux-4.1.10.orig/kernel/fork.c linux-4.1.10/kernel/fork.c
---- linux-4.1.10.orig/kernel/fork.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/fork.c 2015-10-12 22:33:32.292675697 +0200
+diff -Nur linux-4.1.13.orig/kernel/fork.c linux-4.1.13/kernel/fork.c
+--- linux-4.1.13.orig/kernel/fork.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/fork.c 2015-11-29 09:23:09.633612589 +0100
@@ -108,7 +108,7 @@
DEFINE_PER_CPU(unsigned long, process_counts) = 0;
@@ -13971,9 +14215,9 @@ diff -Nur linux-4.1.10.orig/kernel/fork.c linux-4.1.10/kernel/fork.c
#ifdef CONFIG_LOCKDEP
p->lockdep_depth = 0; /* no locks held yet */
p->curr_chain_key = 0;
-diff -Nur linux-4.1.10.orig/kernel/futex.c linux-4.1.10/kernel/futex.c
---- linux-4.1.10.orig/kernel/futex.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/futex.c 2015-10-12 22:33:32.292675697 +0200
+diff -Nur linux-4.1.13.orig/kernel/futex.c linux-4.1.13/kernel/futex.c
+--- linux-4.1.13.orig/kernel/futex.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/futex.c 2015-11-29 09:23:09.633612589 +0100
@@ -738,7 +738,9 @@
* task still owns the PI-state:
*/
@@ -14302,9 +14546,9 @@ diff -Nur linux-4.1.10.orig/kernel/futex.c linux-4.1.10/kernel/futex.c
/*
* Fixup the pi_state owner and possibly acquire the lock if we
* haven't already.
-diff -Nur linux-4.1.10.orig/kernel/irq/handle.c linux-4.1.10/kernel/irq/handle.c
---- linux-4.1.10.orig/kernel/irq/handle.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/irq/handle.c 2015-10-12 22:33:32.296675432 +0200
+diff -Nur linux-4.1.13.orig/kernel/irq/handle.c linux-4.1.13/kernel/irq/handle.c
+--- linux-4.1.13.orig/kernel/irq/handle.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/irq/handle.c 2015-11-29 09:23:09.633612589 +0100
@@ -133,6 +133,8 @@
irqreturn_t
handle_irq_event_percpu(struct irq_desc *desc, struct irqaction *action)
@@ -14327,9 +14571,9 @@ diff -Nur linux-4.1.10.orig/kernel/irq/handle.c linux-4.1.10/kernel/irq/handle.c
if (!noirqdebug)
note_interrupt(irq, desc, retval);
-diff -Nur linux-4.1.10.orig/kernel/irq/manage.c linux-4.1.10/kernel/irq/manage.c
---- linux-4.1.10.orig/kernel/irq/manage.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/irq/manage.c 2015-10-12 22:33:32.296675432 +0200
+diff -Nur linux-4.1.13.orig/kernel/irq/manage.c linux-4.1.13/kernel/irq/manage.c
+--- linux-4.1.13.orig/kernel/irq/manage.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/irq/manage.c 2015-11-29 09:23:09.633612589 +0100
@@ -22,6 +22,7 @@
#include "internals.h"
@@ -14766,9 +15010,9 @@ diff -Nur linux-4.1.10.orig/kernel/irq/manage.c linux-4.1.10/kernel/irq/manage.c
#ifdef CONFIG_DEBUG_SHIRQ_FIXME
if (!retval && (irqflags & IRQF_SHARED)) {
-diff -Nur linux-4.1.10.orig/kernel/irq/settings.h linux-4.1.10/kernel/irq/settings.h
---- linux-4.1.10.orig/kernel/irq/settings.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/irq/settings.h 2015-10-12 22:33:32.296675432 +0200
+diff -Nur linux-4.1.13.orig/kernel/irq/settings.h linux-4.1.13/kernel/irq/settings.h
+--- linux-4.1.13.orig/kernel/irq/settings.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/irq/settings.h 2015-11-29 09:23:09.637612322 +0100
@@ -15,6 +15,7 @@
_IRQ_NESTED_THREAD = IRQ_NESTED_THREAD,
_IRQ_PER_CPU_DEVID = IRQ_PER_CPU_DEVID,
@@ -14802,9 +15046,9 @@ diff -Nur linux-4.1.10.orig/kernel/irq/settings.h linux-4.1.10/kernel/irq/settin
static inline bool irq_settings_is_per_cpu(struct irq_desc *desc)
{
return desc->status_use_accessors & _IRQ_PER_CPU;
-diff -Nur linux-4.1.10.orig/kernel/irq/spurious.c linux-4.1.10/kernel/irq/spurious.c
---- linux-4.1.10.orig/kernel/irq/spurious.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/irq/spurious.c 2015-10-12 22:33:32.296675432 +0200
+diff -Nur linux-4.1.13.orig/kernel/irq/spurious.c linux-4.1.13/kernel/irq/spurious.c
+--- linux-4.1.13.orig/kernel/irq/spurious.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/irq/spurious.c 2015-11-29 09:23:09.637612322 +0100
@@ -444,6 +444,10 @@
static int __init irqfixup_setup(char *str)
@@ -14827,9 +15071,9 @@ diff -Nur linux-4.1.10.orig/kernel/irq/spurious.c linux-4.1.10/kernel/irq/spurio
irqfixup = 2;
printk(KERN_WARNING "Misrouted IRQ fixup and polling support "
"enabled\n");
-diff -Nur linux-4.1.10.orig/kernel/irq_work.c linux-4.1.10/kernel/irq_work.c
---- linux-4.1.10.orig/kernel/irq_work.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/irq_work.c 2015-10-12 22:33:32.296675432 +0200
+diff -Nur linux-4.1.13.orig/kernel/irq_work.c linux-4.1.13/kernel/irq_work.c
+--- linux-4.1.13.orig/kernel/irq_work.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/irq_work.c 2015-11-29 09:23:09.637612322 +0100
@@ -17,6 +17,7 @@
#include <linux/cpu.h>
#include <linux/notifier.h>
@@ -14933,9 +15177,27 @@ diff -Nur linux-4.1.10.orig/kernel/irq_work.c linux-4.1.10/kernel/irq_work.c
}
EXPORT_SYMBOL_GPL(irq_work_run);
-diff -Nur linux-4.1.10.orig/kernel/Kconfig.locks linux-4.1.10/kernel/Kconfig.locks
---- linux-4.1.10.orig/kernel/Kconfig.locks 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/Kconfig.locks 2015-10-12 22:33:32.296675432 +0200
+@@ -179,8 +200,17 @@
+
+ if (!llist_empty(raised) && !arch_irq_work_has_interrupt())
+ irq_work_run_list(raised);
++
++ if (!IS_ENABLED(CONFIG_PREEMPT_RT_FULL))
++ irq_work_run_list(this_cpu_ptr(&lazy_list));
++}
++
++#if defined(CONFIG_IRQ_WORK) && defined(CONFIG_PREEMPT_RT_FULL)
++void irq_work_tick_soft(void)
++{
+ irq_work_run_list(this_cpu_ptr(&lazy_list));
+ }
++#endif
+
+ /*
+ * Synchronize against the irq_work @entry, ensures the entry is not
+diff -Nur linux-4.1.13.orig/kernel/Kconfig.locks linux-4.1.13/kernel/Kconfig.locks
+--- linux-4.1.13.orig/kernel/Kconfig.locks 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/Kconfig.locks 2015-11-29 09:23:09.629612854 +0100
@@ -225,11 +225,11 @@
config MUTEX_SPIN_ON_OWNER
@@ -14950,9 +15212,9 @@ diff -Nur linux-4.1.10.orig/kernel/Kconfig.locks linux-4.1.10/kernel/Kconfig.loc
config LOCK_SPIN_ON_OWNER
def_bool y
-diff -Nur linux-4.1.10.orig/kernel/Kconfig.preempt linux-4.1.10/kernel/Kconfig.preempt
---- linux-4.1.10.orig/kernel/Kconfig.preempt 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/Kconfig.preempt 2015-10-12 22:33:32.296675432 +0200
+diff -Nur linux-4.1.13.orig/kernel/Kconfig.preempt linux-4.1.13/kernel/Kconfig.preempt
+--- linux-4.1.13.orig/kernel/Kconfig.preempt 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/Kconfig.preempt 2015-11-29 09:23:09.629612854 +0100
@@ -1,3 +1,16 @@
+config PREEMPT
+ bool
@@ -15005,9 +15267,9 @@ diff -Nur linux-4.1.10.orig/kernel/Kconfig.preempt linux-4.1.10/kernel/Kconfig.p
endchoice
config PREEMPT_COUNT
-diff -Nur linux-4.1.10.orig/kernel/ksysfs.c linux-4.1.10/kernel/ksysfs.c
---- linux-4.1.10.orig/kernel/ksysfs.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/ksysfs.c 2015-10-12 22:33:32.296675432 +0200
+diff -Nur linux-4.1.13.orig/kernel/ksysfs.c linux-4.1.13/kernel/ksysfs.c
+--- linux-4.1.13.orig/kernel/ksysfs.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/ksysfs.c 2015-11-29 09:23:09.637612322 +0100
@@ -136,6 +136,15 @@
#endif /* CONFIG_KEXEC */
@@ -15034,9 +15296,9 @@ diff -Nur linux-4.1.10.orig/kernel/ksysfs.c linux-4.1.10/kernel/ksysfs.c
NULL
};
-diff -Nur linux-4.1.10.orig/kernel/locking/lglock.c linux-4.1.10/kernel/locking/lglock.c
---- linux-4.1.10.orig/kernel/locking/lglock.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/locking/lglock.c 2015-10-12 22:33:32.296675432 +0200
+diff -Nur linux-4.1.13.orig/kernel/locking/lglock.c linux-4.1.13/kernel/locking/lglock.c
+--- linux-4.1.13.orig/kernel/locking/lglock.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/locking/lglock.c 2015-11-29 09:23:09.637612322 +0100
@@ -4,6 +4,15 @@
#include <linux/cpu.h>
#include <linux/string.h>
@@ -15181,9 +15443,9 @@ diff -Nur linux-4.1.10.orig/kernel/locking/lglock.c linux-4.1.10/kernel/locking/
+ }
+}
+#endif
-diff -Nur linux-4.1.10.orig/kernel/locking/lockdep.c linux-4.1.10/kernel/locking/lockdep.c
---- linux-4.1.10.orig/kernel/locking/lockdep.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/locking/lockdep.c 2015-10-12 22:33:32.296675432 +0200
+diff -Nur linux-4.1.13.orig/kernel/locking/lockdep.c linux-4.1.13/kernel/locking/lockdep.c
+--- linux-4.1.13.orig/kernel/locking/lockdep.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/locking/lockdep.c 2015-11-29 09:23:09.637612322 +0100
@@ -3563,6 +3563,7 @@
}
}
@@ -15200,9 +15462,9 @@ diff -Nur linux-4.1.10.orig/kernel/locking/lockdep.c linux-4.1.10/kernel/locking
if (!debug_locks)
print_irqtrace_events(current);
-diff -Nur linux-4.1.10.orig/kernel/locking/locktorture.c linux-4.1.10/kernel/locking/locktorture.c
---- linux-4.1.10.orig/kernel/locking/locktorture.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/locking/locktorture.c 2015-10-12 22:33:32.296675432 +0200
+diff -Nur linux-4.1.13.orig/kernel/locking/locktorture.c linux-4.1.13/kernel/locking/locktorture.c
+--- linux-4.1.13.orig/kernel/locking/locktorture.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/locking/locktorture.c 2015-11-29 09:23:09.637612322 +0100
@@ -24,7 +24,6 @@
#include <linux/module.h>
#include <linux/kthread.h>
@@ -15211,9 +15473,9 @@ diff -Nur linux-4.1.10.orig/kernel/locking/locktorture.c linux-4.1.10/kernel/loc
#include <linux/mutex.h>
#include <linux/rwsem.h>
#include <linux/smp.h>
-diff -Nur linux-4.1.10.orig/kernel/locking/Makefile linux-4.1.10/kernel/locking/Makefile
---- linux-4.1.10.orig/kernel/locking/Makefile 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/locking/Makefile 2015-10-12 22:33:32.296675432 +0200
+diff -Nur linux-4.1.13.orig/kernel/locking/Makefile linux-4.1.13/kernel/locking/Makefile
+--- linux-4.1.13.orig/kernel/locking/Makefile 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/locking/Makefile 2015-11-29 09:23:09.637612322 +0100
@@ -1,5 +1,5 @@
-obj-y += mutex.o semaphore.o rwsem.o
@@ -15245,9 +15507,9 @@ diff -Nur linux-4.1.10.orig/kernel/locking/Makefile linux-4.1.10/kernel/locking/
+obj-$(CONFIG_PREEMPT_RT_FULL) += rt.o
obj-$(CONFIG_QUEUE_RWLOCK) += qrwlock.o
obj-$(CONFIG_LOCK_TORTURE_TEST) += locktorture.o
-diff -Nur linux-4.1.10.orig/kernel/locking/rt.c linux-4.1.10/kernel/locking/rt.c
---- linux-4.1.10.orig/kernel/locking/rt.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.1.10/kernel/locking/rt.c 2015-10-12 22:33:32.296675432 +0200
+diff -Nur linux-4.1.13.orig/kernel/locking/rt.c linux-4.1.13/kernel/locking/rt.c
+--- linux-4.1.13.orig/kernel/locking/rt.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.13/kernel/locking/rt.c 2015-11-29 09:23:09.637612322 +0100
@@ -0,0 +1,461 @@
+/*
+ * kernel/rt.c
@@ -15710,9 +15972,9 @@ diff -Nur linux-4.1.10.orig/kernel/locking/rt.c linux-4.1.10/kernel/locking/rt.c
+ return 1;
+}
+EXPORT_SYMBOL(atomic_dec_and_mutex_lock);
-diff -Nur linux-4.1.10.orig/kernel/locking/rtmutex.c linux-4.1.10/kernel/locking/rtmutex.c
---- linux-4.1.10.orig/kernel/locking/rtmutex.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/locking/rtmutex.c 2015-10-12 22:33:32.296675432 +0200
+diff -Nur linux-4.1.13.orig/kernel/locking/rtmutex.c linux-4.1.13/kernel/locking/rtmutex.c
+--- linux-4.1.13.orig/kernel/locking/rtmutex.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/locking/rtmutex.c 2015-11-29 09:23:09.637612322 +0100
@@ -7,6 +7,11 @@
* Copyright (C) 2005-2006 Timesys Corp., Thomas Gleixner <tglx@timesys.com>
* Copyright (C) 2005 Kihon Technologies Inc., Steven Rostedt
@@ -16702,6 +16964,15 @@ diff -Nur linux-4.1.10.orig/kernel/locking/rtmutex.c linux-4.1.10/kernel/locking
/* We enforce deadlock detection for futexes */
ret = task_blocks_on_rt_mutex(lock, waiter, task,
RT_MUTEX_FULL_CHAINWALK);
+@@ -1575,7 +2141,7 @@
+ ret = 0;
+ }
+
+- if (unlikely(ret))
++ if (ret && rt_mutex_has_waiters(lock))
+ remove_waiter(lock, waiter);
+
+ raw_spin_unlock(&lock->wait_lock);
@@ -1631,7 +2197,7 @@
set_current_state(TASK_INTERRUPTIBLE);
@@ -16801,9 +17072,9 @@ diff -Nur linux-4.1.10.orig/kernel/locking/rtmutex.c linux-4.1.10/kernel/locking
+}
+EXPORT_SYMBOL(ww_mutex_unlock);
+#endif
-diff -Nur linux-4.1.10.orig/kernel/locking/rtmutex_common.h linux-4.1.10/kernel/locking/rtmutex_common.h
---- linux-4.1.10.orig/kernel/locking/rtmutex_common.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/locking/rtmutex_common.h 2015-10-12 22:33:32.296675432 +0200
+diff -Nur linux-4.1.13.orig/kernel/locking/rtmutex_common.h linux-4.1.13/kernel/locking/rtmutex_common.h
+--- linux-4.1.13.orig/kernel/locking/rtmutex_common.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/locking/rtmutex_common.h 2015-11-29 09:23:09.637612322 +0100
@@ -49,6 +49,7 @@
struct rb_node pi_tree_entry;
struct task_struct *task;
@@ -16847,9 +17118,9 @@ diff -Nur linux-4.1.10.orig/kernel/locking/rtmutex_common.h linux-4.1.10/kernel/
+}
+
#endif
-diff -Nur linux-4.1.10.orig/kernel/locking/spinlock.c linux-4.1.10/kernel/locking/spinlock.c
---- linux-4.1.10.orig/kernel/locking/spinlock.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/locking/spinlock.c 2015-10-12 22:33:32.300675168 +0200
+diff -Nur linux-4.1.13.orig/kernel/locking/spinlock.c linux-4.1.13/kernel/locking/spinlock.c
+--- linux-4.1.13.orig/kernel/locking/spinlock.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/locking/spinlock.c 2015-11-29 09:23:09.637612322 +0100
@@ -124,8 +124,11 @@
* __[spin|read|write]_lock_bh()
*/
@@ -16880,9 +17151,9 @@ diff -Nur linux-4.1.10.orig/kernel/locking/spinlock.c linux-4.1.10/kernel/lockin
#ifdef CONFIG_DEBUG_LOCK_ALLOC
void __lockfunc _raw_spin_lock_nested(raw_spinlock_t *lock, int subclass)
-diff -Nur linux-4.1.10.orig/kernel/locking/spinlock_debug.c linux-4.1.10/kernel/locking/spinlock_debug.c
---- linux-4.1.10.orig/kernel/locking/spinlock_debug.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/locking/spinlock_debug.c 2015-10-12 22:33:32.300675168 +0200
+diff -Nur linux-4.1.13.orig/kernel/locking/spinlock_debug.c linux-4.1.13/kernel/locking/spinlock_debug.c
+--- linux-4.1.13.orig/kernel/locking/spinlock_debug.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/locking/spinlock_debug.c 2015-11-29 09:23:09.637612322 +0100
@@ -31,6 +31,7 @@
EXPORT_SYMBOL(__raw_spin_lock_init);
@@ -16913,9 +17184,9 @@ diff -Nur linux-4.1.10.orig/kernel/locking/spinlock_debug.c linux-4.1.10/kernel/
}
+
+#endif
-diff -Nur linux-4.1.10.orig/kernel/panic.c linux-4.1.10/kernel/panic.c
---- linux-4.1.10.orig/kernel/panic.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/panic.c 2015-10-12 22:33:32.300675168 +0200
+diff -Nur linux-4.1.13.orig/kernel/panic.c linux-4.1.13/kernel/panic.c
+--- linux-4.1.13.orig/kernel/panic.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/panic.c 2015-11-29 09:23:09.637612322 +0100
@@ -387,9 +387,11 @@
static int init_oops_id(void)
@@ -16928,9 +17199,9 @@ diff -Nur linux-4.1.10.orig/kernel/panic.c linux-4.1.10/kernel/panic.c
oops_id++;
return 0;
-diff -Nur linux-4.1.10.orig/kernel/power/hibernate.c linux-4.1.10/kernel/power/hibernate.c
---- linux-4.1.10.orig/kernel/power/hibernate.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/power/hibernate.c 2015-10-12 22:33:32.300675168 +0200
+diff -Nur linux-4.1.13.orig/kernel/power/hibernate.c linux-4.1.13/kernel/power/hibernate.c
+--- linux-4.1.13.orig/kernel/power/hibernate.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/power/hibernate.c 2015-11-29 09:23:09.637612322 +0100
@@ -285,6 +285,8 @@
local_irq_disable();
@@ -16980,9 +17251,9 @@ diff -Nur linux-4.1.10.orig/kernel/power/hibernate.c linux-4.1.10/kernel/power/h
local_irq_enable();
enable_nonboot_cpus();
-diff -Nur linux-4.1.10.orig/kernel/power/suspend.c linux-4.1.10/kernel/power/suspend.c
---- linux-4.1.10.orig/kernel/power/suspend.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/power/suspend.c 2015-10-12 22:33:32.300675168 +0200
+diff -Nur linux-4.1.13.orig/kernel/power/suspend.c linux-4.1.13/kernel/power/suspend.c
+--- linux-4.1.13.orig/kernel/power/suspend.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/power/suspend.c 2015-11-29 09:23:09.637612322 +0100
@@ -356,6 +356,8 @@
arch_suspend_disable_irqs();
BUG_ON(!irqs_disabled());
@@ -17001,9 +17272,9 @@ diff -Nur linux-4.1.10.orig/kernel/power/suspend.c linux-4.1.10/kernel/power/sus
arch_suspend_enable_irqs();
BUG_ON(irqs_disabled());
-diff -Nur linux-4.1.10.orig/kernel/printk/printk.c linux-4.1.10/kernel/printk/printk.c
---- linux-4.1.10.orig/kernel/printk/printk.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/printk/printk.c 2015-10-12 22:33:32.300675168 +0200
+diff -Nur linux-4.1.13.orig/kernel/printk/printk.c linux-4.1.13/kernel/printk/printk.c
+--- linux-4.1.13.orig/kernel/printk/printk.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/printk/printk.c 2015-11-29 09:23:09.641612055 +0100
@@ -1163,6 +1163,7 @@
{
char *text;
@@ -17256,9 +17527,9 @@ diff -Nur linux-4.1.10.orig/kernel/printk/printk.c linux-4.1.10/kernel/printk/pr
}
console_locked = 0;
-diff -Nur linux-4.1.10.orig/kernel/ptrace.c linux-4.1.10/kernel/ptrace.c
---- linux-4.1.10.orig/kernel/ptrace.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/ptrace.c 2015-10-12 22:33:32.300675168 +0200
+diff -Nur linux-4.1.13.orig/kernel/ptrace.c linux-4.1.13/kernel/ptrace.c
+--- linux-4.1.13.orig/kernel/ptrace.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/ptrace.c 2015-11-29 09:23:09.641612055 +0100
@@ -129,7 +129,12 @@
spin_lock_irq(&task->sighand->siglock);
@@ -17273,9 +17544,9 @@ diff -Nur linux-4.1.10.orig/kernel/ptrace.c linux-4.1.10/kernel/ptrace.c
ret = true;
}
spin_unlock_irq(&task->sighand->siglock);
-diff -Nur linux-4.1.10.orig/kernel/rcu/tree.c linux-4.1.10/kernel/rcu/tree.c
---- linux-4.1.10.orig/kernel/rcu/tree.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/rcu/tree.c 2015-10-12 22:33:32.300675168 +0200
+diff -Nur linux-4.1.13.orig/kernel/rcu/tree.c linux-4.1.13/kernel/rcu/tree.c
+--- linux-4.1.13.orig/kernel/rcu/tree.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/rcu/tree.c 2015-11-29 09:23:09.641612055 +0100
@@ -56,6 +56,11 @@
#include <linux/random.h>
#include <linux/ftrace_event.h>
@@ -17563,9 +17834,9 @@ diff -Nur linux-4.1.10.orig/kernel/rcu/tree.c linux-4.1.10/kernel/rcu/tree.c
/*
* We don't need protection against CPU-hotplug here because
-diff -Nur linux-4.1.10.orig/kernel/rcu/tree.h linux-4.1.10/kernel/rcu/tree.h
---- linux-4.1.10.orig/kernel/rcu/tree.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/rcu/tree.h 2015-10-12 22:33:32.300675168 +0200
+diff -Nur linux-4.1.13.orig/kernel/rcu/tree.h linux-4.1.13/kernel/rcu/tree.h
+--- linux-4.1.13.orig/kernel/rcu/tree.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/rcu/tree.h 2015-11-29 09:23:09.641612055 +0100
@@ -27,6 +27,7 @@
#include <linux/threads.h>
#include <linux/cpumask.h>
@@ -17626,9 +17897,9 @@ diff -Nur linux-4.1.10.orig/kernel/rcu/tree.h linux-4.1.10/kernel/rcu/tree.h
static int rcu_spawn_one_boost_kthread(struct rcu_state *rsp,
struct rcu_node *rnp);
#endif /* #ifdef CONFIG_RCU_BOOST */
-diff -Nur linux-4.1.10.orig/kernel/rcu/tree_plugin.h linux-4.1.10/kernel/rcu/tree_plugin.h
---- linux-4.1.10.orig/kernel/rcu/tree_plugin.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/rcu/tree_plugin.h 2015-10-12 22:33:32.300675168 +0200
+diff -Nur linux-4.1.13.orig/kernel/rcu/tree_plugin.h linux-4.1.13/kernel/rcu/tree_plugin.h
+--- linux-4.1.13.orig/kernel/rcu/tree_plugin.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/rcu/tree_plugin.h 2015-11-29 09:23:09.641612055 +0100
@@ -24,27 +24,20 @@
* Paul E. McKenney <paulmck@linux.vnet.ibm.com>
*/
@@ -17963,9 +18234,9 @@ diff -Nur linux-4.1.10.orig/kernel/rcu/tree_plugin.h linux-4.1.10/kernel/rcu/tre
rdp->nocb_follower_tail = &rdp->nocb_follower_head;
}
-diff -Nur linux-4.1.10.orig/kernel/rcu/update.c linux-4.1.10/kernel/rcu/update.c
---- linux-4.1.10.orig/kernel/rcu/update.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/rcu/update.c 2015-10-12 22:33:32.300675168 +0200
+diff -Nur linux-4.1.13.orig/kernel/rcu/update.c linux-4.1.13/kernel/rcu/update.c
+--- linux-4.1.13.orig/kernel/rcu/update.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/rcu/update.c 2015-11-29 09:23:09.641612055 +0100
@@ -227,6 +227,7 @@
}
EXPORT_SYMBOL_GPL(rcu_read_lock_held);
@@ -17982,9 +18253,9 @@ diff -Nur linux-4.1.10.orig/kernel/rcu/update.c linux-4.1.10/kernel/rcu/update.c
#endif /* #ifdef CONFIG_DEBUG_LOCK_ALLOC */
-diff -Nur linux-4.1.10.orig/kernel/relay.c linux-4.1.10/kernel/relay.c
---- linux-4.1.10.orig/kernel/relay.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/relay.c 2015-10-12 22:33:32.304674904 +0200
+diff -Nur linux-4.1.13.orig/kernel/relay.c linux-4.1.13/kernel/relay.c
+--- linux-4.1.13.orig/kernel/relay.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/relay.c 2015-11-29 09:23:09.641612055 +0100
@@ -339,6 +339,10 @@
{
struct rchan_buf *buf = (struct rchan_buf *)data;
@@ -18020,9 +18291,9 @@ diff -Nur linux-4.1.10.orig/kernel/relay.c linux-4.1.10/kernel/relay.c
}
old = buf->data;
-diff -Nur linux-4.1.10.orig/kernel/sched/completion.c linux-4.1.10/kernel/sched/completion.c
---- linux-4.1.10.orig/kernel/sched/completion.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/sched/completion.c 2015-10-12 22:33:32.304674904 +0200
+diff -Nur linux-4.1.13.orig/kernel/sched/completion.c linux-4.1.13/kernel/sched/completion.c
+--- linux-4.1.13.orig/kernel/sched/completion.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/sched/completion.c 2015-11-29 09:23:09.641612055 +0100
@@ -30,10 +30,10 @@
{
unsigned long flags;
@@ -18113,9 +18384,9 @@ diff -Nur linux-4.1.10.orig/kernel/sched/completion.c linux-4.1.10/kernel/sched/
return true;
}
EXPORT_SYMBOL(completion_done);
-diff -Nur linux-4.1.10.orig/kernel/sched/core.c linux-4.1.10/kernel/sched/core.c
---- linux-4.1.10.orig/kernel/sched/core.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/sched/core.c 2015-10-12 22:33:32.304674904 +0200
+diff -Nur linux-4.1.13.orig/kernel/sched/core.c linux-4.1.13/kernel/sched/core.c
+--- linux-4.1.13.orig/kernel/sched/core.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/sched/core.c 2015-11-29 09:23:09.645611789 +0100
@@ -282,7 +282,11 @@
* Number of tasks to iterate in a single balance run.
* Limited because this is done with IRQs disabled.
@@ -18303,7 +18574,19 @@ diff -Nur linux-4.1.10.orig/kernel/sched/core.c linux-4.1.10/kernel/sched/core.c
}
/*
-@@ -1666,8 +1762,27 @@
+@@ -1462,9 +1558,9 @@
+ ttwu_do_wakeup(struct rq *rq, struct task_struct *p, int wake_flags)
+ {
+ check_preempt_curr(rq, p, wake_flags);
+- trace_sched_wakeup(p, true);
+-
+ p->state = TASK_RUNNING;
++ trace_sched_wakeup(p);
++
+ #ifdef CONFIG_SMP
+ if (p->sched_class->task_woken)
+ p->sched_class->task_woken(rq, p);
+@@ -1666,8 +1762,29 @@
*/
smp_mb__before_spinlock();
raw_spin_lock_irqsave(&p->pi_lock, flags);
@@ -18329,10 +18612,12 @@ diff -Nur linux-4.1.10.orig/kernel/sched/core.c linux-4.1.10/kernel/sched/core.c
+ */
+ if (!(wake_flags & WF_LOCK_SLEEPER))
+ p->saved_state = TASK_RUNNING;
++
++ trace_sched_waking(p);
success = 1; /* we're going to change ->state */
cpu = task_cpu(p);
-@@ -1710,42 +1825,6 @@
+@@ -1710,42 +1827,6 @@
}
/**
@@ -18375,7 +18660,7 @@ diff -Nur linux-4.1.10.orig/kernel/sched/core.c linux-4.1.10/kernel/sched/core.c
* wake_up_process - Wake up a specific process
* @p: The process to be woken up.
*
-@@ -1759,11 +1838,23 @@
+@@ -1759,11 +1840,23 @@
*/
int wake_up_process(struct task_struct *p)
{
@@ -18400,7 +18685,7 @@ diff -Nur linux-4.1.10.orig/kernel/sched/core.c linux-4.1.10/kernel/sched/core.c
int wake_up_state(struct task_struct *p, unsigned int state)
{
return try_to_wake_up(p, state, 0);
-@@ -1959,6 +2050,9 @@
+@@ -1959,6 +2052,9 @@
p->on_cpu = 0;
#endif
init_task_preempt_count(p);
@@ -18410,7 +18695,16 @@ diff -Nur linux-4.1.10.orig/kernel/sched/core.c linux-4.1.10/kernel/sched/core.c
#ifdef CONFIG_SMP
plist_node_init(&p->pushable_tasks, MAX_PRIO);
RB_CLEAR_NODE(&p->pushable_dl_tasks);
-@@ -2231,8 +2325,12 @@
+@@ -2094,7 +2190,7 @@
+ rq = __task_rq_lock(p);
+ activate_task(rq, p, 0);
+ p->on_rq = TASK_ON_RQ_QUEUED;
+- trace_sched_wakeup_new(p, true);
++ trace_sched_wakeup_new(p);
+ check_preempt_curr(rq, p, WF_FORK);
+ #ifdef CONFIG_SMP
+ if (p->sched_class->task_woken)
+@@ -2231,8 +2327,12 @@
finish_arch_post_lock_switch();
fire_sched_in_preempt_notifiers(current);
@@ -18424,7 +18718,7 @@ diff -Nur linux-4.1.10.orig/kernel/sched/core.c linux-4.1.10/kernel/sched/core.c
if (unlikely(prev_state == TASK_DEAD)) {
if (prev->sched_class->task_dead)
prev->sched_class->task_dead(prev);
-@@ -2650,6 +2748,133 @@
+@@ -2657,6 +2757,133 @@
schedstat_inc(this_rq(), sched_count);
}
@@ -18558,7 +18852,7 @@ diff -Nur linux-4.1.10.orig/kernel/sched/core.c linux-4.1.10/kernel/sched/core.c
/*
* Pick up the highest-prio task:
*/
-@@ -2756,6 +2981,8 @@
+@@ -2763,6 +2990,8 @@
smp_mb__before_spinlock();
raw_spin_lock_irq(&rq->lock);
@@ -18567,7 +18861,7 @@ diff -Nur linux-4.1.10.orig/kernel/sched/core.c linux-4.1.10/kernel/sched/core.c
rq->clock_skip_update <<= 1; /* promote REQ to ACT */
switch_count = &prev->nivcsw;
-@@ -2765,19 +2992,6 @@
+@@ -2772,19 +3001,6 @@
} else {
deactivate_task(rq, prev, DEQUEUE_SLEEP);
prev->on_rq = 0;
@@ -18587,7 +18881,7 @@ diff -Nur linux-4.1.10.orig/kernel/sched/core.c linux-4.1.10/kernel/sched/core.c
}
switch_count = &prev->nvcsw;
}
-@@ -2787,6 +3001,7 @@
+@@ -2794,6 +3010,7 @@
next = pick_next_task(rq, prev);
clear_tsk_need_resched(prev);
@@ -18595,7 +18889,7 @@ diff -Nur linux-4.1.10.orig/kernel/sched/core.c linux-4.1.10/kernel/sched/core.c
clear_preempt_need_resched();
rq->clock_skip_update = 0;
-@@ -2807,8 +3022,19 @@
+@@ -2814,8 +3031,19 @@
static inline void sched_submit_work(struct task_struct *tsk)
{
@@ -18616,7 +18910,7 @@ diff -Nur linux-4.1.10.orig/kernel/sched/core.c linux-4.1.10/kernel/sched/core.c
/*
* If we are going to sleep and we have plugged IO queued,
* make sure to submit it to avoid deadlocks.
-@@ -2817,6 +3043,12 @@
+@@ -2824,6 +3052,12 @@
blk_schedule_flush_plug(tsk);
}
@@ -18629,7 +18923,7 @@ diff -Nur linux-4.1.10.orig/kernel/sched/core.c linux-4.1.10/kernel/sched/core.c
asmlinkage __visible void __sched schedule(void)
{
struct task_struct *tsk = current;
-@@ -2825,6 +3057,7 @@
+@@ -2832,6 +3066,7 @@
do {
__schedule();
} while (need_resched());
@@ -18637,7 +18931,7 @@ diff -Nur linux-4.1.10.orig/kernel/sched/core.c linux-4.1.10/kernel/sched/core.c
}
EXPORT_SYMBOL(schedule);
-@@ -2916,6 +3149,14 @@
+@@ -2923,6 +3158,14 @@
if (likely(!preemptible()))
return;
@@ -18652,7 +18946,7 @@ diff -Nur linux-4.1.10.orig/kernel/sched/core.c linux-4.1.10/kernel/sched/core.c
do {
__preempt_count_add(PREEMPT_ACTIVE);
/*
-@@ -2924,7 +3165,16 @@
+@@ -2931,7 +3174,16 @@
* an infinite recursion.
*/
prev_ctx = exception_enter();
@@ -18669,7 +18963,7 @@ diff -Nur linux-4.1.10.orig/kernel/sched/core.c linux-4.1.10/kernel/sched/core.c
exception_exit(prev_ctx);
__preempt_count_sub(PREEMPT_ACTIVE);
-@@ -4261,6 +4511,7 @@
+@@ -4268,6 +4520,7 @@
}
EXPORT_SYMBOL(__cond_resched_lock);
@@ -18677,7 +18971,7 @@ diff -Nur linux-4.1.10.orig/kernel/sched/core.c linux-4.1.10/kernel/sched/core.c
int __sched __cond_resched_softirq(void)
{
BUG_ON(!in_softirq());
-@@ -4274,6 +4525,7 @@
+@@ -4281,6 +4534,7 @@
return 0;
}
EXPORT_SYMBOL(__cond_resched_softirq);
@@ -18685,7 +18979,7 @@ diff -Nur linux-4.1.10.orig/kernel/sched/core.c linux-4.1.10/kernel/sched/core.c
/**
* yield - yield the current processor to other threads.
-@@ -4628,7 +4880,9 @@
+@@ -4635,7 +4889,9 @@
/* Set the preempt count _outside_ the spinlocks! */
init_idle_preempt_count(idle, cpu);
@@ -18696,7 +18990,7 @@ diff -Nur linux-4.1.10.orig/kernel/sched/core.c linux-4.1.10/kernel/sched/core.c
/*
* The idle tasks have their own, simple scheduling class:
*/
-@@ -4748,11 +5002,91 @@
+@@ -4755,11 +5011,91 @@
void do_set_cpus_allowed(struct task_struct *p, const struct cpumask *new_mask)
{
@@ -18791,7 +19085,7 @@ diff -Nur linux-4.1.10.orig/kernel/sched/core.c linux-4.1.10/kernel/sched/core.c
}
/*
-@@ -4798,7 +5132,7 @@
+@@ -4805,7 +5141,7 @@
do_set_cpus_allowed(p, new_mask);
/* Can the task run on the task's current CPU? If so, we're done */
@@ -18800,7 +19094,7 @@ diff -Nur linux-4.1.10.orig/kernel/sched/core.c linux-4.1.10/kernel/sched/core.c
goto out;
dest_cpu = cpumask_any_and(cpu_active_mask, new_mask);
-@@ -4938,6 +5272,8 @@
+@@ -4945,6 +5281,8 @@
#ifdef CONFIG_HOTPLUG_CPU
@@ -18809,7 +19103,7 @@ diff -Nur linux-4.1.10.orig/kernel/sched/core.c linux-4.1.10/kernel/sched/core.c
/*
* Ensures that the idle task is using init_mm right before its cpu goes
* offline.
-@@ -4952,7 +5288,11 @@
+@@ -4959,7 +5297,11 @@
switch_mm(mm, &init_mm, current);
finish_arch_post_lock_switch();
}
@@ -18822,7 +19116,7 @@ diff -Nur linux-4.1.10.orig/kernel/sched/core.c linux-4.1.10/kernel/sched/core.c
}
/*
-@@ -5295,6 +5635,10 @@
+@@ -5302,6 +5644,10 @@
case CPU_DEAD:
calc_load_migrate(rq);
@@ -18833,7 +19127,7 @@ diff -Nur linux-4.1.10.orig/kernel/sched/core.c linux-4.1.10/kernel/sched/core.c
break;
#endif
}
-@@ -7274,7 +7618,8 @@
+@@ -7281,7 +7627,8 @@
#ifdef CONFIG_DEBUG_ATOMIC_SLEEP
static inline int preempt_count_equals(int preempt_offset)
{
@@ -18843,9 +19137,9 @@ diff -Nur linux-4.1.10.orig/kernel/sched/core.c linux-4.1.10/kernel/sched/core.c
return (nested == preempt_offset);
}
-diff -Nur linux-4.1.10.orig/kernel/sched/cputime.c linux-4.1.10/kernel/sched/cputime.c
---- linux-4.1.10.orig/kernel/sched/cputime.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/sched/cputime.c 2015-10-12 22:33:32.308674640 +0200
+diff -Nur linux-4.1.13.orig/kernel/sched/cputime.c linux-4.1.13/kernel/sched/cputime.c
+--- linux-4.1.13.orig/kernel/sched/cputime.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/sched/cputime.c 2015-11-29 09:23:09.645611789 +0100
@@ -675,37 +675,45 @@
void vtime_account_system(struct task_struct *tsk)
@@ -18999,9 +19293,9 @@ diff -Nur linux-4.1.10.orig/kernel/sched/cputime.c linux-4.1.10/kernel/sched/cpu
}
-diff -Nur linux-4.1.10.orig/kernel/sched/deadline.c linux-4.1.10/kernel/sched/deadline.c
---- linux-4.1.10.orig/kernel/sched/deadline.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/sched/deadline.c 2015-10-12 22:33:32.308674640 +0200
+diff -Nur linux-4.1.13.orig/kernel/sched/deadline.c linux-4.1.13/kernel/sched/deadline.c
+--- linux-4.1.13.orig/kernel/sched/deadline.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/sched/deadline.c 2015-11-29 09:23:09.645611789 +0100
@@ -637,6 +637,7 @@
hrtimer_init(timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
@@ -19010,9 +19304,9 @@ diff -Nur linux-4.1.10.orig/kernel/sched/deadline.c linux-4.1.10/kernel/sched/de
}
static
-diff -Nur linux-4.1.10.orig/kernel/sched/debug.c linux-4.1.10/kernel/sched/debug.c
---- linux-4.1.10.orig/kernel/sched/debug.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/sched/debug.c 2015-10-12 22:33:32.308674640 +0200
+diff -Nur linux-4.1.13.orig/kernel/sched/debug.c linux-4.1.13/kernel/sched/debug.c
+--- linux-4.1.13.orig/kernel/sched/debug.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/sched/debug.c 2015-11-29 09:23:09.645611789 +0100
@@ -260,6 +260,9 @@
P(rt_throttled);
PN(rt_time);
@@ -19034,9 +19328,9 @@ diff -Nur linux-4.1.10.orig/kernel/sched/debug.c linux-4.1.10/kernel/sched/debug
#undef PN
#undef __PN
#undef P
-diff -Nur linux-4.1.10.orig/kernel/sched/fair.c linux-4.1.10/kernel/sched/fair.c
---- linux-4.1.10.orig/kernel/sched/fair.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/sched/fair.c 2015-10-12 22:33:32.308674640 +0200
+diff -Nur linux-4.1.13.orig/kernel/sched/fair.c linux-4.1.13/kernel/sched/fair.c
+--- linux-4.1.13.orig/kernel/sched/fair.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/sched/fair.c 2015-11-29 09:23:09.645611789 +0100
@@ -3201,7 +3201,7 @@
ideal_runtime = sched_slice(cfs_rq, curr);
delta_exec = curr->sum_exec_runtime - curr->prev_sum_exec_runtime;
@@ -19091,7 +19385,7 @@ diff -Nur linux-4.1.10.orig/kernel/sched/fair.c linux-4.1.10/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
-@@ -7866,7 +7866,7 @@
+@@ -7869,7 +7869,7 @@
* 'current' within the tree based on its new key value.
*/
swap(curr->vruntime, se->vruntime);
@@ -19100,7 +19394,7 @@ diff -Nur linux-4.1.10.orig/kernel/sched/fair.c linux-4.1.10/kernel/sched/fair.c
}
se->vruntime -= cfs_rq->min_vruntime;
-@@ -7891,7 +7891,7 @@
+@@ -7894,7 +7894,7 @@
*/
if (rq->curr == p) {
if (p->prio > oldprio)
@@ -19109,9 +19403,9 @@ diff -Nur linux-4.1.10.orig/kernel/sched/fair.c linux-4.1.10/kernel/sched/fair.c
} else
check_preempt_curr(rq, p, 0);
}
-diff -Nur linux-4.1.10.orig/kernel/sched/features.h linux-4.1.10/kernel/sched/features.h
---- linux-4.1.10.orig/kernel/sched/features.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/sched/features.h 2015-10-12 22:33:32.308674640 +0200
+diff -Nur linux-4.1.13.orig/kernel/sched/features.h linux-4.1.13/kernel/sched/features.h
+--- linux-4.1.13.orig/kernel/sched/features.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/sched/features.h 2015-11-29 09:23:09.645611789 +0100
@@ -50,11 +50,19 @@
*/
SCHED_FEAT(NONTASK_CAPACITY, true)
@@ -19132,9 +19426,9 @@ diff -Nur linux-4.1.10.orig/kernel/sched/features.h linux-4.1.10/kernel/sched/fe
#ifdef HAVE_RT_PUSH_IPI
/*
-diff -Nur linux-4.1.10.orig/kernel/sched/Makefile linux-4.1.10/kernel/sched/Makefile
---- linux-4.1.10.orig/kernel/sched/Makefile 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/sched/Makefile 2015-10-12 22:33:32.308674640 +0200
+diff -Nur linux-4.1.13.orig/kernel/sched/Makefile linux-4.1.13/kernel/sched/Makefile
+--- linux-4.1.13.orig/kernel/sched/Makefile 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/sched/Makefile 2015-11-29 09:23:09.641612055 +0100
@@ -13,7 +13,7 @@
obj-y += core.o proc.o clock.o cputime.o
@@ -19144,9 +19438,9 @@ diff -Nur linux-4.1.10.orig/kernel/sched/Makefile linux-4.1.10/kernel/sched/Make
obj-$(CONFIG_SMP) += cpupri.o cpudeadline.o
obj-$(CONFIG_SCHED_AUTOGROUP) += auto_group.o
obj-$(CONFIG_SCHEDSTATS) += stats.o
-diff -Nur linux-4.1.10.orig/kernel/sched/rt.c linux-4.1.10/kernel/sched/rt.c
---- linux-4.1.10.orig/kernel/sched/rt.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/sched/rt.c 2015-10-12 22:33:32.312674375 +0200
+diff -Nur linux-4.1.13.orig/kernel/sched/rt.c linux-4.1.13/kernel/sched/rt.c
+--- linux-4.1.13.orig/kernel/sched/rt.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/sched/rt.c 2015-11-29 09:23:09.645611789 +0100
@@ -44,6 +44,7 @@
hrtimer_init(&rt_b->rt_period_timer,
@@ -19163,10 +19457,10 @@ diff -Nur linux-4.1.10.orig/kernel/sched/rt.c linux-4.1.10/kernel/sched/rt.c
#endif
#endif /* CONFIG_SMP */
/* We start is dequeued state, because no RT tasks are queued */
-diff -Nur linux-4.1.10.orig/kernel/sched/sched.h linux-4.1.10/kernel/sched/sched.h
---- linux-4.1.10.orig/kernel/sched/sched.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/sched/sched.h 2015-10-12 22:33:32.312674375 +0200
-@@ -1092,6 +1092,7 @@
+diff -Nur linux-4.1.13.orig/kernel/sched/sched.h linux-4.1.13/kernel/sched/sched.h
+--- linux-4.1.13.orig/kernel/sched/sched.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/sched/sched.h 2015-11-29 09:23:09.645611789 +0100
+@@ -1093,6 +1093,7 @@
#define WF_SYNC 0x01 /* waker goes to sleep after wakeup */
#define WF_FORK 0x02 /* child wakeup after fork */
#define WF_MIGRATED 0x4 /* internal use, task got migrated */
@@ -19174,7 +19468,7 @@ diff -Nur linux-4.1.10.orig/kernel/sched/sched.h linux-4.1.10/kernel/sched/sched
/*
* To aid in avoiding the subversion of "niceness" due to uneven distribution
-@@ -1289,6 +1290,15 @@
+@@ -1290,6 +1291,15 @@
extern void resched_curr(struct rq *rq);
extern void resched_cpu(int cpu);
@@ -19190,9 +19484,9 @@ diff -Nur linux-4.1.10.orig/kernel/sched/sched.h linux-4.1.10/kernel/sched/sched
extern struct rt_bandwidth def_rt_bandwidth;
extern void init_rt_bandwidth(struct rt_bandwidth *rt_b, u64 period, u64 runtime);
-diff -Nur linux-4.1.10.orig/kernel/sched/wait-simple.c linux-4.1.10/kernel/sched/wait-simple.c
---- linux-4.1.10.orig/kernel/sched/wait-simple.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.1.10/kernel/sched/wait-simple.c 2015-10-12 22:33:32.312674375 +0200
+diff -Nur linux-4.1.13.orig/kernel/sched/wait-simple.c linux-4.1.13/kernel/sched/wait-simple.c
+--- linux-4.1.13.orig/kernel/sched/wait-simple.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.13/kernel/sched/wait-simple.c 2015-11-29 09:23:09.645611789 +0100
@@ -0,0 +1,115 @@
+/*
+ * Simple waitqueues without fancy flags and callbacks
@@ -19309,10 +19603,10 @@ diff -Nur linux-4.1.10.orig/kernel/sched/wait-simple.c linux-4.1.10/kernel/sched
+ return woken;
+}
+EXPORT_SYMBOL(__swait_wake);
-diff -Nur linux-4.1.10.orig/kernel/sched/work-simple.c linux-4.1.10/kernel/sched/work-simple.c
---- linux-4.1.10.orig/kernel/sched/work-simple.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.1.10/kernel/sched/work-simple.c 2015-10-12 22:33:32.312674375 +0200
-@@ -0,0 +1,172 @@
+diff -Nur linux-4.1.13.orig/kernel/sched/work-simple.c linux-4.1.13/kernel/sched/work-simple.c
+--- linux-4.1.13.orig/kernel/sched/work-simple.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.13/kernel/sched/work-simple.c 2015-11-29 09:23:09.645611789 +0100
+@@ -0,0 +1,173 @@
+/*
+ * Copyright (C) 2014 BMW Car IT GmbH, Daniel Wagner daniel.wagner@bmw-carit.de
+ *
@@ -19325,6 +19619,7 @@ diff -Nur linux-4.1.10.orig/kernel/sched/work-simple.c linux-4.1.10/kernel/sched
+#include <linux/kthread.h>
+#include <linux/slab.h>
+#include <linux/spinlock.h>
++#include <linux/export.h>
+
+#define SWORK_EVENT_PENDING (1 << 0)
+
@@ -19485,9 +19780,9 @@ diff -Nur linux-4.1.10.orig/kernel/sched/work-simple.c linux-4.1.10/kernel/sched
+ mutex_unlock(&worker_mutex);
+}
+EXPORT_SYMBOL_GPL(swork_put);
-diff -Nur linux-4.1.10.orig/kernel/signal.c linux-4.1.10/kernel/signal.c
---- linux-4.1.10.orig/kernel/signal.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/signal.c 2015-10-12 22:33:32.312674375 +0200
+diff -Nur linux-4.1.13.orig/kernel/signal.c linux-4.1.13/kernel/signal.c
+--- linux-4.1.13.orig/kernel/signal.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/signal.c 2015-11-29 09:23:09.649611524 +0100
@@ -14,6 +14,7 @@
#include <linux/export.h>
#include <linux/init.h>
@@ -19732,9 +20027,9 @@ diff -Nur linux-4.1.10.orig/kernel/signal.c linux-4.1.10/kernel/signal.c
freezable_schedule();
} else {
/*
-diff -Nur linux-4.1.10.orig/kernel/softirq.c linux-4.1.10/kernel/softirq.c
---- linux-4.1.10.orig/kernel/softirq.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/softirq.c 2015-10-12 22:33:32.312674375 +0200
+diff -Nur linux-4.1.13.orig/kernel/softirq.c linux-4.1.13/kernel/softirq.c
+--- linux-4.1.13.orig/kernel/softirq.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/softirq.c 2015-11-29 09:23:09.649611524 +0100
@@ -21,10 +21,12 @@
#include <linux/freezer.h>
#include <linux/kthread.h>
@@ -19965,7 +20260,7 @@ diff -Nur linux-4.1.10.orig/kernel/softirq.c linux-4.1.10/kernel/softirq.c
pending = local_softirq_pending();
if (pending) {
-@@ -320,6 +445,285 @@
+@@ -320,6 +445,255 @@
}
/*
@@ -20078,26 +20373,14 @@ diff -Nur linux-4.1.10.orig/kernel/softirq.c linux-4.1.10/kernel/softirq.c
+ }
+}
+
-+static void __local_bh_disable(void)
++void __local_bh_disable(void)
+{
+ if (++current->softirq_nestcnt == 1)
+ migrate_disable();
+}
++EXPORT_SYMBOL(__local_bh_disable);
+
-+void local_bh_disable(void)
-+{
-+ __local_bh_disable();
-+}
-+EXPORT_SYMBOL(local_bh_disable);
-+
-+void __local_bh_disable_ip(unsigned long ip, unsigned int cnt)
-+{
-+ __local_bh_disable();
-+ if (cnt & PREEMPT_CHECK_OFFSET)
-+ preempt_disable();
-+}
-+
-+static void __local_bh_enable(void)
++void __local_bh_enable(void)
+{
+ if (WARN_ON(current->softirq_nestcnt == 0))
+ return;
@@ -20110,25 +20393,7 @@ diff -Nur linux-4.1.10.orig/kernel/softirq.c linux-4.1.10/kernel/softirq.c
+ if (--current->softirq_nestcnt == 0)
+ migrate_enable();
+}
-+
-+void local_bh_enable(void)
-+{
-+ __local_bh_enable();
-+}
-+EXPORT_SYMBOL(local_bh_enable);
-+
-+extern void __local_bh_enable_ip(unsigned long ip, unsigned int cnt)
-+{
-+ __local_bh_enable();
-+ if (cnt & PREEMPT_CHECK_OFFSET)
-+ preempt_enable();
-+}
-+
-+void local_bh_enable_ip(unsigned long ip)
-+{
-+ local_bh_enable();
-+}
-+EXPORT_SYMBOL(local_bh_enable_ip);
++EXPORT_SYMBOL(__local_bh_enable);
+
+void _local_bh_enable(void)
+{
@@ -20251,7 +20516,7 @@ diff -Nur linux-4.1.10.orig/kernel/softirq.c linux-4.1.10/kernel/softirq.c
* Enter an interrupt context.
*/
void irq_enter(void)
-@@ -330,9 +734,9 @@
+@@ -330,9 +704,9 @@
* Prevent raise_softirq from needlessly waking up ksoftirqd
* here, as softirq will be serviced on return from interrupt.
*/
@@ -20263,7 +20528,7 @@ diff -Nur linux-4.1.10.orig/kernel/softirq.c linux-4.1.10/kernel/softirq.c
}
__irq_enter();
-@@ -340,6 +744,7 @@
+@@ -340,6 +714,7 @@
static inline void invoke_softirq(void)
{
@@ -20271,7 +20536,7 @@ diff -Nur linux-4.1.10.orig/kernel/softirq.c linux-4.1.10/kernel/softirq.c
if (!force_irqthreads) {
#ifdef CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK
/*
-@@ -359,6 +764,15 @@
+@@ -359,6 +734,15 @@
} else {
wakeup_softirqd();
}
@@ -20287,7 +20552,7 @@ diff -Nur linux-4.1.10.orig/kernel/softirq.c linux-4.1.10/kernel/softirq.c
}
static inline void tick_irq_exit(void)
-@@ -395,26 +809,6 @@
+@@ -395,26 +779,6 @@
trace_hardirq_exit(); /* must be last! */
}
@@ -20314,7 +20579,7 @@ diff -Nur linux-4.1.10.orig/kernel/softirq.c linux-4.1.10/kernel/softirq.c
void raise_softirq(unsigned int nr)
{
unsigned long flags;
-@@ -424,12 +818,6 @@
+@@ -424,12 +788,6 @@
local_irq_restore(flags);
}
@@ -20327,7 +20592,7 @@ diff -Nur linux-4.1.10.orig/kernel/softirq.c linux-4.1.10/kernel/softirq.c
void open_softirq(int nr, void (*action)(struct softirq_action *))
{
softirq_vec[nr].action = action;
-@@ -446,15 +834,45 @@
+@@ -446,15 +804,45 @@
static DEFINE_PER_CPU(struct tasklet_head, tasklet_vec);
static DEFINE_PER_CPU(struct tasklet_head, tasklet_hi_vec);
@@ -20377,7 +20642,7 @@ diff -Nur linux-4.1.10.orig/kernel/softirq.c linux-4.1.10/kernel/softirq.c
local_irq_restore(flags);
}
EXPORT_SYMBOL(__tasklet_schedule);
-@@ -464,10 +882,7 @@
+@@ -464,10 +852,7 @@
unsigned long flags;
local_irq_save(flags);
@@ -20389,7 +20654,7 @@ diff -Nur linux-4.1.10.orig/kernel/softirq.c linux-4.1.10/kernel/softirq.c
local_irq_restore(flags);
}
EXPORT_SYMBOL(__tasklet_hi_schedule);
-@@ -476,82 +891,122 @@
+@@ -476,82 +861,122 @@
{
BUG_ON(!irqs_disabled());
@@ -20531,12 +20796,12 @@ diff -Nur linux-4.1.10.orig/kernel/softirq.c linux-4.1.10/kernel/softirq.c
__this_cpu_write(tasklet_hi_vec.head, NULL);
__this_cpu_write(tasklet_hi_vec.tail, this_cpu_ptr(&tasklet_hi_vec.head));
- local_irq_enable();
--
+
- while (list) {
- struct tasklet_struct *t = list;
-
- list = list->next;
-
+-
- if (tasklet_trylock(t)) {
- if (!atomic_read(&t->count)) {
- if (!test_and_clear_bit(TASKLET_STATE_SCHED,
@@ -20561,7 +20826,7 @@ diff -Nur linux-4.1.10.orig/kernel/softirq.c linux-4.1.10/kernel/softirq.c
}
void tasklet_init(struct tasklet_struct *t,
-@@ -572,7 +1027,7 @@
+@@ -572,7 +997,7 @@
while (test_and_set_bit(TASKLET_STATE_SCHED, &t->state)) {
do {
@@ -20570,19 +20835,19 @@ diff -Nur linux-4.1.10.orig/kernel/softirq.c linux-4.1.10/kernel/softirq.c
} while (test_bit(TASKLET_STATE_SCHED, &t->state));
}
tasklet_unlock_wait(t);
-@@ -646,25 +1101,26 @@
+@@ -646,25 +1071,26 @@
open_softirq(HI_SOFTIRQ, tasklet_hi_action);
}
-static int ksoftirqd_should_run(unsigned int cpu)
--{
++#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT_RT_FULL)
++void tasklet_unlock_wait(struct tasklet_struct *t)
+ {
- return local_softirq_pending();
-}
-
-static void run_ksoftirqd(unsigned int cpu)
-+#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT_RT_FULL)
-+void tasklet_unlock_wait(struct tasklet_struct *t)
- {
+-{
- local_irq_disable();
- if (local_softirq_pending()) {
+ while (test_bit(TASKLET_STATE_RUN, &(t)->state)) {
@@ -20612,7 +20877,7 @@ diff -Nur linux-4.1.10.orig/kernel/softirq.c linux-4.1.10/kernel/softirq.c
}
#ifdef CONFIG_HOTPLUG_CPU
-@@ -746,6 +1202,8 @@
+@@ -746,6 +1172,8 @@
static struct smp_hotplug_thread softirq_threads = {
.store = &ksoftirqd,
@@ -20621,9 +20886,9 @@ diff -Nur linux-4.1.10.orig/kernel/softirq.c linux-4.1.10/kernel/softirq.c
.thread_should_run = ksoftirqd_should_run,
.thread_fn = run_ksoftirqd,
.thread_comm = "ksoftirqd/%u",
-diff -Nur linux-4.1.10.orig/kernel/stop_machine.c linux-4.1.10/kernel/stop_machine.c
---- linux-4.1.10.orig/kernel/stop_machine.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/stop_machine.c 2015-10-12 22:33:32.312674375 +0200
+diff -Nur linux-4.1.13.orig/kernel/stop_machine.c linux-4.1.13/kernel/stop_machine.c
+--- linux-4.1.13.orig/kernel/stop_machine.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/stop_machine.c 2015-11-29 09:23:09.649611524 +0100
@@ -30,12 +30,12 @@
atomic_t nr_todo; /* nr left to execute */
bool executed; /* actually executed? */
@@ -20884,9 +21149,9 @@ diff -Nur linux-4.1.10.orig/kernel/stop_machine.c linux-4.1.10/kernel/stop_machi
cpu_relax();
mutex_unlock(&stop_cpus_mutex);
-diff -Nur linux-4.1.10.orig/kernel/time/hrtimer.c linux-4.1.10/kernel/time/hrtimer.c
---- linux-4.1.10.orig/kernel/time/hrtimer.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/time/hrtimer.c 2015-10-12 22:33:32.312674375 +0200
+diff -Nur linux-4.1.13.orig/kernel/time/hrtimer.c linux-4.1.13/kernel/time/hrtimer.c
+--- linux-4.1.13.orig/kernel/time/hrtimer.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/time/hrtimer.c 2015-11-29 09:23:09.649611524 +0100
@@ -48,11 +48,13 @@
#include <linux/sched/rt.h>
#include <linux/sched/deadline.h>
@@ -21491,9 +21756,9 @@ diff -Nur linux-4.1.10.orig/kernel/time/hrtimer.c linux-4.1.10/kernel/time/hrtim
}
/**
-diff -Nur linux-4.1.10.orig/kernel/time/itimer.c linux-4.1.10/kernel/time/itimer.c
---- linux-4.1.10.orig/kernel/time/itimer.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/time/itimer.c 2015-10-12 22:33:32.312674375 +0200
+diff -Nur linux-4.1.13.orig/kernel/time/itimer.c linux-4.1.13/kernel/time/itimer.c
+--- linux-4.1.13.orig/kernel/time/itimer.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/time/itimer.c 2015-11-29 09:23:09.649611524 +0100
@@ -213,6 +213,7 @@
/* We are sharing ->siglock with it_real_fn() */
if (hrtimer_try_to_cancel(timer) < 0) {
@@ -21502,9 +21767,9 @@ diff -Nur linux-4.1.10.orig/kernel/time/itimer.c linux-4.1.10/kernel/time/itimer
goto again;
}
expires = timeval_to_ktime(value->it_value);
-diff -Nur linux-4.1.10.orig/kernel/time/jiffies.c linux-4.1.10/kernel/time/jiffies.c
---- linux-4.1.10.orig/kernel/time/jiffies.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/time/jiffies.c 2015-10-12 22:33:32.312674375 +0200
+diff -Nur linux-4.1.13.orig/kernel/time/jiffies.c linux-4.1.13/kernel/time/jiffies.c
+--- linux-4.1.13.orig/kernel/time/jiffies.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/time/jiffies.c 2015-11-29 09:23:09.649611524 +0100
@@ -74,7 +74,8 @@
.max_cycles = 10,
};
@@ -21527,9 +21792,9 @@ diff -Nur linux-4.1.10.orig/kernel/time/jiffies.c linux-4.1.10/kernel/time/jiffi
return ret;
}
EXPORT_SYMBOL(get_jiffies_64);
-diff -Nur linux-4.1.10.orig/kernel/time/ntp.c linux-4.1.10/kernel/time/ntp.c
---- linux-4.1.10.orig/kernel/time/ntp.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/time/ntp.c 2015-10-12 22:33:32.312674375 +0200
+diff -Nur linux-4.1.13.orig/kernel/time/ntp.c linux-4.1.13/kernel/time/ntp.c
+--- linux-4.1.13.orig/kernel/time/ntp.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/time/ntp.c 2015-11-29 09:23:09.649611524 +0100
@@ -10,6 +10,7 @@
#include <linux/workqueue.h>
#include <linux/hrtimer.h>
@@ -21591,9 +21856,9 @@ diff -Nur linux-4.1.10.orig/kernel/time/ntp.c linux-4.1.10/kernel/time/ntp.c
#else
void ntp_notify_cmos_timer(void) { }
-diff -Nur linux-4.1.10.orig/kernel/time/posix-cpu-timers.c linux-4.1.10/kernel/time/posix-cpu-timers.c
---- linux-4.1.10.orig/kernel/time/posix-cpu-timers.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/time/posix-cpu-timers.c 2015-10-12 22:33:32.316674111 +0200
+diff -Nur linux-4.1.13.orig/kernel/time/posix-cpu-timers.c linux-4.1.13/kernel/time/posix-cpu-timers.c
+--- linux-4.1.13.orig/kernel/time/posix-cpu-timers.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/time/posix-cpu-timers.c 2015-11-29 09:23:09.649611524 +0100
@@ -3,6 +3,7 @@
*/
@@ -21841,9 +22106,9 @@ diff -Nur linux-4.1.10.orig/kernel/time/posix-cpu-timers.c linux-4.1.10/kernel/t
/*
* Set one of the process-wide special case CPU timers or RLIMIT_CPU.
* The tsk->sighand->siglock must be held by the caller.
-diff -Nur linux-4.1.10.orig/kernel/time/posix-timers.c linux-4.1.10/kernel/time/posix-timers.c
---- linux-4.1.10.orig/kernel/time/posix-timers.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/time/posix-timers.c 2015-10-12 22:33:32.316674111 +0200
+diff -Nur linux-4.1.13.orig/kernel/time/posix-timers.c linux-4.1.13/kernel/time/posix-timers.c
+--- linux-4.1.13.orig/kernel/time/posix-timers.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/time/posix-timers.c 2015-11-29 09:23:09.649611524 +0100
@@ -499,6 +499,7 @@
static struct pid *good_sigevent(sigevent_t * event)
{
@@ -21939,9 +22204,9 @@ diff -Nur linux-4.1.10.orig/kernel/time/posix-timers.c linux-4.1.10/kernel/time/
goto retry_delete;
}
list_del(&timer->list);
-diff -Nur linux-4.1.10.orig/kernel/time/tick-common.c linux-4.1.10/kernel/time/tick-common.c
---- linux-4.1.10.orig/kernel/time/tick-common.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/time/tick-common.c 2015-10-12 22:33:32.316674111 +0200
+diff -Nur linux-4.1.13.orig/kernel/time/tick-common.c linux-4.1.13/kernel/time/tick-common.c
+--- linux-4.1.13.orig/kernel/time/tick-common.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/time/tick-common.c 2015-11-29 09:23:09.649611524 +0100
@@ -78,13 +78,15 @@
static void tick_periodic(int cpu)
{
@@ -21972,9 +22237,9 @@ diff -Nur linux-4.1.10.orig/kernel/time/tick-common.c linux-4.1.10/kernel/time/t
clockevents_set_state(dev, CLOCK_EVT_STATE_ONESHOT);
-diff -Nur linux-4.1.10.orig/kernel/time/tick-sched.c linux-4.1.10/kernel/time/tick-sched.c
---- linux-4.1.10.orig/kernel/time/tick-sched.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/time/tick-sched.c 2015-10-12 22:33:32.316674111 +0200
+diff -Nur linux-4.1.13.orig/kernel/time/tick-sched.c linux-4.1.13/kernel/time/tick-sched.c
+--- linux-4.1.13.orig/kernel/time/tick-sched.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/time/tick-sched.c 2015-11-29 09:23:09.649611524 +0100
@@ -62,7 +62,8 @@
return;
@@ -22074,9 +22339,9 @@ diff -Nur linux-4.1.10.orig/kernel/time/tick-sched.c linux-4.1.10/kernel/time/ti
ts->sched_timer.function = tick_sched_timer;
/* Get the next period (per cpu) */
-diff -Nur linux-4.1.10.orig/kernel/time/timekeeping.c linux-4.1.10/kernel/time/timekeeping.c
---- linux-4.1.10.orig/kernel/time/timekeeping.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/time/timekeeping.c 2015-10-12 22:33:32.316674111 +0200
+diff -Nur linux-4.1.13.orig/kernel/time/timekeeping.c linux-4.1.13/kernel/time/timekeeping.c
+--- linux-4.1.13.orig/kernel/time/timekeeping.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/time/timekeeping.c 2015-11-29 09:23:09.649611524 +0100
@@ -2065,8 +2065,10 @@
*/
void xtime_update(unsigned long ticks)
@@ -22090,9 +22355,9 @@ diff -Nur linux-4.1.10.orig/kernel/time/timekeeping.c linux-4.1.10/kernel/time/t
+ raw_spin_unlock(&jiffies_lock);
update_wall_time();
}
-diff -Nur linux-4.1.10.orig/kernel/time/timekeeping.h linux-4.1.10/kernel/time/timekeeping.h
---- linux-4.1.10.orig/kernel/time/timekeeping.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/time/timekeeping.h 2015-10-12 22:33:32.316674111 +0200
+diff -Nur linux-4.1.13.orig/kernel/time/timekeeping.h linux-4.1.13/kernel/time/timekeeping.h
+--- linux-4.1.13.orig/kernel/time/timekeeping.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/time/timekeeping.h 2015-11-29 09:23:09.653611260 +0100
@@ -22,7 +22,8 @@
extern void do_timer(unsigned long ticks);
extern void update_wall_time(void);
@@ -22103,9 +22368,9 @@ diff -Nur linux-4.1.10.orig/kernel/time/timekeeping.h linux-4.1.10/kernel/time/t
#define CS_NAME_LEN 32
-diff -Nur linux-4.1.10.orig/kernel/time/timer.c linux-4.1.10/kernel/time/timer.c
---- linux-4.1.10.orig/kernel/time/timer.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/time/timer.c 2015-10-12 22:33:32.316674111 +0200
+diff -Nur linux-4.1.13.orig/kernel/time/timer.c linux-4.1.13/kernel/time/timer.c
+--- linux-4.1.13.orig/kernel/time/timer.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/time/timer.c 2015-11-29 09:23:09.653611260 +0100
@@ -78,6 +78,9 @@
struct tvec_base {
spinlock_t lock;
@@ -22260,7 +22525,7 @@ diff -Nur linux-4.1.10.orig/kernel/time/timer.c linux-4.1.10/kernel/time/timer.c
run_local_timers();
rcu_check_callbacks(user_tick);
-#ifdef CONFIG_IRQ_WORK
-+#if defined(CONFIG_IRQ_WORK) && !defined(CONFIG_PREEMPT_RT_FULL)
++#if defined(CONFIG_IRQ_WORK)
if (in_irq())
irq_work_tick();
#endif
@@ -22268,18 +22533,16 @@ diff -Nur linux-4.1.10.orig/kernel/time/timer.c linux-4.1.10/kernel/time/timer.c
run_posix_cpu_timers(p);
}
-@@ -1411,6 +1471,10 @@
+@@ -1411,6 +1471,8 @@
hrtimer_run_pending();
-+#if defined(CONFIG_IRQ_WORK) && defined(CONFIG_PREEMPT_RT_FULL)
-+ irq_work_tick();
-+#endif
++ irq_work_tick_soft();
+
if (time_after_eq(jiffies, base->timer_jiffies))
__run_timers(base);
}
-@@ -1566,7 +1630,7 @@
+@@ -1566,7 +1628,7 @@
BUG_ON(cpu_online(cpu));
old_base = per_cpu(tvec_bases, cpu);
@@ -22288,7 +22551,7 @@ diff -Nur linux-4.1.10.orig/kernel/time/timer.c linux-4.1.10/kernel/time/timer.c
/*
* The caller is globally serialized and nobody else
* takes two locks at once, deadlock is not possible.
-@@ -1590,7 +1654,7 @@
+@@ -1590,7 +1652,7 @@
spin_unlock(&old_base->lock);
spin_unlock_irq(&new_base->lock);
@@ -22297,7 +22560,7 @@ diff -Nur linux-4.1.10.orig/kernel/time/timer.c linux-4.1.10/kernel/time/timer.c
}
static int timer_cpu_notify(struct notifier_block *self,
-@@ -1625,6 +1689,9 @@
+@@ -1625,6 +1687,9 @@
base->cpu = cpu;
per_cpu(tvec_bases, cpu) = base;
spin_lock_init(&base->lock);
@@ -22307,9 +22570,9 @@ diff -Nur linux-4.1.10.orig/kernel/time/timer.c linux-4.1.10/kernel/time/timer.c
for (j = 0; j < TVN_SIZE; j++) {
INIT_LIST_HEAD(base->tv5.vec + j);
-diff -Nur linux-4.1.10.orig/kernel/trace/Kconfig linux-4.1.10/kernel/trace/Kconfig
---- linux-4.1.10.orig/kernel/trace/Kconfig 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/trace/Kconfig 2015-10-12 22:33:32.316674111 +0200
+diff -Nur linux-4.1.13.orig/kernel/trace/Kconfig linux-4.1.13/kernel/trace/Kconfig
+--- linux-4.1.13.orig/kernel/trace/Kconfig 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/trace/Kconfig 2015-11-29 09:23:09.653611260 +0100
@@ -187,6 +187,24 @@
enabled. This option and the preempt-off timing option can be
used together or separately.)
@@ -22435,9 +22698,9 @@ diff -Nur linux-4.1.10.orig/kernel/trace/Kconfig linux-4.1.10/kernel/trace/Kconf
config ENABLE_DEFAULT_TRACERS
bool "Trace process context switches and events"
depends on !GENERIC_TRACER
-diff -Nur linux-4.1.10.orig/kernel/trace/latency_hist.c linux-4.1.10/kernel/trace/latency_hist.c
---- linux-4.1.10.orig/kernel/trace/latency_hist.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.1.10/kernel/trace/latency_hist.c 2015-10-12 22:33:32.316674111 +0200
+diff -Nur linux-4.1.13.orig/kernel/trace/latency_hist.c linux-4.1.13/kernel/trace/latency_hist.c
+--- linux-4.1.13.orig/kernel/trace/latency_hist.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.1.13/kernel/trace/latency_hist.c 2015-11-29 09:23:09.653611260 +0100
@@ -0,0 +1,1178 @@
+/*
+ * kernel/trace/latency_hist.c
@@ -22556,7 +22819,7 @@ diff -Nur linux-4.1.10.orig/kernel/trace/latency_hist.c linux-4.1.10/kernel/trac
+static char *wakeup_latency_hist_dir = "wakeup";
+static char *wakeup_latency_hist_dir_sharedprio = "sharedprio";
+static notrace void probe_wakeup_latency_hist_start(void *v,
-+ struct task_struct *p, int success);
++ struct task_struct *p);
+static notrace void probe_wakeup_latency_hist_stop(void *v,
+ struct task_struct *prev, struct task_struct *next);
+static notrace void probe_sched_migrate_task(void *,
@@ -23310,7 +23573,7 @@ diff -Nur linux-4.1.10.orig/kernel/trace/latency_hist.c linux-4.1.10/kernel/trac
+}
+
+static notrace void probe_wakeup_latency_hist_start(void *v,
-+ struct task_struct *p, int success)
++ struct task_struct *p)
+{
+ unsigned long flags;
+ struct task_struct *curr = current;
@@ -23617,9 +23880,9 @@ diff -Nur linux-4.1.10.orig/kernel/trace/latency_hist.c linux-4.1.10/kernel/trac
+}
+
+device_initcall(latency_hist_init);
-diff -Nur linux-4.1.10.orig/kernel/trace/Makefile linux-4.1.10/kernel/trace/Makefile
---- linux-4.1.10.orig/kernel/trace/Makefile 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/trace/Makefile 2015-10-12 22:33:32.316674111 +0200
+diff -Nur linux-4.1.13.orig/kernel/trace/Makefile linux-4.1.13/kernel/trace/Makefile
+--- linux-4.1.13.orig/kernel/trace/Makefile 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/trace/Makefile 2015-11-29 09:23:09.653611260 +0100
@@ -36,6 +36,10 @@
obj-$(CONFIG_IRQSOFF_TRACER) += trace_irqsoff.o
obj-$(CONFIG_PREEMPT_TRACER) += trace_irqsoff.o
@@ -23631,9 +23894,9 @@ diff -Nur linux-4.1.10.orig/kernel/trace/Makefile linux-4.1.10/kernel/trace/Make
obj-$(CONFIG_NOP_TRACER) += trace_nop.o
obj-$(CONFIG_STACK_TRACER) += trace_stack.o
obj-$(CONFIG_MMIOTRACE) += trace_mmiotrace.o
-diff -Nur linux-4.1.10.orig/kernel/trace/trace.c linux-4.1.10/kernel/trace/trace.c
---- linux-4.1.10.orig/kernel/trace/trace.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/trace/trace.c 2015-10-12 22:33:32.316674111 +0200
+diff -Nur linux-4.1.13.orig/kernel/trace/trace.c linux-4.1.13/kernel/trace/trace.c
+--- linux-4.1.13.orig/kernel/trace/trace.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/trace/trace.c 2015-11-29 09:23:09.653611260 +0100
@@ -1630,6 +1630,7 @@
struct task_struct *tsk = current;
@@ -23701,9 +23964,9 @@ diff -Nur linux-4.1.10.orig/kernel/trace/trace.c linux-4.1.10/kernel/trace/trace
}
void
-diff -Nur linux-4.1.10.orig/kernel/trace/trace_events.c linux-4.1.10/kernel/trace/trace_events.c
---- linux-4.1.10.orig/kernel/trace/trace_events.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/trace/trace_events.c 2015-10-12 22:33:32.320673847 +0200
+diff -Nur linux-4.1.13.orig/kernel/trace/trace_events.c linux-4.1.13/kernel/trace/trace_events.c
+--- linux-4.1.13.orig/kernel/trace/trace_events.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/trace/trace_events.c 2015-11-29 09:23:09.653611260 +0100
@@ -162,6 +162,8 @@
__common_field(unsigned char, flags);
__common_field(unsigned char, preempt_count);
@@ -23713,9 +23976,9 @@ diff -Nur linux-4.1.10.orig/kernel/trace/trace_events.c linux-4.1.10/kernel/trac
return ret;
}
-diff -Nur linux-4.1.10.orig/kernel/trace/trace.h linux-4.1.10/kernel/trace/trace.h
---- linux-4.1.10.orig/kernel/trace/trace.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/trace/trace.h 2015-10-12 22:33:32.320673847 +0200
+diff -Nur linux-4.1.13.orig/kernel/trace/trace.h linux-4.1.13/kernel/trace/trace.h
+--- linux-4.1.13.orig/kernel/trace/trace.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/trace/trace.h 2015-11-29 09:23:09.653611260 +0100
@@ -120,6 +120,7 @@
* NEED_RESCHED - reschedule is requested
* HARDIRQ - inside an interrupt handler
@@ -23732,9 +23995,9 @@ diff -Nur linux-4.1.10.orig/kernel/trace/trace.h linux-4.1.10/kernel/trace/trace
};
#define TRACE_BUF_SIZE 1024
-diff -Nur linux-4.1.10.orig/kernel/trace/trace_irqsoff.c linux-4.1.10/kernel/trace/trace_irqsoff.c
---- linux-4.1.10.orig/kernel/trace/trace_irqsoff.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/trace/trace_irqsoff.c 2015-10-12 22:33:32.320673847 +0200
+diff -Nur linux-4.1.13.orig/kernel/trace/trace_irqsoff.c linux-4.1.13/kernel/trace/trace_irqsoff.c
+--- linux-4.1.13.orig/kernel/trace/trace_irqsoff.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/trace/trace_irqsoff.c 2015-11-29 09:23:09.653611260 +0100
@@ -13,6 +13,7 @@
#include <linux/uaccess.h>
#include <linux/module.h>
@@ -23818,9 +24081,9 @@ diff -Nur linux-4.1.10.orig/kernel/trace/trace_irqsoff.c linux-4.1.10/kernel/tra
if (preempt_trace() && !irq_trace())
start_critical_timing(a0, a1);
}
-diff -Nur linux-4.1.10.orig/kernel/trace/trace_output.c linux-4.1.10/kernel/trace/trace_output.c
---- linux-4.1.10.orig/kernel/trace/trace_output.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/trace/trace_output.c 2015-10-12 22:33:32.320673847 +0200
+diff -Nur linux-4.1.13.orig/kernel/trace/trace_output.c linux-4.1.13/kernel/trace/trace_output.c
+--- linux-4.1.13.orig/kernel/trace/trace_output.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/trace/trace_output.c 2015-11-29 09:23:09.653611260 +0100
@@ -430,6 +430,7 @@
{
char hardsoft_irq;
@@ -23866,9 +24129,33 @@ diff -Nur linux-4.1.10.orig/kernel/trace/trace_output.c linux-4.1.10/kernel/trac
return !trace_seq_has_overflowed(s);
}
-diff -Nur linux-4.1.10.orig/kernel/user.c linux-4.1.10/kernel/user.c
---- linux-4.1.10.orig/kernel/user.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/user.c 2015-10-12 22:33:32.320673847 +0200
+diff -Nur linux-4.1.13.orig/kernel/trace/trace_sched_switch.c linux-4.1.13/kernel/trace/trace_sched_switch.c
+--- linux-4.1.13.orig/kernel/trace/trace_sched_switch.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/trace/trace_sched_switch.c 2015-11-29 09:23:09.653611260 +0100
+@@ -26,7 +26,7 @@
+ }
+
+ static void
+-probe_sched_wakeup(void *ignore, struct task_struct *wakee, int success)
++probe_sched_wakeup(void *ignore, struct task_struct *wakee)
+ {
+ if (unlikely(!sched_ref))
+ return;
+diff -Nur linux-4.1.13.orig/kernel/trace/trace_sched_wakeup.c linux-4.1.13/kernel/trace/trace_sched_wakeup.c
+--- linux-4.1.13.orig/kernel/trace/trace_sched_wakeup.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/trace/trace_sched_wakeup.c 2015-11-29 09:23:09.657610995 +0100
+@@ -514,7 +514,7 @@
+ }
+
+ static void
+-probe_wakeup(void *ignore, struct task_struct *p, int success)
++probe_wakeup(void *ignore, struct task_struct *p)
+ {
+ struct trace_array_cpu *data;
+ int cpu = smp_processor_id();
+diff -Nur linux-4.1.13.orig/kernel/user.c linux-4.1.13/kernel/user.c
+--- linux-4.1.13.orig/kernel/user.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/user.c 2015-11-29 09:23:09.657610995 +0100
@@ -161,11 +161,11 @@
if (!up)
return;
@@ -23883,9 +24170,9 @@ diff -Nur linux-4.1.10.orig/kernel/user.c linux-4.1.10/kernel/user.c
}
struct user_struct *alloc_uid(kuid_t uid)
-diff -Nur linux-4.1.10.orig/kernel/watchdog.c linux-4.1.10/kernel/watchdog.c
---- linux-4.1.10.orig/kernel/watchdog.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/watchdog.c 2015-10-12 22:33:32.320673847 +0200
+diff -Nur linux-4.1.13.orig/kernel/watchdog.c linux-4.1.13/kernel/watchdog.c
+--- linux-4.1.13.orig/kernel/watchdog.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/watchdog.c 2015-11-29 09:23:09.657610995 +0100
@@ -262,6 +262,8 @@
#ifdef CONFIG_HARDLOCKUP_DETECTOR
@@ -23927,9 +24214,9 @@ diff -Nur linux-4.1.10.orig/kernel/watchdog.c linux-4.1.10/kernel/watchdog.c
/* Enable the perf event */
watchdog_nmi_enable(cpu);
-diff -Nur linux-4.1.10.orig/kernel/workqueue.c linux-4.1.10/kernel/workqueue.c
---- linux-4.1.10.orig/kernel/workqueue.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/workqueue.c 2015-10-12 22:33:32.320673847 +0200
+diff -Nur linux-4.1.13.orig/kernel/workqueue.c linux-4.1.13/kernel/workqueue.c
+--- linux-4.1.13.orig/kernel/workqueue.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/workqueue.c 2015-11-29 09:23:09.657610995 +0100
@@ -48,6 +48,8 @@
#include <linux/nodemask.h>
#include <linux/moduleparam.h>
@@ -24561,9 +24848,9 @@ diff -Nur linux-4.1.10.orig/kernel/workqueue.c linux-4.1.10/kernel/workqueue.c
return written;
}
-diff -Nur linux-4.1.10.orig/kernel/workqueue_internal.h linux-4.1.10/kernel/workqueue_internal.h
---- linux-4.1.10.orig/kernel/workqueue_internal.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/kernel/workqueue_internal.h 2015-10-12 22:33:32.320673847 +0200
+diff -Nur linux-4.1.13.orig/kernel/workqueue_internal.h linux-4.1.13/kernel/workqueue_internal.h
+--- linux-4.1.13.orig/kernel/workqueue_internal.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/kernel/workqueue_internal.h 2015-11-29 09:23:09.657610995 +0100
@@ -43,6 +43,7 @@
unsigned long last_active; /* L: last active timestamp */
unsigned int flags; /* X: flags */
@@ -24582,9 +24869,9 @@ diff -Nur linux-4.1.10.orig/kernel/workqueue_internal.h linux-4.1.10/kernel/work
+void wq_worker_sleeping(struct task_struct *task);
#endif /* _KERNEL_WORKQUEUE_INTERNAL_H */
-diff -Nur linux-4.1.10.orig/lib/debugobjects.c linux-4.1.10/lib/debugobjects.c
---- linux-4.1.10.orig/lib/debugobjects.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/lib/debugobjects.c 2015-10-12 22:33:32.320673847 +0200
+diff -Nur linux-4.1.13.orig/lib/debugobjects.c linux-4.1.13/lib/debugobjects.c
+--- linux-4.1.13.orig/lib/debugobjects.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/lib/debugobjects.c 2015-11-29 09:23:09.657610995 +0100
@@ -309,7 +309,10 @@
struct debug_obj *obj;
unsigned long flags;
@@ -24597,9 +24884,9 @@ diff -Nur linux-4.1.10.orig/lib/debugobjects.c linux-4.1.10/lib/debugobjects.c
db = get_bucket((unsigned long) addr);
-diff -Nur linux-4.1.10.orig/lib/dump_stack.c linux-4.1.10/lib/dump_stack.c
---- linux-4.1.10.orig/lib/dump_stack.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/lib/dump_stack.c 2015-10-12 22:33:32.320673847 +0200
+diff -Nur linux-4.1.13.orig/lib/dump_stack.c linux-4.1.13/lib/dump_stack.c
+--- linux-4.1.13.orig/lib/dump_stack.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/lib/dump_stack.c 2015-11-29 09:23:09.657610995 +0100
@@ -33,7 +33,7 @@
* Permit this cpu to perform nested stack dumps while serialising
* against other CPUs
@@ -24618,9 +24905,9 @@ diff -Nur linux-4.1.10.orig/lib/dump_stack.c linux-4.1.10/lib/dump_stack.c
}
#else
asmlinkage __visible void dump_stack(void)
-diff -Nur linux-4.1.10.orig/lib/idr.c linux-4.1.10/lib/idr.c
---- linux-4.1.10.orig/lib/idr.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/lib/idr.c 2015-10-12 22:33:32.324673582 +0200
+diff -Nur linux-4.1.13.orig/lib/idr.c linux-4.1.13/lib/idr.c
+--- linux-4.1.13.orig/lib/idr.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/lib/idr.c 2015-11-29 09:23:09.657610995 +0100
@@ -30,6 +30,7 @@
#include <linux/idr.h>
#include <linux/spinlock.h>
@@ -24686,9 +24973,9 @@ diff -Nur linux-4.1.10.orig/lib/idr.c linux-4.1.10/lib/idr.c
if (!new)
break;
-diff -Nur linux-4.1.10.orig/lib/Kconfig linux-4.1.10/lib/Kconfig
---- linux-4.1.10.orig/lib/Kconfig 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/lib/Kconfig 2015-10-12 22:33:32.324673582 +0200
+diff -Nur linux-4.1.13.orig/lib/Kconfig linux-4.1.13/lib/Kconfig
+--- linux-4.1.13.orig/lib/Kconfig 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/lib/Kconfig 2015-11-29 09:23:09.657610995 +0100
@@ -391,6 +391,7 @@
config CPUMASK_OFFSTACK
@@ -24697,9 +24984,9 @@ diff -Nur linux-4.1.10.orig/lib/Kconfig linux-4.1.10/lib/Kconfig
help
Use dynamic allocation for cpumask_var_t, instead of putting
them on the stack. This is a bit more expensive, but avoids
-diff -Nur linux-4.1.10.orig/lib/locking-selftest.c linux-4.1.10/lib/locking-selftest.c
---- linux-4.1.10.orig/lib/locking-selftest.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/lib/locking-selftest.c 2015-10-12 22:33:32.324673582 +0200
+diff -Nur linux-4.1.13.orig/lib/locking-selftest.c linux-4.1.13/lib/locking-selftest.c
+--- linux-4.1.13.orig/lib/locking-selftest.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/lib/locking-selftest.c 2015-11-29 09:23:09.657610995 +0100
@@ -590,6 +590,8 @@
#include "locking-selftest-spin-hardirq.h"
GENERATE_PERMUTATIONS_2_EVENTS(irqsafe1_hard_spin)
@@ -24848,9 +25135,9 @@ diff -Nur linux-4.1.10.orig/lib/locking-selftest.c linux-4.1.10/lib/locking-self
ww_tests();
-diff -Nur linux-4.1.10.orig/lib/percpu_ida.c linux-4.1.10/lib/percpu_ida.c
---- linux-4.1.10.orig/lib/percpu_ida.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/lib/percpu_ida.c 2015-10-12 22:33:32.324673582 +0200
+diff -Nur linux-4.1.13.orig/lib/percpu_ida.c linux-4.1.13/lib/percpu_ida.c
+--- linux-4.1.13.orig/lib/percpu_ida.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/lib/percpu_ida.c 2015-11-29 09:23:09.657610995 +0100
@@ -26,6 +26,9 @@
#include <linux/string.h>
#include <linux/spinlock.h>
@@ -24939,9 +25226,9 @@ diff -Nur linux-4.1.10.orig/lib/percpu_ida.c linux-4.1.10/lib/percpu_ida.c
return err;
}
EXPORT_SYMBOL_GPL(percpu_ida_for_each_free);
-diff -Nur linux-4.1.10.orig/lib/radix-tree.c linux-4.1.10/lib/radix-tree.c
---- linux-4.1.10.orig/lib/radix-tree.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/lib/radix-tree.c 2015-10-12 22:33:32.324673582 +0200
+diff -Nur linux-4.1.13.orig/lib/radix-tree.c linux-4.1.13/lib/radix-tree.c
+--- linux-4.1.13.orig/lib/radix-tree.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/lib/radix-tree.c 2015-11-29 09:23:09.657610995 +0100
@@ -195,12 +195,13 @@
* succeed in getting a node here (and never reach
* kmem_cache_alloc)
@@ -24973,9 +25260,9 @@ diff -Nur linux-4.1.10.orig/lib/radix-tree.c linux-4.1.10/lib/radix-tree.c
/*
* Return the maximum key which can be store into a
-diff -Nur linux-4.1.10.orig/lib/scatterlist.c linux-4.1.10/lib/scatterlist.c
---- linux-4.1.10.orig/lib/scatterlist.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/lib/scatterlist.c 2015-10-12 22:33:32.324673582 +0200
+diff -Nur linux-4.1.13.orig/lib/scatterlist.c linux-4.1.13/lib/scatterlist.c
+--- linux-4.1.13.orig/lib/scatterlist.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/lib/scatterlist.c 2015-11-29 09:23:09.657610995 +0100
@@ -592,7 +592,7 @@
flush_kernel_dcache_page(miter->page);
@@ -25003,9 +25290,9 @@ diff -Nur linux-4.1.10.orig/lib/scatterlist.c linux-4.1.10/lib/scatterlist.c
return offset;
}
-diff -Nur linux-4.1.10.orig/lib/smp_processor_id.c linux-4.1.10/lib/smp_processor_id.c
---- linux-4.1.10.orig/lib/smp_processor_id.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/lib/smp_processor_id.c 2015-10-12 22:33:32.324673582 +0200
+diff -Nur linux-4.1.13.orig/lib/smp_processor_id.c linux-4.1.13/lib/smp_processor_id.c
+--- linux-4.1.13.orig/lib/smp_processor_id.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/lib/smp_processor_id.c 2015-11-29 09:23:09.657610995 +0100
@@ -39,8 +39,9 @@
if (!printk_ratelimit())
goto out_enable;
@@ -25018,9 +25305,9 @@ diff -Nur linux-4.1.10.orig/lib/smp_processor_id.c linux-4.1.10/lib/smp_processo
print_symbol("caller is %s\n", (long)__builtin_return_address(0));
dump_stack();
-diff -Nur linux-4.1.10.orig/lib/strnlen_user.c linux-4.1.10/lib/strnlen_user.c
---- linux-4.1.10.orig/lib/strnlen_user.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/lib/strnlen_user.c 2015-10-12 22:33:32.324673582 +0200
+diff -Nur linux-4.1.13.orig/lib/strnlen_user.c linux-4.1.13/lib/strnlen_user.c
+--- linux-4.1.13.orig/lib/strnlen_user.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/lib/strnlen_user.c 2015-11-29 09:23:09.657610995 +0100
@@ -85,7 +85,8 @@
* @str: The string to measure.
* @count: Maximum count (including NUL character)
@@ -25041,9 +25328,9 @@ diff -Nur linux-4.1.10.orig/lib/strnlen_user.c linux-4.1.10/lib/strnlen_user.c
*
* Get the size of a NUL-terminated string in user space.
*
-diff -Nur linux-4.1.10.orig/mm/compaction.c linux-4.1.10/mm/compaction.c
---- linux-4.1.10.orig/mm/compaction.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/mm/compaction.c 2015-10-12 22:33:32.324673582 +0200
+diff -Nur linux-4.1.13.orig/mm/compaction.c linux-4.1.13/mm/compaction.c
+--- linux-4.1.13.orig/mm/compaction.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/mm/compaction.c 2015-11-29 09:23:09.661610728 +0100
@@ -1406,10 +1406,12 @@
cc->migrate_pfn & ~((1UL << cc->order) - 1);
@@ -25059,9 +25346,9 @@ diff -Nur linux-4.1.10.orig/mm/compaction.c linux-4.1.10/mm/compaction.c
/* No more flushing until we migrate again */
last_migrated_pfn = 0;
}
-diff -Nur linux-4.1.10.orig/mm/filemap.c linux-4.1.10/mm/filemap.c
---- linux-4.1.10.orig/mm/filemap.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/mm/filemap.c 2015-10-12 22:33:32.324673582 +0200
+diff -Nur linux-4.1.13.orig/mm/filemap.c linux-4.1.13/mm/filemap.c
+--- linux-4.1.13.orig/mm/filemap.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/mm/filemap.c 2015-11-29 09:23:09.661610728 +0100
@@ -167,7 +167,9 @@
if (!workingset_node_pages(node) &&
list_empty(&node->private_list)) {
@@ -25088,9 +25375,9 @@ diff -Nur linux-4.1.10.orig/mm/filemap.c linux-4.1.10/mm/filemap.c
}
return 0;
}
-diff -Nur linux-4.1.10.orig/mm/highmem.c linux-4.1.10/mm/highmem.c
---- linux-4.1.10.orig/mm/highmem.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/mm/highmem.c 2015-10-12 22:33:32.324673582 +0200
+diff -Nur linux-4.1.13.orig/mm/highmem.c linux-4.1.13/mm/highmem.c
+--- linux-4.1.13.orig/mm/highmem.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/mm/highmem.c 2015-11-29 09:23:09.661610728 +0100
@@ -29,10 +29,11 @@
#include <linux/kgdb.h>
#include <asm/tlbflush.h>
@@ -25115,9 +25402,9 @@ diff -Nur linux-4.1.10.orig/mm/highmem.c linux-4.1.10/mm/highmem.c
unsigned int nr_free_highpages (void)
{
-diff -Nur linux-4.1.10.orig/mm/Kconfig linux-4.1.10/mm/Kconfig
---- linux-4.1.10.orig/mm/Kconfig 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/mm/Kconfig 2015-10-12 22:33:32.324673582 +0200
+diff -Nur linux-4.1.13.orig/mm/Kconfig linux-4.1.13/mm/Kconfig
+--- linux-4.1.13.orig/mm/Kconfig 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/mm/Kconfig 2015-11-29 09:23:09.661610728 +0100
@@ -409,7 +409,7 @@
config TRANSPARENT_HUGEPAGE
@@ -25127,9 +25414,9 @@ diff -Nur linux-4.1.10.orig/mm/Kconfig linux-4.1.10/mm/Kconfig
select COMPACTION
help
Transparent Hugepages allows the kernel to use huge pages and
-diff -Nur linux-4.1.10.orig/mm/memcontrol.c linux-4.1.10/mm/memcontrol.c
---- linux-4.1.10.orig/mm/memcontrol.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/mm/memcontrol.c 2015-10-12 22:33:32.328673318 +0200
+diff -Nur linux-4.1.13.orig/mm/memcontrol.c linux-4.1.13/mm/memcontrol.c
+--- linux-4.1.13.orig/mm/memcontrol.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/mm/memcontrol.c 2015-11-29 09:23:09.661610728 +0100
@@ -66,6 +66,8 @@
#include <net/sock.h>
#include <net/ip.h>
@@ -25185,7 +25472,7 @@ diff -Nur linux-4.1.10.orig/mm/memcontrol.c linux-4.1.10/mm/memcontrol.c
put_online_cpus();
mutex_unlock(&percpu_charge_mutex);
}
-@@ -4801,12 +4807,12 @@
+@@ -4802,12 +4808,12 @@
ret = 0;
@@ -25200,7 +25487,7 @@ diff -Nur linux-4.1.10.orig/mm/memcontrol.c linux-4.1.10/mm/memcontrol.c
out_unlock:
unlock_page(page);
out:
-@@ -5543,10 +5549,10 @@
+@@ -5544,10 +5550,10 @@
VM_BUG_ON_PAGE(!PageTransHuge(page), page);
}
@@ -25213,7 +25500,7 @@ diff -Nur linux-4.1.10.orig/mm/memcontrol.c linux-4.1.10/mm/memcontrol.c
if (do_swap_account && PageSwapCache(page)) {
swp_entry_t entry = { .val = page_private(page) };
-@@ -5602,14 +5608,14 @@
+@@ -5603,14 +5609,14 @@
memcg_oom_recover(memcg);
}
@@ -25230,7 +25517,7 @@ diff -Nur linux-4.1.10.orig/mm/memcontrol.c linux-4.1.10/mm/memcontrol.c
if (!mem_cgroup_is_root(memcg))
css_put_many(&memcg->css, nr_pages);
-@@ -5813,6 +5819,7 @@
+@@ -5814,6 +5820,7 @@
{
struct mem_cgroup *memcg;
unsigned short oldid;
@@ -25238,7 +25525,7 @@ diff -Nur linux-4.1.10.orig/mm/memcontrol.c linux-4.1.10/mm/memcontrol.c
VM_BUG_ON_PAGE(PageLRU(page), page);
VM_BUG_ON_PAGE(page_count(page), page);
-@@ -5835,9 +5842,11 @@
+@@ -5836,9 +5843,11 @@
if (!mem_cgroup_is_root(memcg))
page_counter_uncharge(&memcg->memory, 1);
@@ -25250,9 +25537,9 @@ diff -Nur linux-4.1.10.orig/mm/memcontrol.c linux-4.1.10/mm/memcontrol.c
}
/**
-diff -Nur linux-4.1.10.orig/mm/memory.c linux-4.1.10/mm/memory.c
---- linux-4.1.10.orig/mm/memory.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/mm/memory.c 2015-10-12 22:33:32.328673318 +0200
+diff -Nur linux-4.1.13.orig/mm/memory.c linux-4.1.13/mm/memory.c
+--- linux-4.1.13.orig/mm/memory.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/mm/memory.c 2015-11-29 09:23:09.661610728 +0100
@@ -3743,7 +3743,7 @@
}
@@ -25289,9 +25576,9 @@ diff -Nur linux-4.1.10.orig/mm/memory.c linux-4.1.10/mm/memory.c
#endif
#if defined(CONFIG_TRANSPARENT_HUGEPAGE) || defined(CONFIG_HUGETLBFS)
-diff -Nur linux-4.1.10.orig/mm/mmu_context.c linux-4.1.10/mm/mmu_context.c
---- linux-4.1.10.orig/mm/mmu_context.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/mm/mmu_context.c 2015-10-12 22:33:32.328673318 +0200
+diff -Nur linux-4.1.13.orig/mm/mmu_context.c linux-4.1.13/mm/mmu_context.c
+--- linux-4.1.13.orig/mm/mmu_context.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/mm/mmu_context.c 2015-11-29 09:23:09.661610728 +0100
@@ -23,6 +23,7 @@
struct task_struct *tsk = current;
@@ -25308,9 +25595,9 @@ diff -Nur linux-4.1.10.orig/mm/mmu_context.c linux-4.1.10/mm/mmu_context.c
task_unlock(tsk);
#ifdef finish_arch_post_lock_switch
finish_arch_post_lock_switch();
-diff -Nur linux-4.1.10.orig/mm/page_alloc.c linux-4.1.10/mm/page_alloc.c
---- linux-4.1.10.orig/mm/page_alloc.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/mm/page_alloc.c 2015-10-12 22:33:32.328673318 +0200
+diff -Nur linux-4.1.13.orig/mm/page_alloc.c linux-4.1.13/mm/page_alloc.c
+--- linux-4.1.13.orig/mm/page_alloc.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/mm/page_alloc.c 2015-11-29 09:23:09.661610728 +0100
@@ -60,6 +60,7 @@
#include <linux/page_ext.h>
#include <linux/hugetlb.h>
@@ -25635,9 +25922,9 @@ diff -Nur linux-4.1.10.orig/mm/page_alloc.c linux-4.1.10/mm/page_alloc.c
}
#ifdef CONFIG_MEMORY_HOTREMOVE
-diff -Nur linux-4.1.10.orig/mm/slab.h linux-4.1.10/mm/slab.h
---- linux-4.1.10.orig/mm/slab.h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/mm/slab.h 2015-10-12 22:33:32.332673054 +0200
+diff -Nur linux-4.1.13.orig/mm/slab.h linux-4.1.13/mm/slab.h
+--- linux-4.1.13.orig/mm/slab.h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/mm/slab.h 2015-11-29 09:23:09.661610728 +0100
@@ -330,7 +330,11 @@
* The slab lists for all objects.
*/
@@ -25650,9 +25937,9 @@ diff -Nur linux-4.1.10.orig/mm/slab.h linux-4.1.10/mm/slab.h
#ifdef CONFIG_SLAB
struct list_head slabs_partial; /* partial list first, better asm code */
-diff -Nur linux-4.1.10.orig/mm/slub.c linux-4.1.10/mm/slub.c
---- linux-4.1.10.orig/mm/slub.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/mm/slub.c 2015-10-12 22:33:32.332673054 +0200
+diff -Nur linux-4.1.13.orig/mm/slub.c linux-4.1.13/mm/slub.c
+--- linux-4.1.13.orig/mm/slub.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/mm/slub.c 2015-11-29 09:23:09.665610461 +0100
@@ -1069,7 +1069,7 @@
{
struct kmem_cache_node *n = get_node(s, page_to_nid(page));
@@ -26137,9 +26424,9 @@ diff -Nur linux-4.1.10.orig/mm/slub.c linux-4.1.10/mm/slub.c
}
for (i = 0; i < t.count; i++) {
-diff -Nur linux-4.1.10.orig/mm/swap.c linux-4.1.10/mm/swap.c
---- linux-4.1.10.orig/mm/swap.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/mm/swap.c 2015-10-12 22:33:32.336672790 +0200
+diff -Nur linux-4.1.13.orig/mm/swap.c linux-4.1.13/mm/swap.c
+--- linux-4.1.13.orig/mm/swap.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/mm/swap.c 2015-11-29 09:23:09.665610461 +0100
@@ -32,6 +32,7 @@
#include <linux/gfp.h>
#include <linux/uio.h>
@@ -26258,9 +26545,9 @@ diff -Nur linux-4.1.10.orig/mm/swap.c linux-4.1.10/mm/swap.c
}
static void lru_add_drain_per_cpu(struct work_struct *dummy)
-diff -Nur linux-4.1.10.orig/mm/truncate.c linux-4.1.10/mm/truncate.c
---- linux-4.1.10.orig/mm/truncate.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/mm/truncate.c 2015-10-12 22:33:32.336672790 +0200
+diff -Nur linux-4.1.13.orig/mm/truncate.c linux-4.1.13/mm/truncate.c
+--- linux-4.1.13.orig/mm/truncate.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/mm/truncate.c 2015-11-29 09:23:09.665610461 +0100
@@ -56,8 +56,11 @@
* protected by mapping->tree_lock.
*/
@@ -26275,9 +26562,9 @@ diff -Nur linux-4.1.10.orig/mm/truncate.c linux-4.1.10/mm/truncate.c
__radix_tree_delete_node(&mapping->page_tree, node);
unlock:
spin_unlock_irq(&mapping->tree_lock);
-diff -Nur linux-4.1.10.orig/mm/vmalloc.c linux-4.1.10/mm/vmalloc.c
---- linux-4.1.10.orig/mm/vmalloc.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/mm/vmalloc.c 2015-10-12 22:33:32.336672790 +0200
+diff -Nur linux-4.1.13.orig/mm/vmalloc.c linux-4.1.13/mm/vmalloc.c
+--- linux-4.1.13.orig/mm/vmalloc.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/mm/vmalloc.c 2015-11-29 09:23:09.665610461 +0100
@@ -819,7 +819,7 @@
struct vmap_block *vb;
struct vmap_area *va;
@@ -26329,9 +26616,9 @@ diff -Nur linux-4.1.10.orig/mm/vmalloc.c linux-4.1.10/mm/vmalloc.c
rcu_read_unlock();
/* Allocate new block if nothing was found */
-diff -Nur linux-4.1.10.orig/mm/vmstat.c linux-4.1.10/mm/vmstat.c
---- linux-4.1.10.orig/mm/vmstat.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/mm/vmstat.c 2015-10-12 22:33:32.336672790 +0200
+diff -Nur linux-4.1.13.orig/mm/vmstat.c linux-4.1.13/mm/vmstat.c
+--- linux-4.1.13.orig/mm/vmstat.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/mm/vmstat.c 2015-11-29 09:23:09.665610461 +0100
@@ -226,6 +226,7 @@
long x;
long t;
@@ -26380,9 +26667,9 @@ diff -Nur linux-4.1.10.orig/mm/vmstat.c linux-4.1.10/mm/vmstat.c
}
void __dec_zone_page_state(struct page *page, enum zone_stat_item item)
-diff -Nur linux-4.1.10.orig/mm/workingset.c linux-4.1.10/mm/workingset.c
---- linux-4.1.10.orig/mm/workingset.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/mm/workingset.c 2015-10-12 22:33:32.336672790 +0200
+diff -Nur linux-4.1.13.orig/mm/workingset.c linux-4.1.13/mm/workingset.c
+--- linux-4.1.13.orig/mm/workingset.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/mm/workingset.c 2015-11-29 09:23:09.665610461 +0100
@@ -264,7 +264,8 @@
* point where they would still be useful.
*/
@@ -26450,9 +26737,9 @@ diff -Nur linux-4.1.10.orig/mm/workingset.c linux-4.1.10/mm/workingset.c
err:
return ret;
}
-diff -Nur linux-4.1.10.orig/net/core/dev.c linux-4.1.10/net/core/dev.c
---- linux-4.1.10.orig/net/core/dev.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/net/core/dev.c 2015-10-12 22:33:32.340672525 +0200
+diff -Nur linux-4.1.13.orig/net/core/dev.c linux-4.1.13/net/core/dev.c
+--- linux-4.1.13.orig/net/core/dev.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/net/core/dev.c 2015-11-29 09:23:09.665610461 +0100
@@ -184,6 +184,7 @@
static DEFINE_HASHTABLE(napi_hash, 8);
@@ -26709,7 +26996,16 @@ diff -Nur linux-4.1.10.orig/net/core/dev.c linux-4.1.10/net/core/dev.c
}
EXPORT_SYMBOL(__napi_schedule);
-@@ -7167,6 +7210,7 @@
+@@ -6926,7 +6969,7 @@
+ void synchronize_net(void)
+ {
+ might_sleep();
+- if (rtnl_is_locked())
++ if (rtnl_is_locked() && !IS_ENABLED(CONFIG_PREEMPT_RT_FULL))
+ synchronize_rcu_expedited();
+ else
+ synchronize_rcu();
+@@ -7167,16 +7210,20 @@
raise_softirq_irqoff(NET_TX_SOFTIRQ);
local_irq_enable();
@@ -26717,7 +27013,11 @@ diff -Nur linux-4.1.10.orig/net/core/dev.c linux-4.1.10/net/core/dev.c
/* Process offline CPU's input_pkt_queue */
while ((skb = __skb_dequeue(&oldsd->process_queue))) {
-@@ -7177,6 +7221,9 @@
+ netif_rx_ni(skb);
+ input_queue_head_incr(oldsd);
+ }
+- while ((skb = skb_dequeue(&oldsd->input_pkt_queue))) {
++ while ((skb = __skb_dequeue(&oldsd->input_pkt_queue))) {
netif_rx_ni(skb);
input_queue_head_incr(oldsd);
}
@@ -26739,9 +27039,9 @@ diff -Nur linux-4.1.10.orig/net/core/dev.c linux-4.1.10/net/core/dev.c
INIT_LIST_HEAD(&sd->poll_list);
sd->output_queue_tailp = &sd->output_queue;
#ifdef CONFIG_RPS
-diff -Nur linux-4.1.10.orig/net/core/skbuff.c linux-4.1.10/net/core/skbuff.c
---- linux-4.1.10.orig/net/core/skbuff.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/net/core/skbuff.c 2015-10-12 22:33:32.344672261 +0200
+diff -Nur linux-4.1.13.orig/net/core/skbuff.c linux-4.1.13/net/core/skbuff.c
+--- linux-4.1.13.orig/net/core/skbuff.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/net/core/skbuff.c 2015-11-29 09:23:09.669610195 +0100
@@ -63,6 +63,7 @@
#include <linux/errqueue.h>
#include <linux/prefetch.h>
@@ -26770,9 +27070,9 @@ diff -Nur linux-4.1.10.orig/net/core/skbuff.c linux-4.1.10/net/core/skbuff.c
return data;
}
-diff -Nur linux-4.1.10.orig/net/core/sock.c linux-4.1.10/net/core/sock.c
---- linux-4.1.10.orig/net/core/sock.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/net/core/sock.c 2015-10-12 22:33:32.344672261 +0200
+diff -Nur linux-4.1.13.orig/net/core/sock.c linux-4.1.13/net/core/sock.c
+--- linux-4.1.13.orig/net/core/sock.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/net/core/sock.c 2015-11-29 09:23:09.669610195 +0100
@@ -2370,12 +2370,11 @@
if (sk->sk_lock.owned)
__lock_sock(sk);
@@ -26787,9 +27087,9 @@ diff -Nur linux-4.1.10.orig/net/core/sock.c linux-4.1.10/net/core/sock.c
}
EXPORT_SYMBOL(lock_sock_nested);
-diff -Nur linux-4.1.10.orig/net/ipv4/icmp.c linux-4.1.10/net/ipv4/icmp.c
---- linux-4.1.10.orig/net/ipv4/icmp.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/net/ipv4/icmp.c 2015-10-12 22:33:32.344672261 +0200
+diff -Nur linux-4.1.13.orig/net/ipv4/icmp.c linux-4.1.13/net/ipv4/icmp.c
+--- linux-4.1.13.orig/net/ipv4/icmp.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/net/ipv4/icmp.c 2015-11-29 09:23:09.669610195 +0100
@@ -69,6 +69,7 @@
#include <linux/jiffies.h>
#include <linux/kernel.h>
@@ -26841,9 +27141,9 @@ diff -Nur linux-4.1.10.orig/net/ipv4/icmp.c linux-4.1.10/net/ipv4/icmp.c
}
/* should there be an ICMP stat for ignored echos? */
return true;
-diff -Nur linux-4.1.10.orig/net/ipv4/sysctl_net_ipv4.c linux-4.1.10/net/ipv4/sysctl_net_ipv4.c
---- linux-4.1.10.orig/net/ipv4/sysctl_net_ipv4.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/net/ipv4/sysctl_net_ipv4.c 2015-10-12 22:33:32.344672261 +0200
+diff -Nur linux-4.1.13.orig/net/ipv4/sysctl_net_ipv4.c linux-4.1.13/net/ipv4/sysctl_net_ipv4.c
+--- linux-4.1.13.orig/net/ipv4/sysctl_net_ipv4.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/net/ipv4/sysctl_net_ipv4.c 2015-11-29 09:23:09.669610195 +0100
@@ -779,6 +779,13 @@
.proc_handler = proc_dointvec
},
@@ -26858,9 +27158,9 @@ diff -Nur linux-4.1.10.orig/net/ipv4/sysctl_net_ipv4.c linux-4.1.10/net/ipv4/sys
.procname = "icmp_ignore_bogus_error_responses",
.data = &init_net.ipv4.sysctl_icmp_ignore_bogus_error_responses,
.maxlen = sizeof(int),
-diff -Nur linux-4.1.10.orig/net/mac80211/rx.c linux-4.1.10/net/mac80211/rx.c
---- linux-4.1.10.orig/net/mac80211/rx.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/net/mac80211/rx.c 2015-10-12 22:33:32.344672261 +0200
+diff -Nur linux-4.1.13.orig/net/mac80211/rx.c linux-4.1.13/net/mac80211/rx.c
+--- linux-4.1.13.orig/net/mac80211/rx.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/net/mac80211/rx.c 2015-11-29 09:23:09.669610195 +0100
@@ -3554,7 +3554,7 @@
struct ieee80211_supported_band *sband;
struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);
@@ -26870,9 +27170,9 @@ diff -Nur linux-4.1.10.orig/net/mac80211/rx.c linux-4.1.10/net/mac80211/rx.c
if (WARN_ON(status->band >= IEEE80211_NUM_BANDS))
goto drop;
-diff -Nur linux-4.1.10.orig/net/netfilter/core.c linux-4.1.10/net/netfilter/core.c
---- linux-4.1.10.orig/net/netfilter/core.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/net/netfilter/core.c 2015-10-12 22:33:32.344672261 +0200
+diff -Nur linux-4.1.13.orig/net/netfilter/core.c linux-4.1.13/net/netfilter/core.c
+--- linux-4.1.13.orig/net/netfilter/core.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/net/netfilter/core.c 2015-11-29 09:23:09.669610195 +0100
@@ -22,11 +22,17 @@
#include <linux/proc_fs.h>
#include <linux/mutex.h>
@@ -26891,9 +27191,9 @@ diff -Nur linux-4.1.10.orig/net/netfilter/core.c linux-4.1.10/net/netfilter/core
static DEFINE_MUTEX(afinfo_mutex);
const struct nf_afinfo __rcu *nf_afinfo[NFPROTO_NUMPROTO] __read_mostly;
-diff -Nur linux-4.1.10.orig/net/packet/af_packet.c linux-4.1.10/net/packet/af_packet.c
---- linux-4.1.10.orig/net/packet/af_packet.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/net/packet/af_packet.c 2015-10-12 22:33:32.344672261 +0200
+diff -Nur linux-4.1.13.orig/net/packet/af_packet.c linux-4.1.13/net/packet/af_packet.c
+--- linux-4.1.13.orig/net/packet/af_packet.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/net/packet/af_packet.c 2015-11-29 09:23:09.669610195 +0100
@@ -63,6 +63,7 @@
#include <linux/if_packet.h>
#include <linux/wireless.h>
@@ -26920,9 +27220,9 @@ diff -Nur linux-4.1.10.orig/net/packet/af_packet.c linux-4.1.10/net/packet/af_pa
}
}
prb_close_block(pkc, pbd, po, status);
-diff -Nur linux-4.1.10.orig/net/rds/ib_rdma.c linux-4.1.10/net/rds/ib_rdma.c
---- linux-4.1.10.orig/net/rds/ib_rdma.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/net/rds/ib_rdma.c 2015-10-12 22:33:32.344672261 +0200
+diff -Nur linux-4.1.13.orig/net/rds/ib_rdma.c linux-4.1.13/net/rds/ib_rdma.c
+--- linux-4.1.13.orig/net/rds/ib_rdma.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/net/rds/ib_rdma.c 2015-11-29 09:23:09.669610195 +0100
@@ -34,6 +34,7 @@
#include <linux/slab.h>
#include <linux/rculist.h>
@@ -26940,9 +27240,9 @@ diff -Nur linux-4.1.10.orig/net/rds/ib_rdma.c linux-4.1.10/net/rds/ib_rdma.c
}
}
-diff -Nur linux-4.1.10.orig/net/sched/sch_generic.c linux-4.1.10/net/sched/sch_generic.c
---- linux-4.1.10.orig/net/sched/sch_generic.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/net/sched/sch_generic.c 2015-10-12 22:33:32.344672261 +0200
+diff -Nur linux-4.1.13.orig/net/sched/sch_generic.c linux-4.1.13/net/sched/sch_generic.c
+--- linux-4.1.13.orig/net/sched/sch_generic.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/net/sched/sch_generic.c 2015-11-29 09:23:09.669610195 +0100
@@ -894,7 +894,7 @@
/* Wait for outstanding qdisc_run calls. */
list_for_each_entry(dev, head, close_list)
@@ -26952,9 +27252,9 @@ diff -Nur linux-4.1.10.orig/net/sched/sch_generic.c linux-4.1.10/net/sched/sch_g
}
void dev_deactivate(struct net_device *dev)
-diff -Nur linux-4.1.10.orig/net/sunrpc/svc_xprt.c linux-4.1.10/net/sunrpc/svc_xprt.c
---- linux-4.1.10.orig/net/sunrpc/svc_xprt.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/net/sunrpc/svc_xprt.c 2015-10-12 22:33:32.344672261 +0200
+diff -Nur linux-4.1.13.orig/net/sunrpc/svc_xprt.c linux-4.1.13/net/sunrpc/svc_xprt.c
+--- linux-4.1.13.orig/net/sunrpc/svc_xprt.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/net/sunrpc/svc_xprt.c 2015-11-29 09:23:09.669610195 +0100
@@ -341,7 +341,7 @@
goto out;
}
@@ -26982,9 +27282,9 @@ diff -Nur linux-4.1.10.orig/net/sunrpc/svc_xprt.c linux-4.1.10/net/sunrpc/svc_xp
out:
trace_svc_xprt_do_enqueue(xprt, rqstp);
}
-diff -Nur linux-4.1.10.orig/scripts/mkcompile_h linux-4.1.10/scripts/mkcompile_h
---- linux-4.1.10.orig/scripts/mkcompile_h 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/scripts/mkcompile_h 2015-10-12 22:33:32.344672261 +0200
+diff -Nur linux-4.1.13.orig/scripts/mkcompile_h linux-4.1.13/scripts/mkcompile_h
+--- linux-4.1.13.orig/scripts/mkcompile_h 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/scripts/mkcompile_h 2015-11-29 09:23:09.669610195 +0100
@@ -4,7 +4,8 @@
ARCH=$2
SMP=$3
@@ -27003,9 +27303,9 @@ diff -Nur linux-4.1.10.orig/scripts/mkcompile_h linux-4.1.10/scripts/mkcompile_h
UTS_VERSION="$UTS_VERSION $CONFIG_FLAGS $TIMESTAMP"
# Truncate to maximum length
-diff -Nur linux-4.1.10.orig/sound/core/pcm_native.c linux-4.1.10/sound/core/pcm_native.c
---- linux-4.1.10.orig/sound/core/pcm_native.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/sound/core/pcm_native.c 2015-10-12 22:33:32.348671997 +0200
+diff -Nur linux-4.1.13.orig/sound/core/pcm_native.c linux-4.1.13/sound/core/pcm_native.c
+--- linux-4.1.13.orig/sound/core/pcm_native.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/sound/core/pcm_native.c 2015-11-29 09:23:09.669610195 +0100
@@ -123,7 +123,7 @@
void snd_pcm_stream_lock_irq(struct snd_pcm_substream *substream)
{
@@ -27042,9 +27342,9 @@ diff -Nur linux-4.1.10.orig/sound/core/pcm_native.c linux-4.1.10/sound/core/pcm_
}
EXPORT_SYMBOL_GPL(snd_pcm_stream_unlock_irqrestore);
-diff -Nur linux-4.1.10.orig/sound/soc/intel/atom/sst/sst.c linux-4.1.10/sound/soc/intel/atom/sst/sst.c
---- linux-4.1.10.orig/sound/soc/intel/atom/sst/sst.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/sound/soc/intel/atom/sst/sst.c 2015-10-12 22:33:32.348671997 +0200
+diff -Nur linux-4.1.13.orig/sound/soc/intel/atom/sst/sst.c linux-4.1.13/sound/soc/intel/atom/sst/sst.c
+--- linux-4.1.13.orig/sound/soc/intel/atom/sst/sst.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/sound/soc/intel/atom/sst/sst.c 2015-11-29 09:23:09.673609931 +0100
@@ -368,8 +368,8 @@
* initialize by FW or driver when firmware is loaded
*/
@@ -27056,9 +27356,9 @@ diff -Nur linux-4.1.10.orig/sound/soc/intel/atom/sst/sst.c linux-4.1.10/sound/so
spin_unlock_irqrestore(&ctx->ipc_spin_lock, irq_flags);
}
-diff -Nur linux-4.1.10.orig/virt/kvm/async_pf.c linux-4.1.10/virt/kvm/async_pf.c
---- linux-4.1.10.orig/virt/kvm/async_pf.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/virt/kvm/async_pf.c 2015-10-12 22:33:32.348671997 +0200
+diff -Nur linux-4.1.13.orig/virt/kvm/async_pf.c linux-4.1.13/virt/kvm/async_pf.c
+--- linux-4.1.13.orig/virt/kvm/async_pf.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/virt/kvm/async_pf.c 2015-11-29 09:23:09.673609931 +0100
@@ -94,8 +94,8 @@
trace_kvm_async_pf_completed(addr, gva);
@@ -27070,9 +27370,9 @@ diff -Nur linux-4.1.10.orig/virt/kvm/async_pf.c linux-4.1.10/virt/kvm/async_pf.c
mmput(mm);
kvm_put_kvm(vcpu->kvm);
-diff -Nur linux-4.1.10.orig/virt/kvm/kvm_main.c linux-4.1.10/virt/kvm/kvm_main.c
---- linux-4.1.10.orig/virt/kvm/kvm_main.c 2015-10-03 13:49:38.000000000 +0200
-+++ linux-4.1.10/virt/kvm/kvm_main.c 2015-10-12 22:33:32.348671997 +0200
+diff -Nur linux-4.1.13.orig/virt/kvm/kvm_main.c linux-4.1.13/virt/kvm/kvm_main.c
+--- linux-4.1.13.orig/virt/kvm/kvm_main.c 2015-11-09 23:34:10.000000000 +0100
++++ linux-4.1.13/virt/kvm/kvm_main.c 2015-11-29 09:23:09.701608072 +0100
@@ -218,7 +218,7 @@
vcpu->kvm = kvm;
vcpu->vcpu_id = id;
diff --git a/target/linux/patches/4.1.10/regmap-default-on.patch b/target/linux/patches/4.1.13/regmap-default-on.patch
index 8d72224bf..8d72224bf 100644
--- a/target/linux/patches/4.1.10/regmap-default-on.patch
+++ b/target/linux/patches/4.1.13/regmap-default-on.patch
diff --git a/target/linux/patches/4.1.10/remove-warn.patch b/target/linux/patches/4.1.13/remove-warn.patch
index 1f89c710d..1f89c710d 100644
--- a/target/linux/patches/4.1.10/remove-warn.patch
+++ b/target/linux/patches/4.1.13/remove-warn.patch
diff --git a/target/linux/patches/4.1.10/startup.patch b/target/linux/patches/4.1.13/startup.patch
index d396b75e4..d396b75e4 100644
--- a/target/linux/patches/4.1.10/startup.patch
+++ b/target/linux/patches/4.1.13/startup.patch
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-23 17:43:58 +0000