summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2017-02-03 18:40:37 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2017-02-03 18:40:37 +0100
commitce4a0717fc441eb5236a36e12cdfe02e4d3c32b6 (patch)
tree6f6ff140c58a10f1c3b036fc2476aa14bce91560 /target
parenta86ca6b0fa2e0e34b17c95c10a0d1f6234b6273c (diff)
linux: update to 4.4.46
Diffstat (limited to 'target')
-rw-r--r--target/config/Config.in.kernelversion3
-rw-r--r--target/linux/patches/4.4.46/coldfire-sighandler.patch (renamed from target/linux/patches/4.4.38/coldfire-sighandler.patch)0
-rw-r--r--target/linux/patches/4.4.46/crisv32.patch (renamed from target/linux/patches/4.4.38/crisv32.patch)0
-rw-r--r--target/linux/patches/4.4.46/crisv32_ethernet_driver.patch (renamed from target/linux/patches/4.4.38/crisv32_ethernet_driver.patch)0
-rw-r--r--target/linux/patches/4.4.46/initramfs-nosizelimit.patch (renamed from target/linux/patches/4.4.38/initramfs-nosizelimit.patch)0
-rw-r--r--target/linux/patches/4.4.46/ld-or1k.patch (renamed from target/linux/patches/4.4.38/ld-or1k.patch)0
-rw-r--r--target/linux/patches/4.4.46/macsonic.patch (renamed from target/linux/patches/4.4.38/macsonic.patch)0
-rw-r--r--target/linux/patches/4.4.46/mips-xz.patch (renamed from target/linux/patches/4.4.38/mips-xz.patch)0
-rw-r--r--target/linux/patches/4.4.46/patch-realtime (renamed from target/linux/patches/4.4.38/patch-realtime)2636
-rw-r--r--target/linux/patches/4.4.46/startup.patch (renamed from target/linux/patches/4.4.38/startup.patch)0
-rw-r--r--target/linux/patches/4.4.46/use-libgcc-for-sh.patch (renamed from target/linux/patches/4.4.38/use-libgcc-for-sh.patch)0
-rw-r--r--target/linux/patches/4.4.46/versatile-nommu.patch (renamed from target/linux/patches/4.4.38/versatile-nommu.patch)0
12 files changed, 1313 insertions, 1326 deletions
diff --git a/target/config/Config.in.kernelversion b/target/config/Config.in.kernelversion
index eacd516c2..74de7fe3e 100644
--- a/target/config/Config.in.kernelversion
+++ b/target/config/Config.in.kernelversion
@@ -31,13 +31,12 @@ config ADK_TARGET_KERNEL_VERSION_4_9
depends on !ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU
config ADK_TARGET_KERNEL_VERSION_4_4
- bool "4.4.38"
+ bool "4.4.46"
depends on !ADK_TARGET_ARCH_NDS32
depends on !ADK_TARGET_ARCH_NIOS2
depends on !ADK_TARGET_ARCH_OR1K
depends on !ADK_TARGET_CPU_MIPS_MIPS32R6
depends on !ADK_TARGET_CPU_MIPS64_MIPS64R6
- depends on !ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208
depends on !ADK_TARGET_SYSTEM_NUMATO_MIMASV2
config ADK_TARGET_KERNEL_VERSION_4_1
diff --git a/target/linux/patches/4.4.38/coldfire-sighandler.patch b/target/linux/patches/4.4.46/coldfire-sighandler.patch
index c52a4e228..c52a4e228 100644
--- a/target/linux/patches/4.4.38/coldfire-sighandler.patch
+++ b/target/linux/patches/4.4.46/coldfire-sighandler.patch
diff --git a/target/linux/patches/4.4.38/crisv32.patch b/target/linux/patches/4.4.46/crisv32.patch
index cb9b0d028..cb9b0d028 100644
--- a/target/linux/patches/4.4.38/crisv32.patch
+++ b/target/linux/patches/4.4.46/crisv32.patch
diff --git a/target/linux/patches/4.4.38/crisv32_ethernet_driver.patch b/target/linux/patches/4.4.46/crisv32_ethernet_driver.patch
index 0cef202fc..0cef202fc 100644
--- a/target/linux/patches/4.4.38/crisv32_ethernet_driver.patch
+++ b/target/linux/patches/4.4.46/crisv32_ethernet_driver.patch
diff --git a/target/linux/patches/4.4.38/initramfs-nosizelimit.patch b/target/linux/patches/4.4.46/initramfs-nosizelimit.patch
index 40d2f6bd8..40d2f6bd8 100644
--- a/target/linux/patches/4.4.38/initramfs-nosizelimit.patch
+++ b/target/linux/patches/4.4.46/initramfs-nosizelimit.patch
diff --git a/target/linux/patches/4.4.38/ld-or1k.patch b/target/linux/patches/4.4.46/ld-or1k.patch
index 264f9166f..264f9166f 100644
--- a/target/linux/patches/4.4.38/ld-or1k.patch
+++ b/target/linux/patches/4.4.46/ld-or1k.patch
diff --git a/target/linux/patches/4.4.38/macsonic.patch b/target/linux/patches/4.4.46/macsonic.patch
index 75a6fcad2..75a6fcad2 100644
--- a/target/linux/patches/4.4.38/macsonic.patch
+++ b/target/linux/patches/4.4.46/macsonic.patch
diff --git a/target/linux/patches/4.4.38/mips-xz.patch b/target/linux/patches/4.4.46/mips-xz.patch
index 5cfac6254..5cfac6254 100644
--- a/target/linux/patches/4.4.38/mips-xz.patch
+++ b/target/linux/patches/4.4.46/mips-xz.patch
diff --git a/target/linux/patches/4.4.38/patch-realtime b/target/linux/patches/4.4.46/patch-realtime
index 995fc7cf2..5ab7acb20 100644
--- a/target/linux/patches/4.4.38/patch-realtime
+++ b/target/linux/patches/4.4.46/patch-realtime
@@ -1,6 +1,6 @@
-diff -Nur linux-4.4.38.orig/arch/arm/include/asm/switch_to.h linux-4.4.38/arch/arm/include/asm/switch_to.h
---- linux-4.4.38.orig/arch/arm/include/asm/switch_to.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/arm/include/asm/switch_to.h 2017-01-01 21:00:17.997608452 +0100
+diff -Nur linux-4.4.46.orig/arch/arm/include/asm/switch_to.h linux-4.4.46/arch/arm/include/asm/switch_to.h
+--- linux-4.4.46.orig/arch/arm/include/asm/switch_to.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/arm/include/asm/switch_to.h 2017-02-03 17:18:05.627414322 +0100
@@ -3,6 +3,13 @@
#include <linux/thread_info.h>
@@ -23,9 +23,9 @@ diff -Nur linux-4.4.38.orig/arch/arm/include/asm/switch_to.h linux-4.4.38/arch/a
last = __switch_to(prev,task_thread_info(prev), task_thread_info(next)); \
} while (0)
-diff -Nur linux-4.4.38.orig/arch/arm/include/asm/thread_info.h linux-4.4.38/arch/arm/include/asm/thread_info.h
---- linux-4.4.38.orig/arch/arm/include/asm/thread_info.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/arm/include/asm/thread_info.h 2017-01-01 21:00:18.017609733 +0100
+diff -Nur linux-4.4.46.orig/arch/arm/include/asm/thread_info.h linux-4.4.46/arch/arm/include/asm/thread_info.h
+--- linux-4.4.46.orig/arch/arm/include/asm/thread_info.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/arm/include/asm/thread_info.h 2017-02-03 17:18:05.627414322 +0100
@@ -49,6 +49,7 @@
struct thread_info {
unsigned long flags; /* low level flags */
@@ -62,9 +62,9 @@ diff -Nur linux-4.4.38.orig/arch/arm/include/asm/thread_info.h linux-4.4.38/arch
#endif /* __KERNEL__ */
#endif /* __ASM_ARM_THREAD_INFO_H */
-diff -Nur linux-4.4.38.orig/arch/arm/Kconfig linux-4.4.38/arch/arm/Kconfig
---- linux-4.4.38.orig/arch/arm/Kconfig 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/arm/Kconfig 2017-01-01 21:00:17.929604080 +0100
+diff -Nur linux-4.4.46.orig/arch/arm/Kconfig linux-4.4.46/arch/arm/Kconfig
+--- linux-4.4.46.orig/arch/arm/Kconfig 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/arm/Kconfig 2017-02-03 17:18:05.627414322 +0100
@@ -33,7 +33,7 @@
select HARDIRQS_SW_RESEND
select HAVE_ARCH_AUDITSYSCALL if (AEABI && !OABI_COMPAT)
@@ -82,9 +82,9 @@ diff -Nur linux-4.4.38.orig/arch/arm/Kconfig linux-4.4.38/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.4.38.orig/arch/arm/kernel/asm-offsets.c linux-4.4.38/arch/arm/kernel/asm-offsets.c
---- linux-4.4.38.orig/arch/arm/kernel/asm-offsets.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/arm/kernel/asm-offsets.c 2017-01-01 21:00:18.041611275 +0100
+diff -Nur linux-4.4.46.orig/arch/arm/kernel/asm-offsets.c linux-4.4.46/arch/arm/kernel/asm-offsets.c
+--- linux-4.4.46.orig/arch/arm/kernel/asm-offsets.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/arm/kernel/asm-offsets.c 2017-02-03 17:18:05.627414322 +0100
@@ -65,6 +65,7 @@
BLANK();
DEFINE(TI_FLAGS, offsetof(struct thread_info, flags));
@@ -93,9 +93,9 @@ diff -Nur linux-4.4.38.orig/arch/arm/kernel/asm-offsets.c linux-4.4.38/arch/arm/
DEFINE(TI_ADDR_LIMIT, offsetof(struct thread_info, addr_limit));
DEFINE(TI_TASK, offsetof(struct thread_info, task));
DEFINE(TI_CPU, offsetof(struct thread_info, cpu));
-diff -Nur linux-4.4.38.orig/arch/arm/kernel/entry-armv.S linux-4.4.38/arch/arm/kernel/entry-armv.S
---- linux-4.4.38.orig/arch/arm/kernel/entry-armv.S 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/arm/kernel/entry-armv.S 2017-01-01 21:00:18.057612302 +0100
+diff -Nur linux-4.4.46.orig/arch/arm/kernel/entry-armv.S linux-4.4.46/arch/arm/kernel/entry-armv.S
+--- linux-4.4.46.orig/arch/arm/kernel/entry-armv.S 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/arm/kernel/entry-armv.S 2017-02-03 17:18:05.627414322 +0100
@@ -215,11 +215,18 @@
#ifdef CONFIG_PREEMPT
get_thread_info tsk
@@ -133,9 +133,9 @@ diff -Nur linux-4.4.38.orig/arch/arm/kernel/entry-armv.S linux-4.4.38/arch/arm/k
#endif
__und_fault:
-diff -Nur linux-4.4.38.orig/arch/arm/kernel/entry-common.S linux-4.4.38/arch/arm/kernel/entry-common.S
---- linux-4.4.38.orig/arch/arm/kernel/entry-common.S 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/arm/kernel/entry-common.S 2017-01-01 21:00:18.057612302 +0100
+diff -Nur linux-4.4.46.orig/arch/arm/kernel/entry-common.S linux-4.4.46/arch/arm/kernel/entry-common.S
+--- linux-4.4.46.orig/arch/arm/kernel/entry-common.S 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/arm/kernel/entry-common.S 2017-02-03 17:18:05.627414322 +0100
@@ -36,7 +36,9 @@
UNWIND(.cantunwind )
disable_irq_notrace @ disable interrupts
@@ -160,9 +160,9 @@ diff -Nur linux-4.4.38.orig/arch/arm/kernel/entry-common.S linux-4.4.38/arch/arm
UNWIND(.fnend )
ENDPROC(ret_fast_syscall)
-diff -Nur linux-4.4.38.orig/arch/arm/kernel/process.c linux-4.4.38/arch/arm/kernel/process.c
---- linux-4.4.38.orig/arch/arm/kernel/process.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/arm/kernel/process.c 2017-01-01 21:00:18.065612816 +0100
+diff -Nur linux-4.4.46.orig/arch/arm/kernel/process.c linux-4.4.46/arch/arm/kernel/process.c
+--- linux-4.4.46.orig/arch/arm/kernel/process.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/arm/kernel/process.c 2017-02-03 17:18:05.627414322 +0100
@@ -319,6 +319,30 @@
}
@@ -194,9 +194,9 @@ diff -Nur linux-4.4.38.orig/arch/arm/kernel/process.c linux-4.4.38/arch/arm/kern
#ifdef CONFIG_KUSER_HELPERS
/*
* The vectors page is always readable from user space for the
-diff -Nur linux-4.4.38.orig/arch/arm/kernel/signal.c linux-4.4.38/arch/arm/kernel/signal.c
---- linux-4.4.38.orig/arch/arm/kernel/signal.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/arm/kernel/signal.c 2017-01-01 21:00:18.065612816 +0100
+diff -Nur linux-4.4.46.orig/arch/arm/kernel/signal.c linux-4.4.46/arch/arm/kernel/signal.c
+--- linux-4.4.46.orig/arch/arm/kernel/signal.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/arm/kernel/signal.c 2017-02-03 17:18:05.627414322 +0100
@@ -572,7 +572,8 @@
*/
trace_hardirqs_off();
@@ -207,9 +207,9 @@ diff -Nur linux-4.4.38.orig/arch/arm/kernel/signal.c linux-4.4.38/arch/arm/kerne
schedule();
} else {
if (unlikely(!user_mode(regs)))
-diff -Nur linux-4.4.38.orig/arch/arm/kernel/smp.c linux-4.4.38/arch/arm/kernel/smp.c
---- linux-4.4.38.orig/arch/arm/kernel/smp.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/arm/kernel/smp.c 2017-01-01 21:00:18.069613077 +0100
+diff -Nur linux-4.4.46.orig/arch/arm/kernel/smp.c linux-4.4.46/arch/arm/kernel/smp.c
+--- linux-4.4.46.orig/arch/arm/kernel/smp.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/arm/kernel/smp.c 2017-02-03 17:18:05.627414322 +0100
@@ -230,8 +230,6 @@
flush_cache_louis();
local_flush_tlb_all();
@@ -229,9 +229,9 @@ diff -Nur linux-4.4.38.orig/arch/arm/kernel/smp.c linux-4.4.38/arch/arm/kernel/s
pr_notice("CPU%u: shutdown\n", cpu);
/*
-diff -Nur linux-4.4.38.orig/arch/arm/kernel/unwind.c linux-4.4.38/arch/arm/kernel/unwind.c
---- linux-4.4.38.orig/arch/arm/kernel/unwind.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/arm/kernel/unwind.c 2017-01-01 21:00:18.069613077 +0100
+diff -Nur linux-4.4.46.orig/arch/arm/kernel/unwind.c linux-4.4.46/arch/arm/kernel/unwind.c
+--- linux-4.4.46.orig/arch/arm/kernel/unwind.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/arm/kernel/unwind.c 2017-02-03 17:18:05.627414322 +0100
@@ -93,7 +93,7 @@
static const struct unwind_idx *__origin_unwind_idx;
extern const struct unwind_idx __stop_unwind_idx[];
@@ -283,9 +283,9 @@ diff -Nur linux-4.4.38.orig/arch/arm/kernel/unwind.c linux-4.4.38/arch/arm/kerne
kfree(tab);
}
-diff -Nur linux-4.4.38.orig/arch/arm/kvm/arm.c linux-4.4.38/arch/arm/kvm/arm.c
---- linux-4.4.38.orig/arch/arm/kvm/arm.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/arm/kvm/arm.c 2017-01-01 21:00:18.085614105 +0100
+diff -Nur linux-4.4.46.orig/arch/arm/kvm/arm.c linux-4.4.46/arch/arm/kvm/arm.c
+--- linux-4.4.46.orig/arch/arm/kvm/arm.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/arm/kvm/arm.c 2017-02-03 17:18:05.627414322 +0100
@@ -496,18 +496,18 @@
struct kvm_vcpu *vcpu;
@@ -336,9 +336,9 @@ diff -Nur linux-4.4.38.orig/arch/arm/kvm/arm.c linux-4.4.38/arch/arm/kvm/arm.c
ret = handle_exit(vcpu, run, ret);
}
-diff -Nur linux-4.4.38.orig/arch/arm/kvm/psci.c linux-4.4.38/arch/arm/kvm/psci.c
---- linux-4.4.38.orig/arch/arm/kvm/psci.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/arm/kvm/psci.c 2017-01-01 21:00:18.105615386 +0100
+diff -Nur linux-4.4.46.orig/arch/arm/kvm/psci.c linux-4.4.46/arch/arm/kvm/psci.c
+--- linux-4.4.46.orig/arch/arm/kvm/psci.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/arm/kvm/psci.c 2017-02-03 17:18:05.627414322 +0100
@@ -70,7 +70,7 @@
{
struct kvm *kvm = source_vcpu->kvm;
@@ -357,9 +357,9 @@ diff -Nur linux-4.4.38.orig/arch/arm/kvm/psci.c linux-4.4.38/arch/arm/kvm/psci.c
return PSCI_RET_SUCCESS;
}
-diff -Nur linux-4.4.38.orig/arch/arm/mach-at91/at91rm9200.c linux-4.4.38/arch/arm/mach-at91/at91rm9200.c
---- linux-4.4.38.orig/arch/arm/mach-at91/at91rm9200.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/arm/mach-at91/at91rm9200.c 2017-01-01 21:00:18.109615647 +0100
+diff -Nur linux-4.4.46.orig/arch/arm/mach-at91/at91rm9200.c linux-4.4.46/arch/arm/mach-at91/at91rm9200.c
+--- linux-4.4.46.orig/arch/arm/mach-at91/at91rm9200.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/arm/mach-at91/at91rm9200.c 2017-02-03 17:18:05.627414322 +0100
@@ -12,7 +12,6 @@
#include <linux/of_platform.h>
@@ -376,9 +376,9 @@ diff -Nur linux-4.4.38.orig/arch/arm/mach-at91/at91rm9200.c linux-4.4.38/arch/ar
at91rm9200_pm_init();
}
-diff -Nur linux-4.4.38.orig/arch/arm/mach-at91/at91sam9.c linux-4.4.38/arch/arm/mach-at91/at91sam9.c
---- linux-4.4.38.orig/arch/arm/mach-at91/at91sam9.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/arm/mach-at91/at91sam9.c 2017-01-01 21:00:18.109615647 +0100
+diff -Nur linux-4.4.46.orig/arch/arm/mach-at91/at91sam9.c linux-4.4.46/arch/arm/mach-at91/at91sam9.c
+--- linux-4.4.46.orig/arch/arm/mach-at91/at91sam9.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/arm/mach-at91/at91sam9.c 2017-02-03 17:18:05.627414322 +0100
@@ -62,8 +62,6 @@
soc_dev = soc_device_to_device(soc);
@@ -388,9 +388,9 @@ diff -Nur linux-4.4.38.orig/arch/arm/mach-at91/at91sam9.c linux-4.4.38/arch/arm/
}
static void __init at91sam9_dt_device_init(void)
-diff -Nur linux-4.4.38.orig/arch/arm/mach-at91/generic.h linux-4.4.38/arch/arm/mach-at91/generic.h
---- linux-4.4.38.orig/arch/arm/mach-at91/generic.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/arm/mach-at91/generic.h 2017-01-01 21:00:18.109615647 +0100
+diff -Nur linux-4.4.46.orig/arch/arm/mach-at91/generic.h linux-4.4.46/arch/arm/mach-at91/generic.h
+--- linux-4.4.46.orig/arch/arm/mach-at91/generic.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/arm/mach-at91/generic.h 2017-02-03 17:18:05.627414322 +0100
@@ -11,27 +11,18 @@
#ifndef _AT91_GENERIC_H
#define _AT91_GENERIC_H
@@ -421,9 +421,9 @@ diff -Nur linux-4.4.38.orig/arch/arm/mach-at91/generic.h linux-4.4.38/arch/arm/m
#endif
#endif /* _AT91_GENERIC_H */
-diff -Nur linux-4.4.38.orig/arch/arm/mach-at91/Kconfig linux-4.4.38/arch/arm/mach-at91/Kconfig
---- linux-4.4.38.orig/arch/arm/mach-at91/Kconfig 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/arm/mach-at91/Kconfig 2017-01-01 21:00:18.109615647 +0100
+diff -Nur linux-4.4.46.orig/arch/arm/mach-at91/Kconfig linux-4.4.46/arch/arm/mach-at91/Kconfig
+--- linux-4.4.46.orig/arch/arm/mach-at91/Kconfig 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/arm/mach-at91/Kconfig 2017-02-03 17:18:05.627414322 +0100
@@ -99,6 +99,7 @@
config COMMON_CLK_AT91
bool
@@ -432,9 +432,9 @@ diff -Nur linux-4.4.38.orig/arch/arm/mach-at91/Kconfig linux-4.4.38/arch/arm/mac
config HAVE_AT91_SMD
bool
-diff -Nur linux-4.4.38.orig/arch/arm/mach-at91/pm.c linux-4.4.38/arch/arm/mach-at91/pm.c
---- linux-4.4.38.orig/arch/arm/mach-at91/pm.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/arm/mach-at91/pm.c 2017-01-01 21:00:18.113615900 +0100
+diff -Nur linux-4.4.46.orig/arch/arm/mach-at91/pm.c linux-4.4.46/arch/arm/mach-at91/pm.c
+--- linux-4.4.46.orig/arch/arm/mach-at91/pm.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/arm/mach-at91/pm.c 2017-02-03 17:18:05.627414322 +0100
@@ -31,10 +31,13 @@
#include <asm/mach/irq.h>
#include <asm/fncpy.h>
@@ -582,9 +582,9 @@ diff -Nur linux-4.4.38.orig/arch/arm/mach-at91/pm.c linux-4.4.38/arch/arm/mach-a
+ at91_pm_data.memctrl = AT91_MEMCTRL_DDRSDR;
+ at91_pm_init(NULL);
}
-diff -Nur linux-4.4.38.orig/arch/arm/mach-at91/sama5.c linux-4.4.38/arch/arm/mach-at91/sama5.c
---- linux-4.4.38.orig/arch/arm/mach-at91/sama5.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/arm/mach-at91/sama5.c 2017-01-01 21:00:18.113615900 +0100
+diff -Nur linux-4.4.46.orig/arch/arm/mach-at91/sama5.c linux-4.4.46/arch/arm/mach-at91/sama5.c
+--- linux-4.4.46.orig/arch/arm/mach-at91/sama5.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/arm/mach-at91/sama5.c 2017-02-03 17:18:05.627414322 +0100
@@ -51,7 +51,7 @@
soc_dev = soc_device_to_device(soc);
@@ -594,9 +594,9 @@ diff -Nur linux-4.4.38.orig/arch/arm/mach-at91/sama5.c linux-4.4.38/arch/arm/mac
}
static const char *const sama5_dt_board_compat[] __initconst = {
-diff -Nur linux-4.4.38.orig/arch/arm/mach-exynos/platsmp.c linux-4.4.38/arch/arm/mach-exynos/platsmp.c
---- linux-4.4.38.orig/arch/arm/mach-exynos/platsmp.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/arm/mach-exynos/platsmp.c 2017-01-01 21:00:18.137617441 +0100
+diff -Nur linux-4.4.46.orig/arch/arm/mach-exynos/platsmp.c linux-4.4.46/arch/arm/mach-exynos/platsmp.c
+--- linux-4.4.46.orig/arch/arm/mach-exynos/platsmp.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/arm/mach-exynos/platsmp.c 2017-02-03 17:18:05.627414322 +0100
@@ -230,7 +230,7 @@
return (void __iomem *)(S5P_VA_SCU);
}
@@ -644,9 +644,9 @@ diff -Nur linux-4.4.38.orig/arch/arm/mach-exynos/platsmp.c linux-4.4.38/arch/arm
return pen_release != -1 ? ret : 0;
}
-diff -Nur linux-4.4.38.orig/arch/arm/mach-hisi/platmcpm.c linux-4.4.38/arch/arm/mach-hisi/platmcpm.c
---- linux-4.4.38.orig/arch/arm/mach-hisi/platmcpm.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/arm/mach-hisi/platmcpm.c 2017-01-01 21:00:18.157618732 +0100
+diff -Nur linux-4.4.46.orig/arch/arm/mach-hisi/platmcpm.c linux-4.4.46/arch/arm/mach-hisi/platmcpm.c
+--- linux-4.4.46.orig/arch/arm/mach-hisi/platmcpm.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/arm/mach-hisi/platmcpm.c 2017-02-03 17:18:05.627414322 +0100
@@ -61,7 +61,7 @@
static void __iomem *sysctrl, *fabric;
@@ -732,9 +732,9 @@ diff -Nur linux-4.4.38.orig/arch/arm/mach-hisi/platmcpm.c linux-4.4.38/arch/arm/
return 0;
}
#endif
-diff -Nur linux-4.4.38.orig/arch/arm/mach-imx/Kconfig linux-4.4.38/arch/arm/mach-imx/Kconfig
---- linux-4.4.38.orig/arch/arm/mach-imx/Kconfig 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/arm/mach-imx/Kconfig 2017-01-01 21:00:18.157618732 +0100
+diff -Nur linux-4.4.46.orig/arch/arm/mach-imx/Kconfig linux-4.4.46/arch/arm/mach-imx/Kconfig
+--- linux-4.4.46.orig/arch/arm/mach-imx/Kconfig 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/arm/mach-imx/Kconfig 2017-02-03 17:18:05.627414322 +0100
@@ -524,7 +524,7 @@
bool "i.MX6 Quad/DualLite support"
select ARM_ERRATA_764369 if SMP
@@ -744,9 +744,9 @@ diff -Nur linux-4.4.38.orig/arch/arm/mach-imx/Kconfig linux-4.4.38/arch/arm/mach
select PCI_DOMAINS if PCI
select PINCTRL_IMX6Q
select SOC_IMX6
-diff -Nur linux-4.4.38.orig/arch/arm/mach-omap2/omap-smp.c linux-4.4.38/arch/arm/mach-omap2/omap-smp.c
---- linux-4.4.38.orig/arch/arm/mach-omap2/omap-smp.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/arm/mach-omap2/omap-smp.c 2017-01-01 21:00:18.193621044 +0100
+diff -Nur linux-4.4.46.orig/arch/arm/mach-omap2/omap-smp.c linux-4.4.46/arch/arm/mach-omap2/omap-smp.c
+--- linux-4.4.46.orig/arch/arm/mach-omap2/omap-smp.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/arm/mach-omap2/omap-smp.c 2017-02-03 17:18:05.631414475 +0100
@@ -43,7 +43,7 @@
/* SCU base address */
static void __iomem *scu_base;
@@ -785,9 +785,9 @@ diff -Nur linux-4.4.38.orig/arch/arm/mach-omap2/omap-smp.c linux-4.4.38/arch/arm
return 0;
}
-diff -Nur linux-4.4.38.orig/arch/arm/mach-prima2/platsmp.c linux-4.4.38/arch/arm/mach-prima2/platsmp.c
---- linux-4.4.38.orig/arch/arm/mach-prima2/platsmp.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/arm/mach-prima2/platsmp.c 2017-01-01 21:00:18.221622840 +0100
+diff -Nur linux-4.4.46.orig/arch/arm/mach-prima2/platsmp.c linux-4.4.46/arch/arm/mach-prima2/platsmp.c
+--- linux-4.4.46.orig/arch/arm/mach-prima2/platsmp.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/arm/mach-prima2/platsmp.c 2017-02-03 17:18:05.631414475 +0100
@@ -22,7 +22,7 @@
static void __iomem *clk_base;
@@ -826,9 +826,9 @@ diff -Nur linux-4.4.38.orig/arch/arm/mach-prima2/platsmp.c linux-4.4.38/arch/arm
return pen_release != -1 ? -ENOSYS : 0;
}
-diff -Nur linux-4.4.38.orig/arch/arm/mach-qcom/platsmp.c linux-4.4.38/arch/arm/mach-qcom/platsmp.c
---- linux-4.4.38.orig/arch/arm/mach-qcom/platsmp.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/arm/mach-qcom/platsmp.c 2017-01-01 21:00:18.261625413 +0100
+diff -Nur linux-4.4.46.orig/arch/arm/mach-qcom/platsmp.c linux-4.4.46/arch/arm/mach-qcom/platsmp.c
+--- linux-4.4.46.orig/arch/arm/mach-qcom/platsmp.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/arm/mach-qcom/platsmp.c 2017-02-03 17:18:05.631414475 +0100
@@ -46,7 +46,7 @@
extern void secondary_startup_arm(void);
@@ -867,9 +867,9 @@ diff -Nur linux-4.4.38.orig/arch/arm/mach-qcom/platsmp.c linux-4.4.38/arch/arm/m
return ret;
}
-diff -Nur linux-4.4.38.orig/arch/arm/mach-spear/platsmp.c linux-4.4.38/arch/arm/mach-spear/platsmp.c
---- linux-4.4.38.orig/arch/arm/mach-spear/platsmp.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/arm/mach-spear/platsmp.c 2017-01-01 21:00:18.305628239 +0100
+diff -Nur linux-4.4.46.orig/arch/arm/mach-spear/platsmp.c linux-4.4.46/arch/arm/mach-spear/platsmp.c
+--- linux-4.4.46.orig/arch/arm/mach-spear/platsmp.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/arm/mach-spear/platsmp.c 2017-02-03 17:18:05.631414475 +0100
@@ -32,7 +32,7 @@
sync_cache_w(&pen_release);
}
@@ -908,9 +908,9 @@ diff -Nur linux-4.4.38.orig/arch/arm/mach-spear/platsmp.c linux-4.4.38/arch/arm/
return pen_release != -1 ? -ENOSYS : 0;
}
-diff -Nur linux-4.4.38.orig/arch/arm/mach-sti/platsmp.c linux-4.4.38/arch/arm/mach-sti/platsmp.c
---- linux-4.4.38.orig/arch/arm/mach-sti/platsmp.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/arm/mach-sti/platsmp.c 2017-01-01 21:00:18.341630548 +0100
+diff -Nur linux-4.4.46.orig/arch/arm/mach-sti/platsmp.c linux-4.4.46/arch/arm/mach-sti/platsmp.c
+--- linux-4.4.46.orig/arch/arm/mach-sti/platsmp.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/arm/mach-sti/platsmp.c 2017-02-03 17:18:05.631414475 +0100
@@ -35,7 +35,7 @@
sync_cache_w(&pen_release);
}
@@ -949,9 +949,9 @@ diff -Nur linux-4.4.38.orig/arch/arm/mach-sti/platsmp.c linux-4.4.38/arch/arm/ma
return pen_release != -1 ? -ENOSYS : 0;
}
-diff -Nur linux-4.4.38.orig/arch/arm/mm/fault.c linux-4.4.38/arch/arm/mm/fault.c
---- linux-4.4.38.orig/arch/arm/mm/fault.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/arm/mm/fault.c 2017-01-01 21:00:18.345630809 +0100
+diff -Nur linux-4.4.46.orig/arch/arm/mm/fault.c linux-4.4.46/arch/arm/mm/fault.c
+--- linux-4.4.46.orig/arch/arm/mm/fault.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/arm/mm/fault.c 2017-02-03 17:18:05.631414475 +0100
@@ -430,6 +430,9 @@
if (addr < TASK_SIZE)
return do_page_fault(addr, fsr, regs);
@@ -972,9 +972,9 @@ diff -Nur linux-4.4.38.orig/arch/arm/mm/fault.c linux-4.4.38/arch/arm/mm/fault.c
do_bad_area(addr, fsr, regs);
return 0;
}
-diff -Nur linux-4.4.38.orig/arch/arm/mm/highmem.c linux-4.4.38/arch/arm/mm/highmem.c
---- linux-4.4.38.orig/arch/arm/mm/highmem.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/arm/mm/highmem.c 2017-01-01 21:00:18.349631062 +0100
+diff -Nur linux-4.4.46.orig/arch/arm/mm/highmem.c linux-4.4.46/arch/arm/mm/highmem.c
+--- linux-4.4.46.orig/arch/arm/mm/highmem.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/arm/mm/highmem.c 2017-02-03 17:18:05.631414475 +0100
@@ -34,6 +34,11 @@
return *ptep;
}
@@ -1105,9 +1105,9 @@ diff -Nur linux-4.4.38.orig/arch/arm/mm/highmem.c linux-4.4.38/arch/arm/mm/highm
+ }
+}
+#endif
-diff -Nur linux-4.4.38.orig/arch/arm/plat-versatile/platsmp.c linux-4.4.38/arch/arm/plat-versatile/platsmp.c
---- linux-4.4.38.orig/arch/arm/plat-versatile/platsmp.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/arm/plat-versatile/platsmp.c 2017-01-01 21:00:18.381633117 +0100
+diff -Nur linux-4.4.46.orig/arch/arm/plat-versatile/platsmp.c linux-4.4.46/arch/arm/plat-versatile/platsmp.c
+--- linux-4.4.46.orig/arch/arm/plat-versatile/platsmp.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/arm/plat-versatile/platsmp.c 2017-02-03 17:18:05.631414475 +0100
@@ -30,7 +30,7 @@
sync_cache_w(&pen_release);
}
@@ -1146,9 +1146,9 @@ diff -Nur linux-4.4.38.orig/arch/arm/plat-versatile/platsmp.c linux-4.4.38/arch/
return pen_release != -1 ? -ENOSYS : 0;
}
-diff -Nur linux-4.4.38.orig/arch/arm64/include/asm/thread_info.h linux-4.4.38/arch/arm64/include/asm/thread_info.h
---- linux-4.4.38.orig/arch/arm64/include/asm/thread_info.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/arm64/include/asm/thread_info.h 2017-01-01 21:00:18.465638510 +0100
+diff -Nur linux-4.4.46.orig/arch/arm64/include/asm/thread_info.h linux-4.4.46/arch/arm64/include/asm/thread_info.h
+--- linux-4.4.46.orig/arch/arm64/include/asm/thread_info.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/arm64/include/asm/thread_info.h 2017-02-03 17:18:05.631414475 +0100
@@ -49,6 +49,7 @@
mm_segment_t addr_limit; /* address limit */
struct task_struct *task; /* main task structure */
@@ -1183,9 +1183,9 @@ diff -Nur linux-4.4.38.orig/arch/arm64/include/asm/thread_info.h linux-4.4.38/ar
#define _TIF_SYSCALL_WORK (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
_TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP | \
-diff -Nur linux-4.4.38.orig/arch/arm64/Kconfig linux-4.4.38/arch/arm64/Kconfig
---- linux-4.4.38.orig/arch/arm64/Kconfig 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/arm64/Kconfig 2017-01-01 21:00:18.425635948 +0100
+diff -Nur linux-4.4.46.orig/arch/arm64/Kconfig linux-4.4.46/arch/arm64/Kconfig
+--- linux-4.4.46.orig/arch/arm64/Kconfig 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/arm64/Kconfig 2017-02-03 17:18:05.631414475 +0100
@@ -76,6 +76,7 @@
select HAVE_PERF_REGS
select HAVE_PERF_USER_STACK_DUMP
@@ -1203,9 +1203,9 @@ diff -Nur linux-4.4.38.orig/arch/arm64/Kconfig linux-4.4.38/arch/arm64/Kconfig
select SWIOTLB_XEN
help
Say Y if you want to run Linux in a Virtual Machine on Xen on ARM64.
-diff -Nur linux-4.4.38.orig/arch/arm64/kernel/asm-offsets.c linux-4.4.38/arch/arm64/kernel/asm-offsets.c
---- linux-4.4.38.orig/arch/arm64/kernel/asm-offsets.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/arm64/kernel/asm-offsets.c 2017-01-01 21:00:18.465638510 +0100
+diff -Nur linux-4.4.46.orig/arch/arm64/kernel/asm-offsets.c linux-4.4.46/arch/arm64/kernel/asm-offsets.c
+--- linux-4.4.46.orig/arch/arm64/kernel/asm-offsets.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/arm64/kernel/asm-offsets.c 2017-02-03 17:18:05.639414785 +0100
@@ -35,6 +35,7 @@
BLANK();
DEFINE(TI_FLAGS, offsetof(struct thread_info, flags));
@@ -1214,9 +1214,9 @@ diff -Nur linux-4.4.38.orig/arch/arm64/kernel/asm-offsets.c linux-4.4.38/arch/ar
DEFINE(TI_ADDR_LIMIT, offsetof(struct thread_info, addr_limit));
DEFINE(TI_TASK, offsetof(struct thread_info, task));
DEFINE(TI_CPU, offsetof(struct thread_info, cpu));
-diff -Nur linux-4.4.38.orig/arch/arm64/kernel/entry.S linux-4.4.38/arch/arm64/kernel/entry.S
---- linux-4.4.38.orig/arch/arm64/kernel/entry.S 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/arm64/kernel/entry.S 2017-01-01 21:00:18.469638771 +0100
+diff -Nur linux-4.4.46.orig/arch/arm64/kernel/entry.S linux-4.4.46/arch/arm64/kernel/entry.S
+--- linux-4.4.46.orig/arch/arm64/kernel/entry.S 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/arm64/kernel/entry.S 2017-02-03 17:18:05.639414785 +0100
@@ -376,11 +376,16 @@
#ifdef CONFIG_PREEMPT
get_thread_info tsk
@@ -1253,9 +1253,9 @@ diff -Nur linux-4.4.38.orig/arch/arm64/kernel/entry.S linux-4.4.38/arch/arm64/ke
/* TIF_SIGPENDING, TIF_NOTIFY_RESUME or TIF_FOREIGN_FPSTATE case */
ldr x2, [sp, #S_PSTATE]
mov x0, sp // 'regs'
-diff -Nur linux-4.4.38.orig/arch/Kconfig linux-4.4.38/arch/Kconfig
---- linux-4.4.38.orig/arch/Kconfig 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/Kconfig 2017-01-01 21:00:17.865599969 +0100
+diff -Nur linux-4.4.46.orig/arch/Kconfig linux-4.4.46/arch/Kconfig
+--- linux-4.4.46.orig/arch/Kconfig 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/Kconfig 2017-02-03 17:18:05.627414322 +0100
@@ -9,6 +9,7 @@
tristate "OProfile system profiling"
depends on PROFILING
@@ -1272,9 +1272,9 @@ diff -Nur linux-4.4.38.orig/arch/Kconfig linux-4.4.38/arch/Kconfig
help
This option enables a transparent branch optimization that
makes certain almost-always-true or almost-always-false branch
-diff -Nur linux-4.4.38.orig/arch/mips/Kconfig linux-4.4.38/arch/mips/Kconfig
---- linux-4.4.38.orig/arch/mips/Kconfig 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/mips/Kconfig 2017-01-01 21:00:18.493640313 +0100
+diff -Nur linux-4.4.46.orig/arch/mips/Kconfig linux-4.4.46/arch/mips/Kconfig
+--- linux-4.4.46.orig/arch/mips/Kconfig 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/mips/Kconfig 2017-02-03 17:18:05.639414785 +0100
@@ -2410,7 +2410,7 @@
#
config HIGHMEM
@@ -1284,9 +1284,9 @@ diff -Nur linux-4.4.38.orig/arch/mips/Kconfig linux-4.4.38/arch/mips/Kconfig
config CPU_SUPPORTS_HIGHMEM
bool
-diff -Nur linux-4.4.38.orig/arch/mips/kvm/mips.c linux-4.4.38/arch/mips/kvm/mips.c
---- linux-4.4.38.orig/arch/mips/kvm/mips.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/mips/kvm/mips.c 2017-01-01 21:00:18.509641339 +0100
+diff -Nur linux-4.4.46.orig/arch/mips/kvm/mips.c linux-4.4.46/arch/mips/kvm/mips.c
+--- linux-4.4.46.orig/arch/mips/kvm/mips.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/mips/kvm/mips.c 2017-02-03 17:18:05.639414785 +0100
@@ -454,8 +454,8 @@
dvcpu->arch.wait = 0;
@@ -1309,9 +1309,9 @@ diff -Nur linux-4.4.38.orig/arch/mips/kvm/mips.c linux-4.4.38/arch/mips/kvm/mips
}
/* low level hrtimer wake routine */
-diff -Nur linux-4.4.38.orig/arch/powerpc/include/asm/kvm_host.h linux-4.4.38/arch/powerpc/include/asm/kvm_host.h
---- linux-4.4.38.orig/arch/powerpc/include/asm/kvm_host.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/powerpc/include/asm/kvm_host.h 2017-01-01 21:00:18.529642625 +0100
+diff -Nur linux-4.4.46.orig/arch/powerpc/include/asm/kvm_host.h linux-4.4.46/arch/powerpc/include/asm/kvm_host.h
+--- linux-4.4.46.orig/arch/powerpc/include/asm/kvm_host.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/powerpc/include/asm/kvm_host.h 2017-02-03 17:18:05.639414785 +0100
@@ -286,7 +286,7 @@
struct list_head runnable_threads;
struct list_head preempt_list;
@@ -1321,7 +1321,7 @@ diff -Nur linux-4.4.38.orig/arch/powerpc/include/asm/kvm_host.h linux-4.4.38/arc
spinlock_t stoltb_lock; /* protects stolen_tb and preempt_tb */
u64 stolen_tb;
u64 preempt_tb;
-@@ -626,7 +626,7 @@
+@@ -627,7 +627,7 @@
u8 prodded;
u32 last_inst;
@@ -1330,9 +1330,9 @@ diff -Nur linux-4.4.38.orig/arch/powerpc/include/asm/kvm_host.h linux-4.4.38/arc
struct kvmppc_vcore *vcore;
int ret;
int trap;
-diff -Nur linux-4.4.38.orig/arch/powerpc/include/asm/thread_info.h linux-4.4.38/arch/powerpc/include/asm/thread_info.h
---- linux-4.4.38.orig/arch/powerpc/include/asm/thread_info.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/powerpc/include/asm/thread_info.h 2017-01-01 21:00:18.537643140 +0100
+diff -Nur linux-4.4.46.orig/arch/powerpc/include/asm/thread_info.h linux-4.4.46/arch/powerpc/include/asm/thread_info.h
+--- linux-4.4.46.orig/arch/powerpc/include/asm/thread_info.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/powerpc/include/asm/thread_info.h 2017-02-03 17:18:05.639414785 +0100
@@ -42,6 +42,8 @@
int cpu; /* cpu we're on */
int preempt_count; /* 0 => preemptable,
@@ -1379,9 +1379,9 @@ diff -Nur linux-4.4.38.orig/arch/powerpc/include/asm/thread_info.h linux-4.4.38/
/* Bits in local_flags */
/* Don't move TLF_NAPPING without adjusting the code in entry_32.S */
-diff -Nur linux-4.4.38.orig/arch/powerpc/Kconfig linux-4.4.38/arch/powerpc/Kconfig
---- linux-4.4.38.orig/arch/powerpc/Kconfig 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/powerpc/Kconfig 2017-01-01 21:00:18.521642113 +0100
+diff -Nur linux-4.4.46.orig/arch/powerpc/Kconfig linux-4.4.46/arch/powerpc/Kconfig
+--- linux-4.4.46.orig/arch/powerpc/Kconfig 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/powerpc/Kconfig 2017-02-03 17:18:05.639414785 +0100
@@ -60,10 +60,11 @@
config RWSEM_GENERIC_SPINLOCK
@@ -1412,9 +1412,9 @@ diff -Nur linux-4.4.38.orig/arch/powerpc/Kconfig linux-4.4.38/arch/powerpc/Kconf
source kernel/Kconfig.hz
source kernel/Kconfig.preempt
-diff -Nur linux-4.4.38.orig/arch/powerpc/kernel/asm-offsets.c linux-4.4.38/arch/powerpc/kernel/asm-offsets.c
---- linux-4.4.38.orig/arch/powerpc/kernel/asm-offsets.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/powerpc/kernel/asm-offsets.c 2017-01-01 21:00:18.545643655 +0100
+diff -Nur linux-4.4.46.orig/arch/powerpc/kernel/asm-offsets.c linux-4.4.46/arch/powerpc/kernel/asm-offsets.c
+--- linux-4.4.46.orig/arch/powerpc/kernel/asm-offsets.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/powerpc/kernel/asm-offsets.c 2017-02-03 17:18:05.643414939 +0100
@@ -160,6 +160,7 @@
DEFINE(TI_FLAGS, offsetof(struct thread_info, flags));
DEFINE(TI_LOCAL_FLAGS, offsetof(struct thread_info, local_flags));
@@ -1423,9 +1423,9 @@ diff -Nur linux-4.4.38.orig/arch/powerpc/kernel/asm-offsets.c linux-4.4.38/arch/
DEFINE(TI_TASK, offsetof(struct thread_info, task));
DEFINE(TI_CPU, offsetof(struct thread_info, cpu));
-diff -Nur linux-4.4.38.orig/arch/powerpc/kernel/entry_32.S linux-4.4.38/arch/powerpc/kernel/entry_32.S
---- linux-4.4.38.orig/arch/powerpc/kernel/entry_32.S 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/powerpc/kernel/entry_32.S 2017-01-01 21:00:18.549643914 +0100
+diff -Nur linux-4.4.46.orig/arch/powerpc/kernel/entry_32.S linux-4.4.46/arch/powerpc/kernel/entry_32.S
+--- linux-4.4.46.orig/arch/powerpc/kernel/entry_32.S 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/powerpc/kernel/entry_32.S 2017-02-03 17:18:05.643414939 +0100
@@ -818,7 +818,14 @@
cmpwi 0,r0,0 /* if non-zero, just restore regs and return */
bne restore
@@ -1474,9 +1474,9 @@ diff -Nur linux-4.4.38.orig/arch/powerpc/kernel/entry_32.S linux-4.4.38/arch/pow
bne- do_resched
andi. r0,r9,_TIF_USER_WORK_MASK
beq restore_user
-diff -Nur linux-4.4.38.orig/arch/powerpc/kernel/entry_64.S linux-4.4.38/arch/powerpc/kernel/entry_64.S
---- linux-4.4.38.orig/arch/powerpc/kernel/entry_64.S 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/powerpc/kernel/entry_64.S 2017-01-01 21:00:18.553644166 +0100
+diff -Nur linux-4.4.46.orig/arch/powerpc/kernel/entry_64.S linux-4.4.46/arch/powerpc/kernel/entry_64.S
+--- linux-4.4.46.orig/arch/powerpc/kernel/entry_64.S 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/powerpc/kernel/entry_64.S 2017-02-03 17:18:05.643414939 +0100
@@ -683,7 +683,7 @@
#else
beq restore
@@ -1515,9 +1515,9 @@ diff -Nur linux-4.4.38.orig/arch/powerpc/kernel/entry_64.S linux-4.4.38/arch/pow
bne 1b
/*
-diff -Nur linux-4.4.38.orig/arch/powerpc/kernel/irq.c linux-4.4.38/arch/powerpc/kernel/irq.c
---- linux-4.4.38.orig/arch/powerpc/kernel/irq.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/powerpc/kernel/irq.c 2017-01-01 21:00:18.557644424 +0100
+diff -Nur linux-4.4.46.orig/arch/powerpc/kernel/irq.c linux-4.4.46/arch/powerpc/kernel/irq.c
+--- linux-4.4.46.orig/arch/powerpc/kernel/irq.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/powerpc/kernel/irq.c 2017-02-03 17:18:05.643414939 +0100
@@ -614,6 +614,7 @@
}
}
@@ -1534,9 +1534,9 @@ diff -Nur linux-4.4.38.orig/arch/powerpc/kernel/irq.c linux-4.4.38/arch/powerpc/
irq_hw_number_t virq_to_hw(unsigned int virq)
{
-diff -Nur linux-4.4.38.orig/arch/powerpc/kernel/misc_32.S linux-4.4.38/arch/powerpc/kernel/misc_32.S
---- linux-4.4.38.orig/arch/powerpc/kernel/misc_32.S 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/powerpc/kernel/misc_32.S 2017-01-01 21:00:18.561644685 +0100
+diff -Nur linux-4.4.46.orig/arch/powerpc/kernel/misc_32.S linux-4.4.46/arch/powerpc/kernel/misc_32.S
+--- linux-4.4.46.orig/arch/powerpc/kernel/misc_32.S 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/powerpc/kernel/misc_32.S 2017-02-03 17:18:05.643414939 +0100
@@ -40,6 +40,7 @@
* We store the saved ksp_limit in the unused part
* of the STACK_FRAME_OVERHEAD
@@ -1553,9 +1553,9 @@ diff -Nur linux-4.4.38.orig/arch/powerpc/kernel/misc_32.S linux-4.4.38/arch/powe
/*
* void call_do_irq(struct pt_regs *regs, struct thread_info *irqtp);
-diff -Nur linux-4.4.38.orig/arch/powerpc/kernel/misc_64.S linux-4.4.38/arch/powerpc/kernel/misc_64.S
---- linux-4.4.38.orig/arch/powerpc/kernel/misc_64.S 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/powerpc/kernel/misc_64.S 2017-01-01 21:00:18.561644685 +0100
+diff -Nur linux-4.4.46.orig/arch/powerpc/kernel/misc_64.S linux-4.4.46/arch/powerpc/kernel/misc_64.S
+--- linux-4.4.46.orig/arch/powerpc/kernel/misc_64.S 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/powerpc/kernel/misc_64.S 2017-02-03 17:18:05.643414939 +0100
@@ -30,6 +30,7 @@
.text
@@ -1572,9 +1572,9 @@ diff -Nur linux-4.4.38.orig/arch/powerpc/kernel/misc_64.S linux-4.4.38/arch/powe
_GLOBAL(call_do_irq)
mflr r0
-diff -Nur linux-4.4.38.orig/arch/powerpc/kvm/book3s_hv.c linux-4.4.38/arch/powerpc/kvm/book3s_hv.c
---- linux-4.4.38.orig/arch/powerpc/kvm/book3s_hv.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/powerpc/kvm/book3s_hv.c 2017-01-01 21:00:18.589646480 +0100
+diff -Nur linux-4.4.46.orig/arch/powerpc/kvm/book3s_hv.c linux-4.4.46/arch/powerpc/kvm/book3s_hv.c
+--- linux-4.4.46.orig/arch/powerpc/kvm/book3s_hv.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/powerpc/kvm/book3s_hv.c 2017-02-03 17:18:05.643414939 +0100
@@ -114,11 +114,11 @@
static void kvmppc_fast_vcpu_kick_hv(struct kvm_vcpu *vcpu)
{
@@ -1601,7 +1601,7 @@ diff -Nur linux-4.4.38.orig/arch/powerpc/kvm/book3s_hv.c linux-4.4.38/arch/power
vcpu->stat.halt_wakeup++;
}
}
-@@ -1447,7 +1447,7 @@
+@@ -1453,7 +1453,7 @@
INIT_LIST_HEAD(&vcore->runnable_threads);
spin_lock_init(&vcore->lock);
spin_lock_init(&vcore->stoltb_lock);
@@ -1610,7 +1610,7 @@ diff -Nur linux-4.4.38.orig/arch/powerpc/kvm/book3s_hv.c linux-4.4.38/arch/power
vcore->preempt_tb = TB_NIL;
vcore->lpcr = kvm->arch.lpcr;
vcore->first_vcpuid = core * threads_per_subcore;
-@@ -2519,10 +2519,9 @@
+@@ -2525,10 +2525,9 @@
{
struct kvm_vcpu *vcpu;
int do_sleep = 1;
@@ -1623,7 +1623,7 @@ diff -Nur linux-4.4.38.orig/arch/powerpc/kvm/book3s_hv.c linux-4.4.38/arch/power
/*
* Check one last time for pending exceptions and ceded state after
-@@ -2536,7 +2535,7 @@
+@@ -2542,7 +2541,7 @@
}
if (!do_sleep) {
@@ -1632,7 +1632,7 @@ diff -Nur linux-4.4.38.orig/arch/powerpc/kvm/book3s_hv.c linux-4.4.38/arch/power
return;
}
-@@ -2544,7 +2543,7 @@
+@@ -2550,7 +2549,7 @@
trace_kvmppc_vcore_blocked(vc, 0);
spin_unlock(&vc->lock);
schedule();
@@ -1641,7 +1641,7 @@ diff -Nur linux-4.4.38.orig/arch/powerpc/kvm/book3s_hv.c linux-4.4.38/arch/power
spin_lock(&vc->lock);
vc->vcore_state = VCORE_INACTIVE;
trace_kvmppc_vcore_blocked(vc, 1);
-@@ -2600,7 +2599,7 @@
+@@ -2606,7 +2605,7 @@
kvmppc_start_thread(vcpu, vc);
trace_kvm_guest_enter(vcpu);
} else if (vc->vcore_state == VCORE_SLEEPING) {
@@ -1650,9 +1650,9 @@ diff -Nur linux-4.4.38.orig/arch/powerpc/kvm/book3s_hv.c linux-4.4.38/arch/power
}
}
-diff -Nur linux-4.4.38.orig/arch/powerpc/kvm/Kconfig linux-4.4.38/arch/powerpc/kvm/Kconfig
---- linux-4.4.38.orig/arch/powerpc/kvm/Kconfig 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/powerpc/kvm/Kconfig 2017-01-01 21:00:18.573645449 +0100
+diff -Nur linux-4.4.46.orig/arch/powerpc/kvm/Kconfig linux-4.4.46/arch/powerpc/kvm/Kconfig
+--- linux-4.4.46.orig/arch/powerpc/kvm/Kconfig 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/powerpc/kvm/Kconfig 2017-02-03 17:18:05.643414939 +0100
@@ -172,6 +172,7 @@
config KVM_MPIC
bool "KVM in-kernel MPIC emulation"
@@ -1661,9 +1661,9 @@ diff -Nur linux-4.4.38.orig/arch/powerpc/kvm/Kconfig linux-4.4.38/arch/powerpc/k
select HAVE_KVM_IRQCHIP
select HAVE_KVM_IRQFD
select HAVE_KVM_IRQ_ROUTING
-diff -Nur linux-4.4.38.orig/arch/powerpc/platforms/ps3/device-init.c linux-4.4.38/arch/powerpc/platforms/ps3/device-init.c
---- linux-4.4.38.orig/arch/powerpc/platforms/ps3/device-init.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/powerpc/platforms/ps3/device-init.c 2017-01-01 21:00:18.605647510 +0100
+diff -Nur linux-4.4.46.orig/arch/powerpc/platforms/ps3/device-init.c linux-4.4.46/arch/powerpc/platforms/ps3/device-init.c
+--- linux-4.4.46.orig/arch/powerpc/platforms/ps3/device-init.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/powerpc/platforms/ps3/device-init.c 2017-02-03 17:18:05.643414939 +0100
@@ -752,7 +752,7 @@
}
pr_debug("%s:%u: notification %s issued\n", __func__, __LINE__, op);
@@ -1673,9 +1673,9 @@ diff -Nur linux-4.4.38.orig/arch/powerpc/platforms/ps3/device-init.c linux-4.4.3
dev->done.done || kthread_should_stop());
if (kthread_should_stop())
res = -EINTR;
-diff -Nur linux-4.4.38.orig/arch/s390/include/asm/kvm_host.h linux-4.4.38/arch/s390/include/asm/kvm_host.h
---- linux-4.4.38.orig/arch/s390/include/asm/kvm_host.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/s390/include/asm/kvm_host.h 2017-01-01 21:00:18.613648025 +0100
+diff -Nur linux-4.4.46.orig/arch/s390/include/asm/kvm_host.h linux-4.4.46/arch/s390/include/asm/kvm_host.h
+--- linux-4.4.46.orig/arch/s390/include/asm/kvm_host.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/s390/include/asm/kvm_host.h 2017-02-03 17:18:05.643414939 +0100
@@ -427,7 +427,7 @@
struct kvm_s390_local_interrupt {
spinlock_t lock;
@@ -1685,9 +1685,9 @@ diff -Nur linux-4.4.38.orig/arch/s390/include/asm/kvm_host.h linux-4.4.38/arch/s
atomic_t *cpuflags;
DECLARE_BITMAP(sigp_emerg_pending, KVM_MAX_VCPUS);
struct kvm_s390_irq_payload irq;
-diff -Nur linux-4.4.38.orig/arch/s390/kvm/interrupt.c linux-4.4.38/arch/s390/kvm/interrupt.c
---- linux-4.4.38.orig/arch/s390/kvm/interrupt.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/s390/kvm/interrupt.c 2017-01-01 21:00:18.625648792 +0100
+diff -Nur linux-4.4.46.orig/arch/s390/kvm/interrupt.c linux-4.4.46/arch/s390/kvm/interrupt.c
+--- linux-4.4.46.orig/arch/s390/kvm/interrupt.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/s390/kvm/interrupt.c 2017-02-03 17:18:05.643414939 +0100
@@ -868,13 +868,13 @@
void kvm_s390_vcpu_wakeup(struct kvm_vcpu *vcpu)
@@ -1704,9 +1704,9 @@ diff -Nur linux-4.4.38.orig/arch/s390/kvm/interrupt.c linux-4.4.38/arch/s390/kvm
vcpu->stat.halt_wakeup++;
}
}
-diff -Nur linux-4.4.38.orig/arch/sh/kernel/irq.c linux-4.4.38/arch/sh/kernel/irq.c
---- linux-4.4.38.orig/arch/sh/kernel/irq.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/sh/kernel/irq.c 2017-01-01 21:00:18.629649053 +0100
+diff -Nur linux-4.4.46.orig/arch/sh/kernel/irq.c linux-4.4.46/arch/sh/kernel/irq.c
+--- linux-4.4.46.orig/arch/sh/kernel/irq.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/sh/kernel/irq.c 2017-02-03 17:18:05.643414939 +0100
@@ -147,6 +147,7 @@
hardirq_ctx[cpu] = NULL;
}
@@ -1723,9 +1723,9 @@ diff -Nur linux-4.4.38.orig/arch/sh/kernel/irq.c linux-4.4.38/arch/sh/kernel/irq
#else
static inline void handle_one_irq(unsigned int irq)
{
-diff -Nur linux-4.4.38.orig/arch/sparc/Kconfig linux-4.4.38/arch/sparc/Kconfig
---- linux-4.4.38.orig/arch/sparc/Kconfig 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/sparc/Kconfig 2017-01-01 21:00:18.637649567 +0100
+diff -Nur linux-4.4.46.orig/arch/sparc/Kconfig linux-4.4.46/arch/sparc/Kconfig
+--- linux-4.4.46.orig/arch/sparc/Kconfig 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/sparc/Kconfig 2017-02-03 17:18:05.643414939 +0100
@@ -189,12 +189,10 @@
source kernel/Kconfig.hz
@@ -1741,9 +1741,9 @@ diff -Nur linux-4.4.38.orig/arch/sparc/Kconfig linux-4.4.38/arch/sparc/Kconfig
config GENERIC_HWEIGHT
bool
-diff -Nur linux-4.4.38.orig/arch/sparc/kernel/irq_64.c linux-4.4.38/arch/sparc/kernel/irq_64.c
---- linux-4.4.38.orig/arch/sparc/kernel/irq_64.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/sparc/kernel/irq_64.c 2017-01-01 21:00:18.645650077 +0100
+diff -Nur linux-4.4.46.orig/arch/sparc/kernel/irq_64.c linux-4.4.46/arch/sparc/kernel/irq_64.c
+--- linux-4.4.46.orig/arch/sparc/kernel/irq_64.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/sparc/kernel/irq_64.c 2017-02-03 17:18:05.643414939 +0100
@@ -854,6 +854,7 @@
set_irq_regs(old_regs);
}
@@ -1760,9 +1760,9 @@ diff -Nur linux-4.4.38.orig/arch/sparc/kernel/irq_64.c linux-4.4.38/arch/sparc/k
#ifdef CONFIG_HOTPLUG_CPU
void fixup_irqs(void)
-diff -Nur linux-4.4.38.orig/arch/x86/crypto/aesni-intel_glue.c linux-4.4.38/arch/x86/crypto/aesni-intel_glue.c
---- linux-4.4.38.orig/arch/x86/crypto/aesni-intel_glue.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/x86/crypto/aesni-intel_glue.c 2017-01-01 21:00:18.677652130 +0100
+diff -Nur linux-4.4.46.orig/arch/x86/crypto/aesni-intel_glue.c linux-4.4.46/arch/x86/crypto/aesni-intel_glue.c
+--- linux-4.4.46.orig/arch/x86/crypto/aesni-intel_glue.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/x86/crypto/aesni-intel_glue.c 2017-02-03 17:18:05.643414939 +0100
@@ -383,14 +383,14 @@
err = blkcipher_walk_virt(desc, &walk);
desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;
@@ -1855,9 +1855,9 @@ diff -Nur linux-4.4.38.orig/arch/x86/crypto/aesni-intel_glue.c linux-4.4.38/arch
return err;
}
-diff -Nur linux-4.4.38.orig/arch/x86/crypto/cast5_avx_glue.c linux-4.4.38/arch/x86/crypto/cast5_avx_glue.c
---- linux-4.4.38.orig/arch/x86/crypto/cast5_avx_glue.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/x86/crypto/cast5_avx_glue.c 2017-01-01 21:00:18.685652651 +0100
+diff -Nur linux-4.4.46.orig/arch/x86/crypto/cast5_avx_glue.c linux-4.4.46/arch/x86/crypto/cast5_avx_glue.c
+--- linux-4.4.46.orig/arch/x86/crypto/cast5_avx_glue.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/x86/crypto/cast5_avx_glue.c 2017-02-03 17:18:05.647415094 +0100
@@ -59,7 +59,7 @@
static int ecb_crypt(struct blkcipher_desc *desc, struct blkcipher_walk *walk,
bool enc)
@@ -1937,9 +1937,9 @@ diff -Nur linux-4.4.38.orig/arch/x86/crypto/cast5_avx_glue.c linux-4.4.38/arch/x
if (walk.nbytes) {
ctr_crypt_final(desc, &walk);
err = blkcipher_walk_done(desc, &walk, 0);
-diff -Nur linux-4.4.38.orig/arch/x86/crypto/glue_helper.c linux-4.4.38/arch/x86/crypto/glue_helper.c
---- linux-4.4.38.orig/arch/x86/crypto/glue_helper.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/x86/crypto/glue_helper.c 2017-01-01 21:00:18.689652904 +0100
+diff -Nur linux-4.4.46.orig/arch/x86/crypto/glue_helper.c linux-4.4.46/arch/x86/crypto/glue_helper.c
+--- linux-4.4.46.orig/arch/x86/crypto/glue_helper.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/x86/crypto/glue_helper.c 2017-02-03 17:18:05.647415094 +0100
@@ -39,7 +39,7 @@
void *ctx = crypto_blkcipher_ctx(desc->tfm);
const unsigned int bsize = 128 / 8;
@@ -2055,9 +2055,9 @@ diff -Nur linux-4.4.38.orig/arch/x86/crypto/glue_helper.c linux-4.4.38/arch/x86/
return err;
}
EXPORT_SYMBOL_GPL(glue_xts_crypt_128bit);
-diff -Nur linux-4.4.38.orig/arch/x86/entry/common.c linux-4.4.38/arch/x86/entry/common.c
---- linux-4.4.38.orig/arch/x86/entry/common.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/x86/entry/common.c 2017-01-01 21:00:18.701653672 +0100
+diff -Nur linux-4.4.46.orig/arch/x86/entry/common.c linux-4.4.46/arch/x86/entry/common.c
+--- linux-4.4.46.orig/arch/x86/entry/common.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/x86/entry/common.c 2017-02-03 17:18:05.647415094 +0100
@@ -220,7 +220,7 @@
#define EXIT_TO_USERMODE_LOOP_FLAGS \
@@ -2085,9 +2085,9 @@ diff -Nur linux-4.4.38.orig/arch/x86/entry/common.c linux-4.4.38/arch/x86/entry/
if (cached_flags & _TIF_UPROBE)
uprobe_notify_resume(regs);
-diff -Nur linux-4.4.38.orig/arch/x86/entry/entry_32.S linux-4.4.38/arch/x86/entry/entry_32.S
---- linux-4.4.38.orig/arch/x86/entry/entry_32.S 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/x86/entry/entry_32.S 2017-01-01 21:00:18.701653672 +0100
+diff -Nur linux-4.4.46.orig/arch/x86/entry/entry_32.S linux-4.4.46/arch/x86/entry/entry_32.S
+--- linux-4.4.46.orig/arch/x86/entry/entry_32.S 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/x86/entry/entry_32.S 2017-02-03 17:18:05.647415094 +0100
@@ -278,8 +278,24 @@
ENTRY(resume_kernel)
DISABLE_INTERRUPTS(CLBR_ANY)
@@ -2113,9 +2113,9 @@ diff -Nur linux-4.4.38.orig/arch/x86/entry/entry_32.S linux-4.4.38/arch/x86/entr
testl $X86_EFLAGS_IF, PT_EFLAGS(%esp) # interrupts off (exception path) ?
jz restore_all
call preempt_schedule_irq
-diff -Nur linux-4.4.38.orig/arch/x86/entry/entry_64.S linux-4.4.38/arch/x86/entry/entry_64.S
---- linux-4.4.38.orig/arch/x86/entry/entry_64.S 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/x86/entry/entry_64.S 2017-01-01 21:00:18.705653930 +0100
+diff -Nur linux-4.4.46.orig/arch/x86/entry/entry_64.S linux-4.4.46/arch/x86/entry/entry_64.S
+--- linux-4.4.46.orig/arch/x86/entry/entry_64.S 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/x86/entry/entry_64.S 2017-02-03 17:18:05.647415094 +0100
@@ -579,7 +579,23 @@
bt $9, EFLAGS(%rsp) /* were interrupts off? */
jnc 1f
@@ -2156,9 +2156,9 @@ diff -Nur linux-4.4.38.orig/arch/x86/entry/entry_64.S linux-4.4.38/arch/x86/entr
#ifdef CONFIG_XEN
idtentry xen_hypervisor_callback xen_do_hypervisor_callback has_error_code=0
-diff -Nur linux-4.4.38.orig/arch/x86/include/asm/preempt.h linux-4.4.38/arch/x86/include/asm/preempt.h
---- linux-4.4.38.orig/arch/x86/include/asm/preempt.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/x86/include/asm/preempt.h 2017-01-01 21:00:18.713654444 +0100
+diff -Nur linux-4.4.46.orig/arch/x86/include/asm/preempt.h linux-4.4.46/arch/x86/include/asm/preempt.h
+--- linux-4.4.46.orig/arch/x86/include/asm/preempt.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/x86/include/asm/preempt.h 2017-02-03 17:18:05.647415094 +0100
@@ -79,17 +79,46 @@
* a decrement which hits zero means we have no preempt_count and should
* reschedule.
@@ -2207,9 +2207,9 @@ diff -Nur linux-4.4.38.orig/arch/x86/include/asm/preempt.h linux-4.4.38/arch/x86
}
#ifdef CONFIG_PREEMPT
-diff -Nur linux-4.4.38.orig/arch/x86/include/asm/signal.h linux-4.4.38/arch/x86/include/asm/signal.h
---- linux-4.4.38.orig/arch/x86/include/asm/signal.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/x86/include/asm/signal.h 2017-01-01 21:00:18.717654706 +0100
+diff -Nur linux-4.4.46.orig/arch/x86/include/asm/signal.h linux-4.4.46/arch/x86/include/asm/signal.h
+--- linux-4.4.46.orig/arch/x86/include/asm/signal.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/x86/include/asm/signal.h 2017-02-03 17:18:05.647415094 +0100
@@ -23,6 +23,19 @@
unsigned long sig[_NSIG_WORDS];
} sigset_t;
@@ -2230,9 +2230,9 @@ diff -Nur linux-4.4.38.orig/arch/x86/include/asm/signal.h linux-4.4.38/arch/x86/
#ifndef CONFIG_COMPAT
typedef sigset_t compat_sigset_t;
#endif
-diff -Nur linux-4.4.38.orig/arch/x86/include/asm/stackprotector.h linux-4.4.38/arch/x86/include/asm/stackprotector.h
---- linux-4.4.38.orig/arch/x86/include/asm/stackprotector.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/x86/include/asm/stackprotector.h 2017-01-01 21:00:18.717654706 +0100
+diff -Nur linux-4.4.46.orig/arch/x86/include/asm/stackprotector.h linux-4.4.46/arch/x86/include/asm/stackprotector.h
+--- linux-4.4.46.orig/arch/x86/include/asm/stackprotector.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/x86/include/asm/stackprotector.h 2017-02-03 17:18:05.647415094 +0100
@@ -59,7 +59,7 @@
*/
static __always_inline void boot_init_stack_canary(void)
@@ -2258,9 +2258,9 @@ diff -Nur linux-4.4.38.orig/arch/x86/include/asm/stackprotector.h linux-4.4.38/a
tsc = rdtsc();
canary += tsc + (tsc << 32UL);
-diff -Nur linux-4.4.38.orig/arch/x86/include/asm/thread_info.h linux-4.4.38/arch/x86/include/asm/thread_info.h
---- linux-4.4.38.orig/arch/x86/include/asm/thread_info.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/x86/include/asm/thread_info.h 2017-01-01 21:00:18.725655220 +0100
+diff -Nur linux-4.4.46.orig/arch/x86/include/asm/thread_info.h linux-4.4.46/arch/x86/include/asm/thread_info.h
+--- linux-4.4.46.orig/arch/x86/include/asm/thread_info.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/x86/include/asm/thread_info.h 2017-02-03 17:18:05.647415094 +0100
@@ -58,6 +58,8 @@
__u32 status; /* thread synchronous flags */
__u32 cpu; /* current CPU */
@@ -2295,9 +2295,9 @@ diff -Nur linux-4.4.38.orig/arch/x86/include/asm/thread_info.h linux-4.4.38/arch
#define STACK_WARN (THREAD_SIZE/8)
/*
-diff -Nur linux-4.4.38.orig/arch/x86/include/asm/uv/uv_bau.h linux-4.4.38/arch/x86/include/asm/uv/uv_bau.h
---- linux-4.4.38.orig/arch/x86/include/asm/uv/uv_bau.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/x86/include/asm/uv/uv_bau.h 2017-01-01 21:00:18.729655473 +0100
+diff -Nur linux-4.4.46.orig/arch/x86/include/asm/uv/uv_bau.h linux-4.4.46/arch/x86/include/asm/uv/uv_bau.h
+--- linux-4.4.46.orig/arch/x86/include/asm/uv/uv_bau.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/x86/include/asm/uv/uv_bau.h 2017-02-03 17:18:05.647415094 +0100
@@ -615,9 +615,9 @@
cycles_t send_message;
cycles_t period_end;
@@ -2331,9 +2331,9 @@ diff -Nur linux-4.4.38.orig/arch/x86/include/asm/uv/uv_bau.h linux-4.4.38/arch/x
return 1;
}
-diff -Nur linux-4.4.38.orig/arch/x86/include/asm/uv/uv_hub.h linux-4.4.38/arch/x86/include/asm/uv/uv_hub.h
---- linux-4.4.38.orig/arch/x86/include/asm/uv/uv_hub.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/x86/include/asm/uv/uv_hub.h 2017-01-01 21:00:18.729655473 +0100
+diff -Nur linux-4.4.46.orig/arch/x86/include/asm/uv/uv_hub.h linux-4.4.46/arch/x86/include/asm/uv/uv_hub.h
+--- linux-4.4.46.orig/arch/x86/include/asm/uv/uv_hub.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/x86/include/asm/uv/uv_hub.h 2017-02-03 17:18:05.647415094 +0100
@@ -492,7 +492,7 @@
unsigned short nr_online_cpus;
unsigned short pnode;
@@ -2343,9 +2343,9 @@ diff -Nur linux-4.4.38.orig/arch/x86/include/asm/uv/uv_hub.h linux-4.4.38/arch/x
unsigned long nmi_count; /* obsolete, see uv_hub_nmi */
};
extern struct uv_blade_info *uv_blade_info;
-diff -Nur linux-4.4.38.orig/arch/x86/Kconfig linux-4.4.38/arch/x86/Kconfig
---- linux-4.4.38.orig/arch/x86/Kconfig 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/x86/Kconfig 2017-01-01 21:00:18.669651618 +0100
+diff -Nur linux-4.4.46.orig/arch/x86/Kconfig linux-4.4.46/arch/x86/Kconfig
+--- linux-4.4.46.orig/arch/x86/Kconfig 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/x86/Kconfig 2017-02-03 17:18:05.643414939 +0100
@@ -17,6 +17,7 @@
### Arch settings
config X86
@@ -2376,9 +2376,9 @@ diff -Nur linux-4.4.38.orig/arch/x86/Kconfig linux-4.4.38/arch/x86/Kconfig
---help---
Enable maximum number of CPUS and NUMA Nodes for this architecture.
If unsure, say N.
-diff -Nur linux-4.4.38.orig/arch/x86/kernel/acpi/boot.c linux-4.4.38/arch/x86/kernel/acpi/boot.c
---- linux-4.4.38.orig/arch/x86/kernel/acpi/boot.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/x86/kernel/acpi/boot.c 2017-01-01 21:00:18.737655987 +0100
+diff -Nur linux-4.4.46.orig/arch/x86/kernel/acpi/boot.c linux-4.4.46/arch/x86/kernel/acpi/boot.c
+--- linux-4.4.46.orig/arch/x86/kernel/acpi/boot.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/x86/kernel/acpi/boot.c 2017-02-03 17:18:05.655415404 +0100
@@ -87,7 +87,9 @@
* ->ioapic_mutex
* ->ioapic_lock
@@ -2389,9 +2389,9 @@ diff -Nur linux-4.4.38.orig/arch/x86/kernel/acpi/boot.c linux-4.4.38/arch/x86/ke
/* --------------------------------------------------------------------------
Boot-time Configuration
-diff -Nur linux-4.4.38.orig/arch/x86/kernel/apic/io_apic.c linux-4.4.38/arch/x86/kernel/apic/io_apic.c
---- linux-4.4.38.orig/arch/x86/kernel/apic/io_apic.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/x86/kernel/apic/io_apic.c 2017-01-01 21:00:18.757657274 +0100
+diff -Nur linux-4.4.46.orig/arch/x86/kernel/apic/io_apic.c linux-4.4.46/arch/x86/kernel/apic/io_apic.c
+--- linux-4.4.46.orig/arch/x86/kernel/apic/io_apic.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/x86/kernel/apic/io_apic.c 2017-02-03 17:18:05.655415404 +0100
@@ -1711,7 +1711,8 @@
static inline bool ioapic_irqd_mask(struct irq_data *data)
{
@@ -2402,9 +2402,9 @@ diff -Nur linux-4.4.38.orig/arch/x86/kernel/apic/io_apic.c linux-4.4.38/arch/x86
mask_ioapic_irq(data);
return true;
}
-diff -Nur linux-4.4.38.orig/arch/x86/kernel/apic/x2apic_uv_x.c linux-4.4.38/arch/x86/kernel/apic/x2apic_uv_x.c
---- linux-4.4.38.orig/arch/x86/kernel/apic/x2apic_uv_x.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/x86/kernel/apic/x2apic_uv_x.c 2017-01-01 21:00:18.773658303 +0100
+diff -Nur linux-4.4.46.orig/arch/x86/kernel/apic/x2apic_uv_x.c linux-4.4.46/arch/x86/kernel/apic/x2apic_uv_x.c
+--- linux-4.4.46.orig/arch/x86/kernel/apic/x2apic_uv_x.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/x86/kernel/apic/x2apic_uv_x.c 2017-02-03 17:18:05.655415404 +0100
@@ -947,7 +947,7 @@
uv_blade_info[blade].pnode = pnode;
uv_blade_info[blade].nr_possible_cpus = 0;
@@ -2414,9 +2414,9 @@ diff -Nur linux-4.4.38.orig/arch/x86/kernel/apic/x2apic_uv_x.c linux-4.4.38/arch
min_pnode = min(pnode, min_pnode);
max_pnode = max(pnode, max_pnode);
blade++;
-diff -Nur linux-4.4.38.orig/arch/x86/kernel/asm-offsets.c linux-4.4.38/arch/x86/kernel/asm-offsets.c
---- linux-4.4.38.orig/arch/x86/kernel/asm-offsets.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/x86/kernel/asm-offsets.c 2017-01-01 21:00:18.773658303 +0100
+diff -Nur linux-4.4.46.orig/arch/x86/kernel/asm-offsets.c linux-4.4.46/arch/x86/kernel/asm-offsets.c
+--- linux-4.4.46.orig/arch/x86/kernel/asm-offsets.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/x86/kernel/asm-offsets.c 2017-02-03 17:18:05.655415404 +0100
@@ -32,6 +32,7 @@
OFFSET(TI_flags, thread_info, flags);
OFFSET(TI_status, thread_info, status);
@@ -2431,9 +2431,9 @@ diff -Nur linux-4.4.38.orig/arch/x86/kernel/asm-offsets.c linux-4.4.38/arch/x86/
DEFINE(PTREGS_SIZE, sizeof(struct pt_regs));
+ DEFINE(_PREEMPT_ENABLED, PREEMPT_ENABLED);
}
-diff -Nur linux-4.4.38.orig/arch/x86/kernel/cpu/mcheck/mce.c linux-4.4.38/arch/x86/kernel/cpu/mcheck/mce.c
---- linux-4.4.38.orig/arch/x86/kernel/cpu/mcheck/mce.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/x86/kernel/cpu/mcheck/mce.c 2017-01-01 21:00:18.781658817 +0100
+diff -Nur linux-4.4.46.orig/arch/x86/kernel/cpu/mcheck/mce.c linux-4.4.46/arch/x86/kernel/cpu/mcheck/mce.c
+--- linux-4.4.46.orig/arch/x86/kernel/cpu/mcheck/mce.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/x86/kernel/cpu/mcheck/mce.c 2017-02-03 17:18:05.659415557 +0100
@@ -41,6 +41,8 @@
#include <linux/debugfs.h>
#include <linux/irq_work.h>
@@ -2675,9 +2675,9 @@ diff -Nur linux-4.4.38.orig/arch/x86/kernel/cpu/mcheck/mce.c linux-4.4.38/arch/x
if (!zalloc_cpumask_var(&mce_device_initialized, GFP_KERNEL)) {
err = -ENOMEM;
goto err_out;
-diff -Nur linux-4.4.38.orig/arch/x86/kernel/cpu/perf_event_intel_rapl.c linux-4.4.38/arch/x86/kernel/cpu/perf_event_intel_rapl.c
---- linux-4.4.38.orig/arch/x86/kernel/cpu/perf_event_intel_rapl.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/x86/kernel/cpu/perf_event_intel_rapl.c 2017-01-01 21:00:18.789659331 +0100
+diff -Nur linux-4.4.46.orig/arch/x86/kernel/cpu/perf_event_intel_rapl.c linux-4.4.46/arch/x86/kernel/cpu/perf_event_intel_rapl.c
+--- linux-4.4.46.orig/arch/x86/kernel/cpu/perf_event_intel_rapl.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/x86/kernel/cpu/perf_event_intel_rapl.c 2017-02-03 17:18:05.663415712 +0100
@@ -117,7 +117,7 @@
};
@@ -2759,9 +2759,9 @@ diff -Nur linux-4.4.38.orig/arch/x86/kernel/cpu/perf_event_intel_rapl.c linux-4.
INIT_LIST_HEAD(&pmu->active_list);
-diff -Nur linux-4.4.38.orig/arch/x86/kernel/dumpstack_32.c linux-4.4.38/arch/x86/kernel/dumpstack_32.c
---- linux-4.4.38.orig/arch/x86/kernel/dumpstack_32.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/x86/kernel/dumpstack_32.c 2017-01-01 21:00:18.793659584 +0100
+diff -Nur linux-4.4.46.orig/arch/x86/kernel/dumpstack_32.c linux-4.4.46/arch/x86/kernel/dumpstack_32.c
+--- linux-4.4.46.orig/arch/x86/kernel/dumpstack_32.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/x86/kernel/dumpstack_32.c 2017-02-03 17:18:05.663415712 +0100
@@ -42,7 +42,7 @@
unsigned long *stack, unsigned long bp,
const struct stacktrace_ops *ops, void *data)
@@ -2780,9 +2780,9 @@ diff -Nur linux-4.4.38.orig/arch/x86/kernel/dumpstack_32.c linux-4.4.38/arch/x86
}
EXPORT_SYMBOL(dump_trace);
-diff -Nur linux-4.4.38.orig/arch/x86/kernel/dumpstack_64.c linux-4.4.38/arch/x86/kernel/dumpstack_64.c
---- linux-4.4.38.orig/arch/x86/kernel/dumpstack_64.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/x86/kernel/dumpstack_64.c 2017-01-01 21:00:18.797659845 +0100
+diff -Nur linux-4.4.46.orig/arch/x86/kernel/dumpstack_64.c linux-4.4.46/arch/x86/kernel/dumpstack_64.c
+--- linux-4.4.46.orig/arch/x86/kernel/dumpstack_64.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/x86/kernel/dumpstack_64.c 2017-02-03 17:18:05.663415712 +0100
@@ -152,7 +152,7 @@
unsigned long *stack, unsigned long bp,
const struct stacktrace_ops *ops, void *data)
@@ -2819,9 +2819,9 @@ diff -Nur linux-4.4.38.orig/arch/x86/kernel/dumpstack_64.c linux-4.4.38/arch/x86
pr_cont("\n");
show_trace_log_lvl(task, regs, sp, bp, log_lvl);
-diff -Nur linux-4.4.38.orig/arch/x86/kernel/irq_32.c linux-4.4.38/arch/x86/kernel/irq_32.c
---- linux-4.4.38.orig/arch/x86/kernel/irq_32.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/x86/kernel/irq_32.c 2017-01-01 21:00:18.801660098 +0100
+diff -Nur linux-4.4.46.orig/arch/x86/kernel/irq_32.c linux-4.4.46/arch/x86/kernel/irq_32.c
+--- linux-4.4.46.orig/arch/x86/kernel/irq_32.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/x86/kernel/irq_32.c 2017-02-03 17:18:05.663415712 +0100
@@ -128,6 +128,7 @@
cpu, per_cpu(hardirq_stack, cpu), per_cpu(softirq_stack, cpu));
}
@@ -2838,9 +2838,9 @@ diff -Nur linux-4.4.38.orig/arch/x86/kernel/irq_32.c linux-4.4.38/arch/x86/kerne
bool handle_irq(struct irq_desc *desc, struct pt_regs *regs)
{
-diff -Nur linux-4.4.38.orig/arch/x86/kernel/kvm.c linux-4.4.38/arch/x86/kernel/kvm.c
---- linux-4.4.38.orig/arch/x86/kernel/kvm.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/x86/kernel/kvm.c 2017-01-01 21:00:18.809660615 +0100
+diff -Nur linux-4.4.46.orig/arch/x86/kernel/kvm.c linux-4.4.46/arch/x86/kernel/kvm.c
+--- linux-4.4.46.orig/arch/x86/kernel/kvm.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/x86/kernel/kvm.c 2017-02-03 17:18:05.663415712 +0100
@@ -36,6 +36,7 @@
#include <linux/kprobes.h>
#include <linux/debugfs.h>
@@ -2980,9 +2980,9 @@ diff -Nur linux-4.4.38.orig/arch/x86/kernel/kvm.c linux-4.4.38/arch/x86/kernel/k
if (kvm_para_has_feature(KVM_FEATURE_ASYNC_PF))
x86_init.irqs.trap_init = kvm_apf_trap_init;
-diff -Nur linux-4.4.38.orig/arch/x86/kernel/nmi.c linux-4.4.38/arch/x86/kernel/nmi.c
---- linux-4.4.38.orig/arch/x86/kernel/nmi.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/x86/kernel/nmi.c 2017-01-01 21:00:18.813660866 +0100
+diff -Nur linux-4.4.46.orig/arch/x86/kernel/nmi.c linux-4.4.46/arch/x86/kernel/nmi.c
+--- linux-4.4.46.orig/arch/x86/kernel/nmi.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/x86/kernel/nmi.c 2017-02-03 17:18:05.663415712 +0100
@@ -231,7 +231,7 @@
#endif
@@ -3020,9 +3020,9 @@ diff -Nur linux-4.4.38.orig/arch/x86/kernel/nmi.c linux-4.4.38/arch/x86/kernel/n
pr_emerg("Dazed and confused, but trying to continue\n");
}
-diff -Nur linux-4.4.38.orig/arch/x86/kernel/process_32.c linux-4.4.38/arch/x86/kernel/process_32.c
---- linux-4.4.38.orig/arch/x86/kernel/process_32.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/x86/kernel/process_32.c 2017-01-01 21:00:18.813660866 +0100
+diff -Nur linux-4.4.46.orig/arch/x86/kernel/process_32.c linux-4.4.46/arch/x86/kernel/process_32.c
+--- linux-4.4.46.orig/arch/x86/kernel/process_32.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/x86/kernel/process_32.c 2017-02-03 17:18:05.663415712 +0100
@@ -35,6 +35,7 @@
#include <linux/uaccess.h>
#include <linux/io.h>
@@ -3076,9 +3076,9 @@ diff -Nur linux-4.4.38.orig/arch/x86/kernel/process_32.c linux-4.4.38/arch/x86/k
/*
* Leave lazy mode, flushing any hypercalls made here.
* This must be done before restoring TLS segments so
-diff -Nur linux-4.4.38.orig/arch/x86/kernel/reboot.c linux-4.4.38/arch/x86/kernel/reboot.c
---- linux-4.4.38.orig/arch/x86/kernel/reboot.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/x86/kernel/reboot.c 2017-01-01 21:00:18.813660866 +0100
+diff -Nur linux-4.4.46.orig/arch/x86/kernel/reboot.c linux-4.4.46/arch/x86/kernel/reboot.c
+--- linux-4.4.46.orig/arch/x86/kernel/reboot.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/x86/kernel/reboot.c 2017-02-03 17:18:05.663415712 +0100
@@ -726,6 +726,7 @@
static nmi_shootdown_cb shootdown_callback;
@@ -3120,9 +3120,9 @@ diff -Nur linux-4.4.38.orig/arch/x86/kernel/reboot.c linux-4.4.38/arch/x86/kerne
#else /* !CONFIG_SMP */
void nmi_shootdown_cpus(nmi_shootdown_cb callback)
{
-diff -Nur linux-4.4.38.orig/arch/x86/kvm/lapic.c linux-4.4.38/arch/x86/kvm/lapic.c
---- linux-4.4.38.orig/arch/x86/kvm/lapic.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/x86/kvm/lapic.c 2017-01-01 21:00:18.825661639 +0100
+diff -Nur linux-4.4.46.orig/arch/x86/kvm/lapic.c linux-4.4.46/arch/x86/kvm/lapic.c
+--- linux-4.4.46.orig/arch/x86/kvm/lapic.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/x86/kvm/lapic.c 2017-02-03 17:18:05.663415712 +0100
@@ -1195,7 +1195,7 @@
static void apic_timer_expired(struct kvm_lapic *apic)
{
@@ -3151,10 +3151,10 @@ diff -Nur linux-4.4.38.orig/arch/x86/kvm/lapic.c linux-4.4.38/arch/x86/kvm/lapic
/*
* APIC is created enabled. This will prevent kvm_lapic_set_base from
-diff -Nur linux-4.4.38.orig/arch/x86/kvm/x86.c linux-4.4.38/arch/x86/kvm/x86.c
---- linux-4.4.38.orig/arch/x86/kvm/x86.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/x86/kvm/x86.c 2017-01-01 21:00:18.877664981 +0100
-@@ -5804,6 +5804,13 @@
+diff -Nur linux-4.4.46.orig/arch/x86/kvm/x86.c linux-4.4.46/arch/x86/kvm/x86.c
+--- linux-4.4.46.orig/arch/x86/kvm/x86.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/x86/kvm/x86.c 2017-02-03 17:18:05.663415712 +0100
+@@ -5809,6 +5809,13 @@
goto out;
}
@@ -3168,9 +3168,9 @@ diff -Nur linux-4.4.38.orig/arch/x86/kvm/x86.c linux-4.4.38/arch/x86/kvm/x86.c
r = kvm_mmu_module_init();
if (r)
goto out_free_percpu;
-diff -Nur linux-4.4.38.orig/arch/x86/mm/highmem_32.c linux-4.4.38/arch/x86/mm/highmem_32.c
---- linux-4.4.38.orig/arch/x86/mm/highmem_32.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/x86/mm/highmem_32.c 2017-01-01 21:00:18.897666268 +0100
+diff -Nur linux-4.4.46.orig/arch/x86/mm/highmem_32.c linux-4.4.46/arch/x86/mm/highmem_32.c
+--- linux-4.4.46.orig/arch/x86/mm/highmem_32.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/x86/mm/highmem_32.c 2017-02-03 17:18:05.663415712 +0100
@@ -32,10 +32,11 @@
*/
void *kmap_atomic_prot(struct page *page, pgprot_t prot)
@@ -3215,9 +3215,9 @@ diff -Nur linux-4.4.38.orig/arch/x86/mm/highmem_32.c linux-4.4.38/arch/x86/mm/hi
}
EXPORT_SYMBOL(__kunmap_atomic);
-diff -Nur linux-4.4.38.orig/arch/x86/mm/iomap_32.c linux-4.4.38/arch/x86/mm/iomap_32.c
---- linux-4.4.38.orig/arch/x86/mm/iomap_32.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/x86/mm/iomap_32.c 2017-01-01 21:00:18.897666268 +0100
+diff -Nur linux-4.4.46.orig/arch/x86/mm/iomap_32.c linux-4.4.46/arch/x86/mm/iomap_32.c
+--- linux-4.4.46.orig/arch/x86/mm/iomap_32.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/x86/mm/iomap_32.c 2017-02-03 17:18:05.663415712 +0100
@@ -56,6 +56,7 @@
void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot)
@@ -3250,9 +3250,9 @@ diff -Nur linux-4.4.38.orig/arch/x86/mm/iomap_32.c linux-4.4.38/arch/x86/mm/ioma
kpte_clear_flush(kmap_pte-idx, vaddr);
kmap_atomic_idx_pop();
}
-diff -Nur linux-4.4.38.orig/arch/x86/platform/uv/tlb_uv.c linux-4.4.38/arch/x86/platform/uv/tlb_uv.c
---- linux-4.4.38.orig/arch/x86/platform/uv/tlb_uv.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/x86/platform/uv/tlb_uv.c 2017-01-01 21:00:18.905666779 +0100
+diff -Nur linux-4.4.46.orig/arch/x86/platform/uv/tlb_uv.c linux-4.4.46/arch/x86/platform/uv/tlb_uv.c
+--- linux-4.4.46.orig/arch/x86/platform/uv/tlb_uv.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/x86/platform/uv/tlb_uv.c 2017-02-03 17:18:05.663415712 +0100
@@ -714,9 +714,9 @@
quiesce_local_uvhub(hmaster);
@@ -3339,9 +3339,9 @@ diff -Nur linux-4.4.38.orig/arch/x86/platform/uv/tlb_uv.c linux-4.4.38/arch/x86/
}
}
-diff -Nur linux-4.4.38.orig/arch/x86/platform/uv/uv_time.c linux-4.4.38/arch/x86/platform/uv/uv_time.c
---- linux-4.4.38.orig/arch/x86/platform/uv/uv_time.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/arch/x86/platform/uv/uv_time.c 2017-01-01 21:00:18.909667040 +0100
+diff -Nur linux-4.4.46.orig/arch/x86/platform/uv/uv_time.c linux-4.4.46/arch/x86/platform/uv/uv_time.c
+--- linux-4.4.46.orig/arch/x86/platform/uv/uv_time.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/arch/x86/platform/uv/uv_time.c 2017-02-03 17:18:05.663415712 +0100
@@ -57,7 +57,7 @@
/* There is one of these allocated per node */
@@ -3422,9 +3422,9 @@ diff -Nur linux-4.4.38.orig/arch/x86/platform/uv/uv_time.c linux-4.4.38/arch/x86
}
/*
-diff -Nur linux-4.4.38.orig/block/blk-core.c linux-4.4.38/block/blk-core.c
---- linux-4.4.38.orig/block/blk-core.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/block/blk-core.c 2017-01-01 21:00:18.929668319 +0100
+diff -Nur linux-4.4.46.orig/block/blk-core.c linux-4.4.46/block/blk-core.c
+--- linux-4.4.46.orig/block/blk-core.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/block/blk-core.c 2017-02-03 17:18:05.667415866 +0100
@@ -125,6 +125,9 @@
INIT_LIST_HEAD(&rq->queuelist);
@@ -3518,9 +3518,9 @@ diff -Nur linux-4.4.38.orig/block/blk-core.c linux-4.4.38/block/blk-core.c
}
void blk_finish_plug(struct blk_plug *plug)
-diff -Nur linux-4.4.38.orig/block/blk-ioc.c linux-4.4.38/block/blk-ioc.c
---- linux-4.4.38.orig/block/blk-ioc.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/block/blk-ioc.c 2017-01-01 21:00:18.941669093 +0100
+diff -Nur linux-4.4.46.orig/block/blk-ioc.c linux-4.4.46/block/blk-ioc.c
+--- linux-4.4.46.orig/block/blk-ioc.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/block/blk-ioc.c 2017-02-03 17:18:05.667415866 +0100
@@ -7,6 +7,7 @@
#include <linux/bio.h>
#include <linux/blkdev.h>
@@ -3547,9 +3547,9 @@ diff -Nur linux-4.4.38.orig/block/blk-ioc.c linux-4.4.38/block/blk-ioc.c
goto retry;
}
}
-diff -Nur linux-4.4.38.orig/block/blk-iopoll.c linux-4.4.38/block/blk-iopoll.c
---- linux-4.4.38.orig/block/blk-iopoll.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/block/blk-iopoll.c 2017-01-01 21:00:18.945669346 +0100
+diff -Nur linux-4.4.46.orig/block/blk-iopoll.c linux-4.4.46/block/blk-iopoll.c
+--- linux-4.4.46.orig/block/blk-iopoll.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/block/blk-iopoll.c 2017-02-03 17:18:05.667415866 +0100
@@ -35,6 +35,7 @@
list_add_tail(&iop->list, this_cpu_ptr(&blk_cpu_iopoll));
__raise_softirq_irqoff(BLOCK_IOPOLL_SOFTIRQ);
@@ -3574,9 +3574,9 @@ diff -Nur linux-4.4.38.orig/block/blk-iopoll.c linux-4.4.38/block/blk-iopoll.c
}
return NOTIFY_OK;
-diff -Nur linux-4.4.38.orig/block/blk-mq.c linux-4.4.38/block/blk-mq.c
---- linux-4.4.38.orig/block/blk-mq.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/block/blk-mq.c 2017-01-01 21:00:18.945669346 +0100
+diff -Nur linux-4.4.46.orig/block/blk-mq.c linux-4.4.46/block/blk-mq.c
+--- linux-4.4.46.orig/block/blk-mq.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/block/blk-mq.c 2017-02-03 17:18:05.667415866 +0100
@@ -92,7 +92,7 @@
static void blk_mq_freeze_queue_wait(struct request_queue *q)
@@ -3667,7 +3667,7 @@ diff -Nur linux-4.4.38.orig/block/blk-mq.c linux-4.4.38/block/blk-mq.c
}
static void __blk_mq_complete_request(struct request *rq)
-@@ -864,14 +884,14 @@
+@@ -862,14 +882,14 @@
return;
if (!async) {
@@ -3685,7 +3685,7 @@ diff -Nur linux-4.4.38.orig/block/blk-mq.c linux-4.4.38/block/blk-mq.c
}
kblockd_schedule_delayed_work_on(blk_mq_hctx_next_cpu(hctx),
-@@ -1619,7 +1639,7 @@
+@@ -1617,7 +1637,7 @@
{
struct blk_mq_hw_ctx *hctx = data;
@@ -3694,9 +3694,9 @@ diff -Nur linux-4.4.38.orig/block/blk-mq.c linux-4.4.38/block/blk-mq.c
return blk_mq_hctx_cpu_offline(hctx, cpu);
/*
-diff -Nur linux-4.4.38.orig/block/blk-mq-cpu.c linux-4.4.38/block/blk-mq-cpu.c
---- linux-4.4.38.orig/block/blk-mq-cpu.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/block/blk-mq-cpu.c 2017-01-01 21:00:18.945669346 +0100
+diff -Nur linux-4.4.46.orig/block/blk-mq-cpu.c linux-4.4.46/block/blk-mq-cpu.c
+--- linux-4.4.46.orig/block/blk-mq-cpu.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/block/blk-mq-cpu.c 2017-02-03 17:18:05.667415866 +0100
@@ -16,7 +16,7 @@
#include "blk-mq.h"
@@ -3748,9 +3748,9 @@ diff -Nur linux-4.4.38.orig/block/blk-mq-cpu.c linux-4.4.38/block/blk-mq-cpu.c
}
void blk_mq_init_cpu_notifier(struct blk_mq_cpu_notifier *notifier,
-diff -Nur linux-4.4.38.orig/block/blk-mq.h linux-4.4.38/block/blk-mq.h
---- linux-4.4.38.orig/block/blk-mq.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/block/blk-mq.h 2017-01-01 21:00:18.949669606 +0100
+diff -Nur linux-4.4.46.orig/block/blk-mq.h linux-4.4.46/block/blk-mq.h
+--- linux-4.4.46.orig/block/blk-mq.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/block/blk-mq.h 2017-02-03 17:18:05.667415866 +0100
@@ -74,7 +74,10 @@
static inline struct blk_mq_ctx *__blk_mq_get_ctx(struct request_queue *q,
unsigned int cpu)
@@ -3778,9 +3778,9 @@ diff -Nur linux-4.4.38.orig/block/blk-mq.h linux-4.4.38/block/blk-mq.h
}
struct blk_mq_alloc_data {
-diff -Nur linux-4.4.38.orig/block/blk-softirq.c linux-4.4.38/block/blk-softirq.c
---- linux-4.4.38.orig/block/blk-softirq.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/block/blk-softirq.c 2017-01-01 21:00:18.949669606 +0100
+diff -Nur linux-4.4.46.orig/block/blk-softirq.c linux-4.4.46/block/blk-softirq.c
+--- linux-4.4.46.orig/block/blk-softirq.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/block/blk-softirq.c 2017-02-03 17:18:05.667415866 +0100
@@ -51,6 +51,7 @@
raise_softirq_irqoff(BLOCK_SOFTIRQ);
@@ -3805,9 +3805,9 @@ diff -Nur linux-4.4.38.orig/block/blk-softirq.c linux-4.4.38/block/blk-softirq.c
}
/**
-diff -Nur linux-4.4.38.orig/block/bounce.c linux-4.4.38/block/bounce.c
---- linux-4.4.38.orig/block/bounce.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/block/bounce.c 2017-01-01 21:00:18.949669606 +0100
+diff -Nur linux-4.4.46.orig/block/bounce.c linux-4.4.46/block/bounce.c
+--- linux-4.4.46.orig/block/bounce.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/block/bounce.c 2017-02-03 17:18:05.667415866 +0100
@@ -55,11 +55,11 @@
unsigned long flags;
unsigned char *vto;
@@ -3822,9 +3822,9 @@ diff -Nur linux-4.4.38.orig/block/bounce.c linux-4.4.38/block/bounce.c
}
#else /* CONFIG_HIGHMEM */
-diff -Nur linux-4.4.38.orig/crypto/algapi.c linux-4.4.38/crypto/algapi.c
---- linux-4.4.38.orig/crypto/algapi.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/crypto/algapi.c 2017-01-01 21:00:18.957670120 +0100
+diff -Nur linux-4.4.46.orig/crypto/algapi.c linux-4.4.46/crypto/algapi.c
+--- linux-4.4.46.orig/crypto/algapi.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/crypto/algapi.c 2017-02-03 17:18:05.667415866 +0100
@@ -719,13 +719,13 @@
int crypto_register_notifier(struct notifier_block *nb)
@@ -3841,9 +3841,9 @@ diff -Nur linux-4.4.38.orig/crypto/algapi.c linux-4.4.38/crypto/algapi.c
}
EXPORT_SYMBOL_GPL(crypto_unregister_notifier);
-diff -Nur linux-4.4.38.orig/crypto/api.c linux-4.4.38/crypto/api.c
---- linux-4.4.38.orig/crypto/api.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/crypto/api.c 2017-01-01 21:00:18.961670377 +0100
+diff -Nur linux-4.4.46.orig/crypto/api.c linux-4.4.46/crypto/api.c
+--- linux-4.4.46.orig/crypto/api.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/crypto/api.c 2017-02-03 17:18:05.671416021 +0100
@@ -31,7 +31,7 @@
DECLARE_RWSEM(crypto_alg_sem);
EXPORT_SYMBOL_GPL(crypto_alg_sem);
@@ -3866,9 +3866,9 @@ diff -Nur linux-4.4.38.orig/crypto/api.c linux-4.4.38/crypto/api.c
}
return ok;
-diff -Nur linux-4.4.38.orig/crypto/internal.h linux-4.4.38/crypto/internal.h
---- linux-4.4.38.orig/crypto/internal.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/crypto/internal.h 2017-01-01 21:00:18.969670888 +0100
+diff -Nur linux-4.4.46.orig/crypto/internal.h linux-4.4.46/crypto/internal.h
+--- linux-4.4.46.orig/crypto/internal.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/crypto/internal.h 2017-02-03 17:18:05.671416021 +0100
@@ -47,7 +47,7 @@
extern struct list_head crypto_alg_list;
@@ -3887,9 +3887,9 @@ diff -Nur linux-4.4.38.orig/crypto/internal.h linux-4.4.38/crypto/internal.h
}
#endif /* _CRYPTO_INTERNAL_H */
-diff -Nur linux-4.4.38.orig/Documentation/hwlat_detector.txt linux-4.4.38/Documentation/hwlat_detector.txt
---- linux-4.4.38.orig/Documentation/hwlat_detector.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.4.38/Documentation/hwlat_detector.txt 2017-01-01 21:00:17.761593288 +0100
+diff -Nur linux-4.4.46.orig/Documentation/hwlat_detector.txt linux-4.4.46/Documentation/hwlat_detector.txt
+--- linux-4.4.46.orig/Documentation/hwlat_detector.txt 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.4.46/Documentation/hwlat_detector.txt 2017-02-03 17:18:05.623414168 +0100
@@ -0,0 +1,64 @@
+Introduction:
+-------------
@@ -3955,9 +3955,9 @@ diff -Nur linux-4.4.38.orig/Documentation/hwlat_detector.txt linux-4.4.38/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.4.38.orig/Documentation/kernel-parameters.txt linux-4.4.38/Documentation/kernel-parameters.txt
---- linux-4.4.38.orig/Documentation/kernel-parameters.txt 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/Documentation/kernel-parameters.txt 2017-01-01 21:00:17.797595605 +0100
+diff -Nur linux-4.4.46.orig/Documentation/kernel-parameters.txt linux-4.4.46/Documentation/kernel-parameters.txt
+--- linux-4.4.46.orig/Documentation/kernel-parameters.txt 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/Documentation/kernel-parameters.txt 2017-02-03 17:18:05.623414168 +0100
@@ -1636,6 +1636,15 @@
ip= [IP_PNP]
See Documentation/filesystems/nfs/nfsroot.txt.
@@ -3974,9 +3974,9 @@ diff -Nur linux-4.4.38.orig/Documentation/kernel-parameters.txt linux-4.4.38/Doc
irqfixup [HW]
When an interrupt is not handled search all handlers
for it. Intended to get systems with badly broken
-diff -Nur linux-4.4.38.orig/Documentation/sysrq.txt linux-4.4.38/Documentation/sysrq.txt
---- linux-4.4.38.orig/Documentation/sysrq.txt 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/Documentation/sysrq.txt 2017-01-01 21:00:17.809596371 +0100
+diff -Nur linux-4.4.46.orig/Documentation/sysrq.txt linux-4.4.46/Documentation/sysrq.txt
+--- linux-4.4.46.orig/Documentation/sysrq.txt 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/Documentation/sysrq.txt 2017-02-03 17:18:05.623414168 +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.
@@ -3997,9 +3997,9 @@ diff -Nur linux-4.4.38.orig/Documentation/sysrq.txt linux-4.4.38/Documentation/s
* What are the 'command' keys?
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
'b' - Will immediately reboot the system without syncing or unmounting
-diff -Nur linux-4.4.38.orig/Documentation/trace/histograms.txt linux-4.4.38/Documentation/trace/histograms.txt
---- linux-4.4.38.orig/Documentation/trace/histograms.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.4.38/Documentation/trace/histograms.txt 2017-01-01 21:00:17.833597913 +0100
+diff -Nur linux-4.4.46.orig/Documentation/trace/histograms.txt linux-4.4.46/Documentation/trace/histograms.txt
+--- linux-4.4.46.orig/Documentation/trace/histograms.txt 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.4.46/Documentation/trace/histograms.txt 2017-02-03 17:18:05.623414168 +0100
@@ -0,0 +1,186 @@
+ Using the Linux Kernel Latency Histograms
+
@@ -4187,9 +4187,9 @@ diff -Nur linux-4.4.38.orig/Documentation/trace/histograms.txt linux-4.4.38/Docu
+is provided.
+
+These data are also reset when the wakeup histogram is reset.
-diff -Nur linux-4.4.38.orig/drivers/acpi/acpica/acglobal.h linux-4.4.38/drivers/acpi/acpica/acglobal.h
---- linux-4.4.38.orig/drivers/acpi/acpica/acglobal.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/acpi/acpica/acglobal.h 2017-01-01 21:00:18.981671661 +0100
+diff -Nur linux-4.4.46.orig/drivers/acpi/acpica/acglobal.h linux-4.4.46/drivers/acpi/acpica/acglobal.h
+--- linux-4.4.46.orig/drivers/acpi/acpica/acglobal.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/acpi/acpica/acglobal.h 2017-02-03 17:18:05.671416021 +0100
@@ -116,7 +116,7 @@
* interrupt level
*/
@@ -4199,9 +4199,9 @@ diff -Nur linux-4.4.38.orig/drivers/acpi/acpica/acglobal.h linux-4.4.38/drivers/
ACPI_GLOBAL(acpi_spinlock, acpi_gbl_reference_count_lock);
/* Mutex for _OSI support */
-diff -Nur linux-4.4.38.orig/drivers/acpi/acpica/hwregs.c linux-4.4.38/drivers/acpi/acpica/hwregs.c
---- linux-4.4.38.orig/drivers/acpi/acpica/hwregs.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/acpi/acpica/hwregs.c 2017-01-01 21:00:18.989672175 +0100
+diff -Nur linux-4.4.46.orig/drivers/acpi/acpica/hwregs.c linux-4.4.46/drivers/acpi/acpica/hwregs.c
+--- linux-4.4.46.orig/drivers/acpi/acpica/hwregs.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/acpi/acpica/hwregs.c 2017-02-03 17:18:05.671416021 +0100
@@ -269,14 +269,14 @@
ACPI_BITMASK_ALL_FIXED_STATUS,
ACPI_FORMAT_UINT64(acpi_gbl_xpm1a_status.address)));
@@ -4219,9 +4219,9 @@ diff -Nur linux-4.4.38.orig/drivers/acpi/acpica/hwregs.c linux-4.4.38/drivers/ac
if (ACPI_FAILURE(status)) {
goto exit;
-diff -Nur linux-4.4.38.orig/drivers/acpi/acpica/hwxface.c linux-4.4.38/drivers/acpi/acpica/hwxface.c
---- linux-4.4.38.orig/drivers/acpi/acpica/hwxface.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/acpi/acpica/hwxface.c 2017-01-01 21:00:18.989672175 +0100
+diff -Nur linux-4.4.46.orig/drivers/acpi/acpica/hwxface.c linux-4.4.46/drivers/acpi/acpica/hwxface.c
+--- linux-4.4.46.orig/drivers/acpi/acpica/hwxface.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/acpi/acpica/hwxface.c 2017-02-03 17:18:05.671416021 +0100
@@ -374,7 +374,7 @@
return_ACPI_STATUS(AE_BAD_PARAMETER);
}
@@ -4240,9 +4240,9 @@ diff -Nur linux-4.4.38.orig/drivers/acpi/acpica/hwxface.c linux-4.4.38/drivers/a
return_ACPI_STATUS(status);
}
-diff -Nur linux-4.4.38.orig/drivers/acpi/acpica/utmutex.c linux-4.4.38/drivers/acpi/acpica/utmutex.c
---- linux-4.4.38.orig/drivers/acpi/acpica/utmutex.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/acpi/acpica/utmutex.c 2017-01-01 21:00:18.997672689 +0100
+diff -Nur linux-4.4.46.orig/drivers/acpi/acpica/utmutex.c linux-4.4.46/drivers/acpi/acpica/utmutex.c
+--- linux-4.4.46.orig/drivers/acpi/acpica/utmutex.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/acpi/acpica/utmutex.c 2017-02-03 17:18:05.671416021 +0100
@@ -88,7 +88,7 @@
return_ACPI_STATUS (status);
}
@@ -4261,9 +4261,9 @@ diff -Nur linux-4.4.38.orig/drivers/acpi/acpica/utmutex.c linux-4.4.38/drivers/a
acpi_os_delete_lock(acpi_gbl_reference_count_lock);
/* Delete the reader/writer lock */
-diff -Nur linux-4.4.38.orig/drivers/ata/libata-sff.c linux-4.4.38/drivers/ata/libata-sff.c
---- linux-4.4.38.orig/drivers/ata/libata-sff.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/ata/libata-sff.c 2017-01-01 21:00:19.017673971 +0100
+diff -Nur linux-4.4.46.orig/drivers/ata/libata-sff.c linux-4.4.46/drivers/ata/libata-sff.c
+--- linux-4.4.46.orig/drivers/ata/libata-sff.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/ata/libata-sff.c 2017-02-03 17:18:05.671416021 +0100
@@ -678,9 +678,9 @@
unsigned long flags;
unsigned int consumed;
@@ -4312,9 +4312,9 @@ diff -Nur linux-4.4.38.orig/drivers/ata/libata-sff.c linux-4.4.38/drivers/ata/li
} else {
buf = page_address(page);
consumed = ap->ops->sff_data_xfer(dev, buf + offset,
-diff -Nur linux-4.4.38.orig/drivers/block/zram/zram_drv.c linux-4.4.38/drivers/block/zram/zram_drv.c
---- linux-4.4.38.orig/drivers/block/zram/zram_drv.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/block/zram/zram_drv.c 2017-01-01 21:00:19.033675005 +0100
+diff -Nur linux-4.4.46.orig/drivers/block/zram/zram_drv.c linux-4.4.46/drivers/block/zram/zram_drv.c
+--- linux-4.4.46.orig/drivers/block/zram/zram_drv.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/block/zram/zram_drv.c 2017-02-03 17:18:05.671416021 +0100
@@ -520,6 +520,8 @@
goto out_error;
}
@@ -4418,9 +4418,9 @@ diff -Nur linux-4.4.38.orig/drivers/block/zram/zram_drv.c linux-4.4.38/drivers/b
atomic64_inc(&zram->stats.notify_free);
}
-diff -Nur linux-4.4.38.orig/drivers/block/zram/zram_drv.h linux-4.4.38/drivers/block/zram/zram_drv.h
---- linux-4.4.38.orig/drivers/block/zram/zram_drv.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/block/zram/zram_drv.h 2017-01-01 21:00:19.037675258 +0100
+diff -Nur linux-4.4.46.orig/drivers/block/zram/zram_drv.h linux-4.4.46/drivers/block/zram/zram_drv.h
+--- linux-4.4.46.orig/drivers/block/zram/zram_drv.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/block/zram/zram_drv.h 2017-02-03 17:18:05.671416021 +0100
@@ -72,6 +72,9 @@
struct zram_table_entry {
unsigned long handle;
@@ -4474,9 +4474,9 @@ diff -Nur linux-4.4.38.orig/drivers/block/zram/zram_drv.h linux-4.4.38/drivers/b
+#endif /* CONFIG_PREEMPT_RT_BASE */
+
#endif
-diff -Nur linux-4.4.38.orig/drivers/char/random.c linux-4.4.38/drivers/char/random.c
---- linux-4.4.38.orig/drivers/char/random.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/char/random.c 2017-01-01 21:00:19.045675772 +0100
+diff -Nur linux-4.4.46.orig/drivers/char/random.c linux-4.4.46/drivers/char/random.c
+--- linux-4.4.46.orig/drivers/char/random.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/char/random.c 2017-02-03 17:18:05.671416021 +0100
@@ -799,8 +799,6 @@
} sample;
long delta, delta2, delta3;
@@ -4528,9 +4528,9 @@ diff -Nur linux-4.4.38.orig/drivers/char/random.c linux-4.4.38/drivers/char/rand
fast_mix(fast_pool);
add_interrupt_bench(cycles);
-diff -Nur linux-4.4.38.orig/drivers/clk/at91/clk-generated.c linux-4.4.38/drivers/clk/at91/clk-generated.c
---- linux-4.4.38.orig/drivers/clk/at91/clk-generated.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/clk/at91/clk-generated.c 2017-01-01 21:00:19.053676286 +0100
+diff -Nur linux-4.4.46.orig/drivers/clk/at91/clk-generated.c linux-4.4.46/drivers/clk/at91/clk-generated.c
+--- linux-4.4.46.orig/drivers/clk/at91/clk-generated.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/clk/at91/clk-generated.c 2017-02-03 17:18:05.671416021 +0100
@@ -15,8 +15,8 @@
#include <linux/clkdev.h>
#include <linux/clk/at91_pmc.h>
@@ -4718,9 +4718,9 @@ diff -Nur linux-4.4.38.orig/drivers/clk/at91/clk-generated.c linux-4.4.38/driver
}
+CLK_OF_DECLARE(of_sama5d2_clk_generated_setup, "atmel,sama5d2-clk-generated",
+ of_sama5d2_clk_generated_setup);
-diff -Nur linux-4.4.38.orig/drivers/clk/at91/clk-h32mx.c linux-4.4.38/drivers/clk/at91/clk-h32mx.c
---- linux-4.4.38.orig/drivers/clk/at91/clk-h32mx.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/clk/at91/clk-h32mx.c 2017-01-01 21:00:19.053676286 +0100
+diff -Nur linux-4.4.46.orig/drivers/clk/at91/clk-h32mx.c linux-4.4.46/drivers/clk/at91/clk-h32mx.c
+--- linux-4.4.46.orig/drivers/clk/at91/clk-h32mx.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/clk/at91/clk-h32mx.c 2017-02-03 17:18:05.671416021 +0100
@@ -15,15 +15,9 @@
#include <linux/clk-provider.h>
#include <linux/clkdev.h>
@@ -4820,9 +4820,9 @@ diff -Nur linux-4.4.38.orig/drivers/clk/at91/clk-h32mx.c linux-4.4.38/drivers/cl
}
+CLK_OF_DECLARE(of_sama5d4_clk_h32mx_setup, "atmel,sama5d4-clk-h32mx",
+ of_sama5d4_clk_h32mx_setup);
-diff -Nur linux-4.4.38.orig/drivers/clk/at91/clk-main.c linux-4.4.38/drivers/clk/at91/clk-main.c
---- linux-4.4.38.orig/drivers/clk/at91/clk-main.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/clk/at91/clk-main.c 2017-01-01 21:00:19.057676547 +0100
+diff -Nur linux-4.4.46.orig/drivers/clk/at91/clk-main.c linux-4.4.46/drivers/clk/at91/clk-main.c
+--- linux-4.4.46.orig/drivers/clk/at91/clk-main.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/clk/at91/clk-main.c 2017-02-03 17:18:05.671416021 +0100
@@ -13,13 +13,8 @@
#include <linux/clk/at91_pmc.h>
#include <linux/delay.h>
@@ -5524,9 +5524,9 @@ diff -Nur linux-4.4.38.orig/drivers/clk/at91/clk-main.c linux-4.4.38/drivers/clk
}
+CLK_OF_DECLARE(at91sam9x5_clk_main, "atmel,at91sam9x5-clk-main",
+ of_at91sam9x5_clk_main_setup);
-diff -Nur linux-4.4.38.orig/drivers/clk/at91/clk-master.c linux-4.4.38/drivers/clk/at91/clk-master.c
---- linux-4.4.38.orig/drivers/clk/at91/clk-master.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/clk/at91/clk-master.c 2017-01-01 21:00:19.057676547 +0100
+diff -Nur linux-4.4.46.orig/drivers/clk/at91/clk-master.c linux-4.4.46/drivers/clk/at91/clk-master.c
+--- linux-4.4.46.orig/drivers/clk/at91/clk-master.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/clk/at91/clk-master.c 2017-02-03 17:18:05.671416021 +0100
@@ -12,13 +12,8 @@
#include <linux/clkdev.h>
#include <linux/clk/at91_pmc.h>
@@ -5731,9 +5731,9 @@ diff -Nur linux-4.4.38.orig/drivers/clk/at91/clk-master.c linux-4.4.38/drivers/c
}
+CLK_OF_DECLARE(at91sam9x5_clk_master, "atmel,at91sam9x5-clk-master",
+ of_at91sam9x5_clk_master_setup);
-diff -Nur linux-4.4.38.orig/drivers/clk/at91/clk-peripheral.c linux-4.4.38/drivers/clk/at91/clk-peripheral.c
---- linux-4.4.38.orig/drivers/clk/at91/clk-peripheral.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/clk/at91/clk-peripheral.c 2017-01-01 21:00:19.057676547 +0100
+diff -Nur linux-4.4.46.orig/drivers/clk/at91/clk-peripheral.c linux-4.4.46/drivers/clk/at91/clk-peripheral.c
+--- linux-4.4.46.orig/drivers/clk/at91/clk-peripheral.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/clk/at91/clk-peripheral.c 2017-02-03 17:18:05.671416021 +0100
@@ -12,11 +12,13 @@
#include <linux/clkdev.h>
#include <linux/clk/at91_pmc.h>
@@ -6060,9 +6060,9 @@ diff -Nur linux-4.4.38.orig/drivers/clk/at91/clk-peripheral.c linux-4.4.38/drive
}
+CLK_OF_DECLARE(at91sam9x5_clk_periph, "atmel,at91sam9x5-clk-peripheral",
+ of_at91sam9x5_clk_periph_setup);
-diff -Nur linux-4.4.38.orig/drivers/clk/at91/clk-pll.c linux-4.4.38/drivers/clk/at91/clk-pll.c
---- linux-4.4.38.orig/drivers/clk/at91/clk-pll.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/clk/at91/clk-pll.c 2017-01-01 21:00:19.061676800 +0100
+diff -Nur linux-4.4.46.orig/drivers/clk/at91/clk-pll.c linux-4.4.46/drivers/clk/at91/clk-pll.c
+--- linux-4.4.46.orig/drivers/clk/at91/clk-pll.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/clk/at91/clk-pll.c 2017-02-03 17:18:05.671416021 +0100
@@ -12,14 +12,8 @@
#include <linux/clkdev.h>
#include <linux/clk/at91_pmc.h>
@@ -6346,9 +6346,9 @@ diff -Nur linux-4.4.38.orig/drivers/clk/at91/clk-pll.c linux-4.4.38/drivers/clk/
}
+CLK_OF_DECLARE(sama5d3_clk_pll, "atmel,sama5d3-clk-pll",
+ of_sama5d3_clk_pll_setup);
-diff -Nur linux-4.4.38.orig/drivers/clk/at91/clk-plldiv.c linux-4.4.38/drivers/clk/at91/clk-plldiv.c
---- linux-4.4.38.orig/drivers/clk/at91/clk-plldiv.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/clk/at91/clk-plldiv.c 2017-01-01 21:00:19.061676800 +0100
+diff -Nur linux-4.4.46.orig/drivers/clk/at91/clk-plldiv.c linux-4.4.46/drivers/clk/at91/clk-plldiv.c
+--- linux-4.4.46.orig/drivers/clk/at91/clk-plldiv.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/clk/at91/clk-plldiv.c 2017-02-03 17:18:05.671416021 +0100
@@ -12,8 +12,8 @@
#include <linux/clkdev.h>
#include <linux/clk/at91_pmc.h>
@@ -6458,9 +6458,9 @@ diff -Nur linux-4.4.38.orig/drivers/clk/at91/clk-plldiv.c linux-4.4.38/drivers/c
-}
+CLK_OF_DECLARE(at91sam9x5_clk_plldiv, "atmel,at91sam9x5-clk-plldiv",
+ of_at91sam9x5_clk_plldiv_setup);
-diff -Nur linux-4.4.38.orig/drivers/clk/at91/clk-programmable.c linux-4.4.38/drivers/clk/at91/clk-programmable.c
---- linux-4.4.38.orig/drivers/clk/at91/clk-programmable.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/clk/at91/clk-programmable.c 2017-01-01 21:00:19.061676800 +0100
+diff -Nur linux-4.4.46.orig/drivers/clk/at91/clk-programmable.c linux-4.4.46/drivers/clk/at91/clk-programmable.c
+--- linux-4.4.46.orig/drivers/clk/at91/clk-programmable.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/clk/at91/clk-programmable.c 2017-02-03 17:18:05.675416176 +0100
@@ -12,10 +12,8 @@
#include <linux/clkdev.h>
#include <linux/clk/at91_pmc.h>
@@ -6684,9 +6684,9 @@ diff -Nur linux-4.4.38.orig/drivers/clk/at91/clk-programmable.c linux-4.4.38/dri
}
+CLK_OF_DECLARE(at91sam9x5_clk_prog, "atmel,at91sam9x5-clk-programmable",
+ of_at91sam9x5_clk_prog_setup);
-diff -Nur linux-4.4.38.orig/drivers/clk/at91/clk-slow.c linux-4.4.38/drivers/clk/at91/clk-slow.c
---- linux-4.4.38.orig/drivers/clk/at91/clk-slow.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/clk/at91/clk-slow.c 2017-01-01 21:00:19.061676800 +0100
+diff -Nur linux-4.4.46.orig/drivers/clk/at91/clk-slow.c linux-4.4.46/drivers/clk/at91/clk-slow.c
+--- linux-4.4.46.orig/drivers/clk/at91/clk-slow.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/clk/at91/clk-slow.c 2017-02-03 17:18:05.675416176 +0100
@@ -13,17 +13,11 @@
#include <linux/clk.h>
#include <linux/clk-provider.h>
@@ -6794,9 +6794,9 @@ diff -Nur linux-4.4.38.orig/drivers/clk/at91/clk-slow.c linux-4.4.38/drivers/clk
/*
* FIXME: All slow clk users are not properly claiming it (get + prepare +
-diff -Nur linux-4.4.38.orig/drivers/clk/at91/clk-smd.c linux-4.4.38/drivers/clk/at91/clk-smd.c
---- linux-4.4.38.orig/drivers/clk/at91/clk-smd.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/clk/at91/clk-smd.c 2017-01-01 21:00:19.061676800 +0100
+diff -Nur linux-4.4.46.orig/drivers/clk/at91/clk-smd.c linux-4.4.46/drivers/clk/at91/clk-smd.c
+--- linux-4.4.46.orig/drivers/clk/at91/clk-smd.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/clk/at91/clk-smd.c 2017-02-03 17:18:05.675416176 +0100
@@ -12,8 +12,8 @@
#include <linux/clkdev.h>
#include <linux/clk/at91_pmc.h>
@@ -6940,9 +6940,9 @@ diff -Nur linux-4.4.38.orig/drivers/clk/at91/clk-smd.c linux-4.4.38/drivers/clk/
}
+CLK_OF_DECLARE(at91sam9x5_clk_smd, "atmel,at91sam9x5-clk-smd",
+ of_at91sam9x5_clk_smd_setup);
-diff -Nur linux-4.4.38.orig/drivers/clk/at91/clk-system.c linux-4.4.38/drivers/clk/at91/clk-system.c
---- linux-4.4.38.orig/drivers/clk/at91/clk-system.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/clk/at91/clk-system.c 2017-01-01 21:00:19.061676800 +0100
+diff -Nur linux-4.4.46.orig/drivers/clk/at91/clk-system.c linux-4.4.46/drivers/clk/at91/clk-system.c
+--- linux-4.4.46.orig/drivers/clk/at91/clk-system.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/clk/at91/clk-system.c 2017-02-03 17:18:05.675416176 +0100
@@ -12,13 +12,8 @@
#include <linux/clkdev.h>
#include <linux/clk/at91_pmc.h>
@@ -7140,9 +7140,9 @@ diff -Nur linux-4.4.38.orig/drivers/clk/at91/clk-system.c linux-4.4.38/drivers/c
-}
+CLK_OF_DECLARE(at91rm9200_clk_sys, "atmel,at91rm9200-clk-system",
+ of_at91rm9200_clk_sys_setup);
-diff -Nur linux-4.4.38.orig/drivers/clk/at91/clk-usb.c linux-4.4.38/drivers/clk/at91/clk-usb.c
---- linux-4.4.38.orig/drivers/clk/at91/clk-usb.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/clk/at91/clk-usb.c 2017-01-01 21:00:19.065677061 +0100
+diff -Nur linux-4.4.46.orig/drivers/clk/at91/clk-usb.c linux-4.4.46/drivers/clk/at91/clk-usb.c
+--- linux-4.4.46.orig/drivers/clk/at91/clk-usb.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/clk/at91/clk-usb.c 2017-02-03 17:18:05.675416176 +0100
@@ -12,8 +12,8 @@
#include <linux/clkdev.h>
#include <linux/clk/at91_pmc.h>
@@ -7471,9 +7471,9 @@ diff -Nur linux-4.4.38.orig/drivers/clk/at91/clk-usb.c linux-4.4.38/drivers/clk/
}
+CLK_OF_DECLARE(at91rm9200_clk_usb, "atmel,at91rm9200-clk-usb",
+ of_at91rm9200_clk_usb_setup);
-diff -Nur linux-4.4.38.orig/drivers/clk/at91/clk-utmi.c linux-4.4.38/drivers/clk/at91/clk-utmi.c
---- linux-4.4.38.orig/drivers/clk/at91/clk-utmi.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/clk/at91/clk-utmi.c 2017-01-01 21:00:19.065677061 +0100
+diff -Nur linux-4.4.46.orig/drivers/clk/at91/clk-utmi.c linux-4.4.46/drivers/clk/at91/clk-utmi.c
+--- linux-4.4.46.orig/drivers/clk/at91/clk-utmi.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/clk/at91/clk-utmi.c 2017-02-03 17:18:05.675416176 +0100
@@ -11,14 +11,9 @@
#include <linux/clk-provider.h>
#include <linux/clkdev.h>
@@ -7636,9 +7636,9 @@ diff -Nur linux-4.4.38.orig/drivers/clk/at91/clk-utmi.c linux-4.4.38/drivers/clk
-}
+CLK_OF_DECLARE(at91sam9x5_clk_utmi, "atmel,at91sam9x5-clk-utmi",
+ of_at91sam9x5_clk_utmi_setup);
-diff -Nur linux-4.4.38.orig/drivers/clk/at91/pmc.c linux-4.4.38/drivers/clk/at91/pmc.c
---- linux-4.4.38.orig/drivers/clk/at91/pmc.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/clk/at91/pmc.c 2017-01-01 21:00:19.065677061 +0100
+diff -Nur linux-4.4.46.orig/drivers/clk/at91/pmc.c linux-4.4.46/drivers/clk/at91/pmc.c
+--- linux-4.4.46.orig/drivers/clk/at91/pmc.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/clk/at91/pmc.c 2017-02-03 17:18:05.675416176 +0100
@@ -12,36 +12,13 @@
#include <linux/clkdev.h>
#include <linux/clk/at91_pmc.h>
@@ -8081,9 +8081,9 @@ diff -Nur linux-4.4.38.orig/drivers/clk/at91/pmc.c linux-4.4.38/drivers/clk/at91
-}
-CLK_OF_DECLARE(sama5d3_clk_pmc, "atmel,sama5d3-pmc",
- of_sama5d3_pmc_setup);
-diff -Nur linux-4.4.38.orig/drivers/clk/at91/pmc.h linux-4.4.38/drivers/clk/at91/pmc.h
---- linux-4.4.38.orig/drivers/clk/at91/pmc.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/clk/at91/pmc.h 2017-01-01 21:00:19.065677061 +0100
+diff -Nur linux-4.4.46.orig/drivers/clk/at91/pmc.h linux-4.4.46/drivers/clk/at91/pmc.h
+--- linux-4.4.46.orig/drivers/clk/at91/pmc.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/clk/at91/pmc.h 2017-02-03 17:18:05.675416176 +0100
@@ -14,8 +14,11 @@
#include <linux/io.h>
@@ -8199,9 +8199,9 @@ diff -Nur linux-4.4.38.orig/drivers/clk/at91/pmc.h linux-4.4.38/drivers/clk/at91
- struct at91_pmc *pmc);
-
#endif /* __PMC_H_ */
-diff -Nur linux-4.4.38.orig/drivers/clocksource/tcb_clksrc.c linux-4.4.38/drivers/clocksource/tcb_clksrc.c
---- linux-4.4.38.orig/drivers/clocksource/tcb_clksrc.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/clocksource/tcb_clksrc.c 2017-01-01 21:00:19.077677831 +0100
+diff -Nur linux-4.4.46.orig/drivers/clocksource/tcb_clksrc.c linux-4.4.46/drivers/clocksource/tcb_clksrc.c
+--- linux-4.4.46.orig/drivers/clocksource/tcb_clksrc.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/clocksource/tcb_clksrc.c 2017-02-03 17:18:05.675416176 +0100
@@ -23,8 +23,7 @@
* this 32 bit free-running counter. the second channel is not used.
*
@@ -8359,9 +8359,9 @@ diff -Nur linux-4.4.38.orig/drivers/clocksource/tcb_clksrc.c linux-4.4.38/driver
if (ret)
goto err_unregister_clksrc;
-diff -Nur linux-4.4.38.orig/drivers/clocksource/timer-atmel-pit.c linux-4.4.38/drivers/clocksource/timer-atmel-pit.c
---- linux-4.4.38.orig/drivers/clocksource/timer-atmel-pit.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/clocksource/timer-atmel-pit.c 2017-01-01 21:00:19.077677831 +0100
+diff -Nur linux-4.4.46.orig/drivers/clocksource/timer-atmel-pit.c linux-4.4.46/drivers/clocksource/timer-atmel-pit.c
+--- linux-4.4.46.orig/drivers/clocksource/timer-atmel-pit.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/clocksource/timer-atmel-pit.c 2017-02-03 17:18:05.675416176 +0100
@@ -46,6 +46,7 @@
u32 cycle;
u32 cnt;
@@ -8422,9 +8422,9 @@ diff -Nur linux-4.4.38.orig/drivers/clocksource/timer-atmel-pit.c linux-4.4.38/d
/* Set up and register clockevents */
data->clkevt.name = "pit";
data->clkevt.features = CLOCK_EVT_FEAT_PERIODIC;
-diff -Nur linux-4.4.38.orig/drivers/clocksource/timer-atmel-st.c linux-4.4.38/drivers/clocksource/timer-atmel-st.c
---- linux-4.4.38.orig/drivers/clocksource/timer-atmel-st.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/clocksource/timer-atmel-st.c 2017-01-01 21:00:19.077677831 +0100
+diff -Nur linux-4.4.46.orig/drivers/clocksource/timer-atmel-st.c linux-4.4.46/drivers/clocksource/timer-atmel-st.c
+--- linux-4.4.46.orig/drivers/clocksource/timer-atmel-st.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/clocksource/timer-atmel-st.c 2017-02-03 17:18:05.675416176 +0100
@@ -115,18 +115,29 @@
last_crtr = read_CRTR();
}
@@ -8501,9 +8501,9 @@ diff -Nur linux-4.4.38.orig/drivers/clocksource/timer-atmel-st.c linux-4.4.38/dr
sclk = of_clk_get(node, 0);
if (IS_ERR(sclk))
panic(pr_fmt("Unable to get slow clock\n"));
-diff -Nur linux-4.4.38.orig/drivers/cpufreq/Kconfig.x86 linux-4.4.38/drivers/cpufreq/Kconfig.x86
---- linux-4.4.38.orig/drivers/cpufreq/Kconfig.x86 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/cpufreq/Kconfig.x86 2017-01-01 21:00:19.081678082 +0100
+diff -Nur linux-4.4.46.orig/drivers/cpufreq/Kconfig.x86 linux-4.4.46/drivers/cpufreq/Kconfig.x86
+--- linux-4.4.46.orig/drivers/cpufreq/Kconfig.x86 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/cpufreq/Kconfig.x86 2017-02-03 17:18:05.675416176 +0100
@@ -123,7 +123,7 @@
config X86_POWERNOW_K8
@@ -8513,9 +8513,9 @@ diff -Nur linux-4.4.38.orig/drivers/cpufreq/Kconfig.x86 linux-4.4.38/drivers/cpu
help
This adds the CPUFreq driver for K8/early Opteron/Athlon64 processors.
Support for K10 and newer processors is now in acpi-cpufreq.
-diff -Nur linux-4.4.38.orig/drivers/cpuidle/coupled.c linux-4.4.38/drivers/cpuidle/coupled.c
---- linux-4.4.38.orig/drivers/cpuidle/coupled.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/cpuidle/coupled.c 2017-01-01 21:00:19.089678602 +0100
+diff -Nur linux-4.4.46.orig/drivers/cpuidle/coupled.c linux-4.4.46/drivers/cpuidle/coupled.c
+--- linux-4.4.46.orig/drivers/cpuidle/coupled.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/cpuidle/coupled.c 2017-02-03 17:18:05.675416176 +0100
@@ -119,7 +119,6 @@
#define CPUIDLE_COUPLED_NOT_IDLE (-1)
@@ -8524,9 +8524,9 @@ diff -Nur linux-4.4.38.orig/drivers/cpuidle/coupled.c linux-4.4.38/drivers/cpuid
static DEFINE_PER_CPU(struct call_single_data, cpuidle_coupled_poke_cb);
/*
-diff -Nur linux-4.4.38.orig/drivers/gpu/drm/i915/i915_gem_execbuffer.c linux-4.4.38/drivers/gpu/drm/i915/i915_gem_execbuffer.c
---- linux-4.4.38.orig/drivers/gpu/drm/i915/i915_gem_execbuffer.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/gpu/drm/i915/i915_gem_execbuffer.c 2017-01-01 21:00:19.105679630 +0100
+diff -Nur linux-4.4.46.orig/drivers/gpu/drm/i915/i915_gem_execbuffer.c linux-4.4.46/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+--- linux-4.4.46.orig/drivers/gpu/drm/i915/i915_gem_execbuffer.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/gpu/drm/i915/i915_gem_execbuffer.c 2017-02-03 17:18:05.675416176 +0100
@@ -1264,7 +1264,9 @@
if (ret)
return ret;
@@ -8537,9 +8537,9 @@ diff -Nur linux-4.4.38.orig/drivers/gpu/drm/i915/i915_gem_execbuffer.c linux-4.4
i915_gem_execbuffer_move_to_active(vmas, params->request);
i915_gem_execbuffer_retire_commands(params);
-diff -Nur linux-4.4.38.orig/drivers/gpu/drm/i915/i915_gem_shrinker.c linux-4.4.38/drivers/gpu/drm/i915/i915_gem_shrinker.c
---- linux-4.4.38.orig/drivers/gpu/drm/i915/i915_gem_shrinker.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/gpu/drm/i915/i915_gem_shrinker.c 2017-01-01 21:00:19.105679630 +0100
+diff -Nur linux-4.4.46.orig/drivers/gpu/drm/i915/i915_gem_shrinker.c linux-4.4.46/drivers/gpu/drm/i915/i915_gem_shrinker.c
+--- linux-4.4.46.orig/drivers/gpu/drm/i915/i915_gem_shrinker.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/gpu/drm/i915/i915_gem_shrinker.c 2017-02-03 17:18:05.675416176 +0100
@@ -39,7 +39,7 @@
if (!mutex_is_locked(mutex))
return false;
@@ -8549,9 +8549,9 @@ diff -Nur linux-4.4.38.orig/drivers/gpu/drm/i915/i915_gem_shrinker.c linux-4.4.3
return mutex->owner == task;
#else
/* Since UP may be pre-empted, we cannot assume that we own the lock */
-diff -Nur linux-4.4.38.orig/drivers/gpu/drm/i915/i915_irq.c linux-4.4.38/drivers/gpu/drm/i915/i915_irq.c
---- linux-4.4.38.orig/drivers/gpu/drm/i915/i915_irq.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/gpu/drm/i915/i915_irq.c 2017-01-01 21:00:19.129681173 +0100
+diff -Nur linux-4.4.46.orig/drivers/gpu/drm/i915/i915_irq.c linux-4.4.46/drivers/gpu/drm/i915/i915_irq.c
+--- linux-4.4.46.orig/drivers/gpu/drm/i915/i915_irq.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/gpu/drm/i915/i915_irq.c 2017-02-03 17:18:05.675416176 +0100
@@ -812,6 +812,7 @@
spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);
@@ -8568,9 +8568,9 @@ diff -Nur linux-4.4.38.orig/drivers/gpu/drm/i915/i915_irq.c linux-4.4.38/drivers
spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags);
-diff -Nur linux-4.4.38.orig/drivers/gpu/drm/i915/intel_display.c linux-4.4.38/drivers/gpu/drm/i915/intel_display.c
---- linux-4.4.38.orig/drivers/gpu/drm/i915/intel_display.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/gpu/drm/i915/intel_display.c 2017-01-01 21:00:19.169683741 +0100
+diff -Nur linux-4.4.46.orig/drivers/gpu/drm/i915/intel_display.c linux-4.4.46/drivers/gpu/drm/i915/intel_display.c
+--- linux-4.4.46.orig/drivers/gpu/drm/i915/intel_display.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/gpu/drm/i915/intel_display.c 2017-02-03 17:18:05.679416330 +0100
@@ -11400,7 +11400,7 @@
struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
struct intel_unpin_work *work;
@@ -8580,9 +8580,9 @@ diff -Nur linux-4.4.38.orig/drivers/gpu/drm/i915/intel_display.c linux-4.4.38/dr
if (crtc == NULL)
return;
-diff -Nur linux-4.4.38.orig/drivers/gpu/drm/i915/intel_sprite.c linux-4.4.38/drivers/gpu/drm/i915/intel_sprite.c
---- linux-4.4.38.orig/drivers/gpu/drm/i915/intel_sprite.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/gpu/drm/i915/intel_sprite.c 2017-01-01 21:00:19.185684770 +0100
+diff -Nur linux-4.4.46.orig/drivers/gpu/drm/i915/intel_sprite.c linux-4.4.46/drivers/gpu/drm/i915/intel_sprite.c
+--- linux-4.4.46.orig/drivers/gpu/drm/i915/intel_sprite.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/gpu/drm/i915/intel_sprite.c 2017-02-03 17:18:05.679416330 +0100
@@ -38,6 +38,7 @@
#include "intel_drv.h"
#include <drm/i915_drm.h>
@@ -8632,9 +8632,9 @@ diff -Nur linux-4.4.38.orig/drivers/gpu/drm/i915/intel_sprite.c linux-4.4.38/dri
if (crtc->debug.start_vbl_count &&
crtc->debug.start_vbl_count != end_vbl_count) {
-diff -Nur linux-4.4.38.orig/drivers/gpu/drm/radeon/radeon_display.c linux-4.4.38/drivers/gpu/drm/radeon/radeon_display.c
---- linux-4.4.38.orig/drivers/gpu/drm/radeon/radeon_display.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/gpu/drm/radeon/radeon_display.c 2017-01-01 21:00:19.197685537 +0100
+diff -Nur linux-4.4.46.orig/drivers/gpu/drm/radeon/radeon_display.c linux-4.4.46/drivers/gpu/drm/radeon/radeon_display.c
+--- linux-4.4.46.orig/drivers/gpu/drm/radeon/radeon_display.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/gpu/drm/radeon/radeon_display.c 2017-02-03 17:18:05.679416330 +0100
@@ -1862,6 +1862,7 @@
struct radeon_device *rdev = dev->dev_private;
@@ -8651,9 +8651,9 @@ diff -Nur linux-4.4.38.orig/drivers/gpu/drm/radeon/radeon_display.c linux-4.4.38
/* Decode into vertical and horizontal scanout position. */
*vpos = position & 0x1fff;
-diff -Nur linux-4.4.38.orig/drivers/hv/vmbus_drv.c linux-4.4.38/drivers/hv/vmbus_drv.c
---- linux-4.4.38.orig/drivers/hv/vmbus_drv.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/hv/vmbus_drv.c 2017-01-01 21:00:19.213686563 +0100
+diff -Nur linux-4.4.46.orig/drivers/hv/vmbus_drv.c linux-4.4.46/drivers/hv/vmbus_drv.c
+--- linux-4.4.46.orig/drivers/hv/vmbus_drv.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/hv/vmbus_drv.c 2017-02-03 17:18:05.679416330 +0100
@@ -820,7 +820,7 @@
tasklet_schedule(&msg_dpc);
}
@@ -8663,9 +8663,9 @@ diff -Nur linux-4.4.38.orig/drivers/hv/vmbus_drv.c linux-4.4.38/drivers/hv/vmbus
}
-diff -Nur linux-4.4.38.orig/drivers/i2c/busses/i2c-omap.c linux-4.4.38/drivers/i2c/busses/i2c-omap.c
---- linux-4.4.38.orig/drivers/i2c/busses/i2c-omap.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/i2c/busses/i2c-omap.c 2017-01-01 21:00:19.225687339 +0100
+diff -Nur linux-4.4.46.orig/drivers/i2c/busses/i2c-omap.c linux-4.4.46/drivers/i2c/busses/i2c-omap.c
+--- linux-4.4.46.orig/drivers/i2c/busses/i2c-omap.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/i2c/busses/i2c-omap.c 2017-02-03 17:18:05.679416330 +0100
@@ -995,15 +995,12 @@
u16 mask;
u16 stat;
@@ -8683,9 +8683,9 @@ diff -Nur linux-4.4.38.orig/drivers/i2c/busses/i2c-omap.c linux-4.4.38/drivers/i
return ret;
}
-diff -Nur linux-4.4.38.orig/drivers/ide/alim15x3.c linux-4.4.38/drivers/ide/alim15x3.c
---- linux-4.4.38.orig/drivers/ide/alim15x3.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/ide/alim15x3.c 2017-01-01 21:00:19.233687853 +0100
+diff -Nur linux-4.4.46.orig/drivers/ide/alim15x3.c linux-4.4.46/drivers/ide/alim15x3.c
+--- linux-4.4.46.orig/drivers/ide/alim15x3.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/ide/alim15x3.c 2017-02-03 17:18:05.679416330 +0100
@@ -234,7 +234,7 @@
isa_dev = pci_get_device(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1533, NULL);
@@ -8704,9 +8704,9 @@ diff -Nur linux-4.4.38.orig/drivers/ide/alim15x3.c linux-4.4.38/drivers/ide/alim
return 0;
}
-diff -Nur linux-4.4.38.orig/drivers/ide/hpt366.c linux-4.4.38/drivers/ide/hpt366.c
---- linux-4.4.38.orig/drivers/ide/hpt366.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/ide/hpt366.c 2017-01-01 21:00:19.237688106 +0100
+diff -Nur linux-4.4.46.orig/drivers/ide/hpt366.c linux-4.4.46/drivers/ide/hpt366.c
+--- linux-4.4.46.orig/drivers/ide/hpt366.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/ide/hpt366.c 2017-02-03 17:18:05.679416330 +0100
@@ -1241,7 +1241,7 @@
dma_old = inb(base + 2);
@@ -8725,9 +8725,9 @@ diff -Nur linux-4.4.38.orig/drivers/ide/hpt366.c linux-4.4.38/drivers/ide/hpt366
printk(KERN_INFO " %s: BM-DMA at 0x%04lx-0x%04lx\n",
hwif->name, base, base + 7);
-diff -Nur linux-4.4.38.orig/drivers/ide/ide-io.c linux-4.4.38/drivers/ide/ide-io.c
---- linux-4.4.38.orig/drivers/ide/ide-io.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/ide/ide-io.c 2017-01-01 21:00:19.253689134 +0100
+diff -Nur linux-4.4.46.orig/drivers/ide/ide-io.c linux-4.4.46/drivers/ide/ide-io.c
+--- linux-4.4.46.orig/drivers/ide/ide-io.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/ide/ide-io.c 2017-02-03 17:18:05.679416330 +0100
@@ -659,7 +659,7 @@
/* disable_irq_nosync ?? */
disable_irq(hwif->irq);
@@ -8737,9 +8737,9 @@ diff -Nur linux-4.4.38.orig/drivers/ide/ide-io.c linux-4.4.38/drivers/ide/ide-io
if (hwif->polling) {
startstop = handler(drive);
} else if (drive_is_ready(drive)) {
-diff -Nur linux-4.4.38.orig/drivers/ide/ide-iops.c linux-4.4.38/drivers/ide/ide-iops.c
---- linux-4.4.38.orig/drivers/ide/ide-iops.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/ide/ide-iops.c 2017-01-01 21:00:19.253689134 +0100
+diff -Nur linux-4.4.46.orig/drivers/ide/ide-iops.c linux-4.4.46/drivers/ide/ide-iops.c
+--- linux-4.4.46.orig/drivers/ide/ide-iops.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/ide/ide-iops.c 2017-02-03 17:18:05.679416330 +0100
@@ -129,12 +129,12 @@
if ((stat & ATA_BUSY) == 0)
break;
@@ -8755,9 +8755,9 @@ diff -Nur linux-4.4.38.orig/drivers/ide/ide-iops.c linux-4.4.38/drivers/ide/ide-
}
/*
* Allow status to settle, then read it again.
-diff -Nur linux-4.4.38.orig/drivers/ide/ide-io-std.c linux-4.4.38/drivers/ide/ide-io-std.c
---- linux-4.4.38.orig/drivers/ide/ide-io-std.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/ide/ide-io-std.c 2017-01-01 21:00:19.245688620 +0100
+diff -Nur linux-4.4.46.orig/drivers/ide/ide-io-std.c linux-4.4.46/drivers/ide/ide-io-std.c
+--- linux-4.4.46.orig/drivers/ide/ide-io-std.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/ide/ide-io-std.c 2017-02-03 17:18:05.679416330 +0100
@@ -175,7 +175,7 @@
unsigned long uninitialized_var(flags);
@@ -8794,9 +8794,9 @@ diff -Nur linux-4.4.38.orig/drivers/ide/ide-io-std.c linux-4.4.38/drivers/ide/id
if (((len + 1) & 3) < 2)
return;
-diff -Nur linux-4.4.38.orig/drivers/ide/ide-probe.c linux-4.4.38/drivers/ide/ide-probe.c
---- linux-4.4.38.orig/drivers/ide/ide-probe.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/ide/ide-probe.c 2017-01-01 21:00:19.269690165 +0100
+diff -Nur linux-4.4.46.orig/drivers/ide/ide-probe.c linux-4.4.46/drivers/ide/ide-probe.c
+--- linux-4.4.46.orig/drivers/ide/ide-probe.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/ide/ide-probe.c 2017-02-03 17:18:05.679416330 +0100
@@ -196,10 +196,10 @@
int bswap = 1;
@@ -8810,9 +8810,9 @@ diff -Nur linux-4.4.38.orig/drivers/ide/ide-probe.c linux-4.4.38/drivers/ide/ide
drive->dev_flags |= IDE_DFLAG_ID_READ;
#ifdef DEBUG
-diff -Nur linux-4.4.38.orig/drivers/ide/ide-taskfile.c linux-4.4.38/drivers/ide/ide-taskfile.c
---- linux-4.4.38.orig/drivers/ide/ide-taskfile.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/ide/ide-taskfile.c 2017-01-01 21:00:19.281690936 +0100
+diff -Nur linux-4.4.46.orig/drivers/ide/ide-taskfile.c linux-4.4.46/drivers/ide/ide-taskfile.c
+--- linux-4.4.46.orig/drivers/ide/ide-taskfile.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/ide/ide-taskfile.c 2017-02-03 17:18:05.683416484 +0100
@@ -250,7 +250,7 @@
page_is_high = PageHighMem(page);
@@ -8840,10 +8840,10 @@ diff -Nur linux-4.4.38.orig/drivers/ide/ide-taskfile.c linux-4.4.38/drivers/ide/
ide_set_handler(drive, &task_pio_intr, WAIT_WORSTCASE);
-diff -Nur linux-4.4.38.orig/drivers/infiniband/ulp/ipoib/ipoib_multicast.c linux-4.4.38/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
---- linux-4.4.38.orig/drivers/infiniband/ulp/ipoib/ipoib_multicast.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/infiniband/ulp/ipoib/ipoib_multicast.c 2017-01-01 21:00:19.297691964 +0100
-@@ -857,7 +857,7 @@
+diff -Nur linux-4.4.46.orig/drivers/infiniband/ulp/ipoib/ipoib_multicast.c linux-4.4.46/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
+--- linux-4.4.46.orig/drivers/infiniband/ulp/ipoib/ipoib_multicast.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/infiniband/ulp/ipoib/ipoib_multicast.c 2017-02-03 17:18:05.683416484 +0100
+@@ -862,7 +862,7 @@
ipoib_dbg_mcast(priv, "restarting multicast task\n");
@@ -8852,7 +8852,7 @@ diff -Nur linux-4.4.38.orig/drivers/infiniband/ulp/ipoib/ipoib_multicast.c linux
netif_addr_lock(dev);
spin_lock(&priv->lock);
-@@ -939,7 +939,7 @@
+@@ -944,7 +944,7 @@
spin_unlock(&priv->lock);
netif_addr_unlock(dev);
@@ -8861,9 +8861,9 @@ diff -Nur linux-4.4.38.orig/drivers/infiniband/ulp/ipoib/ipoib_multicast.c linux
/*
* make sure the in-flight joins have finished before we attempt
-diff -Nur linux-4.4.38.orig/drivers/input/gameport/gameport.c linux-4.4.38/drivers/input/gameport/gameport.c
---- linux-4.4.38.orig/drivers/input/gameport/gameport.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/input/gameport/gameport.c 2017-01-01 21:00:19.305692478 +0100
+diff -Nur linux-4.4.46.orig/drivers/input/gameport/gameport.c linux-4.4.46/drivers/input/gameport/gameport.c
+--- linux-4.4.46.orig/drivers/input/gameport/gameport.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/input/gameport/gameport.c 2017-02-03 17:18:05.683416484 +0100
@@ -91,13 +91,13 @@
tx = ~0;
@@ -8909,9 +8909,9 @@ diff -Nur linux-4.4.38.orig/drivers/input/gameport/gameport.c linux-4.4.38/drive
udelay(i * 10);
if (t2 - t1 < tx) tx = t2 - t1;
}
-diff -Nur linux-4.4.38.orig/drivers/iommu/amd_iommu.c linux-4.4.38/drivers/iommu/amd_iommu.c
---- linux-4.4.38.orig/drivers/iommu/amd_iommu.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/iommu/amd_iommu.c 2017-01-01 21:00:19.329694017 +0100
+diff -Nur linux-4.4.46.orig/drivers/iommu/amd_iommu.c linux-4.4.46/drivers/iommu/amd_iommu.c
+--- linux-4.4.46.orig/drivers/iommu/amd_iommu.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/iommu/amd_iommu.c 2017-02-03 17:18:05.683416484 +0100
@@ -2022,10 +2022,10 @@
int ret;
@@ -8940,9 +8940,9 @@ diff -Nur linux-4.4.38.orig/drivers/iommu/amd_iommu.c linux-4.4.38/drivers/iommu
if (WARN_ON(!dev_data->domain))
return;
-diff -Nur linux-4.4.38.orig/drivers/leds/trigger/Kconfig linux-4.4.38/drivers/leds/trigger/Kconfig
---- linux-4.4.38.orig/drivers/leds/trigger/Kconfig 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/leds/trigger/Kconfig 2017-01-01 21:00:19.329694017 +0100
+diff -Nur linux-4.4.46.orig/drivers/leds/trigger/Kconfig linux-4.4.46/drivers/leds/trigger/Kconfig
+--- linux-4.4.46.orig/drivers/leds/trigger/Kconfig 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/leds/trigger/Kconfig 2017-02-03 17:18:05.683416484 +0100
@@ -61,7 +61,7 @@
config LEDS_TRIGGER_CPU
@@ -8952,9 +8952,9 @@ diff -Nur linux-4.4.38.orig/drivers/leds/trigger/Kconfig linux-4.4.38/drivers/le
help
This allows LEDs to be controlled by active CPUs. This shows
the active CPUs across an array of LEDs so you can see which
-diff -Nur linux-4.4.38.orig/drivers/md/bcache/Kconfig linux-4.4.38/drivers/md/bcache/Kconfig
---- linux-4.4.38.orig/drivers/md/bcache/Kconfig 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/md/bcache/Kconfig 2017-01-01 21:00:19.333694276 +0100
+diff -Nur linux-4.4.46.orig/drivers/md/bcache/Kconfig linux-4.4.46/drivers/md/bcache/Kconfig
+--- linux-4.4.46.orig/drivers/md/bcache/Kconfig 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/md/bcache/Kconfig 2017-02-03 17:18:05.683416484 +0100
@@ -1,6 +1,7 @@
config BCACHE
@@ -8963,9 +8963,9 @@ diff -Nur linux-4.4.38.orig/drivers/md/bcache/Kconfig linux-4.4.38/drivers/md/bc
---help---
Allows a block device to be used as cache for other devices; uses
a btree for indexing and the layout is optimized for SSDs.
-diff -Nur linux-4.4.38.orig/drivers/md/dm.c linux-4.4.38/drivers/md/dm.c
---- linux-4.4.38.orig/drivers/md/dm.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/md/dm.c 2017-01-01 21:00:19.353695561 +0100
+diff -Nur linux-4.4.46.orig/drivers/md/dm.c linux-4.4.46/drivers/md/dm.c
+--- linux-4.4.46.orig/drivers/md/dm.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/md/dm.c 2017-02-03 17:18:05.683416484 +0100
@@ -2127,7 +2127,7 @@
/* Establish tio->ti before queuing work (map_tio_request) */
tio->ti = ti;
@@ -8975,9 +8975,9 @@ diff -Nur linux-4.4.38.orig/drivers/md/dm.c linux-4.4.38/drivers/md/dm.c
}
goto out;
-diff -Nur linux-4.4.38.orig/drivers/md/raid5.c linux-4.4.38/drivers/md/raid5.c
---- linux-4.4.38.orig/drivers/md/raid5.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/md/raid5.c 2017-01-01 21:00:19.417699668 +0100
+diff -Nur linux-4.4.46.orig/drivers/md/raid5.c linux-4.4.46/drivers/md/raid5.c
+--- linux-4.4.46.orig/drivers/md/raid5.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/md/raid5.c 2017-02-03 17:18:05.683416484 +0100
@@ -1920,8 +1920,9 @@
struct raid5_percpu *percpu;
unsigned long cpu;
@@ -9007,9 +9007,9 @@ diff -Nur linux-4.4.38.orig/drivers/md/raid5.c linux-4.4.38/drivers/md/raid5.c
}
put_online_cpus();
-diff -Nur linux-4.4.38.orig/drivers/md/raid5.h linux-4.4.38/drivers/md/raid5.h
---- linux-4.4.38.orig/drivers/md/raid5.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/md/raid5.h 2017-01-01 21:00:19.429700442 +0100
+diff -Nur linux-4.4.46.orig/drivers/md/raid5.h linux-4.4.46/drivers/md/raid5.h
+--- linux-4.4.46.orig/drivers/md/raid5.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/md/raid5.h 2017-02-03 17:18:05.683416484 +0100
@@ -504,6 +504,7 @@
int recovery_disabled;
/* per cpu variables */
@@ -9018,9 +9018,9 @@ diff -Nur linux-4.4.38.orig/drivers/md/raid5.h linux-4.4.38/drivers/md/raid5.h
struct page *spare_page; /* Used when checking P/Q in raid6 */
struct flex_array *scribble; /* space for constructing buffer
* lists and performing address
-diff -Nur linux-4.4.38.orig/drivers/media/platform/vsp1/vsp1_video.c linux-4.4.38/drivers/media/platform/vsp1/vsp1_video.c
---- linux-4.4.38.orig/drivers/media/platform/vsp1/vsp1_video.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/media/platform/vsp1/vsp1_video.c 2017-01-01 21:00:19.433700702 +0100
+diff -Nur linux-4.4.46.orig/drivers/media/platform/vsp1/vsp1_video.c linux-4.4.46/drivers/media/platform/vsp1/vsp1_video.c
+--- linux-4.4.46.orig/drivers/media/platform/vsp1/vsp1_video.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/media/platform/vsp1/vsp1_video.c 2017-02-03 17:18:05.683416484 +0100
@@ -520,7 +520,7 @@
bool stopped;
@@ -9030,9 +9030,9 @@ diff -Nur linux-4.4.38.orig/drivers/media/platform/vsp1/vsp1_video.c linux-4.4.3
spin_unlock_irqrestore(&pipe->irqlock, flags);
return stopped;
-diff -Nur linux-4.4.38.orig/drivers/misc/hwlat_detector.c linux-4.4.38/drivers/misc/hwlat_detector.c
---- linux-4.4.38.orig/drivers/misc/hwlat_detector.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.4.38/drivers/misc/hwlat_detector.c 2017-01-01 21:00:19.449701724 +0100
+diff -Nur linux-4.4.46.orig/drivers/misc/hwlat_detector.c linux-4.4.46/drivers/misc/hwlat_detector.c
+--- linux-4.4.46.orig/drivers/misc/hwlat_detector.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.4.46/drivers/misc/hwlat_detector.c 2017-02-03 17:18:05.687416638 +0100
@@ -0,0 +1,1240 @@
+/*
+ * hwlat_detector.c - A simple Hardware Latency detector.
@@ -10274,9 +10274,9 @@ diff -Nur linux-4.4.38.orig/drivers/misc/hwlat_detector.c linux-4.4.38/drivers/m
+
+module_init(detector_init);
+module_exit(detector_exit);
-diff -Nur linux-4.4.38.orig/drivers/misc/Kconfig linux-4.4.38/drivers/misc/Kconfig
---- linux-4.4.38.orig/drivers/misc/Kconfig 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/misc/Kconfig 2017-01-01 21:00:19.445701472 +0100
+diff -Nur linux-4.4.46.orig/drivers/misc/Kconfig linux-4.4.46/drivers/misc/Kconfig
+--- linux-4.4.46.orig/drivers/misc/Kconfig 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/misc/Kconfig 2017-02-03 17:18:05.683416484 +0100
@@ -54,6 +54,7 @@
config ATMEL_TCLIB
bool "Atmel AT32/AT91 Timer/Counter Library"
@@ -10347,9 +10347,9 @@ diff -Nur linux-4.4.38.orig/drivers/misc/Kconfig linux-4.4.38/drivers/misc/Kconf
config PHANTOM
tristate "Sensable PHANToM (PCI)"
depends on PCI
-diff -Nur linux-4.4.38.orig/drivers/misc/Makefile linux-4.4.38/drivers/misc/Makefile
---- linux-4.4.38.orig/drivers/misc/Makefile 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/misc/Makefile 2017-01-01 21:00:19.445701472 +0100
+diff -Nur linux-4.4.46.orig/drivers/misc/Makefile linux-4.4.46/drivers/misc/Makefile
+--- linux-4.4.46.orig/drivers/misc/Makefile 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/misc/Makefile 2017-02-03 17:18:05.683416484 +0100
@@ -39,6 +39,7 @@
obj-$(CONFIG_HMC6352) += hmc6352.o
obj-y += eeprom/
@@ -10358,9 +10358,9 @@ diff -Nur linux-4.4.38.orig/drivers/misc/Makefile linux-4.4.38/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.4.38.orig/drivers/mmc/host/mmci.c linux-4.4.38/drivers/mmc/host/mmci.c
---- linux-4.4.38.orig/drivers/mmc/host/mmci.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/mmc/host/mmci.c 2017-01-01 21:00:19.469703011 +0100
+diff -Nur linux-4.4.46.orig/drivers/mmc/host/mmci.c linux-4.4.46/drivers/mmc/host/mmci.c
+--- linux-4.4.46.orig/drivers/mmc/host/mmci.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/mmc/host/mmci.c 2017-02-03 17:18:05.687416638 +0100
@@ -1155,15 +1155,12 @@
struct sg_mapping_iter *sg_miter = &host->sg_miter;
struct variant_data *variant = host->variant;
@@ -10386,9 +10386,9 @@ diff -Nur linux-4.4.38.orig/drivers/mmc/host/mmci.c linux-4.4.38/drivers/mmc/hos
/*
* If we have less than the fifo 'half-full' threshold to transfer,
* trigger a PIO interrupt as soon as any data is available.
-diff -Nur linux-4.4.38.orig/drivers/net/ethernet/3com/3c59x.c linux-4.4.38/drivers/net/ethernet/3com/3c59x.c
---- linux-4.4.38.orig/drivers/net/ethernet/3com/3c59x.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/net/ethernet/3com/3c59x.c 2017-01-01 21:00:19.497704812 +0100
+diff -Nur linux-4.4.46.orig/drivers/net/ethernet/3com/3c59x.c linux-4.4.46/drivers/net/ethernet/3com/3c59x.c
+--- linux-4.4.46.orig/drivers/net/ethernet/3com/3c59x.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/net/ethernet/3com/3c59x.c 2017-02-03 17:18:05.687416638 +0100
@@ -842,9 +842,9 @@
{
struct vortex_private *vp = netdev_priv(dev);
@@ -10416,9 +10416,9 @@ diff -Nur linux-4.4.38.orig/drivers/net/ethernet/3com/3c59x.c linux-4.4.38/drive
}
}
-diff -Nur linux-4.4.38.orig/drivers/net/ethernet/atheros/atl1c/atl1c_main.c linux-4.4.38/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
---- linux-4.4.38.orig/drivers/net/ethernet/atheros/atl1c/atl1c_main.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/net/ethernet/atheros/atl1c/atl1c_main.c 2017-01-01 21:00:19.517706094 +0100
+diff -Nur linux-4.4.46.orig/drivers/net/ethernet/atheros/atl1c/atl1c_main.c linux-4.4.46/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
+--- linux-4.4.46.orig/drivers/net/ethernet/atheros/atl1c/atl1c_main.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/net/ethernet/atheros/atl1c/atl1c_main.c 2017-02-03 17:18:05.687416638 +0100
@@ -2221,11 +2221,7 @@
}
@@ -10432,9 +10432,9 @@ diff -Nur linux-4.4.38.orig/drivers/net/ethernet/atheros/atl1c/atl1c_main.c linu
if (atl1c_tpd_avail(adapter, type) < tpd_req) {
/* no enough descriptor, just stop queue */
-diff -Nur linux-4.4.38.orig/drivers/net/ethernet/atheros/atl1e/atl1e_main.c linux-4.4.38/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
---- linux-4.4.38.orig/drivers/net/ethernet/atheros/atl1e/atl1e_main.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/net/ethernet/atheros/atl1e/atl1e_main.c 2017-01-01 21:00:19.529706865 +0100
+diff -Nur linux-4.4.46.orig/drivers/net/ethernet/atheros/atl1e/atl1e_main.c linux-4.4.46/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
+--- linux-4.4.46.orig/drivers/net/ethernet/atheros/atl1e/atl1e_main.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/net/ethernet/atheros/atl1e/atl1e_main.c 2017-02-03 17:18:05.687416638 +0100
@@ -1880,8 +1880,7 @@
return NETDEV_TX_OK;
}
@@ -10445,9 +10445,9 @@ diff -Nur linux-4.4.38.orig/drivers/net/ethernet/atheros/atl1e/atl1e_main.c linu
if (atl1e_tpd_avail(adapter) < tpd_req) {
/* no enough descriptor, just stop queue */
-diff -Nur linux-4.4.38.orig/drivers/net/ethernet/chelsio/cxgb/sge.c linux-4.4.38/drivers/net/ethernet/chelsio/cxgb/sge.c
---- linux-4.4.38.orig/drivers/net/ethernet/chelsio/cxgb/sge.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/net/ethernet/chelsio/cxgb/sge.c 2017-01-01 21:00:19.541707632 +0100
+diff -Nur linux-4.4.46.orig/drivers/net/ethernet/chelsio/cxgb/sge.c linux-4.4.46/drivers/net/ethernet/chelsio/cxgb/sge.c
+--- linux-4.4.46.orig/drivers/net/ethernet/chelsio/cxgb/sge.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/net/ethernet/chelsio/cxgb/sge.c 2017-02-03 17:18:05.691416794 +0100
@@ -1664,8 +1664,7 @@
struct cmdQ *q = &sge->cmdQ[qid];
unsigned int credits, pidx, genbit, count, use_sched_skb = 0;
@@ -10458,9 +10458,9 @@ diff -Nur linux-4.4.38.orig/drivers/net/ethernet/chelsio/cxgb/sge.c linux-4.4.38
reclaim_completed_tx(sge, q);
-diff -Nur linux-4.4.38.orig/drivers/net/ethernet/neterion/s2io.c linux-4.4.38/drivers/net/ethernet/neterion/s2io.c
---- linux-4.4.38.orig/drivers/net/ethernet/neterion/s2io.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/net/ethernet/neterion/s2io.c 2017-01-01 21:00:19.565709180 +0100
+diff -Nur linux-4.4.46.orig/drivers/net/ethernet/neterion/s2io.c linux-4.4.46/drivers/net/ethernet/neterion/s2io.c
+--- linux-4.4.46.orig/drivers/net/ethernet/neterion/s2io.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/net/ethernet/neterion/s2io.c 2017-02-03 17:18:05.691416794 +0100
@@ -4084,12 +4084,7 @@
[skb->priority & (MAX_TX_FIFOS - 1)];
fifo = &mac_control->fifos[queue];
@@ -10475,9 +10475,9 @@ diff -Nur linux-4.4.38.orig/drivers/net/ethernet/neterion/s2io.c linux-4.4.38/dr
if (sp->config.multiq) {
if (__netif_subqueue_stopped(dev, fifo->fifo_no)) {
-diff -Nur linux-4.4.38.orig/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c linux-4.4.38/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
---- linux-4.4.38.orig/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c 2017-01-01 21:00:19.585710462 +0100
+diff -Nur linux-4.4.46.orig/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c linux-4.4.46/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
+--- linux-4.4.46.orig/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c 2017-02-03 17:18:05.691416794 +0100
@@ -2137,10 +2137,8 @@
struct pch_gbe_tx_ring *tx_ring = adapter->tx_ring;
unsigned long flags;
@@ -10491,9 +10491,9 @@ diff -Nur linux-4.4.38.orig/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
if (unlikely(!PCH_GBE_DESC_UNUSED(tx_ring))) {
netif_stop_queue(netdev);
spin_unlock_irqrestore(&tx_ring->tx_lock, flags);
-diff -Nur linux-4.4.38.orig/drivers/net/ethernet/realtek/8139too.c linux-4.4.38/drivers/net/ethernet/realtek/8139too.c
---- linux-4.4.38.orig/drivers/net/ethernet/realtek/8139too.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/net/ethernet/realtek/8139too.c 2017-01-01 21:00:19.613712263 +0100
+diff -Nur linux-4.4.46.orig/drivers/net/ethernet/realtek/8139too.c linux-4.4.46/drivers/net/ethernet/realtek/8139too.c
+--- linux-4.4.46.orig/drivers/net/ethernet/realtek/8139too.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/net/ethernet/realtek/8139too.c 2017-02-03 17:18:05.691416794 +0100
@@ -2229,7 +2229,7 @@
struct rtl8139_private *tp = netdev_priv(dev);
const int irq = tp->pci_dev->irq;
@@ -10503,9 +10503,9 @@ diff -Nur linux-4.4.38.orig/drivers/net/ethernet/realtek/8139too.c linux-4.4.38/
rtl8139_interrupt(irq, dev);
enable_irq(irq);
}
-diff -Nur linux-4.4.38.orig/drivers/net/ethernet/tehuti/tehuti.c linux-4.4.38/drivers/net/ethernet/tehuti/tehuti.c
---- linux-4.4.38.orig/drivers/net/ethernet/tehuti/tehuti.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/net/ethernet/tehuti/tehuti.c 2017-01-01 21:00:19.629713292 +0100
+diff -Nur linux-4.4.46.orig/drivers/net/ethernet/tehuti/tehuti.c linux-4.4.46/drivers/net/ethernet/tehuti/tehuti.c
+--- linux-4.4.46.orig/drivers/net/ethernet/tehuti/tehuti.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/net/ethernet/tehuti/tehuti.c 2017-02-03 17:18:05.691416794 +0100
@@ -1629,13 +1629,8 @@
unsigned long flags;
@@ -10522,9 +10522,9 @@ diff -Nur linux-4.4.38.orig/drivers/net/ethernet/tehuti/tehuti.c linux-4.4.38/dr
/* build tx descriptor */
BDX_ASSERT(f->m.wptr >= f->m.memsz); /* started with valid wptr */
-diff -Nur linux-4.4.38.orig/drivers/net/rionet.c linux-4.4.38/drivers/net/rionet.c
---- linux-4.4.38.orig/drivers/net/rionet.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/net/rionet.c 2017-01-01 21:00:19.641714059 +0100
+diff -Nur linux-4.4.46.orig/drivers/net/rionet.c linux-4.4.46/drivers/net/rionet.c
+--- linux-4.4.46.orig/drivers/net/rionet.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/net/rionet.c 2017-02-03 17:18:05.691416794 +0100
@@ -174,11 +174,7 @@
unsigned long flags;
int add_num = 1;
@@ -10538,9 +10538,9 @@ diff -Nur linux-4.4.38.orig/drivers/net/rionet.c linux-4.4.38/drivers/net/rionet
if (is_multicast_ether_addr(eth->h_dest))
add_num = nets[rnet->mport->id].nact;
-diff -Nur linux-4.4.38.orig/drivers/net/wireless/orinoco/orinoco_usb.c linux-4.4.38/drivers/net/wireless/orinoco/orinoco_usb.c
---- linux-4.4.38.orig/drivers/net/wireless/orinoco/orinoco_usb.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/net/wireless/orinoco/orinoco_usb.c 2017-01-01 21:00:19.649714573 +0100
+diff -Nur linux-4.4.46.orig/drivers/net/wireless/orinoco/orinoco_usb.c linux-4.4.46/drivers/net/wireless/orinoco/orinoco_usb.c
+--- linux-4.4.46.orig/drivers/net/wireless/orinoco/orinoco_usb.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/net/wireless/orinoco/orinoco_usb.c 2017-02-03 17:18:05.695416949 +0100
@@ -697,7 +697,7 @@
while (!ctx->done.done && msecs--)
udelay(1000);
@@ -10550,9 +10550,9 @@ diff -Nur linux-4.4.38.orig/drivers/net/wireless/orinoco/orinoco_usb.c linux-4.4
ctx->done.done);
}
break;
-diff -Nur linux-4.4.38.orig/drivers/pci/access.c linux-4.4.38/drivers/pci/access.c
---- linux-4.4.38.orig/drivers/pci/access.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/pci/access.c 2017-01-01 21:00:19.657715089 +0100
+diff -Nur linux-4.4.46.orig/drivers/pci/access.c linux-4.4.46/drivers/pci/access.c
+--- linux-4.4.46.orig/drivers/pci/access.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/pci/access.c 2017-02-03 17:18:05.695416949 +0100
@@ -561,7 +561,7 @@
WARN_ON(!dev->block_cfg_access);
@@ -10562,9 +10562,9 @@ diff -Nur linux-4.4.38.orig/drivers/pci/access.c linux-4.4.38/drivers/pci/access
raw_spin_unlock_irqrestore(&pci_lock, flags);
}
EXPORT_SYMBOL_GPL(pci_cfg_access_unlock);
-diff -Nur linux-4.4.38.orig/drivers/scsi/fcoe/fcoe.c linux-4.4.38/drivers/scsi/fcoe/fcoe.c
---- linux-4.4.38.orig/drivers/scsi/fcoe/fcoe.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/scsi/fcoe/fcoe.c 2017-01-01 21:00:19.681716628 +0100
+diff -Nur linux-4.4.46.orig/drivers/scsi/fcoe/fcoe.c linux-4.4.46/drivers/scsi/fcoe/fcoe.c
+--- linux-4.4.46.orig/drivers/scsi/fcoe/fcoe.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/scsi/fcoe/fcoe.c 2017-02-03 17:18:05.695416949 +0100
@@ -1286,7 +1286,7 @@
struct sk_buff *skb;
#ifdef CONFIG_SMP
@@ -10637,9 +10637,9 @@ diff -Nur linux-4.4.38.orig/drivers/scsi/fcoe/fcoe.c linux-4.4.38/drivers/scsi/f
kfree_skb(skb);
}
-diff -Nur linux-4.4.38.orig/drivers/scsi/fcoe/fcoe_ctlr.c linux-4.4.38/drivers/scsi/fcoe/fcoe_ctlr.c
---- linux-4.4.38.orig/drivers/scsi/fcoe/fcoe_ctlr.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/scsi/fcoe/fcoe_ctlr.c 2017-01-01 21:00:19.693717403 +0100
+diff -Nur linux-4.4.46.orig/drivers/scsi/fcoe/fcoe_ctlr.c linux-4.4.46/drivers/scsi/fcoe/fcoe_ctlr.c
+--- linux-4.4.46.orig/drivers/scsi/fcoe/fcoe_ctlr.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/scsi/fcoe/fcoe_ctlr.c 2017-02-03 17:18:05.695416949 +0100
@@ -831,7 +831,7 @@
INIT_LIST_HEAD(&del_list);
@@ -10658,9 +10658,9 @@ diff -Nur linux-4.4.38.orig/drivers/scsi/fcoe/fcoe_ctlr.c linux-4.4.38/drivers/s
list_for_each_entry_safe(fcf, next, &del_list, list) {
/* Removes fcf from current list */
-diff -Nur linux-4.4.38.orig/drivers/scsi/libfc/fc_exch.c linux-4.4.38/drivers/scsi/libfc/fc_exch.c
---- linux-4.4.38.orig/drivers/scsi/libfc/fc_exch.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/scsi/libfc/fc_exch.c 2017-01-01 21:00:19.709718431 +0100
+diff -Nur linux-4.4.46.orig/drivers/scsi/libfc/fc_exch.c linux-4.4.46/drivers/scsi/libfc/fc_exch.c
+--- linux-4.4.46.orig/drivers/scsi/libfc/fc_exch.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/scsi/libfc/fc_exch.c 2017-02-03 17:18:05.695416949 +0100
@@ -814,10 +814,10 @@
}
memset(ep, 0, sizeof(*ep));
@@ -10674,9 +10674,9 @@ diff -Nur linux-4.4.38.orig/drivers/scsi/libfc/fc_exch.c linux-4.4.38/drivers/sc
/* peek cache of free slot */
if (pool->left != FC_XID_UNKNOWN) {
-diff -Nur linux-4.4.38.orig/drivers/scsi/libsas/sas_ata.c linux-4.4.38/drivers/scsi/libsas/sas_ata.c
---- linux-4.4.38.orig/drivers/scsi/libsas/sas_ata.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/scsi/libsas/sas_ata.c 2017-01-01 21:00:19.721719201 +0100
+diff -Nur linux-4.4.46.orig/drivers/scsi/libsas/sas_ata.c linux-4.4.46/drivers/scsi/libsas/sas_ata.c
+--- linux-4.4.46.orig/drivers/scsi/libsas/sas_ata.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/scsi/libsas/sas_ata.c 2017-02-03 17:18:05.695416949 +0100
@@ -190,7 +190,7 @@
/* TODO: audit callers to ensure they are ready for qc_issue to
* unconditionally re-enable interrupts
@@ -10695,9 +10695,9 @@ diff -Nur linux-4.4.38.orig/drivers/scsi/libsas/sas_ata.c linux-4.4.38/drivers/s
return ret;
}
-diff -Nur linux-4.4.38.orig/drivers/scsi/qla2xxx/qla_inline.h linux-4.4.38/drivers/scsi/qla2xxx/qla_inline.h
---- linux-4.4.38.orig/drivers/scsi/qla2xxx/qla_inline.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/scsi/qla2xxx/qla_inline.h 2017-01-01 21:00:19.733719972 +0100
+diff -Nur linux-4.4.46.orig/drivers/scsi/qla2xxx/qla_inline.h linux-4.4.46/drivers/scsi/qla2xxx/qla_inline.h
+--- linux-4.4.46.orig/drivers/scsi/qla2xxx/qla_inline.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/scsi/qla2xxx/qla_inline.h 2017-02-03 17:18:05.695416949 +0100
@@ -59,12 +59,12 @@
{
unsigned long flags;
@@ -10713,9 +10713,9 @@ diff -Nur linux-4.4.38.orig/drivers/scsi/qla2xxx/qla_inline.h linux-4.4.38/drive
}
static inline uint8_t *
-diff -Nur linux-4.4.38.orig/drivers/thermal/x86_pkg_temp_thermal.c linux-4.4.38/drivers/thermal/x86_pkg_temp_thermal.c
---- linux-4.4.38.orig/drivers/thermal/x86_pkg_temp_thermal.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/thermal/x86_pkg_temp_thermal.c 2017-01-01 21:00:19.741720486 +0100
+diff -Nur linux-4.4.46.orig/drivers/thermal/x86_pkg_temp_thermal.c linux-4.4.46/drivers/thermal/x86_pkg_temp_thermal.c
+--- linux-4.4.46.orig/drivers/thermal/x86_pkg_temp_thermal.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/thermal/x86_pkg_temp_thermal.c 2017-02-03 17:18:05.695416949 +0100
@@ -29,6 +29,7 @@
#include <linux/pm.h>
#include <linux/thermal.h>
@@ -10818,9 +10818,9 @@ diff -Nur linux-4.4.38.orig/drivers/thermal/x86_pkg_temp_thermal.c linux-4.4.38/
for_each_online_cpu(i)
cancel_delayed_work_sync(
&per_cpu(pkg_temp_thermal_threshold_work, i));
-diff -Nur linux-4.4.38.orig/drivers/tty/serial/8250/8250_core.c linux-4.4.38/drivers/tty/serial/8250/8250_core.c
---- linux-4.4.38.orig/drivers/tty/serial/8250/8250_core.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/tty/serial/8250/8250_core.c 2017-01-01 21:00:19.753721253 +0100
+diff -Nur linux-4.4.46.orig/drivers/tty/serial/8250/8250_core.c linux-4.4.46/drivers/tty/serial/8250/8250_core.c
+--- linux-4.4.46.orig/drivers/tty/serial/8250/8250_core.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/tty/serial/8250/8250_core.c 2017-02-03 17:18:05.695416949 +0100
@@ -58,7 +58,16 @@
static unsigned int skip_txen_test; /* force skip of txen test at init time */
@@ -10839,9 +10839,9 @@ diff -Nur linux-4.4.38.orig/drivers/tty/serial/8250/8250_core.c linux-4.4.38/dri
#include <asm/serial.h>
/*
-diff -Nur linux-4.4.38.orig/drivers/tty/serial/8250/8250_port.c linux-4.4.38/drivers/tty/serial/8250/8250_port.c
---- linux-4.4.38.orig/drivers/tty/serial/8250/8250_port.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/tty/serial/8250/8250_port.c 2017-01-01 21:00:19.773722542 +0100
+diff -Nur linux-4.4.46.orig/drivers/tty/serial/8250/8250_port.c linux-4.4.46/drivers/tty/serial/8250/8250_port.c
+--- linux-4.4.46.orig/drivers/tty/serial/8250/8250_port.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/tty/serial/8250/8250_port.c 2017-02-03 17:18:05.695416949 +0100
@@ -35,6 +35,7 @@
#include <linux/nmi.h>
#include <linux/mutex.h>
@@ -10862,9 +10862,9 @@ diff -Nur linux-4.4.38.orig/drivers/tty/serial/8250/8250_port.c linux-4.4.38/dri
locked = spin_trylock_irqsave(&port->lock, flags);
else
spin_lock_irqsave(&port->lock, flags);
-diff -Nur linux-4.4.38.orig/drivers/tty/serial/amba-pl011.c linux-4.4.38/drivers/tty/serial/amba-pl011.c
---- linux-4.4.38.orig/drivers/tty/serial/amba-pl011.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/tty/serial/amba-pl011.c 2017-01-01 21:00:19.793723822 +0100
+diff -Nur linux-4.4.46.orig/drivers/tty/serial/amba-pl011.c linux-4.4.46/drivers/tty/serial/amba-pl011.c
+--- linux-4.4.46.orig/drivers/tty/serial/amba-pl011.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/tty/serial/amba-pl011.c 2017-02-03 17:18:05.695416949 +0100
@@ -2067,13 +2067,19 @@
clk_enable(uap->clk);
@@ -10898,9 +10898,9 @@ diff -Nur linux-4.4.38.orig/drivers/tty/serial/amba-pl011.c linux-4.4.38/drivers
clk_disable(uap->clk);
}
-diff -Nur linux-4.4.38.orig/drivers/tty/serial/omap-serial.c linux-4.4.38/drivers/tty/serial/omap-serial.c
---- linux-4.4.38.orig/drivers/tty/serial/omap-serial.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/tty/serial/omap-serial.c 2017-01-01 21:00:19.797724083 +0100
+diff -Nur linux-4.4.46.orig/drivers/tty/serial/omap-serial.c linux-4.4.46/drivers/tty/serial/omap-serial.c
+--- linux-4.4.46.orig/drivers/tty/serial/omap-serial.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/tty/serial/omap-serial.c 2017-02-03 17:18:05.695416949 +0100
@@ -1257,13 +1257,10 @@
pm_runtime_get_sync(up->dev);
@@ -10928,21 +10928,9 @@ diff -Nur linux-4.4.38.orig/drivers/tty/serial/omap-serial.c linux-4.4.38/driver
}
static int __init
-diff -Nur linux-4.4.38.orig/drivers/tty/serial/sc16is7xx.c linux-4.4.38/drivers/tty/serial/sc16is7xx.c
---- linux-4.4.38.orig/drivers/tty/serial/sc16is7xx.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/tty/serial/sc16is7xx.c 2017-01-01 21:00:19.805724597 +0100
-@@ -1230,7 +1230,7 @@
-
- /* Setup interrupt */
- ret = devm_request_irq(dev, irq, sc16is7xx_irq,
-- IRQF_ONESHOT | flags, dev_name(dev), s);
-+ flags, dev_name(dev), s);
- if (!ret)
- return 0;
-
-diff -Nur linux-4.4.38.orig/drivers/usb/core/hcd.c linux-4.4.38/drivers/usb/core/hcd.c
---- linux-4.4.38.orig/drivers/usb/core/hcd.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/usb/core/hcd.c 2017-01-01 21:00:19.817725365 +0100
+diff -Nur linux-4.4.46.orig/drivers/usb/core/hcd.c linux-4.4.46/drivers/usb/core/hcd.c
+--- linux-4.4.46.orig/drivers/usb/core/hcd.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/usb/core/hcd.c 2017-02-03 17:18:10.895617822 +0100
@@ -1735,9 +1735,9 @@
* and no one may trigger the above deadlock situation when
* running complete() in tasklet.
@@ -10955,9 +10943,9 @@ diff -Nur linux-4.4.38.orig/drivers/usb/core/hcd.c linux-4.4.38/drivers/usb/core
usb_anchor_resume_wakeups(anchor);
atomic_dec(&urb->use_count);
-diff -Nur linux-4.4.38.orig/drivers/usb/gadget/function/f_fs.c linux-4.4.38/drivers/usb/gadget/function/f_fs.c
---- linux-4.4.38.orig/drivers/usb/gadget/function/f_fs.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/usb/gadget/function/f_fs.c 2017-01-01 21:00:19.841726907 +0100
+diff -Nur linux-4.4.46.orig/drivers/usb/gadget/function/f_fs.c linux-4.4.46/drivers/usb/gadget/function/f_fs.c
+--- linux-4.4.46.orig/drivers/usb/gadget/function/f_fs.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/usb/gadget/function/f_fs.c 2017-02-03 17:18:10.895617822 +0100
@@ -1404,7 +1404,7 @@
pr_info("%s(): freeing\n", __func__);
ffs_data_clear(ffs);
@@ -10967,9 +10955,9 @@ diff -Nur linux-4.4.38.orig/drivers/usb/gadget/function/f_fs.c linux-4.4.38/driv
kfree(ffs->dev_name);
kfree(ffs);
}
-diff -Nur linux-4.4.38.orig/drivers/usb/gadget/legacy/inode.c linux-4.4.38/drivers/usb/gadget/legacy/inode.c
---- linux-4.4.38.orig/drivers/usb/gadget/legacy/inode.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/usb/gadget/legacy/inode.c 2017-01-01 21:00:19.849727423 +0100
+diff -Nur linux-4.4.46.orig/drivers/usb/gadget/legacy/inode.c linux-4.4.46/drivers/usb/gadget/legacy/inode.c
+--- linux-4.4.46.orig/drivers/usb/gadget/legacy/inode.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/usb/gadget/legacy/inode.c 2017-02-03 17:18:10.895617822 +0100
@@ -345,7 +345,7 @@
spin_unlock_irq (&epdata->dev->lock);
@@ -10988,9 +10976,9 @@ diff -Nur linux-4.4.38.orig/drivers/usb/gadget/legacy/inode.c linux-4.4.38/drive
if (epdata->status == -ECONNRESET)
epdata->status = -EINTR;
} else {
-diff -Nur linux-4.4.38.orig/drivers/usb/gadget/udc/atmel_usba_udc.c linux-4.4.38/drivers/usb/gadget/udc/atmel_usba_udc.c
---- linux-4.4.38.orig/drivers/usb/gadget/udc/atmel_usba_udc.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/usb/gadget/udc/atmel_usba_udc.c 2017-01-01 21:00:19.865728448 +0100
+diff -Nur linux-4.4.46.orig/drivers/usb/gadget/udc/atmel_usba_udc.c linux-4.4.46/drivers/usb/gadget/udc/atmel_usba_udc.c
+--- linux-4.4.46.orig/drivers/usb/gadget/udc/atmel_usba_udc.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/usb/gadget/udc/atmel_usba_udc.c 2017-02-03 17:18:10.895617822 +0100
@@ -17,7 +17,9 @@
#include <linux/device.h>
#include <linux/dma-mapping.h>
@@ -11037,9 +11025,9 @@ diff -Nur linux-4.4.38.orig/drivers/usb/gadget/udc/atmel_usba_udc.c linux-4.4.38
udc->num_ep = 0;
-diff -Nur linux-4.4.38.orig/drivers/usb/gadget/udc/atmel_usba_udc.h linux-4.4.38/drivers/usb/gadget/udc/atmel_usba_udc.h
---- linux-4.4.38.orig/drivers/usb/gadget/udc/atmel_usba_udc.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/drivers/usb/gadget/udc/atmel_usba_udc.h 2017-01-01 21:00:19.873728962 +0100
+diff -Nur linux-4.4.46.orig/drivers/usb/gadget/udc/atmel_usba_udc.h linux-4.4.46/drivers/usb/gadget/udc/atmel_usba_udc.h
+--- linux-4.4.46.orig/drivers/usb/gadget/udc/atmel_usba_udc.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/drivers/usb/gadget/udc/atmel_usba_udc.h 2017-02-03 17:18:10.895617822 +0100
@@ -354,6 +354,8 @@
struct dentry *debugfs_root;
struct dentry *debugfs_regs;
@@ -11049,9 +11037,9 @@ diff -Nur linux-4.4.38.orig/drivers/usb/gadget/udc/atmel_usba_udc.h linux-4.4.38
};
static inline struct usba_ep *to_usba_ep(struct usb_ep *ep)
-diff -Nur linux-4.4.38.orig/fs/aio.c linux-4.4.38/fs/aio.c
---- linux-4.4.38.orig/fs/aio.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/fs/aio.c 2017-01-01 21:00:19.873728962 +0100
+diff -Nur linux-4.4.46.orig/fs/aio.c linux-4.4.46/fs/aio.c
+--- linux-4.4.46.orig/fs/aio.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/fs/aio.c 2017-02-03 17:18:10.899617976 +0100
@@ -40,6 +40,7 @@
#include <linux/ramfs.h>
#include <linux/percpu-refcount.h>
@@ -11127,9 +11115,9 @@ diff -Nur linux-4.4.38.orig/fs/aio.c linux-4.4.38/fs/aio.c
static int ioctx_add_table(struct kioctx *ctx, struct mm_struct *mm)
{
unsigned i, new_nr;
-diff -Nur linux-4.4.38.orig/fs/autofs4/autofs_i.h linux-4.4.38/fs/autofs4/autofs_i.h
---- linux-4.4.38.orig/fs/autofs4/autofs_i.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/fs/autofs4/autofs_i.h 2017-01-01 21:00:19.873728962 +0100
+diff -Nur linux-4.4.46.orig/fs/autofs4/autofs_i.h linux-4.4.46/fs/autofs4/autofs_i.h
+--- linux-4.4.46.orig/fs/autofs4/autofs_i.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/fs/autofs4/autofs_i.h 2017-02-03 17:18:10.899617976 +0100
@@ -34,6 +34,7 @@
#include <linux/sched.h>
#include <linux/mount.h>
@@ -11138,9 +11126,9 @@ diff -Nur linux-4.4.38.orig/fs/autofs4/autofs_i.h linux-4.4.38/fs/autofs4/autofs
#include <asm/current.h>
#include <asm/uaccess.h>
-diff -Nur linux-4.4.38.orig/fs/autofs4/expire.c linux-4.4.38/fs/autofs4/expire.c
---- linux-4.4.38.orig/fs/autofs4/expire.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/fs/autofs4/expire.c 2017-01-01 21:00:19.873728962 +0100
+diff -Nur linux-4.4.46.orig/fs/autofs4/expire.c linux-4.4.46/fs/autofs4/expire.c
+--- linux-4.4.46.orig/fs/autofs4/expire.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/fs/autofs4/expire.c 2017-02-03 17:18:10.899617976 +0100
@@ -150,7 +150,7 @@
parent = p->d_parent;
if (!spin_trylock(&parent->d_lock)) {
@@ -11150,9 +11138,9 @@ diff -Nur linux-4.4.38.orig/fs/autofs4/expire.c linux-4.4.38/fs/autofs4/expire.c
goto relock;
}
spin_unlock(&p->d_lock);
-diff -Nur linux-4.4.38.orig/fs/buffer.c linux-4.4.38/fs/buffer.c
---- linux-4.4.38.orig/fs/buffer.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/fs/buffer.c 2017-01-01 21:00:19.877729223 +0100
+diff -Nur linux-4.4.46.orig/fs/buffer.c linux-4.4.46/fs/buffer.c
+--- linux-4.4.46.orig/fs/buffer.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/fs/buffer.c 2017-02-03 17:18:10.899617976 +0100
@@ -305,8 +305,7 @@
* decide that the page is now completely done.
*/
@@ -11220,9 +11208,9 @@ diff -Nur linux-4.4.38.orig/fs/buffer.c linux-4.4.38/fs/buffer.c
preempt_disable();
__this_cpu_inc(bh_accounting.nr);
recalc_bh_state();
-diff -Nur linux-4.4.38.orig/fs/dcache.c linux-4.4.38/fs/dcache.c
---- linux-4.4.38.orig/fs/dcache.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/fs/dcache.c 2017-01-01 21:00:19.877729223 +0100
+diff -Nur linux-4.4.46.orig/fs/dcache.c linux-4.4.46/fs/dcache.c
+--- linux-4.4.46.orig/fs/dcache.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/fs/dcache.c 2017-02-03 17:18:10.899617976 +0100
@@ -19,6 +19,7 @@
#include <linux/mm.h>
#include <linux/fs.h>
@@ -11262,7 +11250,7 @@ diff -Nur linux-4.4.38.orig/fs/dcache.c linux-4.4.38/fs/dcache.c
goto repeat;
}
}
-@@ -2394,7 +2406,7 @@
+@@ -2397,7 +2409,7 @@
if (dentry->d_lockref.count == 1) {
if (!spin_trylock(&inode->i_lock)) {
spin_unlock(&dentry->d_lock);
@@ -11271,9 +11259,9 @@ diff -Nur linux-4.4.38.orig/fs/dcache.c linux-4.4.38/fs/dcache.c
goto again;
}
dentry->d_flags &= ~DCACHE_CANT_MOUNT;
-diff -Nur linux-4.4.38.orig/fs/eventpoll.c linux-4.4.38/fs/eventpoll.c
---- linux-4.4.38.orig/fs/eventpoll.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/fs/eventpoll.c 2017-01-01 21:00:19.877729223 +0100
+diff -Nur linux-4.4.46.orig/fs/eventpoll.c linux-4.4.46/fs/eventpoll.c
+--- linux-4.4.46.orig/fs/eventpoll.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/fs/eventpoll.c 2017-02-03 17:18:10.899617976 +0100
@@ -505,12 +505,12 @@
*/
static void ep_poll_safewake(wait_queue_head_t *wq)
@@ -11289,10 +11277,10 @@ diff -Nur linux-4.4.38.orig/fs/eventpoll.c linux-4.4.38/fs/eventpoll.c
}
static void ep_remove_wait_queue(struct eppoll_entry *pwq)
-diff -Nur linux-4.4.38.orig/fs/exec.c linux-4.4.38/fs/exec.c
---- linux-4.4.38.orig/fs/exec.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/fs/exec.c 2017-01-01 21:00:19.877729223 +0100
-@@ -865,12 +865,14 @@
+diff -Nur linux-4.4.46.orig/fs/exec.c linux-4.4.46/fs/exec.c
+--- linux-4.4.46.orig/fs/exec.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/fs/exec.c 2017-02-03 17:18:10.899617976 +0100
+@@ -866,12 +866,14 @@
}
}
task_lock(tsk);
@@ -11307,9 +11295,9 @@ diff -Nur linux-4.4.38.orig/fs/exec.c linux-4.4.38/fs/exec.c
task_unlock(tsk);
if (old_mm) {
up_read(&old_mm->mmap_sem);
-diff -Nur linux-4.4.38.orig/fs/f2fs/f2fs.h linux-4.4.38/fs/f2fs/f2fs.h
---- linux-4.4.38.orig/fs/f2fs/f2fs.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/fs/f2fs/f2fs.h 2017-01-01 21:00:19.881729476 +0100
+diff -Nur linux-4.4.46.orig/fs/f2fs/f2fs.h linux-4.4.46/fs/f2fs/f2fs.h
+--- linux-4.4.46.orig/fs/f2fs/f2fs.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/fs/f2fs/f2fs.h 2017-02-03 17:18:10.899617976 +0100
@@ -24,7 +24,6 @@
#ifdef CONFIG_F2FS_CHECK_FS
@@ -11335,9 +11323,9 @@ diff -Nur linux-4.4.38.orig/fs/f2fs/f2fs.h linux-4.4.38/fs/f2fs/f2fs.h
}
static inline void f2fs_unlock_all(struct f2fs_sb_info *sbi)
-diff -Nur linux-4.4.38.orig/fs/jbd2/checkpoint.c linux-4.4.38/fs/jbd2/checkpoint.c
---- linux-4.4.38.orig/fs/jbd2/checkpoint.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/fs/jbd2/checkpoint.c 2017-01-01 21:00:19.881729476 +0100
+diff -Nur linux-4.4.46.orig/fs/jbd2/checkpoint.c linux-4.4.46/fs/jbd2/checkpoint.c
+--- linux-4.4.46.orig/fs/jbd2/checkpoint.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/fs/jbd2/checkpoint.c 2017-02-03 17:18:10.899617976 +0100
@@ -116,6 +116,8 @@
nblocks = jbd2_space_needed(journal);
while (jbd2_log_space_left(journal) < nblocks) {
@@ -11347,9 +11335,9 @@ diff -Nur linux-4.4.38.orig/fs/jbd2/checkpoint.c linux-4.4.38/fs/jbd2/checkpoint
mutex_lock(&journal->j_checkpoint_mutex);
/*
-diff -Nur linux-4.4.38.orig/fs/namespace.c linux-4.4.38/fs/namespace.c
---- linux-4.4.38.orig/fs/namespace.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/fs/namespace.c 2017-01-01 21:00:19.881729476 +0100
+diff -Nur linux-4.4.46.orig/fs/namespace.c linux-4.4.46/fs/namespace.c
+--- linux-4.4.46.orig/fs/namespace.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/fs/namespace.c 2017-02-03 17:18:10.899617976 +0100
@@ -14,6 +14,7 @@
#include <linux/mnt_namespace.h>
#include <linux/user_namespace.h>
@@ -11372,9 +11360,9 @@ diff -Nur linux-4.4.38.orig/fs/namespace.c linux-4.4.38/fs/namespace.c
/*
* After the slowpath clears MNT_WRITE_HOLD, mnt_is_readonly will
* be set to match its requirements. So we must not load that until
-diff -Nur linux-4.4.38.orig/fs/ntfs/aops.c linux-4.4.38/fs/ntfs/aops.c
---- linux-4.4.38.orig/fs/ntfs/aops.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/fs/ntfs/aops.c 2017-01-01 21:00:19.897730504 +0100
+diff -Nur linux-4.4.46.orig/fs/ntfs/aops.c linux-4.4.46/fs/ntfs/aops.c
+--- linux-4.4.46.orig/fs/ntfs/aops.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/fs/ntfs/aops.c 2017-02-03 17:18:10.899617976 +0100
@@ -107,8 +107,7 @@
"0x%llx.", (unsigned long long)bh->b_blocknr);
}
@@ -11422,9 +11410,9 @@ diff -Nur linux-4.4.38.orig/fs/ntfs/aops.c linux-4.4.38/fs/ntfs/aops.c
}
/**
-diff -Nur linux-4.4.38.orig/fs/timerfd.c linux-4.4.38/fs/timerfd.c
---- linux-4.4.38.orig/fs/timerfd.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/fs/timerfd.c 2017-01-01 21:00:19.901730765 +0100
+diff -Nur linux-4.4.46.orig/fs/timerfd.c linux-4.4.46/fs/timerfd.c
+--- linux-4.4.46.orig/fs/timerfd.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/fs/timerfd.c 2017-02-03 17:18:10.899617976 +0100
@@ -450,7 +450,10 @@
break;
}
@@ -11437,9 +11425,9 @@ diff -Nur linux-4.4.38.orig/fs/timerfd.c linux-4.4.38/fs/timerfd.c
}
/*
-diff -Nur linux-4.4.38.orig/include/acpi/platform/aclinux.h linux-4.4.38/include/acpi/platform/aclinux.h
---- linux-4.4.38.orig/include/acpi/platform/aclinux.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/acpi/platform/aclinux.h 2017-01-01 21:00:19.901730765 +0100
+diff -Nur linux-4.4.46.orig/include/acpi/platform/aclinux.h linux-4.4.46/include/acpi/platform/aclinux.h
+--- linux-4.4.46.orig/include/acpi/platform/aclinux.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/acpi/platform/aclinux.h 2017-02-03 17:18:10.899617976 +0100
@@ -127,6 +127,7 @@
#define acpi_cache_t struct kmem_cache
@@ -11469,9 +11457,9 @@ diff -Nur linux-4.4.38.orig/include/acpi/platform/aclinux.h linux-4.4.38/include
/*
* OSL interfaces used by debugger/disassembler
*/
-diff -Nur linux-4.4.38.orig/include/asm-generic/bug.h linux-4.4.38/include/asm-generic/bug.h
---- linux-4.4.38.orig/include/asm-generic/bug.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/asm-generic/bug.h 2017-01-01 21:00:19.901730765 +0100
+diff -Nur linux-4.4.46.orig/include/asm-generic/bug.h linux-4.4.46/include/asm-generic/bug.h
+--- linux-4.4.46.orig/include/asm-generic/bug.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/asm-generic/bug.h 2017-02-03 17:18:10.903618130 +0100
@@ -206,6 +206,20 @@
# define WARN_ON_SMP(x) ({0;})
#endif
@@ -11493,9 +11481,9 @@ diff -Nur linux-4.4.38.orig/include/asm-generic/bug.h linux-4.4.38/include/asm-g
#endif /* __ASSEMBLY__ */
#endif
-diff -Nur linux-4.4.38.orig/include/asm-generic/preempt.h linux-4.4.38/include/asm-generic/preempt.h
---- linux-4.4.38.orig/include/asm-generic/preempt.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/asm-generic/preempt.h 2017-01-01 21:00:19.909731275 +0100
+diff -Nur linux-4.4.46.orig/include/asm-generic/preempt.h linux-4.4.46/include/asm-generic/preempt.h
+--- linux-4.4.46.orig/include/asm-generic/preempt.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/asm-generic/preempt.h 2017-02-03 17:18:10.903618130 +0100
@@ -7,10 +7,10 @@
static __always_inline int preempt_count(void)
@@ -11509,9 +11497,9 @@ diff -Nur linux-4.4.38.orig/include/asm-generic/preempt.h linux-4.4.38/include/a
{
return &current_thread_info()->preempt_count;
}
-diff -Nur linux-4.4.38.orig/include/linux/blkdev.h linux-4.4.38/include/linux/blkdev.h
---- linux-4.4.38.orig/include/linux/blkdev.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/linux/blkdev.h 2017-01-01 21:00:19.913731535 +0100
+diff -Nur linux-4.4.46.orig/include/linux/blkdev.h linux-4.4.46/include/linux/blkdev.h
+--- linux-4.4.46.orig/include/linux/blkdev.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/linux/blkdev.h 2017-02-03 17:18:10.903618130 +0100
@@ -89,6 +89,7 @@
struct list_head queuelist;
union {
@@ -11529,9 +11517,9 @@ diff -Nur linux-4.4.38.orig/include/linux/blkdev.h linux-4.4.38/include/linux/bl
struct percpu_ref q_usage_counter;
struct list_head all_q_node;
-diff -Nur linux-4.4.38.orig/include/linux/blk-mq.h linux-4.4.38/include/linux/blk-mq.h
---- linux-4.4.38.orig/include/linux/blk-mq.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/linux/blk-mq.h 2017-01-01 21:00:19.909731275 +0100
+diff -Nur linux-4.4.46.orig/include/linux/blk-mq.h linux-4.4.46/include/linux/blk-mq.h
+--- linux-4.4.46.orig/include/linux/blk-mq.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/linux/blk-mq.h 2017-02-03 17:18:10.903618130 +0100
@@ -212,6 +212,7 @@
struct blk_mq_hw_ctx *blk_mq_map_queue(struct request_queue *, const int ctx_index);
@@ -11540,9 +11528,9 @@ diff -Nur linux-4.4.38.orig/include/linux/blk-mq.h linux-4.4.38/include/linux/bl
int blk_mq_request_started(struct request *rq);
void blk_mq_start_request(struct request *rq);
-diff -Nur linux-4.4.38.orig/include/linux/bottom_half.h linux-4.4.38/include/linux/bottom_half.h
---- linux-4.4.38.orig/include/linux/bottom_half.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/linux/bottom_half.h 2017-01-01 21:00:19.913731535 +0100
+diff -Nur linux-4.4.46.orig/include/linux/bottom_half.h linux-4.4.46/include/linux/bottom_half.h
+--- linux-4.4.46.orig/include/linux/bottom_half.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/linux/bottom_half.h 2017-02-03 17:18:10.903618130 +0100
@@ -3,6 +3,39 @@
#include <linux/preempt.h>
@@ -11590,9 +11578,9 @@ diff -Nur linux-4.4.38.orig/include/linux/bottom_half.h linux-4.4.38/include/lin
+#endif
#endif /* _LINUX_BH_H */
-diff -Nur linux-4.4.38.orig/include/linux/buffer_head.h linux-4.4.38/include/linux/buffer_head.h
---- linux-4.4.38.orig/include/linux/buffer_head.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/linux/buffer_head.h 2017-01-01 21:00:19.913731535 +0100
+diff -Nur linux-4.4.46.orig/include/linux/buffer_head.h linux-4.4.46/include/linux/buffer_head.h
+--- linux-4.4.46.orig/include/linux/buffer_head.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/linux/buffer_head.h 2017-02-03 17:18:10.903618130 +0100
@@ -75,8 +75,50 @@
struct address_space *b_assoc_map; /* mapping this buffer is
associated with */
@@ -11644,9 +11632,9 @@ diff -Nur linux-4.4.38.orig/include/linux/buffer_head.h linux-4.4.38/include/lin
/*
* macro tricks to expand the set_buffer_foo(), clear_buffer_foo()
* and buffer_foo() functions.
-diff -Nur linux-4.4.38.orig/include/linux/cgroup-defs.h linux-4.4.38/include/linux/cgroup-defs.h
---- linux-4.4.38.orig/include/linux/cgroup-defs.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/linux/cgroup-defs.h 2017-01-01 21:00:19.913731535 +0100
+diff -Nur linux-4.4.46.orig/include/linux/cgroup-defs.h linux-4.4.46/include/linux/cgroup-defs.h
+--- linux-4.4.46.orig/include/linux/cgroup-defs.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/linux/cgroup-defs.h 2017-02-03 17:18:10.903618130 +0100
@@ -16,6 +16,7 @@
#include <linux/percpu-refcount.h>
#include <linux/percpu-rwsem.h>
@@ -11663,9 +11651,9 @@ diff -Nur linux-4.4.38.orig/include/linux/cgroup-defs.h linux-4.4.38/include/lin
};
/*
-diff -Nur linux-4.4.38.orig/include/linux/clk/at91_pmc.h linux-4.4.38/include/linux/clk/at91_pmc.h
---- linux-4.4.38.orig/include/linux/clk/at91_pmc.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/linux/clk/at91_pmc.h 2017-01-01 21:00:19.913731535 +0100
+diff -Nur linux-4.4.46.orig/include/linux/clk/at91_pmc.h linux-4.4.46/include/linux/clk/at91_pmc.h
+--- linux-4.4.46.orig/include/linux/clk/at91_pmc.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/linux/clk/at91_pmc.h 2017-02-03 17:18:10.903618130 +0100
@@ -16,18 +16,6 @@
#ifndef AT91_PMC_H
#define AT91_PMC_H
@@ -11685,9 +11673,9 @@ diff -Nur linux-4.4.38.orig/include/linux/clk/at91_pmc.h linux-4.4.38/include/li
#define AT91_PMC_SCER 0x00 /* System Clock Enable Register */
#define AT91_PMC_SCDR 0x04 /* System Clock Disable Register */
-diff -Nur linux-4.4.38.orig/include/linux/completion.h linux-4.4.38/include/linux/completion.h
---- linux-4.4.38.orig/include/linux/completion.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/linux/completion.h 2017-01-01 21:00:19.913731535 +0100
+diff -Nur linux-4.4.46.orig/include/linux/completion.h linux-4.4.46/include/linux/completion.h
+--- linux-4.4.46.orig/include/linux/completion.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/linux/completion.h 2017-02-03 17:18:10.903618130 +0100
@@ -7,8 +7,7 @@
* Atomic wait-for-completion handler data structures.
* See kernel/sched/completion.c for details.
@@ -11721,10 +11709,10 @@ diff -Nur linux-4.4.38.orig/include/linux/completion.h linux-4.4.38/include/linu
}
/**
-diff -Nur linux-4.4.38.orig/include/linux/cpu.h linux-4.4.38/include/linux/cpu.h
---- linux-4.4.38.orig/include/linux/cpu.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/linux/cpu.h 2017-01-01 21:00:19.913731535 +0100
-@@ -231,6 +231,8 @@
+diff -Nur linux-4.4.46.orig/include/linux/cpu.h linux-4.4.46/include/linux/cpu.h
+--- linux-4.4.46.orig/include/linux/cpu.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/linux/cpu.h 2017-02-03 17:18:10.903618130 +0100
+@@ -224,6 +224,8 @@
extern void put_online_cpus(void);
extern void cpu_hotplug_disable(void);
extern void cpu_hotplug_enable(void);
@@ -11733,7 +11721,7 @@ diff -Nur linux-4.4.38.orig/include/linux/cpu.h linux-4.4.38/include/linux/cpu.h
#define hotcpu_notifier(fn, pri) cpu_notifier(fn, pri)
#define __hotcpu_notifier(fn, pri) __cpu_notifier(fn, pri)
#define register_hotcpu_notifier(nb) register_cpu_notifier(nb)
-@@ -248,6 +250,8 @@
+@@ -241,6 +243,8 @@
#define put_online_cpus() do { } while (0)
#define cpu_hotplug_disable() do { } while (0)
#define cpu_hotplug_enable() do { } while (0)
@@ -11742,9 +11730,9 @@ diff -Nur linux-4.4.38.orig/include/linux/cpu.h linux-4.4.38/include/linux/cpu.h
#define hotcpu_notifier(fn, pri) do { (void)(fn); } while (0)
#define __hotcpu_notifier(fn, pri) do { (void)(fn); } while (0)
/* These aren't inline functions due to a GCC bug. */
-diff -Nur linux-4.4.38.orig/include/linux/delay.h linux-4.4.38/include/linux/delay.h
---- linux-4.4.38.orig/include/linux/delay.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/linux/delay.h 2017-01-01 21:00:19.913731535 +0100
+diff -Nur linux-4.4.46.orig/include/linux/delay.h linux-4.4.46/include/linux/delay.h
+--- linux-4.4.46.orig/include/linux/delay.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/linux/delay.h 2017-02-03 17:18:10.903618130 +0100
@@ -52,4 +52,10 @@
msleep(seconds * 1000);
}
@@ -11756,9 +11744,9 @@ diff -Nur linux-4.4.38.orig/include/linux/delay.h linux-4.4.38/include/linux/del
+#endif
+
#endif /* defined(_LINUX_DELAY_H) */
-diff -Nur linux-4.4.38.orig/include/linux/ftrace.h linux-4.4.38/include/linux/ftrace.h
---- linux-4.4.38.orig/include/linux/ftrace.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/linux/ftrace.h 2017-01-01 21:00:19.917731786 +0100
+diff -Nur linux-4.4.46.orig/include/linux/ftrace.h linux-4.4.46/include/linux/ftrace.h
+--- linux-4.4.46.orig/include/linux/ftrace.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/linux/ftrace.h 2017-02-03 17:18:10.903618130 +0100
@@ -694,6 +694,18 @@
#define CALLER_ADDR5 ((unsigned long)ftrace_return_address(5))
#define CALLER_ADDR6 ((unsigned long)ftrace_return_address(6))
@@ -11778,9 +11766,9 @@ diff -Nur linux-4.4.38.orig/include/linux/ftrace.h linux-4.4.38/include/linux/ft
#ifdef CONFIG_IRQSOFF_TRACER
extern void time_hardirqs_on(unsigned long a0, unsigned long a1);
extern void time_hardirqs_off(unsigned long a0, unsigned long a1);
-diff -Nur linux-4.4.38.orig/include/linux/highmem.h linux-4.4.38/include/linux/highmem.h
---- linux-4.4.38.orig/include/linux/highmem.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/linux/highmem.h 2017-01-01 21:00:19.917731786 +0100
+diff -Nur linux-4.4.46.orig/include/linux/highmem.h linux-4.4.46/include/linux/highmem.h
+--- linux-4.4.46.orig/include/linux/highmem.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/linux/highmem.h 2017-02-03 17:18:10.903618130 +0100
@@ -7,6 +7,7 @@
#include <linux/mm.h>
#include <linux/uaccess.h>
@@ -11863,9 +11851,9 @@ diff -Nur linux-4.4.38.orig/include/linux/highmem.h linux-4.4.38/include/linux/h
#endif
}
-diff -Nur linux-4.4.38.orig/include/linux/hrtimer.h linux-4.4.38/include/linux/hrtimer.h
---- linux-4.4.38.orig/include/linux/hrtimer.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/linux/hrtimer.h 2017-01-01 21:00:19.917731786 +0100
+diff -Nur linux-4.4.46.orig/include/linux/hrtimer.h linux-4.4.46/include/linux/hrtimer.h
+--- linux-4.4.46.orig/include/linux/hrtimer.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/linux/hrtimer.h 2017-02-03 17:18:10.903618130 +0100
@@ -87,6 +87,9 @@
* @function: timer expiry callback function
* @base: pointer to the timer base (per cpu and per clock)
@@ -11957,9 +11945,9 @@ diff -Nur linux-4.4.38.orig/include/linux/hrtimer.h linux-4.4.38/include/linux/h
{
return timer->base->cpu_base->running == timer;
}
-diff -Nur linux-4.4.38.orig/include/linux/idr.h linux-4.4.38/include/linux/idr.h
---- linux-4.4.38.orig/include/linux/idr.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/linux/idr.h 2017-01-01 21:00:19.917731786 +0100
+diff -Nur linux-4.4.46.orig/include/linux/idr.h linux-4.4.46/include/linux/idr.h
+--- linux-4.4.46.orig/include/linux/idr.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/linux/idr.h 2017-02-03 17:18:10.903618130 +0100
@@ -95,10 +95,14 @@
* Each idr_preload() should be matched with an invocation of this
* function. See idr_preload() for details.
@@ -11975,9 +11963,9 @@ diff -Nur linux-4.4.38.orig/include/linux/idr.h linux-4.4.38/include/linux/idr.h
/**
* idr_find - return pointer for given id
-diff -Nur linux-4.4.38.orig/include/linux/init_task.h linux-4.4.38/include/linux/init_task.h
---- linux-4.4.38.orig/include/linux/init_task.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/linux/init_task.h 2017-01-01 21:00:19.917731786 +0100
+diff -Nur linux-4.4.46.orig/include/linux/init_task.h linux-4.4.46/include/linux/init_task.h
+--- linux-4.4.46.orig/include/linux/init_task.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/linux/init_task.h 2017-02-03 17:18:10.903618130 +0100
@@ -148,9 +148,15 @@
# define INIT_PERF_EVENTS(tsk)
#endif
@@ -12003,9 +11991,9 @@ diff -Nur linux-4.4.38.orig/include/linux/init_task.h linux-4.4.38/include/linux
.pids = { \
[PIDTYPE_PID] = INIT_PID_LINK(PIDTYPE_PID), \
[PIDTYPE_PGID] = INIT_PID_LINK(PIDTYPE_PGID), \
-diff -Nur linux-4.4.38.orig/include/linux/interrupt.h linux-4.4.38/include/linux/interrupt.h
---- linux-4.4.38.orig/include/linux/interrupt.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/linux/interrupt.h 2017-01-01 21:00:19.917731786 +0100
+diff -Nur linux-4.4.46.orig/include/linux/interrupt.h linux-4.4.46/include/linux/interrupt.h
+--- linux-4.4.46.orig/include/linux/interrupt.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/linux/interrupt.h 2017-02-03 17:18:10.903618130 +0100
@@ -61,6 +61,7 @@
* interrupt handler after suspending interrupts. For system
* wakeup devices users need to implement wakeup detection in
@@ -12182,9 +12170,9 @@ diff -Nur linux-4.4.38.orig/include/linux/interrupt.h linux-4.4.38/include/linux
/*
* Autoprobing for irqs:
*
-diff -Nur linux-4.4.38.orig/include/linux/irqdesc.h linux-4.4.38/include/linux/irqdesc.h
---- linux-4.4.38.orig/include/linux/irqdesc.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/linux/irqdesc.h 2017-01-01 21:00:19.921732045 +0100
+diff -Nur linux-4.4.46.orig/include/linux/irqdesc.h linux-4.4.46/include/linux/irqdesc.h
+--- linux-4.4.46.orig/include/linux/irqdesc.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/linux/irqdesc.h 2017-02-03 17:18:10.903618130 +0100
@@ -61,6 +61,7 @@
unsigned int irqs_unhandled;
atomic_t threads_handled;
@@ -12193,9 +12181,9 @@ diff -Nur linux-4.4.38.orig/include/linux/irqdesc.h linux-4.4.38/include/linux/i
raw_spinlock_t lock;
struct cpumask *percpu_enabled;
#ifdef CONFIG_SMP
-diff -Nur linux-4.4.38.orig/include/linux/irqflags.h linux-4.4.38/include/linux/irqflags.h
---- linux-4.4.38.orig/include/linux/irqflags.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/linux/irqflags.h 2017-01-01 21:00:19.921732045 +0100
+diff -Nur linux-4.4.46.orig/include/linux/irqflags.h linux-4.4.46/include/linux/irqflags.h
+--- linux-4.4.46.orig/include/linux/irqflags.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/linux/irqflags.h 2017-02-03 17:18:10.903618130 +0100
@@ -25,8 +25,6 @@
# define trace_softirqs_enabled(p) ((p)->softirqs_enabled)
# define trace_hardirq_enter() do { current->hardirq_context++; } while (0)
@@ -12246,9 +12234,9 @@ diff -Nur linux-4.4.38.orig/include/linux/irqflags.h linux-4.4.38/include/linux/
+#endif
+
#endif
-diff -Nur linux-4.4.38.orig/include/linux/irq.h linux-4.4.38/include/linux/irq.h
---- linux-4.4.38.orig/include/linux/irq.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/linux/irq.h 2017-01-01 21:00:19.921732045 +0100
+diff -Nur linux-4.4.46.orig/include/linux/irq.h linux-4.4.46/include/linux/irq.h
+--- linux-4.4.46.orig/include/linux/irq.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/linux/irq.h 2017-02-03 17:18:10.903618130 +0100
@@ -72,6 +72,7 @@
* IRQ_IS_POLLED - Always polled by another interrupt. Exclude
* it from the spurious interrupt detection
@@ -12273,9 +12261,9 @@ diff -Nur linux-4.4.38.orig/include/linux/irq.h linux-4.4.38/include/linux/irq.h
#define IRQ_NO_BALANCING_MASK (IRQ_PER_CPU | IRQ_NO_BALANCING)
-diff -Nur linux-4.4.38.orig/include/linux/irq_work.h linux-4.4.38/include/linux/irq_work.h
---- linux-4.4.38.orig/include/linux/irq_work.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/linux/irq_work.h 2017-01-01 21:00:19.921732045 +0100
+diff -Nur linux-4.4.46.orig/include/linux/irq_work.h linux-4.4.46/include/linux/irq_work.h
+--- linux-4.4.46.orig/include/linux/irq_work.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/linux/irq_work.h 2017-02-03 17:18:10.903618130 +0100
@@ -16,6 +16,7 @@
#define IRQ_WORK_BUSY 2UL
#define IRQ_WORK_FLAGS 3UL
@@ -12295,9 +12283,9 @@ diff -Nur linux-4.4.38.orig/include/linux/irq_work.h linux-4.4.38/include/linux/
+#endif
+
#endif /* _LINUX_IRQ_WORK_H */
-diff -Nur linux-4.4.38.orig/include/linux/jbd2.h linux-4.4.38/include/linux/jbd2.h
---- linux-4.4.38.orig/include/linux/jbd2.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/linux/jbd2.h 2017-01-01 21:00:19.921732045 +0100
+diff -Nur linux-4.4.46.orig/include/linux/jbd2.h linux-4.4.46/include/linux/jbd2.h
+--- linux-4.4.46.orig/include/linux/jbd2.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/linux/jbd2.h 2017-02-03 17:18:10.907618284 +0100
@@ -352,32 +352,56 @@
static inline void jbd_lock_bh_state(struct buffer_head *bh)
@@ -12355,9 +12343,9 @@ diff -Nur linux-4.4.38.orig/include/linux/jbd2.h linux-4.4.38/include/linux/jbd2
}
#define J_ASSERT(assert) BUG_ON(!(assert))
-diff -Nur linux-4.4.38.orig/include/linux/kdb.h linux-4.4.38/include/linux/kdb.h
---- linux-4.4.38.orig/include/linux/kdb.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/linux/kdb.h 2017-01-01 21:00:19.921732045 +0100
+diff -Nur linux-4.4.46.orig/include/linux/kdb.h linux-4.4.46/include/linux/kdb.h
+--- linux-4.4.46.orig/include/linux/kdb.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/linux/kdb.h 2017-02-03 17:18:10.907618284 +0100
@@ -167,6 +167,7 @@
extern __printf(1, 2) int kdb_printf(const char *, ...);
typedef __printf(1, 2) int (*kdb_printf_t)(const char *, ...);
@@ -12374,9 +12362,9 @@ diff -Nur linux-4.4.38.orig/include/linux/kdb.h linux-4.4.38/include/linux/kdb.h
static inline void kdb_init(int level) {}
static inline int kdb_register(char *cmd, kdb_func_t func, char *usage,
char *help, short minlen) { return 0; }
-diff -Nur linux-4.4.38.orig/include/linux/kernel.h linux-4.4.38/include/linux/kernel.h
---- linux-4.4.38.orig/include/linux/kernel.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/linux/kernel.h 2017-01-01 21:00:19.925732306 +0100
+diff -Nur linux-4.4.46.orig/include/linux/kernel.h linux-4.4.46/include/linux/kernel.h
+--- linux-4.4.46.orig/include/linux/kernel.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/linux/kernel.h 2017-02-03 17:18:10.907618284 +0100
@@ -188,6 +188,9 @@
*/
# define might_sleep() \
@@ -12426,9 +12414,9 @@ diff -Nur linux-4.4.38.orig/include/linux/kernel.h linux-4.4.38/include/linux/ke
} system_state;
#define TAINT_PROPRIETARY_MODULE 0
-diff -Nur linux-4.4.38.orig/include/linux/kvm_host.h linux-4.4.38/include/linux/kvm_host.h
---- linux-4.4.38.orig/include/linux/kvm_host.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/linux/kvm_host.h 2017-01-01 21:00:19.925732306 +0100
+diff -Nur linux-4.4.46.orig/include/linux/kvm_host.h linux-4.4.46/include/linux/kvm_host.h
+--- linux-4.4.46.orig/include/linux/kvm_host.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/linux/kvm_host.h 2017-02-03 17:18:10.907618284 +0100
@@ -25,6 +25,7 @@
#include <linux/irqflags.h>
#include <linux/context_tracking.h>
@@ -12455,9 +12443,9 @@ diff -Nur linux-4.4.38.orig/include/linux/kvm_host.h linux-4.4.38/include/linux/
{
#ifdef __KVM_HAVE_ARCH_WQP
return vcpu->arch.wqp;
-diff -Nur linux-4.4.38.orig/include/linux/lglock.h linux-4.4.38/include/linux/lglock.h
---- linux-4.4.38.orig/include/linux/lglock.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/linux/lglock.h 2017-01-01 21:00:19.925732306 +0100
+diff -Nur linux-4.4.46.orig/include/linux/lglock.h linux-4.4.46/include/linux/lglock.h
+--- linux-4.4.46.orig/include/linux/lglock.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/linux/lglock.h 2017-02-03 17:18:10.907618284 +0100
@@ -34,13 +34,30 @@
#endif
@@ -12510,9 +12498,9 @@ diff -Nur linux-4.4.38.orig/include/linux/lglock.h linux-4.4.38/include/linux/lg
#else
/* When !CONFIG_SMP, map lglock to spinlock */
#define lglock spinlock
-diff -Nur linux-4.4.38.orig/include/linux/list_bl.h linux-4.4.38/include/linux/list_bl.h
---- linux-4.4.38.orig/include/linux/list_bl.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/linux/list_bl.h 2017-01-01 21:00:19.925732306 +0100
+diff -Nur linux-4.4.46.orig/include/linux/list_bl.h linux-4.4.46/include/linux/list_bl.h
+--- linux-4.4.46.orig/include/linux/list_bl.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/linux/list_bl.h 2017-02-03 17:18:10.907618284 +0100
@@ -2,6 +2,7 @@
#define _LINUX_LIST_BL_H
@@ -12575,9 +12563,9 @@ diff -Nur linux-4.4.38.orig/include/linux/list_bl.h linux-4.4.38/include/linux/l
}
static inline bool hlist_bl_is_locked(struct hlist_bl_head *b)
-diff -Nur linux-4.4.38.orig/include/linux/locallock.h linux-4.4.38/include/linux/locallock.h
---- linux-4.4.38.orig/include/linux/locallock.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.4.38/include/linux/locallock.h 2017-01-01 21:00:19.925732306 +0100
+diff -Nur linux-4.4.46.orig/include/linux/locallock.h linux-4.4.46/include/linux/locallock.h
+--- linux-4.4.46.orig/include/linux/locallock.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.4.46/include/linux/locallock.h 2017-02-03 17:18:10.907618284 +0100
@@ -0,0 +1,276 @@
+#ifndef _LINUX_LOCALLOCK_H
+#define _LINUX_LOCALLOCK_H
@@ -12855,9 +12843,9 @@ diff -Nur linux-4.4.38.orig/include/linux/locallock.h linux-4.4.38/include/linux
+#endif
+
+#endif
-diff -Nur linux-4.4.38.orig/include/linux/mm_types.h linux-4.4.38/include/linux/mm_types.h
---- linux-4.4.38.orig/include/linux/mm_types.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/linux/mm_types.h 2017-01-01 21:00:19.925732306 +0100
+diff -Nur linux-4.4.46.orig/include/linux/mm_types.h linux-4.4.46/include/linux/mm_types.h
+--- linux-4.4.46.orig/include/linux/mm_types.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/linux/mm_types.h 2017-02-03 17:18:10.907618284 +0100
@@ -11,6 +11,7 @@
#include <linux/completion.h>
#include <linux/cpumask.h>
@@ -12866,7 +12854,7 @@ diff -Nur linux-4.4.38.orig/include/linux/mm_types.h linux-4.4.38/include/linux/
#include <linux/page-flags-layout.h>
#include <asm/page.h>
#include <asm/mmu.h>
-@@ -504,6 +505,9 @@
+@@ -505,6 +506,9 @@
bool tlb_flush_pending;
#endif
struct uprobes_state uprobes_state;
@@ -12876,9 +12864,9 @@ diff -Nur linux-4.4.38.orig/include/linux/mm_types.h linux-4.4.38/include/linux/
#ifdef CONFIG_X86_INTEL_MPX
/* address of the bounds directory */
void __user *bd_addr;
-diff -Nur linux-4.4.38.orig/include/linux/mutex.h linux-4.4.38/include/linux/mutex.h
---- linux-4.4.38.orig/include/linux/mutex.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/linux/mutex.h 2017-01-01 21:00:19.925732306 +0100
+diff -Nur linux-4.4.46.orig/include/linux/mutex.h linux-4.4.46/include/linux/mutex.h
+--- linux-4.4.46.orig/include/linux/mutex.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/linux/mutex.h 2017-02-03 17:18:10.907618284 +0100
@@ -19,6 +19,17 @@
#include <asm/processor.h>
#include <linux/osq_lock.h>
@@ -12920,9 +12908,9 @@ diff -Nur linux-4.4.38.orig/include/linux/mutex.h linux-4.4.38/include/linux/mut
extern int atomic_dec_and_mutex_lock(atomic_t *cnt, struct mutex *lock);
#endif /* __LINUX_MUTEX_H */
-diff -Nur linux-4.4.38.orig/include/linux/mutex_rt.h linux-4.4.38/include/linux/mutex_rt.h
---- linux-4.4.38.orig/include/linux/mutex_rt.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.4.38/include/linux/mutex_rt.h 2017-01-01 21:00:19.925732306 +0100
+diff -Nur linux-4.4.46.orig/include/linux/mutex_rt.h linux-4.4.46/include/linux/mutex_rt.h
+--- linux-4.4.46.orig/include/linux/mutex_rt.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.4.46/include/linux/mutex_rt.h 2017-02-03 17:18:10.907618284 +0100
@@ -0,0 +1,84 @@
+#ifndef __LINUX_MUTEX_RT_H
+#define __LINUX_MUTEX_RT_H
@@ -13008,9 +12996,9 @@ diff -Nur linux-4.4.38.orig/include/linux/mutex_rt.h linux-4.4.38/include/linux/
+} while (0)
+
+#endif
-diff -Nur linux-4.4.38.orig/include/linux/netdevice.h linux-4.4.38/include/linux/netdevice.h
---- linux-4.4.38.orig/include/linux/netdevice.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/linux/netdevice.h 2017-01-01 21:00:19.929732559 +0100
+diff -Nur linux-4.4.46.orig/include/linux/netdevice.h linux-4.4.46/include/linux/netdevice.h
+--- linux-4.4.46.orig/include/linux/netdevice.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/linux/netdevice.h 2017-02-03 17:18:10.907618284 +0100
@@ -2286,11 +2286,20 @@
void synchronize_net(void);
int init_dummy_netdev(struct net_device *dev);
@@ -13032,7 +13020,7 @@ diff -Nur linux-4.4.38.orig/include/linux/netdevice.h linux-4.4.38/include/linux
struct net_device *dev_get_by_index(struct net *net, int ifindex);
struct net_device *__dev_get_by_index(struct net *net, int ifindex);
-@@ -2601,6 +2610,7 @@
+@@ -2606,6 +2615,7 @@
unsigned int dropped;
struct sk_buff_head input_pkt_queue;
struct napi_struct backlog;
@@ -13040,9 +13028,9 @@ diff -Nur linux-4.4.38.orig/include/linux/netdevice.h linux-4.4.38/include/linux
};
-diff -Nur linux-4.4.38.orig/include/linux/netfilter/x_tables.h linux-4.4.38/include/linux/netfilter/x_tables.h
---- linux-4.4.38.orig/include/linux/netfilter/x_tables.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/linux/netfilter/x_tables.h 2017-01-01 21:00:19.929732559 +0100
+diff -Nur linux-4.4.46.orig/include/linux/netfilter/x_tables.h linux-4.4.46/include/linux/netfilter/x_tables.h
+--- linux-4.4.46.orig/include/linux/netfilter/x_tables.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/linux/netfilter/x_tables.h 2017-02-03 17:18:10.907618284 +0100
@@ -4,6 +4,7 @@
#include <linux/netdevice.h>
@@ -13078,9 +13066,9 @@ diff -Nur linux-4.4.38.orig/include/linux/netfilter/x_tables.h linux-4.4.38/incl
}
/*
-diff -Nur linux-4.4.38.orig/include/linux/notifier.h linux-4.4.38/include/linux/notifier.h
---- linux-4.4.38.orig/include/linux/notifier.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/linux/notifier.h 2017-01-01 21:00:19.933732820 +0100
+diff -Nur linux-4.4.46.orig/include/linux/notifier.h linux-4.4.46/include/linux/notifier.h
+--- linux-4.4.46.orig/include/linux/notifier.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/linux/notifier.h 2017-02-03 17:18:10.907618284 +0100
@@ -6,7 +6,7 @@
*
* Alan Cox <Alan.Cox@linux.org>
@@ -13160,9 +13148,9 @@ diff -Nur linux-4.4.38.orig/include/linux/notifier.h linux-4.4.38/include/linux/
/* CPU notfiers are defined in include/linux/cpu.h. */
/* netdevice notifiers are defined in include/linux/netdevice.h */
-diff -Nur linux-4.4.38.orig/include/linux/percpu.h linux-4.4.38/include/linux/percpu.h
---- linux-4.4.38.orig/include/linux/percpu.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/linux/percpu.h 2017-01-01 21:00:19.933732820 +0100
+diff -Nur linux-4.4.46.orig/include/linux/percpu.h linux-4.4.46/include/linux/percpu.h
+--- linux-4.4.46.orig/include/linux/percpu.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/linux/percpu.h 2017-02-03 17:18:10.907618284 +0100
@@ -24,6 +24,35 @@
PERCPU_MODULE_RESERVE)
#endif
@@ -13199,9 +13187,9 @@ diff -Nur linux-4.4.38.orig/include/linux/percpu.h linux-4.4.38/include/linux/pe
/* minimum unit size, also is the maximum supported allocation size */
#define PCPU_MIN_UNIT_SIZE PFN_ALIGN(32 << 10)
-diff -Nur linux-4.4.38.orig/include/linux/pid.h linux-4.4.38/include/linux/pid.h
---- linux-4.4.38.orig/include/linux/pid.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/linux/pid.h 2017-01-01 21:00:19.933732820 +0100
+diff -Nur linux-4.4.46.orig/include/linux/pid.h linux-4.4.46/include/linux/pid.h
+--- linux-4.4.46.orig/include/linux/pid.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/linux/pid.h 2017-02-03 17:18:10.907618284 +0100
@@ -2,6 +2,7 @@
#define _LINUX_PID_H
@@ -13210,9 +13198,9 @@ diff -Nur linux-4.4.38.orig/include/linux/pid.h linux-4.4.38/include/linux/pid.h
enum pid_type
{
-diff -Nur linux-4.4.38.orig/include/linux/preempt.h linux-4.4.38/include/linux/preempt.h
---- linux-4.4.38.orig/include/linux/preempt.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/linux/preempt.h 2017-01-01 21:00:19.933732820 +0100
+diff -Nur linux-4.4.46.orig/include/linux/preempt.h linux-4.4.46/include/linux/preempt.h
+--- linux-4.4.46.orig/include/linux/preempt.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/linux/preempt.h 2017-02-03 17:18:10.907618284 +0100
@@ -50,7 +50,11 @@
#define HARDIRQ_OFFSET (1UL << HARDIRQ_SHIFT)
#define NMI_OFFSET (1UL << NMI_SHIFT)
@@ -13366,9 +13354,9 @@ diff -Nur linux-4.4.38.orig/include/linux/preempt.h linux-4.4.38/include/linux/p
#ifdef CONFIG_PREEMPT_NOTIFIERS
struct preempt_notifier;
-diff -Nur linux-4.4.38.orig/include/linux/printk.h linux-4.4.38/include/linux/printk.h
---- linux-4.4.38.orig/include/linux/printk.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/linux/printk.h 2017-01-01 21:00:19.933732820 +0100
+diff -Nur linux-4.4.46.orig/include/linux/printk.h linux-4.4.46/include/linux/printk.h
+--- linux-4.4.46.orig/include/linux/printk.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/linux/printk.h 2017-02-03 17:18:10.907618284 +0100
@@ -117,9 +117,11 @@
#ifdef CONFIG_EARLY_PRINTK
extern asmlinkage __printf(1, 2)
@@ -13381,9 +13369,9 @@ diff -Nur linux-4.4.38.orig/include/linux/printk.h linux-4.4.38/include/linux/pr
#endif
typedef __printf(1, 0) int (*printk_func_t)(const char *fmt, va_list args);
-diff -Nur linux-4.4.38.orig/include/linux/radix-tree.h linux-4.4.38/include/linux/radix-tree.h
---- linux-4.4.38.orig/include/linux/radix-tree.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/linux/radix-tree.h 2017-01-01 21:00:19.933732820 +0100
+diff -Nur linux-4.4.46.orig/include/linux/radix-tree.h linux-4.4.46/include/linux/radix-tree.h
+--- linux-4.4.46.orig/include/linux/radix-tree.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/linux/radix-tree.h 2017-02-03 17:18:10.907618284 +0100
@@ -277,8 +277,13 @@
unsigned int radix_tree_gang_lookup_slot(struct radix_tree_root *root,
void ***results, unsigned long *indices,
@@ -13407,9 +13395,9 @@ diff -Nur linux-4.4.38.orig/include/linux/radix-tree.h linux-4.4.38/include/linu
}
/**
-diff -Nur linux-4.4.38.orig/include/linux/random.h linux-4.4.38/include/linux/random.h
---- linux-4.4.38.orig/include/linux/random.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/linux/random.h 2017-01-01 21:00:19.933732820 +0100
+diff -Nur linux-4.4.46.orig/include/linux/random.h linux-4.4.46/include/linux/random.h
+--- linux-4.4.46.orig/include/linux/random.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/linux/random.h 2017-02-03 17:18:10.907618284 +0100
@@ -20,7 +20,7 @@
extern void add_device_randomness(const void *, unsigned int);
extern void add_input_randomness(unsigned int type, unsigned int code,
@@ -13419,9 +13407,9 @@ diff -Nur linux-4.4.38.orig/include/linux/random.h linux-4.4.38/include/linux/ra
extern void get_random_bytes(void *buf, int nbytes);
extern int add_random_ready_callback(struct random_ready_callback *rdy);
-diff -Nur linux-4.4.38.orig/include/linux/rbtree.h linux-4.4.38/include/linux/rbtree.h
---- linux-4.4.38.orig/include/linux/rbtree.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/linux/rbtree.h 2017-01-01 21:00:19.933732820 +0100
+diff -Nur linux-4.4.46.orig/include/linux/rbtree.h linux-4.4.46/include/linux/rbtree.h
+--- linux-4.4.46.orig/include/linux/rbtree.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/linux/rbtree.h 2017-02-03 17:18:10.907618284 +0100
@@ -31,7 +31,6 @@
#include <linux/kernel.h>
@@ -13447,9 +13435,9 @@ diff -Nur linux-4.4.38.orig/include/linux/rbtree.h linux-4.4.38/include/linux/rb
#define rb_entry_safe(ptr, type, member) \
({ typeof(ptr) ____ptr = (ptr); \
-diff -Nur linux-4.4.38.orig/include/linux/rcupdate.h linux-4.4.38/include/linux/rcupdate.h
---- linux-4.4.38.orig/include/linux/rcupdate.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/linux/rcupdate.h 2017-01-01 21:00:19.937733073 +0100
+diff -Nur linux-4.4.46.orig/include/linux/rcupdate.h linux-4.4.46/include/linux/rcupdate.h
+--- linux-4.4.46.orig/include/linux/rcupdate.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/linux/rcupdate.h 2017-02-03 17:18:10.907618284 +0100
@@ -169,6 +169,9 @@
#endif /* #else #ifdef CONFIG_PREEMPT_RCU */
@@ -13534,9 +13522,9 @@ diff -Nur linux-4.4.38.orig/include/linux/rcupdate.h linux-4.4.38/include/linux/
local_bh_enable();
}
-diff -Nur linux-4.4.38.orig/include/linux/rcutree.h linux-4.4.38/include/linux/rcutree.h
---- linux-4.4.38.orig/include/linux/rcutree.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/linux/rcutree.h 2017-01-01 21:00:19.937733073 +0100
+diff -Nur linux-4.4.46.orig/include/linux/rcutree.h linux-4.4.46/include/linux/rcutree.h
+--- linux-4.4.46.orig/include/linux/rcutree.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/linux/rcutree.h 2017-02-03 17:18:10.907618284 +0100
@@ -44,7 +44,11 @@
rcu_note_context_switch();
}
@@ -13589,9 +13577,9 @@ diff -Nur linux-4.4.38.orig/include/linux/rcutree.h linux-4.4.38/include/linux/r
void rcu_all_qs(void);
#endif /* __LINUX_RCUTREE_H */
-diff -Nur linux-4.4.38.orig/include/linux/rtmutex.h linux-4.4.38/include/linux/rtmutex.h
---- linux-4.4.38.orig/include/linux/rtmutex.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/linux/rtmutex.h 2017-01-01 21:00:19.937733073 +0100
+diff -Nur linux-4.4.46.orig/include/linux/rtmutex.h linux-4.4.46/include/linux/rtmutex.h
+--- linux-4.4.46.orig/include/linux/rtmutex.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/linux/rtmutex.h 2017-02-03 17:18:10.911618440 +0100
@@ -13,11 +13,15 @@
#define __LINUX_RT_MUTEX_H
@@ -13666,9 +13654,9 @@ diff -Nur linux-4.4.38.orig/include/linux/rtmutex.h linux-4.4.38/include/linux/r
extern int rt_mutex_timed_lock(struct rt_mutex *lock,
struct hrtimer_sleeper *timeout);
-diff -Nur linux-4.4.38.orig/include/linux/rwlock_rt.h linux-4.4.38/include/linux/rwlock_rt.h
---- linux-4.4.38.orig/include/linux/rwlock_rt.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.4.38/include/linux/rwlock_rt.h 2017-01-01 21:00:19.937733073 +0100
+diff -Nur linux-4.4.46.orig/include/linux/rwlock_rt.h linux-4.4.46/include/linux/rwlock_rt.h
+--- linux-4.4.46.orig/include/linux/rwlock_rt.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.4.46/include/linux/rwlock_rt.h 2017-02-03 17:18:10.911618440 +0100
@@ -0,0 +1,99 @@
+#ifndef __LINUX_RWLOCK_RT_H
+#define __LINUX_RWLOCK_RT_H
@@ -13769,9 +13757,9 @@ diff -Nur linux-4.4.38.orig/include/linux/rwlock_rt.h linux-4.4.38/include/linux
+ } while (0)
+
+#endif
-diff -Nur linux-4.4.38.orig/include/linux/rwlock_types.h linux-4.4.38/include/linux/rwlock_types.h
---- linux-4.4.38.orig/include/linux/rwlock_types.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/linux/rwlock_types.h 2017-01-01 21:00:19.937733073 +0100
+diff -Nur linux-4.4.46.orig/include/linux/rwlock_types.h linux-4.4.46/include/linux/rwlock_types.h
+--- linux-4.4.46.orig/include/linux/rwlock_types.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/linux/rwlock_types.h 2017-02-03 17:18:10.911618440 +0100
@@ -1,6 +1,10 @@
#ifndef __LINUX_RWLOCK_TYPES_H
#define __LINUX_RWLOCK_TYPES_H
@@ -13792,9 +13780,9 @@ diff -Nur linux-4.4.38.orig/include/linux/rwlock_types.h linux-4.4.38/include/li
+ rwlock_t name __cacheline_aligned_in_smp = __RW_LOCK_UNLOCKED(name)
#endif /* __LINUX_RWLOCK_TYPES_H */
-diff -Nur linux-4.4.38.orig/include/linux/rwlock_types_rt.h linux-4.4.38/include/linux/rwlock_types_rt.h
---- linux-4.4.38.orig/include/linux/rwlock_types_rt.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.4.38/include/linux/rwlock_types_rt.h 2017-01-01 21:00:19.937733073 +0100
+diff -Nur linux-4.4.46.orig/include/linux/rwlock_types_rt.h linux-4.4.46/include/linux/rwlock_types_rt.h
+--- linux-4.4.46.orig/include/linux/rwlock_types_rt.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.4.46/include/linux/rwlock_types_rt.h 2017-02-03 17:18:10.911618440 +0100
@@ -0,0 +1,33 @@
+#ifndef __LINUX_RWLOCK_TYPES_RT_H
+#define __LINUX_RWLOCK_TYPES_RT_H
@@ -13829,9 +13817,9 @@ diff -Nur linux-4.4.38.orig/include/linux/rwlock_types_rt.h linux-4.4.38/include
+ rwlock_t name __cacheline_aligned_in_smp = __RW_LOCK_UNLOCKED(name)
+
+#endif
-diff -Nur linux-4.4.38.orig/include/linux/rwsem.h linux-4.4.38/include/linux/rwsem.h
---- linux-4.4.38.orig/include/linux/rwsem.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/linux/rwsem.h 2017-01-01 21:00:19.937733073 +0100
+diff -Nur linux-4.4.46.orig/include/linux/rwsem.h linux-4.4.46/include/linux/rwsem.h
+--- linux-4.4.46.orig/include/linux/rwsem.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/linux/rwsem.h 2017-02-03 17:18:10.911618440 +0100
@@ -18,6 +18,10 @@
#include <linux/osq_lock.h>
#endif
@@ -13850,9 +13838,9 @@ diff -Nur linux-4.4.38.orig/include/linux/rwsem.h linux-4.4.38/include/linux/rws
+#endif /* !PREEMPT_RT_FULL */
+
#endif /* _LINUX_RWSEM_H */
-diff -Nur linux-4.4.38.orig/include/linux/rwsem_rt.h linux-4.4.38/include/linux/rwsem_rt.h
---- linux-4.4.38.orig/include/linux/rwsem_rt.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.4.38/include/linux/rwsem_rt.h 2017-01-01 21:00:19.937733073 +0100
+diff -Nur linux-4.4.46.orig/include/linux/rwsem_rt.h linux-4.4.46/include/linux/rwsem_rt.h
+--- linux-4.4.46.orig/include/linux/rwsem_rt.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.4.46/include/linux/rwsem_rt.h 2017-02-03 17:18:10.911618440 +0100
@@ -0,0 +1,152 @@
+#ifndef _LINUX_RWSEM_RT_H
+#define _LINUX_RWSEM_RT_H
@@ -14006,9 +13994,9 @@ diff -Nur linux-4.4.38.orig/include/linux/rwsem_rt.h linux-4.4.38/include/linux/
+}
+#endif
+#endif
-diff -Nur linux-4.4.38.orig/include/linux/sched.h linux-4.4.38/include/linux/sched.h
---- linux-4.4.38.orig/include/linux/sched.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/linux/sched.h 2017-01-01 21:00:19.941733334 +0100
+diff -Nur linux-4.4.46.orig/include/linux/sched.h linux-4.4.46/include/linux/sched.h
+--- linux-4.4.46.orig/include/linux/sched.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/linux/sched.h 2017-02-03 17:18:10.911618440 +0100
@@ -26,6 +26,7 @@
#include <linux/nodemask.h>
#include <linux/mm_types.h>
@@ -14117,8 +14105,8 @@ diff -Nur linux-4.4.38.orig/include/linux/sched.h linux-4.4.38/include/linux/sch
+#endif
/* process credentials */
- const struct cred __rcu *real_cred; /* objective and real subjective task
-@@ -1568,10 +1592,15 @@
+ const struct cred __rcu *ptracer_cred; /* Tracer's credentials at attach */
+@@ -1569,10 +1593,15 @@
/* signal handlers */
struct signal_struct *signal;
struct sighand_struct *sighand;
@@ -14134,7 +14122,7 @@ diff -Nur linux-4.4.38.orig/include/linux/sched.h linux-4.4.38/include/linux/sch
unsigned long sas_ss_sp;
size_t sas_ss_size;
-@@ -1795,6 +1824,12 @@
+@@ -1796,6 +1825,12 @@
unsigned long trace;
/* bitmask and counter of trace recursion */
unsigned long trace_recursion;
@@ -14147,7 +14135,7 @@ diff -Nur linux-4.4.38.orig/include/linux/sched.h linux-4.4.38/include/linux/sch
#endif /* CONFIG_TRACING */
#ifdef CONFIG_MEMCG
struct mem_cgroup *memcg_in_oom;
-@@ -1811,9 +1846,23 @@
+@@ -1812,9 +1847,23 @@
unsigned int sequential_io;
unsigned int sequential_io_avg;
#endif
@@ -14171,7 +14159,7 @@ diff -Nur linux-4.4.38.orig/include/linux/sched.h linux-4.4.38/include/linux/sch
int pagefault_disabled;
/* CPU-specific state of this task */
struct thread_struct thread;
-@@ -1831,9 +1880,6 @@
+@@ -1832,9 +1881,6 @@
# define arch_task_struct_size (sizeof(struct task_struct))
#endif
@@ -14181,7 +14169,7 @@ diff -Nur linux-4.4.38.orig/include/linux/sched.h linux-4.4.38/include/linux/sch
#define TNF_MIGRATED 0x01
#define TNF_NO_GROUP 0x02
#define TNF_SHARED 0x04
-@@ -2023,6 +2069,15 @@
+@@ -2024,6 +2070,15 @@
extern void free_task(struct task_struct *tsk);
#define get_task_struct(tsk) do { atomic_inc(&(tsk)->usage); } while(0)
@@ -14197,7 +14185,7 @@ diff -Nur linux-4.4.38.orig/include/linux/sched.h linux-4.4.38/include/linux/sch
extern void __put_task_struct(struct task_struct *t);
static inline void put_task_struct(struct task_struct *t)
-@@ -2030,6 +2085,7 @@
+@@ -2031,6 +2086,7 @@
if (atomic_dec_and_test(&t->usage))
__put_task_struct(t);
}
@@ -14205,7 +14193,7 @@ diff -Nur linux-4.4.38.orig/include/linux/sched.h linux-4.4.38/include/linux/sch
#ifdef CONFIG_VIRT_CPU_ACCOUNTING_GEN
extern void task_cputime(struct task_struct *t,
-@@ -2068,6 +2124,7 @@
+@@ -2069,6 +2125,7 @@
/*
* Per process flags
*/
@@ -14213,7 +14201,7 @@ diff -Nur linux-4.4.38.orig/include/linux/sched.h linux-4.4.38/include/linux/sch
#define PF_EXITING 0x00000004 /* getting shut down */
#define PF_EXITPIDONE 0x00000008 /* pi exit done on shut down */
#define PF_VCPU 0x00000010 /* I'm a virtual CPU */
-@@ -2232,6 +2289,10 @@
+@@ -2233,6 +2290,10 @@
extern int set_cpus_allowed_ptr(struct task_struct *p,
const struct cpumask *new_mask);
@@ -14224,7 +14212,7 @@ diff -Nur linux-4.4.38.orig/include/linux/sched.h linux-4.4.38/include/linux/sch
#else
static inline void do_set_cpus_allowed(struct task_struct *p,
const struct cpumask *new_mask)
-@@ -2244,6 +2305,9 @@
+@@ -2245,6 +2306,9 @@
return -EINVAL;
return 0;
}
@@ -14234,7 +14222,7 @@ diff -Nur linux-4.4.38.orig/include/linux/sched.h linux-4.4.38/include/linux/sch
#endif
#ifdef CONFIG_NO_HZ_COMMON
-@@ -2453,6 +2517,7 @@
+@@ -2454,6 +2518,7 @@
extern int wake_up_state(struct task_struct *tsk, unsigned int state);
extern int wake_up_process(struct task_struct *tsk);
@@ -14242,7 +14230,7 @@ diff -Nur linux-4.4.38.orig/include/linux/sched.h linux-4.4.38/include/linux/sch
extern void wake_up_new_task(struct task_struct *tsk);
#ifdef CONFIG_SMP
extern void kick_process(struct task_struct *tsk);
-@@ -2576,12 +2641,24 @@
+@@ -2577,12 +2642,24 @@
/* mmdrop drops the mm and the page tables */
extern void __mmdrop(struct mm_struct *);
@@ -14267,7 +14255,7 @@ diff -Nur linux-4.4.38.orig/include/linux/sched.h linux-4.4.38/include/linux/sch
/* mmput gets rid of the mappings and all user-space */
extern void mmput(struct mm_struct *);
/* Grab a reference to a task's mm, if it is not already going away */
-@@ -2891,6 +2968,43 @@
+@@ -2892,6 +2969,43 @@
return unlikely(test_tsk_thread_flag(tsk,TIF_NEED_RESCHED));
}
@@ -14311,7 +14299,7 @@ diff -Nur linux-4.4.38.orig/include/linux/sched.h linux-4.4.38/include/linux/sch
static inline int restart_syscall(void)
{
set_tsk_thread_flag(current, TIF_SIGPENDING);
-@@ -2922,6 +3036,51 @@
+@@ -2923,6 +3037,51 @@
return (state & TASK_INTERRUPTIBLE) || __fatal_signal_pending(p);
}
@@ -14363,7 +14351,7 @@ diff -Nur linux-4.4.38.orig/include/linux/sched.h linux-4.4.38/include/linux/sch
/*
* cond_resched() and cond_resched_lock(): latency reduction via
* explicit rescheduling in places that are safe. The return
-@@ -2943,12 +3102,16 @@
+@@ -2944,12 +3103,16 @@
__cond_resched_lock(lock); \
})
@@ -14380,7 +14368,7 @@ diff -Nur linux-4.4.38.orig/include/linux/sched.h linux-4.4.38/include/linux/sch
static inline void cond_resched_rcu(void)
{
-@@ -3110,6 +3273,31 @@
+@@ -3111,6 +3274,31 @@
#endif /* CONFIG_SMP */
@@ -14412,9 +14400,9 @@ diff -Nur linux-4.4.38.orig/include/linux/sched.h linux-4.4.38/include/linux/sch
extern long sched_setaffinity(pid_t pid, const struct cpumask *new_mask);
extern long sched_getaffinity(pid_t pid, struct cpumask *mask);
-diff -Nur linux-4.4.38.orig/include/linux/seqlock.h linux-4.4.38/include/linux/seqlock.h
---- linux-4.4.38.orig/include/linux/seqlock.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/linux/seqlock.h 2017-01-01 21:00:19.941733334 +0100
+diff -Nur linux-4.4.46.orig/include/linux/seqlock.h linux-4.4.46/include/linux/seqlock.h
+--- linux-4.4.46.orig/include/linux/seqlock.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/linux/seqlock.h 2017-02-03 17:18:10.911618440 +0100
@@ -220,20 +220,30 @@
return __read_seqcount_retry(s, start);
}
@@ -14544,9 +14532,9 @@ diff -Nur linux-4.4.38.orig/include/linux/seqlock.h linux-4.4.38/include/linux/s
spin_unlock_irqrestore(&sl->lock, flags);
}
-diff -Nur linux-4.4.38.orig/include/linux/signal.h linux-4.4.38/include/linux/signal.h
---- linux-4.4.38.orig/include/linux/signal.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/linux/signal.h 2017-01-01 21:00:19.941733334 +0100
+diff -Nur linux-4.4.46.orig/include/linux/signal.h linux-4.4.46/include/linux/signal.h
+--- linux-4.4.46.orig/include/linux/signal.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/linux/signal.h 2017-02-03 17:18:10.911618440 +0100
@@ -233,6 +233,7 @@
}
@@ -14555,9 +14543,9 @@ diff -Nur linux-4.4.38.orig/include/linux/signal.h linux-4.4.38/include/linux/si
/* Test if 'sig' is valid signal. Use this instead of testing _NSIG directly */
static inline int valid_signal(unsigned long sig)
-diff -Nur linux-4.4.38.orig/include/linux/skbuff.h linux-4.4.38/include/linux/skbuff.h
---- linux-4.4.38.orig/include/linux/skbuff.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/linux/skbuff.h 2017-01-01 21:00:19.945733587 +0100
+diff -Nur linux-4.4.46.orig/include/linux/skbuff.h linux-4.4.46/include/linux/skbuff.h
+--- linux-4.4.46.orig/include/linux/skbuff.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/linux/skbuff.h 2017-02-03 17:18:10.911618440 +0100
@@ -203,6 +203,7 @@
__u32 qlen;
@@ -14579,9 +14567,9 @@ diff -Nur linux-4.4.38.orig/include/linux/skbuff.h linux-4.4.38/include/linux/sk
static inline void skb_queue_head_init_class(struct sk_buff_head *list,
struct lock_class_key *class)
{
-diff -Nur linux-4.4.38.orig/include/linux/smp.h linux-4.4.38/include/linux/smp.h
---- linux-4.4.38.orig/include/linux/smp.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/linux/smp.h 2017-01-01 21:00:19.945733587 +0100
+diff -Nur linux-4.4.46.orig/include/linux/smp.h linux-4.4.46/include/linux/smp.h
+--- linux-4.4.46.orig/include/linux/smp.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/linux/smp.h 2017-02-03 17:18:10.911618440 +0100
@@ -185,6 +185,9 @@
#define get_cpu() ({ preempt_disable(); smp_processor_id(); })
#define put_cpu() preempt_enable()
@@ -14592,9 +14580,9 @@ diff -Nur linux-4.4.38.orig/include/linux/smp.h linux-4.4.38/include/linux/smp.h
/*
* Callback to arch code if there's nosmp or maxcpus=0 on the
* boot command line:
-diff -Nur linux-4.4.38.orig/include/linux/spinlock_api_smp.h linux-4.4.38/include/linux/spinlock_api_smp.h
---- linux-4.4.38.orig/include/linux/spinlock_api_smp.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/linux/spinlock_api_smp.h 2017-01-01 21:00:19.945733587 +0100
+diff -Nur linux-4.4.46.orig/include/linux/spinlock_api_smp.h linux-4.4.46/include/linux/spinlock_api_smp.h
+--- linux-4.4.46.orig/include/linux/spinlock_api_smp.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/linux/spinlock_api_smp.h 2017-02-03 17:18:10.911618440 +0100
@@ -189,6 +189,8 @@
return 0;
}
@@ -14605,9 +14593,9 @@ diff -Nur linux-4.4.38.orig/include/linux/spinlock_api_smp.h linux-4.4.38/includ
+#endif
#endif /* __LINUX_SPINLOCK_API_SMP_H */
-diff -Nur linux-4.4.38.orig/include/linux/spinlock.h linux-4.4.38/include/linux/spinlock.h
---- linux-4.4.38.orig/include/linux/spinlock.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/linux/spinlock.h 2017-01-01 21:00:19.945733587 +0100
+diff -Nur linux-4.4.46.orig/include/linux/spinlock.h linux-4.4.46/include/linux/spinlock.h
+--- linux-4.4.46.orig/include/linux/spinlock.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/linux/spinlock.h 2017-02-03 17:18:10.911618440 +0100
@@ -271,7 +271,11 @@
#define raw_spin_can_lock(lock) (!raw_spin_is_locked(lock))
@@ -14652,9 +14640,9 @@ diff -Nur linux-4.4.38.orig/include/linux/spinlock.h linux-4.4.38/include/linux/
+#endif /* !PREEMPT_RT_FULL */
+
#endif /* __LINUX_SPINLOCK_H */
-diff -Nur linux-4.4.38.orig/include/linux/spinlock_rt.h linux-4.4.38/include/linux/spinlock_rt.h
---- linux-4.4.38.orig/include/linux/spinlock_rt.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.4.38/include/linux/spinlock_rt.h 2017-01-01 21:00:19.945733587 +0100
+diff -Nur linux-4.4.46.orig/include/linux/spinlock_rt.h linux-4.4.46/include/linux/spinlock_rt.h
+--- linux-4.4.46.orig/include/linux/spinlock_rt.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.4.46/include/linux/spinlock_rt.h 2017-02-03 17:18:10.911618440 +0100
@@ -0,0 +1,165 @@
+#ifndef __LINUX_SPINLOCK_RT_H
+#define __LINUX_SPINLOCK_RT_H
@@ -14821,9 +14809,9 @@ diff -Nur linux-4.4.38.orig/include/linux/spinlock_rt.h linux-4.4.38/include/lin
+ atomic_dec_and_spin_lock(atomic, lock)
+
+#endif
-diff -Nur linux-4.4.38.orig/include/linux/spinlock_types.h linux-4.4.38/include/linux/spinlock_types.h
---- linux-4.4.38.orig/include/linux/spinlock_types.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/linux/spinlock_types.h 2017-01-01 21:00:19.949733848 +0100
+diff -Nur linux-4.4.46.orig/include/linux/spinlock_types.h linux-4.4.46/include/linux/spinlock_types.h
+--- linux-4.4.46.orig/include/linux/spinlock_types.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/linux/spinlock_types.h 2017-02-03 17:18:10.911618440 +0100
@@ -9,80 +9,15 @@
* Released under the General Public License (GPL).
*/
@@ -14912,9 +14900,9 @@ diff -Nur linux-4.4.38.orig/include/linux/spinlock_types.h linux-4.4.38/include/
-#include <linux/rwlock_types.h>
-
#endif /* __LINUX_SPINLOCK_TYPES_H */
-diff -Nur linux-4.4.38.orig/include/linux/spinlock_types_nort.h linux-4.4.38/include/linux/spinlock_types_nort.h
---- linux-4.4.38.orig/include/linux/spinlock_types_nort.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.4.38/include/linux/spinlock_types_nort.h 2017-01-01 21:00:19.949733848 +0100
+diff -Nur linux-4.4.46.orig/include/linux/spinlock_types_nort.h linux-4.4.46/include/linux/spinlock_types_nort.h
+--- linux-4.4.46.orig/include/linux/spinlock_types_nort.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.4.46/include/linux/spinlock_types_nort.h 2017-02-03 17:18:10.911618440 +0100
@@ -0,0 +1,33 @@
+#ifndef __LINUX_SPINLOCK_TYPES_NORT_H
+#define __LINUX_SPINLOCK_TYPES_NORT_H
@@ -14949,9 +14937,9 @@ diff -Nur linux-4.4.38.orig/include/linux/spinlock_types_nort.h linux-4.4.38/inc
+#define DEFINE_SPINLOCK(x) spinlock_t x = __SPIN_LOCK_UNLOCKED(x)
+
+#endif
-diff -Nur linux-4.4.38.orig/include/linux/spinlock_types_raw.h linux-4.4.38/include/linux/spinlock_types_raw.h
---- linux-4.4.38.orig/include/linux/spinlock_types_raw.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.4.38/include/linux/spinlock_types_raw.h 2017-01-01 21:00:19.949733848 +0100
+diff -Nur linux-4.4.46.orig/include/linux/spinlock_types_raw.h linux-4.4.46/include/linux/spinlock_types_raw.h
+--- linux-4.4.46.orig/include/linux/spinlock_types_raw.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.4.46/include/linux/spinlock_types_raw.h 2017-02-03 17:18:10.911618440 +0100
@@ -0,0 +1,56 @@
+#ifndef __LINUX_SPINLOCK_TYPES_RAW_H
+#define __LINUX_SPINLOCK_TYPES_RAW_H
@@ -15009,9 +14997,9 @@ diff -Nur linux-4.4.38.orig/include/linux/spinlock_types_raw.h linux-4.4.38/incl
+#define DEFINE_RAW_SPINLOCK(x) raw_spinlock_t x = __RAW_SPIN_LOCK_UNLOCKED(x)
+
+#endif
-diff -Nur linux-4.4.38.orig/include/linux/spinlock_types_rt.h linux-4.4.38/include/linux/spinlock_types_rt.h
---- linux-4.4.38.orig/include/linux/spinlock_types_rt.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.4.38/include/linux/spinlock_types_rt.h 2017-01-01 21:00:19.949733848 +0100
+diff -Nur linux-4.4.46.orig/include/linux/spinlock_types_rt.h linux-4.4.46/include/linux/spinlock_types_rt.h
+--- linux-4.4.46.orig/include/linux/spinlock_types_rt.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.4.46/include/linux/spinlock_types_rt.h 2017-02-03 17:18:10.911618440 +0100
@@ -0,0 +1,51 @@
+#ifndef __LINUX_SPINLOCK_TYPES_RT_H
+#define __LINUX_SPINLOCK_TYPES_RT_H
@@ -15064,9 +15052,9 @@ diff -Nur linux-4.4.38.orig/include/linux/spinlock_types_rt.h linux-4.4.38/inclu
+ spinlock_t name __cacheline_aligned_in_smp = __SPIN_LOCK_UNLOCKED(name)
+
+#endif
-diff -Nur linux-4.4.38.orig/include/linux/srcu.h linux-4.4.38/include/linux/srcu.h
---- linux-4.4.38.orig/include/linux/srcu.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/linux/srcu.h 2017-01-01 21:00:19.949733848 +0100
+diff -Nur linux-4.4.46.orig/include/linux/srcu.h linux-4.4.46/include/linux/srcu.h
+--- linux-4.4.46.orig/include/linux/srcu.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/linux/srcu.h 2017-02-03 17:18:10.911618440 +0100
@@ -84,10 +84,10 @@
void process_srcu(struct work_struct *work);
@@ -15089,9 +15077,9 @@ diff -Nur linux-4.4.38.orig/include/linux/srcu.h linux-4.4.38/include/linux/srcu
#define DEFINE_SRCU(name) __DEFINE_SRCU(name, /* not static */)
#define DEFINE_STATIC_SRCU(name) __DEFINE_SRCU(name, static)
-diff -Nur linux-4.4.38.orig/include/linux/suspend.h linux-4.4.38/include/linux/suspend.h
---- linux-4.4.38.orig/include/linux/suspend.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/linux/suspend.h 2017-01-01 21:00:19.949733848 +0100
+diff -Nur linux-4.4.46.orig/include/linux/suspend.h linux-4.4.46/include/linux/suspend.h
+--- linux-4.4.46.orig/include/linux/suspend.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/linux/suspend.h 2017-02-03 17:18:10.911618440 +0100
@@ -194,6 +194,12 @@
void (*end)(void);
};
@@ -15105,9 +15093,9 @@ diff -Nur linux-4.4.38.orig/include/linux/suspend.h linux-4.4.38/include/linux/s
#ifdef CONFIG_SUSPEND
/**
* suspend_set_ops - set platform dependent suspend operations
-diff -Nur linux-4.4.38.orig/include/linux/swait.h linux-4.4.38/include/linux/swait.h
---- linux-4.4.38.orig/include/linux/swait.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.4.38/include/linux/swait.h 2017-01-01 21:00:19.949733848 +0100
+diff -Nur linux-4.4.46.orig/include/linux/swait.h linux-4.4.46/include/linux/swait.h
+--- linux-4.4.46.orig/include/linux/swait.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.4.46/include/linux/swait.h 2017-02-03 17:18:10.915618595 +0100
@@ -0,0 +1,173 @@
+#ifndef _LINUX_SWAIT_H
+#define _LINUX_SWAIT_H
@@ -15282,9 +15270,9 @@ diff -Nur linux-4.4.38.orig/include/linux/swait.h linux-4.4.38/include/linux/swa
+})
+
+#endif /* _LINUX_SWAIT_H */
-diff -Nur linux-4.4.38.orig/include/linux/swap.h linux-4.4.38/include/linux/swap.h
---- linux-4.4.38.orig/include/linux/swap.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/linux/swap.h 2017-01-01 21:00:19.949733848 +0100
+diff -Nur linux-4.4.46.orig/include/linux/swap.h linux-4.4.46/include/linux/swap.h
+--- linux-4.4.46.orig/include/linux/swap.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/linux/swap.h 2017-02-03 17:18:10.915618595 +0100
@@ -11,6 +11,7 @@
#include <linux/fs.h>
#include <linux/atomic.h>
@@ -15311,9 +15299,9 @@ diff -Nur linux-4.4.38.orig/include/linux/swap.h linux-4.4.38/include/linux/swap
extern void lru_cache_add(struct page *);
extern void lru_cache_add_anon(struct page *page);
extern void lru_cache_add_file(struct page *page);
-diff -Nur linux-4.4.38.orig/include/linux/swork.h linux-4.4.38/include/linux/swork.h
---- linux-4.4.38.orig/include/linux/swork.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.4.38/include/linux/swork.h 2017-01-01 21:00:19.949733848 +0100
+diff -Nur linux-4.4.46.orig/include/linux/swork.h linux-4.4.46/include/linux/swork.h
+--- linux-4.4.46.orig/include/linux/swork.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.4.46/include/linux/swork.h 2017-02-03 17:18:10.915618595 +0100
@@ -0,0 +1,24 @@
+#ifndef _LINUX_SWORK_H
+#define _LINUX_SWORK_H
@@ -15339,9 +15327,9 @@ diff -Nur linux-4.4.38.orig/include/linux/swork.h linux-4.4.38/include/linux/swo
+void swork_put(void);
+
+#endif /* _LINUX_SWORK_H */
-diff -Nur linux-4.4.38.orig/include/linux/thread_info.h linux-4.4.38/include/linux/thread_info.h
---- linux-4.4.38.orig/include/linux/thread_info.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/linux/thread_info.h 2017-01-01 21:00:19.949733848 +0100
+diff -Nur linux-4.4.46.orig/include/linux/thread_info.h linux-4.4.46/include/linux/thread_info.h
+--- linux-4.4.46.orig/include/linux/thread_info.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/linux/thread_info.h 2017-02-03 17:18:10.915618595 +0100
@@ -102,7 +102,17 @@
#define test_thread_flag(flag) \
test_ti_thread_flag(current_thread_info(), flag)
@@ -15361,9 +15349,9 @@ diff -Nur linux-4.4.38.orig/include/linux/thread_info.h linux-4.4.38/include/lin
#if defined TIF_RESTORE_SIGMASK && !defined HAVE_SET_RESTORE_SIGMASK
/*
-diff -Nur linux-4.4.38.orig/include/linux/timer.h linux-4.4.38/include/linux/timer.h
---- linux-4.4.38.orig/include/linux/timer.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/linux/timer.h 2017-01-01 21:00:19.953734101 +0100
+diff -Nur linux-4.4.46.orig/include/linux/timer.h linux-4.4.46/include/linux/timer.h
+--- linux-4.4.46.orig/include/linux/timer.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/linux/timer.h 2017-02-03 17:18:10.915618595 +0100
@@ -225,7 +225,7 @@
extern int try_to_del_timer_sync(struct timer_list *timer);
@@ -15373,9 +15361,9 @@ diff -Nur linux-4.4.38.orig/include/linux/timer.h linux-4.4.38/include/linux/tim
extern int del_timer_sync(struct timer_list *timer);
#else
# define del_timer_sync(t) del_timer(t)
-diff -Nur linux-4.4.38.orig/include/linux/trace_events.h linux-4.4.38/include/linux/trace_events.h
---- linux-4.4.38.orig/include/linux/trace_events.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/linux/trace_events.h 2017-01-01 21:00:19.953734101 +0100
+diff -Nur linux-4.4.46.orig/include/linux/trace_events.h linux-4.4.46/include/linux/trace_events.h
+--- linux-4.4.46.orig/include/linux/trace_events.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/linux/trace_events.h 2017-02-03 17:18:10.915618595 +0100
@@ -66,6 +66,9 @@
unsigned char flags;
unsigned char preempt_count;
@@ -15386,9 +15374,9 @@ diff -Nur linux-4.4.38.orig/include/linux/trace_events.h linux-4.4.38/include/li
};
#define TRACE_EVENT_TYPE_MAX \
-diff -Nur linux-4.4.38.orig/include/linux/uaccess.h linux-4.4.38/include/linux/uaccess.h
---- linux-4.4.38.orig/include/linux/uaccess.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/linux/uaccess.h 2017-01-01 21:00:19.953734101 +0100
+diff -Nur linux-4.4.46.orig/include/linux/uaccess.h linux-4.4.46/include/linux/uaccess.h
+--- linux-4.4.46.orig/include/linux/uaccess.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/linux/uaccess.h 2017-02-03 17:18:10.915618595 +0100
@@ -24,6 +24,7 @@
*/
static inline void pagefault_disable(void)
@@ -15405,9 +15393,9 @@ diff -Nur linux-4.4.38.orig/include/linux/uaccess.h linux-4.4.38/include/linux/u
}
/*
-diff -Nur linux-4.4.38.orig/include/linux/uprobes.h linux-4.4.38/include/linux/uprobes.h
---- linux-4.4.38.orig/include/linux/uprobes.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/linux/uprobes.h 2017-01-01 21:00:19.953734101 +0100
+diff -Nur linux-4.4.46.orig/include/linux/uprobes.h linux-4.4.46/include/linux/uprobes.h
+--- linux-4.4.46.orig/include/linux/uprobes.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/linux/uprobes.h 2017-02-03 17:18:10.915618595 +0100
@@ -27,6 +27,7 @@
#include <linux/errno.h>
#include <linux/rbtree.h>
@@ -15416,9 +15404,9 @@ diff -Nur linux-4.4.38.orig/include/linux/uprobes.h linux-4.4.38/include/linux/u
struct vm_area_struct;
struct mm_struct;
-diff -Nur linux-4.4.38.orig/include/linux/vmstat.h linux-4.4.38/include/linux/vmstat.h
---- linux-4.4.38.orig/include/linux/vmstat.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/linux/vmstat.h 2017-01-01 21:00:19.953734101 +0100
+diff -Nur linux-4.4.46.orig/include/linux/vmstat.h linux-4.4.46/include/linux/vmstat.h
+--- linux-4.4.46.orig/include/linux/vmstat.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/linux/vmstat.h 2017-02-03 17:18:10.915618595 +0100
@@ -33,7 +33,9 @@
*/
static inline void __count_vm_event(enum vm_event_item item)
@@ -15439,9 +15427,9 @@ diff -Nur linux-4.4.38.orig/include/linux/vmstat.h linux-4.4.38/include/linux/vm
}
static inline void count_vm_events(enum vm_event_item item, long delta)
-diff -Nur linux-4.4.38.orig/include/linux/wait.h linux-4.4.38/include/linux/wait.h
---- linux-4.4.38.orig/include/linux/wait.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/linux/wait.h 2017-01-01 21:00:19.953734101 +0100
+diff -Nur linux-4.4.46.orig/include/linux/wait.h linux-4.4.46/include/linux/wait.h
+--- linux-4.4.46.orig/include/linux/wait.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/linux/wait.h 2017-02-03 17:18:10.915618595 +0100
@@ -8,6 +8,7 @@
#include <linux/spinlock.h>
#include <asm/current.h>
@@ -15450,9 +15438,9 @@ diff -Nur linux-4.4.38.orig/include/linux/wait.h linux-4.4.38/include/linux/wait
typedef struct __wait_queue wait_queue_t;
typedef int (*wait_queue_func_t)(wait_queue_t *wait, unsigned mode, int flags, void *key);
-diff -Nur linux-4.4.38.orig/include/net/dst.h linux-4.4.38/include/net/dst.h
---- linux-4.4.38.orig/include/net/dst.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/net/dst.h 2017-01-01 21:00:19.953734101 +0100
+diff -Nur linux-4.4.46.orig/include/net/dst.h linux-4.4.46/include/net/dst.h
+--- linux-4.4.46.orig/include/net/dst.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/net/dst.h 2017-02-03 17:18:10.915618595 +0100
@@ -437,7 +437,7 @@
static inline int dst_neigh_output(struct dst_entry *dst, struct neighbour *n,
struct sk_buff *skb)
@@ -15462,9 +15450,9 @@ diff -Nur linux-4.4.38.orig/include/net/dst.h linux-4.4.38/include/net/dst.h
if (dst->pending_confirm) {
unsigned long now = jiffies;
-diff -Nur linux-4.4.38.orig/include/net/neighbour.h linux-4.4.38/include/net/neighbour.h
---- linux-4.4.38.orig/include/net/neighbour.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/net/neighbour.h 2017-01-01 21:00:19.953734101 +0100
+diff -Nur linux-4.4.46.orig/include/net/neighbour.h linux-4.4.46/include/net/neighbour.h
+--- linux-4.4.46.orig/include/net/neighbour.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/net/neighbour.h 2017-02-03 17:18:10.915618595 +0100
@@ -446,7 +446,7 @@
}
#endif
@@ -15483,9 +15471,9 @@ diff -Nur linux-4.4.38.orig/include/net/neighbour.h linux-4.4.38/include/net/nei
const struct net_device *dev)
{
unsigned int seq;
-diff -Nur linux-4.4.38.orig/include/net/netns/ipv4.h linux-4.4.38/include/net/netns/ipv4.h
---- linux-4.4.38.orig/include/net/netns/ipv4.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/net/netns/ipv4.h 2017-01-01 21:00:19.957734362 +0100
+diff -Nur linux-4.4.46.orig/include/net/netns/ipv4.h linux-4.4.46/include/net/netns/ipv4.h
+--- linux-4.4.46.orig/include/net/netns/ipv4.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/net/netns/ipv4.h 2017-02-03 17:18:10.915618595 +0100
@@ -70,6 +70,7 @@
int sysctl_icmp_echo_ignore_all;
@@ -15494,9 +15482,9 @@ diff -Nur linux-4.4.38.orig/include/net/netns/ipv4.h linux-4.4.38/include/net/ne
int sysctl_icmp_ignore_bogus_error_responses;
int sysctl_icmp_ratelimit;
int sysctl_icmp_ratemask;
-diff -Nur linux-4.4.38.orig/include/trace/events/hist.h linux-4.4.38/include/trace/events/hist.h
---- linux-4.4.38.orig/include/trace/events/hist.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.4.38/include/trace/events/hist.h 2017-01-01 21:00:19.957734362 +0100
+diff -Nur linux-4.4.46.orig/include/trace/events/hist.h linux-4.4.46/include/trace/events/hist.h
+--- linux-4.4.46.orig/include/trace/events/hist.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.4.46/include/trace/events/hist.h 2017-02-03 17:18:10.915618595 +0100
@@ -0,0 +1,73 @@
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM hist
@@ -15571,9 +15559,9 @@ diff -Nur linux-4.4.38.orig/include/trace/events/hist.h linux-4.4.38/include/tra
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>
-diff -Nur linux-4.4.38.orig/include/trace/events/latency_hist.h linux-4.4.38/include/trace/events/latency_hist.h
---- linux-4.4.38.orig/include/trace/events/latency_hist.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.4.38/include/trace/events/latency_hist.h 2017-01-01 21:00:19.957734362 +0100
+diff -Nur linux-4.4.46.orig/include/trace/events/latency_hist.h linux-4.4.46/include/trace/events/latency_hist.h
+--- linux-4.4.46.orig/include/trace/events/latency_hist.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.4.46/include/trace/events/latency_hist.h 2017-02-03 17:18:10.915618595 +0100
@@ -0,0 +1,29 @@
+#ifndef _LATENCY_HIST_H
+#define _LATENCY_HIST_H
@@ -15604,9 +15592,9 @@ diff -Nur linux-4.4.38.orig/include/trace/events/latency_hist.h linux-4.4.38/inc
+}
+
+#endif /* _LATENCY_HIST_H */
-diff -Nur linux-4.4.38.orig/include/trace/events/writeback.h linux-4.4.38/include/trace/events/writeback.h
---- linux-4.4.38.orig/include/trace/events/writeback.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/include/trace/events/writeback.h 2017-01-01 21:00:19.957734362 +0100
+diff -Nur linux-4.4.46.orig/include/trace/events/writeback.h linux-4.4.46/include/trace/events/writeback.h
+--- linux-4.4.46.orig/include/trace/events/writeback.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/include/trace/events/writeback.h 2017-02-03 17:18:10.915618595 +0100
@@ -134,58 +134,28 @@
#ifdef CREATE_TRACE_POINTS
#ifdef CONFIG_CGROUP_WRITEBACK
@@ -15946,9 +15934,9 @@ diff -Nur linux-4.4.38.orig/include/trace/events/writeback.h linux-4.4.38/includ
)
);
-diff -Nur linux-4.4.38.orig/init/Kconfig linux-4.4.38/init/Kconfig
---- linux-4.4.38.orig/init/Kconfig 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/init/Kconfig 2017-01-01 21:00:19.957734362 +0100
+diff -Nur linux-4.4.46.orig/init/Kconfig linux-4.4.46/init/Kconfig
+--- linux-4.4.46.orig/init/Kconfig 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/init/Kconfig 2017-02-03 17:18:10.915618595 +0100
@@ -498,7 +498,7 @@
config RCU_EXPERT
@@ -16009,9 +15997,9 @@ diff -Nur linux-4.4.38.orig/init/Kconfig linux-4.4.38/init/Kconfig
bool "SLUB per cpu partial cache"
help
Per cpu partial caches accellerate objects allocation and freeing
-diff -Nur linux-4.4.38.orig/init/main.c linux-4.4.38/init/main.c
---- linux-4.4.38.orig/init/main.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/init/main.c 2017-01-01 21:00:19.961734615 +0100
+diff -Nur linux-4.4.46.orig/init/main.c linux-4.4.46/init/main.c
+--- linux-4.4.46.orig/init/main.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/init/main.c 2017-02-03 17:18:10.915618595 +0100
@@ -530,6 +530,7 @@
setup_command_line(command_line);
setup_nr_cpu_ids();
@@ -16020,18 +16008,18 @@ diff -Nur linux-4.4.38.orig/init/main.c linux-4.4.38/init/main.c
smp_prepare_boot_cpu(); /* arch-specific boot-cpu hooks */
build_all_zonelists(NULL, NULL);
-diff -Nur linux-4.4.38.orig/init/Makefile linux-4.4.38/init/Makefile
---- linux-4.4.38.orig/init/Makefile 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/init/Makefile 2017-01-01 21:00:19.961734615 +0100
+diff -Nur linux-4.4.46.orig/init/Makefile linux-4.4.46/init/Makefile
+--- linux-4.4.46.orig/init/Makefile 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/init/Makefile 2017-02-03 17:18:10.915618595 +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.4.38.orig/ipc/msg.c linux-4.4.38/ipc/msg.c
---- linux-4.4.38.orig/ipc/msg.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/ipc/msg.c 2017-01-01 21:00:19.961734615 +0100
+diff -Nur linux-4.4.46.orig/ipc/msg.c linux-4.4.46/ipc/msg.c
+--- linux-4.4.46.orig/ipc/msg.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/ipc/msg.c 2017-02-03 17:18:10.919618749 +0100
@@ -183,20 +183,14 @@
}
}
@@ -16231,9 +16219,9 @@ diff -Nur linux-4.4.38.orig/ipc/msg.c linux-4.4.38/ipc/msg.c
msg = (struct msg_msg *)msr_d.r_msg;
if (msg != ERR_PTR(-EAGAIN))
goto out_unlock0;
-diff -Nur linux-4.4.38.orig/ipc/sem.c linux-4.4.38/ipc/sem.c
---- linux-4.4.38.orig/ipc/sem.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/ipc/sem.c 2017-01-01 21:00:19.961734615 +0100
+diff -Nur linux-4.4.46.orig/ipc/sem.c linux-4.4.46/ipc/sem.c
+--- linux-4.4.46.orig/ipc/sem.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/ipc/sem.c 2017-02-03 17:18:10.919618749 +0100
@@ -708,6 +708,13 @@
static void wake_up_sem_queue_prepare(struct list_head *pt,
struct sem_queue *q, int error)
@@ -16272,9 +16260,9 @@ diff -Nur linux-4.4.38.orig/ipc/sem.c linux-4.4.38/ipc/sem.c
}
static void unlink_queue(struct sem_array *sma, struct sem_queue *q)
-diff -Nur linux-4.4.38.orig/kernel/cgroup.c linux-4.4.38/kernel/cgroup.c
---- linux-4.4.38.orig/kernel/cgroup.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/cgroup.c 2017-01-01 21:00:19.969735130 +0100
+diff -Nur linux-4.4.46.orig/kernel/cgroup.c linux-4.4.46/kernel/cgroup.c
+--- linux-4.4.46.orig/kernel/cgroup.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/cgroup.c 2017-02-03 17:18:10.919618749 +0100
@@ -4740,10 +4740,10 @@
queue_work(cgroup_destroy_wq, &css->destroy_work);
}
@@ -16307,9 +16295,9 @@ diff -Nur linux-4.4.38.orig/kernel/cgroup.c linux-4.4.38/kernel/cgroup.c
/*
* Used to destroy pidlists and separate to serve as flush domain.
-diff -Nur linux-4.4.38.orig/kernel/cpu.c linux-4.4.38/kernel/cpu.c
---- linux-4.4.38.orig/kernel/cpu.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/cpu.c 2017-01-01 21:00:19.969735130 +0100
+diff -Nur linux-4.4.46.orig/kernel/cpu.c linux-4.4.46/kernel/cpu.c
+--- linux-4.4.46.orig/kernel/cpu.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/cpu.c 2017-02-03 17:18:10.919618749 +0100
@@ -75,8 +75,8 @@
#endif
} cpu_hotplug = {
@@ -16690,9 +16678,9 @@ diff -Nur linux-4.4.38.orig/kernel/cpu.c linux-4.4.38/kernel/cpu.c
return err;
}
-diff -Nur linux-4.4.38.orig/kernel/debug/kdb/kdb_io.c linux-4.4.38/kernel/debug/kdb/kdb_io.c
---- linux-4.4.38.orig/kernel/debug/kdb/kdb_io.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/debug/kdb/kdb_io.c 2017-01-01 21:00:19.969735130 +0100
+diff -Nur linux-4.4.46.orig/kernel/debug/kdb/kdb_io.c linux-4.4.46/kernel/debug/kdb/kdb_io.c
+--- linux-4.4.46.orig/kernel/debug/kdb/kdb_io.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/debug/kdb/kdb_io.c 2017-02-03 17:18:10.919618749 +0100
@@ -554,7 +554,6 @@
int linecount;
int colcount;
@@ -16730,9 +16718,9 @@ diff -Nur linux-4.4.38.orig/kernel/debug/kdb/kdb_io.c linux-4.4.38/kernel/debug/
return r;
}
-diff -Nur linux-4.4.38.orig/kernel/events/core.c linux-4.4.38/kernel/events/core.c
---- linux-4.4.38.orig/kernel/events/core.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/events/core.c 2017-01-01 21:00:19.973735387 +0100
+diff -Nur linux-4.4.46.orig/kernel/events/core.c linux-4.4.46/kernel/events/core.c
+--- linux-4.4.46.orig/kernel/events/core.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/events/core.c 2017-02-03 17:18:10.919618749 +0100
@@ -802,6 +802,7 @@
raw_spin_lock_init(&cpuctx->hrtimer_lock);
hrtimer_init(timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS_PINNED);
@@ -16749,9 +16737,9 @@ diff -Nur linux-4.4.38.orig/kernel/events/core.c linux-4.4.38/kernel/events/core
/*
* Since hrtimers have a fixed rate, we can do a static freq->period
-diff -Nur linux-4.4.38.orig/kernel/exit.c linux-4.4.38/kernel/exit.c
---- linux-4.4.38.orig/kernel/exit.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/exit.c 2017-01-01 21:00:19.977735646 +0100
+diff -Nur linux-4.4.46.orig/kernel/exit.c linux-4.4.46/kernel/exit.c
+--- linux-4.4.46.orig/kernel/exit.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/exit.c 2017-02-03 17:18:10.923618903 +0100
@@ -144,7 +144,7 @@
* Do this under ->siglock, we can race with another thread
* doing sigqueue_free() if we have SIGQUEUE_PREALLOC signals.
@@ -16761,9 +16749,9 @@ diff -Nur linux-4.4.38.orig/kernel/exit.c linux-4.4.38/kernel/exit.c
tsk->sighand = NULL;
spin_unlock(&sighand->siglock);
-diff -Nur linux-4.4.38.orig/kernel/fork.c linux-4.4.38/kernel/fork.c
---- linux-4.4.38.orig/kernel/fork.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/fork.c 2017-01-01 21:00:19.977735646 +0100
+diff -Nur linux-4.4.46.orig/kernel/fork.c linux-4.4.46/kernel/fork.c
+--- linux-4.4.46.orig/kernel/fork.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/fork.c 2017-02-03 17:18:10.923618903 +0100
@@ -108,7 +108,7 @@
DEFINE_PER_CPU(unsigned long, process_counts) = 0;
@@ -16803,7 +16791,7 @@ diff -Nur linux-4.4.38.orig/kernel/fork.c linux-4.4.38/kernel/fork.c
void __init __weak arch_task_cache_init(void) { }
-@@ -689,6 +702,19 @@
+@@ -692,6 +705,19 @@
}
EXPORT_SYMBOL_GPL(__mmdrop);
@@ -16823,7 +16811,7 @@ diff -Nur linux-4.4.38.orig/kernel/fork.c linux-4.4.38/kernel/fork.c
/*
* Decrement the use count and release all resources for an mm.
*/
-@@ -1239,6 +1265,9 @@
+@@ -1242,6 +1268,9 @@
*/
static void posix_cpu_timers_init(struct task_struct *tsk)
{
@@ -16833,7 +16821,7 @@ diff -Nur linux-4.4.38.orig/kernel/fork.c linux-4.4.38/kernel/fork.c
tsk->cputime_expires.prof_exp = 0;
tsk->cputime_expires.virt_exp = 0;
tsk->cputime_expires.sched_exp = 0;
-@@ -1364,15 +1393,16 @@
+@@ -1367,15 +1396,16 @@
spin_lock_init(&p->alloc_lock);
init_sigpending(&p->pending);
@@ -16852,9 +16840,9 @@ diff -Nur linux-4.4.38.orig/kernel/fork.c linux-4.4.38/kernel/fork.c
#endif
#if defined(SPLIT_RSS_COUNTING)
-diff -Nur linux-4.4.38.orig/kernel/futex.c linux-4.4.38/kernel/futex.c
---- linux-4.4.38.orig/kernel/futex.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/futex.c 2017-01-01 21:00:19.981735897 +0100
+diff -Nur linux-4.4.46.orig/kernel/futex.c linux-4.4.46/kernel/futex.c
+--- linux-4.4.46.orig/kernel/futex.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/futex.c 2017-02-03 17:18:10.923618903 +0100
@@ -815,7 +815,9 @@
* task still owns the PI-state:
*/
@@ -17073,9 +17061,9 @@ diff -Nur linux-4.4.38.orig/kernel/futex.c linux-4.4.38/kernel/futex.c
/*
* Fixup the pi_state owner and possibly acquire the lock if we
* haven't already.
-diff -Nur linux-4.4.38.orig/kernel/irq/handle.c linux-4.4.38/kernel/irq/handle.c
---- linux-4.4.38.orig/kernel/irq/handle.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/irq/handle.c 2017-01-01 21:00:19.981735897 +0100
+diff -Nur linux-4.4.46.orig/kernel/irq/handle.c linux-4.4.46/kernel/irq/handle.c
+--- linux-4.4.46.orig/kernel/irq/handle.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/irq/handle.c 2017-02-03 17:18:10.923618903 +0100
@@ -134,6 +134,8 @@
irqreturn_t handle_irq_event_percpu(struct irq_desc *desc)
@@ -17098,9 +17086,9 @@ diff -Nur linux-4.4.38.orig/kernel/irq/handle.c linux-4.4.38/kernel/irq/handle.c
if (!noirqdebug)
note_interrupt(desc, retval);
-diff -Nur linux-4.4.38.orig/kernel/irq/irqdesc.c linux-4.4.38/kernel/irq/irqdesc.c
---- linux-4.4.38.orig/kernel/irq/irqdesc.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/irq/irqdesc.c 2017-01-01 21:00:19.981735897 +0100
+diff -Nur linux-4.4.46.orig/kernel/irq/irqdesc.c linux-4.4.46/kernel/irq/irqdesc.c
+--- linux-4.4.46.orig/kernel/irq/irqdesc.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/irq/irqdesc.c 2017-02-03 17:18:10.923618903 +0100
@@ -24,10 +24,27 @@
static struct lock_class_key irq_desc_lock_class;
@@ -17131,9 +17119,9 @@ diff -Nur linux-4.4.38.orig/kernel/irq/irqdesc.c linux-4.4.38/kernel/irq/irqdesc
}
#else
static void __init init_irq_default_affinity(void)
-diff -Nur linux-4.4.38.orig/kernel/irq/manage.c linux-4.4.38/kernel/irq/manage.c
---- linux-4.4.38.orig/kernel/irq/manage.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/irq/manage.c 2017-01-01 21:00:19.981735897 +0100
+diff -Nur linux-4.4.46.orig/kernel/irq/manage.c linux-4.4.46/kernel/irq/manage.c
+--- linux-4.4.46.orig/kernel/irq/manage.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/irq/manage.c 2017-02-03 17:18:10.923618903 +0100
@@ -22,6 +22,7 @@
#include "internals.h"
@@ -17315,9 +17303,9 @@ diff -Nur linux-4.4.38.orig/kernel/irq/manage.c linux-4.4.38/kernel/irq/manage.c
* interrupt controller has per-cpu registers.
*/
int irq_set_irqchip_state(unsigned int irq, enum irqchip_irq_state which,
-diff -Nur linux-4.4.38.orig/kernel/irq/settings.h linux-4.4.38/kernel/irq/settings.h
---- linux-4.4.38.orig/kernel/irq/settings.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/irq/settings.h 2017-01-01 21:00:19.985736156 +0100
+diff -Nur linux-4.4.46.orig/kernel/irq/settings.h linux-4.4.46/kernel/irq/settings.h
+--- linux-4.4.46.orig/kernel/irq/settings.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/irq/settings.h 2017-02-03 17:18:10.923618903 +0100
@@ -16,6 +16,7 @@
_IRQ_PER_CPU_DEVID = IRQ_PER_CPU_DEVID,
_IRQ_IS_POLLED = IRQ_IS_POLLED,
@@ -17351,9 +17339,9 @@ diff -Nur linux-4.4.38.orig/kernel/irq/settings.h linux-4.4.38/kernel/irq/settin
static inline bool irq_settings_is_per_cpu(struct irq_desc *desc)
{
return desc->status_use_accessors & _IRQ_PER_CPU;
-diff -Nur linux-4.4.38.orig/kernel/irq/spurious.c linux-4.4.38/kernel/irq/spurious.c
---- linux-4.4.38.orig/kernel/irq/spurious.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/irq/spurious.c 2017-01-01 21:00:19.985736156 +0100
+diff -Nur linux-4.4.46.orig/kernel/irq/spurious.c linux-4.4.46/kernel/irq/spurious.c
+--- linux-4.4.46.orig/kernel/irq/spurious.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/irq/spurious.c 2017-02-03 17:18:10.923618903 +0100
@@ -444,6 +444,10 @@
static int __init irqfixup_setup(char *str)
@@ -17376,9 +17364,9 @@ diff -Nur linux-4.4.38.orig/kernel/irq/spurious.c linux-4.4.38/kernel/irq/spurio
irqfixup = 2;
printk(KERN_WARNING "Misrouted IRQ fixup and polling support "
"enabled\n");
-diff -Nur linux-4.4.38.orig/kernel/irq_work.c linux-4.4.38/kernel/irq_work.c
---- linux-4.4.38.orig/kernel/irq_work.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/irq_work.c 2017-01-01 21:00:19.985736156 +0100
+diff -Nur linux-4.4.46.orig/kernel/irq_work.c linux-4.4.46/kernel/irq_work.c
+--- linux-4.4.46.orig/kernel/irq_work.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/irq_work.c 2017-02-03 17:18:10.923618903 +0100
@@ -17,6 +17,7 @@
#include <linux/cpu.h>
#include <linux/notifier.h>
@@ -17500,9 +17488,9 @@ diff -Nur linux-4.4.38.orig/kernel/irq_work.c linux-4.4.38/kernel/irq_work.c
/*
* Synchronize against the irq_work @entry, ensures the entry is not
-diff -Nur linux-4.4.38.orig/kernel/Kconfig.locks linux-4.4.38/kernel/Kconfig.locks
---- linux-4.4.38.orig/kernel/Kconfig.locks 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/Kconfig.locks 2017-01-01 21:00:19.965734876 +0100
+diff -Nur linux-4.4.46.orig/kernel/Kconfig.locks linux-4.4.46/kernel/Kconfig.locks
+--- linux-4.4.46.orig/kernel/Kconfig.locks 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/Kconfig.locks 2017-02-03 17:18:10.919618749 +0100
@@ -225,11 +225,11 @@
config MUTEX_SPIN_ON_OWNER
@@ -17517,9 +17505,9 @@ diff -Nur linux-4.4.38.orig/kernel/Kconfig.locks linux-4.4.38/kernel/Kconfig.loc
config LOCK_SPIN_ON_OWNER
def_bool y
-diff -Nur linux-4.4.38.orig/kernel/Kconfig.preempt linux-4.4.38/kernel/Kconfig.preempt
---- linux-4.4.38.orig/kernel/Kconfig.preempt 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/Kconfig.preempt 2017-01-01 21:00:19.965734876 +0100
+diff -Nur linux-4.4.46.orig/kernel/Kconfig.preempt linux-4.4.46/kernel/Kconfig.preempt
+--- linux-4.4.46.orig/kernel/Kconfig.preempt 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/Kconfig.preempt 2017-02-03 17:18:10.919618749 +0100
@@ -1,3 +1,16 @@
+config PREEMPT
+ bool
@@ -17572,9 +17560,9 @@ diff -Nur linux-4.4.38.orig/kernel/Kconfig.preempt linux-4.4.38/kernel/Kconfig.p
endchoice
config PREEMPT_COUNT
-diff -Nur linux-4.4.38.orig/kernel/ksysfs.c linux-4.4.38/kernel/ksysfs.c
---- linux-4.4.38.orig/kernel/ksysfs.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/ksysfs.c 2017-01-01 21:00:19.985736156 +0100
+diff -Nur linux-4.4.46.orig/kernel/ksysfs.c linux-4.4.46/kernel/ksysfs.c
+--- linux-4.4.46.orig/kernel/ksysfs.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/ksysfs.c 2017-02-03 17:18:10.923618903 +0100
@@ -136,6 +136,15 @@
#endif /* CONFIG_KEXEC_CORE */
@@ -17601,9 +17589,9 @@ diff -Nur linux-4.4.38.orig/kernel/ksysfs.c linux-4.4.38/kernel/ksysfs.c
NULL
};
-diff -Nur linux-4.4.38.orig/kernel/locking/lglock.c linux-4.4.38/kernel/locking/lglock.c
---- linux-4.4.38.orig/kernel/locking/lglock.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/locking/lglock.c 2017-01-01 21:00:19.985736156 +0100
+diff -Nur linux-4.4.46.orig/kernel/locking/lglock.c linux-4.4.46/kernel/locking/lglock.c
+--- linux-4.4.46.orig/kernel/locking/lglock.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/locking/lglock.c 2017-02-03 17:18:10.923618903 +0100
@@ -4,6 +4,15 @@
#include <linux/cpu.h>
#include <linux/string.h>
@@ -17772,9 +17760,9 @@ diff -Nur linux-4.4.38.orig/kernel/locking/lglock.c linux-4.4.38/kernel/locking/
+ }
+}
+#endif
-diff -Nur linux-4.4.38.orig/kernel/locking/lockdep.c linux-4.4.38/kernel/locking/lockdep.c
---- linux-4.4.38.orig/kernel/locking/lockdep.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/locking/lockdep.c 2017-01-01 21:00:19.989736417 +0100
+diff -Nur linux-4.4.46.orig/kernel/locking/lockdep.c linux-4.4.46/kernel/locking/lockdep.c
+--- linux-4.4.46.orig/kernel/locking/lockdep.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/locking/lockdep.c 2017-02-03 17:18:10.923618903 +0100
@@ -3525,6 +3525,7 @@
}
}
@@ -17791,9 +17779,9 @@ diff -Nur linux-4.4.38.orig/kernel/locking/lockdep.c linux-4.4.38/kernel/locking
if (!debug_locks)
print_irqtrace_events(current);
-diff -Nur linux-4.4.38.orig/kernel/locking/locktorture.c linux-4.4.38/kernel/locking/locktorture.c
---- linux-4.4.38.orig/kernel/locking/locktorture.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/locking/locktorture.c 2017-01-01 21:00:19.989736417 +0100
+diff -Nur linux-4.4.46.orig/kernel/locking/locktorture.c linux-4.4.46/kernel/locking/locktorture.c
+--- linux-4.4.46.orig/kernel/locking/locktorture.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/locking/locktorture.c 2017-02-03 17:18:10.923618903 +0100
@@ -26,7 +26,6 @@
#include <linux/kthread.h>
#include <linux/sched/rt.h>
@@ -17802,9 +17790,9 @@ diff -Nur linux-4.4.38.orig/kernel/locking/locktorture.c linux-4.4.38/kernel/loc
#include <linux/mutex.h>
#include <linux/rwsem.h>
#include <linux/smp.h>
-diff -Nur linux-4.4.38.orig/kernel/locking/Makefile linux-4.4.38/kernel/locking/Makefile
---- linux-4.4.38.orig/kernel/locking/Makefile 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/locking/Makefile 2017-01-01 21:00:19.985736156 +0100
+diff -Nur linux-4.4.46.orig/kernel/locking/Makefile linux-4.4.46/kernel/locking/Makefile
+--- linux-4.4.46.orig/kernel/locking/Makefile 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/locking/Makefile 2017-02-03 17:18:10.923618903 +0100
@@ -1,5 +1,5 @@
-obj-y += mutex.o semaphore.o rwsem.o percpu-rwsem.o
@@ -17835,9 +17823,9 @@ diff -Nur linux-4.4.38.orig/kernel/locking/Makefile linux-4.4.38/kernel/locking/
+obj-$(CONFIG_PREEMPT_RT_FULL) += rt.o
obj-$(CONFIG_QUEUED_RWLOCKS) += qrwlock.o
obj-$(CONFIG_LOCK_TORTURE_TEST) += locktorture.o
-diff -Nur linux-4.4.38.orig/kernel/locking/rt.c linux-4.4.38/kernel/locking/rt.c
---- linux-4.4.38.orig/kernel/locking/rt.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.4.38/kernel/locking/rt.c 2017-01-01 21:00:19.989736417 +0100
+diff -Nur linux-4.4.46.orig/kernel/locking/rt.c linux-4.4.46/kernel/locking/rt.c
+--- linux-4.4.46.orig/kernel/locking/rt.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.4.46/kernel/locking/rt.c 2017-02-03 17:18:10.923618903 +0100
@@ -0,0 +1,474 @@
+/*
+ * kernel/rt.c
@@ -18313,9 +18301,9 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rt.c linux-4.4.38/kernel/locking/rt.c
+ return 1;
+}
+EXPORT_SYMBOL(atomic_dec_and_mutex_lock);
-diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex.c linux-4.4.38/kernel/locking/rtmutex.c
---- linux-4.4.38.orig/kernel/locking/rtmutex.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/locking/rtmutex.c 2017-01-01 21:00:19.993736670 +0100
+diff -Nur linux-4.4.46.orig/kernel/locking/rtmutex.c linux-4.4.46/kernel/locking/rtmutex.c
+--- linux-4.4.46.orig/kernel/locking/rtmutex.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/locking/rtmutex.c 2017-02-03 17:18:10.927619058 +0100
@@ -7,6 +7,11 @@
* Copyright (C) 2005-2006 Timesys Corp., Thomas Gleixner <tglx@timesys.com>
* Copyright (C) 2005 Kihon Technologies Inc., Steven Rostedt
@@ -18336,8 +18324,8 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex.c linux-4.4.38/kernel/locking
#include "rtmutex_common.h"
-@@ -69,6 +75,12 @@
- clear_rt_mutex_waiters(lock);
+@@ -133,6 +139,12 @@
+ WRITE_ONCE(*p, owner & ~RT_MUTEX_HAS_WAITERS);
}
+static int rt_mutex_real_waiter(struct rt_mutex_waiter *waiter)
@@ -18349,7 +18337,7 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex.c linux-4.4.38/kernel/locking
/*
* We can speed up the acquire/release, if there's no debugging state to be
* set up.
-@@ -99,13 +111,14 @@
+@@ -163,13 +175,14 @@
* 2) Drop lock->wait_lock
* 3) Try to unlock the lock with cmpxchg
*/
@@ -18366,7 +18354,7 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex.c linux-4.4.38/kernel/locking
/*
* If a new waiter comes in between the unlock and the cmpxchg
* we have two situations:
-@@ -147,11 +160,12 @@
+@@ -211,11 +224,12 @@
/*
* Simple slow path only version: lock->owner is protected by lock->wait_lock.
*/
@@ -18381,7 +18369,7 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex.c linux-4.4.38/kernel/locking
return true;
}
#endif
-@@ -348,6 +362,14 @@
+@@ -412,6 +426,14 @@
return debug_rt_mutex_detect_deadlock(waiter, chwalk);
}
@@ -18396,7 +18384,7 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex.c linux-4.4.38/kernel/locking
/*
* Max number of times we'll walk the boosting chain:
*/
-@@ -355,7 +377,8 @@
+@@ -419,7 +441,8 @@
static inline struct rt_mutex *task_blocked_on_lock(struct task_struct *p)
{
@@ -18406,7 +18394,7 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex.c linux-4.4.38/kernel/locking
}
/*
-@@ -433,7 +456,6 @@
+@@ -497,7 +520,6 @@
int ret = 0, depth = 0;
struct rt_mutex *lock;
bool detect_deadlock;
@@ -18414,7 +18402,7 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex.c linux-4.4.38/kernel/locking
bool requeue = true;
detect_deadlock = rt_mutex_cond_detect_deadlock(orig_waiter, chwalk);
-@@ -476,7 +498,7 @@
+@@ -540,7 +562,7 @@
/*
* [1] Task cannot go away as we did a get_task() before !
*/
@@ -18423,7 +18411,7 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex.c linux-4.4.38/kernel/locking
/*
* [2] Get the waiter on which @task is blocked on.
-@@ -492,7 +514,7 @@
+@@ -556,7 +578,7 @@
* reached or the state of the chain has changed while we
* dropped the locks.
*/
@@ -18432,7 +18420,7 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex.c linux-4.4.38/kernel/locking
goto out_unlock_pi;
/*
-@@ -560,7 +582,7 @@
+@@ -624,7 +646,7 @@
* operations.
*/
if (!raw_spin_trylock(&lock->wait_lock)) {
@@ -18441,7 +18429,7 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex.c linux-4.4.38/kernel/locking
cpu_relax();
goto retry;
}
-@@ -591,7 +613,7 @@
+@@ -655,7 +677,7 @@
/*
* No requeue[7] here. Just release @task [8]
*/
@@ -18450,7 +18438,7 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex.c linux-4.4.38/kernel/locking
put_task_struct(task);
/*
-@@ -599,14 +621,14 @@
+@@ -663,14 +685,14 @@
* If there is no owner of the lock, end of chain.
*/
if (!rt_mutex_owner(lock)) {
@@ -18467,7 +18455,7 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex.c linux-4.4.38/kernel/locking
/*
* No requeue [11] here. We just do deadlock detection.
-@@ -621,8 +643,8 @@
+@@ -685,8 +707,8 @@
top_waiter = rt_mutex_top_waiter(lock);
/* [13] Drop locks */
@@ -18478,7 +18466,7 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex.c linux-4.4.38/kernel/locking
/* If owner is not blocked, end of chain. */
if (!next_lock)
-@@ -643,7 +665,7 @@
+@@ -707,7 +729,7 @@
rt_mutex_enqueue(lock, waiter);
/* [8] Release the task */
@@ -18487,7 +18475,7 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex.c linux-4.4.38/kernel/locking
put_task_struct(task);
/*
-@@ -654,21 +676,24 @@
+@@ -718,21 +740,24 @@
* follow here. This is the end of the chain we are walking.
*/
if (!rt_mutex_owner(lock)) {
@@ -18516,7 +18504,7 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex.c linux-4.4.38/kernel/locking
/* [11] requeue the pi waiters if necessary */
if (waiter == rt_mutex_top_waiter(lock)) {
-@@ -722,8 +747,8 @@
+@@ -786,8 +811,8 @@
top_waiter = rt_mutex_top_waiter(lock);
/* [13] Drop the locks */
@@ -18527,7 +18515,7 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex.c linux-4.4.38/kernel/locking
/*
* Make the actual exit decisions [12], based on the stored
-@@ -746,28 +771,46 @@
+@@ -810,28 +835,46 @@
goto again;
out_unlock_pi:
@@ -18580,7 +18568,7 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex.c linux-4.4.38/kernel/locking
/*
* Before testing whether we can acquire @lock, we set the
* RT_MUTEX_HAS_WAITERS bit in @lock->owner. This forces all
-@@ -803,8 +846,10 @@
+@@ -867,8 +910,10 @@
* If waiter is not the highest priority waiter of
* @lock, give up.
*/
@@ -18592,7 +18580,7 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex.c linux-4.4.38/kernel/locking
/*
* We can acquire the lock. Remove the waiter from the
-@@ -822,14 +867,10 @@
+@@ -886,14 +931,10 @@
* not need to be dequeued.
*/
if (rt_mutex_has_waiters(lock)) {
@@ -18610,7 +18598,7 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex.c linux-4.4.38/kernel/locking
/*
* The current top waiter stays enqueued. We
* don't have to change anything in the lock
-@@ -852,7 +893,7 @@
+@@ -916,7 +957,7 @@
* case, but conditionals are more expensive than a redundant
* store.
*/
@@ -18619,7 +18607,7 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex.c linux-4.4.38/kernel/locking
task->pi_blocked_on = NULL;
/*
* Finish the lock acquisition. @task is the new owner. If
-@@ -861,7 +902,7 @@
+@@ -925,7 +966,7 @@
*/
if (rt_mutex_has_waiters(lock))
rt_mutex_enqueue_pi(task, rt_mutex_top_waiter(lock));
@@ -18628,7 +18616,7 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex.c linux-4.4.38/kernel/locking
takeit:
/* We got the lock. */
-@@ -878,12 +919,444 @@
+@@ -942,12 +983,444 @@
return 1;
}
@@ -19074,7 +19062,7 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex.c linux-4.4.38/kernel/locking
*/
static int task_blocks_on_rt_mutex(struct rt_mutex *lock,
struct rt_mutex_waiter *waiter,
-@@ -894,7 +1367,6 @@
+@@ -958,7 +1431,6 @@
struct rt_mutex_waiter *top_waiter = waiter;
struct rt_mutex *next_lock;
int chain_walk = 0, res;
@@ -19082,7 +19070,7 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex.c linux-4.4.38/kernel/locking
/*
* Early deadlock detection. We really don't want the task to
-@@ -908,7 +1380,24 @@
+@@ -972,7 +1444,24 @@
if (owner == task)
return -EDEADLK;
@@ -19108,7 +19096,7 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex.c linux-4.4.38/kernel/locking
__rt_mutex_adjust_prio(task);
waiter->task = task;
waiter->lock = lock;
-@@ -921,18 +1410,18 @@
+@@ -985,18 +1474,18 @@
task->pi_blocked_on = waiter;
@@ -19130,7 +19118,7 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex.c linux-4.4.38/kernel/locking
chain_walk = 1;
} else if (rt_mutex_cond_detect_deadlock(waiter, chwalk)) {
chain_walk = 1;
-@@ -941,7 +1430,7 @@
+@@ -1005,7 +1494,7 @@
/* Store the lock on which owner is blocked or NULL */
next_lock = task_blocked_on_lock(owner);
@@ -19139,7 +19127,7 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex.c linux-4.4.38/kernel/locking
/*
* Even if full deadlock detection is on, if the owner is not
* blocked itself, we can avoid finding this out in the chain
-@@ -957,12 +1446,12 @@
+@@ -1021,12 +1510,12 @@
*/
get_task_struct(owner);
@@ -19154,7 +19142,7 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex.c linux-4.4.38/kernel/locking
return res;
}
-@@ -971,15 +1460,15 @@
+@@ -1035,15 +1524,15 @@
* Remove the top waiter from the current tasks pi waiter tree and
* queue it up.
*
@@ -19173,7 +19161,7 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex.c linux-4.4.38/kernel/locking
waiter = rt_mutex_top_waiter(lock);
-@@ -1001,15 +1490,18 @@
+@@ -1065,15 +1554,18 @@
*/
lock->owner = (void *) RT_MUTEX_HAS_WAITERS;
@@ -19195,7 +19183,7 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex.c linux-4.4.38/kernel/locking
* have just failed to try_to_take_rt_mutex().
*/
static void remove_waiter(struct rt_mutex *lock,
-@@ -1017,13 +1509,12 @@
+@@ -1081,13 +1573,12 @@
{
bool is_top_waiter = (waiter == rt_mutex_top_waiter(lock));
struct task_struct *owner = rt_mutex_owner(lock);
@@ -19212,7 +19200,7 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex.c linux-4.4.38/kernel/locking
/*
* Only update priority if the waiter was the highest priority
-@@ -1032,7 +1523,7 @@
+@@ -1096,7 +1587,7 @@
if (!owner || !is_top_waiter)
return;
@@ -19221,7 +19209,7 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex.c linux-4.4.38/kernel/locking
rt_mutex_dequeue_pi(owner, waiter);
-@@ -1042,9 +1533,10 @@
+@@ -1106,9 +1597,10 @@
__rt_mutex_adjust_prio(owner);
/* Store the lock on which owner is blocked or NULL */
@@ -19234,7 +19222,7 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex.c linux-4.4.38/kernel/locking
/*
* Don't walk the chain, if the owner task is not blocked
-@@ -1056,12 +1548,12 @@
+@@ -1120,12 +1612,12 @@
/* gets dropped in rt_mutex_adjust_prio_chain()! */
get_task_struct(owner);
@@ -19249,7 +19237,7 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex.c linux-4.4.38/kernel/locking
}
/*
-@@ -1078,17 +1570,17 @@
+@@ -1142,17 +1634,17 @@
raw_spin_lock_irqsave(&task->pi_lock, flags);
waiter = task->pi_blocked_on;
@@ -19269,7 +19257,7 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex.c linux-4.4.38/kernel/locking
rt_mutex_adjust_prio_chain(task, RT_MUTEX_MIN_CHAINWALK, NULL,
next_lock, NULL, task);
}
-@@ -1097,16 +1589,17 @@
+@@ -1161,16 +1653,17 @@
* __rt_mutex_slowlock() - Perform the wait-wake-try-to-take loop
* @lock: the rt_mutex to take
* @state: the state the task should block in (TASK_INTERRUPTIBLE
@@ -19290,7 +19278,7 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex.c linux-4.4.38/kernel/locking
{
int ret = 0;
-@@ -1129,13 +1622,19 @@
+@@ -1193,13 +1686,19 @@
break;
}
@@ -19312,7 +19300,7 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex.c linux-4.4.38/kernel/locking
set_current_state(state);
}
-@@ -1163,26 +1662,112 @@
+@@ -1227,26 +1726,112 @@
}
}
@@ -19431,7 +19419,7 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex.c linux-4.4.38/kernel/locking
return 0;
}
-@@ -1196,13 +1781,23 @@
+@@ -1260,13 +1845,23 @@
if (likely(!ret))
/* sleep on the mutex */
@@ -19457,7 +19445,7 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex.c linux-4.4.38/kernel/locking
}
/*
-@@ -1211,7 +1806,7 @@
+@@ -1275,7 +1870,7 @@
*/
fixup_rt_mutex_waiters(lock);
@@ -19466,7 +19454,7 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex.c linux-4.4.38/kernel/locking
/* Remove pending timer: */
if (unlikely(timeout))
-@@ -1227,6 +1822,7 @@
+@@ -1291,6 +1886,7 @@
*/
static inline int rt_mutex_slowtrylock(struct rt_mutex *lock)
{
@@ -19474,7 +19462,7 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex.c linux-4.4.38/kernel/locking
int ret;
/*
-@@ -1238,10 +1834,10 @@
+@@ -1302,10 +1898,10 @@
return 0;
/*
@@ -19488,7 +19476,7 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex.c linux-4.4.38/kernel/locking
ret = try_to_take_rt_mutex(lock, current, NULL);
-@@ -1251,7 +1847,7 @@
+@@ -1315,7 +1911,7 @@
*/
fixup_rt_mutex_waiters(lock);
@@ -19497,7 +19485,7 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex.c linux-4.4.38/kernel/locking
return ret;
}
-@@ -1261,9 +1857,13 @@
+@@ -1325,9 +1921,13 @@
* Return whether the current task needs to undo a potential priority boosting.
*/
static bool __sched rt_mutex_slowunlock(struct rt_mutex *lock,
@@ -19513,7 +19501,7 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex.c linux-4.4.38/kernel/locking
debug_rt_mutex_unlock(lock);
-@@ -1302,10 +1902,10 @@
+@@ -1366,10 +1966,10 @@
*/
while (!rt_mutex_has_waiters(lock)) {
/* Drops lock->wait_lock ! */
@@ -19526,7 +19514,7 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex.c linux-4.4.38/kernel/locking
}
/*
-@@ -1314,9 +1914,9 @@
+@@ -1378,9 +1978,9 @@
*
* Queue the next waiter for wakeup once we release the wait_lock.
*/
@@ -19538,7 +19526,7 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex.c linux-4.4.38/kernel/locking
/* check PI boosting */
return true;
-@@ -1330,31 +1930,36 @@
+@@ -1394,31 +1994,36 @@
*/
static inline int
rt_mutex_fastlock(struct rt_mutex *lock, int state,
@@ -19579,7 +19567,7 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex.c linux-4.4.38/kernel/locking
}
static inline int
-@@ -1371,17 +1976,20 @@
+@@ -1435,17 +2040,20 @@
static inline void
rt_mutex_fastunlock(struct rt_mutex *lock,
bool (*slowfn)(struct rt_mutex *lock,
@@ -19602,7 +19590,7 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex.c linux-4.4.38/kernel/locking
/* Undo pi boosting if necessary: */
if (deboost)
-@@ -1398,7 +2006,7 @@
+@@ -1462,7 +2070,7 @@
{
might_sleep();
@@ -19611,7 +19599,7 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex.c linux-4.4.38/kernel/locking
}
EXPORT_SYMBOL_GPL(rt_mutex_lock);
-@@ -1415,7 +2023,7 @@
+@@ -1479,7 +2087,7 @@
{
might_sleep();
@@ -19620,7 +19608,7 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex.c linux-4.4.38/kernel/locking
}
EXPORT_SYMBOL_GPL(rt_mutex_lock_interruptible);
-@@ -1428,11 +2036,30 @@
+@@ -1492,11 +2100,30 @@
might_sleep();
return rt_mutex_timed_fastlock(lock, TASK_INTERRUPTIBLE, timeout,
@@ -19652,7 +19640,7 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex.c linux-4.4.38/kernel/locking
* rt_mutex_timed_lock - lock a rt_mutex interruptible
* the timeout structure is provided
* by the caller
-@@ -1452,6 +2079,7 @@
+@@ -1516,6 +2143,7 @@
return rt_mutex_timed_fastlock(lock, TASK_INTERRUPTIBLE, timeout,
RT_MUTEX_MIN_CHAINWALK,
@@ -19660,7 +19648,7 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex.c linux-4.4.38/kernel/locking
rt_mutex_slowlock);
}
EXPORT_SYMBOL_GPL(rt_mutex_timed_lock);
-@@ -1469,7 +2097,11 @@
+@@ -1533,7 +2161,11 @@
*/
int __sched rt_mutex_trylock(struct rt_mutex *lock)
{
@@ -19672,7 +19660,7 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex.c linux-4.4.38/kernel/locking
return 0;
return rt_mutex_fasttrylock(lock, rt_mutex_slowtrylock);
-@@ -1495,13 +2127,14 @@
+@@ -1559,13 +2191,14 @@
* required or not.
*/
bool __sched rt_mutex_futex_unlock(struct rt_mutex *lock,
@@ -19689,7 +19677,7 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex.c linux-4.4.38/kernel/locking
}
/**
-@@ -1534,13 +2167,12 @@
+@@ -1598,13 +2231,12 @@
void __rt_mutex_init(struct rt_mutex *lock, const char *name)
{
lock->owner = NULL;
@@ -19704,7 +19692,7 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex.c linux-4.4.38/kernel/locking
/**
* rt_mutex_init_proxy_locked - initialize and lock a rt_mutex on behalf of a
-@@ -1555,7 +2187,7 @@
+@@ -1619,7 +2251,7 @@
void rt_mutex_init_proxy_locked(struct rt_mutex *lock,
struct task_struct *proxy_owner)
{
@@ -19713,7 +19701,7 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex.c linux-4.4.38/kernel/locking
debug_rt_mutex_proxy_lock(lock, proxy_owner);
rt_mutex_set_owner(lock, proxy_owner);
rt_mutex_deadlock_account_lock(lock, proxy_owner);
-@@ -1596,13 +2228,42 @@
+@@ -1660,13 +2292,42 @@
{
int ret;
@@ -19758,7 +19746,7 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex.c linux-4.4.38/kernel/locking
/* We enforce deadlock detection for futexes */
ret = task_blocks_on_rt_mutex(lock, waiter, task,
RT_MUTEX_FULL_CHAINWALK);
-@@ -1617,10 +2278,10 @@
+@@ -1681,10 +2342,10 @@
ret = 0;
}
@@ -19771,7 +19759,7 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex.c linux-4.4.38/kernel/locking
debug_rt_mutex_print_deadlock(waiter);
-@@ -1668,12 +2329,12 @@
+@@ -1732,12 +2393,12 @@
{
int ret;
@@ -19786,15 +19774,15 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex.c linux-4.4.38/kernel/locking
if (unlikely(ret))
remove_waiter(lock, waiter);
-@@ -1684,7 +2345,93 @@
+@@ -1748,7 +2409,93 @@
*/
fixup_rt_mutex_waiters(lock);
- raw_spin_unlock(&lock->wait_lock);
+ raw_spin_unlock_irq(&lock->wait_lock);
-
- return ret;
- }
++
++ return ret;
++}
+
+static inline int
+ww_mutex_deadlock_injection(struct ww_mutex *lock, struct ww_acquire_ctx *ctx)
@@ -19836,9 +19824,9 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex.c linux-4.4.38/kernel/locking
+ mutex_release(&lock->base.dep_map, 1, _RET_IP_);
+ else if (!ret && ww_ctx->acquired > 1)
+ return ww_mutex_deadlock_injection(lock, ww_ctx);
-+
-+ return ret;
-+}
+
+ return ret;
+ }
+EXPORT_SYMBOL_GPL(__ww_mutex_lock_interruptible);
+
+int __sched
@@ -19881,9 +19869,9 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex.c linux-4.4.38/kernel/locking
+}
+EXPORT_SYMBOL(ww_mutex_unlock);
+#endif
-diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex_common.h linux-4.4.38/kernel/locking/rtmutex_common.h
---- linux-4.4.38.orig/kernel/locking/rtmutex_common.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/locking/rtmutex_common.h 2017-01-01 21:00:19.993736670 +0100
+diff -Nur linux-4.4.46.orig/kernel/locking/rtmutex_common.h linux-4.4.46/kernel/locking/rtmutex_common.h
+--- linux-4.4.46.orig/kernel/locking/rtmutex_common.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/locking/rtmutex_common.h 2017-02-03 17:18:10.927619058 +0100
@@ -27,6 +27,7 @@
struct rb_node pi_tree_entry;
struct task_struct *task;
@@ -19892,7 +19880,7 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex_common.h linux-4.4.38/kernel/
#ifdef CONFIG_DEBUG_RT_MUTEXES
unsigned long ip;
struct pid *deadlock_task_pid;
-@@ -97,6 +98,9 @@
+@@ -98,6 +99,9 @@
/*
* PI-futex support (proxy locking functions, etc.):
*/
@@ -19902,7 +19890,7 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex_common.h linux-4.4.38/kernel/
extern struct task_struct *rt_mutex_next_owner(struct rt_mutex *lock);
extern void rt_mutex_init_proxy_locked(struct rt_mutex *lock,
struct task_struct *proxy_owner);
-@@ -110,7 +114,8 @@
+@@ -111,7 +115,8 @@
struct rt_mutex_waiter *waiter);
extern int rt_mutex_timed_futex_lock(struct rt_mutex *l, struct hrtimer_sleeper *to);
extern bool rt_mutex_futex_unlock(struct rt_mutex *lock,
@@ -19912,7 +19900,7 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex_common.h linux-4.4.38/kernel/
extern void rt_mutex_adjust_prio(struct task_struct *task);
#ifdef CONFIG_DEBUG_RT_MUTEXES
-@@ -119,4 +124,14 @@
+@@ -120,4 +125,14 @@
# include "rtmutex.h"
#endif
@@ -19927,9 +19915,9 @@ diff -Nur linux-4.4.38.orig/kernel/locking/rtmutex_common.h linux-4.4.38/kernel/
+}
+
#endif
-diff -Nur linux-4.4.38.orig/kernel/locking/spinlock.c linux-4.4.38/kernel/locking/spinlock.c
---- linux-4.4.38.orig/kernel/locking/spinlock.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/locking/spinlock.c 2017-01-01 21:00:19.993736670 +0100
+diff -Nur linux-4.4.46.orig/kernel/locking/spinlock.c linux-4.4.46/kernel/locking/spinlock.c
+--- linux-4.4.46.orig/kernel/locking/spinlock.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/locking/spinlock.c 2017-02-03 17:18:10.927619058 +0100
@@ -124,8 +124,11 @@
* __[spin|read|write]_lock_bh()
*/
@@ -19960,9 +19948,9 @@ diff -Nur linux-4.4.38.orig/kernel/locking/spinlock.c linux-4.4.38/kernel/lockin
#ifdef CONFIG_DEBUG_LOCK_ALLOC
void __lockfunc _raw_spin_lock_nested(raw_spinlock_t *lock, int subclass)
-diff -Nur linux-4.4.38.orig/kernel/locking/spinlock_debug.c linux-4.4.38/kernel/locking/spinlock_debug.c
---- linux-4.4.38.orig/kernel/locking/spinlock_debug.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/locking/spinlock_debug.c 2017-01-01 21:00:19.993736670 +0100
+diff -Nur linux-4.4.46.orig/kernel/locking/spinlock_debug.c linux-4.4.46/kernel/locking/spinlock_debug.c
+--- linux-4.4.46.orig/kernel/locking/spinlock_debug.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/locking/spinlock_debug.c 2017-02-03 17:18:10.927619058 +0100
@@ -31,6 +31,7 @@
EXPORT_SYMBOL(__raw_spin_lock_init);
@@ -19993,9 +19981,9 @@ diff -Nur linux-4.4.38.orig/kernel/locking/spinlock_debug.c linux-4.4.38/kernel/
}
+
+#endif
-diff -Nur linux-4.4.38.orig/kernel/panic.c linux-4.4.38/kernel/panic.c
---- linux-4.4.38.orig/kernel/panic.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/panic.c 2017-01-01 21:00:19.997736931 +0100
+diff -Nur linux-4.4.46.orig/kernel/panic.c linux-4.4.46/kernel/panic.c
+--- linux-4.4.46.orig/kernel/panic.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/panic.c 2017-02-03 17:18:10.927619058 +0100
@@ -61,6 +61,37 @@
cpu_relax();
}
@@ -20084,9 +20072,9 @@ diff -Nur linux-4.4.38.orig/kernel/panic.c linux-4.4.38/kernel/panic.c
oops_id++;
return 0;
-diff -Nur linux-4.4.38.orig/kernel/power/hibernate.c linux-4.4.38/kernel/power/hibernate.c
---- linux-4.4.38.orig/kernel/power/hibernate.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/power/hibernate.c 2017-01-01 21:00:19.997736931 +0100
+diff -Nur linux-4.4.46.orig/kernel/power/hibernate.c linux-4.4.46/kernel/power/hibernate.c
+--- linux-4.4.46.orig/kernel/power/hibernate.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/power/hibernate.c 2017-02-03 17:18:10.927619058 +0100
@@ -285,6 +285,8 @@
local_irq_disable();
@@ -20164,9 +20152,9 @@ diff -Nur linux-4.4.38.orig/kernel/power/hibernate.c linux-4.4.38/kernel/power/h
return error;
}
-diff -Nur linux-4.4.38.orig/kernel/power/suspend.c linux-4.4.38/kernel/power/suspend.c
---- linux-4.4.38.orig/kernel/power/suspend.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/power/suspend.c 2017-01-01 21:00:19.997736931 +0100
+diff -Nur linux-4.4.46.orig/kernel/power/suspend.c linux-4.4.46/kernel/power/suspend.c
+--- linux-4.4.46.orig/kernel/power/suspend.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/power/suspend.c 2017-02-03 17:18:10.927619058 +0100
@@ -359,6 +359,8 @@
arch_suspend_disable_irqs();
BUG_ON(!irqs_disabled());
@@ -20211,9 +20199,9 @@ diff -Nur linux-4.4.38.orig/kernel/power/suspend.c linux-4.4.38/kernel/power/sus
return error;
}
EXPORT_SYMBOL(pm_suspend);
-diff -Nur linux-4.4.38.orig/kernel/printk/printk.c linux-4.4.38/kernel/printk/printk.c
---- linux-4.4.38.orig/kernel/printk/printk.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/printk/printk.c 2017-01-01 21:00:19.997736931 +0100
+diff -Nur linux-4.4.46.orig/kernel/printk/printk.c linux-4.4.46/kernel/printk/printk.c
+--- linux-4.4.46.orig/kernel/printk/printk.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/printk/printk.c 2017-02-03 17:18:10.927619058 +0100
@@ -241,6 +241,65 @@
*/
static DEFINE_RAW_SPINLOCK(logbuf_lock);
@@ -20487,10 +20475,10 @@ diff -Nur linux-4.4.38.orig/kernel/printk/printk.c linux-4.4.38/kernel/printk/pr
/*
* console_unblank can no longer be called in interrupt context unless
* oops_in_progress is set to 1..
-diff -Nur linux-4.4.38.orig/kernel/ptrace.c linux-4.4.38/kernel/ptrace.c
---- linux-4.4.38.orig/kernel/ptrace.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/ptrace.c 2017-01-01 21:00:20.001737184 +0100
-@@ -129,7 +129,14 @@
+diff -Nur linux-4.4.46.orig/kernel/ptrace.c linux-4.4.46/kernel/ptrace.c
+--- linux-4.4.46.orig/kernel/ptrace.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/ptrace.c 2017-02-03 17:18:10.927619058 +0100
+@@ -136,7 +136,14 @@
spin_lock_irq(&task->sighand->siglock);
if (task_is_traced(task) && !__fatal_signal_pending(task)) {
@@ -20506,9 +20494,9 @@ diff -Nur linux-4.4.38.orig/kernel/ptrace.c linux-4.4.38/kernel/ptrace.c
ret = true;
}
spin_unlock_irq(&task->sighand->siglock);
-diff -Nur linux-4.4.38.orig/kernel/rcu/rcutorture.c linux-4.4.38/kernel/rcu/rcutorture.c
---- linux-4.4.38.orig/kernel/rcu/rcutorture.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/rcu/rcutorture.c 2017-01-01 21:00:20.001737184 +0100
+diff -Nur linux-4.4.46.orig/kernel/rcu/rcutorture.c linux-4.4.46/kernel/rcu/rcutorture.c
+--- linux-4.4.46.orig/kernel/rcu/rcutorture.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/rcu/rcutorture.c 2017-02-03 17:18:10.927619058 +0100
@@ -390,6 +390,7 @@
.name = "rcu"
};
@@ -20530,9 +20518,9 @@ diff -Nur linux-4.4.38.orig/kernel/rcu/rcutorture.c linux-4.4.38/kernel/rcu/rcut
/*
* Don't even think about trying any of these in real life!!!
* The names includes "busted", and they really means it!
-diff -Nur linux-4.4.38.orig/kernel/rcu/tree.c linux-4.4.38/kernel/rcu/tree.c
---- linux-4.4.38.orig/kernel/rcu/tree.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/rcu/tree.c 2017-01-01 21:00:20.005737445 +0100
+diff -Nur linux-4.4.46.orig/kernel/rcu/tree.c linux-4.4.46/kernel/rcu/tree.c
+--- linux-4.4.46.orig/kernel/rcu/tree.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/rcu/tree.c 2017-02-03 17:18:10.931619212 +0100
@@ -56,6 +56,11 @@
#include <linux/random.h>
#include <linux/trace_events.h>
@@ -20926,9 +20914,9 @@ diff -Nur linux-4.4.38.orig/kernel/rcu/tree.c linux-4.4.38/kernel/rcu/tree.c
/*
* We don't need protection against CPU-hotplug here because
-diff -Nur linux-4.4.38.orig/kernel/rcu/tree.h linux-4.4.38/kernel/rcu/tree.h
---- linux-4.4.38.orig/kernel/rcu/tree.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/rcu/tree.h 2017-01-01 21:00:20.005737445 +0100
+diff -Nur linux-4.4.46.orig/kernel/rcu/tree.h linux-4.4.46/kernel/rcu/tree.h
+--- linux-4.4.46.orig/kernel/rcu/tree.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/rcu/tree.h 2017-02-03 17:18:10.931619212 +0100
@@ -27,6 +27,7 @@
#include <linux/threads.h>
#include <linux/cpumask.h>
@@ -21016,9 +21004,9 @@ diff -Nur linux-4.4.38.orig/kernel/rcu/tree.h linux-4.4.38/kernel/rcu/tree.h
static void rcu_init_one_nocb(struct rcu_node *rnp);
static bool __call_rcu_nocb(struct rcu_data *rdp, struct rcu_head *rhp,
bool lazy, unsigned long flags);
-diff -Nur linux-4.4.38.orig/kernel/rcu/tree_plugin.h linux-4.4.38/kernel/rcu/tree_plugin.h
---- linux-4.4.38.orig/kernel/rcu/tree_plugin.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/rcu/tree_plugin.h 2017-01-01 21:00:20.005737445 +0100
+diff -Nur linux-4.4.46.orig/kernel/rcu/tree_plugin.h linux-4.4.46/kernel/rcu/tree_plugin.h
+--- linux-4.4.46.orig/kernel/rcu/tree_plugin.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/rcu/tree_plugin.h 2017-02-03 17:18:10.931619212 +0100
@@ -24,25 +24,10 @@
* Paul E. McKenney <paulmck@linux.vnet.ibm.com>
*/
@@ -21394,9 +21382,9 @@ diff -Nur linux-4.4.38.orig/kernel/rcu/tree_plugin.h linux-4.4.38/kernel/rcu/tre
static void rcu_init_one_nocb(struct rcu_node *rnp)
{
}
-diff -Nur linux-4.4.38.orig/kernel/rcu/update.c linux-4.4.38/kernel/rcu/update.c
---- linux-4.4.38.orig/kernel/rcu/update.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/rcu/update.c 2017-01-01 21:00:20.005737445 +0100
+diff -Nur linux-4.4.46.orig/kernel/rcu/update.c linux-4.4.46/kernel/rcu/update.c
+--- linux-4.4.46.orig/kernel/rcu/update.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/rcu/update.c 2017-02-03 17:18:10.931619212 +0100
@@ -276,6 +276,7 @@
}
EXPORT_SYMBOL_GPL(rcu_read_lock_held);
@@ -21413,9 +21401,9 @@ diff -Nur linux-4.4.38.orig/kernel/rcu/update.c linux-4.4.38/kernel/rcu/update.c
#endif /* #ifdef CONFIG_DEBUG_LOCK_ALLOC */
-diff -Nur linux-4.4.38.orig/kernel/relay.c linux-4.4.38/kernel/relay.c
---- linux-4.4.38.orig/kernel/relay.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/relay.c 2017-01-01 21:00:20.005737445 +0100
+diff -Nur linux-4.4.46.orig/kernel/relay.c linux-4.4.46/kernel/relay.c
+--- linux-4.4.46.orig/kernel/relay.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/relay.c 2017-02-03 17:18:10.931619212 +0100
@@ -336,6 +336,10 @@
{
struct rchan_buf *buf = (struct rchan_buf *)data;
@@ -21451,9 +21439,9 @@ diff -Nur linux-4.4.38.orig/kernel/relay.c linux-4.4.38/kernel/relay.c
}
old = buf->data;
-diff -Nur linux-4.4.38.orig/kernel/sched/completion.c linux-4.4.38/kernel/sched/completion.c
---- linux-4.4.38.orig/kernel/sched/completion.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/sched/completion.c 2017-01-01 21:00:20.005737445 +0100
+diff -Nur linux-4.4.46.orig/kernel/sched/completion.c linux-4.4.46/kernel/sched/completion.c
+--- linux-4.4.46.orig/kernel/sched/completion.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/sched/completion.c 2017-02-03 17:18:10.931619212 +0100
@@ -30,10 +30,10 @@
{
unsigned long flags;
@@ -21544,9 +21532,9 @@ diff -Nur linux-4.4.38.orig/kernel/sched/completion.c linux-4.4.38/kernel/sched/
return true;
}
EXPORT_SYMBOL(completion_done);
-diff -Nur linux-4.4.38.orig/kernel/sched/core.c linux-4.4.38/kernel/sched/core.c
---- linux-4.4.38.orig/kernel/sched/core.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/sched/core.c 2017-01-01 21:00:20.009737698 +0100
+diff -Nur linux-4.4.46.orig/kernel/sched/core.c linux-4.4.46/kernel/sched/core.c
+--- linux-4.4.46.orig/kernel/sched/core.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/sched/core.c 2017-02-03 17:18:10.931619212 +0100
@@ -260,7 +260,11 @@
* Number of tasks to iterate in a single balance run.
* Limited because this is done with IRQs disabled.
@@ -22261,9 +22249,9 @@ diff -Nur linux-4.4.38.orig/kernel/sched/core.c linux-4.4.38/kernel/sched/core.c
return (nested == preempt_offset);
}
-diff -Nur linux-4.4.38.orig/kernel/sched/cpudeadline.c linux-4.4.38/kernel/sched/cpudeadline.c
---- linux-4.4.38.orig/kernel/sched/cpudeadline.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/sched/cpudeadline.c 2017-01-01 21:00:20.009737698 +0100
+diff -Nur linux-4.4.46.orig/kernel/sched/cpudeadline.c linux-4.4.46/kernel/sched/cpudeadline.c
+--- linux-4.4.46.orig/kernel/sched/cpudeadline.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/sched/cpudeadline.c 2017-02-03 17:18:10.931619212 +0100
@@ -103,10 +103,10 @@
const struct sched_dl_entity *dl_se = &p->dl;
@@ -22277,9 +22265,9 @@ diff -Nur linux-4.4.38.orig/kernel/sched/cpudeadline.c linux-4.4.38/kernel/sched
dl_time_before(dl_se->deadline, cp->elements[0].dl)) {
best_cpu = cpudl_maximum(cp);
if (later_mask)
-diff -Nur linux-4.4.38.orig/kernel/sched/cpupri.c linux-4.4.38/kernel/sched/cpupri.c
---- linux-4.4.38.orig/kernel/sched/cpupri.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/sched/cpupri.c 2017-01-01 21:00:20.009737698 +0100
+diff -Nur linux-4.4.46.orig/kernel/sched/cpupri.c linux-4.4.46/kernel/sched/cpupri.c
+--- linux-4.4.46.orig/kernel/sched/cpupri.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/sched/cpupri.c 2017-02-03 17:18:10.931619212 +0100
@@ -103,11 +103,11 @@
if (skip)
continue;
@@ -22294,9 +22282,9 @@ diff -Nur linux-4.4.38.orig/kernel/sched/cpupri.c linux-4.4.38/kernel/sched/cpup
/*
* We have to ensure that we have at least one bit
-diff -Nur linux-4.4.38.orig/kernel/sched/cputime.c linux-4.4.38/kernel/sched/cputime.c
---- linux-4.4.38.orig/kernel/sched/cputime.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/sched/cputime.c 2017-01-01 21:00:20.009737698 +0100
+diff -Nur linux-4.4.46.orig/kernel/sched/cputime.c linux-4.4.46/kernel/sched/cputime.c
+--- linux-4.4.46.orig/kernel/sched/cputime.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/sched/cputime.c 2017-02-03 17:18:10.931619212 +0100
@@ -685,7 +685,7 @@
{
unsigned long long delta = vtime_delta(tsk);
@@ -22453,9 +22441,9 @@ diff -Nur linux-4.4.38.orig/kernel/sched/cputime.c linux-4.4.38/kernel/sched/cpu
}
-diff -Nur linux-4.4.38.orig/kernel/sched/deadline.c linux-4.4.38/kernel/sched/deadline.c
---- linux-4.4.38.orig/kernel/sched/deadline.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/sched/deadline.c 2017-01-01 21:00:20.009737698 +0100
+diff -Nur linux-4.4.46.orig/kernel/sched/deadline.c linux-4.4.46/kernel/sched/deadline.c
+--- linux-4.4.46.orig/kernel/sched/deadline.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/sched/deadline.c 2017-02-03 17:18:10.935619367 +0100
@@ -134,7 +134,7 @@
{
struct task_struct *p = dl_task_of(dl_se);
@@ -22587,9 +22575,9 @@ diff -Nur linux-4.4.38.orig/kernel/sched/deadline.c linux-4.4.38/kernel/sched/de
queue_push_tasks(rq);
#else
if (dl_task(rq->curr))
-diff -Nur linux-4.4.38.orig/kernel/sched/debug.c linux-4.4.38/kernel/sched/debug.c
---- linux-4.4.38.orig/kernel/sched/debug.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/sched/debug.c 2017-01-01 21:00:20.009737698 +0100
+diff -Nur linux-4.4.46.orig/kernel/sched/debug.c linux-4.4.46/kernel/sched/debug.c
+--- linux-4.4.46.orig/kernel/sched/debug.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/sched/debug.c 2017-02-03 17:18:10.935619367 +0100
@@ -251,6 +251,9 @@
P(rt_throttled);
PN(rt_time);
@@ -22611,9 +22599,9 @@ diff -Nur linux-4.4.38.orig/kernel/sched/debug.c linux-4.4.38/kernel/sched/debug
#undef PN
#undef __PN
#undef P
-diff -Nur linux-4.4.38.orig/kernel/sched/fair.c linux-4.4.38/kernel/sched/fair.c
---- linux-4.4.38.orig/kernel/sched/fair.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/sched/fair.c 2017-01-01 21:00:20.013737959 +0100
+diff -Nur linux-4.4.46.orig/kernel/sched/fair.c linux-4.4.46/kernel/sched/fair.c
+--- linux-4.4.46.orig/kernel/sched/fair.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/sched/fair.c 2017-02-03 17:18:10.935619367 +0100
@@ -3166,7 +3166,7 @@
ideal_runtime = sched_slice(cfs_rq, curr);
delta_exec = curr->sum_exec_runtime - curr->prev_sum_exec_runtime;
@@ -22686,9 +22674,9 @@ diff -Nur linux-4.4.38.orig/kernel/sched/fair.c linux-4.4.38/kernel/sched/fair.c
} else
check_preempt_curr(rq, p, 0);
}
-diff -Nur linux-4.4.38.orig/kernel/sched/features.h linux-4.4.38/kernel/sched/features.h
---- linux-4.4.38.orig/kernel/sched/features.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/sched/features.h 2017-01-01 21:00:20.013737959 +0100
+diff -Nur linux-4.4.46.orig/kernel/sched/features.h linux-4.4.46/kernel/sched/features.h
+--- linux-4.4.46.orig/kernel/sched/features.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/sched/features.h 2017-02-03 17:18:10.935619367 +0100
@@ -45,11 +45,19 @@
*/
SCHED_FEAT(NONTASK_CAPACITY, true)
@@ -22709,9 +22697,9 @@ diff -Nur linux-4.4.38.orig/kernel/sched/features.h linux-4.4.38/kernel/sched/fe
#ifdef HAVE_RT_PUSH_IPI
/*
-diff -Nur linux-4.4.38.orig/kernel/sched/Makefile linux-4.4.38/kernel/sched/Makefile
---- linux-4.4.38.orig/kernel/sched/Makefile 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/sched/Makefile 2017-01-01 21:00:20.005737445 +0100
+diff -Nur linux-4.4.46.orig/kernel/sched/Makefile linux-4.4.46/kernel/sched/Makefile
+--- linux-4.4.46.orig/kernel/sched/Makefile 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/sched/Makefile 2017-02-03 17:18:10.931619212 +0100
@@ -13,7 +13,7 @@
obj-y += core.o loadavg.o clock.o cputime.o
@@ -22721,9 +22709,9 @@ diff -Nur linux-4.4.38.orig/kernel/sched/Makefile linux-4.4.38/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.4.38.orig/kernel/sched/rt.c linux-4.4.38/kernel/sched/rt.c
---- linux-4.4.38.orig/kernel/sched/rt.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/sched/rt.c 2017-01-01 21:00:20.013737959 +0100
+diff -Nur linux-4.4.46.orig/kernel/sched/rt.c linux-4.4.46/kernel/sched/rt.c
+--- linux-4.4.46.orig/kernel/sched/rt.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/sched/rt.c 2017-02-03 17:18:10.935619367 +0100
@@ -47,6 +47,7 @@
hrtimer_init(&rt_b->rt_period_timer,
@@ -22842,9 +22830,9 @@ diff -Nur linux-4.4.38.orig/kernel/sched/rt.c linux-4.4.38/kernel/sched/rt.c
queue_push_tasks(rq);
#else
if (p->prio < rq->curr->prio)
-diff -Nur linux-4.4.38.orig/kernel/sched/sched.h linux-4.4.38/kernel/sched/sched.h
---- linux-4.4.38.orig/kernel/sched/sched.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/sched/sched.h 2017-01-01 21:00:20.013737959 +0100
+diff -Nur linux-4.4.46.orig/kernel/sched/sched.h linux-4.4.46/kernel/sched/sched.h
+--- linux-4.4.46.orig/kernel/sched/sched.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/sched/sched.h 2017-02-03 17:18:10.935619367 +0100
@@ -1100,6 +1100,7 @@
#define WF_SYNC 0x01 /* waker goes to sleep after wakeup */
#define WF_FORK 0x02 /* child wakeup after fork */
@@ -22869,9 +22857,9 @@ diff -Nur linux-4.4.38.orig/kernel/sched/sched.h linux-4.4.38/kernel/sched/sched
extern struct rt_bandwidth def_rt_bandwidth;
extern void init_rt_bandwidth(struct rt_bandwidth *rt_b, u64 period, u64 runtime);
-diff -Nur linux-4.4.38.orig/kernel/sched/swait.c linux-4.4.38/kernel/sched/swait.c
---- linux-4.4.38.orig/kernel/sched/swait.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.4.38/kernel/sched/swait.c 2017-01-01 21:00:20.013737959 +0100
+diff -Nur linux-4.4.46.orig/kernel/sched/swait.c linux-4.4.46/kernel/sched/swait.c
+--- linux-4.4.46.orig/kernel/sched/swait.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.4.46/kernel/sched/swait.c 2017-02-03 17:18:10.935619367 +0100
@@ -0,0 +1,143 @@
+#include <linux/sched.h>
+#include <linux/swait.h>
@@ -23016,9 +23004,9 @@ diff -Nur linux-4.4.38.orig/kernel/sched/swait.c linux-4.4.38/kernel/sched/swait
+ }
+}
+EXPORT_SYMBOL(finish_swait);
-diff -Nur linux-4.4.38.orig/kernel/sched/swork.c linux-4.4.38/kernel/sched/swork.c
---- linux-4.4.38.orig/kernel/sched/swork.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.4.38/kernel/sched/swork.c 2017-01-01 21:00:20.013737959 +0100
+diff -Nur linux-4.4.46.orig/kernel/sched/swork.c linux-4.4.46/kernel/sched/swork.c
+--- linux-4.4.46.orig/kernel/sched/swork.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.4.46/kernel/sched/swork.c 2017-02-03 17:18:10.935619367 +0100
@@ -0,0 +1,173 @@
+/*
+ * Copyright (C) 2014 BMW Car IT GmbH, Daniel Wagner daniel.wagner@bmw-carit.de
@@ -23193,9 +23181,9 @@ diff -Nur linux-4.4.38.orig/kernel/sched/swork.c linux-4.4.38/kernel/sched/swork
+ mutex_unlock(&worker_mutex);
+}
+EXPORT_SYMBOL_GPL(swork_put);
-diff -Nur linux-4.4.38.orig/kernel/signal.c linux-4.4.38/kernel/signal.c
---- linux-4.4.38.orig/kernel/signal.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/signal.c 2017-01-01 21:00:20.017738213 +0100
+diff -Nur linux-4.4.46.orig/kernel/signal.c linux-4.4.46/kernel/signal.c
+--- linux-4.4.46.orig/kernel/signal.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/signal.c 2017-02-03 17:18:10.935619367 +0100
@@ -14,6 +14,7 @@
#include <linux/export.h>
#include <linux/init.h>
@@ -23425,9 +23413,9 @@ diff -Nur linux-4.4.38.orig/kernel/signal.c linux-4.4.38/kernel/signal.c
freezable_schedule();
} else {
/*
-diff -Nur linux-4.4.38.orig/kernel/softirq.c linux-4.4.38/kernel/softirq.c
---- linux-4.4.38.orig/kernel/softirq.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/softirq.c 2017-01-01 21:00:20.017738213 +0100
+diff -Nur linux-4.4.46.orig/kernel/softirq.c linux-4.4.46/kernel/softirq.c
+--- linux-4.4.46.orig/kernel/softirq.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/softirq.c 2017-02-03 17:18:10.935619367 +0100
@@ -21,10 +21,12 @@
#include <linux/freezer.h>
#include <linux/kthread.h>
@@ -24398,9 +24386,9 @@ diff -Nur linux-4.4.38.orig/kernel/softirq.c linux-4.4.38/kernel/softirq.c
return 0;
}
-diff -Nur linux-4.4.38.orig/kernel/stop_machine.c linux-4.4.38/kernel/stop_machine.c
---- linux-4.4.38.orig/kernel/stop_machine.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/stop_machine.c 2017-01-01 21:00:20.017738213 +0100
+diff -Nur linux-4.4.46.orig/kernel/stop_machine.c linux-4.4.46/kernel/stop_machine.c
+--- linux-4.4.46.orig/kernel/stop_machine.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/stop_machine.c 2017-02-03 17:18:10.935619367 +0100
@@ -37,7 +37,7 @@
struct cpu_stopper {
struct task_struct *thread;
@@ -24573,9 +24561,9 @@ diff -Nur linux-4.4.38.orig/kernel/stop_machine.c linux-4.4.38/kernel/stop_machi
ret = multi_cpu_stop(&msdata);
/* Busy wait for completion. */
-diff -Nur linux-4.4.38.orig/kernel/time/hrtimer.c linux-4.4.38/kernel/time/hrtimer.c
---- linux-4.4.38.orig/kernel/time/hrtimer.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/time/hrtimer.c 2017-01-01 21:00:20.017738213 +0100
+diff -Nur linux-4.4.46.orig/kernel/time/hrtimer.c linux-4.4.46/kernel/time/hrtimer.c
+--- linux-4.4.46.orig/kernel/time/hrtimer.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/time/hrtimer.c 2017-02-03 17:18:10.939619522 +0100
@@ -48,11 +48,13 @@
#include <linux/sched/rt.h>
#include <linux/sched/deadline.h>
@@ -25019,9 +25007,9 @@ diff -Nur linux-4.4.38.orig/kernel/time/hrtimer.c linux-4.4.38/kernel/time/hrtim
}
/**
-diff -Nur linux-4.4.38.orig/kernel/time/itimer.c linux-4.4.38/kernel/time/itimer.c
---- linux-4.4.38.orig/kernel/time/itimer.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/time/itimer.c 2017-01-01 21:00:20.017738213 +0100
+diff -Nur linux-4.4.46.orig/kernel/time/itimer.c linux-4.4.46/kernel/time/itimer.c
+--- linux-4.4.46.orig/kernel/time/itimer.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/time/itimer.c 2017-02-03 17:18:10.939619522 +0100
@@ -213,6 +213,7 @@
/* We are sharing ->siglock with it_real_fn() */
if (hrtimer_try_to_cancel(timer) < 0) {
@@ -25030,9 +25018,9 @@ diff -Nur linux-4.4.38.orig/kernel/time/itimer.c linux-4.4.38/kernel/time/itimer
goto again;
}
expires = timeval_to_ktime(value->it_value);
-diff -Nur linux-4.4.38.orig/kernel/time/jiffies.c linux-4.4.38/kernel/time/jiffies.c
---- linux-4.4.38.orig/kernel/time/jiffies.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/time/jiffies.c 2017-01-01 21:00:20.017738213 +0100
+diff -Nur linux-4.4.46.orig/kernel/time/jiffies.c linux-4.4.46/kernel/time/jiffies.c
+--- linux-4.4.46.orig/kernel/time/jiffies.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/time/jiffies.c 2017-02-03 17:18:10.939619522 +0100
@@ -74,7 +74,8 @@
.max_cycles = 10,
};
@@ -25055,9 +25043,9 @@ diff -Nur linux-4.4.38.orig/kernel/time/jiffies.c linux-4.4.38/kernel/time/jiffi
return ret;
}
EXPORT_SYMBOL(get_jiffies_64);
-diff -Nur linux-4.4.38.orig/kernel/time/ntp.c linux-4.4.38/kernel/time/ntp.c
---- linux-4.4.38.orig/kernel/time/ntp.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/time/ntp.c 2017-01-01 21:00:20.017738213 +0100
+diff -Nur linux-4.4.46.orig/kernel/time/ntp.c linux-4.4.46/kernel/time/ntp.c
+--- linux-4.4.46.orig/kernel/time/ntp.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/time/ntp.c 2017-02-03 17:18:10.939619522 +0100
@@ -10,6 +10,7 @@
#include <linux/workqueue.h>
#include <linux/hrtimer.h>
@@ -25119,9 +25107,9 @@ diff -Nur linux-4.4.38.orig/kernel/time/ntp.c linux-4.4.38/kernel/time/ntp.c
#else
void ntp_notify_cmos_timer(void) { }
-diff -Nur linux-4.4.38.orig/kernel/time/posix-cpu-timers.c linux-4.4.38/kernel/time/posix-cpu-timers.c
---- linux-4.4.38.orig/kernel/time/posix-cpu-timers.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/time/posix-cpu-timers.c 2017-01-01 21:00:20.021738474 +0100
+diff -Nur linux-4.4.46.orig/kernel/time/posix-cpu-timers.c linux-4.4.46/kernel/time/posix-cpu-timers.c
+--- linux-4.4.46.orig/kernel/time/posix-cpu-timers.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/time/posix-cpu-timers.c 2017-02-03 17:18:10.939619522 +0100
@@ -3,6 +3,7 @@
*/
@@ -25355,9 +25343,9 @@ diff -Nur linux-4.4.38.orig/kernel/time/posix-cpu-timers.c linux-4.4.38/kernel/t
/*
* Set one of the process-wide special case CPU timers or RLIMIT_CPU.
* The tsk->sighand->siglock must be held by the caller.
-diff -Nur linux-4.4.38.orig/kernel/time/posix-timers.c linux-4.4.38/kernel/time/posix-timers.c
---- linux-4.4.38.orig/kernel/time/posix-timers.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/time/posix-timers.c 2017-01-01 21:00:20.021738474 +0100
+diff -Nur linux-4.4.46.orig/kernel/time/posix-timers.c linux-4.4.46/kernel/time/posix-timers.c
+--- linux-4.4.46.orig/kernel/time/posix-timers.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/time/posix-timers.c 2017-02-03 17:18:10.939619522 +0100
@@ -506,6 +506,7 @@
static struct pid *good_sigevent(sigevent_t * event)
{
@@ -25453,9 +25441,9 @@ diff -Nur linux-4.4.38.orig/kernel/time/posix-timers.c linux-4.4.38/kernel/time/
goto retry_delete;
}
list_del(&timer->list);
-diff -Nur linux-4.4.38.orig/kernel/time/tick-broadcast-hrtimer.c linux-4.4.38/kernel/time/tick-broadcast-hrtimer.c
---- linux-4.4.38.orig/kernel/time/tick-broadcast-hrtimer.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/time/tick-broadcast-hrtimer.c 2017-01-01 21:00:20.021738474 +0100
+diff -Nur linux-4.4.46.orig/kernel/time/tick-broadcast-hrtimer.c linux-4.4.46/kernel/time/tick-broadcast-hrtimer.c
+--- linux-4.4.46.orig/kernel/time/tick-broadcast-hrtimer.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/time/tick-broadcast-hrtimer.c 2017-02-03 17:18:10.939619522 +0100
@@ -106,5 +106,6 @@
{
hrtimer_init(&bctimer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
@@ -25463,9 +25451,9 @@ diff -Nur linux-4.4.38.orig/kernel/time/tick-broadcast-hrtimer.c linux-4.4.38/ke
+ bctimer.irqsafe = true;
clockevents_register_device(&ce_broadcast_hrtimer);
}
-diff -Nur linux-4.4.38.orig/kernel/time/tick-common.c linux-4.4.38/kernel/time/tick-common.c
---- linux-4.4.38.orig/kernel/time/tick-common.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/time/tick-common.c 2017-01-01 21:00:20.021738474 +0100
+diff -Nur linux-4.4.46.orig/kernel/time/tick-common.c linux-4.4.46/kernel/time/tick-common.c
+--- linux-4.4.46.orig/kernel/time/tick-common.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/time/tick-common.c 2017-02-03 17:18:10.939619522 +0100
@@ -79,13 +79,15 @@
static void tick_periodic(int cpu)
{
@@ -25496,9 +25484,9 @@ diff -Nur linux-4.4.38.orig/kernel/time/tick-common.c linux-4.4.38/kernel/time/t
clockevents_switch_state(dev, CLOCK_EVT_STATE_ONESHOT);
-diff -Nur linux-4.4.38.orig/kernel/time/tick-sched.c linux-4.4.38/kernel/time/tick-sched.c
---- linux-4.4.38.orig/kernel/time/tick-sched.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/time/tick-sched.c 2017-01-01 21:00:20.021738474 +0100
+diff -Nur linux-4.4.46.orig/kernel/time/tick-sched.c linux-4.4.46/kernel/time/tick-sched.c
+--- linux-4.4.46.orig/kernel/time/tick-sched.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/time/tick-sched.c 2017-02-03 17:18:10.939619522 +0100
@@ -62,7 +62,8 @@
return;
@@ -25598,9 +25586,9 @@ diff -Nur linux-4.4.38.orig/kernel/time/tick-sched.c linux-4.4.38/kernel/time/ti
ts->sched_timer.function = tick_sched_timer;
/* Get the next period (per cpu) */
-diff -Nur linux-4.4.38.orig/kernel/time/timekeeping.c linux-4.4.38/kernel/time/timekeeping.c
---- linux-4.4.38.orig/kernel/time/timekeeping.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/time/timekeeping.c 2017-01-01 21:00:20.021738474 +0100
+diff -Nur linux-4.4.46.orig/kernel/time/timekeeping.c linux-4.4.46/kernel/time/timekeeping.c
+--- linux-4.4.46.orig/kernel/time/timekeeping.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/time/timekeeping.c 2017-02-03 17:18:10.939619522 +0100
@@ -2070,8 +2070,10 @@
*/
void xtime_update(unsigned long ticks)
@@ -25614,9 +25602,9 @@ diff -Nur linux-4.4.38.orig/kernel/time/timekeeping.c linux-4.4.38/kernel/time/t
+ raw_spin_unlock(&jiffies_lock);
update_wall_time();
}
-diff -Nur linux-4.4.38.orig/kernel/time/timekeeping.h linux-4.4.38/kernel/time/timekeeping.h
---- linux-4.4.38.orig/kernel/time/timekeeping.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/time/timekeeping.h 2017-01-01 21:00:20.021738474 +0100
+diff -Nur linux-4.4.46.orig/kernel/time/timekeeping.h linux-4.4.46/kernel/time/timekeeping.h
+--- linux-4.4.46.orig/kernel/time/timekeeping.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/time/timekeeping.h 2017-02-03 17:18:10.939619522 +0100
@@ -19,7 +19,8 @@
extern void do_timer(unsigned long ticks);
extern void update_wall_time(void);
@@ -25627,9 +25615,9 @@ diff -Nur linux-4.4.38.orig/kernel/time/timekeeping.h linux-4.4.38/kernel/time/t
#define CS_NAME_LEN 32
-diff -Nur linux-4.4.38.orig/kernel/time/timer.c linux-4.4.38/kernel/time/timer.c
---- linux-4.4.38.orig/kernel/time/timer.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/time/timer.c 2017-01-01 21:00:20.021738474 +0100
+diff -Nur linux-4.4.46.orig/kernel/time/timer.c linux-4.4.46/kernel/time/timer.c
+--- linux-4.4.46.orig/kernel/time/timer.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/time/timer.c 2017-02-03 17:18:10.939619522 +0100
@@ -80,6 +80,9 @@
struct tvec_base {
spinlock_t lock;
@@ -25839,9 +25827,9 @@ diff -Nur linux-4.4.38.orig/kernel/time/timer.c linux-4.4.38/kernel/time/timer.c
base->timer_jiffies = jiffies;
base->next_timer = base->timer_jiffies;
-diff -Nur linux-4.4.38.orig/kernel/trace/Kconfig linux-4.4.38/kernel/trace/Kconfig
---- linux-4.4.38.orig/kernel/trace/Kconfig 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/trace/Kconfig 2017-01-01 21:00:20.021738474 +0100
+diff -Nur linux-4.4.46.orig/kernel/trace/Kconfig linux-4.4.46/kernel/trace/Kconfig
+--- linux-4.4.46.orig/kernel/trace/Kconfig 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/trace/Kconfig 2017-02-03 17:18:10.939619522 +0100
@@ -187,6 +187,24 @@
enabled. This option and the preempt-off timing option can be
used together or separately.)
@@ -25967,9 +25955,9 @@ diff -Nur linux-4.4.38.orig/kernel/trace/Kconfig linux-4.4.38/kernel/trace/Kconf
config ENABLE_DEFAULT_TRACERS
bool "Trace process context switches and events"
depends on !GENERIC_TRACER
-diff -Nur linux-4.4.38.orig/kernel/trace/latency_hist.c linux-4.4.38/kernel/trace/latency_hist.c
---- linux-4.4.38.orig/kernel/trace/latency_hist.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.4.38/kernel/trace/latency_hist.c 2017-01-01 21:00:20.025738727 +0100
+diff -Nur linux-4.4.46.orig/kernel/trace/latency_hist.c linux-4.4.46/kernel/trace/latency_hist.c
+--- linux-4.4.46.orig/kernel/trace/latency_hist.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.4.46/kernel/trace/latency_hist.c 2017-02-03 17:18:10.939619522 +0100
@@ -0,0 +1,1178 @@
+/*
+ * kernel/trace/latency_hist.c
@@ -27149,9 +27137,9 @@ diff -Nur linux-4.4.38.orig/kernel/trace/latency_hist.c linux-4.4.38/kernel/trac
+}
+
+device_initcall(latency_hist_init);
-diff -Nur linux-4.4.38.orig/kernel/trace/Makefile linux-4.4.38/kernel/trace/Makefile
---- linux-4.4.38.orig/kernel/trace/Makefile 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/trace/Makefile 2017-01-01 21:00:20.021738474 +0100
+diff -Nur linux-4.4.46.orig/kernel/trace/Makefile linux-4.4.46/kernel/trace/Makefile
+--- linux-4.4.46.orig/kernel/trace/Makefile 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/trace/Makefile 2017-02-03 17:18:10.939619522 +0100
@@ -40,6 +40,10 @@
obj-$(CONFIG_IRQSOFF_TRACER) += trace_irqsoff.o
obj-$(CONFIG_PREEMPT_TRACER) += trace_irqsoff.o
@@ -27163,9 +27151,9 @@ diff -Nur linux-4.4.38.orig/kernel/trace/Makefile linux-4.4.38/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.4.38.orig/kernel/trace/trace.c linux-4.4.38/kernel/trace/trace.c
---- linux-4.4.38.orig/kernel/trace/trace.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/trace/trace.c 2017-01-01 21:00:20.025738727 +0100
+diff -Nur linux-4.4.46.orig/kernel/trace/trace.c linux-4.4.46/kernel/trace/trace.c
+--- linux-4.4.46.orig/kernel/trace/trace.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/trace/trace.c 2017-02-03 17:18:10.943619676 +0100
@@ -1652,6 +1652,7 @@
struct task_struct *tsk = current;
@@ -27233,9 +27221,9 @@ diff -Nur linux-4.4.38.orig/kernel/trace/trace.c linux-4.4.38/kernel/trace/trace
}
void
-diff -Nur linux-4.4.38.orig/kernel/trace/trace_events.c linux-4.4.38/kernel/trace/trace_events.c
---- linux-4.4.38.orig/kernel/trace/trace_events.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/trace/trace_events.c 2017-01-01 21:00:20.029738988 +0100
+diff -Nur linux-4.4.46.orig/kernel/trace/trace_events.c linux-4.4.46/kernel/trace/trace_events.c
+--- linux-4.4.46.orig/kernel/trace/trace_events.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/trace/trace_events.c 2017-02-03 17:18:10.943619676 +0100
@@ -188,6 +188,8 @@
__common_field(unsigned char, flags);
__common_field(unsigned char, preempt_count);
@@ -27260,9 +27248,9 @@ diff -Nur linux-4.4.38.orig/kernel/trace/trace_events.c linux-4.4.38/kernel/trac
fbuffer->trace_file = trace_file;
fbuffer->event =
-diff -Nur linux-4.4.38.orig/kernel/trace/trace.h linux-4.4.38/kernel/trace/trace.h
---- linux-4.4.38.orig/kernel/trace/trace.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/trace/trace.h 2017-01-01 21:00:20.025738727 +0100
+diff -Nur linux-4.4.46.orig/kernel/trace/trace.h linux-4.4.46/kernel/trace/trace.h
+--- linux-4.4.46.orig/kernel/trace/trace.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/trace/trace.h 2017-02-03 17:18:10.943619676 +0100
@@ -117,6 +117,7 @@
* NEED_RESCHED - reschedule is requested
* HARDIRQ - inside an interrupt handler
@@ -27279,9 +27267,9 @@ diff -Nur linux-4.4.38.orig/kernel/trace/trace.h linux-4.4.38/kernel/trace/trace
};
#define TRACE_BUF_SIZE 1024
-diff -Nur linux-4.4.38.orig/kernel/trace/trace_irqsoff.c linux-4.4.38/kernel/trace/trace_irqsoff.c
---- linux-4.4.38.orig/kernel/trace/trace_irqsoff.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/trace/trace_irqsoff.c 2017-01-01 21:00:20.029738988 +0100
+diff -Nur linux-4.4.46.orig/kernel/trace/trace_irqsoff.c linux-4.4.46/kernel/trace/trace_irqsoff.c
+--- linux-4.4.46.orig/kernel/trace/trace_irqsoff.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/trace/trace_irqsoff.c 2017-02-03 17:18:10.943619676 +0100
@@ -13,6 +13,7 @@
#include <linux/uaccess.h>
#include <linux/module.h>
@@ -27365,9 +27353,9 @@ diff -Nur linux-4.4.38.orig/kernel/trace/trace_irqsoff.c linux-4.4.38/kernel/tra
if (preempt_trace() && !irq_trace())
start_critical_timing(a0, a1);
}
-diff -Nur linux-4.4.38.orig/kernel/trace/trace_output.c linux-4.4.38/kernel/trace/trace_output.c
---- linux-4.4.38.orig/kernel/trace/trace_output.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/trace/trace_output.c 2017-01-01 21:00:20.029738988 +0100
+diff -Nur linux-4.4.46.orig/kernel/trace/trace_output.c linux-4.4.46/kernel/trace/trace_output.c
+--- linux-4.4.46.orig/kernel/trace/trace_output.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/trace/trace_output.c 2017-02-03 17:18:10.943619676 +0100
@@ -386,6 +386,7 @@
{
char hardsoft_irq;
@@ -27413,9 +27401,9 @@ diff -Nur linux-4.4.38.orig/kernel/trace/trace_output.c linux-4.4.38/kernel/trac
return !trace_seq_has_overflowed(s);
}
-diff -Nur linux-4.4.38.orig/kernel/user.c linux-4.4.38/kernel/user.c
---- linux-4.4.38.orig/kernel/user.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/user.c 2017-01-01 21:00:20.029738988 +0100
+diff -Nur linux-4.4.46.orig/kernel/user.c linux-4.4.46/kernel/user.c
+--- linux-4.4.46.orig/kernel/user.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/user.c 2017-02-03 17:18:10.943619676 +0100
@@ -161,11 +161,11 @@
if (!up)
return;
@@ -27430,9 +27418,9 @@ diff -Nur linux-4.4.38.orig/kernel/user.c linux-4.4.38/kernel/user.c
}
struct user_struct *alloc_uid(kuid_t uid)
-diff -Nur linux-4.4.38.orig/kernel/watchdog.c linux-4.4.38/kernel/watchdog.c
---- linux-4.4.38.orig/kernel/watchdog.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/watchdog.c 2017-01-01 21:00:20.029738988 +0100
+diff -Nur linux-4.4.46.orig/kernel/watchdog.c linux-4.4.46/kernel/watchdog.c
+--- linux-4.4.46.orig/kernel/watchdog.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/watchdog.c 2017-02-03 17:18:10.943619676 +0100
@@ -299,6 +299,8 @@
#ifdef CONFIG_HARDLOCKUP_DETECTOR
@@ -27442,7 +27430,7 @@ diff -Nur linux-4.4.38.orig/kernel/watchdog.c linux-4.4.38/kernel/watchdog.c
static struct perf_event_attr wd_hw_attr = {
.type = PERF_TYPE_HARDWARE,
.config = PERF_COUNT_HW_CPU_CYCLES,
-@@ -333,6 +335,13 @@
+@@ -332,6 +334,13 @@
/* only print hardlockups once */
if (__this_cpu_read(hard_watchdog_warn) == true)
return;
@@ -27456,7 +27444,7 @@ diff -Nur linux-4.4.38.orig/kernel/watchdog.c linux-4.4.38/kernel/watchdog.c
pr_emerg("Watchdog detected hard LOCKUP on cpu %d", this_cpu);
print_modules();
-@@ -350,8 +359,9 @@
+@@ -349,8 +358,9 @@
!test_and_set_bit(0, &hardlockup_allcpu_dumped))
trigger_allbutself_cpu_backtrace();
@@ -27467,7 +27455,7 @@ diff -Nur linux-4.4.38.orig/kernel/watchdog.c linux-4.4.38/kernel/watchdog.c
__this_cpu_write(hard_watchdog_warn, true);
return;
-@@ -497,6 +507,7 @@
+@@ -496,6 +506,7 @@
/* kick off the timer for the hardlockup detector */
hrtimer_init(hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
hrtimer->function = watchdog_timer_fn;
@@ -27475,9 +27463,9 @@ diff -Nur linux-4.4.38.orig/kernel/watchdog.c linux-4.4.38/kernel/watchdog.c
/* Enable the perf event */
watchdog_nmi_enable(cpu);
-diff -Nur linux-4.4.38.orig/kernel/workqueue.c linux-4.4.38/kernel/workqueue.c
---- linux-4.4.38.orig/kernel/workqueue.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/workqueue.c 2017-01-01 21:00:20.029738988 +0100
+diff -Nur linux-4.4.46.orig/kernel/workqueue.c linux-4.4.46/kernel/workqueue.c
+--- linux-4.4.46.orig/kernel/workqueue.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/workqueue.c 2017-02-03 17:18:10.943619676 +0100
@@ -48,6 +48,8 @@
#include <linux/nodemask.h>
#include <linux/moduleparam.h>
@@ -28121,9 +28109,9 @@ diff -Nur linux-4.4.38.orig/kernel/workqueue.c linux-4.4.38/kernel/workqueue.c
return written;
}
-diff -Nur linux-4.4.38.orig/kernel/workqueue_internal.h linux-4.4.38/kernel/workqueue_internal.h
---- linux-4.4.38.orig/kernel/workqueue_internal.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/kernel/workqueue_internal.h 2017-01-01 21:00:20.029738988 +0100
+diff -Nur linux-4.4.46.orig/kernel/workqueue_internal.h linux-4.4.46/kernel/workqueue_internal.h
+--- linux-4.4.46.orig/kernel/workqueue_internal.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/kernel/workqueue_internal.h 2017-02-03 17:18:10.943619676 +0100
@@ -43,6 +43,7 @@
unsigned long last_active; /* L: last active timestamp */
unsigned int flags; /* X: flags */
@@ -28142,9 +28130,9 @@ diff -Nur linux-4.4.38.orig/kernel/workqueue_internal.h linux-4.4.38/kernel/work
+void wq_worker_sleeping(struct task_struct *task);
#endif /* _KERNEL_WORKQUEUE_INTERNAL_H */
-diff -Nur linux-4.4.38.orig/lib/debugobjects.c linux-4.4.38/lib/debugobjects.c
---- linux-4.4.38.orig/lib/debugobjects.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/lib/debugobjects.c 2017-01-01 21:00:20.033739241 +0100
+diff -Nur linux-4.4.46.orig/lib/debugobjects.c linux-4.4.46/lib/debugobjects.c
+--- linux-4.4.46.orig/lib/debugobjects.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/lib/debugobjects.c 2017-02-03 17:18:10.943619676 +0100
@@ -309,7 +309,10 @@
struct debug_obj *obj;
unsigned long flags;
@@ -28157,9 +28145,9 @@ diff -Nur linux-4.4.38.orig/lib/debugobjects.c linux-4.4.38/lib/debugobjects.c
db = get_bucket((unsigned long) addr);
-diff -Nur linux-4.4.38.orig/lib/idr.c linux-4.4.38/lib/idr.c
---- linux-4.4.38.orig/lib/idr.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/lib/idr.c 2017-01-01 21:00:20.033739241 +0100
+diff -Nur linux-4.4.46.orig/lib/idr.c linux-4.4.46/lib/idr.c
+--- linux-4.4.46.orig/lib/idr.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/lib/idr.c 2017-02-03 17:18:10.943619676 +0100
@@ -30,6 +30,7 @@
#include <linux/idr.h>
#include <linux/spinlock.h>
@@ -28252,9 +28240,9 @@ diff -Nur linux-4.4.38.orig/lib/idr.c linux-4.4.38/lib/idr.c
if (!new)
break;
-diff -Nur linux-4.4.38.orig/lib/Kconfig linux-4.4.38/lib/Kconfig
---- linux-4.4.38.orig/lib/Kconfig 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/lib/Kconfig 2017-01-01 21:00:20.029738988 +0100
+diff -Nur linux-4.4.46.orig/lib/Kconfig linux-4.4.46/lib/Kconfig
+--- linux-4.4.46.orig/lib/Kconfig 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/lib/Kconfig 2017-02-03 17:18:10.943619676 +0100
@@ -397,6 +397,7 @@
config CPUMASK_OFFSTACK
@@ -28263,9 +28251,9 @@ diff -Nur linux-4.4.38.orig/lib/Kconfig linux-4.4.38/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.4.38.orig/lib/locking-selftest.c linux-4.4.38/lib/locking-selftest.c
---- linux-4.4.38.orig/lib/locking-selftest.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/lib/locking-selftest.c 2017-01-01 21:00:20.033739241 +0100
+diff -Nur linux-4.4.46.orig/lib/locking-selftest.c linux-4.4.46/lib/locking-selftest.c
+--- linux-4.4.46.orig/lib/locking-selftest.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/lib/locking-selftest.c 2017-02-03 17:18:10.947619830 +0100
@@ -590,6 +590,8 @@
#include "locking-selftest-spin-hardirq.h"
GENERATE_PERMUTATIONS_2_EVENTS(irqsafe1_hard_spin)
@@ -28414,9 +28402,9 @@ diff -Nur linux-4.4.38.orig/lib/locking-selftest.c linux-4.4.38/lib/locking-self
ww_tests();
-diff -Nur linux-4.4.38.orig/lib/percpu_ida.c linux-4.4.38/lib/percpu_ida.c
---- linux-4.4.38.orig/lib/percpu_ida.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/lib/percpu_ida.c 2017-01-01 21:00:20.033739241 +0100
+diff -Nur linux-4.4.46.orig/lib/percpu_ida.c linux-4.4.46/lib/percpu_ida.c
+--- linux-4.4.46.orig/lib/percpu_ida.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/lib/percpu_ida.c 2017-02-03 17:18:10.947619830 +0100
@@ -26,6 +26,9 @@
#include <linux/string.h>
#include <linux/spinlock.h>
@@ -28505,9 +28493,9 @@ diff -Nur linux-4.4.38.orig/lib/percpu_ida.c linux-4.4.38/lib/percpu_ida.c
return err;
}
EXPORT_SYMBOL_GPL(percpu_ida_for_each_free);
-diff -Nur linux-4.4.38.orig/lib/radix-tree.c linux-4.4.38/lib/radix-tree.c
---- linux-4.4.38.orig/lib/radix-tree.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/lib/radix-tree.c 2017-01-01 21:00:20.033739241 +0100
+diff -Nur linux-4.4.46.orig/lib/radix-tree.c linux-4.4.46/lib/radix-tree.c
+--- linux-4.4.46.orig/lib/radix-tree.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/lib/radix-tree.c 2017-02-03 17:18:10.947619830 +0100
@@ -196,13 +196,14 @@
* succeed in getting a node here (and never reach
* kmem_cache_alloc)
@@ -28540,9 +28528,9 @@ diff -Nur linux-4.4.38.orig/lib/radix-tree.c linux-4.4.38/lib/radix-tree.c
/*
* Return the maximum key which can be store into a
-diff -Nur linux-4.4.38.orig/lib/rbtree.c linux-4.4.38/lib/rbtree.c
---- linux-4.4.38.orig/lib/rbtree.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/lib/rbtree.c 2017-01-01 21:00:20.033739241 +0100
+diff -Nur linux-4.4.46.orig/lib/rbtree.c linux-4.4.46/lib/rbtree.c
+--- linux-4.4.46.orig/lib/rbtree.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/lib/rbtree.c 2017-02-03 17:18:10.947619830 +0100
@@ -23,6 +23,7 @@
#include <linux/rbtree_augmented.h>
@@ -28565,9 +28553,9 @@ diff -Nur linux-4.4.38.orig/lib/rbtree.c linux-4.4.38/lib/rbtree.c
+ rcu_assign_pointer(*rb_link, node);
+}
+EXPORT_SYMBOL(rb_link_node_rcu);
-diff -Nur linux-4.4.38.orig/lib/scatterlist.c linux-4.4.38/lib/scatterlist.c
---- linux-4.4.38.orig/lib/scatterlist.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/lib/scatterlist.c 2017-01-01 21:00:20.033739241 +0100
+diff -Nur linux-4.4.46.orig/lib/scatterlist.c linux-4.4.46/lib/scatterlist.c
+--- linux-4.4.46.orig/lib/scatterlist.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/lib/scatterlist.c 2017-02-03 17:18:10.947619830 +0100
@@ -620,7 +620,7 @@
flush_kernel_dcache_page(miter->page);
@@ -28595,9 +28583,9 @@ diff -Nur linux-4.4.38.orig/lib/scatterlist.c linux-4.4.38/lib/scatterlist.c
return offset;
}
EXPORT_SYMBOL(sg_copy_buffer);
-diff -Nur linux-4.4.38.orig/lib/smp_processor_id.c linux-4.4.38/lib/smp_processor_id.c
---- linux-4.4.38.orig/lib/smp_processor_id.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/lib/smp_processor_id.c 2017-01-01 21:00:20.033739241 +0100
+diff -Nur linux-4.4.46.orig/lib/smp_processor_id.c linux-4.4.46/lib/smp_processor_id.c
+--- linux-4.4.46.orig/lib/smp_processor_id.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/lib/smp_processor_id.c 2017-02-03 17:18:10.947619830 +0100
@@ -39,8 +39,9 @@
if (!printk_ratelimit())
goto out_enable;
@@ -28610,9 +28598,9 @@ diff -Nur linux-4.4.38.orig/lib/smp_processor_id.c linux-4.4.38/lib/smp_processo
print_symbol("caller is %s\n", (long)__builtin_return_address(0));
dump_stack();
-diff -Nur linux-4.4.38.orig/Makefile linux-4.4.38/Makefile
---- linux-4.4.38.orig/Makefile 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/Makefile 2017-01-01 21:00:17.849598941 +0100
+diff -Nur linux-4.4.46.orig/Makefile linux-4.4.46/Makefile
+--- linux-4.4.46.orig/Makefile 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/Makefile 2017-02-03 17:18:05.627414322 +0100
@@ -785,6 +785,9 @@
# Prohibit date/time macros, which would make the build non-deterministic
KBUILD_CFLAGS += $(call cc-option,-Werror=date-time)
@@ -28623,9 +28611,9 @@ diff -Nur linux-4.4.38.orig/Makefile linux-4.4.38/Makefile
# use the deterministic mode of AR if available
KBUILD_ARFLAGS := $(call ar-option,D)
-diff -Nur linux-4.4.38.orig/mm/backing-dev.c linux-4.4.38/mm/backing-dev.c
---- linux-4.4.38.orig/mm/backing-dev.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/mm/backing-dev.c 2017-01-01 21:00:20.033739241 +0100
+diff -Nur linux-4.4.46.orig/mm/backing-dev.c linux-4.4.46/mm/backing-dev.c
+--- linux-4.4.46.orig/mm/backing-dev.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/mm/backing-dev.c 2017-02-03 17:18:10.947619830 +0100
@@ -457,9 +457,9 @@
{
unsigned long flags;
@@ -28638,9 +28626,9 @@ diff -Nur linux-4.4.38.orig/mm/backing-dev.c linux-4.4.38/mm/backing-dev.c
return;
}
-diff -Nur linux-4.4.38.orig/mm/compaction.c linux-4.4.38/mm/compaction.c
---- linux-4.4.38.orig/mm/compaction.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/mm/compaction.c 2017-01-01 21:00:20.037739498 +0100
+diff -Nur linux-4.4.46.orig/mm/compaction.c linux-4.4.46/mm/compaction.c
+--- linux-4.4.46.orig/mm/compaction.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/mm/compaction.c 2017-02-03 17:18:10.947619830 +0100
@@ -1430,10 +1430,12 @@
cc->migrate_pfn & ~((1UL << cc->order) - 1);
@@ -28656,9 +28644,9 @@ diff -Nur linux-4.4.38.orig/mm/compaction.c linux-4.4.38/mm/compaction.c
/* No more flushing until we migrate again */
cc->last_migrated_pfn = 0;
}
-diff -Nur linux-4.4.38.orig/mm/filemap.c linux-4.4.38/mm/filemap.c
---- linux-4.4.38.orig/mm/filemap.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/mm/filemap.c 2017-01-01 21:00:20.037739498 +0100
+diff -Nur linux-4.4.46.orig/mm/filemap.c linux-4.4.46/mm/filemap.c
+--- linux-4.4.46.orig/mm/filemap.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/mm/filemap.c 2017-02-03 17:18:10.947619830 +0100
@@ -144,9 +144,12 @@
* node->private_list is protected by
* mapping->tree_lock.
@@ -28685,9 +28673,9 @@ diff -Nur linux-4.4.38.orig/mm/filemap.c linux-4.4.38/mm/filemap.c
}
}
-diff -Nur linux-4.4.38.orig/mm/highmem.c linux-4.4.38/mm/highmem.c
---- linux-4.4.38.orig/mm/highmem.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/mm/highmem.c 2017-01-01 21:00:20.037739498 +0100
+diff -Nur linux-4.4.46.orig/mm/highmem.c linux-4.4.46/mm/highmem.c
+--- linux-4.4.46.orig/mm/highmem.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/mm/highmem.c 2017-02-03 17:18:10.947619830 +0100
@@ -29,10 +29,11 @@
#include <linux/kgdb.h>
#include <asm/tlbflush.h>
@@ -28712,9 +28700,9 @@ diff -Nur linux-4.4.38.orig/mm/highmem.c linux-4.4.38/mm/highmem.c
unsigned int nr_free_highpages (void)
{
-diff -Nur linux-4.4.38.orig/mm/Kconfig linux-4.4.38/mm/Kconfig
---- linux-4.4.38.orig/mm/Kconfig 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/mm/Kconfig 2017-01-01 21:00:20.033739241 +0100
+diff -Nur linux-4.4.46.orig/mm/Kconfig linux-4.4.46/mm/Kconfig
+--- linux-4.4.46.orig/mm/Kconfig 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/mm/Kconfig 2017-02-03 17:18:10.947619830 +0100
@@ -392,7 +392,7 @@
config TRANSPARENT_HUGEPAGE
@@ -28724,9 +28712,9 @@ diff -Nur linux-4.4.38.orig/mm/Kconfig linux-4.4.38/mm/Kconfig
select COMPACTION
help
Transparent Hugepages allows the kernel to use huge pages and
-diff -Nur linux-4.4.38.orig/mm/memcontrol.c linux-4.4.38/mm/memcontrol.c
---- linux-4.4.38.orig/mm/memcontrol.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/mm/memcontrol.c 2017-01-01 21:00:20.037739498 +0100
+diff -Nur linux-4.4.46.orig/mm/memcontrol.c linux-4.4.46/mm/memcontrol.c
+--- linux-4.4.46.orig/mm/memcontrol.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/mm/memcontrol.c 2017-02-03 17:18:10.947619830 +0100
@@ -67,6 +67,8 @@
#include <net/sock.h>
#include <net/ip.h>
@@ -28852,9 +28840,9 @@ diff -Nur linux-4.4.38.orig/mm/memcontrol.c linux-4.4.38/mm/memcontrol.c
}
/**
-diff -Nur linux-4.4.38.orig/mm/mmu_context.c linux-4.4.38/mm/mmu_context.c
---- linux-4.4.38.orig/mm/mmu_context.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/mm/mmu_context.c 2017-01-01 21:00:20.037739498 +0100
+diff -Nur linux-4.4.46.orig/mm/mmu_context.c linux-4.4.46/mm/mmu_context.c
+--- linux-4.4.46.orig/mm/mmu_context.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/mm/mmu_context.c 2017-02-03 17:18:10.947619830 +0100
@@ -23,6 +23,7 @@
struct task_struct *tsk = current;
@@ -28871,9 +28859,9 @@ diff -Nur linux-4.4.38.orig/mm/mmu_context.c linux-4.4.38/mm/mmu_context.c
task_unlock(tsk);
#ifdef finish_arch_post_lock_switch
finish_arch_post_lock_switch();
-diff -Nur linux-4.4.38.orig/mm/page_alloc.c linux-4.4.38/mm/page_alloc.c
---- linux-4.4.38.orig/mm/page_alloc.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/mm/page_alloc.c 2017-01-01 21:00:20.041739757 +0100
+diff -Nur linux-4.4.46.orig/mm/page_alloc.c linux-4.4.46/mm/page_alloc.c
+--- linux-4.4.46.orig/mm/page_alloc.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/mm/page_alloc.c 2017-02-03 17:18:10.951619984 +0100
@@ -60,6 +60,7 @@
#include <linux/page_ext.h>
#include <linux/hugetlb.h>
@@ -29182,7 +29170,7 @@ diff -Nur linux-4.4.38.orig/mm/page_alloc.c linux-4.4.38/mm/page_alloc.c
return NULL;
}
-@@ -5950,6 +6011,7 @@
+@@ -5953,6 +6014,7 @@
void __init page_alloc_init(void)
{
hotcpu_notifier(page_alloc_cpu_notify, 0);
@@ -29190,7 +29178,7 @@ diff -Nur linux-4.4.38.orig/mm/page_alloc.c linux-4.4.38/mm/page_alloc.c
}
/*
-@@ -6844,7 +6906,7 @@
+@@ -6847,7 +6909,7 @@
struct per_cpu_pageset *pset;
/* avoid races with drain_pages() */
@@ -29199,7 +29187,7 @@ diff -Nur linux-4.4.38.orig/mm/page_alloc.c linux-4.4.38/mm/page_alloc.c
if (zone->pageset != &boot_pageset) {
for_each_online_cpu(cpu) {
pset = per_cpu_ptr(zone->pageset, cpu);
-@@ -6853,7 +6915,7 @@
+@@ -6856,7 +6918,7 @@
free_percpu(zone->pageset);
zone->pageset = &boot_pageset;
}
@@ -29208,9 +29196,9 @@ diff -Nur linux-4.4.38.orig/mm/page_alloc.c linux-4.4.38/mm/page_alloc.c
}
#ifdef CONFIG_MEMORY_HOTREMOVE
-diff -Nur linux-4.4.38.orig/mm/slab.h linux-4.4.38/mm/slab.h
---- linux-4.4.38.orig/mm/slab.h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/mm/slab.h 2017-01-01 21:00:20.041739757 +0100
+diff -Nur linux-4.4.46.orig/mm/slab.h linux-4.4.46/mm/slab.h
+--- linux-4.4.46.orig/mm/slab.h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/mm/slab.h 2017-02-03 17:18:10.951619984 +0100
@@ -324,7 +324,11 @@
* The slab lists for all objects.
*/
@@ -29223,9 +29211,9 @@ diff -Nur linux-4.4.38.orig/mm/slab.h linux-4.4.38/mm/slab.h
#ifdef CONFIG_SLAB
struct list_head slabs_partial; /* partial list first, better asm code */
-diff -Nur linux-4.4.38.orig/mm/slub.c linux-4.4.38/mm/slub.c
---- linux-4.4.38.orig/mm/slub.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/mm/slub.c 2017-01-01 21:00:20.041739757 +0100
+diff -Nur linux-4.4.46.orig/mm/slub.c linux-4.4.46/mm/slub.c
+--- linux-4.4.46.orig/mm/slub.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/mm/slub.c 2017-02-03 17:18:10.951619984 +0100
@@ -1075,7 +1075,7 @@
void *object = head;
int cnt = 0;
@@ -29627,9 +29615,9 @@ diff -Nur linux-4.4.38.orig/mm/slub.c linux-4.4.38/mm/slub.c
}
for (i = 0; i < t.count; i++) {
-diff -Nur linux-4.4.38.orig/mm/swap.c linux-4.4.38/mm/swap.c
---- linux-4.4.38.orig/mm/swap.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/mm/swap.c 2017-01-01 21:00:20.041739757 +0100
+diff -Nur linux-4.4.46.orig/mm/swap.c linux-4.4.46/mm/swap.c
+--- linux-4.4.46.orig/mm/swap.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/mm/swap.c 2017-02-03 17:18:10.951619984 +0100
@@ -31,6 +31,7 @@
#include <linux/memcontrol.h>
#include <linux/gfp.h>
@@ -29807,9 +29795,9 @@ diff -Nur linux-4.4.38.orig/mm/swap.c linux-4.4.38/mm/swap.c
put_online_cpus();
mutex_unlock(&lock);
-diff -Nur linux-4.4.38.orig/mm/truncate.c linux-4.4.38/mm/truncate.c
---- linux-4.4.38.orig/mm/truncate.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/mm/truncate.c 2017-01-01 21:00:20.045740009 +0100
+diff -Nur linux-4.4.46.orig/mm/truncate.c linux-4.4.46/mm/truncate.c
+--- linux-4.4.46.orig/mm/truncate.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/mm/truncate.c 2017-02-03 17:18:10.951619984 +0100
@@ -56,8 +56,11 @@
* protected by mapping->tree_lock.
*/
@@ -29824,9 +29812,9 @@ diff -Nur linux-4.4.38.orig/mm/truncate.c linux-4.4.38/mm/truncate.c
__radix_tree_delete_node(&mapping->page_tree, node);
unlock:
spin_unlock_irq(&mapping->tree_lock);
-diff -Nur linux-4.4.38.orig/mm/vmalloc.c linux-4.4.38/mm/vmalloc.c
---- linux-4.4.38.orig/mm/vmalloc.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/mm/vmalloc.c 2017-01-01 21:00:20.045740009 +0100
+diff -Nur linux-4.4.46.orig/mm/vmalloc.c linux-4.4.46/mm/vmalloc.c
+--- linux-4.4.46.orig/mm/vmalloc.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/mm/vmalloc.c 2017-02-03 17:18:10.951619984 +0100
@@ -821,7 +821,7 @@
struct vmap_block *vb;
struct vmap_area *va;
@@ -29878,9 +29866,9 @@ diff -Nur linux-4.4.38.orig/mm/vmalloc.c linux-4.4.38/mm/vmalloc.c
rcu_read_unlock();
/* Allocate new block if nothing was found */
-diff -Nur linux-4.4.38.orig/mm/vmstat.c linux-4.4.38/mm/vmstat.c
---- linux-4.4.38.orig/mm/vmstat.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/mm/vmstat.c 2017-01-01 21:00:20.045740009 +0100
+diff -Nur linux-4.4.46.orig/mm/vmstat.c linux-4.4.46/mm/vmstat.c
+--- linux-4.4.46.orig/mm/vmstat.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/mm/vmstat.c 2017-02-03 17:18:10.951619984 +0100
@@ -226,6 +226,7 @@
long x;
long t;
@@ -29929,9 +29917,9 @@ diff -Nur linux-4.4.38.orig/mm/vmstat.c linux-4.4.38/mm/vmstat.c
}
void __dec_zone_page_state(struct page *page, enum zone_stat_item item)
-diff -Nur linux-4.4.38.orig/mm/workingset.c linux-4.4.38/mm/workingset.c
---- linux-4.4.38.orig/mm/workingset.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/mm/workingset.c 2017-01-01 21:00:20.045740009 +0100
+diff -Nur linux-4.4.46.orig/mm/workingset.c linux-4.4.46/mm/workingset.c
+--- linux-4.4.46.orig/mm/workingset.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/mm/workingset.c 2017-02-03 17:18:10.951619984 +0100
@@ -264,7 +264,8 @@
* point where they would still be useful.
*/
@@ -29999,9 +29987,9 @@ diff -Nur linux-4.4.38.orig/mm/workingset.c linux-4.4.38/mm/workingset.c
err:
return ret;
}
-diff -Nur linux-4.4.38.orig/mm/zsmalloc.c linux-4.4.38/mm/zsmalloc.c
---- linux-4.4.38.orig/mm/zsmalloc.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/mm/zsmalloc.c 2017-01-01 21:00:20.045740009 +0100
+diff -Nur linux-4.4.46.orig/mm/zsmalloc.c linux-4.4.46/mm/zsmalloc.c
+--- linux-4.4.46.orig/mm/zsmalloc.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/mm/zsmalloc.c 2017-02-03 17:18:10.951619984 +0100
@@ -64,6 +64,7 @@
#include <linux/debugfs.h>
#include <linux/zsmalloc.h>
@@ -30036,9 +30024,9 @@ diff -Nur linux-4.4.38.orig/mm/zsmalloc.c linux-4.4.38/mm/zsmalloc.c
unpin_tag(handle);
}
EXPORT_SYMBOL_GPL(zs_unmap_object);
-diff -Nur linux-4.4.38.orig/net/core/dev.c linux-4.4.38/net/core/dev.c
---- linux-4.4.38.orig/net/core/dev.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/net/core/dev.c 2017-01-01 21:00:20.049740267 +0100
+diff -Nur linux-4.4.46.orig/net/core/dev.c linux-4.4.46/net/core/dev.c
+--- linux-4.4.46.orig/net/core/dev.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/net/core/dev.c 2017-02-03 17:18:10.955620139 +0100
@@ -186,6 +186,7 @@
static DEFINE_HASHTABLE(napi_hash, 8);
@@ -30349,7 +30337,7 @@ diff -Nur linux-4.4.38.orig/net/core/dev.c linux-4.4.38/net/core/dev.c
}
static int napi_gro_complete(struct sk_buff *skb)
-@@ -4533,6 +4612,7 @@
+@@ -4535,6 +4614,7 @@
sd->rps_ipi_list = NULL;
local_irq_enable();
@@ -30357,7 +30345,7 @@ diff -Nur linux-4.4.38.orig/net/core/dev.c linux-4.4.38/net/core/dev.c
/* Send pending IPI's to kick RPS processing on remote cpus. */
while (remsd) {
-@@ -4546,6 +4626,7 @@
+@@ -4548,6 +4628,7 @@
} else
#endif
local_irq_enable();
@@ -30365,7 +30353,7 @@ diff -Nur linux-4.4.38.orig/net/core/dev.c linux-4.4.38/net/core/dev.c
}
static bool sd_has_rps_ipi_waiting(struct softnet_data *sd)
-@@ -4627,6 +4708,7 @@
+@@ -4629,6 +4710,7 @@
local_irq_save(flags);
____napi_schedule(this_cpu_ptr(&softnet_data), n);
local_irq_restore(flags);
@@ -30373,7 +30361,7 @@ diff -Nur linux-4.4.38.orig/net/core/dev.c linux-4.4.38/net/core/dev.c
}
EXPORT_SYMBOL(__napi_schedule);
-@@ -4903,7 +4985,7 @@
+@@ -4905,7 +4987,7 @@
list_splice_tail(&repoll, &list);
list_splice(&list, &sd->poll_list);
if (!list_empty(&sd->poll_list))
@@ -30382,7 +30370,7 @@ diff -Nur linux-4.4.38.orig/net/core/dev.c linux-4.4.38/net/core/dev.c
net_rps_action_and_irq_enable(sd);
}
-@@ -7242,7 +7324,7 @@
+@@ -7244,7 +7326,7 @@
void synchronize_net(void)
{
might_sleep();
@@ -30391,7 +30379,7 @@ diff -Nur linux-4.4.38.orig/net/core/dev.c linux-4.4.38/net/core/dev.c
synchronize_rcu_expedited();
else
synchronize_rcu();
-@@ -7483,16 +7565,20 @@
+@@ -7485,16 +7567,20 @@
raise_softirq_irqoff(NET_TX_SOFTIRQ);
local_irq_enable();
@@ -30413,7 +30401,7 @@ diff -Nur linux-4.4.38.orig/net/core/dev.c linux-4.4.38/net/core/dev.c
return NOTIFY_OK;
}
-@@ -7794,8 +7880,9 @@
+@@ -7796,8 +7882,9 @@
for_each_possible_cpu(i) {
struct softnet_data *sd = &per_cpu(softnet_data, i);
@@ -30425,9 +30413,9 @@ diff -Nur linux-4.4.38.orig/net/core/dev.c linux-4.4.38/net/core/dev.c
INIT_LIST_HEAD(&sd->poll_list);
sd->output_queue_tailp = &sd->output_queue;
#ifdef CONFIG_RPS
-diff -Nur linux-4.4.38.orig/net/core/skbuff.c linux-4.4.38/net/core/skbuff.c
---- linux-4.4.38.orig/net/core/skbuff.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/net/core/skbuff.c 2017-01-01 21:00:20.049740267 +0100
+diff -Nur linux-4.4.46.orig/net/core/skbuff.c linux-4.4.46/net/core/skbuff.c
+--- linux-4.4.46.orig/net/core/skbuff.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/net/core/skbuff.c 2017-02-03 17:18:10.955620139 +0100
@@ -63,6 +63,7 @@
#include <linux/errqueue.h>
#include <linux/prefetch.h>
@@ -30523,9 +30511,9 @@ diff -Nur linux-4.4.38.orig/net/core/skbuff.c linux-4.4.38/net/core/skbuff.c
skb->pfmemalloc = 1;
skb->head_frag = 1;
-diff -Nur linux-4.4.38.orig/net/core/sock.c linux-4.4.38/net/core/sock.c
---- linux-4.4.38.orig/net/core/sock.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/net/core/sock.c 2017-01-01 21:00:20.049740267 +0100
+diff -Nur linux-4.4.46.orig/net/core/sock.c linux-4.4.46/net/core/sock.c
+--- linux-4.4.46.orig/net/core/sock.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/net/core/sock.c 2017-02-03 17:18:10.955620139 +0100
@@ -2436,12 +2436,11 @@
if (sk->sk_lock.owned)
__lock_sock(sk);
@@ -30540,9 +30528,9 @@ diff -Nur linux-4.4.38.orig/net/core/sock.c linux-4.4.38/net/core/sock.c
}
EXPORT_SYMBOL(lock_sock_nested);
-diff -Nur linux-4.4.38.orig/net/ipv4/icmp.c linux-4.4.38/net/ipv4/icmp.c
---- linux-4.4.38.orig/net/ipv4/icmp.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/net/ipv4/icmp.c 2017-01-01 21:00:20.049740267 +0100
+diff -Nur linux-4.4.46.orig/net/ipv4/icmp.c linux-4.4.46/net/ipv4/icmp.c
+--- linux-4.4.46.orig/net/ipv4/icmp.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/net/ipv4/icmp.c 2017-02-03 17:18:10.955620139 +0100
@@ -69,6 +69,7 @@
#include <linux/jiffies.h>
#include <linux/kernel.h>
@@ -30650,9 +30638,9 @@ diff -Nur linux-4.4.38.orig/net/ipv4/icmp.c linux-4.4.38/net/ipv4/icmp.c
}
/* should there be an ICMP stat for ignored echos? */
return true;
-diff -Nur linux-4.4.38.orig/net/ipv4/sysctl_net_ipv4.c linux-4.4.38/net/ipv4/sysctl_net_ipv4.c
---- linux-4.4.38.orig/net/ipv4/sysctl_net_ipv4.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/net/ipv4/sysctl_net_ipv4.c 2017-01-01 21:00:20.049740267 +0100
+diff -Nur linux-4.4.46.orig/net/ipv4/sysctl_net_ipv4.c linux-4.4.46/net/ipv4/sysctl_net_ipv4.c
+--- linux-4.4.46.orig/net/ipv4/sysctl_net_ipv4.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/net/ipv4/sysctl_net_ipv4.c 2017-02-03 17:18:10.955620139 +0100
@@ -818,6 +818,13 @@
.proc_handler = proc_dointvec
},
@@ -30667,9 +30655,9 @@ diff -Nur linux-4.4.38.orig/net/ipv4/sysctl_net_ipv4.c linux-4.4.38/net/ipv4/sys
.procname = "icmp_ignore_bogus_error_responses",
.data = &init_net.ipv4.sysctl_icmp_ignore_bogus_error_responses,
.maxlen = sizeof(int),
-diff -Nur linux-4.4.38.orig/net/ipv4/tcp_ipv4.c linux-4.4.38/net/ipv4/tcp_ipv4.c
---- linux-4.4.38.orig/net/ipv4/tcp_ipv4.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/net/ipv4/tcp_ipv4.c 2017-01-01 21:00:20.053740528 +0100
+diff -Nur linux-4.4.46.orig/net/ipv4/tcp_ipv4.c linux-4.4.46/net/ipv4/tcp_ipv4.c
+--- linux-4.4.46.orig/net/ipv4/tcp_ipv4.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/net/ipv4/tcp_ipv4.c 2017-02-03 17:18:10.955620139 +0100
@@ -62,6 +62,7 @@
#include <linux/init.h>
#include <linux/times.h>
@@ -30713,9 +30701,9 @@ diff -Nur linux-4.4.38.orig/net/ipv4/tcp_ipv4.c linux-4.4.38/net/ipv4/tcp_ipv4.c
TCP_INC_STATS_BH(net, TCP_MIB_OUTSEGS);
}
-diff -Nur linux-4.4.38.orig/net/mac80211/rx.c linux-4.4.38/net/mac80211/rx.c
---- linux-4.4.38.orig/net/mac80211/rx.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/net/mac80211/rx.c 2017-01-01 21:00:20.053740528 +0100
+diff -Nur linux-4.4.46.orig/net/mac80211/rx.c linux-4.4.46/net/mac80211/rx.c
+--- linux-4.4.46.orig/net/mac80211/rx.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/net/mac80211/rx.c 2017-02-03 17:18:10.955620139 +0100
@@ -3580,7 +3580,7 @@
struct ieee80211_supported_band *sband;
struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);
@@ -30725,9 +30713,9 @@ diff -Nur linux-4.4.38.orig/net/mac80211/rx.c linux-4.4.38/net/mac80211/rx.c
if (WARN_ON(status->band >= IEEE80211_NUM_BANDS))
goto drop;
-diff -Nur linux-4.4.38.orig/net/netfilter/core.c linux-4.4.38/net/netfilter/core.c
---- linux-4.4.38.orig/net/netfilter/core.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/net/netfilter/core.c 2017-01-01 21:00:20.053740528 +0100
+diff -Nur linux-4.4.46.orig/net/netfilter/core.c linux-4.4.46/net/netfilter/core.c
+--- linux-4.4.46.orig/net/netfilter/core.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/net/netfilter/core.c 2017-02-03 17:18:10.955620139 +0100
@@ -22,11 +22,17 @@
#include <linux/proc_fs.h>
#include <linux/mutex.h>
@@ -30746,9 +30734,9 @@ diff -Nur linux-4.4.38.orig/net/netfilter/core.c linux-4.4.38/net/netfilter/core
static DEFINE_MUTEX(afinfo_mutex);
const struct nf_afinfo __rcu *nf_afinfo[NFPROTO_NUMPROTO] __read_mostly;
-diff -Nur linux-4.4.38.orig/net/packet/af_packet.c linux-4.4.38/net/packet/af_packet.c
---- linux-4.4.38.orig/net/packet/af_packet.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/net/packet/af_packet.c 2017-01-01 21:00:20.053740528 +0100
+diff -Nur linux-4.4.46.orig/net/packet/af_packet.c linux-4.4.46/net/packet/af_packet.c
+--- linux-4.4.46.orig/net/packet/af_packet.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/net/packet/af_packet.c 2017-02-03 17:18:10.959620294 +0100
@@ -63,6 +63,7 @@
#include <linux/if_packet.h>
#include <linux/wireless.h>
@@ -30775,9 +30763,9 @@ diff -Nur linux-4.4.38.orig/net/packet/af_packet.c linux-4.4.38/net/packet/af_pa
}
}
prb_close_block(pkc, pbd, po, status);
-diff -Nur linux-4.4.38.orig/net/rds/ib_rdma.c linux-4.4.38/net/rds/ib_rdma.c
---- linux-4.4.38.orig/net/rds/ib_rdma.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/net/rds/ib_rdma.c 2017-01-01 21:00:20.053740528 +0100
+diff -Nur linux-4.4.46.orig/net/rds/ib_rdma.c linux-4.4.46/net/rds/ib_rdma.c
+--- linux-4.4.46.orig/net/rds/ib_rdma.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/net/rds/ib_rdma.c 2017-02-03 17:18:10.959620294 +0100
@@ -34,6 +34,7 @@
#include <linux/slab.h>
#include <linux/rculist.h>
@@ -30795,9 +30783,9 @@ diff -Nur linux-4.4.38.orig/net/rds/ib_rdma.c linux-4.4.38/net/rds/ib_rdma.c
}
}
-diff -Nur linux-4.4.38.orig/net/sched/sch_generic.c linux-4.4.38/net/sched/sch_generic.c
---- linux-4.4.38.orig/net/sched/sch_generic.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/net/sched/sch_generic.c 2017-01-01 21:00:20.053740528 +0100
+diff -Nur linux-4.4.46.orig/net/sched/sch_generic.c linux-4.4.46/net/sched/sch_generic.c
+--- linux-4.4.46.orig/net/sched/sch_generic.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/net/sched/sch_generic.c 2017-02-03 17:18:10.959620294 +0100
@@ -893,7 +893,7 @@
/* Wait for outstanding qdisc_run calls. */
list_for_each_entry(dev, head, close_list)
@@ -30807,9 +30795,9 @@ diff -Nur linux-4.4.38.orig/net/sched/sch_generic.c linux-4.4.38/net/sched/sch_g
}
void dev_deactivate(struct net_device *dev)
-diff -Nur linux-4.4.38.orig/net/sunrpc/svc_xprt.c linux-4.4.38/net/sunrpc/svc_xprt.c
---- linux-4.4.38.orig/net/sunrpc/svc_xprt.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/net/sunrpc/svc_xprt.c 2017-01-01 21:00:20.057740782 +0100
+diff -Nur linux-4.4.46.orig/net/sunrpc/svc_xprt.c linux-4.4.46/net/sunrpc/svc_xprt.c
+--- linux-4.4.46.orig/net/sunrpc/svc_xprt.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/net/sunrpc/svc_xprt.c 2017-02-03 17:18:10.959620294 +0100
@@ -340,7 +340,7 @@
goto out;
}
@@ -30837,9 +30825,9 @@ diff -Nur linux-4.4.38.orig/net/sunrpc/svc_xprt.c linux-4.4.38/net/sunrpc/svc_xp
out:
trace_svc_xprt_do_enqueue(xprt, rqstp);
}
-diff -Nur linux-4.4.38.orig/scripts/mkcompile_h linux-4.4.38/scripts/mkcompile_h
---- linux-4.4.38.orig/scripts/mkcompile_h 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/scripts/mkcompile_h 2017-01-01 21:00:20.057740782 +0100
+diff -Nur linux-4.4.46.orig/scripts/mkcompile_h linux-4.4.46/scripts/mkcompile_h
+--- linux-4.4.46.orig/scripts/mkcompile_h 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/scripts/mkcompile_h 2017-02-03 17:18:10.959620294 +0100
@@ -4,7 +4,8 @@
ARCH=$2
SMP=$3
@@ -30858,9 +30846,9 @@ diff -Nur linux-4.4.38.orig/scripts/mkcompile_h linux-4.4.38/scripts/mkcompile_h
UTS_VERSION="$UTS_VERSION $CONFIG_FLAGS $TIMESTAMP"
# Truncate to maximum length
-diff -Nur linux-4.4.38.orig/sound/core/pcm_native.c linux-4.4.38/sound/core/pcm_native.c
---- linux-4.4.38.orig/sound/core/pcm_native.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/sound/core/pcm_native.c 2017-01-01 21:00:20.057740782 +0100
+diff -Nur linux-4.4.46.orig/sound/core/pcm_native.c linux-4.4.46/sound/core/pcm_native.c
+--- linux-4.4.46.orig/sound/core/pcm_native.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/sound/core/pcm_native.c 2017-02-03 17:18:10.959620294 +0100
@@ -135,7 +135,7 @@
void snd_pcm_stream_lock_irq(struct snd_pcm_substream *substream)
{
@@ -30897,9 +30885,9 @@ diff -Nur linux-4.4.38.orig/sound/core/pcm_native.c linux-4.4.38/sound/core/pcm_
}
EXPORT_SYMBOL_GPL(snd_pcm_stream_unlock_irqrestore);
-diff -Nur linux-4.4.38.orig/virt/kvm/async_pf.c linux-4.4.38/virt/kvm/async_pf.c
---- linux-4.4.38.orig/virt/kvm/async_pf.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/virt/kvm/async_pf.c 2017-01-01 21:00:20.057740782 +0100
+diff -Nur linux-4.4.46.orig/virt/kvm/async_pf.c linux-4.4.46/virt/kvm/async_pf.c
+--- linux-4.4.46.orig/virt/kvm/async_pf.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/virt/kvm/async_pf.c 2017-02-03 17:18:10.959620294 +0100
@@ -98,8 +98,8 @@
* This memory barrier pairs with prepare_to_wait's set_current_state()
*/
@@ -30911,9 +30899,9 @@ diff -Nur linux-4.4.38.orig/virt/kvm/async_pf.c linux-4.4.38/virt/kvm/async_pf.c
mmput(mm);
kvm_put_kvm(vcpu->kvm);
-diff -Nur linux-4.4.38.orig/virt/kvm/kvm_main.c linux-4.4.38/virt/kvm/kvm_main.c
---- linux-4.4.38.orig/virt/kvm/kvm_main.c 2016-12-10 19:08:05.000000000 +0100
-+++ linux-4.4.38/virt/kvm/kvm_main.c 2017-01-01 21:00:20.057740782 +0100
+diff -Nur linux-4.4.46.orig/virt/kvm/kvm_main.c linux-4.4.46/virt/kvm/kvm_main.c
+--- linux-4.4.46.orig/virt/kvm/kvm_main.c 2017-02-01 08:31:11.000000000 +0100
++++ linux-4.4.46/virt/kvm/kvm_main.c 2017-02-03 17:18:10.959620294 +0100
@@ -228,8 +228,7 @@
vcpu->kvm = kvm;
vcpu->vcpu_id = id;
diff --git a/target/linux/patches/4.4.38/startup.patch b/target/linux/patches/4.4.46/startup.patch
index e54ac19a6..e54ac19a6 100644
--- a/target/linux/patches/4.4.38/startup.patch
+++ b/target/linux/patches/4.4.46/startup.patch
diff --git a/target/linux/patches/4.4.38/use-libgcc-for-sh.patch b/target/linux/patches/4.4.46/use-libgcc-for-sh.patch
index 6420219b0..6420219b0 100644
--- a/target/linux/patches/4.4.38/use-libgcc-for-sh.patch
+++ b/target/linux/patches/4.4.46/use-libgcc-for-sh.patch
diff --git a/target/linux/patches/4.4.38/versatile-nommu.patch b/target/linux/patches/4.4.46/versatile-nommu.patch
index 96140b30c..96140b30c 100644
--- a/target/linux/patches/4.4.38/versatile-nommu.patch
+++ b/target/linux/patches/4.4.46/versatile-nommu.patch