diff options
| author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2015-11-18 16:22:39 +0100 |
|---|---|---|
| committer | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2015-11-18 16:22:39 +0100 |
| commit | 3f1c9e7b4ba7cefa263a3af0156881f53f60ef09 (patch) | |
| tree | 199e07093f51f7d53dfb45cf0e63e1b7c23e78f7 | |
| parent | 213397b608b539ee53fd3a8baddb5120e04054d5 (diff) | |
| download | 4.8-rt-patches-3f1c9e7b4ba7cefa263a3af0156881f53f60ef09.tar.gz | |
[ANNOUNCE] 4.1.13-rt14
Dear RT folks!
I'm pleased to announce the v4.1.13-rt14 patch set.
Changes since v4.1.12-rt13:
none.
Known issues:
You can get this release via the git tree at:
git://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-rt-devel.git linux-4.1.y-rt
git://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-rt-devel.git linux-4.1.y-rt-rebase
git://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-rt-devel.git linux-4.1.y-rt-queue
The RT patch against 4.1.3 can be found here:
https://cdn.kernel.org/pub/linux/kernel/projects/rt/4.1/patch-4.1.13-rt14.patch.xz
The split quilt queue is available at:
https://cdn.kernel.org/pub/linux/kernel/projects/rt/4.1/patches-4.1.13-rt14.tar.xz
Sebastian
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
282 files changed, 1399 insertions, 2674 deletions
diff --git a/patches/0001-arm64-Mark-PMU-interrupt-IRQF_NO_THREAD.patch b/patches/0001-arm64-Mark-PMU-interrupt-IRQF_NO_THREAD.patch index d9ff3f5c7ed4ec..1abc7c53698776 100644 --- a/patches/0001-arm64-Mark-PMU-interrupt-IRQF_NO_THREAD.patch +++ b/patches/0001-arm64-Mark-PMU-interrupt-IRQF_NO_THREAD.patch @@ -13,10 +13,8 @@ Signed-off-by: Anders Roxell <anders.roxell@linaro.org> arch/arm64/kernel/perf_event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux-rt-devel/arch/arm64/kernel/perf_event.c -=================================================================== ---- linux-rt-devel.orig/arch/arm64/kernel/perf_event.c -+++ linux-rt-devel/arch/arm64/kernel/perf_event.c +--- a/arch/arm64/kernel/perf_event.c ++++ b/arch/arm64/kernel/perf_event.c @@ -488,7 +488,7 @@ armpmu_reserve_hardware(struct arm_pmu * } diff --git a/patches/0001-sched-Implement-lockless-wake-queues.patch b/patches/0001-sched-Implement-lockless-wake-queues.patch index 26589fd01e182e..23931132a606ef 100644 --- a/patches/0001-sched-Implement-lockless-wake-queues.patch +++ b/patches/0001-sched-Implement-lockless-wake-queues.patch @@ -47,10 +47,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> kernel/sched/core.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 92 insertions(+) -Index: linux-rt-devel/include/linux/sched.h -=================================================================== ---- linux-rt-devel.orig/include/linux/sched.h -+++ linux-rt-devel/include/linux/sched.h +--- a/include/linux/sched.h ++++ b/include/linux/sched.h @@ -900,6 +900,50 @@ enum cpu_idle_type { #define SCHED_CAPACITY_SCALE (1L << SCHED_CAPACITY_SHIFT) @@ -111,10 +109,8 @@ Index: linux-rt-devel/include/linux/sched.h #ifdef CONFIG_RT_MUTEXES /* PI waiters blocked on a rt_mutex held by this task */ struct rb_root pi_waiters; -Index: linux-rt-devel/kernel/sched/core.c -=================================================================== ---- linux-rt-devel.orig/kernel/sched/core.c -+++ linux-rt-devel/kernel/sched/core.c +--- a/kernel/sched/core.c ++++ b/kernel/sched/core.c @@ -541,6 +541,52 @@ static bool set_nr_if_polling(struct tas #endif #endif diff --git a/patches/0001-uaccess-count-pagefault_disable-levels-in-pagefault_.patch b/patches/0001-uaccess-count-pagefault_disable-levels-in-pagefault_.patch index 48874b188c31b7..784d0ab15c7615 100644 --- a/patches/0001-uaccess-count-pagefault_disable-levels-in-pagefault_.patch +++ b/patches/0001-uaccess-count-pagefault_disable-levels-in-pagefault_.patch @@ -24,10 +24,8 @@ Signed-off-by: David Hildenbrand <dahi@linux.vnet.ibm.com> kernel/fork.c | 3 +++ 3 files changed, 33 insertions(+), 7 deletions(-) -Index: linux-rt-devel/include/linux/sched.h -=================================================================== ---- linux-rt-devel.orig/include/linux/sched.h -+++ linux-rt-devel/include/linux/sched.h +--- a/include/linux/sched.h ++++ b/include/linux/sched.h @@ -1724,6 +1724,7 @@ struct task_struct { #ifdef CONFIG_DEBUG_ATOMIC_SLEEP unsigned long task_state_change; @@ -36,10 +34,8 @@ Index: linux-rt-devel/include/linux/sched.h }; /* Future-safe accessor for struct task_struct's cpus_allowed. */ -Index: linux-rt-devel/include/linux/uaccess.h -=================================================================== ---- linux-rt-devel.orig/include/linux/uaccess.h -+++ linux-rt-devel/include/linux/uaccess.h +--- a/include/linux/uaccess.h ++++ b/include/linux/uaccess.h @@ -2,20 +2,36 @@ #define __LINUX_UACCESS_H__ @@ -109,10 +105,8 @@ Index: linux-rt-devel/include/linux/uaccess.h #ifndef ARCH_HAS_NOCACHE_UACCESS static inline unsigned long __copy_from_user_inatomic_nocache(void *to, -Index: linux-rt-devel/kernel/fork.c -=================================================================== ---- linux-rt-devel.orig/kernel/fork.c -+++ linux-rt-devel/kernel/fork.c +--- a/kernel/fork.c ++++ b/kernel/fork.c @@ -1396,6 +1396,9 @@ static struct task_struct *copy_process( p->hardirq_context = 0; p->softirq_context = 0; diff --git a/patches/0002-arm64-Allow-forced-irq-threading.patch b/patches/0002-arm64-Allow-forced-irq-threading.patch index 94bdd35bc33406..5b450f04b794b6 100644 --- a/patches/0002-arm64-Allow-forced-irq-threading.patch +++ b/patches/0002-arm64-Allow-forced-irq-threading.patch @@ -14,10 +14,8 @@ Signed-off-by: Anders Roxell <anders.roxell@linaro.org> arch/arm64/Kconfig | 1 + 1 file changed, 1 insertion(+) -Index: linux-rt-devel/arch/arm64/Kconfig -=================================================================== ---- linux-rt-devel.orig/arch/arm64/Kconfig -+++ linux-rt-devel/arch/arm64/Kconfig +--- a/arch/arm64/Kconfig ++++ b/arch/arm64/Kconfig @@ -71,6 +71,7 @@ config ARM64 select HAVE_RCU_TABLE_FREE select HAVE_SYSCALL_TRACEPOINTS diff --git a/patches/0002-futex-Implement-lockless-wakeups.patch b/patches/0002-futex-Implement-lockless-wakeups.patch index 14c69e203b3b9f..9aaa32d24e70fe 100644 --- a/patches/0002-futex-Implement-lockless-wakeups.patch +++ b/patches/0002-futex-Implement-lockless-wakeups.patch @@ -52,10 +52,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> kernel/futex.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) -Index: linux-rt-devel/kernel/futex.c -=================================================================== ---- linux-rt-devel.orig/kernel/futex.c -+++ linux-rt-devel/kernel/futex.c +--- a/kernel/futex.c ++++ b/kernel/futex.c @@ -1090,9 +1090,11 @@ static void __unqueue_futex(struct futex /* @@ -130,7 +128,7 @@ Index: linux-rt-devel/kernel/futex.c retry: ret = get_futex_key(uaddr1, flags & FLAGS_SHARED, &key1, VERIFY_READ); -@@ -1320,7 +1318,7 @@ retry_private: +@@ -1320,7 +1318,7 @@ futex_wake_op(u32 __user *uaddr1, unsign ret = -EINVAL; goto out_unlock; } @@ -139,7 +137,7 @@ Index: linux-rt-devel/kernel/futex.c if (++ret >= nr_wake) break; } -@@ -1334,7 +1332,7 @@ retry_private: +@@ -1334,7 +1332,7 @@ futex_wake_op(u32 __user *uaddr1, unsign ret = -EINVAL; goto out_unlock; } @@ -148,7 +146,7 @@ Index: linux-rt-devel/kernel/futex.c if (++op_ret >= nr_wake2) break; } -@@ -1344,6 +1342,7 @@ retry_private: +@@ -1344,6 +1342,7 @@ futex_wake_op(u32 __user *uaddr1, unsign out_unlock: double_unlock_hb(hb1, hb2); @@ -164,7 +162,7 @@ Index: linux-rt-devel/kernel/futex.c if (requeue_pi) { /* -@@ -1679,7 +1679,7 @@ retry_private: +@@ -1679,7 +1679,7 @@ static int futex_requeue(u32 __user *uad * woken by futex_unlock_pi(). */ if (++task_count <= nr_wake && !requeue_pi) { @@ -173,7 +171,7 @@ Index: linux-rt-devel/kernel/futex.c continue; } -@@ -1719,6 +1719,7 @@ retry_private: +@@ -1719,6 +1719,7 @@ static int futex_requeue(u32 __user *uad out_unlock: free_pi_state(pi_state); double_unlock_hb(hb1, hb2); diff --git a/patches/0002-mm-uaccess-trigger-might_sleep-in-might_fault-with-d.patch b/patches/0002-mm-uaccess-trigger-might_sleep-in-might_fault-with-d.patch index e813f414e36c5b..a26899c7f55bde 100644 --- a/patches/0002-mm-uaccess-trigger-might_sleep-in-might_fault-with-d.patch +++ b/patches/0002-mm-uaccess-trigger-might_sleep-in-might_fault-with-d.patch @@ -48,10 +48,8 @@ Signed-off-by: David Hildenbrand <dahi@linux.vnet.ibm.com> mm/memory.c | 18 ++++++------------ 2 files changed, 8 insertions(+), 13 deletions(-) -Index: linux-rt-devel/include/linux/kernel.h -=================================================================== ---- linux-rt-devel.orig/include/linux/kernel.h -+++ linux-rt-devel/include/linux/kernel.h +--- a/include/linux/kernel.h ++++ b/include/linux/kernel.h @@ -244,7 +244,8 @@ static inline u32 reciprocal_scale(u32 v #if defined(CONFIG_MMU) && \ @@ -62,10 +60,8 @@ Index: linux-rt-devel/include/linux/kernel.h #else static inline void might_fault(void) { } #endif -Index: linux-rt-devel/mm/memory.c -=================================================================== ---- linux-rt-devel.orig/mm/memory.c -+++ linux-rt-devel/mm/memory.c +--- a/mm/memory.c ++++ b/mm/memory.c @@ -3743,7 +3743,7 @@ void print_vma_addr(char *prefix, unsign } diff --git a/patches/0003-uaccess-clarify-that-uaccess-may-only-sleep-if-pagef.patch b/patches/0003-uaccess-clarify-that-uaccess-may-only-sleep-if-pagef.patch index be6d40fa69c997..81c503208b7f36 100644 --- a/patches/0003-uaccess-clarify-that-uaccess-may-only-sleep-if-pagef.patch +++ b/patches/0003-uaccess-clarify-that-uaccess-may-only-sleep-if-pagef.patch @@ -25,10 +25,8 @@ Signed-off-by: David Hildenbrand <dahi@linux.vnet.ibm.com> lib/strnlen_user.c | 6 +++- 12 files changed, 118 insertions(+), 59 deletions(-) -Index: linux-rt-devel/arch/avr32/include/asm/uaccess.h -=================================================================== ---- linux-rt-devel.orig/arch/avr32/include/asm/uaccess.h -+++ linux-rt-devel/arch/avr32/include/asm/uaccess.h +--- a/arch/avr32/include/asm/uaccess.h ++++ b/arch/avr32/include/asm/uaccess.h @@ -97,7 +97,8 @@ static inline __kernel_size_t __copy_fro * @x: Value to copy to user space. * @ptr: Destination address, in user space. @@ -69,10 +67,8 @@ Index: linux-rt-devel/arch/avr32/include/asm/uaccess.h * * This macro copies a single simple variable from user space to kernel * space. It supports simple types like char and int, but not larger -Index: linux-rt-devel/arch/hexagon/include/asm/uaccess.h -=================================================================== ---- linux-rt-devel.orig/arch/hexagon/include/asm/uaccess.h -+++ linux-rt-devel/arch/hexagon/include/asm/uaccess.h +--- a/arch/hexagon/include/asm/uaccess.h ++++ b/arch/hexagon/include/asm/uaccess.h @@ -36,7 +36,8 @@ * @addr: User space pointer to start of block to check * @size: Size of block to check @@ -83,10 +79,8 @@ Index: linux-rt-devel/arch/hexagon/include/asm/uaccess.h * * Checks if a pointer to a block of memory in user space is valid. * -Index: linux-rt-devel/arch/m32r/include/asm/uaccess.h -=================================================================== ---- linux-rt-devel.orig/arch/m32r/include/asm/uaccess.h -+++ linux-rt-devel/arch/m32r/include/asm/uaccess.h +--- a/arch/m32r/include/asm/uaccess.h ++++ b/arch/m32r/include/asm/uaccess.h @@ -91,7 +91,8 @@ static inline void set_fs(mm_segment_t s * @addr: User space pointer to start of block to check * @size: Size of block to check @@ -187,10 +181,8 @@ Index: linux-rt-devel/arch/m32r/include/asm/uaccess.h * * Get the size of a NUL-terminated string in user space. * -Index: linux-rt-devel/arch/microblaze/include/asm/uaccess.h -=================================================================== ---- linux-rt-devel.orig/arch/microblaze/include/asm/uaccess.h -+++ linux-rt-devel/arch/microblaze/include/asm/uaccess.h +--- a/arch/microblaze/include/asm/uaccess.h ++++ b/arch/microblaze/include/asm/uaccess.h @@ -178,7 +178,8 @@ extern long __user_bad(void); * @x: Variable to store result. * @ptr: Source address, in user space. @@ -211,10 +203,8 @@ Index: linux-rt-devel/arch/microblaze/include/asm/uaccess.h * * This macro copies a single simple value from kernel space to user * space. It supports simple types like char and int, but not larger -Index: linux-rt-devel/arch/mips/include/asm/uaccess.h -=================================================================== ---- linux-rt-devel.orig/arch/mips/include/asm/uaccess.h -+++ linux-rt-devel/arch/mips/include/asm/uaccess.h +--- a/arch/mips/include/asm/uaccess.h ++++ b/arch/mips/include/asm/uaccess.h @@ -103,7 +103,8 @@ extern u64 __ua_limit; * @addr: User space pointer to start of block to check * @size: Size of block to check @@ -365,10 +355,8 @@ Index: linux-rt-devel/arch/mips/include/asm/uaccess.h * * Get the size of a NUL-terminated string in user space. * -Index: linux-rt-devel/arch/s390/include/asm/uaccess.h -=================================================================== ---- linux-rt-devel.orig/arch/s390/include/asm/uaccess.h -+++ linux-rt-devel/arch/s390/include/asm/uaccess.h +--- a/arch/s390/include/asm/uaccess.h ++++ b/arch/s390/include/asm/uaccess.h @@ -98,7 +98,8 @@ static inline unsigned long extable_fixu * @from: Source address, in user space. * @n: Number of bytes to copy. @@ -399,7 +387,7 @@ Index: linux-rt-devel/arch/s390/include/asm/uaccess.h * * Copy data from kernel space to user space. * -@@ -290,7 +293,8 @@ __compiletime_warning("copy_from_user() +@@ -290,7 +293,8 @@ void copy_from_user_overflow(void) * @from: Source address, in user space. * @n: Number of bytes to copy. * @@ -419,10 +407,8 @@ Index: linux-rt-devel/arch/s390/include/asm/uaccess.h * * Get the size of a NUL-terminated string in user space. * -Index: linux-rt-devel/arch/score/include/asm/uaccess.h -=================================================================== ---- linux-rt-devel.orig/arch/score/include/asm/uaccess.h -+++ linux-rt-devel/arch/score/include/asm/uaccess.h +--- a/arch/score/include/asm/uaccess.h ++++ b/arch/score/include/asm/uaccess.h @@ -36,7 +36,8 @@ * @addr: User space pointer to start of block to check * @size: Size of block to check @@ -473,10 +459,8 @@ Index: linux-rt-devel/arch/score/include/asm/uaccess.h * * This macro copies a single simple variable from user space to kernel * space. It supports simple types like char and int, but not larger -Index: linux-rt-devel/arch/tile/include/asm/uaccess.h -=================================================================== ---- linux-rt-devel.orig/arch/tile/include/asm/uaccess.h -+++ linux-rt-devel/arch/tile/include/asm/uaccess.h +--- a/arch/tile/include/asm/uaccess.h ++++ b/arch/tile/include/asm/uaccess.h @@ -78,7 +78,8 @@ int __range_ok(unsigned long addr, unsig * @addr: User space pointer to start of block to check * @size: Size of block to check @@ -537,10 +521,8 @@ Index: linux-rt-devel/arch/tile/include/asm/uaccess.h * * Copy data from user space to user space. Caller must check * the specified blocks with access_ok() before calling this function. -Index: linux-rt-devel/arch/x86/include/asm/uaccess.h -=================================================================== ---- linux-rt-devel.orig/arch/x86/include/asm/uaccess.h -+++ linux-rt-devel/arch/x86/include/asm/uaccess.h +--- a/arch/x86/include/asm/uaccess.h ++++ b/arch/x86/include/asm/uaccess.h @@ -74,7 +74,8 @@ static inline bool __chk_range_not_ok(un * @addr: User space pointer to start of block to check * @size: Size of block to check @@ -551,7 +533,7 @@ Index: linux-rt-devel/arch/x86/include/asm/uaccess.h * * Checks if a pointer to a block of memory in user space is valid. * -@@ -145,7 +146,8 @@ __typeof__(__builtin_choose_expr(sizeof( +@@ -145,7 +146,8 @@ extern int __get_user_bad(void); * @x: Variable to store result. * @ptr: Source address, in user space. * @@ -591,11 +573,9 @@ Index: linux-rt-devel/arch/x86/include/asm/uaccess.h * * This macro copies a single simple value from kernel space to user * space. It supports simple types like char and int, but not larger -Index: linux-rt-devel/arch/x86/include/asm/uaccess_32.h -=================================================================== ---- linux-rt-devel.orig/arch/x86/include/asm/uaccess_32.h -+++ linux-rt-devel/arch/x86/include/asm/uaccess_32.h -@@ -70,7 +70,8 @@ __copy_to_user_inatomic(void __user *to, +--- a/arch/x86/include/asm/uaccess_32.h ++++ b/arch/x86/include/asm/uaccess_32.h +@@ -70,7 +70,8 @@ static __always_inline unsigned long __m * @from: Source address, in kernel space. * @n: Number of bytes to copy. * @@ -605,7 +585,7 @@ Index: linux-rt-devel/arch/x86/include/asm/uaccess_32.h * * Copy data from kernel space to user space. Caller must check * the specified block with access_ok() before calling this function. -@@ -117,7 +118,8 @@ __copy_from_user_inatomic(void *to, cons +@@ -117,7 +118,8 @@ static __always_inline unsigned long * @from: Source address, in user space. * @n: Number of bytes to copy. * @@ -615,10 +595,8 @@ Index: linux-rt-devel/arch/x86/include/asm/uaccess_32.h * * Copy data from user space to kernel space. Caller must check * the specified block with access_ok() before calling this function. -Index: linux-rt-devel/arch/x86/lib/usercopy_32.c -=================================================================== ---- linux-rt-devel.orig/arch/x86/lib/usercopy_32.c -+++ linux-rt-devel/arch/x86/lib/usercopy_32.c +--- a/arch/x86/lib/usercopy_32.c ++++ b/arch/x86/lib/usercopy_32.c @@ -647,7 +647,8 @@ EXPORT_SYMBOL(__copy_from_user_ll_nocach * @from: Source address, in kernel space. * @n: Number of bytes to copy. @@ -639,10 +617,8 @@ Index: linux-rt-devel/arch/x86/lib/usercopy_32.c * * Copy data from user space to kernel space. * -Index: linux-rt-devel/lib/strnlen_user.c -=================================================================== ---- linux-rt-devel.orig/lib/strnlen_user.c -+++ linux-rt-devel/lib/strnlen_user.c +--- a/lib/strnlen_user.c ++++ b/lib/strnlen_user.c @@ -85,7 +85,8 @@ static inline long do_strnlen_user(const * @str: The string to measure. * @count: Maximum count (including NUL character) diff --git a/patches/0004-ipc-mqueue-Implement-lockless-pipelined-wakeups.patch b/patches/0004-ipc-mqueue-Implement-lockless-pipelined-wakeups.patch index 55f4e1c147a10e..92931b77a541bb 100644 --- a/patches/0004-ipc-mqueue-Implement-lockless-pipelined-wakeups.patch +++ b/patches/0004-ipc-mqueue-Implement-lockless-pipelined-wakeups.patch @@ -39,10 +39,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> ipc/mqueue.c | 54 +++++++++++++++++++++++++++++++++--------------------- 1 file changed, 33 insertions(+), 21 deletions(-) -Index: linux-rt-devel/ipc/mqueue.c -=================================================================== ---- linux-rt-devel.orig/ipc/mqueue.c -+++ linux-rt-devel/ipc/mqueue.c +--- a/ipc/mqueue.c ++++ b/ipc/mqueue.c @@ -47,8 +47,7 @@ #define RECV 1 @@ -70,7 +68,7 @@ Index: linux-rt-devel/ipc/mqueue.c if (ewp->state == STATE_READY) { retval = 0; goto out; -@@ -904,11 +900,15 @@ out_name: +@@ -904,11 +900,15 @@ SYSCALL_DEFINE1(mq_unlink, const char __ * list of waiting receivers. A sender checks that list before adding the new * message into the message array. If there is a waiting receiver, then it * bypasses the message array and directly hands the message over to the @@ -91,7 +89,7 @@ Index: linux-rt-devel/ipc/mqueue.c * * The same algorithm is used for senders. */ -@@ -916,21 +916,29 @@ out_name: +@@ -916,21 +916,29 @@ SYSCALL_DEFINE1(mq_unlink, const char __ /* pipelined_send() - send a message directly to the task waiting in * sys_mq_timedreceive() (without inserting message into a queue). */ diff --git a/patches/0004-mm-explicitly-disable-enable-preemption-in-kmap_atom.patch b/patches/0004-mm-explicitly-disable-enable-preemption-in-kmap_atom.patch index 5e2e5c6abff45f..c74a65d9272f01 100644 --- a/patches/0004-mm-explicitly-disable-enable-preemption-in-kmap_atom.patch +++ b/patches/0004-mm-explicitly-disable-enable-preemption-in-kmap_atom.patch @@ -29,10 +29,8 @@ Signed-off-by: David Hildenbrand <dahi@linux.vnet.ibm.com> include/linux/io-mapping.h | 2 ++ 15 files changed, 38 insertions(+), 7 deletions(-) -Index: linux-rt-devel/arch/arm/mm/highmem.c -=================================================================== ---- linux-rt-devel.orig/arch/arm/mm/highmem.c -+++ linux-rt-devel/arch/arm/mm/highmem.c +--- a/arch/arm/mm/highmem.c ++++ b/arch/arm/mm/highmem.c @@ -59,6 +59,7 @@ void *kmap_atomic(struct page *page) void *kmap; int type; @@ -57,10 +55,8 @@ Index: linux-rt-devel/arch/arm/mm/highmem.c pagefault_disable(); if (!PageHighMem(page)) return page_address(page); -Index: linux-rt-devel/arch/frv/mm/highmem.c -=================================================================== ---- linux-rt-devel.orig/arch/frv/mm/highmem.c -+++ linux-rt-devel/arch/frv/mm/highmem.c +--- a/arch/frv/mm/highmem.c ++++ b/arch/frv/mm/highmem.c @@ -42,6 +42,7 @@ void *kmap_atomic(struct page *page) unsigned long paddr; int type; @@ -76,10 +72,8 @@ Index: linux-rt-devel/arch/frv/mm/highmem.c + preempt_enable(); } EXPORT_SYMBOL(__kunmap_atomic); -Index: linux-rt-devel/arch/metag/mm/highmem.c -=================================================================== ---- linux-rt-devel.orig/arch/metag/mm/highmem.c -+++ linux-rt-devel/arch/metag/mm/highmem.c +--- a/arch/metag/mm/highmem.c ++++ b/arch/metag/mm/highmem.c @@ -43,7 +43,7 @@ void *kmap_atomic(struct page *page) unsigned long vaddr; int type; @@ -105,10 +99,8 @@ Index: linux-rt-devel/arch/metag/mm/highmem.c pagefault_disable(); type = kmap_atomic_idx_push(); -Index: linux-rt-devel/arch/microblaze/mm/highmem.c -=================================================================== ---- linux-rt-devel.orig/arch/microblaze/mm/highmem.c -+++ linux-rt-devel/arch/microblaze/mm/highmem.c +--- a/arch/microblaze/mm/highmem.c ++++ b/arch/microblaze/mm/highmem.c @@ -37,7 +37,7 @@ void *kmap_atomic_prot(struct page *page unsigned long vaddr; int idx, type; @@ -133,10 +125,8 @@ Index: linux-rt-devel/arch/microblaze/mm/highmem.c + preempt_enable(); } EXPORT_SYMBOL(__kunmap_atomic); -Index: linux-rt-devel/arch/mips/mm/highmem.c -=================================================================== ---- linux-rt-devel.orig/arch/mips/mm/highmem.c -+++ linux-rt-devel/arch/mips/mm/highmem.c +--- a/arch/mips/mm/highmem.c ++++ b/arch/mips/mm/highmem.c @@ -47,7 +47,7 @@ void *kmap_atomic(struct page *page) unsigned long vaddr; int idx, type; @@ -170,10 +160,8 @@ Index: linux-rt-devel/arch/mips/mm/highmem.c pagefault_disable(); type = kmap_atomic_idx_push(); -Index: linux-rt-devel/arch/mn10300/include/asm/highmem.h -=================================================================== ---- linux-rt-devel.orig/arch/mn10300/include/asm/highmem.h -+++ linux-rt-devel/arch/mn10300/include/asm/highmem.h +--- a/arch/mn10300/include/asm/highmem.h ++++ b/arch/mn10300/include/asm/highmem.h @@ -75,6 +75,7 @@ static inline void *kmap_atomic(struct p unsigned long vaddr; int idx, type; @@ -198,10 +186,8 @@ Index: linux-rt-devel/arch/mn10300/include/asm/highmem.h } #endif /* __KERNEL__ */ -Index: linux-rt-devel/arch/parisc/include/asm/cacheflush.h -=================================================================== ---- linux-rt-devel.orig/arch/parisc/include/asm/cacheflush.h -+++ linux-rt-devel/arch/parisc/include/asm/cacheflush.h +--- a/arch/parisc/include/asm/cacheflush.h ++++ b/arch/parisc/include/asm/cacheflush.h @@ -142,6 +142,7 @@ static inline void kunmap(struct page *p static inline void *kmap_atomic(struct page *page) @@ -218,10 +204,8 @@ Index: linux-rt-devel/arch/parisc/include/asm/cacheflush.h } #define kmap_atomic_prot(page, prot) kmap_atomic(page) -Index: linux-rt-devel/arch/powerpc/mm/highmem.c -=================================================================== ---- linux-rt-devel.orig/arch/powerpc/mm/highmem.c -+++ linux-rt-devel/arch/powerpc/mm/highmem.c +--- a/arch/powerpc/mm/highmem.c ++++ b/arch/powerpc/mm/highmem.c @@ -34,7 +34,7 @@ void *kmap_atomic_prot(struct page *page unsigned long vaddr; int idx, type; @@ -246,10 +230,8 @@ Index: linux-rt-devel/arch/powerpc/mm/highmem.c + preempt_enable(); } EXPORT_SYMBOL(__kunmap_atomic); -Index: linux-rt-devel/arch/sparc/mm/highmem.c -=================================================================== ---- linux-rt-devel.orig/arch/sparc/mm/highmem.c -+++ linux-rt-devel/arch/sparc/mm/highmem.c +--- a/arch/sparc/mm/highmem.c ++++ b/arch/sparc/mm/highmem.c @@ -53,7 +53,7 @@ void *kmap_atomic(struct page *page) unsigned long vaddr; long idx, type; @@ -274,10 +256,8 @@ Index: linux-rt-devel/arch/sparc/mm/highmem.c + preempt_enable(); } EXPORT_SYMBOL(__kunmap_atomic); -Index: linux-rt-devel/arch/tile/mm/highmem.c -=================================================================== ---- linux-rt-devel.orig/arch/tile/mm/highmem.c -+++ linux-rt-devel/arch/tile/mm/highmem.c +--- a/arch/tile/mm/highmem.c ++++ b/arch/tile/mm/highmem.c @@ -201,7 +201,7 @@ void *kmap_atomic_prot(struct page *page int idx, type; pte_t *pte; @@ -295,10 +275,8 @@ Index: linux-rt-devel/arch/tile/mm/highmem.c } EXPORT_SYMBOL(__kunmap_atomic); -Index: linux-rt-devel/arch/x86/mm/highmem_32.c -=================================================================== ---- linux-rt-devel.orig/arch/x86/mm/highmem_32.c -+++ linux-rt-devel/arch/x86/mm/highmem_32.c +--- a/arch/x86/mm/highmem_32.c ++++ b/arch/x86/mm/highmem_32.c @@ -35,7 +35,7 @@ void *kmap_atomic_prot(struct page *page unsigned long vaddr; int idx, type; @@ -316,10 +294,8 @@ Index: linux-rt-devel/arch/x86/mm/highmem_32.c } EXPORT_SYMBOL(__kunmap_atomic); -Index: linux-rt-devel/arch/x86/mm/iomap_32.c -=================================================================== ---- linux-rt-devel.orig/arch/x86/mm/iomap_32.c -+++ linux-rt-devel/arch/x86/mm/iomap_32.c +--- a/arch/x86/mm/iomap_32.c ++++ b/arch/x86/mm/iomap_32.c @@ -59,6 +59,7 @@ void *kmap_atomic_prot_pfn(unsigned long unsigned long vaddr; int idx, type; @@ -335,10 +311,8 @@ Index: linux-rt-devel/arch/x86/mm/iomap_32.c + preempt_enable(); } EXPORT_SYMBOL_GPL(iounmap_atomic); -Index: linux-rt-devel/arch/xtensa/mm/highmem.c -=================================================================== ---- linux-rt-devel.orig/arch/xtensa/mm/highmem.c -+++ linux-rt-devel/arch/xtensa/mm/highmem.c +--- a/arch/xtensa/mm/highmem.c ++++ b/arch/xtensa/mm/highmem.c @@ -42,6 +42,7 @@ void *kmap_atomic(struct page *page) enum fixed_addresses idx; unsigned long vaddr; @@ -355,10 +329,8 @@ Index: linux-rt-devel/arch/xtensa/mm/highmem.c } EXPORT_SYMBOL(__kunmap_atomic); -Index: linux-rt-devel/include/linux/highmem.h -=================================================================== ---- linux-rt-devel.orig/include/linux/highmem.h -+++ linux-rt-devel/include/linux/highmem.h +--- a/include/linux/highmem.h ++++ b/include/linux/highmem.h @@ -65,6 +65,7 @@ static inline void kunmap(struct page *p static inline void *kmap_atomic(struct page *page) @@ -375,10 +347,8 @@ Index: linux-rt-devel/include/linux/highmem.h } #define kmap_atomic_pfn(pfn) kmap_atomic(pfn_to_page(pfn)) -Index: linux-rt-devel/include/linux/io-mapping.h -=================================================================== ---- linux-rt-devel.orig/include/linux/io-mapping.h -+++ linux-rt-devel/include/linux/io-mapping.h +--- a/include/linux/io-mapping.h ++++ b/include/linux/io-mapping.h @@ -141,6 +141,7 @@ static inline void __iomem * io_mapping_map_atomic_wc(struct io_mapping *mapping, unsigned long offset) diff --git a/patches/0005-futex-Ensure-lock-unlock-symetry-versus-pi_lock-and-.patch b/patches/0005-futex-Ensure-lock-unlock-symetry-versus-pi_lock-and-.patch index 5fcf63d3f3ec2f..caabe01f3fd389 100644 --- a/patches/0005-futex-Ensure-lock-unlock-symetry-versus-pi_lock-and-.patch +++ b/patches/0005-futex-Ensure-lock-unlock-symetry-versus-pi_lock-and-.patch @@ -28,10 +28,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> kernel/futex.c | 2 ++ 1 file changed, 2 insertions(+) -Index: linux-rt-devel/kernel/futex.c -=================================================================== ---- linux-rt-devel.orig/kernel/futex.c -+++ linux-rt-devel/kernel/futex.c +--- a/kernel/futex.c ++++ b/kernel/futex.c @@ -738,7 +738,9 @@ void exit_pi_state_list(struct task_stru * task still owns the PI-state: */ diff --git a/patches/0005-mips-kmap_coherent-relies-on-disabled-preemption.patch b/patches/0005-mips-kmap_coherent-relies-on-disabled-preemption.patch index e7479e86e18e5c..694fad25ad8017 100644 --- a/patches/0005-mips-kmap_coherent-relies-on-disabled-preemption.patch +++ b/patches/0005-mips-kmap_coherent-relies-on-disabled-preemption.patch @@ -20,10 +20,8 @@ Signed-off-by: David Hildenbrand <dahi@linux.vnet.ibm.com> arch/mips/mm/init.c | 2 ++ 1 file changed, 2 insertions(+) -Index: linux-rt-devel/arch/mips/mm/init.c -=================================================================== ---- linux-rt-devel.orig/arch/mips/mm/init.c -+++ linux-rt-devel/arch/mips/mm/init.c +--- a/arch/mips/mm/init.c ++++ b/arch/mips/mm/init.c @@ -90,6 +90,7 @@ static void *__kmap_pgprot(struct page * BUG_ON(Page_dcache_dirty(page)); diff --git a/patches/0006-mm-use-pagefault_disable-to-check-for-disabled-pagef.patch b/patches/0006-mm-use-pagefault_disable-to-check-for-disabled-pagef.patch index 1ecda71bdc8f0c..65643180719e13 100644 --- a/patches/0006-mm-use-pagefault_disable-to-check-for-disabled-pagef.patch +++ b/patches/0006-mm-use-pagefault_disable-to-check-for-disabled-pagef.patch @@ -58,10 +58,8 @@ Signed-off-by: David Hildenbrand <dahi@linux.vnet.ibm.com> include/linux/uaccess.h | 12 ++++++++++++ 30 files changed, 72 insertions(+), 57 deletions(-) -Index: linux-rt-devel/arch/alpha/mm/fault.c -=================================================================== ---- linux-rt-devel.orig/arch/alpha/mm/fault.c -+++ linux-rt-devel/arch/alpha/mm/fault.c +--- a/arch/alpha/mm/fault.c ++++ b/arch/alpha/mm/fault.c @@ -23,8 +23,7 @@ #include <linux/smp.h> #include <linux/interrupt.h> @@ -81,10 +79,8 @@ Index: linux-rt-devel/arch/alpha/mm/fault.c goto no_context; #ifdef CONFIG_ALPHA_LARGE_VMALLOC -Index: linux-rt-devel/arch/arc/mm/fault.c -=================================================================== ---- linux-rt-devel.orig/arch/arc/mm/fault.c -+++ linux-rt-devel/arch/arc/mm/fault.c +--- a/arch/arc/mm/fault.c ++++ b/arch/arc/mm/fault.c @@ -86,7 +86,7 @@ void do_page_fault(unsigned long address * If we're in an interrupt or have no user * context, we must not take the fault.. @@ -94,10 +90,8 @@ Index: linux-rt-devel/arch/arc/mm/fault.c goto no_context; if (user_mode(regs)) -Index: linux-rt-devel/arch/arm/mm/fault.c -=================================================================== ---- linux-rt-devel.orig/arch/arm/mm/fault.c -+++ linux-rt-devel/arch/arm/mm/fault.c +--- a/arch/arm/mm/fault.c ++++ b/arch/arm/mm/fault.c @@ -276,7 +276,7 @@ do_page_fault(unsigned long addr, unsign * If we're in an interrupt or have no user * context, we must not take the fault.. @@ -107,10 +101,8 @@ Index: linux-rt-devel/arch/arm/mm/fault.c goto no_context; if (user_mode(regs)) -Index: linux-rt-devel/arch/arm64/mm/fault.c -=================================================================== ---- linux-rt-devel.orig/arch/arm64/mm/fault.c -+++ linux-rt-devel/arch/arm64/mm/fault.c +--- a/arch/arm64/mm/fault.c ++++ b/arch/arm64/mm/fault.c @@ -211,7 +211,7 @@ static int __kprobes do_page_fault(unsig * If we're in an interrupt or have no user context, we must not take * the fault. @@ -120,10 +112,8 @@ Index: linux-rt-devel/arch/arm64/mm/fault.c goto no_context; if (user_mode(regs)) -Index: linux-rt-devel/arch/avr32/mm/fault.c -=================================================================== ---- linux-rt-devel.orig/arch/avr32/mm/fault.c -+++ linux-rt-devel/arch/avr32/mm/fault.c +--- a/arch/avr32/mm/fault.c ++++ b/arch/avr32/mm/fault.c @@ -14,11 +14,11 @@ #include <linux/pagemap.h> #include <linux/kdebug.h> @@ -146,10 +136,8 @@ Index: linux-rt-devel/arch/avr32/mm/fault.c goto no_context; local_irq_enable(); -Index: linux-rt-devel/arch/cris/mm/fault.c -=================================================================== ---- linux-rt-devel.orig/arch/cris/mm/fault.c -+++ linux-rt-devel/arch/cris/mm/fault.c +--- a/arch/cris/mm/fault.c ++++ b/arch/cris/mm/fault.c @@ -8,7 +8,7 @@ #include <linux/interrupt.h> #include <linux/module.h> @@ -173,10 +161,8 @@ Index: linux-rt-devel/arch/cris/mm/fault.c goto no_context; if (user_mode(regs)) -Index: linux-rt-devel/arch/frv/mm/fault.c -=================================================================== ---- linux-rt-devel.orig/arch/frv/mm/fault.c -+++ linux-rt-devel/arch/frv/mm/fault.c +--- a/arch/frv/mm/fault.c ++++ b/arch/frv/mm/fault.c @@ -19,9 +19,9 @@ #include <linux/kernel.h> #include <linux/ptrace.h> @@ -197,10 +183,8 @@ Index: linux-rt-devel/arch/frv/mm/fault.c goto no_context; if (user_mode(__frame)) -Index: linux-rt-devel/arch/ia64/mm/fault.c -=================================================================== ---- linux-rt-devel.orig/arch/ia64/mm/fault.c -+++ linux-rt-devel/arch/ia64/mm/fault.c +--- a/arch/ia64/mm/fault.c ++++ b/arch/ia64/mm/fault.c @@ -11,10 +11,10 @@ #include <linux/kprobes.h> #include <linux/kdebug.h> @@ -222,10 +206,8 @@ Index: linux-rt-devel/arch/ia64/mm/fault.c goto no_context; #ifdef CONFIG_VIRTUAL_MEM_MAP -Index: linux-rt-devel/arch/m32r/mm/fault.c -=================================================================== ---- linux-rt-devel.orig/arch/m32r/mm/fault.c -+++ linux-rt-devel/arch/m32r/mm/fault.c +--- a/arch/m32r/mm/fault.c ++++ b/arch/m32r/mm/fault.c @@ -24,9 +24,9 @@ #include <linux/vt_kern.h> /* For unblank_screen() */ #include <linux/highmem.h> @@ -251,10 +233,8 @@ Index: linux-rt-devel/arch/m32r/mm/fault.c goto bad_area_nosemaphore; if (error_code & ACE_USERMODE) -Index: linux-rt-devel/arch/m68k/mm/fault.c -=================================================================== ---- linux-rt-devel.orig/arch/m68k/mm/fault.c -+++ linux-rt-devel/arch/m68k/mm/fault.c +--- a/arch/m68k/mm/fault.c ++++ b/arch/m68k/mm/fault.c @@ -10,10 +10,10 @@ #include <linux/ptrace.h> #include <linux/interrupt.h> @@ -276,10 +256,8 @@ Index: linux-rt-devel/arch/m68k/mm/fault.c goto no_context; if (user_mode(regs)) -Index: linux-rt-devel/arch/metag/mm/fault.c -=================================================================== ---- linux-rt-devel.orig/arch/metag/mm/fault.c -+++ linux-rt-devel/arch/metag/mm/fault.c +--- a/arch/metag/mm/fault.c ++++ b/arch/metag/mm/fault.c @@ -105,7 +105,7 @@ int do_page_fault(struct pt_regs *regs, mm = tsk->mm; @@ -289,10 +267,8 @@ Index: linux-rt-devel/arch/metag/mm/fault.c goto no_context; if (user_mode(regs)) -Index: linux-rt-devel/arch/microblaze/mm/fault.c -=================================================================== ---- linux-rt-devel.orig/arch/microblaze/mm/fault.c -+++ linux-rt-devel/arch/microblaze/mm/fault.c +--- a/arch/microblaze/mm/fault.c ++++ b/arch/microblaze/mm/fault.c @@ -107,14 +107,14 @@ void do_page_fault(struct pt_regs *regs, if ((error_code & 0x13) == 0x13 || (error_code & 0x11) == 0x11) is_write = 0; @@ -312,10 +288,8 @@ Index: linux-rt-devel/arch/microblaze/mm/fault.c pr_emerg("r15 = %lx MSR = %lx\n", regs->r15, regs->msr); die("Weird page fault", regs, SIGSEGV); -Index: linux-rt-devel/arch/mips/mm/fault.c -=================================================================== ---- linux-rt-devel.orig/arch/mips/mm/fault.c -+++ linux-rt-devel/arch/mips/mm/fault.c +--- a/arch/mips/mm/fault.c ++++ b/arch/mips/mm/fault.c @@ -21,10 +21,10 @@ #include <linux/module.h> #include <linux/kprobes.h> @@ -337,10 +311,8 @@ Index: linux-rt-devel/arch/mips/mm/fault.c goto bad_area_nosemaphore; if (user_mode(regs)) -Index: linux-rt-devel/arch/mn10300/mm/fault.c -=================================================================== ---- linux-rt-devel.orig/arch/mn10300/mm/fault.c -+++ linux-rt-devel/arch/mn10300/mm/fault.c +--- a/arch/mn10300/mm/fault.c ++++ b/arch/mn10300/mm/fault.c @@ -23,8 +23,8 @@ #include <linux/interrupt.h> #include <linux/init.h> @@ -360,10 +332,8 @@ Index: linux-rt-devel/arch/mn10300/mm/fault.c goto no_context; if ((fault_code & MMUFCR_xFC_ACCESS) == MMUFCR_xFC_ACCESS_USR) -Index: linux-rt-devel/arch/nios2/mm/fault.c -=================================================================== ---- linux-rt-devel.orig/arch/nios2/mm/fault.c -+++ linux-rt-devel/arch/nios2/mm/fault.c +--- a/arch/nios2/mm/fault.c ++++ b/arch/nios2/mm/fault.c @@ -77,7 +77,7 @@ asmlinkage void do_page_fault(struct pt_ * If we're in an interrupt or have no user * context, we must not take the fault.. @@ -373,10 +343,8 @@ Index: linux-rt-devel/arch/nios2/mm/fault.c goto bad_area_nosemaphore; if (user_mode(regs)) -Index: linux-rt-devel/arch/parisc/kernel/traps.c -=================================================================== ---- linux-rt-devel.orig/arch/parisc/kernel/traps.c -+++ linux-rt-devel/arch/parisc/kernel/traps.c +--- a/arch/parisc/kernel/traps.c ++++ b/arch/parisc/kernel/traps.c @@ -26,9 +26,9 @@ #include <linux/console.h> #include <linux/bug.h> @@ -397,10 +365,8 @@ Index: linux-rt-devel/arch/parisc/kernel/traps.c { pdc_chassis_send_status(PDC_CHASSIS_DIRECT_PANIC); parisc_terminate("Kernel Fault", regs, code, fault_address); -Index: linux-rt-devel/arch/parisc/mm/fault.c -=================================================================== ---- linux-rt-devel.orig/arch/parisc/mm/fault.c -+++ linux-rt-devel/arch/parisc/mm/fault.c +--- a/arch/parisc/mm/fault.c ++++ b/arch/parisc/mm/fault.c @@ -15,8 +15,8 @@ #include <linux/sched.h> #include <linux/interrupt.h> @@ -420,10 +386,8 @@ Index: linux-rt-devel/arch/parisc/mm/fault.c goto no_context; tsk = current; -Index: linux-rt-devel/arch/powerpc/mm/fault.c -=================================================================== ---- linux-rt-devel.orig/arch/powerpc/mm/fault.c -+++ linux-rt-devel/arch/powerpc/mm/fault.c +--- a/arch/powerpc/mm/fault.c ++++ b/arch/powerpc/mm/fault.c @@ -33,13 +33,13 @@ #include <linux/ratelimit.h> #include <linux/context_tracking.h> @@ -459,10 +423,8 @@ Index: linux-rt-devel/arch/powerpc/mm/fault.c printk(KERN_EMERG "NIP = %lx MSR = %lx\n", regs->nip, regs->msr); die("Weird page fault", regs, SIGSEGV); -Index: linux-rt-devel/arch/s390/mm/fault.c -=================================================================== ---- linux-rt-devel.orig/arch/s390/mm/fault.c -+++ linux-rt-devel/arch/s390/mm/fault.c +--- a/arch/s390/mm/fault.c ++++ b/arch/s390/mm/fault.c @@ -399,7 +399,7 @@ static inline int do_exception(struct pt * user context. */ @@ -472,10 +434,8 @@ Index: linux-rt-devel/arch/s390/mm/fault.c goto out; address = trans_exc_code & __FAIL_ADDR_MASK; -Index: linux-rt-devel/arch/score/mm/fault.c -=================================================================== ---- linux-rt-devel.orig/arch/score/mm/fault.c -+++ linux-rt-devel/arch/score/mm/fault.c +--- a/arch/score/mm/fault.c ++++ b/arch/score/mm/fault.c @@ -34,6 +34,7 @@ #include <linux/string.h> #include <linux/types.h> @@ -493,10 +453,8 @@ Index: linux-rt-devel/arch/score/mm/fault.c goto bad_area_nosemaphore; if (user_mode(regs)) -Index: linux-rt-devel/arch/sh/mm/fault.c -=================================================================== ---- linux-rt-devel.orig/arch/sh/mm/fault.c -+++ linux-rt-devel/arch/sh/mm/fault.c +--- a/arch/sh/mm/fault.c ++++ b/arch/sh/mm/fault.c @@ -17,6 +17,7 @@ #include <linux/kprobes.h> #include <linux/perf_event.h> @@ -517,10 +475,8 @@ Index: linux-rt-devel/arch/sh/mm/fault.c bad_area_nosemaphore(regs, error_code, address); return; } -Index: linux-rt-devel/arch/sparc/mm/fault_32.c -=================================================================== ---- linux-rt-devel.orig/arch/sparc/mm/fault_32.c -+++ linux-rt-devel/arch/sparc/mm/fault_32.c +--- a/arch/sparc/mm/fault_32.c ++++ b/arch/sparc/mm/fault_32.c @@ -21,6 +21,7 @@ #include <linux/perf_event.h> #include <linux/interrupt.h> @@ -546,10 +502,8 @@ Index: linux-rt-devel/arch/sparc/mm/fault_32.c goto no_context; perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, address); -Index: linux-rt-devel/arch/sparc/mm/fault_64.c -=================================================================== ---- linux-rt-devel.orig/arch/sparc/mm/fault_64.c -+++ linux-rt-devel/arch/sparc/mm/fault_64.c +--- a/arch/sparc/mm/fault_64.c ++++ b/arch/sparc/mm/fault_64.c @@ -22,12 +22,12 @@ #include <linux/kdebug.h> #include <linux/percpu.h> @@ -573,10 +527,8 @@ Index: linux-rt-devel/arch/sparc/mm/fault_64.c goto intr_or_no_mm; perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, address); -Index: linux-rt-devel/arch/sparc/mm/init_64.c -=================================================================== ---- linux-rt-devel.orig/arch/sparc/mm/init_64.c -+++ linux-rt-devel/arch/sparc/mm/init_64.c +--- a/arch/sparc/mm/init_64.c ++++ b/arch/sparc/mm/init_64.c @@ -2738,7 +2738,7 @@ void hugetlb_setup(struct pt_regs *regs) struct mm_struct *mm = current->mm; struct tsb_config *tp; @@ -586,10 +538,8 @@ Index: linux-rt-devel/arch/sparc/mm/init_64.c const struct exception_table_entry *entry; entry = search_exception_tables(regs->tpc); -Index: linux-rt-devel/arch/tile/mm/fault.c -=================================================================== ---- linux-rt-devel.orig/arch/tile/mm/fault.c -+++ linux-rt-devel/arch/tile/mm/fault.c +--- a/arch/tile/mm/fault.c ++++ b/arch/tile/mm/fault.c @@ -354,9 +354,9 @@ static int handle_page_fault(struct pt_r /* @@ -602,10 +552,8 @@ Index: linux-rt-devel/arch/tile/mm/fault.c vma = NULL; /* happy compiler */ goto bad_area_nosemaphore; } -Index: linux-rt-devel/arch/um/kernel/trap.c -=================================================================== ---- linux-rt-devel.orig/arch/um/kernel/trap.c -+++ linux-rt-devel/arch/um/kernel/trap.c +--- a/arch/um/kernel/trap.c ++++ b/arch/um/kernel/trap.c @@ -35,10 +35,10 @@ int handle_page_fault(unsigned long addr *code_out = SEGV_MAPERR; @@ -619,10 +567,8 @@ Index: linux-rt-devel/arch/um/kernel/trap.c goto out_nosemaphore; if (is_user) -Index: linux-rt-devel/arch/unicore32/mm/fault.c -=================================================================== ---- linux-rt-devel.orig/arch/unicore32/mm/fault.c -+++ linux-rt-devel/arch/unicore32/mm/fault.c +--- a/arch/unicore32/mm/fault.c ++++ b/arch/unicore32/mm/fault.c @@ -218,7 +218,7 @@ static int do_pf(unsigned long addr, uns * If we're in an interrupt or have no user * context, we must not take the fault.. @@ -632,10 +578,8 @@ Index: linux-rt-devel/arch/unicore32/mm/fault.c goto no_context; if (user_mode(regs)) -Index: linux-rt-devel/arch/x86/mm/fault.c -=================================================================== ---- linux-rt-devel.orig/arch/x86/mm/fault.c -+++ linux-rt-devel/arch/x86/mm/fault.c +--- a/arch/x86/mm/fault.c ++++ b/arch/x86/mm/fault.c @@ -13,6 +13,7 @@ #include <linux/hugetlb.h> /* hstate_index_to_shift */ #include <linux/prefetch.h> /* prefetchw */ @@ -644,7 +588,7 @@ Index: linux-rt-devel/arch/x86/mm/fault.c #include <asm/traps.h> /* dotraplinkage, ... */ #include <asm/pgalloc.h> /* pgd_*(), ... */ -@@ -1126,9 +1127,9 @@ __do_page_fault(struct pt_regs *regs, un +@@ -1126,9 +1127,9 @@ static noinline void /* * If we're in an interrupt, have no user context or are running @@ -656,10 +600,8 @@ Index: linux-rt-devel/arch/x86/mm/fault.c bad_area_nosemaphore(regs, error_code, address); return; } -Index: linux-rt-devel/arch/xtensa/mm/fault.c -=================================================================== ---- linux-rt-devel.orig/arch/xtensa/mm/fault.c -+++ linux-rt-devel/arch/xtensa/mm/fault.c +--- a/arch/xtensa/mm/fault.c ++++ b/arch/xtensa/mm/fault.c @@ -15,10 +15,10 @@ #include <linux/mm.h> #include <linux/module.h> @@ -681,10 +623,8 @@ Index: linux-rt-devel/arch/xtensa/mm/fault.c bad_page_fault(regs, address, SIGSEGV); return; } -Index: linux-rt-devel/include/linux/uaccess.h -=================================================================== ---- linux-rt-devel.orig/include/linux/uaccess.h -+++ linux-rt-devel/include/linux/uaccess.h +--- a/include/linux/uaccess.h ++++ b/include/linux/uaccess.h @@ -59,6 +59,18 @@ static inline void pagefault_enable(void */ #define pagefault_disabled() (current->pagefault_disabled != 0) diff --git a/patches/0007-drm-i915-use-pagefault_disabled-to-check-for-disable.patch b/patches/0007-drm-i915-use-pagefault_disabled-to-check-for-disable.patch index 462ebe3aa28036..fd0ac3bc496a5b 100644 --- a/patches/0007-drm-i915-use-pagefault_disabled-to-check-for-disable.patch +++ b/patches/0007-drm-i915-use-pagefault_disabled-to-check-for-disable.patch @@ -11,10 +11,8 @@ Signed-off-by: David Hildenbrand <dahi@linux.vnet.ibm.com> drivers/gpu/drm/i915/i915_gem_execbuffer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -Index: linux-rt-devel/drivers/gpu/drm/i915/i915_gem_execbuffer.c -=================================================================== ---- linux-rt-devel.orig/drivers/gpu/drm/i915/i915_gem_execbuffer.c -+++ linux-rt-devel/drivers/gpu/drm/i915/i915_gem_execbuffer.c +--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c ++++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c @@ -32,6 +32,7 @@ #include "i915_trace.h" #include "intel_drv.h" diff --git a/patches/0008-futex-UP-futex_atomic_op_inuser-relies-on-disabled-p.patch b/patches/0008-futex-UP-futex_atomic_op_inuser-relies-on-disabled-p.patch index 491656876e60f2..1701eac2505f87 100644 --- a/patches/0008-futex-UP-futex_atomic_op_inuser-relies-on-disabled-p.patch +++ b/patches/0008-futex-UP-futex_atomic_op_inuser-relies-on-disabled-p.patch @@ -15,10 +15,8 @@ Signed-off-by: David Hildenbrand <dahi@linux.vnet.ibm.com> include/asm-generic/futex.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -Index: linux-rt-devel/include/asm-generic/futex.h -=================================================================== ---- linux-rt-devel.orig/include/asm-generic/futex.h -+++ linux-rt-devel/include/asm-generic/futex.h +--- a/include/asm-generic/futex.h ++++ b/include/asm-generic/futex.h @@ -8,8 +8,7 @@ #ifndef CONFIG_SMP /* diff --git a/patches/0009-futex-UP-futex_atomic_cmpxchg_inatomic-relies-on-dis.patch b/patches/0009-futex-UP-futex_atomic_cmpxchg_inatomic-relies-on-dis.patch index 9eae4b2e332cf9..ed74ddae816aa5 100644 --- a/patches/0009-futex-UP-futex_atomic_cmpxchg_inatomic-relies-on-dis.patch +++ b/patches/0009-futex-UP-futex_atomic_cmpxchg_inatomic-relies-on-dis.patch @@ -16,10 +16,8 @@ Signed-off-by: David Hildenbrand <dahi@linux.vnet.ibm.com> include/asm-generic/futex.h | 2 ++ 1 file changed, 2 insertions(+) -Index: linux-rt-devel/include/asm-generic/futex.h -=================================================================== ---- linux-rt-devel.orig/include/asm-generic/futex.h -+++ linux-rt-devel/include/asm-generic/futex.h +--- a/include/asm-generic/futex.h ++++ b/include/asm-generic/futex.h @@ -107,6 +107,7 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, { u32 val; diff --git a/patches/0010-arm-futex-UP-futex_atomic_cmpxchg_inatomic-relies-on.patch b/patches/0010-arm-futex-UP-futex_atomic_cmpxchg_inatomic-relies-on.patch index b185fed8eefefa..48aebb2d4152e9 100644 --- a/patches/0010-arm-futex-UP-futex_atomic_cmpxchg_inatomic-relies-on.patch +++ b/patches/0010-arm-futex-UP-futex_atomic_cmpxchg_inatomic-relies-on.patch @@ -15,10 +15,8 @@ Signed-off-by: David Hildenbrand <dahi@linux.vnet.ibm.com> arch/arm/include/asm/futex.h | 3 +++ 1 file changed, 3 insertions(+) -Index: linux-rt-devel/arch/arm/include/asm/futex.h -=================================================================== ---- linux-rt-devel.orig/arch/arm/include/asm/futex.h -+++ linux-rt-devel/arch/arm/include/asm/futex.h +--- a/arch/arm/include/asm/futex.h ++++ b/arch/arm/include/asm/futex.h @@ -93,6 +93,7 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32))) return -EFAULT; diff --git a/patches/0011-arm-futex-UP-futex_atomic_op_inuser-relies-on-disabl.patch b/patches/0011-arm-futex-UP-futex_atomic_op_inuser-relies-on-disabl.patch index 1342b8ed678fc8..e837433a78789b 100644 --- a/patches/0011-arm-futex-UP-futex_atomic_op_inuser-relies-on-disabl.patch +++ b/patches/0011-arm-futex-UP-futex_atomic_op_inuser-relies-on-disabl.patch @@ -19,10 +19,8 @@ Signed-off-by: David Hildenbrand <dahi@linux.vnet.ibm.com> arch/arm/include/asm/futex.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) -Index: linux-rt-devel/arch/arm/include/asm/futex.h -=================================================================== ---- linux-rt-devel.orig/arch/arm/include/asm/futex.h -+++ linux-rt-devel/arch/arm/include/asm/futex.h +--- a/arch/arm/include/asm/futex.h ++++ b/arch/arm/include/asm/futex.h @@ -127,7 +127,10 @@ futex_atomic_op_inuser (int encoded_op, if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32))) return -EFAULT; diff --git a/patches/0012-futex-clarify-that-preemption-doesn-t-have-to-be-dis.patch b/patches/0012-futex-clarify-that-preemption-doesn-t-have-to-be-dis.patch index 4c3e5a871f9f68..42dde8e91c0a0c 100644 --- a/patches/0012-futex-clarify-that-preemption-doesn-t-have-to-be-dis.patch +++ b/patches/0012-futex-clarify-that-preemption-doesn-t-have-to-be-dis.patch @@ -16,10 +16,8 @@ Signed-off-by: David Hildenbrand <dahi@linux.vnet.ibm.com> arch/arm64/include/asm/futex.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) -Index: linux-rt-devel/arch/arc/include/asm/futex.h -=================================================================== ---- linux-rt-devel.orig/arch/arc/include/asm/futex.h -+++ linux-rt-devel/arch/arc/include/asm/futex.h +--- a/arch/arc/include/asm/futex.h ++++ b/arch/arc/include/asm/futex.h @@ -53,7 +53,7 @@ static inline int futex_atomic_op_inuser if (!access_ok(VERIFY_WRITE, uaddr, sizeof(int))) return -EFAULT; @@ -65,10 +63,8 @@ Index: linux-rt-devel/arch/arc/include/asm/futex.h *uval = val; return val; -Index: linux-rt-devel/arch/arm64/include/asm/futex.h -=================================================================== ---- linux-rt-devel.orig/arch/arm64/include/asm/futex.h -+++ linux-rt-devel/arch/arm64/include/asm/futex.h +--- a/arch/arm64/include/asm/futex.h ++++ b/arch/arm64/include/asm/futex.h @@ -58,7 +58,7 @@ futex_atomic_op_inuser (int encoded_op, if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32))) return -EFAULT; diff --git a/patches/0013-mips-properly-lock-access-to-the-fpu.patch b/patches/0013-mips-properly-lock-access-to-the-fpu.patch index 07fd539e044847..5acfb89ffb0dd8 100644 --- a/patches/0013-mips-properly-lock-access-to-the-fpu.patch +++ b/patches/0013-mips-properly-lock-access-to-the-fpu.patch @@ -14,10 +14,8 @@ Signed-off-by: David Hildenbrand <dahi@linux.vnet.ibm.com> arch/mips/kernel/signal-common.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) -Index: linux-rt-devel/arch/mips/kernel/signal-common.h -=================================================================== ---- linux-rt-devel.orig/arch/mips/kernel/signal-common.h -+++ linux-rt-devel/arch/mips/kernel/signal-common.h +--- a/arch/mips/kernel/signal-common.h ++++ b/arch/mips/kernel/signal-common.h @@ -28,12 +28,7 @@ extern void __user *get_sigframe(struct extern int fpcsr_pending(unsigned int __user *fpcsr); diff --git a/patches/0014-uaccess-decouple-preemption-from-the-pagefault-logic.patch b/patches/0014-uaccess-decouple-preemption-from-the-pagefault-logic.patch index 50bcf3772a6c5a..e9b148bf5d9687 100644 --- a/patches/0014-uaccess-decouple-preemption-from-the-pagefault-logic.patch +++ b/patches/0014-uaccess-decouple-preemption-from-the-pagefault-logic.patch @@ -16,10 +16,8 @@ Signed-off-by: David Hildenbrand <dahi@linux.vnet.ibm.com> include/linux/uaccess.h | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) -Index: linux-rt-devel/include/linux/uaccess.h -=================================================================== ---- linux-rt-devel.orig/include/linux/uaccess.h -+++ linux-rt-devel/include/linux/uaccess.h +--- a/include/linux/uaccess.h ++++ b/include/linux/uaccess.h @@ -1,7 +1,6 @@ #ifndef __LINUX_UACCESS_H__ #define __LINUX_UACCESS_H__ diff --git a/patches/ARM-cmpxchg-define-__HAVE_ARCH_CMPXCHG-for-armv6-and.patch b/patches/ARM-cmpxchg-define-__HAVE_ARCH_CMPXCHG-for-armv6-and.patch index 43dbf5f8914c30..8c3abb11a6189a 100644 --- a/patches/ARM-cmpxchg-define-__HAVE_ARCH_CMPXCHG-for-armv6-and.patch +++ b/patches/ARM-cmpxchg-define-__HAVE_ARCH_CMPXCHG-for-armv6-and.patch @@ -26,10 +26,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> arch/arm/include/asm/cmpxchg.h | 2 ++ 1 file changed, 2 insertions(+) -Index: linux-rt-devel/arch/arm/include/asm/cmpxchg.h -=================================================================== ---- linux-rt-devel.orig/arch/arm/include/asm/cmpxchg.h -+++ linux-rt-devel/arch/arm/include/asm/cmpxchg.h +--- a/arch/arm/include/asm/cmpxchg.h ++++ b/arch/arm/include/asm/cmpxchg.h @@ -129,6 +129,8 @@ static inline unsigned long __xchg(unsig #else /* min ARCH >= ARMv6 */ diff --git a/patches/ARM-enable-irq-in-translation-section-permission-fau.patch b/patches/ARM-enable-irq-in-translation-section-permission-fau.patch index 271da02280ee4c..c1db6bee2360f6 100644 --- a/patches/ARM-enable-irq-in-translation-section-permission-fau.patch +++ b/patches/ARM-enable-irq-in-translation-section-permission-fau.patch @@ -61,10 +61,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> arch/arm/mm/fault.c | 6 ++++++ 1 file changed, 6 insertions(+) -Index: linux-rt-devel/arch/arm/mm/fault.c -=================================================================== ---- linux-rt-devel.orig/arch/arm/mm/fault.c -+++ linux-rt-devel/arch/arm/mm/fault.c +--- a/arch/arm/mm/fault.c ++++ b/arch/arm/mm/fault.c @@ -430,6 +430,9 @@ do_translation_fault(unsigned long addr, if (addr < TASK_SIZE) return do_page_fault(addr, fsr, regs); diff --git a/patches/ASoC-Intel-sst-use-instead-of-at-the-of-a-C-statemen.patch b/patches/ASoC-Intel-sst-use-instead-of-at-the-of-a-C-statemen.patch index 19b93c9411bdb3..53e65cde292712 100644 --- a/patches/ASoC-Intel-sst-use-instead-of-at-the-of-a-C-statemen.patch +++ b/patches/ASoC-Intel-sst-use-instead-of-at-the-of-a-C-statemen.patch @@ -11,10 +11,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> sound/soc/intel/atom/sst/sst.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -Index: linux-rt-devel/sound/soc/intel/atom/sst/sst.c -=================================================================== ---- linux-rt-devel.orig/sound/soc/intel/atom/sst/sst.c -+++ linux-rt-devel/sound/soc/intel/atom/sst/sst.c +--- a/sound/soc/intel/atom/sst/sst.c ++++ b/sound/soc/intel/atom/sst/sst.c @@ -368,8 +368,8 @@ static inline void sst_restore_shim64(st * initialize by FW or driver when firmware is loaded */ diff --git a/patches/HACK-printk-drop-the-logbuf_lock-more-often.patch b/patches/HACK-printk-drop-the-logbuf_lock-more-often.patch index c323cc8f2d444d..029dfa695fc38c 100644 --- a/patches/HACK-printk-drop-the-logbuf_lock-more-often.patch +++ b/patches/HACK-printk-drop-the-logbuf_lock-more-often.patch @@ -10,10 +10,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> kernel/printk/printk.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) -Index: linux-rt-devel/kernel/printk/printk.c -=================================================================== ---- linux-rt-devel.orig/kernel/printk/printk.c -+++ linux-rt-devel/kernel/printk/printk.c +--- a/kernel/printk/printk.c ++++ b/kernel/printk/printk.c @@ -1163,6 +1163,7 @@ static int syslog_print_all(char __user { char *text; diff --git a/patches/KVM-lapic-mark-LAPIC-timer-handler-as-irqsafe.patch b/patches/KVM-lapic-mark-LAPIC-timer-handler-as-irqsafe.patch index cc1d4649b1136d..875dc538bc9a0a 100644 --- a/patches/KVM-lapic-mark-LAPIC-timer-handler-as-irqsafe.patch +++ b/patches/KVM-lapic-mark-LAPIC-timer-handler-as-irqsafe.patch @@ -16,10 +16,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> arch/x86/kvm/lapic.c | 40 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 37 insertions(+), 3 deletions(-) -Index: linux-rt-devel/arch/x86/kvm/lapic.c -=================================================================== ---- linux-rt-devel.orig/arch/x86/kvm/lapic.c -+++ linux-rt-devel/arch/x86/kvm/lapic.c +--- a/arch/x86/kvm/lapic.c ++++ b/arch/x86/kvm/lapic.c @@ -1167,8 +1167,36 @@ void wait_lapic_expire(struct kvm_vcpu * __delay(tsc_deadline - guest_tsc); } diff --git a/patches/KVM-use-simple-waitqueue-for-vcpu-wq.patch b/patches/KVM-use-simple-waitqueue-for-vcpu-wq.patch index 8a271e94680bdd..9ec1315628bcef 100644 --- a/patches/KVM-use-simple-waitqueue-for-vcpu-wq.patch +++ b/patches/KVM-use-simple-waitqueue-for-vcpu-wq.patch @@ -44,10 +44,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> virt/kvm/kvm_main.c | 16 ++++++++-------- 10 files changed, 37 insertions(+), 38 deletions(-) -Index: linux-rt-devel/arch/arm/kvm/arm.c -=================================================================== ---- linux-rt-devel.orig/arch/arm/kvm/arm.c -+++ linux-rt-devel/arch/arm/kvm/arm.c +--- a/arch/arm/kvm/arm.c ++++ b/arch/arm/kvm/arm.c @@ -474,9 +474,9 @@ bool kvm_arch_intc_initialized(struct kv static void vcpu_pause(struct kvm_vcpu *vcpu) @@ -60,10 +58,8 @@ Index: linux-rt-devel/arch/arm/kvm/arm.c } static int kvm_vcpu_initialized(struct kvm_vcpu *vcpu) -Index: linux-rt-devel/arch/arm/kvm/psci.c -=================================================================== ---- linux-rt-devel.orig/arch/arm/kvm/psci.c -+++ linux-rt-devel/arch/arm/kvm/psci.c +--- a/arch/arm/kvm/psci.c ++++ b/arch/arm/kvm/psci.c @@ -68,7 +68,7 @@ static unsigned long kvm_psci_vcpu_on(st { struct kvm *kvm = source_vcpu->kvm; @@ -82,10 +78,8 @@ Index: linux-rt-devel/arch/arm/kvm/psci.c return PSCI_RET_SUCCESS; } -Index: linux-rt-devel/arch/powerpc/include/asm/kvm_host.h -=================================================================== ---- linux-rt-devel.orig/arch/powerpc/include/asm/kvm_host.h -+++ linux-rt-devel/arch/powerpc/include/asm/kvm_host.h +--- a/arch/powerpc/include/asm/kvm_host.h ++++ b/arch/powerpc/include/asm/kvm_host.h @@ -280,7 +280,7 @@ struct kvmppc_vcore { u8 in_guest; struct list_head runnable_threads; @@ -104,10 +98,8 @@ Index: linux-rt-devel/arch/powerpc/include/asm/kvm_host.h struct kvmppc_vcore *vcore; int ret; int trap; -Index: linux-rt-devel/arch/powerpc/kvm/book3s_hv.c -=================================================================== ---- linux-rt-devel.orig/arch/powerpc/kvm/book3s_hv.c -+++ linux-rt-devel/arch/powerpc/kvm/book3s_hv.c +--- a/arch/powerpc/kvm/book3s_hv.c ++++ b/arch/powerpc/kvm/book3s_hv.c @@ -115,11 +115,11 @@ static bool kvmppc_ipi_thread(int cpu) static void kvmppc_fast_vcpu_kick_hv(struct kvm_vcpu *vcpu) { @@ -183,10 +175,8 @@ Index: linux-rt-devel/arch/powerpc/kvm/book3s_hv.c } } -Index: linux-rt-devel/arch/s390/include/asm/kvm_host.h -=================================================================== ---- linux-rt-devel.orig/arch/s390/include/asm/kvm_host.h -+++ linux-rt-devel/arch/s390/include/asm/kvm_host.h +--- a/arch/s390/include/asm/kvm_host.h ++++ b/arch/s390/include/asm/kvm_host.h @@ -419,7 +419,7 @@ struct kvm_s390_irq_payload { struct kvm_s390_local_interrupt { spinlock_t lock; @@ -196,11 +186,9 @@ Index: linux-rt-devel/arch/s390/include/asm/kvm_host.h atomic_t *cpuflags; DECLARE_BITMAP(sigp_emerg_pending, KVM_MAX_VCPUS); struct kvm_s390_irq_payload irq; -Index: linux-rt-devel/arch/s390/kvm/interrupt.c -=================================================================== ---- linux-rt-devel.orig/arch/s390/kvm/interrupt.c -+++ linux-rt-devel/arch/s390/kvm/interrupt.c -@@ -875,13 +875,13 @@ no_timer: +--- a/arch/s390/kvm/interrupt.c ++++ b/arch/s390/kvm/interrupt.c +@@ -875,13 +875,13 @@ int kvm_s390_handle_wait(struct kvm_vcpu void kvm_s390_vcpu_wakeup(struct kvm_vcpu *vcpu) { @@ -234,10 +222,8 @@ Index: linux-rt-devel/arch/s390/kvm/interrupt.c spin_unlock(&li->lock); return rc; } -Index: linux-rt-devel/arch/x86/kvm/lapic.c -=================================================================== ---- linux-rt-devel.orig/arch/x86/kvm/lapic.c -+++ linux-rt-devel/arch/x86/kvm/lapic.c +--- a/arch/x86/kvm/lapic.c ++++ b/arch/x86/kvm/lapic.c @@ -1104,7 +1104,7 @@ static void apic_update_lvtt(struct kvm_ static void apic_timer_expired(struct kvm_lapic *apic) { @@ -258,10 +244,8 @@ Index: linux-rt-devel/arch/x86/kvm/lapic.c if (apic_lvtt_tscdeadline(apic)) ktimer->expired_tscdeadline = ktimer->tscdeadline; -Index: linux-rt-devel/include/linux/kvm_host.h -=================================================================== ---- linux-rt-devel.orig/include/linux/kvm_host.h -+++ linux-rt-devel/include/linux/kvm_host.h +--- a/include/linux/kvm_host.h ++++ b/include/linux/kvm_host.h @@ -230,7 +230,7 @@ struct kvm_vcpu { int fpu_active; @@ -280,10 +264,8 @@ Index: linux-rt-devel/include/linux/kvm_host.h { #ifdef __KVM_HAVE_ARCH_WQP return vcpu->arch.wqp; -Index: linux-rt-devel/virt/kvm/async_pf.c -=================================================================== ---- linux-rt-devel.orig/virt/kvm/async_pf.c -+++ linux-rt-devel/virt/kvm/async_pf.c +--- a/virt/kvm/async_pf.c ++++ b/virt/kvm/async_pf.c @@ -94,8 +94,8 @@ static void async_pf_execute(struct work trace_kvm_async_pf_completed(addr, gva); @@ -295,10 +277,8 @@ Index: linux-rt-devel/virt/kvm/async_pf.c mmput(mm); kvm_put_kvm(vcpu->kvm); -Index: linux-rt-devel/virt/kvm/kvm_main.c -=================================================================== ---- linux-rt-devel.orig/virt/kvm/kvm_main.c -+++ linux-rt-devel/virt/kvm/kvm_main.c +--- a/virt/kvm/kvm_main.c ++++ b/virt/kvm/kvm_main.c @@ -218,7 +218,7 @@ int kvm_vcpu_init(struct kvm_vcpu *vcpu, vcpu->kvm = kvm; vcpu->vcpu_id = id; diff --git a/patches/acpi-rt-Convert-acpi_gbl_hardware-lock-back-to-a-raw.patch b/patches/acpi-rt-Convert-acpi_gbl_hardware-lock-back-to-a-raw.patch index f99f7505326146..67dbcae408a4df 100644 --- a/patches/acpi-rt-Convert-acpi_gbl_hardware-lock-back-to-a-raw.patch +++ b/patches/acpi-rt-Convert-acpi_gbl_hardware-lock-back-to-a-raw.patch @@ -70,10 +70,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> include/acpi/platform/aclinux.h | 15 +++++++++++++++ 5 files changed, 22 insertions(+), 7 deletions(-) -Index: linux-rt-devel/drivers/acpi/acpica/acglobal.h -=================================================================== ---- linux-rt-devel.orig/drivers/acpi/acpica/acglobal.h -+++ linux-rt-devel/drivers/acpi/acpica/acglobal.h +--- a/drivers/acpi/acpica/acglobal.h ++++ b/drivers/acpi/acpica/acglobal.h @@ -112,7 +112,7 @@ ACPI_GLOBAL(u8, acpi_gbl_global_lock_pen * interrupt level */ @@ -83,10 +81,8 @@ Index: linux-rt-devel/drivers/acpi/acpica/acglobal.h ACPI_GLOBAL(acpi_spinlock, acpi_gbl_reference_count_lock); /* Mutex for _OSI support */ -Index: linux-rt-devel/drivers/acpi/acpica/hwregs.c -=================================================================== ---- linux-rt-devel.orig/drivers/acpi/acpica/hwregs.c -+++ linux-rt-devel/drivers/acpi/acpica/hwregs.c +--- a/drivers/acpi/acpica/hwregs.c ++++ b/drivers/acpi/acpica/hwregs.c @@ -269,14 +269,14 @@ acpi_status acpi_hw_clear_acpi_status(vo ACPI_BITMASK_ALL_FIXED_STATUS, ACPI_FORMAT_UINT64(acpi_gbl_xpm1a_status.address))); @@ -104,10 +100,8 @@ Index: linux-rt-devel/drivers/acpi/acpica/hwregs.c if (ACPI_FAILURE(status)) { goto exit; -Index: linux-rt-devel/drivers/acpi/acpica/hwxface.c -=================================================================== ---- linux-rt-devel.orig/drivers/acpi/acpica/hwxface.c -+++ linux-rt-devel/drivers/acpi/acpica/hwxface.c +--- a/drivers/acpi/acpica/hwxface.c ++++ b/drivers/acpi/acpica/hwxface.c @@ -374,7 +374,7 @@ acpi_status acpi_write_bit_register(u32 return_ACPI_STATUS(AE_BAD_PARAMETER); } @@ -126,10 +120,8 @@ Index: linux-rt-devel/drivers/acpi/acpica/hwxface.c return_ACPI_STATUS(status); } -Index: linux-rt-devel/drivers/acpi/acpica/utmutex.c -=================================================================== ---- linux-rt-devel.orig/drivers/acpi/acpica/utmutex.c -+++ linux-rt-devel/drivers/acpi/acpica/utmutex.c +--- a/drivers/acpi/acpica/utmutex.c ++++ b/drivers/acpi/acpica/utmutex.c @@ -88,7 +88,7 @@ acpi_status acpi_ut_mutex_initialize(voi return_ACPI_STATUS (status); } @@ -148,10 +140,8 @@ Index: linux-rt-devel/drivers/acpi/acpica/utmutex.c acpi_os_delete_lock(acpi_gbl_reference_count_lock); /* Delete the reader/writer lock */ -Index: linux-rt-devel/include/acpi/platform/aclinux.h -=================================================================== ---- linux-rt-devel.orig/include/acpi/platform/aclinux.h -+++ linux-rt-devel/include/acpi/platform/aclinux.h +--- a/include/acpi/platform/aclinux.h ++++ b/include/acpi/platform/aclinux.h @@ -123,6 +123,7 @@ #define acpi_cache_t struct kmem_cache diff --git a/patches/arch-arm64-Add-lazy-preempt-support.patch b/patches/arch-arm64-Add-lazy-preempt-support.patch index a4768cad9a69e8..de7aa8b52aad81 100644 --- a/patches/arch-arm64-Add-lazy-preempt-support.patch +++ b/patches/arch-arm64-Add-lazy-preempt-support.patch @@ -17,10 +17,8 @@ Signed-off-by: Anders Roxell <anders.roxell@linaro.org> arch/arm64/kernel/entry.S | 13 ++++++++++--- 4 files changed, 15 insertions(+), 3 deletions(-) -Index: linux-rt-devel/arch/arm64/Kconfig -=================================================================== ---- linux-rt-devel.orig/arch/arm64/Kconfig -+++ linux-rt-devel/arch/arm64/Kconfig +--- a/arch/arm64/Kconfig ++++ b/arch/arm64/Kconfig @@ -69,6 +69,7 @@ config ARM64 select HAVE_PERF_REGS select HAVE_PERF_USER_STACK_DUMP @@ -29,10 +27,8 @@ Index: linux-rt-devel/arch/arm64/Kconfig select HAVE_SYSCALL_TRACEPOINTS select IRQ_DOMAIN select IRQ_FORCED_THREADING -Index: linux-rt-devel/arch/arm64/include/asm/thread_info.h -=================================================================== ---- linux-rt-devel.orig/arch/arm64/include/asm/thread_info.h -+++ linux-rt-devel/arch/arm64/include/asm/thread_info.h +--- a/arch/arm64/include/asm/thread_info.h ++++ b/arch/arm64/include/asm/thread_info.h @@ -47,6 +47,7 @@ struct thread_info { mm_segment_t addr_limit; /* address limit */ struct task_struct *task; /* main task structure */ @@ -57,10 +53,8 @@ Index: linux-rt-devel/arch/arm64/include/asm/thread_info.h #define _TIF_NOHZ (1 << TIF_NOHZ) #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE) #define _TIF_SYSCALL_AUDIT (1 << TIF_SYSCALL_AUDIT) -Index: linux-rt-devel/arch/arm64/kernel/asm-offsets.c -=================================================================== ---- linux-rt-devel.orig/arch/arm64/kernel/asm-offsets.c -+++ linux-rt-devel/arch/arm64/kernel/asm-offsets.c +--- a/arch/arm64/kernel/asm-offsets.c ++++ b/arch/arm64/kernel/asm-offsets.c @@ -35,6 +35,7 @@ int main(void) BLANK(); DEFINE(TI_FLAGS, offsetof(struct thread_info, flags)); @@ -69,11 +63,9 @@ Index: linux-rt-devel/arch/arm64/kernel/asm-offsets.c 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)); -Index: linux-rt-devel/arch/arm64/kernel/entry.S -=================================================================== ---- linux-rt-devel.orig/arch/arm64/kernel/entry.S -+++ linux-rt-devel/arch/arm64/kernel/entry.S -@@ -367,11 +367,16 @@ el1_irq: +--- a/arch/arm64/kernel/entry.S ++++ b/arch/arm64/kernel/entry.S +@@ -367,11 +367,16 @@ ENDPROC(el1_sync) #ifdef CONFIG_PREEMPT get_thread_info tsk ldr w24, [tsk, #TI_PREEMPT] // get preempt count @@ -93,7 +85,7 @@ Index: linux-rt-devel/arch/arm64/kernel/entry.S #endif #ifdef CONFIG_TRACE_IRQFLAGS bl trace_hardirqs_on -@@ -385,6 +390,7 @@ el1_preempt: +@@ -385,6 +390,7 @@ ENDPROC(el1_irq) 1: bl preempt_schedule_irq // irq en/disable is done inside ldr x0, [tsk, #TI_FLAGS] // get new tasks TI_FLAGS tbnz x0, #TIF_NEED_RESCHED, 1b // needs rescheduling? @@ -101,7 +93,7 @@ Index: linux-rt-devel/arch/arm64/kernel/entry.S ret x24 #endif -@@ -622,6 +628,7 @@ fast_work_pending: +@@ -622,6 +628,7 @@ ENDPROC(cpu_switch_to) str x0, [sp, #S_X0] // returned x0 work_pending: tbnz x1, #TIF_NEED_RESCHED, work_resched diff --git a/patches/arm-at91-pit-remove-irq-handler-when-clock-is-unused.patch b/patches/arm-at91-pit-remove-irq-handler-when-clock-is-unused.patch index 97fb3688ff47d5..7cf425a86288c7 100644 --- a/patches/arm-at91-pit-remove-irq-handler-when-clock-is-unused.patch +++ b/patches/arm-at91-pit-remove-irq-handler-when-clock-is-unused.patch @@ -17,10 +17,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> drivers/clocksource/timer-atmel-st.c | 1 + 2 files changed, 5 insertions(+) -Index: linux-rt-devel/drivers/clocksource/timer-atmel-pit.c -=================================================================== ---- linux-rt-devel.orig/drivers/clocksource/timer-atmel-pit.c -+++ linux-rt-devel/drivers/clocksource/timer-atmel-pit.c +--- a/drivers/clocksource/timer-atmel-pit.c ++++ b/drivers/clocksource/timer-atmel-pit.c @@ -90,6 +90,7 @@ static cycle_t read_pit_clk(struct clock return elapsed; } @@ -46,10 +44,8 @@ Index: linux-rt-devel/drivers/clocksource/timer-atmel-pit.c break; case CLOCK_EVT_MODE_RESUME: break; -Index: linux-rt-devel/drivers/clocksource/timer-atmel-st.c -=================================================================== ---- linux-rt-devel.orig/drivers/clocksource/timer-atmel-st.c -+++ linux-rt-devel/drivers/clocksource/timer-atmel-st.c +--- a/drivers/clocksource/timer-atmel-st.c ++++ b/drivers/clocksource/timer-atmel-st.c @@ -131,6 +131,7 @@ clkevt32k_mode(enum clock_event_mode mod break; case CLOCK_EVT_MODE_SHUTDOWN: diff --git a/patches/arm-at91-tclib-default-to-tclib-timer-for-rt.patch b/patches/arm-at91-tclib-default-to-tclib-timer-for-rt.patch index 8433248989228e..f81c2037b22e4b 100644 --- a/patches/arm-at91-tclib-default-to-tclib-timer-for-rt.patch +++ b/patches/arm-at91-tclib-default-to-tclib-timer-for-rt.patch @@ -11,10 +11,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> drivers/misc/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -Index: linux-rt-devel/drivers/misc/Kconfig -=================================================================== ---- linux-rt-devel.orig/drivers/misc/Kconfig -+++ linux-rt-devel/drivers/misc/Kconfig +--- a/drivers/misc/Kconfig ++++ b/drivers/misc/Kconfig @@ -54,6 +54,7 @@ config AD525X_DPOT_SPI config ATMEL_TCLIB bool "Atmel AT32/AT91 Timer/Counter Library" diff --git a/patches/arm-convert-boot-lock-to-raw.patch b/patches/arm-convert-boot-lock-to-raw.patch index 4130a49b7bc509..aa79108db45fe6 100644 --- a/patches/arm-convert-boot-lock-to-raw.patch +++ b/patches/arm-convert-boot-lock-to-raw.patch @@ -30,10 +30,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> arch/arm/plat-versatile/platsmp.c | 10 +++++----- 9 files changed, 54 insertions(+), 54 deletions(-) -Index: linux-rt-devel/arch/arm/mach-exynos/platsmp.c -=================================================================== ---- linux-rt-devel.orig/arch/arm/mach-exynos/platsmp.c -+++ linux-rt-devel/arch/arm/mach-exynos/platsmp.c +--- a/arch/arm/mach-exynos/platsmp.c ++++ b/arch/arm/mach-exynos/platsmp.c @@ -231,7 +231,7 @@ static void __iomem *scu_base_addr(void) return (void __iomem *)(S5P_VA_SCU); } @@ -81,10 +79,8 @@ Index: linux-rt-devel/arch/arm/mach-exynos/platsmp.c return pen_release != -1 ? ret : 0; } -Index: linux-rt-devel/arch/arm/mach-hisi/platmcpm.c -=================================================================== ---- linux-rt-devel.orig/arch/arm/mach-hisi/platmcpm.c -+++ linux-rt-devel/arch/arm/mach-hisi/platmcpm.c +--- a/arch/arm/mach-hisi/platmcpm.c ++++ b/arch/arm/mach-hisi/platmcpm.c @@ -57,7 +57,7 @@ static void __iomem *sysctrl, *fabric; @@ -187,10 +183,8 @@ Index: linux-rt-devel/arch/arm/mach-hisi/platmcpm.c } static void __naked hip04_mcpm_power_up_setup(unsigned int affinity_level) -Index: linux-rt-devel/arch/arm/mach-omap2/omap-smp.c -=================================================================== ---- linux-rt-devel.orig/arch/arm/mach-omap2/omap-smp.c -+++ linux-rt-devel/arch/arm/mach-omap2/omap-smp.c +--- a/arch/arm/mach-omap2/omap-smp.c ++++ b/arch/arm/mach-omap2/omap-smp.c @@ -43,7 +43,7 @@ /* SCU base address */ static void __iomem *scu_base; @@ -229,10 +223,8 @@ Index: linux-rt-devel/arch/arm/mach-omap2/omap-smp.c return 0; } -Index: linux-rt-devel/arch/arm/mach-prima2/platsmp.c -=================================================================== ---- linux-rt-devel.orig/arch/arm/mach-prima2/platsmp.c -+++ linux-rt-devel/arch/arm/mach-prima2/platsmp.c +--- a/arch/arm/mach-prima2/platsmp.c ++++ b/arch/arm/mach-prima2/platsmp.c @@ -22,7 +22,7 @@ static void __iomem *clk_base; @@ -271,10 +263,8 @@ Index: linux-rt-devel/arch/arm/mach-prima2/platsmp.c return pen_release != -1 ? -ENOSYS : 0; } -Index: linux-rt-devel/arch/arm/mach-qcom/platsmp.c -=================================================================== ---- linux-rt-devel.orig/arch/arm/mach-qcom/platsmp.c -+++ linux-rt-devel/arch/arm/mach-qcom/platsmp.c +--- a/arch/arm/mach-qcom/platsmp.c ++++ b/arch/arm/mach-qcom/platsmp.c @@ -46,7 +46,7 @@ extern void secondary_startup_arm(void); @@ -313,10 +303,8 @@ Index: linux-rt-devel/arch/arm/mach-qcom/platsmp.c return ret; } -Index: linux-rt-devel/arch/arm/mach-spear/platsmp.c -=================================================================== ---- linux-rt-devel.orig/arch/arm/mach-spear/platsmp.c -+++ linux-rt-devel/arch/arm/mach-spear/platsmp.c +--- a/arch/arm/mach-spear/platsmp.c ++++ b/arch/arm/mach-spear/platsmp.c @@ -32,7 +32,7 @@ static void write_pen_release(int val) sync_cache_w(&pen_release); } @@ -355,10 +343,8 @@ Index: linux-rt-devel/arch/arm/mach-spear/platsmp.c return pen_release != -1 ? -ENOSYS : 0; } -Index: linux-rt-devel/arch/arm/mach-sti/platsmp.c -=================================================================== ---- linux-rt-devel.orig/arch/arm/mach-sti/platsmp.c -+++ linux-rt-devel/arch/arm/mach-sti/platsmp.c +--- a/arch/arm/mach-sti/platsmp.c ++++ b/arch/arm/mach-sti/platsmp.c @@ -34,7 +34,7 @@ static void write_pen_release(int val) sync_cache_w(&pen_release); } @@ -397,10 +383,8 @@ Index: linux-rt-devel/arch/arm/mach-sti/platsmp.c return pen_release != -1 ? -ENOSYS : 0; } -Index: linux-rt-devel/arch/arm/mach-ux500/platsmp.c -=================================================================== ---- linux-rt-devel.orig/arch/arm/mach-ux500/platsmp.c -+++ linux-rt-devel/arch/arm/mach-ux500/platsmp.c +--- a/arch/arm/mach-ux500/platsmp.c ++++ b/arch/arm/mach-ux500/platsmp.c @@ -51,7 +51,7 @@ static void __iomem *scu_base_addr(void) return NULL; } @@ -439,10 +423,8 @@ Index: linux-rt-devel/arch/arm/mach-ux500/platsmp.c return pen_release != -1 ? -ENOSYS : 0; } -Index: linux-rt-devel/arch/arm/plat-versatile/platsmp.c -=================================================================== ---- linux-rt-devel.orig/arch/arm/plat-versatile/platsmp.c -+++ linux-rt-devel/arch/arm/plat-versatile/platsmp.c +--- a/arch/arm/plat-versatile/platsmp.c ++++ b/arch/arm/plat-versatile/platsmp.c @@ -30,7 +30,7 @@ static void write_pen_release(int val) sync_cache_w(&pen_release); } diff --git a/patches/arm-enable-highmem-for-rt.patch b/patches/arm-enable-highmem-for-rt.patch index f2f6a43237fbc6..fe8d45a62817d2 100644 --- a/patches/arm-enable-highmem-for-rt.patch +++ b/patches/arm-enable-highmem-for-rt.patch @@ -11,10 +11,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> include/linux/highmem.h | 1 3 files changed, 50 insertions(+), 5 deletions(-) -Index: linux-rt-devel/arch/arm/include/asm/switch_to.h -=================================================================== ---- linux-rt-devel.orig/arch/arm/include/asm/switch_to.h -+++ linux-rt-devel/arch/arm/include/asm/switch_to.h +--- a/arch/arm/include/asm/switch_to.h ++++ b/arch/arm/include/asm/switch_to.h @@ -3,6 +3,13 @@ #include <linux/thread_info.h> @@ -37,10 +35,8 @@ Index: linux-rt-devel/arch/arm/include/asm/switch_to.h last = __switch_to(prev,task_thread_info(prev), task_thread_info(next)); \ } while (0) -Index: linux-rt-devel/arch/arm/mm/highmem.c -=================================================================== ---- linux-rt-devel.orig/arch/arm/mm/highmem.c -+++ linux-rt-devel/arch/arm/mm/highmem.c +--- a/arch/arm/mm/highmem.c ++++ b/arch/arm/mm/highmem.c @@ -54,12 +54,13 @@ EXPORT_SYMBOL(kunmap); void *kmap_atomic(struct page *page) @@ -140,10 +136,8 @@ Index: linux-rt-devel/arch/arm/mm/highmem.c + } +} +#endif -Index: linux-rt-devel/include/linux/highmem.h -=================================================================== ---- linux-rt-devel.orig/include/linux/highmem.h -+++ linux-rt-devel/include/linux/highmem.h +--- a/include/linux/highmem.h ++++ b/include/linux/highmem.h @@ -7,6 +7,7 @@ #include <linux/mm.h> #include <linux/uaccess.h> diff --git a/patches/arm-highmem-flush-tlb-on-unmap.patch b/patches/arm-highmem-flush-tlb-on-unmap.patch index 3ec7c15c57b6c2..08e17cab7ea81f 100644 --- a/patches/arm-highmem-flush-tlb-on-unmap.patch +++ b/patches/arm-highmem-flush-tlb-on-unmap.patch @@ -11,10 +11,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> arch/arm/mm/highmem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux-rt-devel/arch/arm/mm/highmem.c -=================================================================== ---- linux-rt-devel.orig/arch/arm/mm/highmem.c -+++ linux-rt-devel/arch/arm/mm/highmem.c +--- a/arch/arm/mm/highmem.c ++++ b/arch/arm/mm/highmem.c @@ -112,10 +112,10 @@ void __kunmap_atomic(void *kvaddr) __cpuc_flush_dcache_area((void *)vaddr, PAGE_SIZE); #ifdef CONFIG_DEBUG_HIGHMEM diff --git a/patches/arm-preempt-lazy-support.patch b/patches/arm-preempt-lazy-support.patch index ddf8ac42353a14..e3d8ca6958dedb 100644 --- a/patches/arm-preempt-lazy-support.patch +++ b/patches/arm-preempt-lazy-support.patch @@ -13,10 +13,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> arch/arm/kernel/signal.c | 3 ++- 5 files changed, 18 insertions(+), 3 deletions(-) -Index: linux-rt-devel/arch/arm/Kconfig -=================================================================== ---- linux-rt-devel.orig/arch/arm/Kconfig -+++ linux-rt-devel/arch/arm/Kconfig +--- a/arch/arm/Kconfig ++++ b/arch/arm/Kconfig @@ -66,6 +66,7 @@ config ARM select HAVE_PERF_EVENTS select HAVE_PERF_REGS @@ -25,10 +23,8 @@ Index: linux-rt-devel/arch/arm/Kconfig select HAVE_RCU_TABLE_FREE if (SMP && ARM_LPAE) select HAVE_REGS_AND_STACK_ACCESS_API select HAVE_SYSCALL_TRACEPOINTS -Index: linux-rt-devel/arch/arm/include/asm/thread_info.h -=================================================================== ---- linux-rt-devel.orig/arch/arm/include/asm/thread_info.h -+++ linux-rt-devel/arch/arm/include/asm/thread_info.h +--- a/arch/arm/include/asm/thread_info.h ++++ b/arch/arm/include/asm/thread_info.h @@ -50,6 +50,7 @@ struct cpu_context_save { struct thread_info { unsigned long flags; /* low level flags */ @@ -53,10 +49,8 @@ Index: linux-rt-devel/arch/arm/include/asm/thread_info.h #define _TIF_UPROBE (1 << TIF_UPROBE) #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE) #define _TIF_SYSCALL_AUDIT (1 << TIF_SYSCALL_AUDIT) -Index: linux-rt-devel/arch/arm/kernel/asm-offsets.c -=================================================================== ---- linux-rt-devel.orig/arch/arm/kernel/asm-offsets.c -+++ linux-rt-devel/arch/arm/kernel/asm-offsets.c +--- a/arch/arm/kernel/asm-offsets.c ++++ b/arch/arm/kernel/asm-offsets.c @@ -65,6 +65,7 @@ int main(void) BLANK(); DEFINE(TI_FLAGS, offsetof(struct thread_info, flags)); @@ -65,11 +59,9 @@ Index: linux-rt-devel/arch/arm/kernel/asm-offsets.c 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)); -Index: linux-rt-devel/arch/arm/kernel/entry-armv.S -=================================================================== ---- linux-rt-devel.orig/arch/arm/kernel/entry-armv.S -+++ linux-rt-devel/arch/arm/kernel/entry-armv.S -@@ -208,11 +208,18 @@ __irq_svc: +--- a/arch/arm/kernel/entry-armv.S ++++ b/arch/arm/kernel/entry-armv.S +@@ -208,11 +208,18 @@ ENDPROC(__dabt_svc) #ifdef CONFIG_PREEMPT get_thread_info tsk ldr r8, [tsk, #TI_PREEMPT] @ get preempt count @@ -90,7 +82,7 @@ Index: linux-rt-devel/arch/arm/kernel/entry-armv.S #endif svc_exit r5, irq = 1 @ return from exception -@@ -227,6 +234,8 @@ svc_preempt: +@@ -227,6 +234,8 @@ ENDPROC(__irq_svc) 1: bl preempt_schedule_irq @ irq en/disable is done inside ldr r0, [tsk, #TI_FLAGS] @ get new tasks TI_FLAGS tst r0, #_TIF_NEED_RESCHED @@ -99,11 +91,9 @@ Index: linux-rt-devel/arch/arm/kernel/entry-armv.S reteq r8 @ go again b 1b #endif -Index: linux-rt-devel/arch/arm/kernel/signal.c -=================================================================== ---- linux-rt-devel.orig/arch/arm/kernel/signal.c -+++ linux-rt-devel/arch/arm/kernel/signal.c -@@ -563,7 +563,8 @@ asmlinkage int +--- a/arch/arm/kernel/signal.c ++++ b/arch/arm/kernel/signal.c +@@ -568,7 +568,8 @@ asmlinkage int do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall) { do { diff --git a/patches/arm-unwind-use_raw_lock.patch b/patches/arm-unwind-use_raw_lock.patch index 315d5ccb15eb30..9c10dd91c29535 100644 --- a/patches/arm-unwind-use_raw_lock.patch +++ b/patches/arm-unwind-use_raw_lock.patch @@ -28,10 +28,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> arch/arm/kernel/unwind.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) -Index: linux-rt-devel/arch/arm/kernel/unwind.c -=================================================================== ---- linux-rt-devel.orig/arch/arm/kernel/unwind.c -+++ linux-rt-devel/arch/arm/kernel/unwind.c +--- a/arch/arm/kernel/unwind.c ++++ b/arch/arm/kernel/unwind.c @@ -93,7 +93,7 @@ extern const struct unwind_idx __start_u static const struct unwind_idx *__origin_unwind_idx; extern const struct unwind_idx __stop_unwind_idx[]; diff --git a/patches/arm64-convert-patch_lock-to-raw-lock.patch b/patches/arm64-convert-patch_lock-to-raw-lock.patch index 4cc3e92798771d..5353009407a9d1 100644 --- a/patches/arm64-convert-patch_lock-to-raw-lock.patch +++ b/patches/arm64-convert-patch_lock-to-raw-lock.patch @@ -50,10 +50,8 @@ v1 -> v2: arch/arm64/kernel/insn.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -Index: linux-rt-devel/arch/arm64/kernel/insn.c -=================================================================== ---- linux-rt-devel.orig/arch/arm64/kernel/insn.c -+++ linux-rt-devel/arch/arm64/kernel/insn.c +--- a/arch/arm64/kernel/insn.c ++++ b/arch/arm64/kernel/insn.c @@ -77,7 +77,7 @@ bool __kprobes aarch64_insn_is_nop(u32 i } } diff --git a/patches/arm64-replace-read_lock-to-rcu-lock-in-call_break_hook.patch b/patches/arm64-replace-read_lock-to-rcu-lock-in-call_break_hook.patch index bdf9ce80e1511a..690c0032a64b85 100644 --- a/patches/arm64-replace-read_lock-to-rcu-lock-in-call_break_hook.patch +++ b/patches/arm64-replace-read_lock-to-rcu-lock-in-call_break_hook.patch @@ -50,10 +50,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> arch/arm64/kernel/debug-monitors.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) -Index: linux-rt-devel/arch/arm64/kernel/debug-monitors.c -=================================================================== ---- linux-rt-devel.orig/arch/arm64/kernel/debug-monitors.c -+++ linux-rt-devel/arch/arm64/kernel/debug-monitors.c +--- a/arch/arm64/kernel/debug-monitors.c ++++ b/arch/arm64/kernel/debug-monitors.c @@ -271,20 +271,21 @@ static int single_step_handler(unsigned * Use reader/writer locks instead of plain spinlock. */ diff --git a/patches/arm64-xen--Make-XEN-depend-on-non-rt.patch b/patches/arm64-xen--Make-XEN-depend-on-non-rt.patch index b3b21a4a7960e0..f84454a8a67eea 100644 --- a/patches/arm64-xen--Make-XEN-depend-on-non-rt.patch +++ b/patches/arm64-xen--Make-XEN-depend-on-non-rt.patch @@ -10,10 +10,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> arch/arm64/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux-rt-devel/arch/arm64/Kconfig -=================================================================== ---- linux-rt-devel.orig/arch/arm64/Kconfig -+++ linux-rt-devel/arch/arm64/Kconfig +--- a/arch/arm64/Kconfig ++++ b/arch/arm64/Kconfig @@ -600,7 +600,7 @@ config XEN_DOM0 config XEN diff --git a/patches/ata-disable-interrupts-if-non-rt.patch b/patches/ata-disable-interrupts-if-non-rt.patch index b5cbaee3ef5842..d3cd3c3fd5dfc1 100644 --- a/patches/ata-disable-interrupts-if-non-rt.patch +++ b/patches/ata-disable-interrupts-if-non-rt.patch @@ -12,10 +12,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> drivers/ata/libata-sff.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) -Index: linux-rt-devel/drivers/ata/libata-sff.c -=================================================================== ---- linux-rt-devel.orig/drivers/ata/libata-sff.c -+++ linux-rt-devel/drivers/ata/libata-sff.c +--- a/drivers/ata/libata-sff.c ++++ b/drivers/ata/libata-sff.c @@ -678,9 +678,9 @@ unsigned int ata_sff_data_xfer_noirq(str unsigned long flags; unsigned int consumed; @@ -46,7 +44,7 @@ Index: linux-rt-devel/drivers/ata/libata-sff.c } else { buf = page_address(page); ap->ops->sff_data_xfer(qc->dev, buf + offset, qc->sect_size, -@@ -864,7 +864,7 @@ next_sg: +@@ -864,7 +864,7 @@ static int __atapi_pio_bytes(struct ata_ unsigned long flags; /* FIXME: use bounce buffer */ @@ -55,7 +53,7 @@ Index: linux-rt-devel/drivers/ata/libata-sff.c buf = kmap_atomic(page); /* do the actual data transfer */ -@@ -872,7 +872,7 @@ next_sg: +@@ -872,7 +872,7 @@ static int __atapi_pio_bytes(struct ata_ count, rw); kunmap_atomic(buf); diff --git a/patches/blk-mq-revert-raw-locks-post-pone-notifier-to-POST_D.patchto-POST_D.patch b/patches/blk-mq-revert-raw-locks-post-pone-notifier-to-POST_D.patchto-POST_D.patch index 2abf53c6329e2b..ff11c7c9677b45 100644 --- a/patches/blk-mq-revert-raw-locks-post-pone-notifier-to-POST_D.patchto-POST_D.patch +++ b/patches/blk-mq-revert-raw-locks-post-pone-notifier-to-POST_D.patchto-POST_D.patch @@ -17,10 +17,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> block/blk-mq.c | 2 +- 2 files changed, 11 insertions(+), 8 deletions(-) -Index: linux-rt-devel/block/blk-mq-cpu.c -=================================================================== ---- linux-rt-devel.orig/block/blk-mq-cpu.c -+++ linux-rt-devel/block/blk-mq-cpu.c +--- a/block/blk-mq-cpu.c ++++ b/block/blk-mq-cpu.c @@ -16,7 +16,7 @@ #include "blk-mq.h" @@ -72,10 +70,8 @@ Index: linux-rt-devel/block/blk-mq-cpu.c } void blk_mq_init_cpu_notifier(struct blk_mq_cpu_notifier *notifier, -Index: linux-rt-devel/block/blk-mq.c -=================================================================== ---- linux-rt-devel.orig/block/blk-mq.c -+++ linux-rt-devel/block/blk-mq.c +--- a/block/blk-mq.c ++++ b/block/blk-mq.c @@ -1612,7 +1612,7 @@ static int blk_mq_hctx_notify(void *data { struct blk_mq_hw_ctx *hctx = data; diff --git a/patches/block-blk-mq-use-swait.patch b/patches/block-blk-mq-use-swait.patch index b1aeb16c45f1c0..0792dc7d084490 100644 --- a/patches/block-blk-mq-use-swait.patch +++ b/patches/block-blk-mq-use-swait.patch @@ -43,10 +43,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> include/linux/blkdev.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) -Index: linux-rt-devel/block/blk-core.c -=================================================================== ---- linux-rt-devel.orig/block/blk-core.c -+++ linux-rt-devel/block/blk-core.c +--- a/block/blk-core.c ++++ b/block/blk-core.c @@ -664,7 +664,7 @@ struct request_queue *blk_alloc_queue_no q->bypass_depth = 1; __set_bit(QUEUE_FLAG_BYPASS, &q->queue_flags); @@ -56,10 +54,8 @@ Index: linux-rt-devel/block/blk-core.c if (blkcg_init_queue(q)) goto fail_bdi; -Index: linux-rt-devel/block/blk-mq.c -=================================================================== ---- linux-rt-devel.orig/block/blk-mq.c -+++ linux-rt-devel/block/blk-mq.c +--- a/block/blk-mq.c ++++ b/block/blk-mq.c @@ -88,7 +88,7 @@ static int blk_mq_queue_enter(struct req if (!(gfp & __GFP_WAIT)) return -EBUSY; @@ -105,10 +101,8 @@ Index: linux-rt-devel/block/blk-mq.c } bool blk_mq_can_queue(struct blk_mq_hw_ctx *hctx) -Index: linux-rt-devel/include/linux/blkdev.h -=================================================================== ---- linux-rt-devel.orig/include/linux/blkdev.h -+++ linux-rt-devel/include/linux/blkdev.h +--- a/include/linux/blkdev.h ++++ b/include/linux/blkdev.h @@ -483,7 +483,7 @@ struct request_queue { struct throtl_data *td; #endif diff --git a/patches/block-mq-don-t-complete-requests-via-IPI.patch b/patches/block-mq-don-t-complete-requests-via-IPI.patch index c9f839c05dbad5..7f9f91ff18b706 100644 --- a/patches/block-mq-don-t-complete-requests-via-IPI.patch +++ b/patches/block-mq-don-t-complete-requests-via-IPI.patch @@ -13,10 +13,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> include/linux/blkdev.h | 1 + 4 files changed, 25 insertions(+) -Index: linux-rt-devel/block/blk-core.c -=================================================================== ---- linux-rt-devel.orig/block/blk-core.c -+++ linux-rt-devel/block/blk-core.c +--- a/block/blk-core.c ++++ b/block/blk-core.c @@ -100,6 +100,9 @@ void blk_rq_init(struct request_queue *q INIT_LIST_HEAD(&rq->queuelist); @@ -27,10 +25,8 @@ Index: linux-rt-devel/block/blk-core.c rq->cpu = -1; rq->q = q; rq->__sector = (sector_t) -1; -Index: linux-rt-devel/block/blk-mq.c -=================================================================== ---- linux-rt-devel.orig/block/blk-mq.c -+++ linux-rt-devel/block/blk-mq.c +--- a/block/blk-mq.c ++++ b/block/blk-mq.c @@ -217,6 +217,9 @@ static void blk_mq_rq_ctx_init(struct re rq->resid_len = 0; rq->sense = NULL; @@ -83,10 +79,8 @@ Index: linux-rt-devel/block/blk-mq.c } else { rq->q->softirq_done_fn(rq); } -Index: linux-rt-devel/include/linux/blk-mq.h -=================================================================== ---- linux-rt-devel.orig/include/linux/blk-mq.h -+++ linux-rt-devel/include/linux/blk-mq.h +--- a/include/linux/blk-mq.h ++++ b/include/linux/blk-mq.h @@ -202,6 +202,7 @@ static inline u16 blk_mq_unique_tag_to_t struct blk_mq_hw_ctx *blk_mq_map_queue(struct request_queue *, const int ctx_index); @@ -95,10 +89,8 @@ Index: linux-rt-devel/include/linux/blk-mq.h int blk_mq_request_started(struct request *rq); void blk_mq_start_request(struct request *rq); -Index: linux-rt-devel/include/linux/blkdev.h -=================================================================== ---- linux-rt-devel.orig/include/linux/blkdev.h -+++ linux-rt-devel/include/linux/blkdev.h +--- a/include/linux/blkdev.h ++++ b/include/linux/blkdev.h @@ -101,6 +101,7 @@ struct request { struct list_head queuelist; union { diff --git a/patches/block-mq-drop-per-ctx-cpu_lock.patch b/patches/block-mq-drop-per-ctx-cpu_lock.patch index 01355f0c677f18..66cea706d8f54f 100644 --- a/patches/block-mq-drop-per-ctx-cpu_lock.patch +++ b/patches/block-mq-drop-per-ctx-cpu_lock.patch @@ -61,10 +61,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> block/blk-mq.h | 8 -------- 2 files changed, 12 deletions(-) -Index: linux-rt-devel/block/blk-mq.c -=================================================================== ---- linux-rt-devel.orig/block/blk-mq.c -+++ linux-rt-devel/block/blk-mq.c +--- a/block/blk-mq.c ++++ b/block/blk-mq.c @@ -1386,9 +1386,7 @@ static void blk_sq_make_request(struct r if (list_empty(&plug->mq_list)) trace_block_plug(q); @@ -91,10 +89,8 @@ Index: linux-rt-devel/block/blk-mq.c INIT_LIST_HEAD(&__ctx->rq_list); __ctx->queue = q; -Index: linux-rt-devel/block/blk-mq.h -=================================================================== ---- linux-rt-devel.orig/block/blk-mq.h -+++ linux-rt-devel/block/blk-mq.h +--- a/block/blk-mq.h ++++ b/block/blk-mq.h @@ -9,7 +9,6 @@ struct blk_mq_ctx { struct list_head rq_list; } ____cacheline_aligned_in_smp; diff --git a/patches/block-mq-drop-preempt-disable.patch b/patches/block-mq-drop-preempt-disable.patch index 00da1ef310cb02..3f711e18a55569 100644 --- a/patches/block-mq-drop-preempt-disable.patch +++ b/patches/block-mq-drop-preempt-disable.patch @@ -11,10 +11,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> block/blk-mq.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) -Index: linux-rt-devel/block/blk-mq.c -=================================================================== ---- linux-rt-devel.orig/block/blk-mq.c -+++ linux-rt-devel/block/blk-mq.c +--- a/block/blk-mq.c ++++ b/block/blk-mq.c @@ -364,7 +364,7 @@ static void blk_mq_ipi_complete_request( return; } diff --git a/patches/block-mq-use-cpu_light.patch b/patches/block-mq-use-cpu_light.patch index 68fce632e2c8bb..ac403d37865ad1 100644 --- a/patches/block-mq-use-cpu_light.patch +++ b/patches/block-mq-use-cpu_light.patch @@ -15,10 +15,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> block/blk-mq.h | 17 ++++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) -Index: linux-rt-devel/block/blk-mq.c -=================================================================== ---- linux-rt-devel.orig/block/blk-mq.c -+++ linux-rt-devel/block/blk-mq.c +--- a/block/blk-mq.c ++++ b/block/blk-mq.c @@ -1366,7 +1366,9 @@ static void blk_sq_make_request(struct r if (list_empty(&plug->mq_list)) trace_block_plug(q); @@ -45,10 +43,8 @@ Index: linux-rt-devel/block/blk-mq.c INIT_LIST_HEAD(&__ctx->rq_list); __ctx->queue = q; -Index: linux-rt-devel/block/blk-mq.h -=================================================================== ---- linux-rt-devel.orig/block/blk-mq.h -+++ linux-rt-devel/block/blk-mq.h +--- a/block/blk-mq.h ++++ b/block/blk-mq.h @@ -9,6 +9,7 @@ struct blk_mq_ctx { struct list_head rq_list; } ____cacheline_aligned_in_smp; diff --git a/patches/block-shorten-interrupt-disabled-regions.patch b/patches/block-shorten-interrupt-disabled-regions.patch index 2c52334d175daf..c849c258d15c2b 100644 --- a/patches/block-shorten-interrupt-disabled-regions.patch +++ b/patches/block-shorten-interrupt-disabled-regions.patch @@ -45,10 +45,8 @@ Link: http://lkml.kernel.org/r/20110622174919.025446432@linutronix.de block/blk-core.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) -Index: linux-rt-devel/block/blk-core.c -=================================================================== ---- linux-rt-devel.orig/block/blk-core.c -+++ linux-rt-devel/block/blk-core.c +--- a/block/blk-core.c ++++ b/block/blk-core.c @@ -3077,7 +3077,7 @@ static void queue_unplugged(struct reque blk_run_queue_async(q); else diff --git a/patches/block-use-cpu-chill.patch b/patches/block-use-cpu-chill.patch index 6ede0db20902c3..47fb1412057e2f 100644 --- a/patches/block-use-cpu-chill.patch +++ b/patches/block-use-cpu-chill.patch @@ -15,10 +15,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> block/blk-ioc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -Index: linux-rt-devel/block/blk-ioc.c -=================================================================== ---- linux-rt-devel.orig/block/blk-ioc.c -+++ linux-rt-devel/block/blk-ioc.c +--- a/block/blk-ioc.c ++++ b/block/blk-ioc.c @@ -7,6 +7,7 @@ #include <linux/bio.h> #include <linux/blkdev.h> @@ -36,7 +34,7 @@ Index: linux-rt-devel/block/blk-ioc.c spin_lock_irqsave_nested(&ioc->lock, flags, 1); } } -@@ -187,7 +188,7 @@ retry: +@@ -187,7 +188,7 @@ void put_io_context_active(struct io_con spin_unlock(icq->q->queue_lock); } else { spin_unlock_irqrestore(&ioc->lock, flags); diff --git a/patches/bpf-convert-hashtab-lock-to-raw-lock.patch b/patches/bpf-convert-hashtab-lock-to-raw-lock.patch index 615f26872e7c48..719ffe4f5504c0 100644 --- a/patches/bpf-convert-hashtab-lock-to-raw-lock.patch +++ b/patches/bpf-convert-hashtab-lock-to-raw-lock.patch @@ -48,11 +48,9 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- This patch is applicable to mainline kernel too. - kernel/bpf/hashtab.c | 14 +++++++------- + kernel/bpf/hashtab.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) -diff --git a/kernel/bpf/hashtab.c b/kernel/bpf/hashtab.c -index 83c209d..972b76b 100644 --- a/kernel/bpf/hashtab.c +++ b/kernel/bpf/hashtab.c @@ -17,7 +17,7 @@ @@ -64,7 +62,7 @@ index 83c209d..972b76b 100644 u32 count; /* number of elements in this hashtable */ u32 n_buckets; /* number of hash buckets */ u32 elem_size; /* size of each element in bytes */ -@@ -82,7 +82,7 @@ static struct bpf_map *htab_map_alloc(union bpf_attr *attr) +@@ -82,7 +82,7 @@ static struct bpf_map *htab_map_alloc(un for (i = 0; i < htab->n_buckets; i++) INIT_HLIST_HEAD(&htab->buckets[i]); @@ -73,7 +71,7 @@ index 83c209d..972b76b 100644 htab->count = 0; htab->elem_size = sizeof(struct htab_elem) + -@@ -230,7 +230,7 @@ static int htab_map_update_elem(struct bpf_map *map, void *key, void *value, +@@ -230,7 +230,7 @@ static int htab_map_update_elem(struct b l_new->hash = htab_map_hash(l_new->key, key_size); /* bpf_map_update_elem() can be called in_irq() */ @@ -82,7 +80,7 @@ index 83c209d..972b76b 100644 head = select_bucket(htab, l_new->hash); -@@ -266,11 +266,11 @@ static int htab_map_update_elem(struct bpf_map *map, void *key, void *value, +@@ -266,11 +266,11 @@ static int htab_map_update_elem(struct b } else { htab->count++; } @@ -96,7 +94,7 @@ index 83c209d..972b76b 100644 kfree(l_new); return ret; } -@@ -291,7 +291,7 @@ static int htab_map_delete_elem(struct bpf_map *map, void *key) +@@ -291,7 +291,7 @@ static int htab_map_delete_elem(struct b hash = htab_map_hash(key, key_size); @@ -105,7 +103,7 @@ index 83c209d..972b76b 100644 head = select_bucket(htab, hash); -@@ -304,7 +304,7 @@ static int htab_map_delete_elem(struct bpf_map *map, void *key) +@@ -304,7 +304,7 @@ static int htab_map_delete_elem(struct b ret = 0; } @@ -114,12 +112,3 @@ index 83c209d..972b76b 100644 return ret; } --- -2.0.2 - --- -To unsubscribe from this list: send the line "unsubscribe linux-rt-users" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html - - diff --git a/patches/bug-rt-dependend-variants.patch b/patches/bug-rt-dependend-variants.patch index 278343fd6b9072..85d0be51e82cdb 100644 --- a/patches/bug-rt-dependend-variants.patch +++ b/patches/bug-rt-dependend-variants.patch @@ -11,10 +11,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> include/asm-generic/bug.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) -Index: linux-rt-devel/include/asm-generic/bug.h -=================================================================== ---- linux-rt-devel.orig/include/asm-generic/bug.h -+++ linux-rt-devel/include/asm-generic/bug.h +--- a/include/asm-generic/bug.h ++++ b/include/asm-generic/bug.h @@ -206,6 +206,20 @@ extern void warn_slowpath_null(const cha # define WARN_ON_SMP(x) ({0;}) #endif diff --git a/patches/cgroups-scheduling-while-atomic-in-cgroup-code.patch b/patches/cgroups-scheduling-while-atomic-in-cgroup-code.patch index 3f8b282c2e68c5..eb6fa606628278 100644 --- a/patches/cgroups-scheduling-while-atomic-in-cgroup-code.patch +++ b/patches/cgroups-scheduling-while-atomic-in-cgroup-code.patch @@ -40,10 +40,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> mm/memcontrol.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) -Index: linux-rt-devel/mm/memcontrol.c -=================================================================== ---- linux-rt-devel.orig/mm/memcontrol.c -+++ linux-rt-devel/mm/memcontrol.c +--- a/mm/memcontrol.c ++++ b/mm/memcontrol.c @@ -2127,14 +2127,17 @@ static void drain_local_stock(struct wor */ static void refill_stock(struct mem_cgroup *memcg, unsigned int nr_pages) diff --git a/patches/cgroups-use-simple-wait-in-css_release.patch b/patches/cgroups-use-simple-wait-in-css_release.patch index 09d96bb2d72a9b..2906dbdc8845c5 100644 --- a/patches/cgroups-use-simple-wait-in-css_release.patch +++ b/patches/cgroups-use-simple-wait-in-css_release.patch @@ -32,10 +32,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> kernel/cgroup.c | 9 +++++---- 2 files changed, 7 insertions(+), 4 deletions(-) -Index: linux-rt-devel/include/linux/cgroup.h -=================================================================== ---- linux-rt-devel.orig/include/linux/cgroup.h -+++ linux-rt-devel/include/linux/cgroup.h +--- a/include/linux/cgroup.h ++++ b/include/linux/cgroup.h @@ -22,6 +22,7 @@ #include <linux/seq_file.h> #include <linux/kernfs.h> @@ -52,10 +50,8 @@ Index: linux-rt-devel/include/linux/cgroup.h }; /* bits in struct cgroup_subsys_state flags field */ -Index: linux-rt-devel/kernel/cgroup.c -=================================================================== ---- linux-rt-devel.orig/kernel/cgroup.c -+++ linux-rt-devel/kernel/cgroup.c +--- a/kernel/cgroup.c ++++ b/kernel/cgroup.c @@ -4422,10 +4422,10 @@ static void css_free_rcu_fn(struct rcu_h queue_work(cgroup_destroy_wq, &css->destroy_work); } diff --git a/patches/clocksource-tclib-allow-higher-clockrates.patch b/patches/clocksource-tclib-allow-higher-clockrates.patch index 2e8bf4529fd75c..92c47ba80adb8a 100644 --- a/patches/clocksource-tclib-allow-higher-clockrates.patch +++ b/patches/clocksource-tclib-allow-higher-clockrates.patch @@ -14,10 +14,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> drivers/misc/Kconfig | 12 ++++++++++-- 2 files changed, 32 insertions(+), 17 deletions(-) -Index: linux-rt-devel/drivers/clocksource/tcb_clksrc.c -=================================================================== ---- linux-rt-devel.orig/drivers/clocksource/tcb_clksrc.c -+++ linux-rt-devel/drivers/clocksource/tcb_clksrc.c +--- a/drivers/clocksource/tcb_clksrc.c ++++ b/drivers/clocksource/tcb_clksrc.c @@ -23,8 +23,7 @@ * this 32 bit free-running counter. the second channel is not used. * @@ -132,10 +130,8 @@ Index: linux-rt-devel/drivers/clocksource/tcb_clksrc.c if (ret) goto err_unregister_clksrc; -Index: linux-rt-devel/drivers/misc/Kconfig -=================================================================== ---- linux-rt-devel.orig/drivers/misc/Kconfig -+++ linux-rt-devel/drivers/misc/Kconfig +--- a/drivers/misc/Kconfig ++++ b/drivers/misc/Kconfig @@ -69,8 +69,7 @@ config ATMEL_TCB_CLKSRC are combined to make a single 32-bit timer. diff --git a/patches/completion-use-simple-wait-queues.patch b/patches/completion-use-simple-wait-queues.patch index 466886f690527f..f1ec51e273128b 100644 --- a/patches/completion-use-simple-wait-queues.patch +++ b/patches/completion-use-simple-wait-queues.patch @@ -17,10 +17,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/sched/core.c | 10 +++++++-- 7 files changed, 33 insertions(+), 27 deletions(-) -Index: linux-rt-devel/drivers/net/wireless/orinoco/orinoco_usb.c -=================================================================== ---- linux-rt-devel.orig/drivers/net/wireless/orinoco/orinoco_usb.c -+++ linux-rt-devel/drivers/net/wireless/orinoco/orinoco_usb.c +--- a/drivers/net/wireless/orinoco/orinoco_usb.c ++++ b/drivers/net/wireless/orinoco/orinoco_usb.c @@ -697,7 +697,7 @@ static void ezusb_req_ctx_wait(struct ez while (!ctx->done.done && msecs--) udelay(1000); @@ -30,10 +28,8 @@ Index: linux-rt-devel/drivers/net/wireless/orinoco/orinoco_usb.c ctx->done.done); } break; -Index: linux-rt-devel/drivers/usb/gadget/function/f_fs.c -=================================================================== ---- linux-rt-devel.orig/drivers/usb/gadget/function/f_fs.c -+++ linux-rt-devel/drivers/usb/gadget/function/f_fs.c +--- a/drivers/usb/gadget/function/f_fs.c ++++ b/drivers/usb/gadget/function/f_fs.c @@ -1405,7 +1405,7 @@ static void ffs_data_put(struct ffs_data pr_info("%s(): freeing\n", __func__); ffs_data_clear(ffs); @@ -43,10 +39,8 @@ Index: linux-rt-devel/drivers/usb/gadget/function/f_fs.c kfree(ffs->dev_name); kfree(ffs); } -Index: linux-rt-devel/drivers/usb/gadget/legacy/inode.c -=================================================================== ---- linux-rt-devel.orig/drivers/usb/gadget/legacy/inode.c -+++ linux-rt-devel/drivers/usb/gadget/legacy/inode.c +--- a/drivers/usb/gadget/legacy/inode.c ++++ b/drivers/usb/gadget/legacy/inode.c @@ -345,7 +345,7 @@ ep_io (struct ep_data *epdata, void *buf spin_unlock_irq (&epdata->dev->lock); @@ -65,10 +59,8 @@ Index: linux-rt-devel/drivers/usb/gadget/legacy/inode.c if (epdata->status == -ECONNRESET) epdata->status = -EINTR; } else { -Index: linux-rt-devel/include/linux/completion.h -=================================================================== ---- linux-rt-devel.orig/include/linux/completion.h -+++ linux-rt-devel/include/linux/completion.h +--- a/include/linux/completion.h ++++ b/include/linux/completion.h @@ -7,8 +7,7 @@ * Atomic wait-for-completion handler data structures. * See kernel/sched/completion.c for details. @@ -102,10 +94,8 @@ Index: linux-rt-devel/include/linux/completion.h } /** -Index: linux-rt-devel/include/linux/uprobes.h -=================================================================== ---- linux-rt-devel.orig/include/linux/uprobes.h -+++ linux-rt-devel/include/linux/uprobes.h +--- a/include/linux/uprobes.h ++++ b/include/linux/uprobes.h @@ -27,6 +27,7 @@ #include <linux/errno.h> #include <linux/rbtree.h> @@ -114,10 +104,8 @@ Index: linux-rt-devel/include/linux/uprobes.h struct vm_area_struct; struct mm_struct; -Index: linux-rt-devel/kernel/sched/completion.c -=================================================================== ---- linux-rt-devel.orig/kernel/sched/completion.c -+++ linux-rt-devel/kernel/sched/completion.c +--- a/kernel/sched/completion.c ++++ b/kernel/sched/completion.c @@ -30,10 +30,10 @@ void complete(struct completion *x) { unsigned long flags; @@ -172,7 +160,7 @@ Index: linux-rt-devel/kernel/sched/completion.c if (!x->done) return timeout; } -@@ -89,9 +89,9 @@ __wait_for_common(struct completion *x, +@@ -89,9 +89,9 @@ static inline long __sched { might_sleep(); @@ -208,11 +196,9 @@ Index: linux-rt-devel/kernel/sched/completion.c return true; } EXPORT_SYMBOL(completion_done); -Index: linux-rt-devel/kernel/sched/core.c -=================================================================== ---- linux-rt-devel.orig/kernel/sched/core.c -+++ linux-rt-devel/kernel/sched/core.c -@@ -2802,7 +2802,10 @@ void migrate_disable(void) +--- a/kernel/sched/core.c ++++ b/kernel/sched/core.c +@@ -2809,7 +2809,10 @@ void migrate_disable(void) } #ifdef CONFIG_SCHED_DEBUG @@ -224,7 +210,7 @@ Index: linux-rt-devel/kernel/sched/core.c #endif if (p->migrate_disable) { -@@ -2832,7 +2835,10 @@ void migrate_enable(void) +@@ -2839,7 +2842,10 @@ void migrate_enable(void) } #ifdef CONFIG_SCHED_DEBUG diff --git a/patches/cond-resched-lock-rt-tweak.patch b/patches/cond-resched-lock-rt-tweak.patch index 3aa7dfbf718179..d4e1e9614b4d24 100644 --- a/patches/cond-resched-lock-rt-tweak.patch +++ b/patches/cond-resched-lock-rt-tweak.patch @@ -10,10 +10,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> include/linux/preempt_mask.h | 4 ++++ 1 file changed, 4 insertions(+) -Index: linux-rt-devel/include/linux/preempt_mask.h -=================================================================== ---- linux-rt-devel.orig/include/linux/preempt_mask.h -+++ linux-rt-devel/include/linux/preempt_mask.h +--- a/include/linux/preempt_mask.h ++++ b/include/linux/preempt_mask.h @@ -83,7 +83,11 @@ /* * The preempt_count offset after spin_lock() diff --git a/patches/cond-resched-softirq-rt.patch b/patches/cond-resched-softirq-rt.patch index c7409a2c3b738c..4bb8f75ccfa45d 100644 --- a/patches/cond-resched-softirq-rt.patch +++ b/patches/cond-resched-softirq-rt.patch @@ -13,11 +13,9 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/sched/core.c | 2 ++ 2 files changed, 6 insertions(+) -Index: linux-rt-devel/include/linux/sched.h -=================================================================== ---- linux-rt-devel.orig/include/linux/sched.h -+++ linux-rt-devel/include/linux/sched.h -@@ -2937,12 +2937,16 @@ extern int __cond_resched_lock(spinlock_ +--- a/include/linux/sched.h ++++ b/include/linux/sched.h +@@ -2931,12 +2931,16 @@ extern int __cond_resched_lock(spinlock_ __cond_resched_lock(lock); \ }) @@ -34,11 +32,9 @@ Index: linux-rt-devel/include/linux/sched.h static inline void cond_resched_rcu(void) { -Index: linux-rt-devel/kernel/sched/core.c -=================================================================== ---- linux-rt-devel.orig/kernel/sched/core.c -+++ linux-rt-devel/kernel/sched/core.c -@@ -4479,6 +4479,7 @@ int __cond_resched_lock(spinlock_t *lock +--- a/kernel/sched/core.c ++++ b/kernel/sched/core.c +@@ -4486,6 +4486,7 @@ int __cond_resched_lock(spinlock_t *lock } EXPORT_SYMBOL(__cond_resched_lock); @@ -46,7 +42,7 @@ Index: linux-rt-devel/kernel/sched/core.c int __sched __cond_resched_softirq(void) { BUG_ON(!in_softirq()); -@@ -4492,6 +4493,7 @@ int __sched __cond_resched_softirq(void) +@@ -4499,6 +4500,7 @@ int __sched __cond_resched_softirq(void) return 0; } EXPORT_SYMBOL(__cond_resched_softirq); diff --git a/patches/cpu-hotplug-Document-why-PREEMPT_RT-uses-a-spinlock.patch b/patches/cpu-hotplug-Document-why-PREEMPT_RT-uses-a-spinlock.patch index dc55ba5048735b..5a6e1e5222caff 100644 --- a/patches/cpu-hotplug-Document-why-PREEMPT_RT-uses-a-spinlock.patch +++ b/patches/cpu-hotplug-Document-why-PREEMPT_RT-uses-a-spinlock.patch @@ -36,10 +36,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> kernel/cpu.c | 8 ++++++++ 1 file changed, 8 insertions(+) -Index: linux-rt-devel/kernel/cpu.c -=================================================================== ---- linux-rt-devel.orig/kernel/cpu.c -+++ linux-rt-devel/kernel/cpu.c +--- a/kernel/cpu.c ++++ b/kernel/cpu.c @@ -109,6 +109,14 @@ struct hotplug_pcp { int grab_lock; struct completion synced; diff --git a/patches/cpu-rt-make-hotplug-lock-a-sleeping-spinlock-on-rt.patch b/patches/cpu-rt-make-hotplug-lock-a-sleeping-spinlock-on-rt.patch index 1b29300ed646a6..3ddd623d38dd55 100644 --- a/patches/cpu-rt-make-hotplug-lock-a-sleeping-spinlock-on-rt.patch +++ b/patches/cpu-rt-make-hotplug-lock-a-sleeping-spinlock-on-rt.patch @@ -22,10 +22,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/cpu.c | 38 +++++++++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 9 deletions(-) -Index: linux-rt-devel/kernel/cpu.c -=================================================================== ---- linux-rt-devel.orig/kernel/cpu.c -+++ linux-rt-devel/kernel/cpu.c +--- a/kernel/cpu.c ++++ b/kernel/cpu.c @@ -59,10 +59,16 @@ static int cpu_hotplug_disabled; static struct { @@ -70,7 +68,7 @@ Index: linux-rt-devel/kernel/cpu.c /* Lockdep annotations for get/put_online_cpus() and cpu_hotplug_begin/end() */ #define cpuhp_lock_acquire_read() lock_map_acquire_read(&cpu_hotplug.dep_map) #define cpuhp_lock_acquire_tryread() \ -@@ -117,8 +137,8 @@ retry: +@@ -117,8 +137,8 @@ void pin_current_cpu(void) return; } preempt_enable(); diff --git a/patches/cpu-rt-rework-cpu-down.patch b/patches/cpu-rt-rework-cpu-down.patch index a8faeeaf2a856b..3a06653a12a1f9 100644 --- a/patches/cpu-rt-rework-cpu-down.patch +++ b/patches/cpu-rt-rework-cpu-down.patch @@ -54,10 +54,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/sched/core.c | 82 ++++++++++++++++ 3 files changed, 285 insertions(+), 48 deletions(-) -Index: linux-rt-devel/include/linux/sched.h -=================================================================== ---- linux-rt-devel.orig/include/linux/sched.h -+++ linux-rt-devel/include/linux/sched.h +--- a/include/linux/sched.h ++++ b/include/linux/sched.h @@ -2217,6 +2217,10 @@ extern void do_set_cpus_allowed(struct t extern int set_cpus_allowed_ptr(struct task_struct *p, @@ -79,10 +77,8 @@ Index: linux-rt-devel/include/linux/sched.h #endif #ifdef CONFIG_NO_HZ_COMMON -Index: linux-rt-devel/kernel/cpu.c -=================================================================== ---- linux-rt-devel.orig/kernel/cpu.c -+++ linux-rt-devel/kernel/cpu.c +--- a/kernel/cpu.c ++++ b/kernel/cpu.c @@ -59,16 +59,10 @@ static int cpu_hotplug_disabled; static struct { @@ -458,11 +454,9 @@ Index: linux-rt-devel/kernel/cpu.c /* * So now all preempt/rcu users must observe !cpu_active(). */ -Index: linux-rt-devel/kernel/sched/core.c -=================================================================== ---- linux-rt-devel.orig/kernel/sched/core.c -+++ linux-rt-devel/kernel/sched/core.c -@@ -2754,7 +2754,7 @@ void migrate_disable(void) +--- a/kernel/sched/core.c ++++ b/kernel/sched/core.c +@@ -2761,7 +2761,7 @@ void migrate_disable(void) { struct task_struct *p = current; @@ -471,7 +465,7 @@ Index: linux-rt-devel/kernel/sched/core.c #ifdef CONFIG_SCHED_DEBUG p->migrate_disable_atomic++; #endif -@@ -2787,7 +2787,7 @@ void migrate_enable(void) +@@ -2794,7 +2794,7 @@ void migrate_enable(void) unsigned long flags; struct rq *rq; @@ -480,7 +474,7 @@ Index: linux-rt-devel/kernel/sched/core.c #ifdef CONFIG_SCHED_DEBUG p->migrate_disable_atomic--; #endif -@@ -4960,6 +4960,84 @@ void do_set_cpus_allowed(struct task_str +@@ -4967,6 +4967,84 @@ void do_set_cpus_allowed(struct task_str cpumask_copy(&p->cpus_allowed, new_mask); } diff --git a/patches/cpu_chill-Add-a-UNINTERRUPTIBLE-hrtimer_nanosleep.patch b/patches/cpu_chill-Add-a-UNINTERRUPTIBLE-hrtimer_nanosleep.patch index 87e71be752bce1..edf10aca00f4d9 100644 --- a/patches/cpu_chill-Add-a-UNINTERRUPTIBLE-hrtimer_nanosleep.patch +++ b/patches/cpu_chill-Add-a-UNINTERRUPTIBLE-hrtimer_nanosleep.patch @@ -31,10 +31,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> kernel/time/hrtimer.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) -Index: linux-rt-devel/kernel/time/hrtimer.c -=================================================================== ---- linux-rt-devel.orig/kernel/time/hrtimer.c -+++ linux-rt-devel/kernel/time/hrtimer.c +--- a/kernel/time/hrtimer.c ++++ b/kernel/time/hrtimer.c @@ -1746,12 +1746,13 @@ void hrtimer_init_sleeper(struct hrtimer } EXPORT_SYMBOL_GPL(hrtimer_init_sleeper); @@ -61,7 +59,7 @@ Index: linux-rt-devel/kernel/time/hrtimer.c goto out; rmtp = restart->nanosleep.rmtp; -@@ -1812,8 +1814,10 @@ out: +@@ -1812,8 +1814,10 @@ long __sched hrtimer_nanosleep_restart(s return ret; } @@ -83,7 +81,7 @@ Index: linux-rt-devel/kernel/time/hrtimer.c goto out; /* Absolute timers do not update the rmtp value and restart: */ -@@ -1853,6 +1857,12 @@ out: +@@ -1853,6 +1857,12 @@ long hrtimer_nanosleep(struct timespec * return ret; } diff --git a/patches/cpu_down_move_migrate_enable_back.patch b/patches/cpu_down_move_migrate_enable_back.patch index 047add4d868099..2d39eb47ee972b 100644 --- a/patches/cpu_down_move_migrate_enable_back.patch +++ b/patches/cpu_down_move_migrate_enable_back.patch @@ -32,10 +32,8 @@ Signed-off-by: Tiejun Chen <tiejun.chen@windriver.com> kernel/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux-rt-devel/kernel/cpu.c -=================================================================== ---- linux-rt-devel.orig/kernel/cpu.c -+++ linux-rt-devel/kernel/cpu.c +--- a/kernel/cpu.c ++++ b/kernel/cpu.c @@ -668,6 +668,7 @@ static int __ref _cpu_down(unsigned int err = -EBUSY; goto restore_cpus; diff --git a/patches/cpufreq-Remove-cpufreq_rwsem.patch b/patches/cpufreq-Remove-cpufreq_rwsem.patch index cfa31267fbcc43..434d35083ee035 100644 --- a/patches/cpufreq-Remove-cpufreq_rwsem.patch +++ b/patches/cpufreq-Remove-cpufreq_rwsem.patch @@ -55,10 +55,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> drivers/cpufreq/cpufreq.c | 35 +++-------------------------------- 1 file changed, 3 insertions(+), 32 deletions(-) -Index: linux-rt-devel/drivers/cpufreq/cpufreq.c -=================================================================== ---- linux-rt-devel.orig/drivers/cpufreq/cpufreq.c -+++ linux-rt-devel/drivers/cpufreq/cpufreq.c +--- a/drivers/cpufreq/cpufreq.c ++++ b/drivers/cpufreq/cpufreq.c @@ -64,12 +64,6 @@ static inline bool has_target(void) return cpufreq_driver->target_index || cpufreq_driver->target; } @@ -163,7 +161,7 @@ Index: linux-rt-devel/drivers/cpufreq/cpufreq.c /* Callback for handling stuff after policy is ready */ if (cpufreq_driver->ready) cpufreq_driver->ready(policy); -@@ -1304,8 +1276,6 @@ err_set_policy_cpu: +@@ -1304,8 +1276,6 @@ static int __cpufreq_add_dev(struct devi cpufreq_policy_free(policy); nomem_out: diff --git a/patches/cpufreq-drop-K8-s-driver-from-beeing-selected.patch b/patches/cpufreq-drop-K8-s-driver-from-beeing-selected.patch index ce7477cc2a7520..e3f833c1032e95 100644 --- a/patches/cpufreq-drop-K8-s-driver-from-beeing-selected.patch +++ b/patches/cpufreq-drop-K8-s-driver-from-beeing-selected.patch @@ -19,10 +19,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> drivers/cpufreq/Kconfig.x86 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux-rt-devel/drivers/cpufreq/Kconfig.x86 -=================================================================== ---- linux-rt-devel.orig/drivers/cpufreq/Kconfig.x86 -+++ linux-rt-devel/drivers/cpufreq/Kconfig.x86 +--- a/drivers/cpufreq/Kconfig.x86 ++++ b/drivers/cpufreq/Kconfig.x86 @@ -123,7 +123,7 @@ config X86_POWERNOW_K7_ACPI config X86_POWERNOW_K8 diff --git a/patches/cpumask-disable-offstack-on-rt.patch b/patches/cpumask-disable-offstack-on-rt.patch index 1325c063c1a411..5fcdbbe512f5f4 100644 --- a/patches/cpumask-disable-offstack-on-rt.patch +++ b/patches/cpumask-disable-offstack-on-rt.patch @@ -11,10 +11,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> lib/Kconfig | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) -Index: linux-rt-devel/arch/x86/Kconfig -=================================================================== ---- linux-rt-devel.orig/arch/x86/Kconfig -+++ linux-rt-devel/arch/x86/Kconfig +--- a/arch/x86/Kconfig ++++ b/arch/x86/Kconfig @@ -841,7 +841,7 @@ config IOMMU_HELPER config MAXSMP bool "Enable Maximum number of SMP Processors and NUMA Nodes" @@ -24,10 +22,8 @@ Index: linux-rt-devel/arch/x86/Kconfig ---help--- Enable maximum number of CPUS and NUMA Nodes for this architecture. If unsure, say N. -Index: linux-rt-devel/lib/Kconfig -=================================================================== ---- linux-rt-devel.orig/lib/Kconfig -+++ linux-rt-devel/lib/Kconfig +--- a/lib/Kconfig ++++ b/lib/Kconfig @@ -391,6 +391,7 @@ config CHECK_SIGNATURE config CPUMASK_OFFSTACK diff --git a/patches/crypto-Reduce-preempt-disabled-regions-more-algos.patch b/patches/crypto-Reduce-preempt-disabled-regions-more-algos.patch index 9989984c6b0c2c..52ebb7a3aee1cc 100644 --- a/patches/crypto-Reduce-preempt-disabled-regions-more-algos.patch +++ b/patches/crypto-Reduce-preempt-disabled-regions-more-algos.patch @@ -41,10 +41,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> arch/x86/crypto/glue_helper.c | 31 +++++++++++++++---------------- 2 files changed, 24 insertions(+), 28 deletions(-) -Index: linux-rt-devel/arch/x86/crypto/cast5_avx_glue.c -=================================================================== ---- linux-rt-devel.orig/arch/x86/crypto/cast5_avx_glue.c -+++ linux-rt-devel/arch/x86/crypto/cast5_avx_glue.c +--- a/arch/x86/crypto/cast5_avx_glue.c ++++ b/arch/x86/crypto/cast5_avx_glue.c @@ -60,7 +60,7 @@ static inline void cast5_fpu_end(bool fp static int ecb_crypt(struct blkcipher_desc *desc, struct blkcipher_walk *walk, bool enc) @@ -75,7 +73,7 @@ Index: linux-rt-devel/arch/x86/crypto/cast5_avx_glue.c return err; } -@@ -228,7 +227,7 @@ done: +@@ -228,7 +227,7 @@ static unsigned int __cbc_decrypt(struct static int cbc_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst, struct scatterlist *src, unsigned int nbytes) { @@ -99,7 +97,7 @@ Index: linux-rt-devel/arch/x86/crypto/cast5_avx_glue.c return err; } -@@ -312,7 +310,7 @@ done: +@@ -312,7 +310,7 @@ static unsigned int __ctr_crypt(struct b static int ctr_crypt(struct blkcipher_desc *desc, struct scatterlist *dst, struct scatterlist *src, unsigned int nbytes) { @@ -124,10 +122,8 @@ Index: linux-rt-devel/arch/x86/crypto/cast5_avx_glue.c if (walk.nbytes) { ctr_crypt_final(desc, &walk); err = blkcipher_walk_done(desc, &walk, 0); -Index: linux-rt-devel/arch/x86/crypto/glue_helper.c -=================================================================== ---- linux-rt-devel.orig/arch/x86/crypto/glue_helper.c -+++ linux-rt-devel/arch/x86/crypto/glue_helper.c +--- a/arch/x86/crypto/glue_helper.c ++++ b/arch/x86/crypto/glue_helper.c @@ -39,7 +39,7 @@ static int __glue_ecb_crypt_128bit(const void *ctx = crypto_blkcipher_ctx(desc->tfm); const unsigned int bsize = 128 / 8; diff --git a/patches/debugobjects-rt.patch b/patches/debugobjects-rt.patch index 4ea1ba49b29663..5a35a8eb17f096 100644 --- a/patches/debugobjects-rt.patch +++ b/patches/debugobjects-rt.patch @@ -9,11 +9,9 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> lib/debugobjects.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -Index: linux-rt-devel/lib/debugobjects.c -=================================================================== ---- linux-rt-devel.orig/lib/debugobjects.c -+++ linux-rt-devel/lib/debugobjects.c -@@ -309,7 +309,10 @@ __debug_object_init(void *addr, struct d +--- a/lib/debugobjects.c ++++ b/lib/debugobjects.c +@@ -309,7 +309,10 @@ static void struct debug_obj *obj; unsigned long flags; diff --git a/patches/dm-make-rt-aware.patch b/patches/dm-make-rt-aware.patch index 19780b5762a058..fb6eccbc040c75 100644 --- a/patches/dm-make-rt-aware.patch +++ b/patches/dm-make-rt-aware.patch @@ -13,10 +13,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> drivers/md/dm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux-rt-devel/drivers/md/dm.c -=================================================================== ---- linux-rt-devel.orig/drivers/md/dm.c -+++ linux-rt-devel/drivers/md/dm.c +--- a/drivers/md/dm.c ++++ b/drivers/md/dm.c @@ -2132,7 +2132,7 @@ static void dm_request_fn(struct request /* Establish tio->ti before queuing work (map_tio_request) */ tio->ti = ti; diff --git a/patches/drivers-net-8139-disable-irq-nosync.patch b/patches/drivers-net-8139-disable-irq-nosync.patch index 1871eb9a0cd2a7..fd12422bc784eb 100644 --- a/patches/drivers-net-8139-disable-irq-nosync.patch +++ b/patches/drivers-net-8139-disable-irq-nosync.patch @@ -12,10 +12,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> drivers/net/ethernet/realtek/8139too.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux-rt-devel/drivers/net/ethernet/realtek/8139too.c -=================================================================== ---- linux-rt-devel.orig/drivers/net/ethernet/realtek/8139too.c -+++ linux-rt-devel/drivers/net/ethernet/realtek/8139too.c +--- a/drivers/net/ethernet/realtek/8139too.c ++++ b/drivers/net/ethernet/realtek/8139too.c @@ -2229,7 +2229,7 @@ static void rtl8139_poll_controller(stru struct rtl8139_private *tp = netdev_priv(dev); const int irq = tp->pci_dev->irq; diff --git a/patches/drivers-net-fix-livelock-issues.patch b/patches/drivers-net-fix-livelock-issues.patch index 73382e2508bf56..21af2b1b04a08b 100644 --- a/patches/drivers-net-fix-livelock-issues.patch +++ b/patches/drivers-net-fix-livelock-issues.patch @@ -21,10 +21,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> drivers/net/rionet.c | 6 +----- 7 files changed, 9 insertions(+), 31 deletions(-) -Index: linux-rt-devel/drivers/net/ethernet/atheros/atl1c/atl1c_main.c -=================================================================== ---- linux-rt-devel.orig/drivers/net/ethernet/atheros/atl1c/atl1c_main.c -+++ linux-rt-devel/drivers/net/ethernet/atheros/atl1c/atl1c_main.c +--- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c ++++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c @@ -2213,11 +2213,7 @@ static netdev_tx_t atl1c_xmit_frame(stru } @@ -38,10 +36,8 @@ Index: linux-rt-devel/drivers/net/ethernet/atheros/atl1c/atl1c_main.c if (atl1c_tpd_avail(adapter, type) < tpd_req) { /* no enough descriptor, just stop queue */ -Index: linux-rt-devel/drivers/net/ethernet/atheros/atl1e/atl1e_main.c -=================================================================== ---- linux-rt-devel.orig/drivers/net/ethernet/atheros/atl1e/atl1e_main.c -+++ linux-rt-devel/drivers/net/ethernet/atheros/atl1e/atl1e_main.c +--- a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c ++++ b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c @@ -1880,8 +1880,7 @@ static netdev_tx_t atl1e_xmit_frame(stru return NETDEV_TX_OK; } @@ -52,10 +48,8 @@ Index: linux-rt-devel/drivers/net/ethernet/atheros/atl1e/atl1e_main.c if (atl1e_tpd_avail(adapter) < tpd_req) { /* no enough descriptor, just stop queue */ -Index: linux-rt-devel/drivers/net/ethernet/chelsio/cxgb/sge.c -=================================================================== ---- linux-rt-devel.orig/drivers/net/ethernet/chelsio/cxgb/sge.c -+++ linux-rt-devel/drivers/net/ethernet/chelsio/cxgb/sge.c +--- a/drivers/net/ethernet/chelsio/cxgb/sge.c ++++ b/drivers/net/ethernet/chelsio/cxgb/sge.c @@ -1664,8 +1664,7 @@ static int t1_sge_tx(struct sk_buff *skb struct cmdQ *q = &sge->cmdQ[qid]; unsigned int credits, pidx, genbit, count, use_sched_skb = 0; @@ -66,10 +60,8 @@ Index: linux-rt-devel/drivers/net/ethernet/chelsio/cxgb/sge.c reclaim_completed_tx(sge, q); -Index: linux-rt-devel/drivers/net/ethernet/neterion/s2io.c -=================================================================== ---- linux-rt-devel.orig/drivers/net/ethernet/neterion/s2io.c -+++ linux-rt-devel/drivers/net/ethernet/neterion/s2io.c +--- a/drivers/net/ethernet/neterion/s2io.c ++++ b/drivers/net/ethernet/neterion/s2io.c @@ -4084,12 +4084,7 @@ static netdev_tx_t s2io_xmit(struct sk_b [skb->priority & (MAX_TX_FIFOS - 1)]; fifo = &mac_control->fifos[queue]; @@ -84,10 +76,8 @@ Index: linux-rt-devel/drivers/net/ethernet/neterion/s2io.c if (sp->config.multiq) { if (__netif_subqueue_stopped(dev, fifo->fifo_no)) { -Index: linux-rt-devel/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c -=================================================================== ---- linux-rt-devel.orig/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c -+++ linux-rt-devel/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c +--- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c ++++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c @@ -2137,10 +2137,8 @@ static int pch_gbe_xmit_frame(struct sk_ struct pch_gbe_tx_ring *tx_ring = adapter->tx_ring; unsigned long flags; @@ -101,10 +91,8 @@ Index: linux-rt-devel/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); -Index: linux-rt-devel/drivers/net/ethernet/tehuti/tehuti.c -=================================================================== ---- linux-rt-devel.orig/drivers/net/ethernet/tehuti/tehuti.c -+++ linux-rt-devel/drivers/net/ethernet/tehuti/tehuti.c +--- a/drivers/net/ethernet/tehuti/tehuti.c ++++ b/drivers/net/ethernet/tehuti/tehuti.c @@ -1629,13 +1629,8 @@ static netdev_tx_t bdx_tx_transmit(struc unsigned long flags; @@ -121,10 +109,8 @@ Index: linux-rt-devel/drivers/net/ethernet/tehuti/tehuti.c /* build tx descriptor */ BDX_ASSERT(f->m.wptr >= f->m.memsz); /* started with valid wptr */ -Index: linux-rt-devel/drivers/net/rionet.c -=================================================================== ---- linux-rt-devel.orig/drivers/net/rionet.c -+++ linux-rt-devel/drivers/net/rionet.c +--- a/drivers/net/rionet.c ++++ b/drivers/net/rionet.c @@ -174,11 +174,7 @@ static int rionet_start_xmit(struct sk_b unsigned long flags; int add_num = 1; diff --git a/patches/drivers-net-vortex-fix-locking-issues.patch b/patches/drivers-net-vortex-fix-locking-issues.patch index d84f49c76efea0..0c6dde7e2729a3 100644 --- a/patches/drivers-net-vortex-fix-locking-issues.patch +++ b/patches/drivers-net-vortex-fix-locking-issues.patch @@ -17,10 +17,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu> -Index: linux-rt-devel/drivers/net/ethernet/3com/3c59x.c -=================================================================== ---- linux-rt-devel.orig/drivers/net/ethernet/3com/3c59x.c -+++ linux-rt-devel/drivers/net/ethernet/3com/3c59x.c +--- a/drivers/net/ethernet/3com/3c59x.c ++++ b/drivers/net/ethernet/3com/3c59x.c @@ -842,9 +842,9 @@ static void poll_vortex(struct net_devic { struct vortex_private *vp = netdev_priv(dev); diff --git a/patches/drivers-random-reduce-preempt-disabled-region.patch b/patches/drivers-random-reduce-preempt-disabled-region.patch index 86b5ff7b3f8961..31078915df1289 100644 --- a/patches/drivers-random-reduce-preempt-disabled-region.patch +++ b/patches/drivers-random-reduce-preempt-disabled-region.patch @@ -11,10 +11,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> drivers/char/random.c | 3 --- 1 file changed, 3 deletions(-) -Index: linux-rt-devel/drivers/char/random.c -=================================================================== ---- linux-rt-devel.orig/drivers/char/random.c -+++ linux-rt-devel/drivers/char/random.c +--- a/drivers/char/random.c ++++ b/drivers/char/random.c @@ -776,8 +776,6 @@ static void add_timer_randomness(struct } sample; long delta, delta2, delta3; diff --git a/patches/drivers-tty-fix-omap-lock-crap.patch b/patches/drivers-tty-fix-omap-lock-crap.patch index 03104766fd20a8..5c1d59ee9027d8 100644 --- a/patches/drivers-tty-fix-omap-lock-crap.patch +++ b/patches/drivers-tty-fix-omap-lock-crap.patch @@ -11,10 +11,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> drivers/tty/serial/omap-serial.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) -Index: linux-rt-devel/drivers/tty/serial/omap-serial.c -=================================================================== ---- linux-rt-devel.orig/drivers/tty/serial/omap-serial.c -+++ linux-rt-devel/drivers/tty/serial/omap-serial.c +--- a/drivers/tty/serial/omap-serial.c ++++ b/drivers/tty/serial/omap-serial.c @@ -1282,13 +1282,10 @@ serial_omap_console_write(struct console pm_runtime_get_sync(up->dev); diff --git a/patches/drivers-tty-pl011-irq-disable-madness.patch b/patches/drivers-tty-pl011-irq-disable-madness.patch index 92c08545a633d3..43404cb43d3187 100644 --- a/patches/drivers-tty-pl011-irq-disable-madness.patch +++ b/patches/drivers-tty-pl011-irq-disable-madness.patch @@ -10,10 +10,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> drivers/tty/serial/amba-pl011.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) -Index: linux-rt-devel/drivers/tty/serial/amba-pl011.c -=================================================================== ---- linux-rt-devel.orig/drivers/tty/serial/amba-pl011.c -+++ linux-rt-devel/drivers/tty/serial/amba-pl011.c +--- a/drivers/tty/serial/amba-pl011.c ++++ b/drivers/tty/serial/amba-pl011.c @@ -2000,13 +2000,19 @@ pl011_console_write(struct console *co, clk_enable(uap->clk); diff --git a/patches/drm-i915-drop-trace_i915_gem_ring_dispatch-onrt.patch b/patches/drm-i915-drop-trace_i915_gem_ring_dispatch-onrt.patch index 8f91c66e6c85d5..fb381dd566fb92 100644 --- a/patches/drm-i915-drop-trace_i915_gem_ring_dispatch-onrt.patch +++ b/patches/drm-i915-drop-trace_i915_gem_ring_dispatch-onrt.patch @@ -44,10 +44,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> drivers/gpu/drm/i915/i915_gem_execbuffer.c | 2 ++ 1 file changed, 2 insertions(+) -Index: linux-rt-devel/drivers/gpu/drm/i915/i915_gem_execbuffer.c -=================================================================== ---- linux-rt-devel.orig/drivers/gpu/drm/i915/i915_gem_execbuffer.c -+++ linux-rt-devel/drivers/gpu/drm/i915/i915_gem_execbuffer.c +--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c ++++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c @@ -1339,7 +1339,9 @@ i915_gem_ringbuffer_submission(struct dr return ret; } diff --git a/patches/dump-stack-don-t-disable-preemption-during-trace.patch b/patches/dump-stack-don-t-disable-preemption-during-trace.patch index d30700df4258ca..f16aa02b20cfcc 100644 --- a/patches/dump-stack-don-t-disable-preemption-during-trace.patch +++ b/patches/dump-stack-don-t-disable-preemption-during-trace.patch @@ -18,10 +18,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> lib/dump_stack.c | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) -Index: linux-rt-devel/arch/x86/kernel/dumpstack_32.c -=================================================================== ---- linux-rt-devel.orig/arch/x86/kernel/dumpstack_32.c -+++ linux-rt-devel/arch/x86/kernel/dumpstack_32.c +--- a/arch/x86/kernel/dumpstack_32.c ++++ b/arch/x86/kernel/dumpstack_32.c @@ -42,7 +42,7 @@ void dump_trace(struct task_struct *task unsigned long *stack, unsigned long bp, const struct stacktrace_ops *ops, void *data) @@ -40,10 +38,8 @@ Index: linux-rt-devel/arch/x86/kernel/dumpstack_32.c } EXPORT_SYMBOL(dump_trace); -Index: linux-rt-devel/arch/x86/kernel/dumpstack_64.c -=================================================================== ---- linux-rt-devel.orig/arch/x86/kernel/dumpstack_64.c -+++ linux-rt-devel/arch/x86/kernel/dumpstack_64.c +--- a/arch/x86/kernel/dumpstack_64.c ++++ b/arch/x86/kernel/dumpstack_64.c @@ -152,7 +152,7 @@ void dump_trace(struct task_struct *task unsigned long *stack, unsigned long bp, const struct stacktrace_ops *ops, void *data) @@ -80,10 +76,8 @@ Index: linux-rt-devel/arch/x86/kernel/dumpstack_64.c pr_cont("\n"); show_trace_log_lvl(task, regs, sp, bp, log_lvl); -Index: linux-rt-devel/lib/dump_stack.c -=================================================================== ---- linux-rt-devel.orig/lib/dump_stack.c -+++ linux-rt-devel/lib/dump_stack.c +--- a/lib/dump_stack.c ++++ b/lib/dump_stack.c @@ -33,7 +33,7 @@ asmlinkage __visible void dump_stack(voi * Permit this cpu to perform nested stack dumps while serialising * against other CPUs @@ -93,7 +87,7 @@ Index: linux-rt-devel/lib/dump_stack.c retry: cpu = smp_processor_id(); -@@ -52,7 +52,7 @@ retry: +@@ -52,7 +52,7 @@ asmlinkage __visible void dump_stack(voi if (!was_locked) atomic_set(&dump_lock, -1); diff --git a/patches/epoll-use-get-cpu-light.patch b/patches/epoll-use-get-cpu-light.patch index d620da0c8c8872..f75d1701a8ab20 100644 --- a/patches/epoll-use-get-cpu-light.patch +++ b/patches/epoll-use-get-cpu-light.patch @@ -11,10 +11,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> fs/eventpoll.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -Index: linux-rt-devel/fs/eventpoll.c -=================================================================== ---- linux-rt-devel.orig/fs/eventpoll.c -+++ linux-rt-devel/fs/eventpoll.c +--- a/fs/eventpoll.c ++++ b/fs/eventpoll.c @@ -505,12 +505,12 @@ static int ep_poll_wakeup_proc(void *pri */ static void ep_poll_safewake(wait_queue_head_t *wq) diff --git a/patches/fix-rt-int3-x86_32-3.2-rt.patch b/patches/fix-rt-int3-x86_32-3.2-rt.patch index c4bfa7814f077a..8f052ac7564aea 100644 --- a/patches/fix-rt-int3-x86_32-3.2-rt.patch +++ b/patches/fix-rt-int3-x86_32-3.2-rt.patch @@ -23,10 +23,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> arch/x86/kernel/traps.c | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) -Index: linux-rt-devel/arch/x86/kernel/traps.c -=================================================================== ---- linux-rt-devel.orig/arch/x86/kernel/traps.c -+++ linux-rt-devel/arch/x86/kernel/traps.c +--- a/arch/x86/kernel/traps.c ++++ b/arch/x86/kernel/traps.c @@ -88,9 +88,21 @@ static inline void conditional_sti(struc local_irq_enable(); } diff --git a/patches/fs-aio-simple-simple-work.patch b/patches/fs-aio-simple-simple-work.patch index 33e31b8dee336f..b08c65f861482f 100644 --- a/patches/fs-aio-simple-simple-work.patch +++ b/patches/fs-aio-simple-simple-work.patch @@ -27,10 +27,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> fs/aio.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) -Index: linux-rt-devel/fs/aio.c -=================================================================== ---- linux-rt-devel.orig/fs/aio.c -+++ linux-rt-devel/fs/aio.c +--- a/fs/aio.c ++++ b/fs/aio.c @@ -40,6 +40,7 @@ #include <linux/ramfs.h> #include <linux/percpu-refcount.h> diff --git a/patches/fs-block-rt-support.patch b/patches/fs-block-rt-support.patch index ce4a31fb0465e8..8f124097ccff8a 100644 --- a/patches/fs-block-rt-support.patch +++ b/patches/fs-block-rt-support.patch @@ -9,10 +9,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> block/blk-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux-rt-devel/block/blk-core.c -=================================================================== ---- linux-rt-devel.orig/block/blk-core.c -+++ linux-rt-devel/block/blk-core.c +--- a/block/blk-core.c ++++ b/block/blk-core.c @@ -194,7 +194,7 @@ EXPORT_SYMBOL(blk_delay_queue); **/ void blk_start_queue(struct request_queue *q) diff --git a/patches/fs-dcache-use-cpu-chill-in-trylock-loops.patch b/patches/fs-dcache-use-cpu-chill-in-trylock-loops.patch index 43bb137511a6c0..6b61c0dfd64644 100644 --- a/patches/fs-dcache-use-cpu-chill-in-trylock-loops.patch +++ b/patches/fs-dcache-use-cpu-chill-in-trylock-loops.patch @@ -15,10 +15,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> fs/namespace.c | 3 ++- 4 files changed, 7 insertions(+), 4 deletions(-) -Index: linux-rt-devel/fs/autofs4/autofs_i.h -=================================================================== ---- linux-rt-devel.orig/fs/autofs4/autofs_i.h -+++ linux-rt-devel/fs/autofs4/autofs_i.h +--- a/fs/autofs4/autofs_i.h ++++ b/fs/autofs4/autofs_i.h @@ -34,6 +34,7 @@ #include <linux/sched.h> #include <linux/mount.h> @@ -27,11 +25,9 @@ Index: linux-rt-devel/fs/autofs4/autofs_i.h #include <asm/current.h> #include <asm/uaccess.h> -Index: linux-rt-devel/fs/autofs4/expire.c -=================================================================== ---- linux-rt-devel.orig/fs/autofs4/expire.c -+++ linux-rt-devel/fs/autofs4/expire.c -@@ -150,7 +150,7 @@ again: +--- a/fs/autofs4/expire.c ++++ b/fs/autofs4/expire.c +@@ -150,7 +150,7 @@ static struct dentry *get_next_positive_ parent = p->d_parent; if (!spin_trylock(&parent->d_lock)) { spin_unlock(&p->d_lock); @@ -40,10 +36,8 @@ Index: linux-rt-devel/fs/autofs4/expire.c goto relock; } spin_unlock(&p->d_lock); -Index: linux-rt-devel/fs/dcache.c -=================================================================== ---- linux-rt-devel.orig/fs/dcache.c -+++ linux-rt-devel/fs/dcache.c +--- a/fs/dcache.c ++++ b/fs/dcache.c @@ -19,6 +19,7 @@ #include <linux/mm.h> #include <linux/fs.h> @@ -61,7 +55,7 @@ Index: linux-rt-devel/fs/dcache.c return dentry; /* try again with same dentry */ } -@@ -2395,7 +2396,7 @@ again: +@@ -2398,7 +2399,7 @@ void d_delete(struct dentry * dentry) if (dentry->d_lockref.count == 1) { if (!spin_trylock(&inode->i_lock)) { spin_unlock(&dentry->d_lock); @@ -70,10 +64,8 @@ Index: linux-rt-devel/fs/dcache.c goto again; } dentry->d_flags &= ~DCACHE_CANT_MOUNT; -Index: linux-rt-devel/fs/namespace.c -=================================================================== ---- linux-rt-devel.orig/fs/namespace.c -+++ linux-rt-devel/fs/namespace.c +--- a/fs/namespace.c ++++ b/fs/namespace.c @@ -14,6 +14,7 @@ #include <linux/mnt_namespace.h> #include <linux/user_namespace.h> diff --git a/patches/fs-jbd-pull-plug-when-waiting-for-space.patch b/patches/fs-jbd-pull-plug-when-waiting-for-space.patch index 4d4a4cfcc59646..0dd4c95d3ec308 100644 --- a/patches/fs-jbd-pull-plug-when-waiting-for-space.patch +++ b/patches/fs-jbd-pull-plug-when-waiting-for-space.patch @@ -16,10 +16,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> fs/jbd/checkpoint.c | 2 ++ 1 file changed, 2 insertions(+) -Index: linux-rt-devel/fs/jbd/checkpoint.c -=================================================================== ---- linux-rt-devel.orig/fs/jbd/checkpoint.c -+++ linux-rt-devel/fs/jbd/checkpoint.c +--- a/fs/jbd/checkpoint.c ++++ b/fs/jbd/checkpoint.c @@ -129,6 +129,8 @@ void __log_wait_for_space(journal_t *jou if (journal->j_flags & JFS_ABORT) return; diff --git a/patches/fs-jbd-replace-bh_state-lock.patch b/patches/fs-jbd-replace-bh_state-lock.patch index bc1acd024130a4..bd240b1081a8e4 100644 --- a/patches/fs-jbd-replace-bh_state-lock.patch +++ b/patches/fs-jbd-replace-bh_state-lock.patch @@ -13,10 +13,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> include/linux/jbd_common.h | 24 ++++++++++++++++++++++++ 2 files changed, 34 insertions(+) -Index: linux-rt-devel/include/linux/buffer_head.h -=================================================================== ---- linux-rt-devel.orig/include/linux/buffer_head.h -+++ linux-rt-devel/include/linux/buffer_head.h +--- a/include/linux/buffer_head.h ++++ b/include/linux/buffer_head.h @@ -77,6 +77,11 @@ struct buffer_head { atomic_t b_count; /* users using this buffer_head */ #ifdef CONFIG_PREEMPT_RT_BASE @@ -41,10 +39,8 @@ Index: linux-rt-devel/include/linux/buffer_head.h #endif } -Index: linux-rt-devel/include/linux/jbd_common.h -=================================================================== ---- linux-rt-devel.orig/include/linux/jbd_common.h -+++ linux-rt-devel/include/linux/jbd_common.h +--- a/include/linux/jbd_common.h ++++ b/include/linux/jbd_common.h @@ -15,32 +15,56 @@ static inline struct journal_head *bh2jh static inline void jbd_lock_bh_state(struct buffer_head *bh) diff --git a/patches/fs-jbd2-pull-your-plug-when-waiting-for-space.patch b/patches/fs-jbd2-pull-your-plug-when-waiting-for-space.patch index aac20dd4d076ea..600ade5ddf9aeb 100644 --- a/patches/fs-jbd2-pull-your-plug-when-waiting-for-space.patch +++ b/patches/fs-jbd2-pull-your-plug-when-waiting-for-space.patch @@ -18,10 +18,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> fs/jbd2/checkpoint.c | 2 ++ 1 file changed, 2 insertions(+) -Index: linux-rt-devel/fs/jbd2/checkpoint.c -=================================================================== ---- linux-rt-devel.orig/fs/jbd2/checkpoint.c -+++ linux-rt-devel/fs/jbd2/checkpoint.c +--- a/fs/jbd2/checkpoint.c ++++ b/fs/jbd2/checkpoint.c @@ -116,6 +116,8 @@ void __jbd2_log_wait_for_space(journal_t nblocks = jbd2_space_needed(journal); while (jbd2_log_space_left(journal) < nblocks) { diff --git a/patches/fs-namespace-preemption-fix.patch b/patches/fs-namespace-preemption-fix.patch index 488590a553905f..40511193367228 100644 --- a/patches/fs-namespace-preemption-fix.patch +++ b/patches/fs-namespace-preemption-fix.patch @@ -13,10 +13,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> fs/namespace.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -Index: linux-rt-devel/fs/namespace.c -=================================================================== ---- linux-rt-devel.orig/fs/namespace.c -+++ linux-rt-devel/fs/namespace.c +--- a/fs/namespace.c ++++ b/fs/namespace.c @@ -353,8 +353,11 @@ int __mnt_want_write(struct vfsmount *m) * incremented count after it has set MNT_WRITE_HOLD. */ diff --git a/patches/fs-ntfs-disable-interrupt-non-rt.patch b/patches/fs-ntfs-disable-interrupt-non-rt.patch index 345848b7ec7d85..49203174e40860 100644 --- a/patches/fs-ntfs-disable-interrupt-non-rt.patch +++ b/patches/fs-ntfs-disable-interrupt-non-rt.patch @@ -39,10 +39,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> fs/ntfs/aops.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -Index: linux-rt-devel/fs/ntfs/aops.c -=================================================================== ---- linux-rt-devel.orig/fs/ntfs/aops.c -+++ linux-rt-devel/fs/ntfs/aops.c +--- a/fs/ntfs/aops.c ++++ b/fs/ntfs/aops.c @@ -143,13 +143,13 @@ static void ntfs_end_buffer_async_read(s recs = PAGE_CACHE_SIZE / rec_size; /* Should have been verified before we got here... */ diff --git a/patches/fs-replace-bh_uptodate_lock-for-rt.patch b/patches/fs-replace-bh_uptodate_lock-for-rt.patch index 1b0a9760e82477..aff9e498fbde07 100644 --- a/patches/fs-replace-bh_uptodate_lock-for-rt.patch +++ b/patches/fs-replace-bh_uptodate_lock-for-rt.patch @@ -12,10 +12,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> include/linux/buffer_head.h | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 44 insertions(+), 21 deletions(-) -Index: linux-rt-devel/fs/buffer.c -=================================================================== ---- linux-rt-devel.orig/fs/buffer.c -+++ linux-rt-devel/fs/buffer.c +--- a/fs/buffer.c ++++ b/fs/buffer.c @@ -301,8 +301,7 @@ static void end_buffer_async_read(struct * decide that the page is now completely done. */ @@ -83,10 +81,8 @@ Index: linux-rt-devel/fs/buffer.c preempt_disable(); __this_cpu_inc(bh_accounting.nr); recalc_bh_state(); -Index: linux-rt-devel/fs/ntfs/aops.c -=================================================================== ---- linux-rt-devel.orig/fs/ntfs/aops.c -+++ linux-rt-devel/fs/ntfs/aops.c +--- a/fs/ntfs/aops.c ++++ b/fs/ntfs/aops.c @@ -107,8 +107,7 @@ static void ntfs_end_buffer_async_read(s "0x%llx.", (unsigned long long)bh->b_blocknr); } @@ -118,10 +114,8 @@ Index: linux-rt-devel/fs/ntfs/aops.c } /** -Index: linux-rt-devel/include/linux/buffer_head.h -=================================================================== ---- linux-rt-devel.orig/include/linux/buffer_head.h -+++ linux-rt-devel/include/linux/buffer_head.h +--- a/include/linux/buffer_head.h ++++ b/include/linux/buffer_head.h @@ -75,8 +75,42 @@ struct buffer_head { struct address_space *b_assoc_map; /* mapping this buffer is associated with */ diff --git a/patches/ftrace-migrate-disable-tracing.patch b/patches/ftrace-migrate-disable-tracing.patch index 32a7fa3e2c88df..4a4412259955fc 100644 --- a/patches/ftrace-migrate-disable-tracing.patch +++ b/patches/ftrace-migrate-disable-tracing.patch @@ -10,10 +10,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/trace/trace_output.c | 5 +++++ 4 files changed, 15 insertions(+), 3 deletions(-) -Index: linux-rt-devel/include/linux/ftrace_event.h -=================================================================== ---- linux-rt-devel.orig/include/linux/ftrace_event.h -+++ linux-rt-devel/include/linux/ftrace_event.h +--- a/include/linux/ftrace_event.h ++++ b/include/linux/ftrace_event.h @@ -66,6 +66,8 @@ struct trace_entry { unsigned char flags; unsigned char preempt_count; @@ -23,10 +21,8 @@ Index: linux-rt-devel/include/linux/ftrace_event.h }; #define FTRACE_MAX_EVENT \ -Index: linux-rt-devel/kernel/trace/trace.c -=================================================================== ---- linux-rt-devel.orig/kernel/trace/trace.c -+++ linux-rt-devel/kernel/trace/trace.c +--- a/kernel/trace/trace.c ++++ b/kernel/trace/trace.c @@ -1641,6 +1641,8 @@ tracing_generic_entry_update(struct trac ((pc & SOFTIRQ_MASK) ? TRACE_FLAG_SOFTIRQ : 0) | (tif_need_resched() ? TRACE_FLAG_NEED_RESCHED : 0) | @@ -50,10 +46,8 @@ Index: linux-rt-devel/kernel/trace/trace.c } static void print_event_info(struct trace_buffer *buf, struct seq_file *m) -Index: linux-rt-devel/kernel/trace/trace_events.c -=================================================================== ---- linux-rt-devel.orig/kernel/trace/trace_events.c -+++ linux-rt-devel/kernel/trace/trace_events.c +--- a/kernel/trace/trace_events.c ++++ b/kernel/trace/trace_events.c @@ -162,6 +162,8 @@ static int trace_define_common_fields(vo __common_field(unsigned char, flags); __common_field(unsigned char, preempt_count); @@ -63,10 +57,8 @@ Index: linux-rt-devel/kernel/trace/trace_events.c return ret; } -Index: linux-rt-devel/kernel/trace/trace_output.c -=================================================================== ---- linux-rt-devel.orig/kernel/trace/trace_output.c -+++ linux-rt-devel/kernel/trace/trace_output.c +--- a/kernel/trace/trace_output.c ++++ b/kernel/trace/trace_output.c @@ -472,6 +472,11 @@ int trace_print_lat_fmt(struct trace_seq else trace_seq_putc(s, '.'); diff --git a/patches/futex-avoid-double-wake-up-in-PI-futex-wait-wake-on-.patch b/patches/futex-avoid-double-wake-up-in-PI-futex-wait-wake-on-.patch index 6ee29b06be2329..ec0496037c0125 100644 --- a/patches/futex-avoid-double-wake-up-in-PI-futex-wait-wake-on-.patch +++ b/patches/futex-avoid-double-wake-up-in-PI-futex-wait-wake-on-.patch @@ -43,10 +43,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> kernel/locking/rtmutex_common.h | 4 ++++ 3 files changed, 62 insertions(+), 14 deletions(-) -Index: linux-rt-devel/kernel/futex.c -=================================================================== ---- linux-rt-devel.orig/kernel/futex.c -+++ linux-rt-devel/kernel/futex.c +--- a/kernel/futex.c ++++ b/kernel/futex.c @@ -1117,11 +1117,13 @@ static void mark_wake_futex(struct wake_ q->lock_ptr = NULL; } @@ -81,7 +79,7 @@ Index: linux-rt-devel/kernel/futex.c return 0; } -@@ -2413,13 +2425,26 @@ retry: +@@ -2413,13 +2425,26 @@ static int futex_unlock_pi(u32 __user *u */ match = futex_top_waiter(hb, &key); if (match) { @@ -109,7 +107,7 @@ Index: linux-rt-devel/kernel/futex.c goto out_unlock; } -@@ -2440,6 +2465,7 @@ retry: +@@ -2440,6 +2465,7 @@ static int futex_unlock_pi(u32 __user *u out_unlock: spin_unlock(&hb->lock); @@ -117,10 +115,8 @@ Index: linux-rt-devel/kernel/futex.c put_futex_key(&key); return ret; -Index: linux-rt-devel/kernel/locking/rtmutex.c -=================================================================== ---- linux-rt-devel.orig/kernel/locking/rtmutex.c -+++ linux-rt-devel/kernel/locking/rtmutex.c +--- a/kernel/locking/rtmutex.c ++++ b/kernel/locking/rtmutex.c @@ -300,7 +300,7 @@ static void __rt_mutex_adjust_prio(struc * of task. We do not use the spin_xx_mutex() variants here as we are * outside of the debug path.) @@ -212,10 +208,8 @@ Index: linux-rt-devel/kernel/locking/rtmutex.c * rt_mutex_destroy - mark a mutex unusable * @lock: the mutex to be destroyed * -Index: linux-rt-devel/kernel/locking/rtmutex_common.h -=================================================================== ---- linux-rt-devel.orig/kernel/locking/rtmutex_common.h -+++ linux-rt-devel/kernel/locking/rtmutex_common.h +--- a/kernel/locking/rtmutex_common.h ++++ b/kernel/locking/rtmutex_common.h @@ -132,6 +132,10 @@ extern int rt_mutex_finish_proxy_lock(st struct rt_mutex_waiter *waiter); extern int rt_mutex_timed_futex_lock(struct rt_mutex *l, struct hrtimer_sleeper *to); diff --git a/patches/futex-requeue-pi-fix.patch b/patches/futex-requeue-pi-fix.patch index 443d3f99242ae3..d2938959eaf7ff 100644 --- a/patches/futex-requeue-pi-fix.patch +++ b/patches/futex-requeue-pi-fix.patch @@ -53,10 +53,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/locking/rtmutex_common.h | 1 + 2 files changed, 32 insertions(+), 1 deletion(-) -Index: linux-rt-devel/kernel/locking/rtmutex.c -=================================================================== ---- linux-rt-devel.orig/kernel/locking/rtmutex.c -+++ linux-rt-devel/kernel/locking/rtmutex.c +--- a/kernel/locking/rtmutex.c ++++ b/kernel/locking/rtmutex.c @@ -71,7 +71,8 @@ static void fixup_rt_mutex_waiters(struc static int rt_mutex_real_waiter(struct rt_mutex_waiter *waiter) @@ -103,10 +101,8 @@ Index: linux-rt-devel/kernel/locking/rtmutex.c /* We enforce deadlock detection for futexes */ ret = task_blocks_on_rt_mutex(lock, waiter, task, RT_MUTEX_FULL_CHAINWALK); -Index: linux-rt-devel/kernel/locking/rtmutex_common.h -=================================================================== ---- linux-rt-devel.orig/kernel/locking/rtmutex_common.h -+++ linux-rt-devel/kernel/locking/rtmutex_common.h +--- a/kernel/locking/rtmutex_common.h ++++ b/kernel/locking/rtmutex_common.h @@ -120,6 +120,7 @@ enum rtmutex_chainwalk { * PI-futex support (proxy locking functions, etc.): */ diff --git a/patches/genirq--Handle-interrupts-with-primary-and-threaded-handler-gracefully b/patches/genirq--Handle-interrupts-with-primary-and-threaded-handler-gracefully index a84bff7945759c..34a3e86abf72c1 100644 --- a/patches/genirq--Handle-interrupts-with-primary-and-threaded-handler-gracefully +++ b/patches/genirq--Handle-interrupts-with-primary-and-threaded-handler-gracefully @@ -41,10 +41,8 @@ hard irq handler' kernel/irq/manage.c | 160 +++++++++++++++++++++++++++++++++------------- 2 files changed, 120 insertions(+), 42 deletions(-) -Index: linux-rt-devel/include/linux/interrupt.h -=================================================================== ---- linux-rt-devel.orig/include/linux/interrupt.h -+++ linux-rt-devel/include/linux/interrupt.h +--- a/include/linux/interrupt.h ++++ b/include/linux/interrupt.h @@ -102,6 +102,7 @@ typedef irqreturn_t (*irq_handler_t)(int * @flags: flags (see IRQF_* above) * @thread_fn: interrupt handler function for threaded interrupts @@ -61,10 +59,8 @@ Index: linux-rt-devel/include/linux/interrupt.h unsigned int irq; unsigned int flags; unsigned long thread_flags; -Index: linux-rt-devel/kernel/irq/manage.c -=================================================================== ---- linux-rt-devel.orig/kernel/irq/manage.c -+++ linux-rt-devel/kernel/irq/manage.c +--- a/kernel/irq/manage.c ++++ b/kernel/irq/manage.c @@ -697,6 +697,12 @@ static irqreturn_t irq_nested_primary_ha return IRQ_NONE; } @@ -210,7 +206,7 @@ Index: linux-rt-devel/kernel/irq/manage.c /* * Internal function to register an irqaction - typically used to * allocate special interrupts that are part of the architecture. -@@ -1004,6 +1083,8 @@ __setup_irq(unsigned int irq, struct irq +@@ -1004,6 +1083,8 @@ static int if (!try_module_get(desc->owner)) return -ENODEV; @@ -219,7 +215,7 @@ Index: linux-rt-devel/kernel/irq/manage.c /* * Check whether the interrupt nests into another interrupt * thread. -@@ -1021,8 +1102,11 @@ __setup_irq(unsigned int irq, struct irq +@@ -1021,8 +1102,11 @@ static int */ new->handler = irq_nested_primary_handler; } else { @@ -233,7 +229,7 @@ Index: linux-rt-devel/kernel/irq/manage.c } /* -@@ -1031,37 +1115,14 @@ __setup_irq(unsigned int irq, struct irq +@@ -1031,37 +1115,14 @@ static int * thread. */ if (new->thread_fn && !nested) { @@ -277,7 +273,7 @@ Index: linux-rt-devel/kernel/irq/manage.c } if (!alloc_cpumask_var(&mask, GFP_KERNEL)) { -@@ -1234,7 +1295,6 @@ __setup_irq(unsigned int irq, struct irq +@@ -1234,7 +1295,6 @@ static int irq, nmsk, omsk); } @@ -285,7 +281,7 @@ Index: linux-rt-devel/kernel/irq/manage.c *old_ptr = new; irq_pm_install_action(desc, new); -@@ -1260,6 +1320,8 @@ __setup_irq(unsigned int irq, struct irq +@@ -1260,6 +1320,8 @@ static int */ if (new->thread) wake_up_process(new->thread); @@ -294,7 +290,7 @@ Index: linux-rt-devel/kernel/irq/manage.c register_irq_proc(irq, desc); new->dir = NULL; -@@ -1290,6 +1352,13 @@ out_thread: +@@ -1290,6 +1352,13 @@ static int kthread_stop(t); put_task_struct(t); } diff --git a/patches/genirq-disable-irqpoll-on-rt.patch b/patches/genirq-disable-irqpoll-on-rt.patch index bd73a831ec2f2b..9aa92515d4d2a3 100644 --- a/patches/genirq-disable-irqpoll-on-rt.patch +++ b/patches/genirq-disable-irqpoll-on-rt.patch @@ -11,10 +11,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/irq/spurious.c | 8 ++++++++ 1 file changed, 8 insertions(+) -Index: linux-rt-devel/kernel/irq/spurious.c -=================================================================== ---- linux-rt-devel.orig/kernel/irq/spurious.c -+++ linux-rt-devel/kernel/irq/spurious.c +--- a/kernel/irq/spurious.c ++++ b/kernel/irq/spurious.c @@ -444,6 +444,10 @@ MODULE_PARM_DESC(noirqdebug, "Disable ir static int __init irqfixup_setup(char *str) diff --git a/patches/genirq-do-not-invoke-the-affinity-callback-via-a-wor.patch b/patches/genirq-do-not-invoke-the-affinity-callback-via-a-wor.patch index f8a53025908190..ba421a181f1667 100644 --- a/patches/genirq-do-not-invoke-the-affinity-callback-via-a-wor.patch +++ b/patches/genirq-do-not-invoke-the-affinity-callback-via-a-wor.patch @@ -14,10 +14,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> kernel/irq/manage.c | 79 ++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 77 insertions(+), 3 deletions(-) -Index: linux-rt-devel/include/linux/interrupt.h -=================================================================== ---- linux-rt-devel.orig/include/linux/interrupt.h -+++ linux-rt-devel/include/linux/interrupt.h +--- a/include/linux/interrupt.h ++++ b/include/linux/interrupt.h @@ -217,6 +217,7 @@ struct irq_affinity_notify { unsigned int irq; struct kref kref; @@ -26,10 +24,8 @@ Index: linux-rt-devel/include/linux/interrupt.h void (*notify)(struct irq_affinity_notify *, const cpumask_t *mask); void (*release)(struct kref *ref); }; -Index: linux-rt-devel/kernel/irq/manage.c -=================================================================== ---- linux-rt-devel.orig/kernel/irq/manage.c -+++ linux-rt-devel/kernel/irq/manage.c +--- a/kernel/irq/manage.c ++++ b/kernel/irq/manage.c @@ -181,6 +181,62 @@ static inline void irq_get_pending(struct cpumask *mask, struct irq_desc *desc) { } #endif @@ -123,7 +119,7 @@ Index: linux-rt-devel/kernel/irq/manage.c struct irq_desc *desc = irq_to_desc(notify->irq); cpumask_var_t cpumask; unsigned long flags; -@@ -283,6 +347,13 @@ out: +@@ -283,6 +347,13 @@ static void irq_affinity_notify(struct w kref_put(¬ify->kref, notify->release); } diff --git a/patches/genirq-force-threading.patch b/patches/genirq-force-threading.patch index 86e0e541596905..bbfcbec08ded9d 100644 --- a/patches/genirq-force-threading.patch +++ b/patches/genirq-force-threading.patch @@ -11,10 +11,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/irq/manage.c | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) -Index: linux-rt-devel/include/linux/interrupt.h -=================================================================== ---- linux-rt-devel.orig/include/linux/interrupt.h -+++ linux-rt-devel/include/linux/interrupt.h +--- a/include/linux/interrupt.h ++++ b/include/linux/interrupt.h @@ -379,9 +379,13 @@ extern int irq_set_irqchip_state(unsigne bool state); @@ -30,10 +28,8 @@ Index: linux-rt-devel/include/linux/interrupt.h #endif #ifndef __ARCH_SET_SOFTIRQ_PENDING -Index: linux-rt-devel/kernel/irq/manage.c -=================================================================== ---- linux-rt-devel.orig/kernel/irq/manage.c -+++ linux-rt-devel/kernel/irq/manage.c +--- a/kernel/irq/manage.c ++++ b/kernel/irq/manage.c @@ -22,6 +22,7 @@ #include "internals.h" diff --git a/patches/gpio-omap-use-raw-locks-for-locking.patch b/patches/gpio-omap-use-raw-locks-for-locking.patch index 3156e836b8ee26..48947fe69c8317 100644 --- a/patches/gpio-omap-use-raw-locks-for-locking.patch +++ b/patches/gpio-omap-use-raw-locks-for-locking.patch @@ -32,10 +32,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> drivers/gpio/gpio-omap.c | 78 +++++++++++++++++++++++------------------------ 1 file changed, 39 insertions(+), 39 deletions(-) -Index: linux-rt-devel/drivers/gpio/gpio-omap.c -=================================================================== ---- linux-rt-devel.orig/drivers/gpio/gpio-omap.c -+++ linux-rt-devel/drivers/gpio/gpio-omap.c +--- a/drivers/gpio/gpio-omap.c ++++ b/drivers/gpio/gpio-omap.c @@ -57,7 +57,7 @@ struct gpio_bank { u32 saved_datain; u32 level_mask; @@ -272,7 +270,7 @@ Index: linux-rt-devel/drivers/gpio/gpio-omap.c /* * Only edges can generate a wakeup event to the PRCM. -@@ -1299,7 +1299,7 @@ update_gpio_context_count: +@@ -1299,7 +1299,7 @@ static int omap_gpio_runtime_suspend(str bank->get_context_loss_count(bank->dev); omap_gpio_dbck_disable(bank); diff --git a/patches/hotplug-Use-set_cpus_allowed_ptr-in-sync_unplug_thre.patch b/patches/hotplug-Use-set_cpus_allowed_ptr-in-sync_unplug_thre.patch index e2613402d7826b..78d70daec6e33f 100644 --- a/patches/hotplug-Use-set_cpus_allowed_ptr-in-sync_unplug_thre.patch +++ b/patches/hotplug-Use-set_cpus_allowed_ptr-in-sync_unplug_thre.patch @@ -33,10 +33,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> kernel/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux-rt-devel/kernel/cpu.c -=================================================================== ---- linux-rt-devel.orig/kernel/cpu.c -+++ linux-rt-devel/kernel/cpu.c +--- a/kernel/cpu.c ++++ b/kernel/cpu.c @@ -267,7 +267,7 @@ static int sync_unplug_thread(void *data * we don't want any more work on this CPU. */ diff --git a/patches/hotplug-light-get-online-cpus.patch b/patches/hotplug-light-get-online-cpus.patch index d09b20a35ecda5..4ddd270805bf14 100644 --- a/patches/hotplug-light-get-online-cpus.patch +++ b/patches/hotplug-light-get-online-cpus.patch @@ -16,10 +16,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/cpu.c | 119 +++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 122 insertions(+), 4 deletions(-) -Index: linux-rt-devel/include/linux/cpu.h -=================================================================== ---- linux-rt-devel.orig/include/linux/cpu.h -+++ linux-rt-devel/include/linux/cpu.h +--- a/include/linux/cpu.h ++++ b/include/linux/cpu.h @@ -221,9 +221,6 @@ static inline void smpboot_thread_init(v #endif /* CONFIG_SMP */ extern struct bus_type cpu_subsys; @@ -48,10 +46,8 @@ Index: linux-rt-devel/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. */ -Index: linux-rt-devel/kernel/cpu.c -=================================================================== ---- linux-rt-devel.orig/kernel/cpu.c -+++ linux-rt-devel/kernel/cpu.c +--- a/kernel/cpu.c ++++ b/kernel/cpu.c @@ -88,6 +88,100 @@ static struct { #define cpuhp_lock_acquire() lock_map_acquire(&cpu_hotplug.dep_map) #define cpuhp_lock_release() lock_map_release(&cpu_hotplug.dep_map) diff --git a/patches/hotplug-sync_unplug-no-27-5cn-27-in-task-name.patch b/patches/hotplug-sync_unplug-no-27-5cn-27-in-task-name.patch index c6abb4fbe5cbdb..cc7d94c5daab64 100644 --- a/patches/hotplug-sync_unplug-no-27-5cn-27-in-task-name.patch +++ b/patches/hotplug-sync_unplug-no-27-5cn-27-in-task-name.patch @@ -11,10 +11,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux-rt-devel/kernel/cpu.c -=================================================================== ---- linux-rt-devel.orig/kernel/cpu.c -+++ linux-rt-devel/kernel/cpu.c +--- a/kernel/cpu.c ++++ b/kernel/cpu.c @@ -167,7 +167,7 @@ static int cpu_unplug_begin(unsigned int struct task_struct *tsk; diff --git a/patches/hotplug-use-migrate-disable.patch b/patches/hotplug-use-migrate-disable.patch index 6423b63ab414e3..25844ce8e17141 100644 --- a/patches/hotplug-use-migrate-disable.patch +++ b/patches/hotplug-use-migrate-disable.patch @@ -10,10 +10,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/cpu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -Index: linux-rt-devel/kernel/cpu.c -=================================================================== ---- linux-rt-devel.orig/kernel/cpu.c -+++ linux-rt-devel/kernel/cpu.c +--- a/kernel/cpu.c ++++ b/kernel/cpu.c @@ -466,14 +466,13 @@ static int __ref _cpu_down(unsigned int cpumask_andnot(cpumask, cpu_online_mask, cpumask_of(cpu)); set_cpus_allowed_ptr(current, cpumask); diff --git a/patches/hrtimer-Move-schedule_work-call-to-helper-thread.patch b/patches/hrtimer-Move-schedule_work-call-to-helper-thread.patch index 61279cbb2f33fa..ef0a92332bd471 100644 --- a/patches/hrtimer-Move-schedule_work-call-to-helper-thread.patch +++ b/patches/hrtimer-Move-schedule_work-call-to-helper-thread.patch @@ -52,10 +52,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> kernel/time/hrtimer.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) -Index: linux-rt-devel/kernel/time/hrtimer.c -=================================================================== ---- linux-rt-devel.orig/kernel/time/hrtimer.c -+++ linux-rt-devel/kernel/time/hrtimer.c +--- a/kernel/time/hrtimer.c ++++ b/kernel/time/hrtimer.c @@ -48,6 +48,7 @@ #include <linux/sched/rt.h> #include <linux/sched/deadline.h> diff --git a/patches/hrtimer-fixup-hrtimer-callback-changes-for-preempt-r.patch b/patches/hrtimer-fixup-hrtimer-callback-changes-for-preempt-r.patch index a482b92e8a0b09..7e46774ae69e7e 100644 --- a/patches/hrtimer-fixup-hrtimer-callback-changes-for-preempt-r.patch +++ b/patches/hrtimer-fixup-hrtimer-callback-changes-for-preempt-r.patch @@ -20,10 +20,8 @@ Signed-off-by: Ingo Molnar <mingo@elte.hu> kernel/watchdog.c | 1 6 files changed, 200 insertions(+), 26 deletions(-) -Index: linux-rt-devel/include/linux/hrtimer.h -=================================================================== ---- linux-rt-devel.orig/include/linux/hrtimer.h -+++ linux-rt-devel/include/linux/hrtimer.h +--- a/include/linux/hrtimer.h ++++ b/include/linux/hrtimer.h @@ -111,6 +111,8 @@ struct hrtimer { enum hrtimer_restart (*function)(struct hrtimer *); struct hrtimer_clock_base *base; @@ -41,10 +39,8 @@ Index: linux-rt-devel/include/linux/hrtimer.h ktime_t resolution; ktime_t (*get_time)(void); ktime_t softirq_time; -Index: linux-rt-devel/kernel/sched/core.c -=================================================================== ---- linux-rt-devel.orig/kernel/sched/core.c -+++ linux-rt-devel/kernel/sched/core.c +--- a/kernel/sched/core.c ++++ b/kernel/sched/core.c @@ -461,6 +461,7 @@ static void init_rq_hrtick(struct rq *rq hrtimer_init(&rq->hrtick_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); @@ -53,10 +49,8 @@ Index: linux-rt-devel/kernel/sched/core.c } #else /* CONFIG_SCHED_HRTICK */ static inline void hrtick_clear(struct rq *rq) -Index: linux-rt-devel/kernel/sched/rt.c -=================================================================== ---- linux-rt-devel.orig/kernel/sched/rt.c -+++ linux-rt-devel/kernel/sched/rt.c +--- a/kernel/sched/rt.c ++++ b/kernel/sched/rt.c @@ -44,6 +44,7 @@ void init_rt_bandwidth(struct rt_bandwid hrtimer_init(&rt_b->rt_period_timer, @@ -65,10 +59,8 @@ Index: linux-rt-devel/kernel/sched/rt.c rt_b->rt_period_timer.function = sched_rt_period_timer; } -Index: linux-rt-devel/kernel/time/hrtimer.c -=================================================================== ---- linux-rt-devel.orig/kernel/time/hrtimer.c -+++ linux-rt-devel/kernel/time/hrtimer.c +--- a/kernel/time/hrtimer.c ++++ b/kernel/time/hrtimer.c @@ -577,8 +577,7 @@ static int hrtimer_reprogram(struct hrti * When the callback is running, we do not reprogram the clock event * device. The timer callback is either running on a different CPU or @@ -346,7 +338,7 @@ Index: linux-rt-devel/kernel/time/hrtimer.c BUG_ON(!cpu_base->hres_active); cpu_base->nr_events++; -@@ -1343,7 +1499,10 @@ retry: +@@ -1343,7 +1499,10 @@ void hrtimer_interrupt(struct clock_even if (basenow.tv64 < hrtimer_get_softexpires_tv64(timer)) break; @@ -358,7 +350,7 @@ Index: linux-rt-devel/kernel/time/hrtimer.c } } /* Reevaluate the clock bases for the next expiry */ -@@ -1360,6 +1519,10 @@ retry: +@@ -1360,6 +1519,10 @@ void hrtimer_interrupt(struct clock_even if (expires_next.tv64 == KTIME_MAX || !tick_program_event(expires_next, 0)) { cpu_base->hang_detected = 0; @@ -448,10 +440,8 @@ Index: linux-rt-devel/kernel/time/hrtimer.c } /** -Index: linux-rt-devel/kernel/time/tick-sched.c -=================================================================== ---- linux-rt-devel.orig/kernel/time/tick-sched.c -+++ linux-rt-devel/kernel/time/tick-sched.c +--- a/kernel/time/tick-sched.c ++++ b/kernel/time/tick-sched.c @@ -1159,6 +1159,7 @@ void tick_setup_sched_timer(void) * Emulate tick processing via per-CPU hrtimers: */ @@ -460,10 +450,8 @@ Index: linux-rt-devel/kernel/time/tick-sched.c ts->sched_timer.function = tick_sched_timer; /* Get the next period (per cpu) */ -Index: linux-rt-devel/kernel/watchdog.c -=================================================================== ---- linux-rt-devel.orig/kernel/watchdog.c -+++ linux-rt-devel/kernel/watchdog.c +--- a/kernel/watchdog.c ++++ b/kernel/watchdog.c @@ -454,6 +454,7 @@ static void watchdog_enable(unsigned int /* kick off the timer for the hardlockup detector */ hrtimer_init(hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); diff --git a/patches/hrtimer-raise-softirq-if-hrtimer-irq-stalled.patch b/patches/hrtimer-raise-softirq-if-hrtimer-irq-stalled.patch index dc6aab3c21181b..3b19d7e0e3f646 100644 --- a/patches/hrtimer-raise-softirq-if-hrtimer-irq-stalled.patch +++ b/patches/hrtimer-raise-softirq-if-hrtimer-irq-stalled.patch @@ -10,11 +10,9 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/time/hrtimer.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) -Index: linux-rt-devel/kernel/time/hrtimer.c -=================================================================== ---- linux-rt-devel.orig/kernel/time/hrtimer.c -+++ linux-rt-devel/kernel/time/hrtimer.c -@@ -1519,11 +1519,7 @@ retry: +--- a/kernel/time/hrtimer.c ++++ b/kernel/time/hrtimer.c +@@ -1519,11 +1519,7 @@ void hrtimer_interrupt(struct clock_even if (expires_next.tv64 == KTIME_MAX || !tick_program_event(expires_next, 0)) { cpu_base->hang_detected = 0; @@ -27,7 +25,7 @@ Index: linux-rt-devel/kernel/time/hrtimer.c } /* -@@ -1567,6 +1563,9 @@ retry: +@@ -1567,6 +1563,9 @@ void hrtimer_interrupt(struct clock_even tick_program_event(expires_next, 1); printk_once(KERN_WARNING "hrtimer: interrupt took %llu ns\n", ktime_to_ns(delta)); diff --git a/patches/hrtimers-prepare-full-preemption.patch b/patches/hrtimers-prepare-full-preemption.patch index 9b7e3f69a415d1..3edbdde07a7bc2 100644 --- a/patches/hrtimers-prepare-full-preemption.patch +++ b/patches/hrtimers-prepare-full-preemption.patch @@ -15,10 +15,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/time/posix-timers.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 76 insertions(+), 1 deletion(-) -Index: linux-rt-devel/include/linux/hrtimer.h -=================================================================== ---- linux-rt-devel.orig/include/linux/hrtimer.h -+++ linux-rt-devel/include/linux/hrtimer.h +--- a/include/linux/hrtimer.h ++++ b/include/linux/hrtimer.h @@ -197,6 +197,9 @@ struct hrtimer_cpu_base { unsigned long nr_hangs; ktime_t max_hang_time; @@ -43,10 +41,8 @@ Index: linux-rt-devel/include/linux/hrtimer.h /* Query timers: */ extern ktime_t hrtimer_get_remaining(const struct hrtimer *timer); extern int hrtimer_get_res(const clockid_t which_clock, struct timespec *tp); -Index: linux-rt-devel/kernel/time/hrtimer.c -=================================================================== ---- linux-rt-devel.orig/kernel/time/hrtimer.c -+++ linux-rt-devel/kernel/time/hrtimer.c +--- a/kernel/time/hrtimer.c ++++ b/kernel/time/hrtimer.c @@ -837,6 +837,32 @@ u64 hrtimer_forward(struct hrtimer *time } EXPORT_SYMBOL_GPL(hrtimer_forward); @@ -108,11 +104,9 @@ Index: linux-rt-devel/kernel/time/hrtimer.c } #ifdef CONFIG_HOTPLUG_CPU -Index: linux-rt-devel/kernel/time/itimer.c -=================================================================== ---- linux-rt-devel.orig/kernel/time/itimer.c -+++ linux-rt-devel/kernel/time/itimer.c -@@ -213,6 +213,7 @@ again: +--- a/kernel/time/itimer.c ++++ b/kernel/time/itimer.c +@@ -213,6 +213,7 @@ int do_setitimer(int which, struct itime /* We are sharing ->siglock with it_real_fn() */ if (hrtimer_try_to_cancel(timer) < 0) { spin_unlock_irq(&tsk->sighand->siglock); @@ -120,10 +114,8 @@ Index: linux-rt-devel/kernel/time/itimer.c goto again; } expires = timeval_to_ktime(value->it_value); -Index: linux-rt-devel/kernel/time/posix-timers.c -=================================================================== ---- linux-rt-devel.orig/kernel/time/posix-timers.c -+++ linux-rt-devel/kernel/time/posix-timers.c +--- a/kernel/time/posix-timers.c ++++ b/kernel/time/posix-timers.c @@ -821,6 +821,20 @@ SYSCALL_DEFINE1(timer_getoverrun, timer_ return overrun; } @@ -145,7 +137,7 @@ Index: linux-rt-devel/kernel/time/posix-timers.c /* Set a POSIX.1b interval timer. */ /* timr->it_lock is taken. */ static int -@@ -898,6 +912,7 @@ retry: +@@ -898,6 +912,7 @@ SYSCALL_DEFINE4(timer_settime, timer_t, if (!timr) return -EINVAL; @@ -153,7 +145,7 @@ Index: linux-rt-devel/kernel/time/posix-timers.c kc = clockid_to_kclock(timr->it_clock); if (WARN_ON_ONCE(!kc || !kc->timer_set)) error = -EINVAL; -@@ -906,9 +921,12 @@ retry: +@@ -906,9 +921,12 @@ SYSCALL_DEFINE4(timer_settime, timer_t, unlock_timer(timr, flag); if (error == TIMER_RETRY) { @@ -166,7 +158,7 @@ Index: linux-rt-devel/kernel/time/posix-timers.c if (old_setting && !error && copy_to_user(old_setting, &old_spec, sizeof (old_spec))) -@@ -946,10 +964,15 @@ retry_delete: +@@ -946,10 +964,15 @@ SYSCALL_DEFINE1(timer_delete, timer_t, t if (!timer) return -EINVAL; diff --git a/patches/hwlat-detector-Don-t-ignore-threshold-module-paramet.patch b/patches/hwlat-detector-Don-t-ignore-threshold-module-paramet.patch index 896100c17566b7..e4cba99d921c1b 100644 --- a/patches/hwlat-detector-Don-t-ignore-threshold-module-paramet.patch +++ b/patches/hwlat-detector-Don-t-ignore-threshold-module-paramet.patch @@ -12,10 +12,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> drivers/misc/hwlat_detector.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux-rt-devel/drivers/misc/hwlat_detector.c -=================================================================== ---- linux-rt-devel.orig/drivers/misc/hwlat_detector.c -+++ linux-rt-devel/drivers/misc/hwlat_detector.c +--- a/drivers/misc/hwlat_detector.c ++++ b/drivers/misc/hwlat_detector.c @@ -414,7 +414,7 @@ static int init_stats(void) goto out; diff --git a/patches/hwlat-detector-Update-hwlat_detector-to-add-outer-lo.patch b/patches/hwlat-detector-Update-hwlat_detector-to-add-outer-lo.patch index de6087073619b0..58f97a82de9c96 100644 --- a/patches/hwlat-detector-Update-hwlat_detector-to-add-outer-lo.patch +++ b/patches/hwlat-detector-Update-hwlat_detector-to-add-outer-lo.patch @@ -44,10 +44,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> drivers/misc/hwlat_detector.c | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) -Index: linux-rt-devel/drivers/misc/hwlat_detector.c -=================================================================== ---- linux-rt-devel.orig/drivers/misc/hwlat_detector.c -+++ linux-rt-devel/drivers/misc/hwlat_detector.c +--- a/drivers/misc/hwlat_detector.c ++++ b/drivers/misc/hwlat_detector.c @@ -143,6 +143,7 @@ static void detector_exit(void); struct sample { u64 seqnum; /* unique sequence */ diff --git a/patches/hwlat-detector-Use-thread-instead-of-stop-machine.patch b/patches/hwlat-detector-Use-thread-instead-of-stop-machine.patch index d3c4e5b514c6bf..fe1a4358324422 100644 --- a/patches/hwlat-detector-Use-thread-instead-of-stop-machine.patch +++ b/patches/hwlat-detector-Use-thread-instead-of-stop-machine.patch @@ -16,10 +16,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> drivers/misc/hwlat_detector.c | 60 ++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 34 deletions(-) -Index: linux-rt-devel/drivers/misc/hwlat_detector.c -=================================================================== ---- linux-rt-devel.orig/drivers/misc/hwlat_detector.c -+++ linux-rt-devel/drivers/misc/hwlat_detector.c +--- a/drivers/misc/hwlat_detector.c ++++ b/drivers/misc/hwlat_detector.c @@ -41,7 +41,6 @@ #include <linux/module.h> #include <linux/init.h> @@ -100,7 +98,7 @@ Index: linux-rt-devel/drivers/misc/hwlat_detector.c out: return ret; } -@@ -305,32 +306,30 @@ out: +@@ -305,32 +306,30 @@ static int get_sample(void *unused) * @unused: A required part of the kthread API. * * Used to periodically sample the CPU TSC via a call to get_sample. We @@ -163,7 +161,7 @@ Index: linux-rt-devel/drivers/misc/hwlat_detector.c } /** -@@ -442,8 +436,7 @@ out: +@@ -442,8 +436,7 @@ static int init_stats(void) * This function provides a generic read implementation for the global state * "data" structure debugfs filesystem entries. It would be nice to use * simple_attr_read directly, but we need to make sure that the data.lock diff --git a/patches/hwlat-detector-Use-trace_clock_local-if-available.patch b/patches/hwlat-detector-Use-trace_clock_local-if-available.patch index b37f1960ef4675..a45adaaf7767fc 100644 --- a/patches/hwlat-detector-Use-trace_clock_local-if-available.patch +++ b/patches/hwlat-detector-Use-trace_clock_local-if-available.patch @@ -14,10 +14,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> drivers/misc/hwlat_detector.c | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) -Index: linux-rt-devel/drivers/misc/hwlat_detector.c -=================================================================== ---- linux-rt-devel.orig/drivers/misc/hwlat_detector.c -+++ linux-rt-devel/drivers/misc/hwlat_detector.c +--- a/drivers/misc/hwlat_detector.c ++++ b/drivers/misc/hwlat_detector.c @@ -51,6 +51,7 @@ #include <linux/version.h> #include <linux/delay.h> diff --git a/patches/hwlatdetect.patch b/patches/hwlatdetect.patch index b0d75d8db55a59..b77f79ffff7bd2 100644 --- a/patches/hwlatdetect.patch +++ b/patches/hwlatdetect.patch @@ -15,10 +15,8 @@ Signed-off-by: Carsten Emde <C.Emde@osadl.org> drivers/misc/hwlat_detector.c | 1212 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 1306 insertions(+) -Index: linux-rt-devel/Documentation/hwlat_detector.txt -=================================================================== --- /dev/null -+++ linux-rt-devel/Documentation/hwlat_detector.txt ++++ b/Documentation/hwlat_detector.txt @@ -0,0 +1,64 @@ +Introduction: +------------- @@ -84,10 +82,8 @@ Index: linux-rt-devel/Documentation/hwlat_detector.txt +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. -Index: linux-rt-devel/drivers/misc/Kconfig -=================================================================== ---- linux-rt-devel.orig/drivers/misc/Kconfig -+++ linux-rt-devel/drivers/misc/Kconfig +--- a/drivers/misc/Kconfig ++++ b/drivers/misc/Kconfig @@ -121,6 +121,35 @@ config IBM_ASM for information on the specific driver level and support statement for your IBM server. @@ -124,10 +120,8 @@ Index: linux-rt-devel/drivers/misc/Kconfig config PHANTOM tristate "Sensable PHANToM (PCI)" depends on PCI -Index: linux-rt-devel/drivers/misc/Makefile -=================================================================== ---- linux-rt-devel.orig/drivers/misc/Makefile -+++ linux-rt-devel/drivers/misc/Makefile +--- a/drivers/misc/Makefile ++++ b/drivers/misc/Makefile @@ -38,6 +38,7 @@ obj-$(CONFIG_C2PORT) += c2port/ obj-$(CONFIG_HMC6352) += hmc6352.o obj-y += eeprom/ @@ -136,10 +130,8 @@ Index: linux-rt-devel/drivers/misc/Makefile obj-$(CONFIG_SPEAR13XX_PCIE_GADGET) += spear13xx_pcie_gadget.o obj-$(CONFIG_VMWARE_BALLOON) += vmw_balloon.o obj-$(CONFIG_ARM_CHARLCD) += arm-charlcd.o -Index: linux-rt-devel/drivers/misc/hwlat_detector.c -=================================================================== --- /dev/null -+++ linux-rt-devel/drivers/misc/hwlat_detector.c ++++ b/drivers/misc/hwlat_detector.c @@ -0,0 +1,1212 @@ +/* + * hwlat_detector.c - A simple Hardware Latency detector. diff --git a/patches/i2c-omap-drop-the-lock-hard-irq-context.patch b/patches/i2c-omap-drop-the-lock-hard-irq-context.patch index d0a5b4244c27c0..d0d91940206821 100644 --- a/patches/i2c-omap-drop-the-lock-hard-irq-context.patch +++ b/patches/i2c-omap-drop-the-lock-hard-irq-context.patch @@ -12,10 +12,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> drivers/i2c/busses/i2c-omap.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) -Index: linux-rt-devel/drivers/i2c/busses/i2c-omap.c -=================================================================== ---- linux-rt-devel.orig/drivers/i2c/busses/i2c-omap.c -+++ linux-rt-devel/drivers/i2c/busses/i2c-omap.c +--- a/drivers/i2c/busses/i2c-omap.c ++++ b/drivers/i2c/busses/i2c-omap.c @@ -996,15 +996,12 @@ omap_i2c_isr(int irq, void *dev_id) u16 mask; u16 stat; diff --git a/patches/i915-bogus-warning-from-i915-when-running-on-PREEMPT.patch b/patches/i915-bogus-warning-from-i915-when-running-on-PREEMPT.patch index 4a3d7359803b3c..cb7557ee15eff9 100644 --- a/patches/i915-bogus-warning-from-i915-when-running-on-PREEMPT.patch +++ b/patches/i915-bogus-warning-from-i915-when-running-on-PREEMPT.patch @@ -16,11 +16,9 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> drivers/gpu/drm/i915/intel_display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux-rt-devel/drivers/gpu/drm/i915/intel_display.c -=================================================================== ---- linux-rt-devel.orig/drivers/gpu/drm/i915/intel_display.c -+++ linux-rt-devel/drivers/gpu/drm/i915/intel_display.c -@@ -10086,7 +10086,7 @@ void intel_check_page_flip(struct drm_de +--- a/drivers/gpu/drm/i915/intel_display.c ++++ b/drivers/gpu/drm/i915/intel_display.c +@@ -10088,7 +10088,7 @@ void intel_check_page_flip(struct drm_de struct drm_crtc *crtc = dev_priv->pipe_to_crtc_mapping[pipe]; struct intel_crtc *intel_crtc = to_intel_crtc(crtc); diff --git a/patches/i915_compile_fix.patch b/patches/i915_compile_fix.patch index d319fbd2575a71..61ffbf809d9583 100644 --- a/patches/i915_compile_fix.patch +++ b/patches/i915_compile_fix.patch @@ -10,10 +10,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> drivers/gpu/drm/i915/i915_gem_shrinker.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux-rt-devel/drivers/gpu/drm/i915/i915_gem_shrinker.c -=================================================================== ---- linux-rt-devel.orig/drivers/gpu/drm/i915/i915_gem_shrinker.c -+++ linux-rt-devel/drivers/gpu/drm/i915/i915_gem_shrinker.c +--- a/drivers/gpu/drm/i915/i915_gem_shrinker.c ++++ b/drivers/gpu/drm/i915/i915_gem_shrinker.c @@ -39,7 +39,7 @@ static bool mutex_is_locked_by(struct mu if (!mutex_is_locked(mutex)) return false; diff --git a/patches/ide-use-nort-local-irq-variants.patch b/patches/ide-use-nort-local-irq-variants.patch index 74f4dbed6dadbb..11e3df947f0e14 100644 --- a/patches/ide-use-nort-local-irq-variants.patch +++ b/patches/ide-use-nort-local-irq-variants.patch @@ -17,10 +17,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> drivers/ide/ide-taskfile.c | 6 +++--- 7 files changed, 16 insertions(+), 16 deletions(-) -Index: linux-rt-devel/drivers/ide/alim15x3.c -=================================================================== ---- linux-rt-devel.orig/drivers/ide/alim15x3.c -+++ linux-rt-devel/drivers/ide/alim15x3.c +--- a/drivers/ide/alim15x3.c ++++ b/drivers/ide/alim15x3.c @@ -234,7 +234,7 @@ static int init_chipset_ali15x3(struct p isa_dev = pci_get_device(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1533, NULL); @@ -30,7 +28,7 @@ Index: linux-rt-devel/drivers/ide/alim15x3.c if (m5229_revision < 0xC2) { /* -@@ -325,7 +325,7 @@ out: +@@ -325,7 +325,7 @@ static int init_chipset_ali15x3(struct p } pci_dev_put(north); pci_dev_put(isa_dev); @@ -39,10 +37,8 @@ Index: linux-rt-devel/drivers/ide/alim15x3.c return 0; } -Index: linux-rt-devel/drivers/ide/hpt366.c -=================================================================== ---- linux-rt-devel.orig/drivers/ide/hpt366.c -+++ linux-rt-devel/drivers/ide/hpt366.c +--- a/drivers/ide/hpt366.c ++++ b/drivers/ide/hpt366.c @@ -1241,7 +1241,7 @@ static int init_dma_hpt366(ide_hwif_t *h dma_old = inb(base + 2); @@ -61,10 +57,8 @@ Index: linux-rt-devel/drivers/ide/hpt366.c printk(KERN_INFO " %s: BM-DMA at 0x%04lx-0x%04lx\n", hwif->name, base, base + 7); -Index: linux-rt-devel/drivers/ide/ide-io-std.c -=================================================================== ---- linux-rt-devel.orig/drivers/ide/ide-io-std.c -+++ linux-rt-devel/drivers/ide/ide-io-std.c +--- a/drivers/ide/ide-io-std.c ++++ b/drivers/ide/ide-io-std.c @@ -175,7 +175,7 @@ void ide_input_data(ide_drive_t *drive, unsigned long uninitialized_var(flags); @@ -101,10 +95,8 @@ Index: linux-rt-devel/drivers/ide/ide-io-std.c if (((len + 1) & 3) < 2) return; -Index: linux-rt-devel/drivers/ide/ide-io.c -=================================================================== ---- linux-rt-devel.orig/drivers/ide/ide-io.c -+++ linux-rt-devel/drivers/ide/ide-io.c +--- a/drivers/ide/ide-io.c ++++ b/drivers/ide/ide-io.c @@ -659,7 +659,7 @@ void ide_timer_expiry (unsigned long dat /* disable_irq_nosync ?? */ disable_irq(hwif->irq); @@ -114,10 +106,8 @@ Index: linux-rt-devel/drivers/ide/ide-io.c if (hwif->polling) { startstop = handler(drive); } else if (drive_is_ready(drive)) { -Index: linux-rt-devel/drivers/ide/ide-iops.c -=================================================================== ---- linux-rt-devel.orig/drivers/ide/ide-iops.c -+++ linux-rt-devel/drivers/ide/ide-iops.c +--- a/drivers/ide/ide-iops.c ++++ b/drivers/ide/ide-iops.c @@ -129,12 +129,12 @@ int __ide_wait_stat(ide_drive_t *drive, if ((stat & ATA_BUSY) == 0) break; @@ -133,10 +123,8 @@ Index: linux-rt-devel/drivers/ide/ide-iops.c } /* * Allow status to settle, then read it again. -Index: linux-rt-devel/drivers/ide/ide-probe.c -=================================================================== ---- linux-rt-devel.orig/drivers/ide/ide-probe.c -+++ linux-rt-devel/drivers/ide/ide-probe.c +--- a/drivers/ide/ide-probe.c ++++ b/drivers/ide/ide-probe.c @@ -196,10 +196,10 @@ static void do_identify(ide_drive_t *dri int bswap = 1; @@ -150,10 +138,8 @@ Index: linux-rt-devel/drivers/ide/ide-probe.c drive->dev_flags |= IDE_DFLAG_ID_READ; #ifdef DEBUG -Index: linux-rt-devel/drivers/ide/ide-taskfile.c -=================================================================== ---- linux-rt-devel.orig/drivers/ide/ide-taskfile.c -+++ linux-rt-devel/drivers/ide/ide-taskfile.c +--- a/drivers/ide/ide-taskfile.c ++++ b/drivers/ide/ide-taskfile.c @@ -250,7 +250,7 @@ void ide_pio_bytes(ide_drive_t *drive, s page_is_high = PageHighMem(page); diff --git a/patches/idr-use-local-lock-for-protection.patch b/patches/idr-use-local-lock-for-protection.patch index 4b36d83fc0702f..b5fec800707428 100644 --- a/patches/idr-use-local-lock-for-protection.patch +++ b/patches/idr-use-local-lock-for-protection.patch @@ -10,10 +10,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> lib/idr.c | 36 +++++++++++++++++++++++++++++++++--- 2 files changed, 37 insertions(+), 3 deletions(-) -Index: linux-rt-devel/include/linux/idr.h -=================================================================== ---- linux-rt-devel.orig/include/linux/idr.h -+++ linux-rt-devel/include/linux/idr.h +--- a/include/linux/idr.h ++++ b/include/linux/idr.h @@ -95,10 +95,14 @@ bool idr_is_empty(struct idr *idp); * Each idr_preload() should be matched with an invocation of this * function. See idr_preload() for details. @@ -29,10 +27,8 @@ Index: linux-rt-devel/include/linux/idr.h /** * idr_find - return pointer for given id -Index: linux-rt-devel/lib/idr.c -=================================================================== ---- linux-rt-devel.orig/lib/idr.c -+++ linux-rt-devel/lib/idr.c +--- a/lib/idr.c ++++ b/lib/idr.c @@ -30,6 +30,7 @@ #include <linux/idr.h> #include <linux/spinlock.h> diff --git a/patches/infiniband-mellanox-ib-use-nort-irq.patch b/patches/infiniband-mellanox-ib-use-nort-irq.patch index 6ab24ff90045eb..b282436e6f6946 100644 --- a/patches/infiniband-mellanox-ib-use-nort-irq.patch +++ b/patches/infiniband-mellanox-ib-use-nort-irq.patch @@ -18,10 +18,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -Index: linux-rt-devel/drivers/infiniband/ulp/ipoib/ipoib_multicast.c -=================================================================== ---- linux-rt-devel.orig/drivers/infiniband/ulp/ipoib/ipoib_multicast.c -+++ linux-rt-devel/drivers/infiniband/ulp/ipoib/ipoib_multicast.c +--- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c ++++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c @@ -821,7 +821,7 @@ void ipoib_mcast_restart_task(struct wor ipoib_dbg_mcast(priv, "restarting multicast task\n"); diff --git a/patches/inpt-gameport-use-local-irq-nort.patch b/patches/inpt-gameport-use-local-irq-nort.patch index 87ac240c25f0ea..97e0e68484971d 100644 --- a/patches/inpt-gameport-use-local-irq-nort.patch +++ b/patches/inpt-gameport-use-local-irq-nort.patch @@ -11,10 +11,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> drivers/input/gameport/gameport.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -Index: linux-rt-devel/drivers/input/gameport/gameport.c -=================================================================== ---- linux-rt-devel.orig/drivers/input/gameport/gameport.c -+++ linux-rt-devel/drivers/input/gameport/gameport.c +--- a/drivers/input/gameport/gameport.c ++++ b/drivers/input/gameport/gameport.c @@ -124,12 +124,12 @@ static int old_gameport_measure_speed(st tx = 1 << 30; diff --git a/patches/introduce_migrate_disable_cpu_light.patch b/patches/introduce_migrate_disable_cpu_light.patch index 8bd71132cc1b26..d39d066156e6cb 100644 --- a/patches/introduce_migrate_disable_cpu_light.patch +++ b/patches/introduce_migrate_disable_cpu_light.patch @@ -39,10 +39,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> lib/smp_processor_id.c | 5 + 7 files changed, 178 insertions(+), 9 deletions(-) -Index: linux-rt-devel/include/linux/cpu.h -=================================================================== ---- linux-rt-devel.orig/include/linux/cpu.h -+++ linux-rt-devel/include/linux/cpu.h +--- a/include/linux/cpu.h ++++ b/include/linux/cpu.h @@ -221,6 +221,9 @@ static inline void smpboot_thread_init(v #endif /* CONFIG_SMP */ extern struct bus_type cpu_subsys; @@ -53,11 +51,9 @@ Index: linux-rt-devel/include/linux/cpu.h #ifdef CONFIG_HOTPLUG_CPU /* Stop CPUs going up and down. */ -Index: linux-rt-devel/include/linux/preempt.h -=================================================================== ---- linux-rt-devel.orig/include/linux/preempt.h -+++ linux-rt-devel/include/linux/preempt.h -@@ -153,11 +153,20 @@ do { \ +--- a/include/linux/preempt.h ++++ b/include/linux/preempt.h +@@ -154,11 +154,20 @@ do { \ # define preempt_enable_rt() preempt_enable() # define preempt_disable_nort() barrier() # define preempt_enable_nort() barrier() @@ -78,10 +74,8 @@ Index: linux-rt-devel/include/linux/preempt.h #endif #ifdef CONFIG_PREEMPT_NOTIFIERS -Index: linux-rt-devel/include/linux/sched.h -=================================================================== ---- linux-rt-devel.orig/include/linux/sched.h -+++ linux-rt-devel/include/linux/sched.h +--- a/include/linux/sched.h ++++ b/include/linux/sched.h @@ -1371,6 +1371,12 @@ struct task_struct { #endif @@ -105,7 +99,7 @@ Index: linux-rt-devel/include/linux/sched.h #define TNF_MIGRATED 0x01 #define TNF_NO_GROUP 0x02 #define TNF_SHARED 0x04 -@@ -3072,6 +3075,26 @@ static inline void set_task_cpu(struct t +@@ -3066,6 +3069,26 @@ static inline void set_task_cpu(struct t #endif /* CONFIG_SMP */ @@ -132,10 +126,8 @@ Index: linux-rt-devel/include/linux/sched.h extern long sched_setaffinity(pid_t pid, const struct cpumask *new_mask); extern long sched_getaffinity(pid_t pid, struct cpumask *mask); -Index: linux-rt-devel/include/linux/smp.h -=================================================================== ---- linux-rt-devel.orig/include/linux/smp.h -+++ linux-rt-devel/include/linux/smp.h +--- a/include/linux/smp.h ++++ b/include/linux/smp.h @@ -185,6 +185,9 @@ static inline void smp_init(void) { } #define get_cpu() ({ preempt_disable(); smp_processor_id(); }) #define put_cpu() preempt_enable() @@ -146,11 +138,9 @@ Index: linux-rt-devel/include/linux/smp.h /* * Callback to arch code if there's nosmp or maxcpus=0 on the * boot command line: -Index: linux-rt-devel/kernel/sched/core.c -=================================================================== ---- linux-rt-devel.orig/kernel/sched/core.c -+++ linux-rt-devel/kernel/sched/core.c -@@ -2696,6 +2696,125 @@ static inline void schedule_debug(struct +--- a/kernel/sched/core.c ++++ b/kernel/sched/core.c +@@ -2703,6 +2703,125 @@ static inline void schedule_debug(struct schedstat_inc(this_rq(), sched_count); } @@ -276,7 +266,7 @@ Index: linux-rt-devel/kernel/sched/core.c /* * Pick up the highest-prio task: */ -@@ -2802,6 +2921,8 @@ static void __sched __schedule(void) +@@ -2809,6 +2928,8 @@ static void __sched __schedule(void) smp_mb__before_spinlock(); raw_spin_lock_irq(&rq->lock); @@ -285,7 +275,7 @@ Index: linux-rt-devel/kernel/sched/core.c rq->clock_skip_update <<= 1; /* promote REQ to ACT */ switch_count = &prev->nivcsw; -@@ -4803,11 +4924,13 @@ static struct rq *move_queued_task(struc +@@ -4810,11 +4931,13 @@ static struct rq *move_queued_task(struc void do_set_cpus_allowed(struct task_struct *p, const struct cpumask *new_mask) { @@ -302,7 +292,7 @@ Index: linux-rt-devel/kernel/sched/core.c } /* -@@ -4853,7 +4976,7 @@ int set_cpus_allowed_ptr(struct task_str +@@ -4860,7 +4983,7 @@ int set_cpus_allowed_ptr(struct task_str do_set_cpus_allowed(p, new_mask); /* Can the task run on the task's current CPU? If so, we're done */ @@ -311,10 +301,8 @@ Index: linux-rt-devel/kernel/sched/core.c goto out; dest_cpu = cpumask_any_and(cpu_active_mask, new_mask); -Index: linux-rt-devel/kernel/sched/debug.c -=================================================================== ---- linux-rt-devel.orig/kernel/sched/debug.c -+++ linux-rt-devel/kernel/sched/debug.c +--- a/kernel/sched/debug.c ++++ b/kernel/sched/debug.c @@ -260,6 +260,9 @@ void print_rt_rq(struct seq_file *m, int P(rt_throttled); PN(rt_time); @@ -336,10 +324,8 @@ Index: linux-rt-devel/kernel/sched/debug.c #undef PN #undef __PN #undef P -Index: linux-rt-devel/lib/smp_processor_id.c -=================================================================== ---- linux-rt-devel.orig/lib/smp_processor_id.c -+++ linux-rt-devel/lib/smp_processor_id.c +--- a/lib/smp_processor_id.c ++++ b/lib/smp_processor_id.c @@ -39,8 +39,9 @@ notrace static unsigned int check_preemp if (!printk_ratelimit()) goto out_enable; diff --git a/patches/ipc-make-rt-aware.patch b/patches/ipc-make-rt-aware.patch index 61b2d7dd17d516..78f3ed82b8d913 100644 --- a/patches/ipc-make-rt-aware.patch +++ b/patches/ipc-make-rt-aware.patch @@ -14,10 +14,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> ipc/msg.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) -Index: linux-rt-devel/ipc/msg.c -=================================================================== ---- linux-rt-devel.orig/ipc/msg.c -+++ linux-rt-devel/ipc/msg.c +--- a/ipc/msg.c ++++ b/ipc/msg.c @@ -188,6 +188,12 @@ static void expunge_all(struct msg_queue struct msg_receiver *msr, *t; diff --git a/patches/ipc-sem-rework-semaphore-wakeups.patch b/patches/ipc-sem-rework-semaphore-wakeups.patch index 0b20e11045c82b..aaece82917bfe8 100644 --- a/patches/ipc-sem-rework-semaphore-wakeups.patch +++ b/patches/ipc-sem-rework-semaphore-wakeups.patch @@ -27,11 +27,9 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> ipc/sem.c | 10 ++++++++++ 1 file changed, 10 insertions(+) -Index: linux-rt-devel/ipc/sem.c -=================================================================== ---- linux-rt-devel.orig/ipc/sem.c -+++ linux-rt-devel/ipc/sem.c -@@ -690,6 +690,13 @@ undo: +--- a/ipc/sem.c ++++ b/ipc/sem.c +@@ -690,6 +690,13 @@ static int perform_atomic_semop(struct s static void wake_up_sem_queue_prepare(struct list_head *pt, struct sem_queue *q, int error) { diff --git a/patches/irq-allow-disabling-of-softirq-processing-in-irq-thread-context.patch b/patches/irq-allow-disabling-of-softirq-processing-in-irq-thread-context.patch index 96f9a8a363bd49..729cd55447972d 100644 --- a/patches/irq-allow-disabling-of-softirq-processing-in-irq-thread-context.patch +++ b/patches/irq-allow-disabling-of-softirq-processing-in-irq-thread-context.patch @@ -18,10 +18,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/softirq.c | 9 +++++++++ 5 files changed, 38 insertions(+), 2 deletions(-) -Index: linux-rt-devel/include/linux/interrupt.h -=================================================================== ---- linux-rt-devel.orig/include/linux/interrupt.h -+++ linux-rt-devel/include/linux/interrupt.h +--- a/include/linux/interrupt.h ++++ b/include/linux/interrupt.h @@ -61,6 +61,7 @@ * interrupt handler after suspending interrupts. For system * wakeup devices users need to implement wakeup detection in @@ -38,10 +36,8 @@ Index: linux-rt-devel/include/linux/interrupt.h #define IRQF_TIMER (__IRQF_TIMER | IRQF_NO_SUSPEND | IRQF_NO_THREAD) -Index: linux-rt-devel/include/linux/irq.h -=================================================================== ---- linux-rt-devel.orig/include/linux/irq.h -+++ linux-rt-devel/include/linux/irq.h +--- a/include/linux/irq.h ++++ b/include/linux/irq.h @@ -72,6 +72,7 @@ enum irqchip_irq_state; * IRQ_IS_POLLED - Always polled by another interrupt. Exclude * it from the spurious interrupt detection @@ -66,10 +62,8 @@ Index: linux-rt-devel/include/linux/irq.h #define IRQ_NO_BALANCING_MASK (IRQ_PER_CPU | IRQ_NO_BALANCING) -Index: linux-rt-devel/kernel/irq/manage.c -=================================================================== ---- linux-rt-devel.orig/kernel/irq/manage.c -+++ linux-rt-devel/kernel/irq/manage.c +--- a/kernel/irq/manage.c ++++ b/kernel/irq/manage.c @@ -907,7 +907,15 @@ irq_forced_thread_fn(struct irq_desc *de local_bh_disable(); ret = action->thread_fn(action->irq, action->dev_id); @@ -87,7 +81,7 @@ Index: linux-rt-devel/kernel/irq/manage.c return ret; } -@@ -1357,6 +1365,9 @@ __setup_irq(unsigned int irq, struct irq +@@ -1357,6 +1365,9 @@ static int irqd_set(&desc->irq_data, IRQD_NO_BALANCING); } @@ -97,10 +91,8 @@ Index: linux-rt-devel/kernel/irq/manage.c /* Set default affinity mask once everything is setup */ setup_affinity(irq, desc, mask); -Index: linux-rt-devel/kernel/irq/settings.h -=================================================================== ---- linux-rt-devel.orig/kernel/irq/settings.h -+++ linux-rt-devel/kernel/irq/settings.h +--- a/kernel/irq/settings.h ++++ b/kernel/irq/settings.h @@ -15,6 +15,7 @@ enum { _IRQ_NESTED_THREAD = IRQ_NESTED_THREAD, _IRQ_PER_CPU_DEVID = IRQ_PER_CPU_DEVID, @@ -134,10 +126,8 @@ Index: linux-rt-devel/kernel/irq/settings.h static inline bool irq_settings_is_per_cpu(struct irq_desc *desc) { return desc->status_use_accessors & _IRQ_PER_CPU; -Index: linux-rt-devel/kernel/softirq.c -=================================================================== ---- linux-rt-devel.orig/kernel/softirq.c -+++ linux-rt-devel/kernel/softirq.c +--- a/kernel/softirq.c ++++ b/kernel/softirq.c @@ -576,6 +576,15 @@ void __local_bh_enable(void) } EXPORT_SYMBOL(__local_bh_enable); diff --git a/patches/irqwork-push_most_work_into_softirq_context.patch b/patches/irqwork-push_most_work_into_softirq_context.patch index 3c116f6dd54d21..b4ffd72b23ed81 100644 --- a/patches/irqwork-push_most_work_into_softirq_context.patch +++ b/patches/irqwork-push_most_work_into_softirq_context.patch @@ -26,10 +26,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> kernel/time/timer.c | 6 +++++- 5 files changed, 47 insertions(+), 14 deletions(-) -Index: linux-rt-devel/include/linux/irq_work.h -=================================================================== ---- linux-rt-devel.orig/include/linux/irq_work.h -+++ linux-rt-devel/include/linux/irq_work.h +--- a/include/linux/irq_work.h ++++ b/include/linux/irq_work.h @@ -16,6 +16,7 @@ #define IRQ_WORK_BUSY 2UL #define IRQ_WORK_FLAGS 3UL @@ -38,10 +36,8 @@ Index: linux-rt-devel/include/linux/irq_work.h struct irq_work { unsigned long flags; -Index: linux-rt-devel/kernel/irq_work.c -=================================================================== ---- linux-rt-devel.orig/kernel/irq_work.c -+++ linux-rt-devel/kernel/irq_work.c +--- a/kernel/irq_work.c ++++ b/kernel/irq_work.c @@ -17,6 +17,7 @@ #include <linux/cpu.h> #include <linux/notifier.h> @@ -145,10 +141,8 @@ Index: linux-rt-devel/kernel/irq_work.c } EXPORT_SYMBOL_GPL(irq_work_run); -Index: linux-rt-devel/kernel/sched/rt.c -=================================================================== ---- linux-rt-devel.orig/kernel/sched/rt.c -+++ linux-rt-devel/kernel/sched/rt.c +--- a/kernel/sched/rt.c ++++ b/kernel/sched/rt.c @@ -90,6 +90,7 @@ void init_rt_rq(struct rt_rq *rt_rq) rt_rq->push_cpu = nr_cpu_ids; raw_spin_lock_init(&rt_rq->push_lock); @@ -157,10 +151,8 @@ Index: linux-rt-devel/kernel/sched/rt.c #endif #endif /* CONFIG_SMP */ /* We start is dequeued state, because no RT tasks are queued */ -Index: linux-rt-devel/kernel/time/tick-sched.c -=================================================================== ---- linux-rt-devel.orig/kernel/time/tick-sched.c -+++ linux-rt-devel/kernel/time/tick-sched.c +--- a/kernel/time/tick-sched.c ++++ b/kernel/time/tick-sched.c @@ -181,6 +181,11 @@ static bool can_stop_full_tick(void) return false; } @@ -181,10 +173,8 @@ Index: linux-rt-devel/kernel/time/tick-sched.c }; /* -Index: linux-rt-devel/kernel/time/timer.c -=================================================================== ---- linux-rt-devel.orig/kernel/time/timer.c -+++ linux-rt-devel/kernel/time/timer.c +--- a/kernel/time/timer.c ++++ b/kernel/time/timer.c @@ -1455,7 +1455,7 @@ void update_process_times(int user_tick) scheduler_tick(); run_local_timers(); diff --git a/patches/jump-label-rt.patch b/patches/jump-label-rt.patch index 99c73a81d40041..b5ea36db24b1e7 100644 --- a/patches/jump-label-rt.patch +++ b/patches/jump-label-rt.patch @@ -22,10 +22,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> arch/arm/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux-rt-devel/arch/arm/Kconfig -=================================================================== ---- linux-rt-devel.orig/arch/arm/Kconfig -+++ linux-rt-devel/arch/arm/Kconfig +--- a/arch/arm/Kconfig ++++ b/arch/arm/Kconfig @@ -31,7 +31,7 @@ config ARM select HARDIRQS_SW_RESEND select HAVE_ARCH_AUDITSYSCALL if (AEABI && !OABI_COMPAT) diff --git a/patches/kconfig-disable-a-few-options-rt.patch b/patches/kconfig-disable-a-few-options-rt.patch index 69c8731fc597c1..10df569c51a077 100644 --- a/patches/kconfig-disable-a-few-options-rt.patch +++ b/patches/kconfig-disable-a-few-options-rt.patch @@ -10,10 +10,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> mm/Kconfig | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -Index: linux-rt-devel/arch/Kconfig -=================================================================== ---- linux-rt-devel.orig/arch/Kconfig -+++ linux-rt-devel/arch/Kconfig +--- a/arch/Kconfig ++++ b/arch/Kconfig @@ -6,6 +6,7 @@ config OPROFILE tristate "OProfile system profiling" depends on PROFILING @@ -22,10 +20,8 @@ Index: linux-rt-devel/arch/Kconfig select RING_BUFFER select RING_BUFFER_ALLOW_SWAP help -Index: linux-rt-devel/mm/Kconfig -=================================================================== ---- linux-rt-devel.orig/mm/Kconfig -+++ linux-rt-devel/mm/Kconfig +--- a/mm/Kconfig ++++ b/mm/Kconfig @@ -409,7 +409,7 @@ config NOMMU_INITIAL_TRIM_EXCESS config TRANSPARENT_HUGEPAGE diff --git a/patches/kconfig-preempt-rt-full.patch b/patches/kconfig-preempt-rt-full.patch index 9ad225ca7101fc..b43504e381de8e 100644 --- a/patches/kconfig-preempt-rt-full.patch +++ b/patches/kconfig-preempt-rt-full.patch @@ -11,20 +11,16 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> scripts/mkcompile_h | 4 +++- 3 files changed, 12 insertions(+), 2 deletions(-) -Index: linux-rt-devel/init/Makefile -=================================================================== ---- linux-rt-devel.orig/init/Makefile -+++ linux-rt-devel/init/Makefile -@@ -33,4 +33,4 @@ silent_chk_compile.h = : +--- a/init/Makefile ++++ b/init/Makefile +@@ -33,4 +33,4 @@ mounts-$(CONFIG_BLK_DEV_MD) += do_mounts 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)" -Index: linux-rt-devel/kernel/Kconfig.preempt -=================================================================== ---- linux-rt-devel.orig/kernel/Kconfig.preempt -+++ linux-rt-devel/kernel/Kconfig.preempt +--- a/kernel/Kconfig.preempt ++++ b/kernel/Kconfig.preempt @@ -67,6 +67,14 @@ config PREEMPT_RTB enables changes which are preliminary for the full preemptible RT kernel. @@ -40,10 +36,8 @@ Index: linux-rt-devel/kernel/Kconfig.preempt endchoice config PREEMPT_COUNT -Index: linux-rt-devel/scripts/mkcompile_h -=================================================================== ---- linux-rt-devel.orig/scripts/mkcompile_h -+++ linux-rt-devel/scripts/mkcompile_h +--- a/scripts/mkcompile_h ++++ b/scripts/mkcompile_h @@ -4,7 +4,8 @@ TARGET=$1 ARCH=$2 SMP=$3 diff --git a/patches/kernel-SRCU-provide-a-static-initializer.patch b/patches/kernel-SRCU-provide-a-static-initializer.patch index 4fd98f961f5614..d63ac9a0f40f58 100644 --- a/patches/kernel-SRCU-provide-a-static-initializer.patch +++ b/patches/kernel-SRCU-provide-a-static-initializer.patch @@ -17,10 +17,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> include/linux/srcu.h | 6 +++--- 2 files changed, 28 insertions(+), 12 deletions(-) -Index: linux-rt-devel/include/linux/notifier.h -=================================================================== ---- linux-rt-devel.orig/include/linux/notifier.h -+++ linux-rt-devel/include/linux/notifier.h +--- a/include/linux/notifier.h ++++ b/include/linux/notifier.h @@ -6,7 +6,7 @@ * * Alan Cox <Alan.Cox@linux.org> @@ -100,10 +98,8 @@ Index: linux-rt-devel/include/linux/notifier.h /* CPU notfiers are defined in include/linux/cpu.h. */ /* netdevice notifiers are defined in include/linux/netdevice.h */ -Index: linux-rt-devel/include/linux/srcu.h -=================================================================== ---- linux-rt-devel.orig/include/linux/srcu.h -+++ linux-rt-devel/include/linux/srcu.h +--- a/include/linux/srcu.h ++++ b/include/linux/srcu.h @@ -84,10 +84,10 @@ int init_srcu_struct(struct srcu_struct void process_srcu(struct work_struct *work); diff --git a/patches/kernel-cpu-fix-cpu-down-problem-if-kthread-s-cpu-is-.patch b/patches/kernel-cpu-fix-cpu-down-problem-if-kthread-s-cpu-is-.patch index 8e722dd8c06b38..421b4966210bb6 100644 --- a/patches/kernel-cpu-fix-cpu-down-problem-if-kthread-s-cpu-is-.patch +++ b/patches/kernel-cpu-fix-cpu-down-problem-if-kthread-s-cpu-is-.patch @@ -24,10 +24,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> kernel/cpu.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) -Index: linux-rt-devel/kernel/cpu.c -=================================================================== ---- linux-rt-devel.orig/kernel/cpu.c -+++ linux-rt-devel/kernel/cpu.c +--- a/kernel/cpu.c ++++ b/kernel/cpu.c @@ -108,6 +108,7 @@ struct hotplug_pcp { int refcount; int grab_lock; diff --git a/patches/kernel-hotplug-restore-original-cpu-mask-oncpu-down.patch b/patches/kernel-hotplug-restore-original-cpu-mask-oncpu-down.patch index efb06967d7c9f3..44da96651dfe05 100644 --- a/patches/kernel-hotplug-restore-original-cpu-mask-oncpu-down.patch +++ b/patches/kernel-hotplug-restore-original-cpu-mask-oncpu-down.patch @@ -13,10 +13,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> kernel/cpu.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) -Index: linux-rt-devel/kernel/cpu.c -=================================================================== ---- linux-rt-devel.orig/kernel/cpu.c -+++ linux-rt-devel/kernel/cpu.c +--- a/kernel/cpu.c ++++ b/kernel/cpu.c @@ -640,6 +640,7 @@ static int __ref _cpu_down(unsigned int .hcpu = hcpu, }; @@ -48,7 +46,7 @@ Index: linux-rt-devel/kernel/cpu.c } cpu_hotplug_begin(); -@@ -740,6 +748,9 @@ out_cancel: +@@ -740,6 +748,9 @@ static int __ref _cpu_down(unsigned int cpu_hotplug_done(); if (!err) cpu_notify_nofail(CPU_POST_DEAD | mod, hcpu); diff --git a/patches/kgb-serial-hackaround.patch b/patches/kgb-serial-hackaround.patch index 6caf9a67b84a68..77eb4fe7bf596d 100644 --- a/patches/kgb-serial-hackaround.patch +++ b/patches/kgb-serial-hackaround.patch @@ -23,10 +23,8 @@ Jason. kernel/debug/kdb/kdb_io.c | 6 ++---- 3 files changed, 6 insertions(+), 5 deletions(-) -Index: linux-rt-devel/drivers/tty/serial/8250/8250_core.c -=================================================================== ---- linux-rt-devel.orig/drivers/tty/serial/8250/8250_core.c -+++ linux-rt-devel/drivers/tty/serial/8250/8250_core.c +--- a/drivers/tty/serial/8250/8250_core.c ++++ b/drivers/tty/serial/8250/8250_core.c @@ -36,6 +36,7 @@ #include <linux/nmi.h> #include <linux/mutex.h> @@ -35,7 +33,7 @@ Index: linux-rt-devel/drivers/tty/serial/8250/8250_core.c #include <linux/uaccess.h> #include <linux/pm_runtime.h> #ifdef CONFIG_SPARC -@@ -3373,7 +3374,7 @@ static void serial8250_console_write(str +@@ -3381,7 +3382,7 @@ static void serial8250_console_write(str if (port->sysrq) locked = 0; @@ -44,10 +42,8 @@ Index: linux-rt-devel/drivers/tty/serial/8250/8250_core.c locked = spin_trylock_irqsave(&port->lock, flags); else spin_lock_irqsave(&port->lock, flags); -Index: linux-rt-devel/include/linux/kdb.h -=================================================================== ---- linux-rt-devel.orig/include/linux/kdb.h -+++ linux-rt-devel/include/linux/kdb.h +--- a/include/linux/kdb.h ++++ b/include/linux/kdb.h @@ -167,6 +167,7 @@ extern __printf(2, 0) int vkdb_printf(en extern __printf(1, 2) int kdb_printf(const char *, ...); typedef __printf(1, 2) int (*kdb_printf_t)(const char *, ...); @@ -64,10 +60,8 @@ Index: linux-rt-devel/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; } -Index: linux-rt-devel/kernel/debug/kdb/kdb_io.c -=================================================================== ---- linux-rt-devel.orig/kernel/debug/kdb/kdb_io.c -+++ linux-rt-devel/kernel/debug/kdb/kdb_io.c +--- a/kernel/debug/kdb/kdb_io.c ++++ b/kernel/debug/kdb/kdb_io.c @@ -554,7 +554,6 @@ int vkdb_printf(enum kdb_msgsrc src, con int linecount; int colcount; @@ -85,7 +79,7 @@ Index: linux-rt-devel/kernel/debug/kdb/kdb_io.c /* Serialize kdb_printf if multiple cpus try to write at once. * But if any cpu goes recursive in kdb, just print the output, -@@ -855,7 +852,6 @@ kdb_print_out: +@@ -855,7 +852,6 @@ int vkdb_printf(enum kdb_msgsrc src, con } else { __release(kdb_printf_lock); } diff --git a/patches/latency-hist.patch b/patches/latency-hist.patch index 60e3b51ed190d8..c28447dd6830da 100644 --- a/patches/latency-hist.patch +++ b/patches/latency-hist.patch @@ -25,10 +25,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/trace/trace_irqsoff.c | 11 10 files changed, 1616 insertions(+) -Index: linux-rt-devel/Documentation/trace/histograms.txt -=================================================================== --- /dev/null -+++ linux-rt-devel/Documentation/trace/histograms.txt ++++ b/Documentation/trace/histograms.txt @@ -0,0 +1,186 @@ + Using the Linux Kernel Latency Histograms + @@ -216,10 +214,8 @@ Index: linux-rt-devel/Documentation/trace/histograms.txt +is provided. + +These data are also reset when the wakeup histogram is reset. -Index: linux-rt-devel/include/linux/hrtimer.h -=================================================================== ---- linux-rt-devel.orig/include/linux/hrtimer.h -+++ linux-rt-devel/include/linux/hrtimer.h +--- a/include/linux/hrtimer.h ++++ b/include/linux/hrtimer.h @@ -111,6 +111,9 @@ struct hrtimer { enum hrtimer_restart (*function)(struct hrtimer *); struct hrtimer_clock_base *base; @@ -230,10 +226,8 @@ Index: linux-rt-devel/include/linux/hrtimer.h #ifdef CONFIG_TIMER_STATS int start_pid; void *start_site; -Index: linux-rt-devel/include/linux/sched.h -=================================================================== ---- linux-rt-devel.orig/include/linux/sched.h -+++ linux-rt-devel/include/linux/sched.h +--- a/include/linux/sched.h ++++ b/include/linux/sched.h @@ -1753,6 +1753,12 @@ struct task_struct { unsigned long trace; /* bitmask and counter of trace recursion */ @@ -247,10 +241,8 @@ Index: linux-rt-devel/include/linux/sched.h #endif /* CONFIG_TRACING */ #ifdef CONFIG_MEMCG struct memcg_oom_info { -Index: linux-rt-devel/include/trace/events/hist.h -=================================================================== --- /dev/null -+++ linux-rt-devel/include/trace/events/hist.h ++++ b/include/trace/events/hist.h @@ -0,0 +1,74 @@ +#undef TRACE_SYSTEM +#define TRACE_SYSTEM hist @@ -326,10 +318,8 @@ Index: linux-rt-devel/include/trace/events/hist.h + +/* This part must be outside protection */ +#include <trace/define_trace.h> -Index: linux-rt-devel/include/trace/events/latency_hist.h -=================================================================== --- /dev/null -+++ linux-rt-devel/include/trace/events/latency_hist.h ++++ b/include/trace/events/latency_hist.h @@ -0,0 +1,29 @@ +#ifndef _LATENCY_HIST_H +#define _LATENCY_HIST_H @@ -360,10 +350,8 @@ Index: linux-rt-devel/include/trace/events/latency_hist.h +} + +#endif /* _LATENCY_HIST_H */ -Index: linux-rt-devel/kernel/time/hrtimer.c -=================================================================== ---- linux-rt-devel.orig/kernel/time/hrtimer.c -+++ linux-rt-devel/kernel/time/hrtimer.c +--- a/kernel/time/hrtimer.c ++++ b/kernel/time/hrtimer.c @@ -53,6 +53,7 @@ #include <asm/uaccess.h> @@ -398,7 +386,7 @@ Index: linux-rt-devel/kernel/time/hrtimer.c /* * High resolution timer interrupt * Called with interrupts disabled -@@ -1281,6 +1293,15 @@ retry: +@@ -1281,6 +1293,15 @@ void hrtimer_interrupt(struct clock_even timer = container_of(node, struct hrtimer, node); @@ -414,10 +402,8 @@ Index: linux-rt-devel/kernel/time/hrtimer.c /* * The immediate goal for using the softexpires is * minimizing wakeups, not running timers at the -Index: linux-rt-devel/kernel/trace/Kconfig -=================================================================== ---- linux-rt-devel.orig/kernel/trace/Kconfig -+++ linux-rt-devel/kernel/trace/Kconfig +--- a/kernel/trace/Kconfig ++++ b/kernel/trace/Kconfig @@ -187,6 +187,24 @@ config IRQSOFF_TRACER enabled. This option and the preempt-off timing option can be used together or separately.) @@ -543,10 +529,8 @@ Index: linux-rt-devel/kernel/trace/Kconfig config ENABLE_DEFAULT_TRACERS bool "Trace process context switches and events" depends on !GENERIC_TRACER -Index: linux-rt-devel/kernel/trace/Makefile -=================================================================== ---- linux-rt-devel.orig/kernel/trace/Makefile -+++ linux-rt-devel/kernel/trace/Makefile +--- a/kernel/trace/Makefile ++++ b/kernel/trace/Makefile @@ -36,6 +36,10 @@ obj-$(CONFIG_FUNCTION_TRACER) += trace_f obj-$(CONFIG_IRQSOFF_TRACER) += trace_irqsoff.o obj-$(CONFIG_PREEMPT_TRACER) += trace_irqsoff.o @@ -558,10 +542,8 @@ Index: linux-rt-devel/kernel/trace/Makefile obj-$(CONFIG_NOP_TRACER) += trace_nop.o obj-$(CONFIG_STACK_TRACER) += trace_stack.o obj-$(CONFIG_MMIOTRACE) += trace_mmiotrace.o -Index: linux-rt-devel/kernel/trace/latency_hist.c -=================================================================== --- /dev/null -+++ linux-rt-devel/kernel/trace/latency_hist.c ++++ b/kernel/trace/latency_hist.c @@ -0,0 +1,1178 @@ +/* + * kernel/trace/latency_hist.c @@ -1741,10 +1723,8 @@ Index: linux-rt-devel/kernel/trace/latency_hist.c +} + +device_initcall(latency_hist_init); -Index: linux-rt-devel/kernel/trace/trace_irqsoff.c -=================================================================== ---- linux-rt-devel.orig/kernel/trace/trace_irqsoff.c -+++ linux-rt-devel/kernel/trace/trace_irqsoff.c +--- a/kernel/trace/trace_irqsoff.c ++++ b/kernel/trace/trace_irqsoff.c @@ -13,6 +13,7 @@ #include <linux/uaccess.h> #include <linux/module.h> @@ -1805,7 +1785,7 @@ Index: linux-rt-devel/kernel/trace/trace_irqsoff.c if (!preempt_trace() && irq_trace()) stop_critical_timing(CALLER_ADDR0, caller_addr); } -@@ -503,6 +511,7 @@ __visible void trace_hardirqs_off_caller +@@ -503,6 +511,7 @@ EXPORT_SYMBOL(trace_hardirqs_on_caller); { if (!preempt_trace() && irq_trace()) start_critical_timing(CALLER_ADDR0, caller_addr); diff --git a/patches/latency_hist-update-sched_wakeup-probe.patch b/patches/latency_hist-update-sched_wakeup-probe.patch index 8ec3e20d2c7a21..60847932f3568e 100644 --- a/patches/latency_hist-update-sched_wakeup-probe.patch +++ b/patches/latency_hist-update-sched_wakeup-probe.patch @@ -15,14 +15,12 @@ Cc: Steven Rostedt <rostedt@goodmis.org> Link: http://lkml.kernel.org/r/1445810765-18732-1-git-send-email-mathieu.desnoyers@efficios.com Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- - kernel/trace/latency_hist.c | 4 ++-- + kernel/trace/latency_hist.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/kernel/trace/latency_hist.c b/kernel/trace/latency_hist.c -index 66a69eb..b6c1d14 100644 --- a/kernel/trace/latency_hist.c +++ b/kernel/trace/latency_hist.c -@@ -115,7 +115,7 @@ static DEFINE_PER_CPU(struct hist_data, wakeup_latency_hist_sharedprio); +@@ -115,7 +115,7 @@ static DEFINE_PER_CPU(struct hist_data, static char *wakeup_latency_hist_dir = "wakeup"; static char *wakeup_latency_hist_dir_sharedprio = "sharedprio"; static notrace void probe_wakeup_latency_hist_start(void *v, @@ -31,7 +29,7 @@ index 66a69eb..b6c1d14 100644 static notrace void probe_wakeup_latency_hist_stop(void *v, struct task_struct *prev, struct task_struct *next); static notrace void probe_sched_migrate_task(void *, -@@ -869,7 +869,7 @@ static notrace void probe_sched_migrate_task(void *v, struct task_struct *task, +@@ -869,7 +869,7 @@ static notrace void probe_sched_migrate_ } static notrace void probe_wakeup_latency_hist_start(void *v, @@ -40,8 +38,3 @@ index 66a69eb..b6c1d14 100644 { unsigned long flags; struct task_struct *curr = current; --- -2.1.4 - - - diff --git a/patches/leds-trigger-disable-CPU-trigger-on-RT.patch b/patches/leds-trigger-disable-CPU-trigger-on-RT.patch index dd0362b819451e..b275ed2a2c1296 100644 --- a/patches/leds-trigger-disable-CPU-trigger-on-RT.patch +++ b/patches/leds-trigger-disable-CPU-trigger-on-RT.patch @@ -22,10 +22,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> drivers/leds/trigger/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux-rt-devel/drivers/leds/trigger/Kconfig -=================================================================== ---- linux-rt-devel.orig/drivers/leds/trigger/Kconfig -+++ linux-rt-devel/drivers/leds/trigger/Kconfig +--- a/drivers/leds/trigger/Kconfig ++++ b/drivers/leds/trigger/Kconfig @@ -61,7 +61,7 @@ config LEDS_TRIGGER_BACKLIGHT config LEDS_TRIGGER_CPU diff --git a/patches/lglocks-rt.patch b/patches/lglocks-rt.patch index 3e88c2c28898ed..2998b6da439637 100644 --- a/patches/lglocks-rt.patch +++ b/patches/lglocks-rt.patch @@ -15,10 +15,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/locking/lglock.c | 54 ++++++++++++++++++++++++++++++++---------------- 2 files changed, 55 insertions(+), 20 deletions(-) -Index: linux-rt-devel/include/linux/lglock.h -=================================================================== ---- linux-rt-devel.orig/include/linux/lglock.h -+++ linux-rt-devel/include/linux/lglock.h +--- a/include/linux/lglock.h ++++ b/include/linux/lglock.h @@ -34,22 +34,39 @@ #endif @@ -61,10 +59,8 @@ Index: linux-rt-devel/include/linux/lglock.h void lg_lock_init(struct lglock *lg, char *name); void lg_local_lock(struct lglock *lg); -Index: linux-rt-devel/kernel/locking/lglock.c -=================================================================== ---- linux-rt-devel.orig/kernel/locking/lglock.c -+++ linux-rt-devel/kernel/locking/lglock.c +--- a/kernel/locking/lglock.c ++++ b/kernel/locking/lglock.c @@ -4,6 +4,15 @@ #include <linux/cpu.h> #include <linux/string.h> diff --git a/patches/list_bl.h-make-list-head-locking-RT-safe.patch b/patches/list_bl.h-make-list-head-locking-RT-safe.patch index f37a10e9632af7..b5c3490b6f2cad 100644 --- a/patches/list_bl.h-make-list-head-locking-RT-safe.patch +++ b/patches/list_bl.h-make-list-head-locking-RT-safe.patch @@ -50,10 +50,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> include/linux/list_bl.h | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) -Index: linux-rt-devel/include/linux/list_bl.h -=================================================================== ---- linux-rt-devel.orig/include/linux/list_bl.h -+++ linux-rt-devel/include/linux/list_bl.h +--- a/include/linux/list_bl.h ++++ b/include/linux/list_bl.h @@ -2,6 +2,7 @@ #define _LINUX_LIST_BL_H diff --git a/patches/local-irq-rt-depending-variants.patch b/patches/local-irq-rt-depending-variants.patch index a9487ea88e2958..87c63ed46c9068 100644 --- a/patches/local-irq-rt-depending-variants.patch +++ b/patches/local-irq-rt-depending-variants.patch @@ -13,10 +13,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> include/linux/irqflags.h | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) -Index: linux-rt-devel/include/linux/interrupt.h -=================================================================== ---- linux-rt-devel.orig/include/linux/interrupt.h -+++ linux-rt-devel/include/linux/interrupt.h +--- a/include/linux/interrupt.h ++++ b/include/linux/interrupt.h @@ -186,7 +186,7 @@ extern void devm_free_irq(struct device #ifdef CONFIG_LOCKDEP # define local_irq_enable_in_hardirq() do { } while (0) @@ -26,10 +24,8 @@ Index: linux-rt-devel/include/linux/interrupt.h #endif extern void disable_irq_nosync(unsigned int irq); -Index: linux-rt-devel/include/linux/irqflags.h -=================================================================== ---- linux-rt-devel.orig/include/linux/irqflags.h -+++ linux-rt-devel/include/linux/irqflags.h +--- a/include/linux/irqflags.h ++++ b/include/linux/irqflags.h @@ -148,4 +148,23 @@ #define irqs_disabled_flags(flags) raw_irqs_disabled_flags(flags) diff --git a/patches/localversion.patch b/patches/localversion.patch index b7a1739210b8c1..9979b294ecb5d4 100644 --- a/patches/localversion.patch +++ b/patches/localversion.patch @@ -1,4 +1,4 @@ -Subject: v4.1.12-rt13 +Subject: v4.1.13-rt14 From: Thomas Gleixner <tglx@linutronix.de> Date: Fri, 08 Jul 2011 20:25:16 +0200 @@ -7,9 +7,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> localversion-rt | 1 + 1 file changed, 1 insertion(+) -Index: linux-rt-devel/localversion-rt -=================================================================== --- /dev/null -+++ linux-rt-devel/localversion-rt ++++ b/localversion-rt @@ -0,0 +1 @@ -+-rt13 ++-rt14 diff --git a/patches/lockdep-no-softirq-accounting-on-rt.patch b/patches/lockdep-no-softirq-accounting-on-rt.patch index ef421c3e102a88..9404763acf4a4f 100644 --- a/patches/lockdep-no-softirq-accounting-on-rt.patch +++ b/patches/lockdep-no-softirq-accounting-on-rt.patch @@ -10,10 +10,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/locking/lockdep.c | 2 ++ 2 files changed, 9 insertions(+), 3 deletions(-) -Index: linux-rt-devel/include/linux/irqflags.h -=================================================================== ---- linux-rt-devel.orig/include/linux/irqflags.h -+++ linux-rt-devel/include/linux/irqflags.h +--- a/include/linux/irqflags.h ++++ b/include/linux/irqflags.h @@ -25,8 +25,6 @@ # define trace_softirqs_enabled(p) ((p)->softirqs_enabled) # define trace_hardirq_enter() do { current->hardirq_context++; } while (0) @@ -40,10 +38,8 @@ Index: linux-rt-devel/include/linux/irqflags.h #endif #if defined(CONFIG_IRQSOFF_TRACER) || \ -Index: linux-rt-devel/kernel/locking/lockdep.c -=================================================================== ---- linux-rt-devel.orig/kernel/locking/lockdep.c -+++ linux-rt-devel/kernel/locking/lockdep.c +--- a/kernel/locking/lockdep.c ++++ b/kernel/locking/lockdep.c @@ -3563,6 +3563,7 @@ static void check_flags(unsigned long fl } } diff --git a/patches/lockdep-selftest-fix-warnings-due-to-missing-PREEMPT.patch b/patches/lockdep-selftest-fix-warnings-due-to-missing-PREEMPT.patch index 28b64c8a30e19f..3f503ad0e7a3bf 100644 --- a/patches/lockdep-selftest-fix-warnings-due-to-missing-PREEMPT.patch +++ b/patches/lockdep-selftest-fix-warnings-due-to-missing-PREEMPT.patch @@ -26,10 +26,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> lib/locking-selftest.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) -Index: linux-rt-devel/lib/locking-selftest.c -=================================================================== ---- linux-rt-devel.orig/lib/locking-selftest.c -+++ linux-rt-devel/lib/locking-selftest.c +--- a/lib/locking-selftest.c ++++ b/lib/locking-selftest.c @@ -590,6 +590,8 @@ GENERATE_TESTCASE(init_held_rsem) #include "locking-selftest-spin-hardirq.h" GENERATE_PERMUTATIONS_2_EVENTS(irqsafe1_hard_spin) diff --git a/patches/lockdep-selftest-only-do-hardirq-context-test-for-raw-spinlock.patch b/patches/lockdep-selftest-only-do-hardirq-context-test-for-raw-spinlock.patch index 44cedf681ea17f..9e71bad35c2cfa 100644 --- a/patches/lockdep-selftest-only-do-hardirq-context-test-for-raw-spinlock.patch +++ b/patches/lockdep-selftest-only-do-hardirq-context-test-for-raw-spinlock.patch @@ -15,10 +15,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> lib/locking-selftest.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) -Index: linux-rt-devel/lib/locking-selftest.c -=================================================================== ---- linux-rt-devel.orig/lib/locking-selftest.c -+++ linux-rt-devel/lib/locking-selftest.c +--- a/lib/locking-selftest.c ++++ b/lib/locking-selftest.c @@ -1858,6 +1858,7 @@ void locking_selftest(void) printk(" --------------------------------------------------------------------------\n"); diff --git a/patches/locking-locktorture-Do-NOT-include-rwlock.h-directly.patch b/patches/locking-locktorture-Do-NOT-include-rwlock.h-directly.patch index f8834fd3b47616..66849317cfb817 100644 --- a/patches/locking-locktorture-Do-NOT-include-rwlock.h-directly.patch +++ b/patches/locking-locktorture-Do-NOT-include-rwlock.h-directly.patch @@ -14,10 +14,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> kernel/locking/locktorture.c | 1 - 1 file changed, 1 deletion(-) -Index: linux-rt-devel/kernel/locking/locktorture.c -=================================================================== ---- linux-rt-devel.orig/kernel/locking/locktorture.c -+++ linux-rt-devel/kernel/locking/locktorture.c +--- a/kernel/locking/locktorture.c ++++ b/kernel/locking/locktorture.c @@ -24,7 +24,6 @@ #include <linux/module.h> #include <linux/kthread.h> diff --git a/patches/md-disable-bcache.patch b/patches/md-disable-bcache.patch index 78a338345bf367..fdfe5933603df6 100644 --- a/patches/md-disable-bcache.patch +++ b/patches/md-disable-bcache.patch @@ -19,10 +19,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> drivers/md/bcache/Kconfig | 1 + 1 file changed, 1 insertion(+) -Index: linux-rt-devel/drivers/md/bcache/Kconfig -=================================================================== ---- linux-rt-devel.orig/drivers/md/bcache/Kconfig -+++ linux-rt-devel/drivers/md/bcache/Kconfig +--- a/drivers/md/bcache/Kconfig ++++ b/drivers/md/bcache/Kconfig @@ -1,6 +1,7 @@ config BCACHE diff --git a/patches/md-raid5-percpu-handling-rt-aware.patch b/patches/md-raid5-percpu-handling-rt-aware.patch index b552c2527c248a..f5cf653d319abd 100644 --- a/patches/md-raid5-percpu-handling-rt-aware.patch +++ b/patches/md-raid5-percpu-handling-rt-aware.patch @@ -18,10 +18,8 @@ Tested-by: Udo van den Heuvel <udovdh@xs4all.nl> drivers/md/raid5.h | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) -Index: linux-rt-devel/drivers/md/raid5.c -=================================================================== ---- linux-rt-devel.orig/drivers/md/raid5.c -+++ linux-rt-devel/drivers/md/raid5.c +--- a/drivers/md/raid5.c ++++ b/drivers/md/raid5.c @@ -1918,8 +1918,9 @@ static void raid_run_ops(struct stripe_h struct raid5_percpu *percpu; unsigned long cpu; @@ -43,7 +41,7 @@ Index: linux-rt-devel/drivers/md/raid5.c } static struct stripe_head *alloc_stripe(struct kmem_cache *sc, gfp_t gfp) -@@ -6361,6 +6363,7 @@ static int raid5_alloc_percpu(struct r5c +@@ -6363,6 +6365,7 @@ static int raid5_alloc_percpu(struct r5c __func__, cpu); break; } @@ -51,10 +49,8 @@ Index: linux-rt-devel/drivers/md/raid5.c } put_online_cpus(); -Index: linux-rt-devel/drivers/md/raid5.h -=================================================================== ---- linux-rt-devel.orig/drivers/md/raid5.h -+++ linux-rt-devel/drivers/md/raid5.h +--- a/drivers/md/raid5.h ++++ b/drivers/md/raid5.h @@ -495,6 +495,7 @@ struct r5conf { int recovery_disabled; /* per cpu variables */ diff --git a/patches/mips-disable-highmem-on-rt.patch b/patches/mips-disable-highmem-on-rt.patch index 01ef2bd099cb00..64bc2829ced982 100644 --- a/patches/mips-disable-highmem-on-rt.patch +++ b/patches/mips-disable-highmem-on-rt.patch @@ -9,10 +9,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> arch/mips/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux-rt-devel/arch/mips/Kconfig -=================================================================== ---- linux-rt-devel.orig/arch/mips/Kconfig -+++ linux-rt-devel/arch/mips/Kconfig +--- a/arch/mips/Kconfig ++++ b/arch/mips/Kconfig @@ -2366,7 +2366,7 @@ config CPU_R4400_WORKAROUNDS # config HIGHMEM diff --git a/patches/mm--rt--Fix-generic-kmap_atomic-for-RT b/patches/mm--rt--Fix-generic-kmap_atomic-for-RT index fff2eddaefa324..6814afe977c97b 100644 --- a/patches/mm--rt--Fix-generic-kmap_atomic-for-RT +++ b/patches/mm--rt--Fix-generic-kmap_atomic-for-RT @@ -18,10 +18,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> include/linux/highmem.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -Index: linux-rt-devel/include/linux/highmem.h -=================================================================== ---- linux-rt-devel.orig/include/linux/highmem.h -+++ linux-rt-devel/include/linux/highmem.h +--- a/include/linux/highmem.h ++++ b/include/linux/highmem.h @@ -65,7 +65,7 @@ static inline void kunmap(struct page *p static inline void *kmap_atomic(struct page *page) diff --git a/patches/mm-bounce-local-irq-save-nort.patch b/patches/mm-bounce-local-irq-save-nort.patch index cea9b2bf2b3975..fb0f5b2b573a8d 100644 --- a/patches/mm-bounce-local-irq-save-nort.patch +++ b/patches/mm-bounce-local-irq-save-nort.patch @@ -9,10 +9,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> block/bounce.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -Index: linux-rt-devel/block/bounce.c -=================================================================== ---- linux-rt-devel.orig/block/bounce.c -+++ linux-rt-devel/block/bounce.c +--- a/block/bounce.c ++++ b/block/bounce.c @@ -54,11 +54,11 @@ static void bounce_copy_vec(struct bio_v unsigned long flags; unsigned char *vto; diff --git a/patches/mm-convert-swap-to-percpu-locked.patch b/patches/mm-convert-swap-to-percpu-locked.patch index e0697e237813a2..aec16dd380badf 100644 --- a/patches/mm-convert-swap-to-percpu-locked.patch +++ b/patches/mm-convert-swap-to-percpu-locked.patch @@ -12,10 +12,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> mm/swap.c | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) -Index: linux-rt-devel/mm/swap.c -=================================================================== ---- linux-rt-devel.orig/mm/swap.c -+++ linux-rt-devel/mm/swap.c +--- a/mm/swap.c ++++ b/mm/swap.c @@ -32,6 +32,7 @@ #include <linux/gfp.h> #include <linux/uio.h> diff --git a/patches/mm-disable-sloub-rt.patch b/patches/mm-disable-sloub-rt.patch index e6d9403412e99f..bbeab6257d117b 100644 --- a/patches/mm-disable-sloub-rt.patch +++ b/patches/mm-disable-sloub-rt.patch @@ -11,10 +11,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> init/Kconfig | 2 ++ 1 file changed, 2 insertions(+) -Index: linux-rt-devel/init/Kconfig -=================================================================== ---- linux-rt-devel.orig/init/Kconfig -+++ linux-rt-devel/init/Kconfig +--- a/init/Kconfig ++++ b/init/Kconfig @@ -1688,6 +1688,7 @@ choice config SLAB diff --git a/patches/mm-enable-slub.patch b/patches/mm-enable-slub.patch index 46d0ac65f1971f..3a1e45bb4c687e 100644 --- a/patches/mm-enable-slub.patch +++ b/patches/mm-enable-slub.patch @@ -11,10 +11,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> mm/slub.c | 118 +++++++++++++++++++++++++++++++++++++++++++++++--------------- 2 files changed, 95 insertions(+), 27 deletions(-) -Index: linux-rt-devel/mm/slab.h -=================================================================== ---- linux-rt-devel.orig/mm/slab.h -+++ linux-rt-devel/mm/slab.h +--- a/mm/slab.h ++++ b/mm/slab.h @@ -330,7 +330,11 @@ static inline struct kmem_cache *cache_f * The slab lists for all objects. */ @@ -27,10 +25,8 @@ Index: linux-rt-devel/mm/slab.h #ifdef CONFIG_SLAB struct list_head slabs_partial; /* partial list first, better asm code */ -Index: linux-rt-devel/mm/slub.c -=================================================================== ---- linux-rt-devel.orig/mm/slub.c -+++ linux-rt-devel/mm/slub.c +--- a/mm/slub.c ++++ b/mm/slub.c @@ -1069,7 +1069,7 @@ static noinline struct kmem_cache_node * { struct kmem_cache_node *n = get_node(s, page_to_nid(page)); @@ -40,7 +36,7 @@ Index: linux-rt-devel/mm/slub.c slab_lock(page); if (!check_slab(s, page)) -@@ -1116,7 +1116,7 @@ out: +@@ -1116,7 +1116,7 @@ static noinline struct kmem_cache_node * fail: slab_unlock(page); @@ -134,7 +130,7 @@ Index: linux-rt-devel/mm/slub.c return object; } -@@ -1896,7 +1926,7 @@ redo: +@@ -1896,7 +1926,7 @@ static void deactivate_slab(struct kmem_ * that acquire_slab() will see a slab page that * is frozen */ @@ -143,7 +139,7 @@ Index: linux-rt-devel/mm/slub.c } } else { m = M_FULL; -@@ -1907,7 +1937,7 @@ redo: +@@ -1907,7 +1937,7 @@ static void deactivate_slab(struct kmem_ * slabs from diagnostic functions will not see * any frozen slabs. */ @@ -152,7 +148,7 @@ Index: linux-rt-devel/mm/slub.c } } -@@ -1942,7 +1972,7 @@ redo: +@@ -1942,7 +1972,7 @@ static void deactivate_slab(struct kmem_ goto redo; if (lock) @@ -253,7 +249,7 @@ Index: linux-rt-devel/mm/slub.c local_irq_save(flags); #ifdef CONFIG_PREEMPT -@@ -2370,7 +2424,13 @@ load_freelist: +@@ -2370,7 +2424,13 @@ static void *__slab_alloc(struct kmem_ca VM_BUG_ON(!c->page->frozen); c->freelist = get_freepointer(s, freelist); c->tid = next_tid(c->tid); @@ -267,7 +263,7 @@ Index: linux-rt-devel/mm/slub.c return freelist; new_slab: -@@ -2387,8 +2447,7 @@ new_slab: +@@ -2387,8 +2447,7 @@ static void *__slab_alloc(struct kmem_ca if (unlikely(!freelist)) { slab_out_of_memory(s, gfpflags, node); @@ -277,7 +273,7 @@ Index: linux-rt-devel/mm/slub.c } page = c->page; -@@ -2403,8 +2462,7 @@ new_slab: +@@ -2403,8 +2462,7 @@ static void *__slab_alloc(struct kmem_ca deactivate_slab(s, page, get_freepointer(s, freelist)); c->page = NULL; c->freelist = NULL; @@ -314,7 +310,7 @@ Index: linux-rt-devel/mm/slub.c return; slab_empty: -@@ -2677,7 +2735,7 @@ slab_empty: +@@ -2677,7 +2735,7 @@ static void __slab_free(struct kmem_cach remove_full(s, n, page); } diff --git a/patches/mm-make-vmstat-rt-aware.patch b/patches/mm-make-vmstat-rt-aware.patch index bc933d367a1bab..34b5f818f923fa 100644 --- a/patches/mm-make-vmstat-rt-aware.patch +++ b/patches/mm-make-vmstat-rt-aware.patch @@ -14,10 +14,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> mm/vmstat.c | 6 ++++++ 2 files changed, 10 insertions(+) -Index: linux-rt-devel/include/linux/vmstat.h -=================================================================== ---- linux-rt-devel.orig/include/linux/vmstat.h -+++ linux-rt-devel/include/linux/vmstat.h +--- a/include/linux/vmstat.h ++++ b/include/linux/vmstat.h @@ -33,7 +33,9 @@ DECLARE_PER_CPU(struct vm_event_state, v */ static inline void __count_vm_event(enum vm_event_item item) @@ -38,10 +36,8 @@ Index: linux-rt-devel/include/linux/vmstat.h } static inline void count_vm_events(enum vm_event_item item, long delta) -Index: linux-rt-devel/mm/vmstat.c -=================================================================== ---- linux-rt-devel.orig/mm/vmstat.c -+++ linux-rt-devel/mm/vmstat.c +--- a/mm/vmstat.c ++++ b/mm/vmstat.c @@ -226,6 +226,7 @@ void __mod_zone_page_state(struct zone * long x; long t; diff --git a/patches/mm-memcontrol-Don-t-call-schedule_work_on-in-preempt.patch b/patches/mm-memcontrol-Don-t-call-schedule_work_on-in-preempt.patch index 4512215162185f..1c6864305d47fa 100644 --- a/patches/mm-memcontrol-Don-t-call-schedule_work_on-in-preempt.patch +++ b/patches/mm-memcontrol-Don-t-call-schedule_work_on-in-preempt.patch @@ -46,10 +46,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> mm/memcontrol.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -Index: linux-rt-devel/mm/memcontrol.c -=================================================================== ---- linux-rt-devel.orig/mm/memcontrol.c -+++ linux-rt-devel/mm/memcontrol.c +--- a/mm/memcontrol.c ++++ b/mm/memcontrol.c @@ -2147,7 +2147,7 @@ static void drain_all_stock(struct mem_c return; /* Notify other cpus that system-wide "drain" is running */ diff --git a/patches/mm-memcontrol-do_not_disable_irq.patch b/patches/mm-memcontrol-do_not_disable_irq.patch index b0024cf2fa3f92..ea16c084717292 100644 --- a/patches/mm-memcontrol-do_not_disable_irq.patch +++ b/patches/mm-memcontrol-do_not_disable_irq.patch @@ -13,10 +13,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> mm/swap.c | 2 +- 4 files changed, 18 insertions(+), 9 deletions(-) -Index: linux-rt-devel/include/linux/swap.h -=================================================================== ---- linux-rt-devel.orig/include/linux/swap.h -+++ linux-rt-devel/include/linux/swap.h +--- a/include/linux/swap.h ++++ b/include/linux/swap.h @@ -298,6 +298,7 @@ extern unsigned long nr_free_pagecache_p @@ -25,11 +23,9 @@ Index: linux-rt-devel/include/linux/swap.h 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); -Index: linux-rt-devel/mm/compaction.c -=================================================================== ---- linux-rt-devel.orig/mm/compaction.c -+++ linux-rt-devel/mm/compaction.c -@@ -1406,10 +1406,12 @@ check_drain: +--- a/mm/compaction.c ++++ b/mm/compaction.c +@@ -1406,10 +1406,12 @@ static int compact_zone(struct zone *zon cc->migrate_pfn & ~((1UL << cc->order) - 1); if (last_migrated_pfn < current_block_start) { @@ -44,10 +40,8 @@ Index: linux-rt-devel/mm/compaction.c /* No more flushing until we migrate again */ last_migrated_pfn = 0; } -Index: linux-rt-devel/mm/memcontrol.c -=================================================================== ---- linux-rt-devel.orig/mm/memcontrol.c -+++ linux-rt-devel/mm/memcontrol.c +--- a/mm/memcontrol.c ++++ b/mm/memcontrol.c @@ -66,6 +66,8 @@ #include <net/sock.h> #include <net/ip.h> @@ -65,7 +59,7 @@ Index: linux-rt-devel/mm/memcontrol.c static const char * const mem_cgroup_stat_names[] = { "cache", "rss", -@@ -4801,12 +4804,12 @@ static int mem_cgroup_move_account(struc +@@ -4802,12 +4805,12 @@ static int mem_cgroup_move_account(struc ret = 0; @@ -80,7 +74,7 @@ Index: linux-rt-devel/mm/memcontrol.c out_unlock: unlock_page(page); out: -@@ -5543,10 +5546,10 @@ void mem_cgroup_commit_charge(struct pag +@@ -5544,10 +5547,10 @@ void mem_cgroup_commit_charge(struct pag VM_BUG_ON_PAGE(!PageTransHuge(page), page); } @@ -93,7 +87,7 @@ Index: linux-rt-devel/mm/memcontrol.c if (do_swap_account && PageSwapCache(page)) { swp_entry_t entry = { .val = page_private(page) }; -@@ -5602,14 +5605,14 @@ static void uncharge_batch(struct mem_cg +@@ -5603,14 +5606,14 @@ static void uncharge_batch(struct mem_cg memcg_oom_recover(memcg); } @@ -110,7 +104,7 @@ Index: linux-rt-devel/mm/memcontrol.c if (!mem_cgroup_is_root(memcg)) css_put_many(&memcg->css, nr_pages); -@@ -5813,6 +5816,7 @@ void mem_cgroup_swapout(struct page *pag +@@ -5814,6 +5817,7 @@ void mem_cgroup_swapout(struct page *pag { struct mem_cgroup *memcg; unsigned short oldid; @@ -118,7 +112,7 @@ Index: linux-rt-devel/mm/memcontrol.c VM_BUG_ON_PAGE(PageLRU(page), page); VM_BUG_ON_PAGE(page_count(page), page); -@@ -5835,9 +5839,11 @@ void mem_cgroup_swapout(struct page *pag +@@ -5836,9 +5840,11 @@ void mem_cgroup_swapout(struct page *pag if (!mem_cgroup_is_root(memcg)) page_counter_uncharge(&memcg->memory, 1); @@ -130,10 +124,8 @@ Index: linux-rt-devel/mm/memcontrol.c } /** -Index: linux-rt-devel/mm/swap.c -=================================================================== ---- linux-rt-devel.orig/mm/swap.c -+++ linux-rt-devel/mm/swap.c +--- a/mm/swap.c ++++ b/mm/swap.c @@ -47,7 +47,7 @@ static DEFINE_PER_CPU(struct pagevec, lr static DEFINE_PER_CPU(struct pagevec, lru_deactivate_file_pvecs); diff --git a/patches/mm-page-alloc-use-local-lock-on-target-cpu.patch b/patches/mm-page-alloc-use-local-lock-on-target-cpu.patch index a57dc0d8eb35d2..f3205d67aef3fd 100644 --- a/patches/mm-page-alloc-use-local-lock-on-target-cpu.patch +++ b/patches/mm-page-alloc-use-local-lock-on-target-cpu.patch @@ -11,10 +11,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> mm/page_alloc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -Index: linux-rt-devel/mm/page_alloc.c -=================================================================== ---- linux-rt-devel.orig/mm/page_alloc.c -+++ linux-rt-devel/mm/page_alloc.c +--- a/mm/page_alloc.c ++++ b/mm/page_alloc.c @@ -238,9 +238,9 @@ static DEFINE_LOCAL_IRQ_LOCK(pa_lock); #ifdef CONFIG_PREEMPT_RT_BASE diff --git a/patches/mm-page_alloc-reduce-lock-sections-further.patch b/patches/mm-page_alloc-reduce-lock-sections-further.patch index f9b91f45a2b929..1c3d915db4d0f2 100644 --- a/patches/mm-page_alloc-reduce-lock-sections-further.patch +++ b/patches/mm-page_alloc-reduce-lock-sections-further.patch @@ -11,10 +11,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> mm/page_alloc.c | 85 ++++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 61 insertions(+), 24 deletions(-) -Index: linux-rt-devel/mm/page_alloc.c -=================================================================== ---- linux-rt-devel.orig/mm/page_alloc.c -+++ linux-rt-devel/mm/page_alloc.c +--- a/mm/page_alloc.c ++++ b/mm/page_alloc.c @@ -694,7 +694,7 @@ static inline int free_pages_check(struc } diff --git a/patches/mm-page_alloc-rt-friendly-per-cpu-pages.patch b/patches/mm-page_alloc-rt-friendly-per-cpu-pages.patch index 90e4aade30c934..01237e5369708a 100644 --- a/patches/mm-page_alloc-rt-friendly-per-cpu-pages.patch +++ b/patches/mm-page_alloc-rt-friendly-per-cpu-pages.patch @@ -15,10 +15,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> mm/page_alloc.c | 57 ++++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 41 insertions(+), 16 deletions(-) -Index: linux-rt-devel/mm/page_alloc.c -=================================================================== ---- linux-rt-devel.orig/mm/page_alloc.c -+++ linux-rt-devel/mm/page_alloc.c +--- a/mm/page_alloc.c ++++ b/mm/page_alloc.c @@ -60,6 +60,7 @@ #include <linux/page_ext.h> #include <linux/hugetlb.h> diff --git a/patches/mm-protect-activate-switch-mm.patch b/patches/mm-protect-activate-switch-mm.patch index a033be08ef51db..383e79fdb2651b 100644 --- a/patches/mm-protect-activate-switch-mm.patch +++ b/patches/mm-protect-activate-switch-mm.patch @@ -34,10 +34,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> mm/mmu_context.c | 2 ++ 2 files changed, 4 insertions(+) -Index: linux-rt-devel/fs/exec.c -=================================================================== ---- linux-rt-devel.orig/fs/exec.c -+++ linux-rt-devel/fs/exec.c +--- a/fs/exec.c ++++ b/fs/exec.c @@ -859,12 +859,14 @@ static int exec_mmap(struct mm_struct *m } } @@ -53,10 +51,8 @@ Index: linux-rt-devel/fs/exec.c task_unlock(tsk); if (old_mm) { up_read(&old_mm->mmap_sem); -Index: linux-rt-devel/mm/mmu_context.c -=================================================================== ---- linux-rt-devel.orig/mm/mmu_context.c -+++ linux-rt-devel/mm/mmu_context.c +--- a/mm/mmu_context.c ++++ b/mm/mmu_context.c @@ -23,6 +23,7 @@ void use_mm(struct mm_struct *mm) struct task_struct *tsk = current; diff --git a/patches/mm-rt-kmap-atomic-scheduling.patch b/patches/mm-rt-kmap-atomic-scheduling.patch index c7c68febb24ff9..ad4843a6c8baf5 100644 --- a/patches/mm-rt-kmap-atomic-scheduling.patch +++ b/patches/mm-rt-kmap-atomic-scheduling.patch @@ -28,10 +28,8 @@ Link: http://lkml.kernel.org/r/1311842631.5890.208.camel@twins mm/highmem.c | 6 ++++-- 7 files changed, 86 insertions(+), 10 deletions(-) -Index: linux-rt-devel/arch/x86/kernel/process_32.c -=================================================================== ---- linux-rt-devel.orig/arch/x86/kernel/process_32.c -+++ linux-rt-devel/arch/x86/kernel/process_32.c +--- a/arch/x86/kernel/process_32.c ++++ b/arch/x86/kernel/process_32.c @@ -35,6 +35,7 @@ #include <linux/uaccess.h> #include <linux/io.h> @@ -76,7 +74,7 @@ Index: linux-rt-devel/arch/x86/kernel/process_32.c /* * switch_to(x,y) should switch tasks from x to y. -@@ -292,6 +322,8 @@ __switch_to(struct task_struct *prev_p, +@@ -292,6 +322,8 @@ EXPORT_SYMBOL_GPL(start_thread); task_thread_info(next_p)->flags & _TIF_WORK_CTXSW_NEXT)) __switch_to_xtra(prev_p, next_p, tss); @@ -85,10 +83,8 @@ Index: linux-rt-devel/arch/x86/kernel/process_32.c /* * Leave lazy mode, flushing any hypercalls made here. * This must be done before restoring TLS segments so -Index: linux-rt-devel/arch/x86/mm/highmem_32.c -=================================================================== ---- linux-rt-devel.orig/arch/x86/mm/highmem_32.c -+++ linux-rt-devel/arch/x86/mm/highmem_32.c +--- a/arch/x86/mm/highmem_32.c ++++ b/arch/x86/mm/highmem_32.c @@ -32,10 +32,11 @@ EXPORT_SYMBOL(kunmap); */ void *kmap_atomic_prot(struct page *page, pgprot_t prot) @@ -133,10 +129,8 @@ Index: linux-rt-devel/arch/x86/mm/highmem_32.c } EXPORT_SYMBOL(__kunmap_atomic); -Index: linux-rt-devel/arch/x86/mm/iomap_32.c -=================================================================== ---- linux-rt-devel.orig/arch/x86/mm/iomap_32.c -+++ linux-rt-devel/arch/x86/mm/iomap_32.c +--- a/arch/x86/mm/iomap_32.c ++++ b/arch/x86/mm/iomap_32.c @@ -56,6 +56,7 @@ EXPORT_SYMBOL_GPL(iomap_free); void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot) @@ -167,10 +161,8 @@ Index: linux-rt-devel/arch/x86/mm/iomap_32.c kpte_clear_flush(kmap_pte-idx, vaddr); kmap_atomic_idx_pop(); } -Index: linux-rt-devel/include/linux/highmem.h -=================================================================== ---- linux-rt-devel.orig/include/linux/highmem.h -+++ linux-rt-devel/include/linux/highmem.h +--- a/include/linux/highmem.h ++++ b/include/linux/highmem.h @@ -87,32 +87,51 @@ static inline void __kunmap_atomic(void #if defined(CONFIG_HIGHMEM) || defined(CONFIG_X86_32) @@ -227,10 +219,8 @@ Index: linux-rt-devel/include/linux/highmem.h #endif } -Index: linux-rt-devel/include/linux/sched.h -=================================================================== ---- linux-rt-devel.orig/include/linux/sched.h -+++ linux-rt-devel/include/linux/sched.h +--- a/include/linux/sched.h ++++ b/include/linux/sched.h @@ -26,6 +26,7 @@ struct sched_param { #include <linux/nodemask.h> #include <linux/mm_types.h> @@ -252,10 +242,8 @@ Index: linux-rt-devel/include/linux/sched.h #ifdef CONFIG_DEBUG_ATOMIC_SLEEP unsigned long task_state_change; #endif -Index: linux-rt-devel/include/linux/uaccess.h -=================================================================== ---- linux-rt-devel.orig/include/linux/uaccess.h -+++ linux-rt-devel/include/linux/uaccess.h +--- a/include/linux/uaccess.h ++++ b/include/linux/uaccess.h @@ -24,6 +24,7 @@ static __always_inline void pagefault_di */ static inline void pagefault_disable(void) @@ -272,10 +260,8 @@ Index: linux-rt-devel/include/linux/uaccess.h } /* -Index: linux-rt-devel/mm/highmem.c -=================================================================== ---- linux-rt-devel.orig/mm/highmem.c -+++ linux-rt-devel/mm/highmem.c +--- a/mm/highmem.c ++++ b/mm/highmem.c @@ -29,10 +29,11 @@ #include <linux/kgdb.h> #include <asm/tlbflush.h> diff --git a/patches/mm-scatterlist-dont-disable-irqs-on-RT.patch b/patches/mm-scatterlist-dont-disable-irqs-on-RT.patch index c3f6ad54b17254..6da9ab217b4c6b 100644 --- a/patches/mm-scatterlist-dont-disable-irqs-on-RT.patch +++ b/patches/mm-scatterlist-dont-disable-irqs-on-RT.patch @@ -12,10 +12,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> lib/scatterlist.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -Index: linux-rt-devel/lib/scatterlist.c -=================================================================== ---- linux-rt-devel.orig/lib/scatterlist.c -+++ linux-rt-devel/lib/scatterlist.c +--- a/lib/scatterlist.c ++++ b/lib/scatterlist.c @@ -592,7 +592,7 @@ void sg_miter_stop(struct sg_mapping_ite flush_kernel_dcache_page(miter->page); diff --git a/patches/mm-slub-move-slab-initialization-into-irq-enabled-region.patch b/patches/mm-slub-move-slab-initialization-into-irq-enabled-region.patch index c8518efd1d7aa0..5104424d13df29 100644 --- a/patches/mm-slub-move-slab-initialization-into-irq-enabled-region.patch +++ b/patches/mm-slub-move-slab-initialization-into-irq-enabled-region.patch @@ -25,10 +25,8 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org> mm/slub.c | 89 +++++++++++++++++++++++++++++--------------------------------- 1 file changed, 42 insertions(+), 47 deletions(-) -Index: linux-rt-devel/mm/slub.c -=================================================================== ---- linux-rt-devel.orig/mm/slub.c -+++ linux-rt-devel/mm/slub.c +--- a/mm/slub.c ++++ b/mm/slub.c @@ -1306,6 +1306,17 @@ static inline void slab_free_hook(struct kasan_slab_free(s, x); } diff --git a/patches/mm-vmalloc-use-get-cpu-light.patch b/patches/mm-vmalloc-use-get-cpu-light.patch index d26568480a43cf..fa6fad8e976fd2 100644 --- a/patches/mm-vmalloc-use-get-cpu-light.patch +++ b/patches/mm-vmalloc-use-get-cpu-light.patch @@ -10,10 +10,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> mm/vmalloc.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) -Index: linux-rt-devel/mm/vmalloc.c -=================================================================== ---- linux-rt-devel.orig/mm/vmalloc.c -+++ linux-rt-devel/mm/vmalloc.c +--- a/mm/vmalloc.c ++++ b/mm/vmalloc.c @@ -819,7 +819,7 @@ static void *new_vmap_block(unsigned int struct vmap_block *vb; struct vmap_area *va; diff --git a/patches/mm-workingset-do-not-protect-workingset_shadow_nodes.patch b/patches/mm-workingset-do-not-protect-workingset_shadow_nodes.patch index 11ac5aa1ec4969..9c388ef7fcd038 100644 --- a/patches/mm-workingset-do-not-protect-workingset_shadow_nodes.patch +++ b/patches/mm-workingset-do-not-protect-workingset_shadow_nodes.patch @@ -15,10 +15,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> mm/workingset.c | 23 ++++++++++++----------- 4 files changed, 28 insertions(+), 17 deletions(-) -Index: linux-rt-devel/include/linux/swap.h -=================================================================== ---- linux-rt-devel.orig/include/linux/swap.h -+++ linux-rt-devel/include/linux/swap.h +--- a/include/linux/swap.h ++++ b/include/linux/swap.h @@ -11,6 +11,7 @@ #include <linux/fs.h> #include <linux/atomic.h> @@ -37,10 +35,8 @@ Index: linux-rt-devel/include/linux/swap.h static inline unsigned int workingset_node_pages(struct radix_tree_node *node) { -Index: linux-rt-devel/mm/filemap.c -=================================================================== ---- linux-rt-devel.orig/mm/filemap.c -+++ linux-rt-devel/mm/filemap.c +--- a/mm/filemap.c ++++ b/mm/filemap.c @@ -167,7 +167,9 @@ static void page_cache_tree_delete(struc if (!workingset_node_pages(node) && list_empty(&node->private_list)) { @@ -67,10 +63,8 @@ Index: linux-rt-devel/mm/filemap.c } return 0; } -Index: linux-rt-devel/mm/truncate.c -=================================================================== ---- linux-rt-devel.orig/mm/truncate.c -+++ linux-rt-devel/mm/truncate.c +--- a/mm/truncate.c ++++ b/mm/truncate.c @@ -56,8 +56,11 @@ static void clear_exceptional_entry(stru * protected by mapping->tree_lock. */ @@ -85,10 +79,8 @@ Index: linux-rt-devel/mm/truncate.c __radix_tree_delete_node(&mapping->page_tree, node); unlock: spin_unlock_irq(&mapping->tree_lock); -Index: linux-rt-devel/mm/workingset.c -=================================================================== ---- linux-rt-devel.orig/mm/workingset.c -+++ linux-rt-devel/mm/workingset.c +--- a/mm/workingset.c ++++ b/mm/workingset.c @@ -264,7 +264,8 @@ void workingset_activation(struct page * * point where they would still be useful. */ diff --git a/patches/mmci-remove-bogus-irq-save.patch b/patches/mmci-remove-bogus-irq-save.patch index cab1130fe4ef2b..67523a158ec56e 100644 --- a/patches/mmci-remove-bogus-irq-save.patch +++ b/patches/mmci-remove-bogus-irq-save.patch @@ -10,10 +10,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> drivers/mmc/host/mmci.c | 5 ----- 1 file changed, 5 deletions(-) -Index: linux-rt-devel/drivers/mmc/host/mmci.c -=================================================================== ---- linux-rt-devel.orig/drivers/mmc/host/mmci.c -+++ linux-rt-devel/drivers/mmc/host/mmci.c +--- a/drivers/mmc/host/mmci.c ++++ b/drivers/mmc/host/mmci.c @@ -1155,15 +1155,12 @@ static irqreturn_t mmci_pio_irq(int irq, struct sg_mapping_iter *sg_miter = &host->sg_miter; struct variant_data *variant = host->variant; diff --git a/patches/move_sched_delayed_work_to_helper.patch b/patches/move_sched_delayed_work_to_helper.patch index cb3f8996567107..044382974da4ad 100644 --- a/patches/move_sched_delayed_work_to_helper.patch +++ b/patches/move_sched_delayed_work_to_helper.patch @@ -23,10 +23,8 @@ Signed-off-by: Steven Rostedt <rostedt@goodmis.org> kernel/time/ntp.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) -Index: linux-rt-devel/kernel/time/ntp.c -=================================================================== ---- linux-rt-devel.orig/kernel/time/ntp.c -+++ linux-rt-devel/kernel/time/ntp.c +--- a/kernel/time/ntp.c ++++ b/kernel/time/ntp.c @@ -10,6 +10,7 @@ #include <linux/workqueue.h> #include <linux/hrtimer.h> diff --git a/patches/mutex-no-spin-on-rt.patch b/patches/mutex-no-spin-on-rt.patch index ec6bb2744269e9..e5308f6dd3df9f 100644 --- a/patches/mutex-no-spin-on-rt.patch +++ b/patches/mutex-no-spin-on-rt.patch @@ -10,10 +10,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/Kconfig.locks | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -Index: linux-rt-devel/kernel/Kconfig.locks -=================================================================== ---- linux-rt-devel.orig/kernel/Kconfig.locks -+++ linux-rt-devel/kernel/Kconfig.locks +--- a/kernel/Kconfig.locks ++++ b/kernel/Kconfig.locks @@ -225,11 +225,11 @@ config ARCH_SUPPORTS_ATOMIC_RMW config MUTEX_SPIN_ON_OWNER diff --git a/patches/net-another-local-irq-disable-alloc-atomic-headache.patch b/patches/net-another-local-irq-disable-alloc-atomic-headache.patch index 72ee128b19987b..884c953c1aba73 100644 --- a/patches/net-another-local-irq-disable-alloc-atomic-headache.patch +++ b/patches/net-another-local-irq-disable-alloc-atomic-headache.patch @@ -9,10 +9,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> net/core/skbuff.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -Index: linux-rt-devel/net/core/skbuff.c -=================================================================== ---- linux-rt-devel.orig/net/core/skbuff.c -+++ linux-rt-devel/net/core/skbuff.c +--- a/net/core/skbuff.c ++++ b/net/core/skbuff.c @@ -63,6 +63,7 @@ #include <linux/errqueue.h> #include <linux/prefetch.h> diff --git a/patches/net-core-cpuhotplug-drain-input_pkt_queue-lockless.patch b/patches/net-core-cpuhotplug-drain-input_pkt_queue-lockless.patch index 57d22d0f3312fd..8a7ce0c52a6bd5 100644 --- a/patches/net-core-cpuhotplug-drain-input_pkt_queue-lockless.patch +++ b/patches/net-core-cpuhotplug-drain-input_pkt_queue-lockless.patch @@ -33,10 +33,8 @@ Cc: stable-rt@vger.kernel.org net/core/dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux-rt-devel/net/core/dev.c -=================================================================== ---- linux-rt-devel.orig/net/core/dev.c -+++ linux-rt-devel/net/core/dev.c +--- a/net/core/dev.c ++++ b/net/core/dev.c @@ -7181,7 +7181,7 @@ static int dev_cpu_callback(struct notif netif_rx_ni(skb); input_queue_head_incr(oldsd); diff --git a/patches/net-fix-iptable-xt-write-recseq-begin-rt-fallout.patch b/patches/net-fix-iptable-xt-write-recseq-begin-rt-fallout.patch index 976d632e492695..45c32002b1c512 100644 --- a/patches/net-fix-iptable-xt-write-recseq-begin-rt-fallout.patch +++ b/patches/net-fix-iptable-xt-write-recseq-begin-rt-fallout.patch @@ -14,10 +14,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> net/netfilter/core.c | 6 ++++++ 2 files changed, 13 insertions(+) -Index: linux-rt-devel/include/linux/netfilter/x_tables.h -=================================================================== ---- linux-rt-devel.orig/include/linux/netfilter/x_tables.h -+++ linux-rt-devel/include/linux/netfilter/x_tables.h +--- a/include/linux/netfilter/x_tables.h ++++ b/include/linux/netfilter/x_tables.h @@ -3,6 +3,7 @@ @@ -53,10 +51,8 @@ Index: linux-rt-devel/include/linux/netfilter/x_tables.h } /* -Index: linux-rt-devel/net/netfilter/core.c -=================================================================== ---- linux-rt-devel.orig/net/netfilter/core.c -+++ linux-rt-devel/net/netfilter/core.c +--- a/net/netfilter/core.c ++++ b/net/netfilter/core.c @@ -22,11 +22,17 @@ #include <linux/proc_fs.h> #include <linux/mutex.h> diff --git a/patches/net-gianfar-do-not-disable-interrupts.patch b/patches/net-gianfar-do-not-disable-interrupts.patch index c380fcdf5ff814..2533c46fc0e959 100644 --- a/patches/net-gianfar-do-not-disable-interrupts.patch +++ b/patches/net-gianfar-do-not-disable-interrupts.patch @@ -19,10 +19,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> drivers/net/ethernet/freescale/gianfar.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) -Index: linux-rt-devel/drivers/net/ethernet/freescale/gianfar.c -=================================================================== ---- linux-rt-devel.orig/drivers/net/ethernet/freescale/gianfar.c -+++ linux-rt-devel/drivers/net/ethernet/freescale/gianfar.c +--- a/drivers/net/ethernet/freescale/gianfar.c ++++ b/drivers/net/ethernet/freescale/gianfar.c @@ -1540,7 +1540,7 @@ static int gfar_suspend(struct device *d if (netif_running(ndev)) { diff --git a/patches/net-make-devnet_rename_seq-a-mutex.patch b/patches/net-make-devnet_rename_seq-a-mutex.patch index 581cfb4edc8db5..cd81c4fd63207c 100644 --- a/patches/net-make-devnet_rename_seq-a-mutex.patch +++ b/patches/net-make-devnet_rename_seq-a-mutex.patch @@ -19,10 +19,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> net/core/dev.c | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) -Index: linux-rt-devel/net/core/dev.c -=================================================================== ---- linux-rt-devel.orig/net/core/dev.c -+++ linux-rt-devel/net/core/dev.c +--- a/net/core/dev.c ++++ b/net/core/dev.c @@ -184,6 +184,7 @@ static unsigned int napi_gen_id; static DEFINE_HASHTABLE(napi_hash, 8); @@ -31,7 +29,7 @@ Index: linux-rt-devel/net/core/dev.c static inline void dev_base_seq_inc(struct net *net) { -@@ -852,7 +853,8 @@ retry: +@@ -852,7 +853,8 @@ int netdev_get_name(struct net *net, cha strcpy(name, dev->name); rcu_read_unlock(); if (read_seqcount_retry(&devnet_rename_seq, seq)) { @@ -68,7 +66,7 @@ Index: linux-rt-devel/net/core/dev.c if (oldname[0] && !strchr(oldname, '%')) netdev_info(dev, "renamed from %s\n", oldname); -@@ -1147,11 +1146,12 @@ rollback: +@@ -1147,11 +1146,12 @@ int dev_change_name(struct net_device *d if (ret) { memcpy(dev->name, oldname, IFNAMSIZ); dev->name_assign_type = old_assign_type; @@ -84,7 +82,7 @@ Index: linux-rt-devel/net/core/dev.c netdev_adjacent_rename_links(dev, oldname); -@@ -1172,7 +1172,8 @@ rollback: +@@ -1172,7 +1172,8 @@ int dev_change_name(struct net_device *d /* err >= 0 after dev_alloc_name() or stores the first errno */ if (err >= 0) { err = ret; @@ -94,7 +92,7 @@ Index: linux-rt-devel/net/core/dev.c memcpy(dev->name, oldname, IFNAMSIZ); memcpy(oldname, newname, IFNAMSIZ); dev->name_assign_type = old_assign_type; -@@ -1185,6 +1186,11 @@ rollback: +@@ -1185,6 +1186,11 @@ int dev_change_name(struct net_device *d } return err; diff --git a/patches/net-prevent-abba-deadlock.patch b/patches/net-prevent-abba-deadlock.patch index 0a47d53bc694f0..223c05704549ac 100644 --- a/patches/net-prevent-abba-deadlock.patch +++ b/patches/net-prevent-abba-deadlock.patch @@ -93,10 +93,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> net/core/sock.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -Index: linux-rt-devel/net/core/sock.c -=================================================================== ---- linux-rt-devel.orig/net/core/sock.c -+++ linux-rt-devel/net/core/sock.c +--- a/net/core/sock.c ++++ b/net/core/sock.c @@ -2370,12 +2370,11 @@ void lock_sock_nested(struct sock *sk, i if (sk->sk_lock.owned) __lock_sock(sk); diff --git a/patches/net-sched-dev_deactivate_many-use-msleep-1-instead-o.patch b/patches/net-sched-dev_deactivate_many-use-msleep-1-instead-o.patch index defac100800914..92829e408434c6 100644 --- a/patches/net-sched-dev_deactivate_many-use-msleep-1-instead-o.patch +++ b/patches/net-sched-dev_deactivate_many-use-msleep-1-instead-o.patch @@ -44,10 +44,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> net/sched/sch_generic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux-rt-devel/net/sched/sch_generic.c -=================================================================== ---- linux-rt-devel.orig/net/sched/sch_generic.c -+++ linux-rt-devel/net/sched/sch_generic.c +--- a/net/sched/sch_generic.c ++++ b/net/sched/sch_generic.c @@ -894,7 +894,7 @@ void dev_deactivate_many(struct list_hea /* Wait for outstanding qdisc_run calls. */ list_for_each_entry(dev, head, close_list) diff --git a/patches/net-tx-action-avoid-livelock-on-rt.patch b/patches/net-tx-action-avoid-livelock-on-rt.patch index 6eda2bbf7084c4..aa776db4207fd9 100644 --- a/patches/net-tx-action-avoid-livelock-on-rt.patch +++ b/patches/net-tx-action-avoid-livelock-on-rt.patch @@ -42,10 +42,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> net/core/dev.c | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) -Index: linux-rt-devel/net/core/dev.c -=================================================================== ---- linux-rt-devel.orig/net/core/dev.c -+++ linux-rt-devel/net/core/dev.c +--- a/net/core/dev.c ++++ b/net/core/dev.c @@ -3444,6 +3444,36 @@ int netif_rx_ni(struct sk_buff *skb) } EXPORT_SYMBOL(netif_rx_ni); diff --git a/patches/net-use-cpu-chill.patch b/patches/net-use-cpu-chill.patch index 20bf94b2ac5124..b5e52e5c41b3a3 100644 --- a/patches/net-use-cpu-chill.patch +++ b/patches/net-use-cpu-chill.patch @@ -13,10 +13,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> net/rds/ib_rdma.c | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) -Index: linux-rt-devel/net/packet/af_packet.c -=================================================================== ---- linux-rt-devel.orig/net/packet/af_packet.c -+++ linux-rt-devel/net/packet/af_packet.c +--- a/net/packet/af_packet.c ++++ b/net/packet/af_packet.c @@ -63,6 +63,7 @@ #include <linux/if_packet.h> #include <linux/wireless.h> @@ -43,10 +41,8 @@ Index: linux-rt-devel/net/packet/af_packet.c } } prb_close_block(pkc, pbd, po, status); -Index: linux-rt-devel/net/rds/ib_rdma.c -=================================================================== ---- linux-rt-devel.orig/net/rds/ib_rdma.c -+++ linux-rt-devel/net/rds/ib_rdma.c +--- a/net/rds/ib_rdma.c ++++ b/net/rds/ib_rdma.c @@ -34,6 +34,7 @@ #include <linux/slab.h> #include <linux/rculist.h> diff --git a/patches/net-wireless-warn-nort.patch b/patches/net-wireless-warn-nort.patch index 4b42d233714c90..4f98708a2dbf71 100644 --- a/patches/net-wireless-warn-nort.patch +++ b/patches/net-wireless-warn-nort.patch @@ -10,10 +10,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> net/mac80211/rx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux-rt-devel/net/mac80211/rx.c -=================================================================== ---- linux-rt-devel.orig/net/mac80211/rx.c -+++ linux-rt-devel/net/mac80211/rx.c +--- a/net/mac80211/rx.c ++++ b/net/mac80211/rx.c @@ -3554,7 +3554,7 @@ void ieee80211_rx(struct ieee80211_hw *h struct ieee80211_supported_band *sband; struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb); diff --git a/patches/net__Make_synchronize-rcu_expedited_conditional-on-non-rt b/patches/net__Make_synchronize-rcu_expedited_conditional-on-non-rt index 7a974975b96efa..73c7de4066796a 100644 --- a/patches/net__Make_synchronize-rcu_expedited_conditional-on-non-rt +++ b/patches/net__Make_synchronize-rcu_expedited_conditional-on-non-rt @@ -22,11 +22,9 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> net/core/dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux-rt-devel/net/core/dev.c -=================================================================== ---- linux-rt-devel.orig/net/core/dev.c -+++ linux-rt-devel/net/core/dev.c -@@ -6969,7 +6969,7 @@ EXPORT_SYMBOL(free_netdev); +--- a/net/core/dev.c ++++ b/net/core/dev.c +@@ -6930,7 +6930,7 @@ EXPORT_SYMBOL(free_netdev); void synchronize_net(void) { might_sleep(); diff --git a/patches/oleg-signal-rt-fix.patch b/patches/oleg-signal-rt-fix.patch index 10bde59d96c104..21b69c1a7672ea 100644 --- a/patches/oleg-signal-rt-fix.patch +++ b/patches/oleg-signal-rt-fix.patch @@ -36,10 +36,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/signal.c | 37 +++++++++++++++++++++++++++++++++++-- 4 files changed, 60 insertions(+), 2 deletions(-) -Index: linux-rt-devel/arch/x86/include/asm/signal.h -=================================================================== ---- linux-rt-devel.orig/arch/x86/include/asm/signal.h -+++ linux-rt-devel/arch/x86/include/asm/signal.h +--- a/arch/x86/include/asm/signal.h ++++ b/arch/x86/include/asm/signal.h @@ -23,6 +23,19 @@ typedef struct { unsigned long sig[_NSIG_WORDS]; } sigset_t; @@ -60,10 +58,8 @@ Index: linux-rt-devel/arch/x86/include/asm/signal.h #ifndef CONFIG_COMPAT typedef sigset_t compat_sigset_t; #endif -Index: linux-rt-devel/arch/x86/kernel/signal.c -=================================================================== ---- linux-rt-devel.orig/arch/x86/kernel/signal.c -+++ linux-rt-devel/arch/x86/kernel/signal.c +--- a/arch/x86/kernel/signal.c ++++ b/arch/x86/kernel/signal.c @@ -723,6 +723,14 @@ do_notify_resume(struct pt_regs *regs, v { user_exit(); @@ -79,10 +75,8 @@ Index: linux-rt-devel/arch/x86/kernel/signal.c if (thread_info_flags & _TIF_UPROBE) uprobe_notify_resume(regs); -Index: linux-rt-devel/include/linux/sched.h -=================================================================== ---- linux-rt-devel.orig/include/linux/sched.h -+++ linux-rt-devel/include/linux/sched.h +--- a/include/linux/sched.h ++++ b/include/linux/sched.h @@ -1538,6 +1538,10 @@ struct task_struct { sigset_t blocked, real_blocked; sigset_t saved_sigmask; /* restored if set_restore_sigmask() was used */ @@ -94,10 +88,8 @@ Index: linux-rt-devel/include/linux/sched.h unsigned long sas_ss_sp; size_t sas_ss_size; -Index: linux-rt-devel/kernel/signal.c -=================================================================== ---- linux-rt-devel.orig/kernel/signal.c -+++ linux-rt-devel/kernel/signal.c +--- a/kernel/signal.c ++++ b/kernel/signal.c @@ -1282,8 +1282,8 @@ int do_send_sig_info(int sig, struct sig * We don't want to have recursive SIGSEGV's etc, for example, * that is why we also clear SIGNAL_UNKILLABLE. diff --git a/patches/panic-disable-random-on-rt.patch b/patches/panic-disable-random-on-rt.patch index 6388cc2ca994ec..3f2f7fd466ad00 100644 --- a/patches/panic-disable-random-on-rt.patch +++ b/patches/panic-disable-random-on-rt.patch @@ -10,10 +10,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/panic.c | 2 ++ 1 file changed, 2 insertions(+) -Index: linux-rt-devel/kernel/panic.c -=================================================================== ---- linux-rt-devel.orig/kernel/panic.c -+++ linux-rt-devel/kernel/panic.c +--- a/kernel/panic.c ++++ b/kernel/panic.c @@ -387,9 +387,11 @@ static u64 oops_id; static int init_oops_id(void) diff --git a/patches/patch-to-introduce-rcu-bh-qs-where-safe-from-softirq.patch b/patches/patch-to-introduce-rcu-bh-qs-where-safe-from-softirq.patch index 21f3cc4bfdf5c5..2c3aed8dae6ea2 100644 --- a/patches/patch-to-introduce-rcu-bh-qs-where-safe-from-softirq.patch +++ b/patches/patch-to-introduce-rcu-bh-qs-where-safe-from-softirq.patch @@ -28,10 +28,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/rcu/tree_plugin.h | 9 +++++++-- 3 files changed, 15 insertions(+), 9 deletions(-) -Index: linux-rt-devel/include/linux/rcupdate.h -=================================================================== ---- linux-rt-devel.orig/include/linux/rcupdate.h -+++ linux-rt-devel/include/linux/rcupdate.h +--- a/include/linux/rcupdate.h ++++ b/include/linux/rcupdate.h @@ -300,13 +300,7 @@ static inline int rcu_preempt_depth(void void rcu_init(void); void rcu_end_inkernel_boot(void); @@ -46,10 +44,8 @@ Index: linux-rt-devel/include/linux/rcupdate.h void rcu_check_callbacks(int user); struct notifier_block; void rcu_idle_enter(void); -Index: linux-rt-devel/kernel/rcu/tree.c -=================================================================== ---- linux-rt-devel.orig/kernel/rcu/tree.c -+++ linux-rt-devel/kernel/rcu/tree.c +--- a/kernel/rcu/tree.c ++++ b/kernel/rcu/tree.c @@ -220,7 +220,14 @@ void rcu_sched_qs(void) } } @@ -66,10 +62,8 @@ Index: linux-rt-devel/kernel/rcu/tree.c void rcu_bh_qs(void) { if (!__this_cpu_read(rcu_bh_data.passed_quiesce)) { -Index: linux-rt-devel/kernel/rcu/tree_plugin.h -=================================================================== ---- linux-rt-devel.orig/kernel/rcu/tree_plugin.h -+++ linux-rt-devel/kernel/rcu/tree_plugin.h +--- a/kernel/rcu/tree_plugin.h ++++ b/kernel/rcu/tree_plugin.h @@ -28,6 +28,7 @@ #include <linux/gfp.h> #include <linux/oom.h> diff --git a/patches/pci-access-use-__wake_up_all_locked.patch b/patches/pci-access-use-__wake_up_all_locked.patch index 107110993629a8..3efbf833ce5d1b 100644 --- a/patches/pci-access-use-__wake_up_all_locked.patch +++ b/patches/pci-access-use-__wake_up_all_locked.patch @@ -12,11 +12,9 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> drivers/pci/access.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux-rt-devel/drivers/pci/access.c -=================================================================== ---- linux-rt-devel.orig/drivers/pci/access.c -+++ linux-rt-devel/drivers/pci/access.c -@@ -580,7 +580,7 @@ void pci_cfg_access_unlock(struct pci_de +--- a/drivers/pci/access.c ++++ b/drivers/pci/access.c +@@ -561,7 +561,7 @@ void pci_cfg_access_unlock(struct pci_de WARN_ON(!dev->block_cfg_access); dev->block_cfg_access = 0; diff --git a/patches/percpu_ida-use-locklocks.patch b/patches/percpu_ida-use-locklocks.patch index c3ae15aa09ac79..c5edf437a4d042 100644 --- a/patches/percpu_ida-use-locklocks.patch +++ b/patches/percpu_ida-use-locklocks.patch @@ -9,10 +9,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> lib/percpu_ida.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) -Index: linux-rt-devel/lib/percpu_ida.c -=================================================================== ---- linux-rt-devel.orig/lib/percpu_ida.c -+++ linux-rt-devel/lib/percpu_ida.c +--- a/lib/percpu_ida.c ++++ b/lib/percpu_ida.c @@ -26,6 +26,9 @@ #include <linux/string.h> #include <linux/spinlock.h> diff --git a/patches/perf-make-swevent-hrtimer-irqsafe.patch b/patches/perf-make-swevent-hrtimer-irqsafe.patch index b2caa6b47de524..5d525e03d5eaef 100644 --- a/patches/perf-make-swevent-hrtimer-irqsafe.patch +++ b/patches/perf-make-swevent-hrtimer-irqsafe.patch @@ -56,11 +56,9 @@ Signed-off-by: Steven Rostedt <rostedt@goodmis.org> kernel/events/core.c | 1 + 1 file changed, 1 insertion(+) -Index: linux-rt-devel/kernel/events/core.c -=================================================================== ---- linux-rt-devel.orig/kernel/events/core.c -+++ linux-rt-devel/kernel/events/core.c -@@ -6933,6 +6933,7 @@ static void perf_swevent_init_hrtimer(st +--- a/kernel/events/core.c ++++ b/kernel/events/core.c +@@ -6925,6 +6925,7 @@ static void perf_swevent_init_hrtimer(st hrtimer_init(&hwc->hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); hwc->hrtimer.function = perf_swevent_hrtimer; diff --git a/patches/peter_zijlstra-frob-rcu.patch b/patches/peter_zijlstra-frob-rcu.patch index 1270c698933ab9..695632b01453a5 100644 --- a/patches/peter_zijlstra-frob-rcu.patch +++ b/patches/peter_zijlstra-frob-rcu.patch @@ -153,10 +153,8 @@ Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> kernel/rcu/tree_plugin.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux-rt-devel/kernel/rcu/tree_plugin.h -=================================================================== ---- linux-rt-devel.orig/kernel/rcu/tree_plugin.h -+++ linux-rt-devel/kernel/rcu/tree_plugin.h +--- a/kernel/rcu/tree_plugin.h ++++ b/kernel/rcu/tree_plugin.h @@ -291,7 +291,7 @@ void rcu_read_unlock_special(struct task } diff --git a/patches/peterz-srcu-crypto-chain.patch b/patches/peterz-srcu-crypto-chain.patch index 2ff4f10827a3f6..77d83b184494f7 100644 --- a/patches/peterz-srcu-crypto-chain.patch +++ b/patches/peterz-srcu-crypto-chain.patch @@ -118,10 +118,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> crypto/internal.h | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) -Index: linux-rt-devel/crypto/algapi.c -=================================================================== ---- linux-rt-devel.orig/crypto/algapi.c -+++ linux-rt-devel/crypto/algapi.c +--- a/crypto/algapi.c ++++ b/crypto/algapi.c @@ -695,13 +695,13 @@ EXPORT_SYMBOL_GPL(crypto_spawn_tfm2); int crypto_register_notifier(struct notifier_block *nb) @@ -138,10 +136,8 @@ Index: linux-rt-devel/crypto/algapi.c } EXPORT_SYMBOL_GPL(crypto_unregister_notifier); -Index: linux-rt-devel/crypto/api.c -=================================================================== ---- linux-rt-devel.orig/crypto/api.c -+++ linux-rt-devel/crypto/api.c +--- a/crypto/api.c ++++ b/crypto/api.c @@ -31,7 +31,7 @@ EXPORT_SYMBOL_GPL(crypto_alg_list); DECLARE_RWSEM(crypto_alg_sem); EXPORT_SYMBOL_GPL(crypto_alg_sem); @@ -164,10 +160,8 @@ Index: linux-rt-devel/crypto/api.c } return ok; -Index: linux-rt-devel/crypto/internal.h -=================================================================== ---- linux-rt-devel.orig/crypto/internal.h -+++ linux-rt-devel/crypto/internal.h +--- a/crypto/internal.h ++++ b/crypto/internal.h @@ -48,7 +48,7 @@ struct crypto_larval { extern struct list_head crypto_alg_list; diff --git a/patches/pid.h-include-atomic.h.patch b/patches/pid.h-include-atomic.h.patch index f3708ff52f24ff..8277468fba677a 100644 --- a/patches/pid.h-include-atomic.h.patch +++ b/patches/pid.h-include-atomic.h.patch @@ -24,10 +24,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> include/linux/pid.h | 1 + 1 file changed, 1 insertion(+) -Index: linux-rt-devel/include/linux/pid.h -=================================================================== ---- linux-rt-devel.orig/include/linux/pid.h -+++ linux-rt-devel/include/linux/pid.h +--- a/include/linux/pid.h ++++ b/include/linux/pid.h @@ -2,6 +2,7 @@ #define _LINUX_PID_H diff --git a/patches/ping-sysrq.patch b/patches/ping-sysrq.patch index ff1ddca090a693..276a332fcb299a 100644 --- a/patches/ping-sysrq.patch +++ b/patches/ping-sysrq.patch @@ -18,10 +18,8 @@ Signed-off-by: Carsten Emde <C.Emde@osadl.org> net/ipv4/sysctl_net_ipv4.c | 7 +++++++ 4 files changed, 47 insertions(+), 2 deletions(-) -Index: linux-rt-devel/Documentation/sysrq.txt -=================================================================== ---- linux-rt-devel.orig/Documentation/sysrq.txt -+++ linux-rt-devel/Documentation/sysrq.txt +--- a/Documentation/sysrq.txt ++++ b/Documentation/sysrq.txt @@ -59,10 +59,17 @@ On PowerPC - Press 'ALT - Print Screen ( On other - If you know of the key combos for other architectures, please let me know so I can add them to this section. @@ -42,10 +40,8 @@ Index: linux-rt-devel/Documentation/sysrq.txt * What are the 'command' keys? ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 'b' - Will immediately reboot the system without syncing or unmounting -Index: linux-rt-devel/include/net/netns/ipv4.h -=================================================================== ---- linux-rt-devel.orig/include/net/netns/ipv4.h -+++ linux-rt-devel/include/net/netns/ipv4.h +--- a/include/net/netns/ipv4.h ++++ b/include/net/netns/ipv4.h @@ -69,6 +69,7 @@ struct netns_ipv4 { int sysctl_icmp_echo_ignore_all; @@ -54,10 +50,8 @@ Index: linux-rt-devel/include/net/netns/ipv4.h int sysctl_icmp_ignore_bogus_error_responses; int sysctl_icmp_ratelimit; int sysctl_icmp_ratemask; -Index: linux-rt-devel/net/ipv4/icmp.c -=================================================================== ---- linux-rt-devel.orig/net/ipv4/icmp.c -+++ linux-rt-devel/net/ipv4/icmp.c +--- a/net/ipv4/icmp.c ++++ b/net/ipv4/icmp.c @@ -69,6 +69,7 @@ #include <linux/jiffies.h> #include <linux/kernel.h> @@ -109,10 +103,8 @@ Index: linux-rt-devel/net/ipv4/icmp.c } /* should there be an ICMP stat for ignored echos? */ return true; -Index: linux-rt-devel/net/ipv4/sysctl_net_ipv4.c -=================================================================== ---- linux-rt-devel.orig/net/ipv4/sysctl_net_ipv4.c -+++ linux-rt-devel/net/ipv4/sysctl_net_ipv4.c +--- a/net/ipv4/sysctl_net_ipv4.c ++++ b/net/ipv4/sysctl_net_ipv4.c @@ -779,6 +779,13 @@ static struct ctl_table ipv4_net_table[] .proc_handler = proc_dointvec }, diff --git a/patches/posix-timers-no-broadcast.patch b/patches/posix-timers-no-broadcast.patch index 568edf41115c96..21adaced5a86b6 100644 --- a/patches/posix-timers-no-broadcast.patch +++ b/patches/posix-timers-no-broadcast.patch @@ -11,10 +11,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/time/posix-timers.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -Index: linux-rt-devel/kernel/time/posix-timers.c -=================================================================== ---- linux-rt-devel.orig/kernel/time/posix-timers.c -+++ linux-rt-devel/kernel/time/posix-timers.c +--- a/kernel/time/posix-timers.c ++++ b/kernel/time/posix-timers.c @@ -499,6 +499,7 @@ static enum hrtimer_restart posix_timer_ static struct pid *good_sigevent(sigevent_t * event) { diff --git a/patches/posix-timers-thread-posix-cpu-timers-on-rt.patch b/patches/posix-timers-thread-posix-cpu-timers-on-rt.patch index 4b0543e250f23b..5d276e6e61eebb 100644 --- a/patches/posix-timers-thread-posix-cpu-timers-on-rt.patch +++ b/patches/posix-timers-thread-posix-cpu-timers-on-rt.patch @@ -17,10 +17,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/time/posix-cpu-timers.c | 198 +++++++++++++++++++++++++++++++++++++++-- 4 files changed, 205 insertions(+), 6 deletions(-) -Index: linux-rt-devel/include/linux/init_task.h -=================================================================== ---- linux-rt-devel.orig/include/linux/init_task.h -+++ linux-rt-devel/include/linux/init_task.h +--- a/include/linux/init_task.h ++++ b/include/linux/init_task.h @@ -147,6 +147,12 @@ extern struct task_group root_task_group # define INIT_PERF_EVENTS(tsk) #endif @@ -42,10 +40,8 @@ Index: linux-rt-devel/include/linux/init_task.h .pids = { \ [PIDTYPE_PID] = INIT_PID_LINK(PIDTYPE_PID), \ [PIDTYPE_PGID] = INIT_PID_LINK(PIDTYPE_PGID), \ -Index: linux-rt-devel/include/linux/sched.h -=================================================================== ---- linux-rt-devel.orig/include/linux/sched.h -+++ linux-rt-devel/include/linux/sched.h +--- a/include/linux/sched.h ++++ b/include/linux/sched.h @@ -1501,6 +1501,9 @@ struct task_struct { struct task_cputime cputime_expires; @@ -56,10 +52,8 @@ Index: linux-rt-devel/include/linux/sched.h /* process credentials */ const struct cred __rcu *real_cred; /* objective and real subjective task -Index: linux-rt-devel/kernel/fork.c -=================================================================== ---- linux-rt-devel.orig/kernel/fork.c -+++ linux-rt-devel/kernel/fork.c +--- a/kernel/fork.c ++++ b/kernel/fork.c @@ -1214,6 +1214,9 @@ static void rt_mutex_init_task(struct ta */ static void posix_cpu_timers_init(struct task_struct *tsk) @@ -70,10 +64,8 @@ Index: linux-rt-devel/kernel/fork.c tsk->cputime_expires.prof_exp = 0; tsk->cputime_expires.virt_exp = 0; tsk->cputime_expires.sched_exp = 0; -Index: linux-rt-devel/kernel/time/posix-cpu-timers.c -=================================================================== ---- linux-rt-devel.orig/kernel/time/posix-cpu-timers.c -+++ linux-rt-devel/kernel/time/posix-cpu-timers.c +--- a/kernel/time/posix-cpu-timers.c ++++ b/kernel/time/posix-cpu-timers.c @@ -3,6 +3,7 @@ */ diff --git a/patches/power-disable-highmem-on-rt.patch b/patches/power-disable-highmem-on-rt.patch index 134a9ed887e1e7..725a8b4aa4e4d9 100644 --- a/patches/power-disable-highmem-on-rt.patch +++ b/patches/power-disable-highmem-on-rt.patch @@ -9,10 +9,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> arch/powerpc/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux-rt-devel/arch/powerpc/Kconfig -=================================================================== ---- linux-rt-devel.orig/arch/powerpc/Kconfig -+++ linux-rt-devel/arch/powerpc/Kconfig +--- a/arch/powerpc/Kconfig ++++ b/arch/powerpc/Kconfig @@ -313,7 +313,7 @@ menu "Kernel options" config HIGHMEM diff --git a/patches/power-use-generic-rwsem-on-rt.patch b/patches/power-use-generic-rwsem-on-rt.patch index dc7ea33cba1fed..7b49387491271b 100644 --- a/patches/power-use-generic-rwsem-on-rt.patch +++ b/patches/power-use-generic-rwsem-on-rt.patch @@ -9,10 +9,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> arch/powerpc/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -Index: linux-rt-devel/arch/powerpc/Kconfig -=================================================================== ---- linux-rt-devel.orig/arch/powerpc/Kconfig -+++ linux-rt-devel/arch/powerpc/Kconfig +--- a/arch/powerpc/Kconfig ++++ b/arch/powerpc/Kconfig @@ -60,10 +60,11 @@ config LOCKDEP_SUPPORT config RWSEM_GENERIC_SPINLOCK diff --git a/patches/powerpc-kvm-Disable-in-kernel-MPIC-emulation-for-PRE.patch b/patches/powerpc-kvm-Disable-in-kernel-MPIC-emulation-for-PRE.patch index 77f547fe0c32c7..c9da5829921874 100644 --- a/patches/powerpc-kvm-Disable-in-kernel-MPIC-emulation-for-PRE.patch +++ b/patches/powerpc-kvm-Disable-in-kernel-MPIC-emulation-for-PRE.patch @@ -25,10 +25,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> arch/powerpc/kvm/Kconfig | 1 + 1 file changed, 1 insertion(+) -Index: linux-rt-devel/arch/powerpc/kvm/Kconfig -=================================================================== ---- linux-rt-devel.orig/arch/powerpc/kvm/Kconfig -+++ linux-rt-devel/arch/powerpc/kvm/Kconfig +--- a/arch/powerpc/kvm/Kconfig ++++ b/arch/powerpc/kvm/Kconfig @@ -172,6 +172,7 @@ config KVM_E500MC config KVM_MPIC bool "KVM in-kernel MPIC emulation" diff --git a/patches/powerpc-preempt-lazy-support.patch b/patches/powerpc-preempt-lazy-support.patch index 03da0edd3d486b..b12421a4c448dd 100644 --- a/patches/powerpc-preempt-lazy-support.patch +++ b/patches/powerpc-preempt-lazy-support.patch @@ -13,10 +13,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> arch/powerpc/kernel/entry_64.S | 14 +++++++++++--- 5 files changed, 33 insertions(+), 11 deletions(-) -Index: linux-rt-devel/arch/powerpc/Kconfig -=================================================================== ---- linux-rt-devel.orig/arch/powerpc/Kconfig -+++ linux-rt-devel/arch/powerpc/Kconfig +--- a/arch/powerpc/Kconfig ++++ b/arch/powerpc/Kconfig @@ -139,6 +139,7 @@ config PPC select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST select GENERIC_STRNCPY_FROM_USER @@ -25,10 +23,8 @@ Index: linux-rt-devel/arch/powerpc/Kconfig select HAVE_MOD_ARCH_SPECIFIC select MODULES_USE_ELF_RELA select CLONE_BACKWARDS -Index: linux-rt-devel/arch/powerpc/include/asm/thread_info.h -=================================================================== ---- linux-rt-devel.orig/arch/powerpc/include/asm/thread_info.h -+++ linux-rt-devel/arch/powerpc/include/asm/thread_info.h +--- a/arch/powerpc/include/asm/thread_info.h ++++ b/arch/powerpc/include/asm/thread_info.h @@ -42,6 +42,8 @@ struct thread_info { int cpu; /* cpu we're on */ int preempt_count; /* 0 => preemptable, @@ -75,10 +71,8 @@ Index: linux-rt-devel/arch/powerpc/include/asm/thread_info.h /* Bits in local_flags */ /* Don't move TLF_NAPPING without adjusting the code in entry_32.S */ -Index: linux-rt-devel/arch/powerpc/kernel/asm-offsets.c -=================================================================== ---- linux-rt-devel.orig/arch/powerpc/kernel/asm-offsets.c -+++ linux-rt-devel/arch/powerpc/kernel/asm-offsets.c +--- a/arch/powerpc/kernel/asm-offsets.c ++++ b/arch/powerpc/kernel/asm-offsets.c @@ -160,6 +160,7 @@ int main(void) DEFINE(TI_FLAGS, offsetof(struct thread_info, flags)); DEFINE(TI_LOCAL_FLAGS, offsetof(struct thread_info, local_flags)); @@ -87,11 +81,9 @@ Index: linux-rt-devel/arch/powerpc/kernel/asm-offsets.c DEFINE(TI_TASK, offsetof(struct thread_info, task)); DEFINE(TI_CPU, offsetof(struct thread_info, cpu)); -Index: linux-rt-devel/arch/powerpc/kernel/entry_32.S -=================================================================== ---- linux-rt-devel.orig/arch/powerpc/kernel/entry_32.S -+++ linux-rt-devel/arch/powerpc/kernel/entry_32.S -@@ -813,7 +813,14 @@ resume_kernel: +--- a/arch/powerpc/kernel/entry_32.S ++++ b/arch/powerpc/kernel/entry_32.S +@@ -813,7 +813,14 @@ user_exc_return: /* r10 contains MSR_KE cmpwi 0,r0,0 /* if non-zero, just restore regs and return */ bne restore andi. r8,r8,_TIF_NEED_RESCHED @@ -106,7 +98,7 @@ Index: linux-rt-devel/arch/powerpc/kernel/entry_32.S lwz r3,_MSR(r1) andi. r0,r3,MSR_EE /* interrupts off? */ beq restore /* don't schedule if so */ -@@ -824,11 +831,11 @@ resume_kernel: +@@ -824,11 +831,11 @@ user_exc_return: /* r10 contains MSR_KE */ bl trace_hardirqs_off #endif @@ -121,7 +113,7 @@ Index: linux-rt-devel/arch/powerpc/kernel/entry_32.S #ifdef CONFIG_TRACE_IRQFLAGS /* And now, to properly rebalance the above, we tell lockdep they * are being turned back on, which will happen when we return -@@ -1149,7 +1156,7 @@ global_dbcr0: +@@ -1149,7 +1156,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_NEED_PAIRE #endif /* !(CONFIG_4xx || CONFIG_BOOKE) */ do_work: /* r10 contains MSR_KERNEL here */ @@ -130,7 +122,7 @@ Index: linux-rt-devel/arch/powerpc/kernel/entry_32.S beq do_user_signal do_resched: /* r10 contains MSR_KERNEL here */ -@@ -1170,7 +1177,7 @@ recheck: +@@ -1170,7 +1177,7 @@ do_resched: /* r10 contains MSR_KERNEL MTMSRD(r10) /* disable interrupts */ CURRENT_THREAD_INFO(r9, r1) lwz r9,TI_FLAGS(r9) @@ -139,11 +131,9 @@ Index: linux-rt-devel/arch/powerpc/kernel/entry_32.S bne- do_resched andi. r0,r9,_TIF_USER_WORK_MASK beq restore_user -Index: linux-rt-devel/arch/powerpc/kernel/entry_64.S -=================================================================== ---- linux-rt-devel.orig/arch/powerpc/kernel/entry_64.S -+++ linux-rt-devel/arch/powerpc/kernel/entry_64.S -@@ -636,7 +636,7 @@ _GLOBAL(ret_from_except_lite) +--- a/arch/powerpc/kernel/entry_64.S ++++ b/arch/powerpc/kernel/entry_64.S +@@ -636,7 +636,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_DSCR) #else beq restore #endif @@ -152,7 +142,7 @@ Index: linux-rt-devel/arch/powerpc/kernel/entry_64.S beq 2f bl restore_interrupts SCHEDULE_USER -@@ -698,10 +698,18 @@ resume_kernel: +@@ -698,10 +698,18 @@ END_FTR_SECTION_IFSET(CPU_FTR_DSCR) #ifdef CONFIG_PREEMPT /* Check if we need to preempt */ @@ -172,7 +162,7 @@ Index: linux-rt-devel/arch/powerpc/kernel/entry_64.S cmpwi cr1,r8,0 ld r0,SOFTE(r1) cmpdi r0,0 -@@ -718,7 +726,7 @@ resume_kernel: +@@ -718,7 +726,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_DSCR) /* Re-test flags and eventually loop */ CURRENT_THREAD_INFO(r9, r1) ld r4,TI_FLAGS(r9) diff --git a/patches/powerpc-ps3-device-init.c-adapt-to-completions-using.patch b/patches/powerpc-ps3-device-init.c-adapt-to-completions-using.patch index 3451103eed124b..a153e1cf017e31 100644 --- a/patches/powerpc-ps3-device-init.c-adapt-to-completions-using.patch +++ b/patches/powerpc-ps3-device-init.c-adapt-to-completions-using.patch @@ -18,10 +18,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> arch/powerpc/platforms/ps3/device-init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux-rt-devel/arch/powerpc/platforms/ps3/device-init.c -=================================================================== ---- linux-rt-devel.orig/arch/powerpc/platforms/ps3/device-init.c -+++ linux-rt-devel/arch/powerpc/platforms/ps3/device-init.c +--- a/arch/powerpc/platforms/ps3/device-init.c ++++ b/arch/powerpc/platforms/ps3/device-init.c @@ -752,7 +752,7 @@ static int ps3_notification_read_write(s } pr_debug("%s:%u: notification %s issued\n", __func__, __LINE__, op); diff --git a/patches/preempt-lazy-support.patch b/patches/preempt-lazy-support.patch index 36ac3daed4109d..decc31c4ede17d 100644 --- a/patches/preempt-lazy-support.patch +++ b/patches/preempt-lazy-support.patch @@ -67,10 +67,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/trace/trace_output.c | 13 +++++++++- 13 files changed, 204 insertions(+), 29 deletions(-) -Index: linux-rt-devel/arch/x86/include/asm/preempt.h -=================================================================== ---- linux-rt-devel.orig/arch/x86/include/asm/preempt.h -+++ linux-rt-devel/arch/x86/include/asm/preempt.h +--- a/arch/x86/include/asm/preempt.h ++++ b/arch/x86/include/asm/preempt.h @@ -82,17 +82,33 @@ static __always_inline void __preempt_co * a decrement which hits zero means we have no preempt_count and should * reschedule. @@ -106,10 +104,8 @@ Index: linux-rt-devel/arch/x86/include/asm/preempt.h } #ifdef CONFIG_PREEMPT -Index: linux-rt-devel/include/linux/ftrace_event.h -=================================================================== ---- linux-rt-devel.orig/include/linux/ftrace_event.h -+++ linux-rt-devel/include/linux/ftrace_event.h +--- a/include/linux/ftrace_event.h ++++ b/include/linux/ftrace_event.h @@ -68,6 +68,7 @@ struct trace_entry { int pid; unsigned short migrate_disable; @@ -118,10 +114,8 @@ Index: linux-rt-devel/include/linux/ftrace_event.h }; #define FTRACE_MAX_EVENT \ -Index: linux-rt-devel/include/linux/preempt.h -=================================================================== ---- linux-rt-devel.orig/include/linux/preempt.h -+++ linux-rt-devel/include/linux/preempt.h +--- a/include/linux/preempt.h ++++ b/include/linux/preempt.h @@ -34,6 +34,20 @@ extern void preempt_count_sub(int val); #define preempt_count_inc() preempt_count_add(1) #define preempt_count_dec() preempt_count_sub(1) @@ -179,10 +173,8 @@ Index: linux-rt-devel/include/linux/preempt.h set_preempt_need_resched(); \ } while (0) -Index: linux-rt-devel/include/linux/sched.h -=================================================================== ---- linux-rt-devel.orig/include/linux/sched.h -+++ linux-rt-devel/include/linux/sched.h +--- a/include/linux/sched.h ++++ b/include/linux/sched.h @@ -2898,6 +2898,43 @@ static inline int test_tsk_need_resched( return unlikely(test_tsk_thread_flag(tsk,TIF_NEED_RESCHED)); } @@ -227,10 +219,8 @@ Index: linux-rt-devel/include/linux/sched.h static inline int restart_syscall(void) { set_tsk_thread_flag(current, TIF_SIGPENDING); -Index: linux-rt-devel/include/linux/thread_info.h -=================================================================== ---- linux-rt-devel.orig/include/linux/thread_info.h -+++ linux-rt-devel/include/linux/thread_info.h +--- a/include/linux/thread_info.h ++++ b/include/linux/thread_info.h @@ -102,7 +102,17 @@ static inline int test_ti_thread_flag(st #define test_thread_flag(flag) \ test_ti_thread_flag(current_thread_info(), flag) @@ -250,10 +240,8 @@ Index: linux-rt-devel/include/linux/thread_info.h #if defined TIF_RESTORE_SIGMASK && !defined HAVE_SET_RESTORE_SIGMASK /* -Index: linux-rt-devel/kernel/Kconfig.preempt -=================================================================== ---- linux-rt-devel.orig/kernel/Kconfig.preempt -+++ linux-rt-devel/kernel/Kconfig.preempt +--- a/kernel/Kconfig.preempt ++++ b/kernel/Kconfig.preempt @@ -6,6 +6,12 @@ config PREEMPT_RT_BASE bool select PREEMPT @@ -267,10 +255,8 @@ Index: linux-rt-devel/kernel/Kconfig.preempt choice prompt "Preemption Model" default PREEMPT_NONE -Index: linux-rt-devel/kernel/sched/core.c -=================================================================== ---- linux-rt-devel.orig/kernel/sched/core.c -+++ linux-rt-devel/kernel/sched/core.c +--- a/kernel/sched/core.c ++++ b/kernel/sched/core.c @@ -623,6 +623,38 @@ void resched_curr(struct rq *rq) trace_sched_wake_idle_without_ipi(cpu); } @@ -370,10 +356,8 @@ Index: linux-rt-devel/kernel/sched/core.c /* * The idle tasks have their own, simple scheduling class: */ -Index: linux-rt-devel/kernel/sched/fair.c -=================================================================== ---- linux-rt-devel.orig/kernel/sched/fair.c -+++ linux-rt-devel/kernel/sched/fair.c +--- a/kernel/sched/fair.c ++++ b/kernel/sched/fair.c @@ -3201,7 +3201,7 @@ check_preempt_tick(struct cfs_rq *cfs_rq ideal_runtime = sched_slice(cfs_rq, curr); delta_exec = curr->sum_exec_runtime - curr->prev_sum_exec_runtime; @@ -446,10 +430,8 @@ Index: linux-rt-devel/kernel/sched/fair.c } else check_preempt_curr(rq, p, 0); } -Index: linux-rt-devel/kernel/sched/features.h -=================================================================== ---- linux-rt-devel.orig/kernel/sched/features.h -+++ linux-rt-devel/kernel/sched/features.h +--- a/kernel/sched/features.h ++++ b/kernel/sched/features.h @@ -52,6 +52,9 @@ SCHED_FEAT(NONTASK_CAPACITY, true) #ifdef CONFIG_PREEMPT_RT_FULL @@ -460,10 +442,8 @@ Index: linux-rt-devel/kernel/sched/features.h #else /* -Index: linux-rt-devel/kernel/sched/sched.h -=================================================================== ---- linux-rt-devel.orig/kernel/sched/sched.h -+++ linux-rt-devel/kernel/sched/sched.h +--- a/kernel/sched/sched.h ++++ b/kernel/sched/sched.h @@ -1291,6 +1291,15 @@ extern void init_sched_dl_class(void); extern void resched_curr(struct rq *rq); extern void resched_cpu(int cpu); @@ -480,10 +460,8 @@ Index: linux-rt-devel/kernel/sched/sched.h extern struct rt_bandwidth def_rt_bandwidth; extern void init_rt_bandwidth(struct rt_bandwidth *rt_b, u64 period, u64 runtime); -Index: linux-rt-devel/kernel/trace/trace.c -=================================================================== ---- linux-rt-devel.orig/kernel/trace/trace.c -+++ linux-rt-devel/kernel/trace/trace.c +--- a/kernel/trace/trace.c ++++ b/kernel/trace/trace.c @@ -1630,6 +1630,7 @@ tracing_generic_entry_update(struct trac struct task_struct *tsk = current; @@ -549,10 +527,8 @@ Index: linux-rt-devel/kernel/trace/trace.c } void -Index: linux-rt-devel/kernel/trace/trace.h -=================================================================== ---- linux-rt-devel.orig/kernel/trace/trace.h -+++ linux-rt-devel/kernel/trace/trace.h +--- a/kernel/trace/trace.h ++++ b/kernel/trace/trace.h @@ -120,6 +120,7 @@ struct kretprobe_trace_entry_head { * NEED_RESCHED - reschedule is requested * HARDIRQ - inside an interrupt handler @@ -569,10 +545,8 @@ Index: linux-rt-devel/kernel/trace/trace.h }; #define TRACE_BUF_SIZE 1024 -Index: linux-rt-devel/kernel/trace/trace_output.c -=================================================================== ---- linux-rt-devel.orig/kernel/trace/trace_output.c -+++ linux-rt-devel/kernel/trace/trace_output.c +--- a/kernel/trace/trace_output.c ++++ b/kernel/trace/trace_output.c @@ -430,6 +430,7 @@ int trace_print_lat_fmt(struct trace_seq { char hardsoft_irq; diff --git a/patches/preempt-nort-rt-variants.patch b/patches/preempt-nort-rt-variants.patch index 8303bc818c7061..1f4b5e6d2cd18f 100644 --- a/patches/preempt-nort-rt-variants.patch +++ b/patches/preempt-nort-rt-variants.patch @@ -11,11 +11,9 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> include/linux/preempt.h | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) -Index: linux-rt-devel/include/linux/preempt.h -=================================================================== ---- linux-rt-devel.orig/include/linux/preempt.h -+++ linux-rt-devel/include/linux/preempt.h -@@ -47,7 +47,11 @@ do { \ +--- a/include/linux/preempt.h ++++ b/include/linux/preempt.h +@@ -48,7 +48,11 @@ do { \ preempt_count_dec(); \ } while (0) @@ -28,7 +26,7 @@ Index: linux-rt-devel/include/linux/preempt.h #ifdef CONFIG_PREEMPT #define preempt_enable() \ -@@ -144,6 +148,18 @@ do { \ +@@ -145,6 +149,18 @@ do { \ set_preempt_need_resched(); \ } while (0) diff --git a/patches/printk-27force_early_printk-27-boot-param-to-help-with-debugging.patch b/patches/printk-27force_early_printk-27-boot-param-to-help-with-debugging.patch index 9a51ba13240354..bd2ea50c2be89c 100644 --- a/patches/printk-27force_early_printk-27-boot-param-to-help-with-debugging.patch +++ b/patches/printk-27force_early_printk-27-boot-param-to-help-with-debugging.patch @@ -13,10 +13,8 @@ Link: http://lkml.kernel.org/n/tip-ykb97nsfmobq44xketrxs977@git.kernel.org kernel/printk/printk.c | 7 +++++++ 1 file changed, 7 insertions(+) -Index: linux-rt-devel/kernel/printk/printk.c -=================================================================== ---- linux-rt-devel.orig/kernel/printk/printk.c -+++ linux-rt-devel/kernel/printk/printk.c +--- a/kernel/printk/printk.c ++++ b/kernel/printk/printk.c @@ -1637,6 +1637,13 @@ asmlinkage void early_printk(const char */ static bool __read_mostly printk_killswitch; diff --git a/patches/printk-kill.patch b/patches/printk-kill.patch index 54acf3816ff71d..a6698f6f9c5336 100644 --- a/patches/printk-kill.patch +++ b/patches/printk-kill.patch @@ -12,10 +12,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/watchdog.c | 14 +++++++-- 3 files changed, 70 insertions(+), 22 deletions(-) -Index: linux-rt-devel/include/linux/printk.h -=================================================================== ---- linux-rt-devel.orig/include/linux/printk.h -+++ linux-rt-devel/include/linux/printk.h +--- a/include/linux/printk.h ++++ b/include/linux/printk.h @@ -115,9 +115,11 @@ int no_printk(const char *fmt, ...) #ifdef CONFIG_EARLY_PRINTK extern asmlinkage __printf(1, 2) @@ -28,10 +26,8 @@ Index: linux-rt-devel/include/linux/printk.h #endif typedef int(*printk_func_t)(const char *fmt, va_list args); -Index: linux-rt-devel/kernel/printk/printk.c -=================================================================== ---- linux-rt-devel.orig/kernel/printk/printk.c -+++ linux-rt-devel/kernel/printk/printk.c +--- a/kernel/printk/printk.c ++++ b/kernel/printk/printk.c @@ -1607,6 +1607,55 @@ static size_t cont_print_text(char *text return textlen; } @@ -129,10 +125,8 @@ Index: linux-rt-devel/kernel/printk/printk.c static int __add_preferred_console(char *name, int idx, char *options, char *brl_options) { -Index: linux-rt-devel/kernel/watchdog.c -=================================================================== ---- linux-rt-devel.orig/kernel/watchdog.c -+++ linux-rt-devel/kernel/watchdog.c +--- a/kernel/watchdog.c ++++ b/kernel/watchdog.c @@ -262,6 +262,8 @@ static int is_softlockup(unsigned long t #ifdef CONFIG_HARDLOCKUP_DETECTOR diff --git a/patches/printk-rt-aware.patch b/patches/printk-rt-aware.patch index df0560428c3df4..2396f51bb83eac 100644 --- a/patches/printk-rt-aware.patch +++ b/patches/printk-rt-aware.patch @@ -10,10 +10,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/printk/printk.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) -Index: linux-rt-devel/kernel/printk/printk.c -=================================================================== ---- linux-rt-devel.orig/kernel/printk/printk.c -+++ linux-rt-devel/kernel/printk/printk.c +--- a/kernel/printk/printk.c ++++ b/kernel/printk/printk.c @@ -1401,6 +1401,7 @@ static void call_console_drivers(int lev if (!console_drivers) return; @@ -82,7 +80,7 @@ Index: linux-rt-devel/kernel/printk/printk.c return; out: raw_spin_unlock_irqrestore(&logbuf_lock, flags); -@@ -2278,12 +2293,17 @@ skip: +@@ -2278,12 +2293,17 @@ void console_unlock(void) console_idx = log_next(console_idx); console_seq++; console_prev = msg->flags; diff --git a/patches/ptrace-fix-ptrace-vs-tasklist_lock-race.patch b/patches/ptrace-fix-ptrace-vs-tasklist_lock-race.patch index b60883986eb7b9..7592c4b3028774 100644 --- a/patches/ptrace-fix-ptrace-vs-tasklist_lock-race.patch +++ b/patches/ptrace-fix-ptrace-vs-tasklist_lock-race.patch @@ -28,10 +28,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> kernel/sched/core.c | 19 ++++++++++++++++--- 3 files changed, 67 insertions(+), 7 deletions(-) -Index: linux-rt-devel/include/linux/sched.h -=================================================================== ---- linux-rt-devel.orig/include/linux/sched.h -+++ linux-rt-devel/include/linux/sched.h +--- a/include/linux/sched.h ++++ b/include/linux/sched.h @@ -234,10 +234,7 @@ extern char ___assert_task_state[1 - 2*! TASK_UNINTERRUPTIBLE | __TASK_STOPPED | \ __TASK_TRACED | EXIT_ZOMBIE | EXIT_DEAD) @@ -95,10 +93,8 @@ Index: linux-rt-devel/include/linux/sched.h /* * cond_resched() and cond_resched_lock(): latency reduction via * explicit rescheduling in places that are safe. The return -Index: linux-rt-devel/kernel/ptrace.c -=================================================================== ---- linux-rt-devel.orig/kernel/ptrace.c -+++ linux-rt-devel/kernel/ptrace.c +--- a/kernel/ptrace.c ++++ b/kernel/ptrace.c @@ -129,7 +129,12 @@ static bool ptrace_freeze_traced(struct spin_lock_irq(&task->sighand->siglock); @@ -113,10 +109,8 @@ Index: linux-rt-devel/kernel/ptrace.c ret = true; } spin_unlock_irq(&task->sighand->siglock); -Index: linux-rt-devel/kernel/sched/core.c -=================================================================== ---- linux-rt-devel.orig/kernel/sched/core.c -+++ linux-rt-devel/kernel/sched/core.c +--- a/kernel/sched/core.c ++++ b/kernel/sched/core.c @@ -1219,6 +1219,18 @@ struct migration_arg { static int migration_cpu_stop(void *data); @@ -155,7 +149,7 @@ Index: linux-rt-devel/kernel/sched/core.c ncsw = p->nvcsw | LONG_MIN; /* sets MSB */ task_rq_unlock(rq, p, &flags); -@@ -1833,7 +1846,7 @@ out: +@@ -1833,7 +1846,7 @@ static void try_to_wake_up_local(struct */ int wake_up_process(struct task_struct *p) { diff --git a/patches/radix-tree-rt-aware.patch b/patches/radix-tree-rt-aware.patch index e51960de48966d..78762efd6a5a62 100644 --- a/patches/radix-tree-rt-aware.patch +++ b/patches/radix-tree-rt-aware.patch @@ -12,10 +12,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> lib/radix-tree.c | 5 ++++- 2 files changed, 10 insertions(+), 2 deletions(-) -Index: linux-rt-devel/include/linux/radix-tree.h -=================================================================== ---- linux-rt-devel.orig/include/linux/radix-tree.h -+++ linux-rt-devel/include/linux/radix-tree.h +--- a/include/linux/radix-tree.h ++++ b/include/linux/radix-tree.h @@ -277,8 +277,13 @@ radix_tree_gang_lookup(struct radix_tree unsigned int radix_tree_gang_lookup_slot(struct radix_tree_root *root, void ***results, unsigned long *indices, @@ -39,10 +37,8 @@ Index: linux-rt-devel/include/linux/radix-tree.h } /** -Index: linux-rt-devel/lib/radix-tree.c -=================================================================== ---- linux-rt-devel.orig/lib/radix-tree.c -+++ linux-rt-devel/lib/radix-tree.c +--- a/lib/radix-tree.c ++++ b/lib/radix-tree.c @@ -195,12 +195,13 @@ radix_tree_node_alloc(struct radix_tree_ * succeed in getting a node here (and never reach * kmem_cache_alloc) diff --git a/patches/random-make-it-work-on-rt.patch b/patches/random-make-it-work-on-rt.patch index 76748a595d5982..299e0bbaa9e8d0 100644 --- a/patches/random-make-it-work-on-rt.patch +++ b/patches/random-make-it-work-on-rt.patch @@ -17,10 +17,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/irq/manage.c | 6 ++++++ 5 files changed, 20 insertions(+), 8 deletions(-) -Index: linux-rt-devel/drivers/char/random.c -=================================================================== ---- linux-rt-devel.orig/drivers/char/random.c -+++ linux-rt-devel/drivers/char/random.c +--- a/drivers/char/random.c ++++ b/drivers/char/random.c @@ -868,28 +868,27 @@ static __u32 get_reg(struct fast_pool *f return *(ptr + f->reg_idx++); } @@ -55,10 +53,8 @@ Index: linux-rt-devel/drivers/char/random.c fast_mix(fast_pool); add_interrupt_bench(cycles); -Index: linux-rt-devel/include/linux/irqdesc.h -=================================================================== ---- linux-rt-devel.orig/include/linux/irqdesc.h -+++ linux-rt-devel/include/linux/irqdesc.h +--- a/include/linux/irqdesc.h ++++ b/include/linux/irqdesc.h @@ -63,6 +63,7 @@ struct irq_desc { unsigned int irqs_unhandled; atomic_t threads_handled; @@ -67,10 +63,8 @@ Index: linux-rt-devel/include/linux/irqdesc.h raw_spinlock_t lock; struct cpumask *percpu_enabled; #ifdef CONFIG_SMP -Index: linux-rt-devel/include/linux/random.h -=================================================================== ---- linux-rt-devel.orig/include/linux/random.h -+++ linux-rt-devel/include/linux/random.h +--- a/include/linux/random.h ++++ b/include/linux/random.h @@ -11,7 +11,7 @@ extern void add_device_randomness(const void *, unsigned int); extern void add_input_randomness(unsigned int type, unsigned int code, @@ -80,10 +74,8 @@ Index: linux-rt-devel/include/linux/random.h extern void get_random_bytes(void *buf, int nbytes); extern void get_random_bytes_arch(void *buf, int nbytes); -Index: linux-rt-devel/kernel/irq/handle.c -=================================================================== ---- linux-rt-devel.orig/kernel/irq/handle.c -+++ linux-rt-devel/kernel/irq/handle.c +--- a/kernel/irq/handle.c ++++ b/kernel/irq/handle.c @@ -133,6 +133,8 @@ void __irq_wake_thread(struct irq_desc * irqreturn_t handle_irq_event_percpu(struct irq_desc *desc, struct irqaction *action) @@ -106,10 +98,8 @@ Index: linux-rt-devel/kernel/irq/handle.c if (!noirqdebug) note_interrupt(irq, desc, retval); -Index: linux-rt-devel/kernel/irq/manage.c -=================================================================== ---- linux-rt-devel.orig/kernel/irq/manage.c -+++ linux-rt-devel/kernel/irq/manage.c +--- a/kernel/irq/manage.c ++++ b/kernel/irq/manage.c @@ -1012,6 +1012,12 @@ static int irq_thread(void *data) if (action_ret == IRQ_WAKE_THREAD) irq_wake_secondary(desc, action); diff --git a/patches/rcu-Eliminate-softirq-processing-from-rcutree.patch b/patches/rcu-Eliminate-softirq-processing-from-rcutree.patch index dde12f33a2b175..ff4adc3db39b3d 100644 --- a/patches/rcu-Eliminate-softirq-processing-from-rcutree.patch +++ b/patches/rcu-Eliminate-softirq-processing-from-rcutree.patch @@ -21,10 +21,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> kernel/rcu/tree_plugin.h | 141 +++++------------------------------------------ 3 files changed, 116 insertions(+), 140 deletions(-) -Index: linux-rt-devel/kernel/rcu/tree.c -=================================================================== ---- linux-rt-devel.orig/kernel/rcu/tree.c -+++ linux-rt-devel/kernel/rcu/tree.c +--- a/kernel/rcu/tree.c ++++ b/kernel/rcu/tree.c @@ -56,6 +56,11 @@ #include <linux/random.h> #include <linux/ftrace_event.h> @@ -37,7 +35,7 @@ Index: linux-rt-devel/kernel/rcu/tree.c #include "tree.h" #include "rcu.h" -@@ -2882,18 +2887,17 @@ __rcu_process_callbacks(struct rcu_state +@@ -2882,18 +2887,17 @@ static void /* * Do RCU core processing for the current CPU. */ @@ -178,10 +176,8 @@ Index: linux-rt-devel/kernel/rcu/tree.c /* * We don't need protection against CPU-hotplug here because -Index: linux-rt-devel/kernel/rcu/tree.h -=================================================================== ---- linux-rt-devel.orig/kernel/rcu/tree.h -+++ linux-rt-devel/kernel/rcu/tree.h +--- a/kernel/rcu/tree.h ++++ b/kernel/rcu/tree.h @@ -530,12 +530,10 @@ extern struct rcu_state rcu_preempt_stat DECLARE_PER_CPU(struct rcu_data, rcu_preempt_data); #endif /* #ifdef CONFIG_PREEMPT_RCU */ @@ -207,10 +203,8 @@ Index: linux-rt-devel/kernel/rcu/tree.h static int rcu_spawn_one_boost_kthread(struct rcu_state *rsp, struct rcu_node *rnp); #endif /* #ifdef CONFIG_RCU_BOOST */ -Index: linux-rt-devel/kernel/rcu/tree_plugin.h -=================================================================== ---- linux-rt-devel.orig/kernel/rcu/tree_plugin.h -+++ linux-rt-devel/kernel/rcu/tree_plugin.h +--- a/kernel/rcu/tree_plugin.h ++++ b/kernel/rcu/tree_plugin.h @@ -24,28 +24,20 @@ * Paul E. McKenney <paulmck@linux.vnet.ibm.com> */ diff --git a/patches/rcu-disable-rcu-fast-no-hz-on-rt.patch b/patches/rcu-disable-rcu-fast-no-hz-on-rt.patch index e0fbaeb07c5bd0..12053fabce9938 100644 --- a/patches/rcu-disable-rcu-fast-no-hz-on-rt.patch +++ b/patches/rcu-disable-rcu-fast-no-hz-on-rt.patch @@ -11,10 +11,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> init/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux-rt-devel/init/Kconfig -=================================================================== ---- linux-rt-devel.orig/init/Kconfig -+++ linux-rt-devel/init/Kconfig +--- a/init/Kconfig ++++ b/init/Kconfig @@ -637,7 +637,7 @@ config RCU_FANOUT_EXACT config RCU_FAST_NO_HZ diff --git a/patches/rcu-make-RCU_BOOST-default-on-RT.patch b/patches/rcu-make-RCU_BOOST-default-on-RT.patch index 5026f913abb7a6..71fa55a7fa7769 100644 --- a/patches/rcu-make-RCU_BOOST-default-on-RT.patch +++ b/patches/rcu-make-RCU_BOOST-default-on-RT.patch @@ -13,10 +13,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> init/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux-rt-devel/init/Kconfig -=================================================================== ---- linux-rt-devel.orig/init/Kconfig -+++ linux-rt-devel/init/Kconfig +--- a/init/Kconfig ++++ b/init/Kconfig @@ -664,7 +664,7 @@ config TREE_RCU_TRACE config RCU_BOOST bool "Enable RCU priority boosting" diff --git a/patches/rcu-merge-rcu-bh-into-rcu-preempt-for-rt.patch b/patches/rcu-merge-rcu-bh-into-rcu-preempt-for-rt.patch index b833c30ed5e83f..1d3b4a2c4fc12a 100644 --- a/patches/rcu-merge-rcu-bh-into-rcu-preempt-for-rt.patch +++ b/patches/rcu-merge-rcu-bh-into-rcu-preempt-for-rt.patch @@ -30,10 +30,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/rcu/update.c | 2 ++ 4 files changed, 59 insertions(+), 2 deletions(-) -Index: linux-rt-devel/include/linux/rcupdate.h -=================================================================== ---- linux-rt-devel.orig/include/linux/rcupdate.h -+++ linux-rt-devel/include/linux/rcupdate.h +--- a/include/linux/rcupdate.h ++++ b/include/linux/rcupdate.h @@ -167,6 +167,9 @@ void call_rcu(struct rcu_head *head, #endif /* #else #ifdef CONFIG_PREEMPT_RCU */ @@ -111,10 +109,8 @@ Index: linux-rt-devel/include/linux/rcupdate.h local_bh_enable(); } -Index: linux-rt-devel/include/linux/rcutree.h -=================================================================== ---- linux-rt-devel.orig/include/linux/rcutree.h -+++ linux-rt-devel/include/linux/rcutree.h +--- a/include/linux/rcutree.h ++++ b/include/linux/rcutree.h @@ -46,7 +46,11 @@ static inline void rcu_virt_note_context rcu_note_context_switch(); } @@ -167,10 +163,8 @@ Index: linux-rt-devel/include/linux/rcutree.h void rcu_all_qs(void); #endif /* __LINUX_RCUTREE_H */ -Index: linux-rt-devel/kernel/rcu/tree.c -=================================================================== ---- linux-rt-devel.orig/kernel/rcu/tree.c -+++ linux-rt-devel/kernel/rcu/tree.c +--- a/kernel/rcu/tree.c ++++ b/kernel/rcu/tree.c @@ -220,6 +220,7 @@ void rcu_sched_qs(void) } } @@ -257,10 +251,8 @@ Index: linux-rt-devel/kernel/rcu/tree.c /** * rcu_barrier_sched - Wait for in-flight call_rcu_sched() callbacks. -Index: linux-rt-devel/kernel/rcu/update.c -=================================================================== ---- linux-rt-devel.orig/kernel/rcu/update.c -+++ linux-rt-devel/kernel/rcu/update.c +--- a/kernel/rcu/update.c ++++ b/kernel/rcu/update.c @@ -227,6 +227,7 @@ int rcu_read_lock_held(void) } EXPORT_SYMBOL_GPL(rcu_read_lock_held); diff --git a/patches/rcu-more-swait-conversions.patch b/patches/rcu-more-swait-conversions.patch index b866715ea7f7b4..3ec0dc8b7916e6 100644 --- a/patches/rcu-more-swait-conversions.patch +++ b/patches/rcu-more-swait-conversions.patch @@ -21,10 +21,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> kernel/rcu/tree_plugin.h | 18 +++++++++--------- 3 files changed, 17 insertions(+), 16 deletions(-) -Index: linux-rt-devel/kernel/rcu/tree.c -=================================================================== ---- linux-rt-devel.orig/kernel/rcu/tree.c -+++ linux-rt-devel/kernel/rcu/tree.c +--- a/kernel/rcu/tree.c ++++ b/kernel/rcu/tree.c @@ -1567,7 +1567,7 @@ static void rcu_gp_kthread_wake(struct r !ACCESS_ONCE(rsp->gp_flags) || !rsp->gp_kthread) @@ -61,10 +59,8 @@ Index: linux-rt-devel/kernel/rcu/tree.c rnp = rsp->level[rcu_num_lvls - 1]; for_each_possible_cpu(i) { while (i > rnp->grphi) -Index: linux-rt-devel/kernel/rcu/tree.h -=================================================================== ---- linux-rt-devel.orig/kernel/rcu/tree.h -+++ linux-rt-devel/kernel/rcu/tree.h +--- a/kernel/rcu/tree.h ++++ b/kernel/rcu/tree.h @@ -27,6 +27,7 @@ #include <linux/threads.h> #include <linux/cpumask.h> @@ -100,10 +96,8 @@ Index: linux-rt-devel/kernel/rcu/tree.h short gp_flags; /* Commands for GP task. */ short gp_state; /* GP kthread sleep state. */ -Index: linux-rt-devel/kernel/rcu/tree_plugin.h -=================================================================== ---- linux-rt-devel.orig/kernel/rcu/tree_plugin.h -+++ linux-rt-devel/kernel/rcu/tree_plugin.h +--- a/kernel/rcu/tree_plugin.h ++++ b/kernel/rcu/tree_plugin.h @@ -1864,7 +1864,7 @@ early_param("rcu_nocb_poll", parse_rcu_n */ static void rcu_nocb_gp_cleanup(struct rcu_state *rsp, struct rcu_node *rnp) @@ -142,7 +136,7 @@ Index: linux-rt-devel/kernel/rcu/tree_plugin.h rnp->nocb_gp_wq[c & 0x1], (d = ULONG_CMP_GE(ACCESS_ONCE(rnp->completed), c))); if (likely(d)) -@@ -2149,7 +2149,7 @@ wait_again: +@@ -2149,7 +2149,7 @@ static void nocb_leader_wait(struct rcu_ /* Wait for callbacks to appear. */ if (!rcu_nocb_poll) { trace_rcu_nocb_wake(my_rdp->rsp->name, my_rdp->cpu, "Sleep"); @@ -151,7 +145,7 @@ Index: linux-rt-devel/kernel/rcu/tree_plugin.h !ACCESS_ONCE(my_rdp->nocb_leader_sleep)); /* Memory barrier handled by smp_mb() calls below and repoll. */ } else if (firsttime) { -@@ -2224,7 +2224,7 @@ wait_again: +@@ -2224,7 +2224,7 @@ static void nocb_leader_wait(struct rcu_ * List was empty, wake up the follower. * Memory barriers supplied by atomic_long_add(). */ diff --git a/patches/rcutree-rcu_bh_qs-disable-irq-while-calling-rcu_pree.patch b/patches/rcutree-rcu_bh_qs-disable-irq-while-calling-rcu_pree.patch index 79422ada511d9b..b1c160a14230c9 100644 --- a/patches/rcutree-rcu_bh_qs-disable-irq-while-calling-rcu_pree.patch +++ b/patches/rcutree-rcu_bh_qs-disable-irq-while-calling-rcu_pree.patch @@ -31,10 +31,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> kernel/rcu/tree.c | 5 +++++ 1 file changed, 5 insertions(+) -Index: linux-rt-devel/kernel/rcu/tree.c -=================================================================== ---- linux-rt-devel.orig/kernel/rcu/tree.c -+++ linux-rt-devel/kernel/rcu/tree.c +--- a/kernel/rcu/tree.c ++++ b/kernel/rcu/tree.c @@ -225,7 +225,12 @@ static void rcu_preempt_qs(void); void rcu_bh_qs(void) diff --git a/patches/re-migrate_disable-race-with-cpu-hotplug-3f.patch b/patches/re-migrate_disable-race-with-cpu-hotplug-3f.patch index 4d2d257930c04e..dc5416f0b255a2 100644 --- a/patches/re-migrate_disable-race-with-cpu-hotplug-3f.patch +++ b/patches/re-migrate_disable-race-with-cpu-hotplug-3f.patch @@ -17,10 +17,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -Index: linux-rt-devel/kernel/cpu.c -=================================================================== ---- linux-rt-devel.orig/kernel/cpu.c -+++ linux-rt-devel/kernel/cpu.c +--- a/kernel/cpu.c ++++ b/kernel/cpu.c @@ -106,9 +106,11 @@ static DEFINE_PER_CPU(struct hotplug_pcp */ void pin_current_cpu(void) diff --git a/patches/re-preempt_rt_full-arm-coredump-fails-for-cpu-3e-3d-4.patch b/patches/re-preempt_rt_full-arm-coredump-fails-for-cpu-3e-3d-4.patch index 2438166de2fb89..a89c4d0733237e 100644 --- a/patches/re-preempt_rt_full-arm-coredump-fails-for-cpu-3e-3d-4.patch +++ b/patches/re-preempt_rt_full-arm-coredump-fails-for-cpu-3e-3d-4.patch @@ -33,10 +33,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> arch/arm/kernel/process.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) -Index: linux-rt-devel/arch/arm/kernel/process.c -=================================================================== ---- linux-rt-devel.orig/arch/arm/kernel/process.c -+++ linux-rt-devel/arch/arm/kernel/process.c +--- a/arch/arm/kernel/process.c ++++ b/arch/arm/kernel/process.c @@ -290,6 +290,30 @@ unsigned long arch_randomize_brk(struct } diff --git a/patches/relay-fix-timer-madness.patch b/patches/relay-fix-timer-madness.patch index b13884cc8deb2a..e872958b3a1c83 100644 --- a/patches/relay-fix-timer-madness.patch +++ b/patches/relay-fix-timer-madness.patch @@ -13,10 +13,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/relay.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) -Index: linux-rt-devel/kernel/relay.c -=================================================================== ---- linux-rt-devel.orig/kernel/relay.c -+++ linux-rt-devel/kernel/relay.c +--- a/kernel/relay.c ++++ b/kernel/relay.c @@ -339,6 +339,10 @@ static void wakeup_readers(unsigned long { struct rchan_buf *buf = (struct rchan_buf *)data; diff --git a/patches/rfc-arm-smp-__cpu_disable-fix-sleeping-function-called-from-invalid-context.patch b/patches/rfc-arm-smp-__cpu_disable-fix-sleeping-function-called-from-invalid-context.patch index 8d54636e8f4679..89c0f9cb510451 100644 --- a/patches/rfc-arm-smp-__cpu_disable-fix-sleeping-function-called-from-invalid-context.patch +++ b/patches/rfc-arm-smp-__cpu_disable-fix-sleeping-function-called-from-invalid-context.patch @@ -72,10 +72,8 @@ This issue was first reported in: arch/arm/kernel/smp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -Index: linux-rt-devel/arch/arm/kernel/smp.c -=================================================================== ---- linux-rt-devel.orig/arch/arm/kernel/smp.c -+++ linux-rt-devel/arch/arm/kernel/smp.c +--- a/arch/arm/kernel/smp.c ++++ b/arch/arm/kernel/smp.c @@ -213,8 +213,6 @@ int __cpu_disable(void) flush_cache_louis(); local_flush_tlb_all(); diff --git a/patches/rt-add-rt-locks.patch b/patches/rt-add-rt-locks.patch index ad3548529b75e6..0f7e02028131d7 100644 --- a/patches/rt-add-rt-locks.patch +++ b/patches/rt-add-rt-locks.patch @@ -33,10 +33,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/locking/spinlock_debug.c | 5 22 files changed, 1525 insertions(+), 43 deletions(-) -Index: linux-rt-devel/include/linux/kernel.h -=================================================================== ---- linux-rt-devel.orig/include/linux/kernel.h -+++ linux-rt-devel/include/linux/kernel.h +--- a/include/linux/kernel.h ++++ b/include/linux/kernel.h @@ -188,6 +188,9 @@ extern int _cond_resched(void); */ # define might_sleep() \ @@ -55,10 +53,8 @@ Index: linux-rt-devel/include/linux/kernel.h # define sched_annotate_sleep() do { } while (0) #endif -Index: linux-rt-devel/include/linux/locallock.h -=================================================================== ---- linux-rt-devel.orig/include/linux/locallock.h -+++ linux-rt-devel/include/linux/locallock.h +--- a/include/linux/locallock.h ++++ b/include/linux/locallock.h @@ -42,9 +42,15 @@ struct local_irq_lock { * already takes care of the migrate_disable/enable * for CONFIG_PREEMPT_BASE map to the normal spin_* calls. @@ -75,10 +71,8 @@ Index: linux-rt-devel/include/linux/locallock.h static inline void __local_lock(struct local_irq_lock *lv) { -Index: linux-rt-devel/include/linux/mutex.h -=================================================================== ---- linux-rt-devel.orig/include/linux/mutex.h -+++ linux-rt-devel/include/linux/mutex.h +--- a/include/linux/mutex.h ++++ b/include/linux/mutex.h @@ -19,6 +19,17 @@ #include <asm/processor.h> #include <linux/osq_lock.h> @@ -120,10 +114,8 @@ Index: linux-rt-devel/include/linux/mutex.h extern int atomic_dec_and_mutex_lock(atomic_t *cnt, struct mutex *lock); #endif /* __LINUX_MUTEX_H */ -Index: linux-rt-devel/include/linux/mutex_rt.h -=================================================================== --- /dev/null -+++ linux-rt-devel/include/linux/mutex_rt.h ++++ b/include/linux/mutex_rt.h @@ -0,0 +1,84 @@ +#ifndef __LINUX_MUTEX_RT_H +#define __LINUX_MUTEX_RT_H @@ -209,10 +201,8 @@ Index: linux-rt-devel/include/linux/mutex_rt.h +} while (0) + +#endif -Index: linux-rt-devel/include/linux/rtmutex.h -=================================================================== ---- linux-rt-devel.orig/include/linux/rtmutex.h -+++ linux-rt-devel/include/linux/rtmutex.h +--- a/include/linux/rtmutex.h ++++ b/include/linux/rtmutex.h @@ -18,6 +18,10 @@ extern int max_lock_depth; /* for sysctl */ @@ -273,10 +263,8 @@ Index: linux-rt-devel/include/linux/rtmutex.h #define DEFINE_RT_MUTEX(mutexname) \ struct rt_mutex mutexname = __RT_MUTEX_INITIALIZER(mutexname) -Index: linux-rt-devel/include/linux/rwlock_rt.h -=================================================================== --- /dev/null -+++ linux-rt-devel/include/linux/rwlock_rt.h ++++ b/include/linux/rwlock_rt.h @@ -0,0 +1,99 @@ +#ifndef __LINUX_RWLOCK_RT_H +#define __LINUX_RWLOCK_RT_H @@ -377,10 +365,8 @@ Index: linux-rt-devel/include/linux/rwlock_rt.h + } while (0) + +#endif -Index: linux-rt-devel/include/linux/rwlock_types_rt.h -=================================================================== --- /dev/null -+++ linux-rt-devel/include/linux/rwlock_types_rt.h ++++ b/include/linux/rwlock_types_rt.h @@ -0,0 +1,33 @@ +#ifndef __LINUX_RWLOCK_TYPES_RT_H +#define __LINUX_RWLOCK_TYPES_RT_H @@ -415,10 +401,8 @@ Index: linux-rt-devel/include/linux/rwlock_types_rt.h + rwlock_t name __cacheline_aligned_in_smp = __RW_LOCK_UNLOCKED(name) + +#endif -Index: linux-rt-devel/include/linux/rwsem.h -=================================================================== ---- linux-rt-devel.orig/include/linux/rwsem.h -+++ linux-rt-devel/include/linux/rwsem.h +--- a/include/linux/rwsem.h ++++ b/include/linux/rwsem.h @@ -18,6 +18,10 @@ #include <linux/osq_lock.h> #endif @@ -437,10 +421,8 @@ Index: linux-rt-devel/include/linux/rwsem.h +#endif /* !PREEMPT_RT_FULL */ + #endif /* _LINUX_RWSEM_H */ -Index: linux-rt-devel/include/linux/rwsem_rt.h -=================================================================== --- /dev/null -+++ linux-rt-devel/include/linux/rwsem_rt.h ++++ b/include/linux/rwsem_rt.h @@ -0,0 +1,140 @@ +#ifndef _LINUX_RWSEM_RT_H +#define _LINUX_RWSEM_RT_H @@ -582,10 +564,8 @@ Index: linux-rt-devel/include/linux/rwsem_rt.h +} +#endif +#endif -Index: linux-rt-devel/include/linux/sched.h -=================================================================== ---- linux-rt-devel.orig/include/linux/sched.h -+++ linux-rt-devel/include/linux/sched.h +--- a/include/linux/sched.h ++++ b/include/linux/sched.h @@ -302,6 +302,11 @@ extern char ___assert_task_state[1 - 2*! #endif @@ -598,10 +578,8 @@ Index: linux-rt-devel/include/linux/sched.h /* Task command name length */ #define TASK_COMM_LEN 16 -Index: linux-rt-devel/include/linux/spinlock.h -=================================================================== ---- linux-rt-devel.orig/include/linux/spinlock.h -+++ linux-rt-devel/include/linux/spinlock.h +--- a/include/linux/spinlock.h ++++ b/include/linux/spinlock.h @@ -281,7 +281,11 @@ static inline void do_raw_spin_unlock(ra #define raw_spin_can_lock(lock) (!raw_spin_is_locked(lock)) @@ -633,10 +611,8 @@ Index: linux-rt-devel/include/linux/spinlock.h +#endif /* !PREEMPT_RT_FULL */ + #endif /* __LINUX_SPINLOCK_H */ -Index: linux-rt-devel/include/linux/spinlock_api_smp.h -=================================================================== ---- linux-rt-devel.orig/include/linux/spinlock_api_smp.h -+++ linux-rt-devel/include/linux/spinlock_api_smp.h +--- a/include/linux/spinlock_api_smp.h ++++ b/include/linux/spinlock_api_smp.h @@ -189,6 +189,8 @@ static inline int __raw_spin_trylock_bh( return 0; } @@ -647,10 +623,8 @@ Index: linux-rt-devel/include/linux/spinlock_api_smp.h +#endif #endif /* __LINUX_SPINLOCK_API_SMP_H */ -Index: linux-rt-devel/include/linux/spinlock_rt.h -=================================================================== --- /dev/null -+++ linux-rt-devel/include/linux/spinlock_rt.h ++++ b/include/linux/spinlock_rt.h @@ -0,0 +1,173 @@ +#ifndef __LINUX_SPINLOCK_RT_H +#define __LINUX_SPINLOCK_RT_H @@ -825,10 +799,8 @@ Index: linux-rt-devel/include/linux/spinlock_rt.h + atomic_dec_and_spin_lock(atomic, lock) + +#endif -Index: linux-rt-devel/include/linux/spinlock_types.h -=================================================================== ---- linux-rt-devel.orig/include/linux/spinlock_types.h -+++ linux-rt-devel/include/linux/spinlock_types.h +--- a/include/linux/spinlock_types.h ++++ b/include/linux/spinlock_types.h @@ -11,8 +11,13 @@ #include <linux/spinlock_types_raw.h> @@ -846,10 +818,8 @@ Index: linux-rt-devel/include/linux/spinlock_types.h +#endif #endif /* __LINUX_SPINLOCK_TYPES_H */ -Index: linux-rt-devel/include/linux/spinlock_types_rt.h -=================================================================== --- /dev/null -+++ linux-rt-devel/include/linux/spinlock_types_rt.h ++++ b/include/linux/spinlock_types_rt.h @@ -0,0 +1,51 @@ +#ifndef __LINUX_SPINLOCK_TYPES_RT_H +#define __LINUX_SPINLOCK_TYPES_RT_H @@ -902,10 +872,8 @@ Index: linux-rt-devel/include/linux/spinlock_types_rt.h + spinlock_t name __cacheline_aligned_in_smp = __SPIN_LOCK_UNLOCKED(name) + +#endif -Index: linux-rt-devel/kernel/futex.c -=================================================================== ---- linux-rt-devel.orig/kernel/futex.c -+++ linux-rt-devel/kernel/futex.c +--- a/kernel/futex.c ++++ b/kernel/futex.c @@ -2613,10 +2613,7 @@ static int futex_wait_requeue_pi(u32 __u * The waiter is allocated on our stack, manipulated by the requeue * code while we sleep on uaddr. @@ -918,10 +886,8 @@ Index: linux-rt-devel/kernel/futex.c ret = get_futex_key(uaddr2, flags & FLAGS_SHARED, &key2, VERIFY_WRITE); if (unlikely(ret != 0)) -Index: linux-rt-devel/kernel/locking/Makefile -=================================================================== ---- linux-rt-devel.orig/kernel/locking/Makefile -+++ linux-rt-devel/kernel/locking/Makefile +--- a/kernel/locking/Makefile ++++ b/kernel/locking/Makefile @@ -1,5 +1,5 @@ -obj-y += mutex.o semaphore.o rwsem.o @@ -953,10 +919,8 @@ Index: linux-rt-devel/kernel/locking/Makefile +obj-$(CONFIG_PREEMPT_RT_FULL) += rt.o obj-$(CONFIG_QUEUE_RWLOCK) += qrwlock.o obj-$(CONFIG_LOCK_TORTURE_TEST) += locktorture.o -Index: linux-rt-devel/kernel/locking/rt.c -=================================================================== --- /dev/null -+++ linux-rt-devel/kernel/locking/rt.c ++++ b/kernel/locking/rt.c @@ -0,0 +1,461 @@ +/* + * kernel/rt.c @@ -1419,10 +1383,8 @@ Index: linux-rt-devel/kernel/locking/rt.c + return 1; +} +EXPORT_SYMBOL(atomic_dec_and_mutex_lock); -Index: linux-rt-devel/kernel/locking/rtmutex.c -=================================================================== ---- linux-rt-devel.orig/kernel/locking/rtmutex.c -+++ linux-rt-devel/kernel/locking/rtmutex.c +--- a/kernel/locking/rtmutex.c ++++ b/kernel/locking/rtmutex.c @@ -7,6 +7,11 @@ * Copyright (C) 2005-2006 Timesys Corp., Thomas Gleixner <tglx@timesys.com> * Copyright (C) 2005 Kihon Technologies Inc., Steven Rostedt @@ -1537,7 +1499,7 @@ Index: linux-rt-devel/kernel/locking/rtmutex.c /* * The current top waiter stays enqueued. We * don't have to change anything in the lock -@@ -872,6 +906,308 @@ takeit: +@@ -872,6 +906,308 @@ static int try_to_take_rt_mutex(struct r return 1; } @@ -1929,10 +1891,8 @@ Index: linux-rt-devel/kernel/locking/rtmutex.c +} +EXPORT_SYMBOL_GPL(ww_mutex_unlock); +#endif -Index: linux-rt-devel/kernel/locking/rtmutex_common.h -=================================================================== ---- linux-rt-devel.orig/kernel/locking/rtmutex_common.h -+++ linux-rt-devel/kernel/locking/rtmutex_common.h +--- a/kernel/locking/rtmutex_common.h ++++ b/kernel/locking/rtmutex_common.h @@ -49,6 +49,7 @@ struct rt_mutex_waiter { struct rb_node pi_tree_entry; struct task_struct *task; @@ -1956,10 +1916,8 @@ Index: linux-rt-devel/kernel/locking/rtmutex_common.h +} + #endif -Index: linux-rt-devel/kernel/locking/spinlock.c -=================================================================== ---- linux-rt-devel.orig/kernel/locking/spinlock.c -+++ linux-rt-devel/kernel/locking/spinlock.c +--- a/kernel/locking/spinlock.c ++++ b/kernel/locking/spinlock.c @@ -124,8 +124,11 @@ void __lockfunc __raw_##op##_lock_bh(loc * __[spin|read|write]_lock_bh() */ @@ -1990,10 +1948,8 @@ Index: linux-rt-devel/kernel/locking/spinlock.c #ifdef CONFIG_DEBUG_LOCK_ALLOC void __lockfunc _raw_spin_lock_nested(raw_spinlock_t *lock, int subclass) -Index: linux-rt-devel/kernel/locking/spinlock_debug.c -=================================================================== ---- linux-rt-devel.orig/kernel/locking/spinlock_debug.c -+++ linux-rt-devel/kernel/locking/spinlock_debug.c +--- a/kernel/locking/spinlock_debug.c ++++ b/kernel/locking/spinlock_debug.c @@ -31,6 +31,7 @@ void __raw_spin_lock_init(raw_spinlock_t EXPORT_SYMBOL(__raw_spin_lock_init); diff --git a/patches/rt-introduce-cpu-chill.patch b/patches/rt-introduce-cpu-chill.patch index 287a12ccf6bdeb..894b7abca8ed50 100644 --- a/patches/rt-introduce-cpu-chill.patch +++ b/patches/rt-introduce-cpu-chill.patch @@ -85,10 +85,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> kernel/time/hrtimer.c | 19 +++++++++++++++++++ 2 files changed, 25 insertions(+) -Index: linux-rt-devel/include/linux/delay.h -=================================================================== ---- linux-rt-devel.orig/include/linux/delay.h -+++ linux-rt-devel/include/linux/delay.h +--- a/include/linux/delay.h ++++ b/include/linux/delay.h @@ -52,4 +52,10 @@ static inline void ssleep(unsigned int s msleep(seconds * 1000); } @@ -100,10 +98,8 @@ Index: linux-rt-devel/include/linux/delay.h +#endif + #endif /* defined(_LINUX_DELAY_H) */ -Index: linux-rt-devel/kernel/time/hrtimer.c -=================================================================== ---- linux-rt-devel.orig/kernel/time/hrtimer.c -+++ linux-rt-devel/kernel/time/hrtimer.c +--- a/kernel/time/hrtimer.c ++++ b/kernel/time/hrtimer.c @@ -1867,6 +1867,25 @@ SYSCALL_DEFINE2(nanosleep, struct timesp return hrtimer_nanosleep(&tu, rmtp, HRTIMER_MODE_REL, CLOCK_MONOTONIC); } diff --git a/patches/rt-local-irq-lock.patch b/patches/rt-local-irq-lock.patch index 0e5e5abc05a9c8..fdd9b7d2140c1f 100644 --- a/patches/rt-local-irq-lock.patch +++ b/patches/rt-local-irq-lock.patch @@ -16,10 +16,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> include/linux/percpu.h | 29 +++++ 2 files changed, 293 insertions(+) -Index: linux-rt-devel/include/linux/locallock.h -=================================================================== --- /dev/null -+++ linux-rt-devel/include/linux/locallock.h ++++ b/include/linux/locallock.h @@ -0,0 +1,264 @@ +#ifndef _LINUX_LOCALLOCK_H +#define _LINUX_LOCALLOCK_H @@ -285,10 +283,8 @@ Index: linux-rt-devel/include/linux/locallock.h +#endif + +#endif -Index: linux-rt-devel/include/linux/percpu.h -=================================================================== ---- linux-rt-devel.orig/include/linux/percpu.h -+++ linux-rt-devel/include/linux/percpu.h +--- a/include/linux/percpu.h ++++ b/include/linux/percpu.h @@ -24,6 +24,35 @@ PERCPU_MODULE_RESERVE) #endif diff --git a/patches/rt-preempt-base-config.patch b/patches/rt-preempt-base-config.patch index a2802978cb7ad6..3f962fb7497ce8 100644 --- a/patches/rt-preempt-base-config.patch +++ b/patches/rt-preempt-base-config.patch @@ -11,10 +11,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/Kconfig.preempt | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) -Index: linux-rt-devel/kernel/Kconfig.preempt -=================================================================== ---- linux-rt-devel.orig/kernel/Kconfig.preempt -+++ linux-rt-devel/kernel/Kconfig.preempt +--- a/kernel/Kconfig.preempt ++++ b/kernel/Kconfig.preempt @@ -1,3 +1,10 @@ +config PREEMPT + bool diff --git a/patches/rt-serial-warn-fix.patch b/patches/rt-serial-warn-fix.patch index 5a320b1d8c2794..cf13097b5e7cfa 100644 --- a/patches/rt-serial-warn-fix.patch +++ b/patches/rt-serial-warn-fix.patch @@ -15,10 +15,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> drivers/tty/serial/8250/8250_core.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) -Index: linux-rt-devel/drivers/tty/serial/8250/8250_core.c -=================================================================== ---- linux-rt-devel.orig/drivers/tty/serial/8250/8250_core.c -+++ linux-rt-devel/drivers/tty/serial/8250/8250_core.c +--- a/drivers/tty/serial/8250/8250_core.c ++++ b/drivers/tty/serial/8250/8250_core.c @@ -80,7 +80,16 @@ static unsigned int skip_txen_test; /* f #define DEBUG_INTR(fmt...) do { } while (0) #endif diff --git a/patches/rtmutex--Handle-non-enqueued-waiters-gracefully b/patches/rtmutex--Handle-non-enqueued-waiters-gracefully index 98ba033e25f3bd..745cb63686b3b0 100644 --- a/patches/rtmutex--Handle-non-enqueued-waiters-gracefully +++ b/patches/rtmutex--Handle-non-enqueued-waiters-gracefully @@ -19,11 +19,9 @@ Cc: stable-rt@vger.kernel.org kernel/locking/rtmutex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux-rt-devel/kernel/locking/rtmutex.c -=================================================================== ---- linux-rt-devel.orig/kernel/locking/rtmutex.c -+++ linux-rt-devel/kernel/locking/rtmutex.c -@@ -2141,7 +2141,7 @@ int rt_mutex_start_proxy_lock(struct rt_ +--- a/kernel/locking/rtmutex.c ++++ b/kernel/locking/rtmutex.c +@@ -1575,7 +1575,7 @@ int rt_mutex_start_proxy_lock(struct rt_ ret = 0; } diff --git a/patches/rtmutex-add-a-first-shot-of-ww_mutex.patch b/patches/rtmutex-add-a-first-shot-of-ww_mutex.patch index b30538136caad4..97c8c8c1cb30bf 100644 --- a/patches/rtmutex-add-a-first-shot-of-ww_mutex.patch +++ b/patches/rtmutex-add-a-first-shot-of-ww_mutex.patch @@ -25,10 +25,8 @@ Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc> kernel/locking/rtmutex.c | 251 ++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 226 insertions(+), 25 deletions(-) -Index: linux-rt-devel/kernel/locking/rtmutex.c -=================================================================== ---- linux-rt-devel.orig/kernel/locking/rtmutex.c -+++ linux-rt-devel/kernel/locking/rtmutex.c +--- a/kernel/locking/rtmutex.c ++++ b/kernel/locking/rtmutex.c @@ -21,6 +21,7 @@ #include <linux/sched/rt.h> #include <linux/sched/deadline.h> @@ -88,7 +86,7 @@ Index: linux-rt-devel/kernel/locking/rtmutex.c { int ret = 0; -@@ -1484,6 +1520,12 @@ __rt_mutex_slowlock(struct rt_mutex *loc +@@ -1484,6 +1520,12 @@ static int __sched break; } diff --git a/patches/rtmutex-avoid-include-hell.patch b/patches/rtmutex-avoid-include-hell.patch index 70df591c073f45..20d85673292ede 100644 --- a/patches/rtmutex-avoid-include-hell.patch +++ b/patches/rtmutex-avoid-include-hell.patch @@ -10,10 +10,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> include/linux/rtmutex.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux-rt-devel/include/linux/rtmutex.h -=================================================================== ---- linux-rt-devel.orig/include/linux/rtmutex.h -+++ linux-rt-devel/include/linux/rtmutex.h +--- a/include/linux/rtmutex.h ++++ b/include/linux/rtmutex.h @@ -14,7 +14,7 @@ #include <linux/linkage.h> diff --git a/patches/rtmutex-futex-prepare-rt.patch b/patches/rtmutex-futex-prepare-rt.patch index f187c61c14d62a..b70f3bb4cdd23a 100644 --- a/patches/rtmutex-futex-prepare-rt.patch +++ b/patches/rtmutex-futex-prepare-rt.patch @@ -13,11 +13,9 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/locking/rtmutex_common.h | 2 + 3 files changed, 94 insertions(+), 21 deletions(-) -Index: linux-rt-devel/kernel/futex.c -=================================================================== ---- linux-rt-devel.orig/kernel/futex.c -+++ linux-rt-devel/kernel/futex.c -@@ -1717,6 +1717,16 @@ retry_private: +--- a/kernel/futex.c ++++ b/kernel/futex.c +@@ -1717,6 +1717,16 @@ static int futex_requeue(u32 __user *uad requeue_pi_wake_futex(this, &key2, hb2); drop_count++; continue; @@ -133,10 +131,8 @@ Index: linux-rt-devel/kernel/futex.c /* * Fixup the pi_state owner and possibly acquire the lock if we * haven't already. -Index: linux-rt-devel/kernel/locking/rtmutex.c -=================================================================== ---- linux-rt-devel.orig/kernel/locking/rtmutex.c -+++ linux-rt-devel/kernel/locking/rtmutex.c +--- a/kernel/locking/rtmutex.c ++++ b/kernel/locking/rtmutex.c @@ -69,6 +69,11 @@ static void fixup_rt_mutex_waiters(struc clear_rt_mutex_waiters(lock); } @@ -229,10 +225,8 @@ Index: linux-rt-devel/kernel/locking/rtmutex.c !dl_prio(task->prio))) { raw_spin_unlock_irqrestore(&task->pi_lock, flags); return; -Index: linux-rt-devel/kernel/locking/rtmutex_common.h -=================================================================== ---- linux-rt-devel.orig/kernel/locking/rtmutex_common.h -+++ linux-rt-devel/kernel/locking/rtmutex_common.h +--- a/kernel/locking/rtmutex_common.h ++++ b/kernel/locking/rtmutex_common.h @@ -119,6 +119,8 @@ enum rtmutex_chainwalk { /* * PI-futex support (proxy locking functions, etc.): diff --git a/patches/rtmutex-lock-killable.patch b/patches/rtmutex-lock-killable.patch index 38e2028f2fd063..7c8865764abc3a 100644 --- a/patches/rtmutex-lock-killable.patch +++ b/patches/rtmutex-lock-killable.patch @@ -11,10 +11,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/locking/rtmutex.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) -Index: linux-rt-devel/include/linux/rtmutex.h -=================================================================== ---- linux-rt-devel.orig/include/linux/rtmutex.h -+++ linux-rt-devel/include/linux/rtmutex.h +--- a/include/linux/rtmutex.h ++++ b/include/linux/rtmutex.h @@ -91,6 +91,7 @@ extern void rt_mutex_destroy(struct rt_m extern void rt_mutex_lock(struct rt_mutex *lock); @@ -23,10 +21,8 @@ Index: linux-rt-devel/include/linux/rtmutex.h extern int rt_mutex_timed_lock(struct rt_mutex *lock, struct hrtimer_sleeper *timeout); -Index: linux-rt-devel/kernel/locking/rtmutex.c -=================================================================== ---- linux-rt-devel.orig/kernel/locking/rtmutex.c -+++ linux-rt-devel/kernel/locking/rtmutex.c +--- a/kernel/locking/rtmutex.c ++++ b/kernel/locking/rtmutex.c @@ -1442,6 +1442,25 @@ int rt_mutex_timed_futex_lock(struct rt_ } diff --git a/patches/sas-ata-isci-dont-t-disable-interrupts-in-qc_issue-h.patch b/patches/sas-ata-isci-dont-t-disable-interrupts-in-qc_issue-h.patch index 26ceabe6844118..8ec5a8e74817a5 100644 --- a/patches/sas-ata-isci-dont-t-disable-interrupts-in-qc_issue-h.patch +++ b/patches/sas-ata-isci-dont-t-disable-interrupts-in-qc_issue-h.patch @@ -56,10 +56,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> drivers/scsi/libsas/sas_ata.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -Index: linux-rt-devel/drivers/scsi/libsas/sas_ata.c -=================================================================== ---- linux-rt-devel.orig/drivers/scsi/libsas/sas_ata.c -+++ linux-rt-devel/drivers/scsi/libsas/sas_ata.c +--- a/drivers/scsi/libsas/sas_ata.c ++++ b/drivers/scsi/libsas/sas_ata.c @@ -190,7 +190,7 @@ static unsigned int sas_ata_qc_issue(str /* TODO: audit callers to ensure they are ready for qc_issue to * unconditionally re-enable interrupts diff --git a/patches/sched-deadline-dl_task_timer-has-to-be-irqsafe.patch b/patches/sched-deadline-dl_task_timer-has-to-be-irqsafe.patch index 6e4b9457eae12c..7680aaa3249c4f 100644 --- a/patches/sched-deadline-dl_task_timer-has-to-be-irqsafe.patch +++ b/patches/sched-deadline-dl_task_timer-has-to-be-irqsafe.patch @@ -10,10 +10,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> kernel/sched/deadline.c | 1 + 1 file changed, 1 insertion(+) -Index: linux-rt-devel/kernel/sched/deadline.c -=================================================================== ---- linux-rt-devel.orig/kernel/sched/deadline.c -+++ linux-rt-devel/kernel/sched/deadline.c +--- a/kernel/sched/deadline.c ++++ b/kernel/sched/deadline.c @@ -637,6 +637,7 @@ void init_dl_task_timer(struct sched_dl_ hrtimer_init(timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); diff --git a/patches/sched-delay-put-task.patch b/patches/sched-delay-put-task.patch index d9c37cd64455a4..2312781575fadc 100644 --- a/patches/sched-delay-put-task.patch +++ b/patches/sched-delay-put-task.patch @@ -11,10 +11,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/fork.c | 15 ++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) -Index: linux-rt-devel/include/linux/sched.h -=================================================================== ---- linux-rt-devel.orig/include/linux/sched.h -+++ linux-rt-devel/include/linux/sched.h +--- a/include/linux/sched.h ++++ b/include/linux/sched.h @@ -1788,6 +1788,9 @@ struct task_struct { unsigned int sequential_io; unsigned int sequential_io_avg; @@ -49,10 +47,8 @@ Index: linux-rt-devel/include/linux/sched.h #ifdef CONFIG_VIRT_CPU_ACCOUNTING_GEN extern void task_cputime(struct task_struct *t, -Index: linux-rt-devel/kernel/fork.c -=================================================================== ---- linux-rt-devel.orig/kernel/fork.c -+++ linux-rt-devel/kernel/fork.c +--- a/kernel/fork.c ++++ b/kernel/fork.c @@ -244,7 +244,9 @@ static inline void put_signal_struct(str if (atomic_dec_and_test(&sig->sigcnt)) free_signal_struct(sig); diff --git a/patches/sched-disable-rt-group-sched-on-rt.patch b/patches/sched-disable-rt-group-sched-on-rt.patch index 3357ef55202aeb..b4ed5bc8e5def8 100644 --- a/patches/sched-disable-rt-group-sched-on-rt.patch +++ b/patches/sched-disable-rt-group-sched-on-rt.patch @@ -16,10 +16,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> init/Kconfig | 1 + 1 file changed, 1 insertion(+) -Index: linux-rt-devel/init/Kconfig -=================================================================== ---- linux-rt-devel.orig/init/Kconfig -+++ linux-rt-devel/init/Kconfig +--- a/init/Kconfig ++++ b/init/Kconfig @@ -1101,6 +1101,7 @@ config CFS_BANDWIDTH config RT_GROUP_SCHED bool "Group scheduling for SCHED_RR/FIFO" diff --git a/patches/sched-disable-ttwu-queue.patch b/patches/sched-disable-ttwu-queue.patch index 541578b81fd303..9bb14049d16359 100644 --- a/patches/sched-disable-ttwu-queue.patch +++ b/patches/sched-disable-ttwu-queue.patch @@ -10,10 +10,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/sched/features.h | 5 +++++ 1 file changed, 5 insertions(+) -Index: linux-rt-devel/kernel/sched/features.h -=================================================================== ---- linux-rt-devel.orig/kernel/sched/features.h -+++ linux-rt-devel/kernel/sched/features.h +--- a/kernel/sched/features.h ++++ b/kernel/sched/features.h @@ -50,11 +50,16 @@ SCHED_FEAT(LB_BIAS, true) */ SCHED_FEAT(NONTASK_CAPACITY, true) diff --git a/patches/sched-introduce-the-27trace_sched_waking-27-tracepoint.patch b/patches/sched-introduce-the-27trace_sched_waking-27-tracepoint.patch index a35676ede93723..698923d176e08d 100644 --- a/patches/sched-introduce-the-27trace_sched_waking-27-tracepoint.patch +++ b/patches/sched-introduce-the-27trace_sched_waking-27-tracepoint.patch @@ -51,14 +51,12 @@ Thanks, Mathieu --- - include/trace/events/sched.h | 30 +++++++++++++++++++++--------- - kernel/sched/core.c | 8 +++++--- - kernel/trace/trace_sched_switch.c | 2 +- - kernel/trace/trace_sched_wakeup.c | 2 +- + include/trace/events/sched.h | 30 +++++++++++++++++++++--------- + kernel/sched/core.c | 8 +++++--- + kernel/trace/trace_sched_switch.c | 2 +- + kernel/trace/trace_sched_wakeup.c | 2 +- 4 files changed, 28 insertions(+), 14 deletions(-) -diff --git a/include/trace/events/sched.h b/include/trace/events/sched.h -index 30fedaf..3b63828 100644 --- a/include/trace/events/sched.h +++ b/include/trace/events/sched.h @@ -55,9 +55,9 @@ TRACE_EVENT(sched_kthread_stop_ret, @@ -73,7 +71,7 @@ index 30fedaf..3b63828 100644 TP_STRUCT__entry( __array( char, comm, TASK_COMM_LEN ) -@@ -71,25 +71,37 @@ DECLARE_EVENT_CLASS(sched_wakeup_template, +@@ -71,25 +71,37 @@ DECLARE_EVENT_CLASS(sched_wakeup_templat memcpy(__entry->comm, p->comm, TASK_COMM_LEN); __entry->pid = p->pid; __entry->prio = p->prio; @@ -118,8 +116,6 @@ index 30fedaf..3b63828 100644 #ifdef CREATE_TRACE_POINTS static inline long __trace_sched_switch_state(struct task_struct *p) -diff --git a/kernel/sched/core.c b/kernel/sched/core.c -index 799b75b..b8b53df 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -1558,9 +1558,9 @@ static void @@ -134,7 +130,7 @@ index 799b75b..b8b53df 100644 #ifdef CONFIG_SMP if (p->sched_class->task_woken) p->sched_class->task_woken(rq, p); -@@ -1784,6 +1784,8 @@ try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags) +@@ -1784,6 +1784,8 @@ try_to_wake_up(struct task_struct *p, un if (!(wake_flags & WF_LOCK_SLEEPER)) p->saved_state = TASK_RUNNING; @@ -143,7 +139,7 @@ index 799b75b..b8b53df 100644 success = 1; /* we're going to change ->state */ cpu = task_cpu(p); -@@ -2188,7 +2190,7 @@ void wake_up_new_task(struct task_struct *p) +@@ -2188,7 +2190,7 @@ void wake_up_new_task(struct task_struct rq = __task_rq_lock(p); activate_task(rq, p, 0); p->on_rq = TASK_ON_RQ_QUEUED; @@ -152,11 +148,9 @@ index 799b75b..b8b53df 100644 check_preempt_curr(rq, p, WF_FORK); #ifdef CONFIG_SMP if (p->sched_class->task_woken) -diff --git a/kernel/trace/trace_sched_switch.c b/kernel/trace/trace_sched_switch.c -index 419ca37..f270088 100644 --- a/kernel/trace/trace_sched_switch.c +++ b/kernel/trace/trace_sched_switch.c -@@ -26,7 +26,7 @@ probe_sched_switch(void *ignore, struct task_struct *prev, struct task_struct *n +@@ -26,7 +26,7 @@ probe_sched_switch(void *ignore, struct } static void @@ -165,11 +159,9 @@ index 419ca37..f270088 100644 { if (unlikely(!sched_ref)) return; -diff --git a/kernel/trace/trace_sched_wakeup.c b/kernel/trace/trace_sched_wakeup.c -index d6e1003..79a2a5f 100644 --- a/kernel/trace/trace_sched_wakeup.c +++ b/kernel/trace/trace_sched_wakeup.c -@@ -514,7 +514,7 @@ static void wakeup_reset(struct trace_array *tr) +@@ -514,7 +514,7 @@ static void wakeup_reset(struct trace_ar } static void @@ -178,8 +170,3 @@ index d6e1003..79a2a5f 100644 { struct trace_array_cpu *data; int cpu = smp_processor_id(); --- -2.1.4 - - - diff --git a/patches/sched-limit-nr-migrate.patch b/patches/sched-limit-nr-migrate.patch index a4a205d9af7285..3c52ca37143bf5 100644 --- a/patches/sched-limit-nr-migrate.patch +++ b/patches/sched-limit-nr-migrate.patch @@ -10,10 +10,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/sched/core.c | 4 ++++ 1 file changed, 4 insertions(+) -Index: linux-rt-devel/kernel/sched/core.c -=================================================================== ---- linux-rt-devel.orig/kernel/sched/core.c -+++ linux-rt-devel/kernel/sched/core.c +--- a/kernel/sched/core.c ++++ b/kernel/sched/core.c @@ -282,7 +282,11 @@ late_initcall(sched_init_debug); * Number of tasks to iterate in a single balance run. * Limited because this is done with IRQs disabled. diff --git a/patches/sched-might-sleep-do-not-account-rcu-depth.patch b/patches/sched-might-sleep-do-not-account-rcu-depth.patch index 50c4c4611303ce..dcca0c492d46e8 100644 --- a/patches/sched-might-sleep-do-not-account-rcu-depth.patch +++ b/patches/sched-might-sleep-do-not-account-rcu-depth.patch @@ -11,10 +11,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/sched/core.c | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) -Index: linux-rt-devel/include/linux/rcupdate.h -=================================================================== ---- linux-rt-devel.orig/include/linux/rcupdate.h -+++ linux-rt-devel/include/linux/rcupdate.h +--- a/include/linux/rcupdate.h ++++ b/include/linux/rcupdate.h @@ -260,6 +260,11 @@ void synchronize_rcu(void); * types of kernel builds, the rcu_read_lock() nesting depth is unknowable. */ @@ -36,11 +34,9 @@ Index: linux-rt-devel/include/linux/rcupdate.h #endif /* #else #ifdef CONFIG_PREEMPT_RCU */ /* Internal to kernel */ -Index: linux-rt-devel/kernel/sched/core.c -=================================================================== ---- linux-rt-devel.orig/kernel/sched/core.c -+++ linux-rt-devel/kernel/sched/core.c -@@ -7504,7 +7504,8 @@ void __init sched_init(void) +--- a/kernel/sched/core.c ++++ b/kernel/sched/core.c +@@ -7511,7 +7511,8 @@ void __init sched_init(void) #ifdef CONFIG_DEBUG_ATOMIC_SLEEP static inline int preempt_count_equals(int preempt_offset) { diff --git a/patches/sched-mmdrop-delayed.patch b/patches/sched-mmdrop-delayed.patch index 9f60640686574a..f5357727ee2501 100644 --- a/patches/sched-mmdrop-delayed.patch +++ b/patches/sched-mmdrop-delayed.patch @@ -13,10 +13,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/sched/core.c | 18 ++++++++++++++++-- 4 files changed, 45 insertions(+), 2 deletions(-) -Index: linux-rt-devel/include/linux/mm_types.h -=================================================================== ---- linux-rt-devel.orig/include/linux/mm_types.h -+++ linux-rt-devel/include/linux/mm_types.h +--- a/include/linux/mm_types.h ++++ b/include/linux/mm_types.h @@ -11,6 +11,7 @@ #include <linux/completion.h> #include <linux/cpumask.h> @@ -35,10 +33,8 @@ Index: linux-rt-devel/include/linux/mm_types.h #ifdef CONFIG_X86_INTEL_MPX /* address of the bounds directory */ void __user *bd_addr; -Index: linux-rt-devel/include/linux/sched.h -=================================================================== ---- linux-rt-devel.orig/include/linux/sched.h -+++ linux-rt-devel/include/linux/sched.h +--- a/include/linux/sched.h ++++ b/include/linux/sched.h @@ -2548,12 +2548,24 @@ extern struct mm_struct * mm_alloc(void) /* mmdrop drops the mm and the page tables */ @@ -64,10 +60,8 @@ Index: linux-rt-devel/include/linux/sched.h /* 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 */ -Index: linux-rt-devel/kernel/fork.c -=================================================================== ---- linux-rt-devel.orig/kernel/fork.c -+++ linux-rt-devel/kernel/fork.c +--- a/kernel/fork.c ++++ b/kernel/fork.c @@ -693,6 +693,19 @@ void __mmdrop(struct mm_struct *mm) } EXPORT_SYMBOL_GPL(__mmdrop); @@ -88,10 +82,8 @@ Index: linux-rt-devel/kernel/fork.c /* * Decrement the use count and release all resources for an mm. */ -Index: linux-rt-devel/kernel/sched/core.c -=================================================================== ---- linux-rt-devel.orig/kernel/sched/core.c -+++ linux-rt-devel/kernel/sched/core.c +--- a/kernel/sched/core.c ++++ b/kernel/sched/core.c @@ -2286,8 +2286,12 @@ static struct rq *finish_task_switch(str finish_arch_post_lock_switch(); @@ -106,7 +98,7 @@ Index: linux-rt-devel/kernel/sched/core.c if (unlikely(prev_state == TASK_DEAD)) { if (prev->sched_class->task_dead) prev->sched_class->task_dead(prev); -@@ -5125,6 +5129,8 @@ static int migration_cpu_stop(void *data +@@ -5132,6 +5136,8 @@ static int migration_cpu_stop(void *data #ifdef CONFIG_HOTPLUG_CPU @@ -115,7 +107,7 @@ Index: linux-rt-devel/kernel/sched/core.c /* * Ensures that the idle task is using init_mm right before its cpu goes * offline. -@@ -5139,7 +5145,11 @@ void idle_task_exit(void) +@@ -5146,7 +5152,11 @@ void idle_task_exit(void) switch_mm(mm, &init_mm, current); finish_arch_post_lock_switch(); } @@ -128,7 +120,7 @@ Index: linux-rt-devel/kernel/sched/core.c } /* -@@ -5482,6 +5492,10 @@ migration_call(struct notifier_block *nf +@@ -5489,6 +5499,10 @@ migration_call(struct notifier_block *nf case CPU_DEAD: calc_load_migrate(rq); diff --git a/patches/sched-rt-mutex-wakeup.patch b/patches/sched-rt-mutex-wakeup.patch index ac3faa6f687e05..c215c9b44ea457 100644 --- a/patches/sched-rt-mutex-wakeup.patch +++ b/patches/sched-rt-mutex-wakeup.patch @@ -15,10 +15,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/sched/sched.h | 1 + 3 files changed, 33 insertions(+), 1 deletion(-) -Index: linux-rt-devel/include/linux/sched.h -=================================================================== ---- linux-rt-devel.orig/include/linux/sched.h -+++ linux-rt-devel/include/linux/sched.h +--- a/include/linux/sched.h ++++ b/include/linux/sched.h @@ -1335,6 +1335,7 @@ enum perf_event_task_context { struct task_struct { @@ -35,10 +33,8 @@ Index: linux-rt-devel/include/linux/sched.h extern void wake_up_new_task(struct task_struct *tsk); #ifdef CONFIG_SMP extern void kick_process(struct task_struct *tsk); -Index: linux-rt-devel/kernel/sched/core.c -=================================================================== ---- linux-rt-devel.orig/kernel/sched/core.c -+++ linux-rt-devel/kernel/sched/core.c +--- a/kernel/sched/core.c ++++ b/kernel/sched/core.c @@ -1721,8 +1721,25 @@ try_to_wake_up(struct task_struct *p, un */ smp_mb__before_spinlock(); @@ -85,11 +81,9 @@ Index: linux-rt-devel/kernel/sched/core.c int wake_up_state(struct task_struct *p, unsigned int state) { return try_to_wake_up(p, state, 0); -Index: linux-rt-devel/kernel/sched/sched.h -=================================================================== ---- linux-rt-devel.orig/kernel/sched/sched.h -+++ linux-rt-devel/kernel/sched/sched.h -@@ -1092,6 +1092,7 @@ static inline void finish_lock_switch(st +--- a/kernel/sched/sched.h ++++ b/kernel/sched/sched.h +@@ -1093,6 +1093,7 @@ static inline void finish_lock_switch(st #define WF_SYNC 0x01 /* waker goes to sleep after wakeup */ #define WF_FORK 0x02 /* child wakeup after fork */ #define WF_MIGRATED 0x4 /* internal use, task got migrated */ diff --git a/patches/sched-ttwu-ensure-success-return-is-correct.patch b/patches/sched-ttwu-ensure-success-return-is-correct.patch index f1554a92b6036f..5ec55b369b2ce4 100644 --- a/patches/sched-ttwu-ensure-success-return-is-correct.patch +++ b/patches/sched-ttwu-ensure-success-return-is-correct.patch @@ -18,10 +18,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/sched/core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -Index: linux-rt-devel/kernel/sched/core.c -=================================================================== ---- linux-rt-devel.orig/kernel/sched/core.c -+++ linux-rt-devel/kernel/sched/core.c +--- a/kernel/sched/core.c ++++ b/kernel/sched/core.c @@ -1728,8 +1728,10 @@ try_to_wake_up(struct task_struct *p, un * if the wakeup condition is true. */ diff --git a/patches/sched-workqueue-Only-wake-up-idle-workers-if-not-blo.patch b/patches/sched-workqueue-Only-wake-up-idle-workers-if-not-blo.patch index a3f05668fa2d92..27f5fc00824544 100644 --- a/patches/sched-workqueue-Only-wake-up-idle-workers-if-not-blo.patch +++ b/patches/sched-workqueue-Only-wake-up-idle-workers-if-not-blo.patch @@ -21,11 +21,9 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> kernel/sched/core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -Index: linux-rt-devel/kernel/sched/core.c -=================================================================== ---- linux-rt-devel.orig/kernel/sched/core.c -+++ linux-rt-devel/kernel/sched/core.c -@@ -2981,8 +2981,10 @@ static void __sched __schedule(void) +--- a/kernel/sched/core.c ++++ b/kernel/sched/core.c +@@ -2988,8 +2988,10 @@ static void __sched __schedule(void) * If a worker went to sleep, notify and ask workqueue * whether it wants to wake up a task to maintain * concurrency. diff --git a/patches/scsi-fcoe-rt-aware.patch b/patches/scsi-fcoe-rt-aware.patch index b4cd0808c30f10..4cd758c772e9dc 100644 --- a/patches/scsi-fcoe-rt-aware.patch +++ b/patches/scsi-fcoe-rt-aware.patch @@ -12,10 +12,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> drivers/scsi/libfc/fc_exch.c | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) -Index: linux-rt-devel/drivers/scsi/fcoe/fcoe.c -=================================================================== ---- linux-rt-devel.orig/drivers/scsi/fcoe/fcoe.c -+++ linux-rt-devel/drivers/scsi/fcoe/fcoe.c +--- a/drivers/scsi/fcoe/fcoe.c ++++ b/drivers/scsi/fcoe/fcoe.c @@ -1287,7 +1287,7 @@ static void fcoe_percpu_thread_destroy(u struct sk_buff *skb; #ifdef CONFIG_SMP @@ -34,7 +32,7 @@ Index: linux-rt-devel/drivers/scsi/fcoe/fcoe.c #else /* * This a non-SMP scenario where the singular Rx thread is -@@ -1567,11 +1567,11 @@ err2: +@@ -1567,11 +1567,11 @@ static int fcoe_rcv(struct sk_buff *skb, static int fcoe_alloc_paged_crc_eof(struct sk_buff *skb, int tlen) { struct fcoe_percpu_s *fps; @@ -79,10 +77,8 @@ Index: linux-rt-devel/drivers/scsi/fcoe/fcoe.c kfree_skb(skb); } -Index: linux-rt-devel/drivers/scsi/fcoe/fcoe_ctlr.c -=================================================================== ---- linux-rt-devel.orig/drivers/scsi/fcoe/fcoe_ctlr.c -+++ linux-rt-devel/drivers/scsi/fcoe/fcoe_ctlr.c +--- a/drivers/scsi/fcoe/fcoe_ctlr.c ++++ b/drivers/scsi/fcoe/fcoe_ctlr.c @@ -831,7 +831,7 @@ static unsigned long fcoe_ctlr_age_fcfs( INIT_LIST_HEAD(&del_list); @@ -101,10 +97,8 @@ Index: linux-rt-devel/drivers/scsi/fcoe/fcoe_ctlr.c list_for_each_entry_safe(fcf, next, &del_list, list) { /* Removes fcf from current list */ -Index: linux-rt-devel/drivers/scsi/libfc/fc_exch.c -=================================================================== ---- linux-rt-devel.orig/drivers/scsi/libfc/fc_exch.c -+++ linux-rt-devel/drivers/scsi/libfc/fc_exch.c +--- a/drivers/scsi/libfc/fc_exch.c ++++ b/drivers/scsi/libfc/fc_exch.c @@ -814,10 +814,10 @@ static struct fc_exch *fc_exch_em_alloc( } memset(ep, 0, sizeof(*ep)); diff --git a/patches/scsi-qla2xxx-fix-bug-sleeping-function-called-from-invalid-context.patch b/patches/scsi-qla2xxx-fix-bug-sleeping-function-called-from-invalid-context.patch index 7f62ea6cddb3cd..64a7596854dcf9 100644 --- a/patches/scsi-qla2xxx-fix-bug-sleeping-function-called-from-invalid-context.patch +++ b/patches/scsi-qla2xxx-fix-bug-sleeping-function-called-from-invalid-context.patch @@ -28,10 +28,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> drivers/scsi/qla2xxx/qla_inline.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -Index: linux-rt-devel/drivers/scsi/qla2xxx/qla_inline.h -=================================================================== ---- linux-rt-devel.orig/drivers/scsi/qla2xxx/qla_inline.h -+++ linux-rt-devel/drivers/scsi/qla2xxx/qla_inline.h +--- a/drivers/scsi/qla2xxx/qla_inline.h ++++ b/drivers/scsi/qla2xxx/qla_inline.h @@ -59,12 +59,12 @@ qla2x00_poll(struct rsp_que *rsp) { unsigned long flags; diff --git a/patches/seqlock-prevent-rt-starvation.patch b/patches/seqlock-prevent-rt-starvation.patch index 1c2697c9eee9b4..a83fee4a2b8a8d 100644 --- a/patches/seqlock-prevent-rt-starvation.patch +++ b/patches/seqlock-prevent-rt-starvation.patch @@ -26,10 +26,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> include/net/neighbour.h | 4 +-- 3 files changed, 47 insertions(+), 15 deletions(-) -Index: linux-rt-devel/include/linux/seqlock.h -=================================================================== ---- linux-rt-devel.orig/include/linux/seqlock.h -+++ linux-rt-devel/include/linux/seqlock.h +--- a/include/linux/seqlock.h ++++ b/include/linux/seqlock.h @@ -219,20 +219,30 @@ static inline int read_seqcount_retry(co return __read_seqcount_retry(s, start); } @@ -159,10 +157,8 @@ Index: linux-rt-devel/include/linux/seqlock.h spin_unlock_irqrestore(&sl->lock, flags); } -Index: linux-rt-devel/include/net/dst.h -=================================================================== ---- linux-rt-devel.orig/include/net/dst.h -+++ linux-rt-devel/include/net/dst.h +--- a/include/net/dst.h ++++ b/include/net/dst.h @@ -403,7 +403,7 @@ static inline void dst_confirm(struct ds static inline int dst_neigh_output(struct dst_entry *dst, struct neighbour *n, struct sk_buff *skb) @@ -172,10 +168,8 @@ Index: linux-rt-devel/include/net/dst.h if (dst->pending_confirm) { unsigned long now = jiffies; -Index: linux-rt-devel/include/net/neighbour.h -=================================================================== ---- linux-rt-devel.orig/include/net/neighbour.h -+++ linux-rt-devel/include/net/neighbour.h +--- a/include/net/neighbour.h ++++ b/include/net/neighbour.h @@ -445,7 +445,7 @@ static inline int neigh_hh_bridge(struct } #endif diff --git a/patches/signal-fix-up-rcu-wreckage.patch b/patches/signal-fix-up-rcu-wreckage.patch index 1fe7599cea1790..97f2a9e8cd2382 100644 --- a/patches/signal-fix-up-rcu-wreckage.patch +++ b/patches/signal-fix-up-rcu-wreckage.patch @@ -10,10 +10,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/signal.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -Index: linux-rt-devel/kernel/signal.c -=================================================================== ---- linux-rt-devel.orig/kernel/signal.c -+++ linux-rt-devel/kernel/signal.c +--- a/kernel/signal.c ++++ b/kernel/signal.c @@ -1342,12 +1342,12 @@ struct sighand_struct *__lock_task_sigha * Disable interrupts early to avoid deadlocks. * See rcu_read_unlock() comment header for details. diff --git a/patches/signal-revert-ptrace-preempt-magic.patch b/patches/signal-revert-ptrace-preempt-magic.patch index 2285e38c58ac90..0dae85433fdeb3 100644 --- a/patches/signal-revert-ptrace-preempt-magic.patch +++ b/patches/signal-revert-ptrace-preempt-magic.patch @@ -11,10 +11,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/signal.c | 8 -------- 1 file changed, 8 deletions(-) -Index: linux-rt-devel/kernel/signal.c -=================================================================== ---- linux-rt-devel.orig/kernel/signal.c -+++ linux-rt-devel/kernel/signal.c +--- a/kernel/signal.c ++++ b/kernel/signal.c @@ -1897,15 +1897,7 @@ static void ptrace_stop(int exit_code, i if (gstop_done && ptrace_reparented(current)) do_notify_parent_cldstop(current, false, why); diff --git a/patches/signals-allow-rt-tasks-to-cache-one-sigqueue-struct.patch b/patches/signals-allow-rt-tasks-to-cache-one-sigqueue-struct.patch index a278b95d49fdc1..f123d926a44f67 100644 --- a/patches/signals-allow-rt-tasks-to-cache-one-sigqueue-struct.patch +++ b/patches/signals-allow-rt-tasks-to-cache-one-sigqueue-struct.patch @@ -15,10 +15,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/signal.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++--- 5 files changed, 84 insertions(+), 5 deletions(-) -Index: linux-rt-devel/include/linux/sched.h -=================================================================== ---- linux-rt-devel.orig/include/linux/sched.h -+++ linux-rt-devel/include/linux/sched.h +--- a/include/linux/sched.h ++++ b/include/linux/sched.h @@ -1527,6 +1527,7 @@ struct task_struct { /* signal handlers */ struct signal_struct *signal; @@ -27,10 +25,8 @@ Index: linux-rt-devel/include/linux/sched.h sigset_t blocked, real_blocked; sigset_t saved_sigmask; /* restored if set_restore_sigmask() was used */ -Index: linux-rt-devel/include/linux/signal.h -=================================================================== ---- linux-rt-devel.orig/include/linux/signal.h -+++ linux-rt-devel/include/linux/signal.h +--- a/include/linux/signal.h ++++ b/include/linux/signal.h @@ -218,6 +218,7 @@ static inline void init_sigpending(struc } @@ -39,10 +35,8 @@ Index: linux-rt-devel/include/linux/signal.h /* Test if 'sig' is valid signal. Use this instead of testing _NSIG directly */ static inline int valid_signal(unsigned long sig) -Index: linux-rt-devel/kernel/exit.c -=================================================================== ---- linux-rt-devel.orig/kernel/exit.c -+++ linux-rt-devel/kernel/exit.c +--- a/kernel/exit.c ++++ b/kernel/exit.c @@ -144,7 +144,7 @@ static void __exit_signal(struct task_st * Do this under ->siglock, we can race with another thread * doing sigqueue_free() if we have SIGQUEUE_PREALLOC signals. @@ -52,10 +46,8 @@ Index: linux-rt-devel/kernel/exit.c tsk->sighand = NULL; spin_unlock(&sighand->siglock); -Index: linux-rt-devel/kernel/fork.c -=================================================================== ---- linux-rt-devel.orig/kernel/fork.c -+++ linux-rt-devel/kernel/fork.c +--- a/kernel/fork.c ++++ b/kernel/fork.c @@ -1338,6 +1338,7 @@ static struct task_struct *copy_process( spin_lock_init(&p->alloc_lock); @@ -64,10 +56,8 @@ Index: linux-rt-devel/kernel/fork.c p->utime = p->stime = p->gtime = 0; p->utimescaled = p->stimescaled = 0; -Index: linux-rt-devel/kernel/signal.c -=================================================================== ---- linux-rt-devel.orig/kernel/signal.c -+++ linux-rt-devel/kernel/signal.c +--- a/kernel/signal.c ++++ b/kernel/signal.c @@ -14,6 +14,7 @@ #include <linux/export.h> #include <linux/init.h> @@ -123,7 +113,7 @@ Index: linux-rt-devel/kernel/signal.c { struct sigqueue *q = NULL; struct user_struct *user; -@@ -375,7 +408,10 @@ __sigqueue_alloc(int sig, struct task_st +@@ -375,7 +408,10 @@ static struct sigqueue * if (override_rlimit || atomic_read(&user->sigpending) <= task_rlimit(t, RLIMIT_SIGPENDING)) { @@ -135,7 +125,7 @@ Index: linux-rt-devel/kernel/signal.c } else { print_dropped_signal(sig); } -@@ -392,6 +428,13 @@ __sigqueue_alloc(int sig, struct task_st +@@ -392,6 +428,13 @@ static struct sigqueue * return q; } diff --git a/patches/skbufhead-raw-lock.patch b/patches/skbufhead-raw-lock.patch index 0a2262b828ea76..7cbfc3f33c0446 100644 --- a/patches/skbufhead-raw-lock.patch +++ b/patches/skbufhead-raw-lock.patch @@ -13,10 +13,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> net/core/dev.c | 19 +++++++++++++------ 3 files changed, 21 insertions(+), 6 deletions(-) -Index: linux-rt-devel/include/linux/netdevice.h -=================================================================== ---- linux-rt-devel.orig/include/linux/netdevice.h -+++ linux-rt-devel/include/linux/netdevice.h +--- a/include/linux/netdevice.h ++++ b/include/linux/netdevice.h @@ -2469,6 +2469,7 @@ struct softnet_data { unsigned int dropped; struct sk_buff_head input_pkt_queue; @@ -25,10 +23,8 @@ Index: linux-rt-devel/include/linux/netdevice.h }; -Index: linux-rt-devel/include/linux/skbuff.h -=================================================================== ---- linux-rt-devel.orig/include/linux/skbuff.h -+++ linux-rt-devel/include/linux/skbuff.h +--- a/include/linux/skbuff.h ++++ b/include/linux/skbuff.h @@ -187,6 +187,7 @@ struct sk_buff_head { __u32 qlen; @@ -50,10 +46,8 @@ Index: linux-rt-devel/include/linux/skbuff.h static inline void skb_queue_head_init_class(struct sk_buff_head *list, struct lock_class_key *class) { -Index: linux-rt-devel/net/core/dev.c -=================================================================== ---- linux-rt-devel.orig/net/core/dev.c -+++ linux-rt-devel/net/core/dev.c +--- a/net/core/dev.c ++++ b/net/core/dev.c @@ -205,14 +205,14 @@ static inline struct hlist_head *dev_ind static inline void rps_lock(struct softnet_data *sd) { diff --git a/patches/slub-disable-SLUB_CPU_PARTIAL.patch b/patches/slub-disable-SLUB_CPU_PARTIAL.patch index cd5b3c12525399..12c21be64bf5af 100644 --- a/patches/slub-disable-SLUB_CPU_PARTIAL.patch +++ b/patches/slub-disable-SLUB_CPU_PARTIAL.patch @@ -34,10 +34,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> init/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux-rt-devel/init/Kconfig -=================================================================== ---- linux-rt-devel.orig/init/Kconfig -+++ linux-rt-devel/init/Kconfig +--- a/init/Kconfig ++++ b/init/Kconfig @@ -1717,7 +1717,7 @@ endchoice config SLUB_CPU_PARTIAL diff --git a/patches/slub-enable-irqs-for-no-wait.patch b/patches/slub-enable-irqs-for-no-wait.patch index 17bf4278d3c339..5da834967e9f7a 100644 --- a/patches/slub-enable-irqs-for-no-wait.patch +++ b/patches/slub-enable-irqs-for-no-wait.patch @@ -10,10 +10,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> mm/slub.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) -Index: linux-rt-devel/mm/slub.c -=================================================================== ---- linux-rt-devel.orig/mm/slub.c -+++ linux-rt-devel/mm/slub.c +--- a/mm/slub.c ++++ b/mm/slub.c @@ -1355,14 +1355,15 @@ static struct page *allocate_slab(struct gfp_t alloc_gfp; void *start, *p; diff --git a/patches/snd-pcm-fix-snd_pcm_stream_lock-irqs_disabled-splats.patch b/patches/snd-pcm-fix-snd_pcm_stream_lock-irqs_disabled-splats.patch index 02399d80a6d7f0..23992cb73413da 100644 --- a/patches/snd-pcm-fix-snd_pcm_stream_lock-irqs_disabled-splats.patch +++ b/patches/snd-pcm-fix-snd_pcm_stream_lock-irqs_disabled-splats.patch @@ -29,10 +29,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> sound/core/pcm_native.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -Index: linux-rt-devel/sound/core/pcm_native.c -=================================================================== ---- linux-rt-devel.orig/sound/core/pcm_native.c -+++ linux-rt-devel/sound/core/pcm_native.c +--- a/sound/core/pcm_native.c ++++ b/sound/core/pcm_native.c @@ -123,7 +123,7 @@ EXPORT_SYMBOL_GPL(snd_pcm_stream_unlock) void snd_pcm_stream_lock_irq(struct snd_pcm_substream *substream) { diff --git a/patches/softirq-disable-softirq-stacks-for-rt.patch b/patches/softirq-disable-softirq-stacks-for-rt.patch index 43b627b50cf4de..19f308050e08a4 100644 --- a/patches/softirq-disable-softirq-stacks-for-rt.patch +++ b/patches/softirq-disable-softirq-stacks-for-rt.patch @@ -17,10 +17,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> include/linux/interrupt.h | 2 +- 8 files changed, 15 insertions(+), 1 deletion(-) -Index: linux-rt-devel/arch/powerpc/kernel/irq.c -=================================================================== ---- linux-rt-devel.orig/arch/powerpc/kernel/irq.c -+++ linux-rt-devel/arch/powerpc/kernel/irq.c +--- a/arch/powerpc/kernel/irq.c ++++ b/arch/powerpc/kernel/irq.c @@ -614,6 +614,7 @@ void irq_ctx_init(void) } } @@ -37,10 +35,8 @@ Index: linux-rt-devel/arch/powerpc/kernel/irq.c irq_hw_number_t virq_to_hw(unsigned int virq) { -Index: linux-rt-devel/arch/powerpc/kernel/misc_32.S -=================================================================== ---- linux-rt-devel.orig/arch/powerpc/kernel/misc_32.S -+++ linux-rt-devel/arch/powerpc/kernel/misc_32.S +--- a/arch/powerpc/kernel/misc_32.S ++++ b/arch/powerpc/kernel/misc_32.S @@ -40,6 +40,7 @@ * We store the saved ksp_limit in the unused part * of the STACK_FRAME_OVERHEAD @@ -49,7 +45,7 @@ Index: linux-rt-devel/arch/powerpc/kernel/misc_32.S _GLOBAL(call_do_softirq) mflr r0 stw r0,4(r1) -@@ -56,6 +57,7 @@ _GLOBAL(call_do_softirq) +@@ -56,6 +57,7 @@ stw r10,THREAD+KSP_LIMIT(r2) mtlr r0 blr @@ -57,10 +53,8 @@ Index: linux-rt-devel/arch/powerpc/kernel/misc_32.S /* * void call_do_irq(struct pt_regs *regs, struct thread_info *irqtp); -Index: linux-rt-devel/arch/powerpc/kernel/misc_64.S -=================================================================== ---- linux-rt-devel.orig/arch/powerpc/kernel/misc_64.S -+++ linux-rt-devel/arch/powerpc/kernel/misc_64.S +--- a/arch/powerpc/kernel/misc_64.S ++++ b/arch/powerpc/kernel/misc_64.S @@ -29,6 +29,7 @@ .text @@ -69,7 +63,7 @@ Index: linux-rt-devel/arch/powerpc/kernel/misc_64.S _GLOBAL(call_do_softirq) mflr r0 std r0,16(r1) -@@ -39,6 +40,7 @@ _GLOBAL(call_do_softirq) +@@ -39,6 +40,7 @@ ld r0,16(r1) mtlr r0 blr @@ -77,10 +71,8 @@ Index: linux-rt-devel/arch/powerpc/kernel/misc_64.S _GLOBAL(call_do_irq) mflr r0 -Index: linux-rt-devel/arch/sh/kernel/irq.c -=================================================================== ---- linux-rt-devel.orig/arch/sh/kernel/irq.c -+++ linux-rt-devel/arch/sh/kernel/irq.c +--- a/arch/sh/kernel/irq.c ++++ b/arch/sh/kernel/irq.c @@ -147,6 +147,7 @@ void irq_ctx_exit(int cpu) hardirq_ctx[cpu] = NULL; } @@ -97,10 +89,8 @@ Index: linux-rt-devel/arch/sh/kernel/irq.c #else static inline void handle_one_irq(unsigned int irq) { -Index: linux-rt-devel/arch/sparc/kernel/irq_64.c -=================================================================== ---- linux-rt-devel.orig/arch/sparc/kernel/irq_64.c -+++ linux-rt-devel/arch/sparc/kernel/irq_64.c +--- a/arch/sparc/kernel/irq_64.c ++++ b/arch/sparc/kernel/irq_64.c @@ -849,6 +849,7 @@ void __irq_entry handler_irq(int pil, st set_irq_regs(old_regs); } @@ -117,11 +107,9 @@ Index: linux-rt-devel/arch/sparc/kernel/irq_64.c #ifdef CONFIG_HOTPLUG_CPU void fixup_irqs(void) -Index: linux-rt-devel/arch/x86/kernel/entry_64.S -=================================================================== ---- linux-rt-devel.orig/arch/x86/kernel/entry_64.S -+++ linux-rt-devel/arch/x86/kernel/entry_64.S -@@ -1118,6 +1118,7 @@ bad_gs: +--- a/arch/x86/kernel/entry_64.S ++++ b/arch/x86/kernel/entry_64.S +@@ -1118,6 +1118,7 @@ END(native_load_gs_index) jmp 2b .previous @@ -137,10 +125,8 @@ Index: linux-rt-devel/arch/x86/kernel/entry_64.S #ifdef CONFIG_XEN idtentry xen_hypervisor_callback xen_do_hypervisor_callback has_error_code=0 -Index: linux-rt-devel/arch/x86/kernel/irq_32.c -=================================================================== ---- linux-rt-devel.orig/arch/x86/kernel/irq_32.c -+++ linux-rt-devel/arch/x86/kernel/irq_32.c +--- a/arch/x86/kernel/irq_32.c ++++ b/arch/x86/kernel/irq_32.c @@ -135,6 +135,7 @@ void irq_ctx_init(int cpu) cpu, per_cpu(hardirq_stack, cpu), per_cpu(softirq_stack, cpu)); } @@ -157,10 +143,8 @@ Index: linux-rt-devel/arch/x86/kernel/irq_32.c bool handle_irq(unsigned irq, struct pt_regs *regs) { -Index: linux-rt-devel/include/linux/interrupt.h -=================================================================== ---- linux-rt-devel.orig/include/linux/interrupt.h -+++ linux-rt-devel/include/linux/interrupt.h +--- a/include/linux/interrupt.h ++++ b/include/linux/interrupt.h @@ -445,7 +445,7 @@ struct softirq_action asmlinkage void do_softirq(void); asmlinkage void __do_softirq(void); diff --git a/patches/softirq-preempt-fix-3-re.patch b/patches/softirq-preempt-fix-3-re.patch index c66595d89a8eb7..e9a6713ae83f03 100644 --- a/patches/softirq-preempt-fix-3-re.patch +++ b/patches/softirq-preempt-fix-3-re.patch @@ -20,10 +20,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> net/core/dev.c | 7 +++++++ 4 files changed, 16 insertions(+) -Index: linux-rt-devel/block/blk-iopoll.c -=================================================================== ---- linux-rt-devel.orig/block/blk-iopoll.c -+++ linux-rt-devel/block/blk-iopoll.c +--- a/block/blk-iopoll.c ++++ b/block/blk-iopoll.c @@ -35,6 +35,7 @@ void blk_iopoll_sched(struct blk_iopoll list_add_tail(&iop->list, this_cpu_ptr(&blk_cpu_iopoll)); __raise_softirq_irqoff(BLOCK_IOPOLL_SOFTIRQ); @@ -48,10 +46,8 @@ Index: linux-rt-devel/block/blk-iopoll.c } return NOTIFY_OK; -Index: linux-rt-devel/block/blk-softirq.c -=================================================================== ---- linux-rt-devel.orig/block/blk-softirq.c -+++ linux-rt-devel/block/blk-softirq.c +--- a/block/blk-softirq.c ++++ b/block/blk-softirq.c @@ -51,6 +51,7 @@ static void trigger_softirq(void *data) raise_softirq_irqoff(BLOCK_SOFTIRQ); @@ -68,7 +64,7 @@ Index: linux-rt-devel/block/blk-softirq.c } return NOTIFY_OK; -@@ -150,6 +152,7 @@ do_local: +@@ -150,6 +152,7 @@ void __blk_complete_request(struct reque goto do_local; local_irq_restore(flags); @@ -76,11 +72,9 @@ Index: linux-rt-devel/block/blk-softirq.c } /** -Index: linux-rt-devel/include/linux/preempt.h -=================================================================== ---- linux-rt-devel.orig/include/linux/preempt.h -+++ linux-rt-devel/include/linux/preempt.h -@@ -49,8 +49,10 @@ do { \ +--- a/include/linux/preempt.h ++++ b/include/linux/preempt.h +@@ -50,8 +50,10 @@ do { \ #ifdef CONFIG_PREEMPT_RT_BASE # define preempt_enable_no_resched() sched_preempt_enable_no_resched() @@ -91,7 +85,7 @@ Index: linux-rt-devel/include/linux/preempt.h #endif #ifdef CONFIG_PREEMPT -@@ -125,6 +127,7 @@ do { \ +@@ -126,6 +128,7 @@ do { \ #define preempt_disable_notrace() barrier() #define preempt_enable_no_resched_notrace() barrier() #define preempt_enable_notrace() barrier() @@ -99,10 +93,8 @@ Index: linux-rt-devel/include/linux/preempt.h #endif /* CONFIG_PREEMPT_COUNT */ -Index: linux-rt-devel/net/core/dev.c -=================================================================== ---- linux-rt-devel.orig/net/core/dev.c -+++ linux-rt-devel/net/core/dev.c +--- a/net/core/dev.c ++++ b/net/core/dev.c @@ -2214,6 +2214,7 @@ static inline void __netif_reschedule(st sd->output_queue_tailp = &q->next_sched; raise_softirq_irqoff(NET_TX_SOFTIRQ); @@ -119,7 +111,7 @@ Index: linux-rt-devel/net/core/dev.c } EXPORT_SYMBOL(__dev_kfree_skb_irq); -@@ -3365,6 +3367,7 @@ drop: +@@ -3365,6 +3367,7 @@ static int enqueue_to_backlog(struct sk_ rps_unlock(sd); local_irq_restore(flags); diff --git a/patches/softirq-split-locks.patch b/patches/softirq-split-locks.patch index 9e5d585646577a..5809d521033ded 100644 --- a/patches/softirq-split-locks.patch +++ b/patches/softirq-split-locks.patch @@ -34,10 +34,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> net/core/dev.c | 6 8 files changed, 477 insertions(+), 94 deletions(-) -Index: linux-rt-devel/include/linux/bottom_half.h -=================================================================== ---- linux-rt-devel.orig/include/linux/bottom_half.h -+++ linux-rt-devel/include/linux/bottom_half.h +--- a/include/linux/bottom_half.h ++++ b/include/linux/bottom_half.h @@ -4,6 +4,39 @@ #include <linux/preempt.h> #include <linux/preempt_mask.h> @@ -85,10 +83,8 @@ Index: linux-rt-devel/include/linux/bottom_half.h +#endif #endif /* _LINUX_BH_H */ -Index: linux-rt-devel/include/linux/interrupt.h -=================================================================== ---- linux-rt-devel.orig/include/linux/interrupt.h -+++ linux-rt-devel/include/linux/interrupt.h +--- a/include/linux/interrupt.h ++++ b/include/linux/interrupt.h @@ -442,10 +442,11 @@ struct softirq_action void (*action)(struct softirq_action *); }; @@ -134,10 +130,8 @@ Index: linux-rt-devel/include/linux/interrupt.h /* * Autoprobing for irqs: * -Index: linux-rt-devel/include/linux/preempt_mask.h -=================================================================== ---- linux-rt-devel.orig/include/linux/preempt_mask.h -+++ linux-rt-devel/include/linux/preempt_mask.h +--- a/include/linux/preempt_mask.h ++++ b/include/linux/preempt_mask.h @@ -44,16 +44,26 @@ #define HARDIRQ_OFFSET (1UL << HARDIRQ_SHIFT) #define NMI_OFFSET (1UL << NMI_SHIFT) @@ -175,10 +169,8 @@ Index: linux-rt-devel/include/linux/preempt_mask.h /* * Are we in NMI context? -Index: linux-rt-devel/include/linux/sched.h -=================================================================== ---- linux-rt-devel.orig/include/linux/sched.h -+++ linux-rt-devel/include/linux/sched.h +--- a/include/linux/sched.h ++++ b/include/linux/sched.h @@ -1791,6 +1791,8 @@ struct task_struct { #endif #ifdef CONFIG_PREEMPT_RT_BASE @@ -196,10 +188,8 @@ Index: linux-rt-devel/include/linux/sched.h #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 */ -Index: linux-rt-devel/init/main.c -=================================================================== ---- linux-rt-devel.orig/init/main.c -+++ linux-rt-devel/init/main.c +--- a/init/main.c ++++ b/init/main.c @@ -525,6 +525,7 @@ asmlinkage __visible void __init start_k setup_command_line(command_line); setup_nr_cpu_ids(); @@ -208,10 +198,8 @@ Index: linux-rt-devel/init/main.c smp_prepare_boot_cpu(); /* arch-specific boot-cpu hooks */ build_all_zonelists(NULL, NULL); -Index: linux-rt-devel/kernel/softirq.c -=================================================================== ---- linux-rt-devel.orig/kernel/softirq.c -+++ linux-rt-devel/kernel/softirq.c +--- a/kernel/softirq.c ++++ b/kernel/softirq.c @@ -26,6 +26,7 @@ #include <linux/smp.h> #include <linux/smpboot.h> @@ -399,7 +387,7 @@ Index: linux-rt-devel/kernel/softirq.c /* * Mask out PF_MEMALLOC s current task context is borrowed for the -@@ -255,36 +408,7 @@ restart: +@@ -255,36 +408,7 @@ asmlinkage __visible void __do_softirq(v /* Reset the pending bitmask before enabling irqs */ set_softirq_pending(0); @@ -794,10 +782,8 @@ Index: linux-rt-devel/kernel/softirq.c .thread_should_run = ksoftirqd_should_run, .thread_fn = run_ksoftirqd, .thread_comm = "ksoftirqd/%u", -Index: linux-rt-devel/kernel/time/tick-sched.c -=================================================================== ---- linux-rt-devel.orig/kernel/time/tick-sched.c -+++ linux-rt-devel/kernel/time/tick-sched.c +--- a/kernel/time/tick-sched.c ++++ b/kernel/time/tick-sched.c @@ -764,14 +764,7 @@ static bool can_stop_idle_tick(int cpu, return false; @@ -814,10 +800,8 @@ Index: linux-rt-devel/kernel/time/tick-sched.c return false; } -Index: linux-rt-devel/net/core/dev.c -=================================================================== ---- linux-rt-devel.orig/net/core/dev.c -+++ linux-rt-devel/net/core/dev.c +--- a/net/core/dev.c ++++ b/net/core/dev.c @@ -3436,11 +3436,9 @@ int netif_rx_ni(struct sk_buff *skb) trace_netif_rx_ni_entry(skb); diff --git a/patches/sparc64-use-generic-rwsem-spinlocks-rt.patch b/patches/sparc64-use-generic-rwsem-spinlocks-rt.patch index 67c233e72e0c59..cb4a7da65c132b 100644 --- a/patches/sparc64-use-generic-rwsem-spinlocks-rt.patch +++ b/patches/sparc64-use-generic-rwsem-spinlocks-rt.patch @@ -9,10 +9,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> arch/sparc/Kconfig | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) -Index: linux-rt-devel/arch/sparc/Kconfig -=================================================================== ---- linux-rt-devel.orig/arch/sparc/Kconfig -+++ linux-rt-devel/arch/sparc/Kconfig +--- a/arch/sparc/Kconfig ++++ b/arch/sparc/Kconfig @@ -189,12 +189,10 @@ config NR_CPUS source kernel/Kconfig.hz diff --git a/patches/spinlock-types-separate-raw.patch b/patches/spinlock-types-separate-raw.patch index d9d4135153eeb4..86476ccef7a501 100644 --- a/patches/spinlock-types-separate-raw.patch +++ b/patches/spinlock-types-separate-raw.patch @@ -14,10 +14,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> include/linux/spinlock_types_raw.h | 56 +++++++++++++++++++++++++++ 4 files changed, 95 insertions(+), 72 deletions(-) -Index: linux-rt-devel/include/linux/rwlock_types.h -=================================================================== ---- linux-rt-devel.orig/include/linux/rwlock_types.h -+++ linux-rt-devel/include/linux/rwlock_types.h +--- a/include/linux/rwlock_types.h ++++ b/include/linux/rwlock_types.h @@ -1,6 +1,10 @@ #ifndef __LINUX_RWLOCK_TYPES_H #define __LINUX_RWLOCK_TYPES_H @@ -29,10 +27,8 @@ Index: linux-rt-devel/include/linux/rwlock_types.h /* * include/linux/rwlock_types.h - generic rwlock type definitions * and initializers -Index: linux-rt-devel/include/linux/spinlock_types.h -=================================================================== ---- linux-rt-devel.orig/include/linux/spinlock_types.h -+++ linux-rt-devel/include/linux/spinlock_types.h +--- a/include/linux/spinlock_types.h ++++ b/include/linux/spinlock_types.h @@ -9,79 +9,9 @@ * Released under the General Public License (GPL). */ @@ -115,10 +111,8 @@ Index: linux-rt-devel/include/linux/spinlock_types.h #include <linux/rwlock_types.h> -Index: linux-rt-devel/include/linux/spinlock_types_nort.h -=================================================================== --- /dev/null -+++ linux-rt-devel/include/linux/spinlock_types_nort.h ++++ b/include/linux/spinlock_types_nort.h @@ -0,0 +1,33 @@ +#ifndef __LINUX_SPINLOCK_TYPES_NORT_H +#define __LINUX_SPINLOCK_TYPES_NORT_H @@ -153,10 +147,8 @@ Index: linux-rt-devel/include/linux/spinlock_types_nort.h +#define DEFINE_SPINLOCK(x) spinlock_t x = __SPIN_LOCK_UNLOCKED(x) + +#endif -Index: linux-rt-devel/include/linux/spinlock_types_raw.h -=================================================================== --- /dev/null -+++ linux-rt-devel/include/linux/spinlock_types_raw.h ++++ b/include/linux/spinlock_types_raw.h @@ -0,0 +1,56 @@ +#ifndef __LINUX_SPINLOCK_TYPES_RAW_H +#define __LINUX_SPINLOCK_TYPES_RAW_H diff --git a/patches/stomp-machine-create-lg_global_trylock_relax-primiti.patch b/patches/stomp-machine-create-lg_global_trylock_relax-primiti.patch index d0095311a213b1..d8dcb4f01d05d7 100644 --- a/patches/stomp-machine-create-lg_global_trylock_relax-primiti.patch +++ b/patches/stomp-machine-create-lg_global_trylock_relax-primiti.patch @@ -14,10 +14,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> kernel/locking/rtmutex.c | 5 +++++ 4 files changed, 37 insertions(+) -Index: linux-rt-devel/include/linux/lglock.h -=================================================================== ---- linux-rt-devel.orig/include/linux/lglock.h -+++ linux-rt-devel/include/linux/lglock.h +--- a/include/linux/lglock.h ++++ b/include/linux/lglock.h @@ -76,6 +76,12 @@ void lg_local_unlock_cpu(struct lglock * void lg_global_lock(struct lglock *lg); void lg_global_unlock(struct lglock *lg); @@ -31,10 +29,8 @@ Index: linux-rt-devel/include/linux/lglock.h #else /* When !CONFIG_SMP, map lglock to spinlock */ #define lglock spinlock -Index: linux-rt-devel/include/linux/spinlock_rt.h -=================================================================== ---- linux-rt-devel.orig/include/linux/spinlock_rt.h -+++ linux-rt-devel/include/linux/spinlock_rt.h +--- a/include/linux/spinlock_rt.h ++++ b/include/linux/spinlock_rt.h @@ -34,6 +34,7 @@ extern int atomic_dec_and_spin_lock(atom */ extern void __lockfunc __rt_spin_lock(struct rt_mutex *lock); @@ -43,10 +39,8 @@ Index: linux-rt-devel/include/linux/spinlock_rt.h #define spin_lock(lock) \ do { \ -Index: linux-rt-devel/kernel/locking/lglock.c -=================================================================== ---- linux-rt-devel.orig/kernel/locking/lglock.c -+++ linux-rt-devel/kernel/locking/lglock.c +--- a/kernel/locking/lglock.c ++++ b/kernel/locking/lglock.c @@ -105,3 +105,28 @@ void lg_global_unlock(struct lglock *lg) preempt_enable_nort(); } @@ -76,10 +70,8 @@ Index: linux-rt-devel/kernel/locking/lglock.c + } +} +#endif -Index: linux-rt-devel/kernel/locking/rtmutex.c -=================================================================== ---- linux-rt-devel.orig/kernel/locking/rtmutex.c -+++ linux-rt-devel/kernel/locking/rtmutex.c +--- a/kernel/locking/rtmutex.c ++++ b/kernel/locking/rtmutex.c @@ -1133,6 +1133,11 @@ void __lockfunc rt_spin_unlock_wait(spin } EXPORT_SYMBOL(rt_spin_unlock_wait); diff --git a/patches/stomp-machine-use-lg_global_trylock_relax-to-dead-wi.patch b/patches/stomp-machine-use-lg_global_trylock_relax-to-dead-wi.patch index b14324bdeb10e3..7a194d728495be 100644 --- a/patches/stomp-machine-use-lg_global_trylock_relax-to-dead-wi.patch +++ b/patches/stomp-machine-use-lg_global_trylock_relax-to-dead-wi.patch @@ -15,10 +15,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> kernel/stop_machine.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) -Index: linux-rt-devel/kernel/stop_machine.c -=================================================================== ---- linux-rt-devel.orig/kernel/stop_machine.c -+++ linux-rt-devel/kernel/stop_machine.c +--- a/kernel/stop_machine.c ++++ b/kernel/stop_machine.c @@ -266,7 +266,7 @@ int stop_two_cpus(unsigned int cpu1, uns struct irq_cpu_stop_queue_work_info call_args; struct multi_stop_data msdata; diff --git a/patches/stop-machine-raw-lock.patch b/patches/stop-machine-raw-lock.patch index 19a8b40f3717ac..ca28bc805664a6 100644 --- a/patches/stop-machine-raw-lock.patch +++ b/patches/stop-machine-raw-lock.patch @@ -9,10 +9,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/stop_machine.c | 64 ++++++++++++++++++++++++++++++++++---------------- 1 file changed, 44 insertions(+), 20 deletions(-) -Index: linux-rt-devel/kernel/stop_machine.c -=================================================================== ---- linux-rt-devel.orig/kernel/stop_machine.c -+++ linux-rt-devel/kernel/stop_machine.c +--- a/kernel/stop_machine.c ++++ b/kernel/stop_machine.c @@ -30,12 +30,12 @@ struct cpu_stop_done { atomic_t nr_todo; /* nr left to execute */ bool executed; /* actually executed? */ @@ -139,7 +137,7 @@ Index: linux-rt-devel/kernel/stop_machine.c if (work) { cpu_stop_fn_t fn = work->fn; -@@ -491,7 +509,13 @@ repeat: +@@ -491,7 +509,13 @@ static void cpu_stopper_thread(unsigned kallsyms_lookup((unsigned long)fn, NULL, NULL, NULL, ksym_buf), arg); diff --git a/patches/stop_machine-convert-stop_machine_run-to-PREEMPT_RT.patch b/patches/stop_machine-convert-stop_machine_run-to-PREEMPT_RT.patch index a25d005d2d00f6..4ec6647893c029 100644 --- a/patches/stop_machine-convert-stop_machine_run-to-PREEMPT_RT.patch +++ b/patches/stop_machine-convert-stop_machine_run-to-PREEMPT_RT.patch @@ -13,11 +13,9 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/stop_machine.c | 10 ++++++++++ 1 file changed, 10 insertions(+) -Index: linux-rt-devel/kernel/stop_machine.c -=================================================================== ---- linux-rt-devel.orig/kernel/stop_machine.c -+++ linux-rt-devel/kernel/stop_machine.c -@@ -467,6 +467,16 @@ repeat: +--- a/kernel/stop_machine.c ++++ b/kernel/stop_machine.c +@@ -467,6 +467,16 @@ static void cpu_stopper_thread(unsigned struct cpu_stop_done *done = work->done; char ksym_buf[KSYM_NAME_LEN] __maybe_unused; diff --git a/patches/sunrpc-make-svc_xprt_do_enqueue-use-get_cpu_light.patch b/patches/sunrpc-make-svc_xprt_do_enqueue-use-get_cpu_light.patch index c0c0004f77807e..91085dd857b73f 100644 --- a/patches/sunrpc-make-svc_xprt_do_enqueue-use-get_cpu_light.patch +++ b/patches/sunrpc-make-svc_xprt_do_enqueue-use-get_cpu_light.patch @@ -31,10 +31,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> net/sunrpc/svc_xprt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -Index: linux-rt-devel/net/sunrpc/svc_xprt.c -=================================================================== ---- linux-rt-devel.orig/net/sunrpc/svc_xprt.c -+++ linux-rt-devel/net/sunrpc/svc_xprt.c +--- a/net/sunrpc/svc_xprt.c ++++ b/net/sunrpc/svc_xprt.c @@ -341,7 +341,7 @@ static void svc_xprt_do_enqueue(struct s goto out; } @@ -44,7 +42,7 @@ Index: linux-rt-devel/net/sunrpc/svc_xprt.c pool = svc_pool_for_cpu(xprt->xpt_server, cpu); atomic_long_inc(&pool->sp_stats.packets); -@@ -377,7 +377,7 @@ redo_search: +@@ -377,7 +377,7 @@ static void svc_xprt_do_enqueue(struct s atomic_long_inc(&pool->sp_stats.threads_woken); wake_up_process(rqstp->rq_task); @@ -53,7 +51,7 @@ Index: linux-rt-devel/net/sunrpc/svc_xprt.c goto out; } rcu_read_unlock(); -@@ -398,7 +398,7 @@ redo_search: +@@ -398,7 +398,7 @@ static void svc_xprt_do_enqueue(struct s goto redo_search; } rqstp = NULL; diff --git a/patches/suspend-prevernt-might-sleep-splats.patch b/patches/suspend-prevernt-might-sleep-splats.patch index e21c238209350d..3aeb8501f35ab2 100644 --- a/patches/suspend-prevernt-might-sleep-splats.patch +++ b/patches/suspend-prevernt-might-sleep-splats.patch @@ -23,10 +23,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/power/suspend.c | 4 ++++ 3 files changed, 12 insertions(+) -Index: linux-rt-devel/include/linux/kernel.h -=================================================================== ---- linux-rt-devel.orig/include/linux/kernel.h -+++ linux-rt-devel/include/linux/kernel.h +--- a/include/linux/kernel.h ++++ b/include/linux/kernel.h @@ -467,6 +467,7 @@ extern enum system_states { SYSTEM_HALT, SYSTEM_POWER_OFF, @@ -35,10 +33,8 @@ Index: linux-rt-devel/include/linux/kernel.h } system_state; #define TAINT_PROPRIETARY_MODULE 0 -Index: linux-rt-devel/kernel/power/hibernate.c -=================================================================== ---- linux-rt-devel.orig/kernel/power/hibernate.c -+++ linux-rt-devel/kernel/power/hibernate.c +--- a/kernel/power/hibernate.c ++++ b/kernel/power/hibernate.c @@ -285,6 +285,8 @@ static int create_image(int platform_mod local_irq_disable(); @@ -88,10 +84,8 @@ Index: linux-rt-devel/kernel/power/hibernate.c local_irq_enable(); enable_nonboot_cpus(); -Index: linux-rt-devel/kernel/power/suspend.c -=================================================================== ---- linux-rt-devel.orig/kernel/power/suspend.c -+++ linux-rt-devel/kernel/power/suspend.c +--- a/kernel/power/suspend.c ++++ b/kernel/power/suspend.c @@ -356,6 +356,8 @@ static int suspend_enter(suspend_state_t arch_suspend_disable_irqs(); BUG_ON(!irqs_disabled()); diff --git a/patches/sysfs-realtime-entry.patch b/patches/sysfs-realtime-entry.patch index 87a1ed60568408..1231bed700866a 100644 --- a/patches/sysfs-realtime-entry.patch +++ b/patches/sysfs-realtime-entry.patch @@ -17,10 +17,8 @@ Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> kernel/ksysfs.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) -Index: linux-rt-devel/kernel/ksysfs.c -=================================================================== ---- linux-rt-devel.orig/kernel/ksysfs.c -+++ linux-rt-devel/kernel/ksysfs.c +--- a/kernel/ksysfs.c ++++ b/kernel/ksysfs.c @@ -136,6 +136,15 @@ KERNEL_ATTR_RO(vmcoreinfo); #endif /* CONFIG_KEXEC */ diff --git a/patches/tasklet-rt-prevent-tasklets-from-going-into-infinite-spin-in-rt.patch b/patches/tasklet-rt-prevent-tasklets-from-going-into-infinite-spin-in-rt.patch index fc655b274b3f35..a194d92ee9eff5 100644 --- a/patches/tasklet-rt-prevent-tasklets-from-going-into-infinite-spin-in-rt.patch +++ b/patches/tasklet-rt-prevent-tasklets-from-going-into-infinite-spin-in-rt.patch @@ -41,10 +41,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/softirq.c | 201 ++++++++++++++++++++++++++++++++-------------- 2 files changed, 162 insertions(+), 72 deletions(-) -Index: linux-rt-devel/include/linux/interrupt.h -=================================================================== ---- linux-rt-devel.orig/include/linux/interrupt.h -+++ linux-rt-devel/include/linux/interrupt.h +--- a/include/linux/interrupt.h ++++ b/include/linux/interrupt.h @@ -481,8 +481,9 @@ static inline struct task_struct *this_c to be executed on some cpu at least once after this. * If the tasklet is already scheduled, but its execution is still not @@ -114,10 +112,8 @@ Index: linux-rt-devel/include/linux/interrupt.h extern void tasklet_kill(struct tasklet_struct *t); extern void tasklet_kill_immediate(struct tasklet_struct *t, unsigned int cpu); extern void tasklet_init(struct tasklet_struct *t, -Index: linux-rt-devel/kernel/softirq.c -=================================================================== ---- linux-rt-devel.orig/kernel/softirq.c -+++ linux-rt-devel/kernel/softirq.c +--- a/kernel/softirq.c ++++ b/kernel/softirq.c @@ -21,6 +21,7 @@ #include <linux/freezer.h> #include <linux/kthread.h> diff --git a/patches/tasklist-lock-fix-section-conflict.patch b/patches/tasklist-lock-fix-section-conflict.patch index f05cf76596ca28..0c0768f3fd7080 100644 --- a/patches/tasklist-lock-fix-section-conflict.patch +++ b/patches/tasklist-lock-fix-section-conflict.patch @@ -31,10 +31,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/fork.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) -Index: linux-rt-devel/include/linux/rwlock_types.h -=================================================================== ---- linux-rt-devel.orig/include/linux/rwlock_types.h -+++ linux-rt-devel/include/linux/rwlock_types.h +--- a/include/linux/rwlock_types.h ++++ b/include/linux/rwlock_types.h @@ -47,6 +47,7 @@ typedef struct { RW_DEP_MAP_INIT(lockname) } #endif @@ -44,10 +42,8 @@ Index: linux-rt-devel/include/linux/rwlock_types.h + rwlock_t name __cacheline_aligned_in_smp = __RW_LOCK_UNLOCKED(name) #endif /* __LINUX_RWLOCK_TYPES_H */ -Index: linux-rt-devel/kernel/fork.c -=================================================================== ---- linux-rt-devel.orig/kernel/fork.c -+++ linux-rt-devel/kernel/fork.c +--- a/kernel/fork.c ++++ b/kernel/fork.c @@ -108,7 +108,7 @@ int max_threads; /* tunable limit on nr DEFINE_PER_CPU(unsigned long, process_counts) = 0; diff --git a/patches/thermal-Defer-thermal-wakups-to-threads.patch b/patches/thermal-Defer-thermal-wakups-to-threads.patch index 64495ff30337a1..95a4dc585bb3da 100644 --- a/patches/thermal-Defer-thermal-wakups-to-threads.patch +++ b/patches/thermal-Defer-thermal-wakups-to-threads.patch @@ -26,10 +26,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> drivers/thermal/x86_pkg_temp_thermal.c | 50 +++++++++++++++++++++++++++++++-- 1 file changed, 47 insertions(+), 3 deletions(-) -Index: linux-rt-devel/drivers/thermal/x86_pkg_temp_thermal.c -=================================================================== ---- linux-rt-devel.orig/drivers/thermal/x86_pkg_temp_thermal.c -+++ linux-rt-devel/drivers/thermal/x86_pkg_temp_thermal.c +--- a/drivers/thermal/x86_pkg_temp_thermal.c ++++ b/drivers/thermal/x86_pkg_temp_thermal.c @@ -29,6 +29,7 @@ #include <linux/pm.h> #include <linux/thermal.h> @@ -115,7 +113,7 @@ Index: linux-rt-devel/drivers/thermal/x86_pkg_temp_thermal.c spin_lock_init(&pkg_work_lock); platform_thermal_package_notify = pkg_temp_thermal_platform_thermal_notify; -@@ -608,7 +651,7 @@ err_ret: +@@ -608,7 +651,7 @@ static int __init pkg_temp_thermal_init( kfree(pkg_work_scheduled); platform_thermal_package_notify = NULL; platform_thermal_package_rate_control = NULL; diff --git a/patches/timekeeping-split-jiffies-lock.patch b/patches/timekeeping-split-jiffies-lock.patch index 9149ae14dc08d7..f46e80560e6453 100644 --- a/patches/timekeeping-split-jiffies-lock.patch +++ b/patches/timekeeping-split-jiffies-lock.patch @@ -14,10 +14,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/time/timekeeping.h | 3 ++- 5 files changed, 28 insertions(+), 17 deletions(-) -Index: linux-rt-devel/kernel/time/jiffies.c -=================================================================== ---- linux-rt-devel.orig/kernel/time/jiffies.c -+++ linux-rt-devel/kernel/time/jiffies.c +--- a/kernel/time/jiffies.c ++++ b/kernel/time/jiffies.c @@ -74,7 +74,8 @@ static struct clocksource clocksource_ji .max_cycles = 10, }; @@ -40,10 +38,8 @@ Index: linux-rt-devel/kernel/time/jiffies.c return ret; } EXPORT_SYMBOL(get_jiffies_64); -Index: linux-rt-devel/kernel/time/tick-common.c -=================================================================== ---- linux-rt-devel.orig/kernel/time/tick-common.c -+++ linux-rt-devel/kernel/time/tick-common.c +--- a/kernel/time/tick-common.c ++++ b/kernel/time/tick-common.c @@ -78,13 +78,15 @@ int tick_is_oneshot_available(void) static void tick_periodic(int cpu) { @@ -74,10 +70,8 @@ Index: linux-rt-devel/kernel/time/tick-common.c clockevents_set_state(dev, CLOCK_EVT_STATE_ONESHOT); -Index: linux-rt-devel/kernel/time/tick-sched.c -=================================================================== ---- linux-rt-devel.orig/kernel/time/tick-sched.c -+++ linux-rt-devel/kernel/time/tick-sched.c +--- a/kernel/time/tick-sched.c ++++ b/kernel/time/tick-sched.c @@ -62,7 +62,8 @@ static void tick_do_update_jiffies64(kti return; @@ -133,10 +127,8 @@ Index: linux-rt-devel/kernel/time/tick-sched.c if (rcu_needs_cpu(&rcu_delta_jiffies) || arch_needs_cpu() || irq_work_needs_cpu()) { -Index: linux-rt-devel/kernel/time/timekeeping.c -=================================================================== ---- linux-rt-devel.orig/kernel/time/timekeeping.c -+++ linux-rt-devel/kernel/time/timekeeping.c +--- a/kernel/time/timekeeping.c ++++ b/kernel/time/timekeeping.c @@ -2065,8 +2065,10 @@ EXPORT_SYMBOL(hardpps); */ void xtime_update(unsigned long ticks) @@ -150,10 +142,8 @@ Index: linux-rt-devel/kernel/time/timekeeping.c + raw_spin_unlock(&jiffies_lock); update_wall_time(); } -Index: linux-rt-devel/kernel/time/timekeeping.h -=================================================================== ---- linux-rt-devel.orig/kernel/time/timekeeping.h -+++ linux-rt-devel/kernel/time/timekeeping.h +--- a/kernel/time/timekeeping.h ++++ b/kernel/time/timekeeping.h @@ -22,7 +22,8 @@ extern void timekeeping_resume(void); extern void do_timer(unsigned long ticks); extern void update_wall_time(void); diff --git a/patches/timer-delay-waking-softirqs-from-the-jiffy-tick.patch b/patches/timer-delay-waking-softirqs-from-the-jiffy-tick.patch index 7840e1f3d1f393..fd3cea82f35910 100644 --- a/patches/timer-delay-waking-softirqs-from-the-jiffy-tick.patch +++ b/patches/timer-delay-waking-softirqs-from-the-jiffy-tick.patch @@ -56,10 +56,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/time/timer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux-rt-devel/kernel/time/timer.c -=================================================================== ---- linux-rt-devel.orig/kernel/time/timer.c -+++ linux-rt-devel/kernel/time/timer.c +--- a/kernel/time/timer.c ++++ b/kernel/time/timer.c @@ -1428,13 +1428,13 @@ void update_process_times(int user_tick) /* Note: this timer irq context must be accounted for as well. */ diff --git a/patches/timer-fd-avoid-live-lock.patch b/patches/timer-fd-avoid-live-lock.patch index 3458396f86829a..8dc713c97cafd5 100644 --- a/patches/timer-fd-avoid-live-lock.patch +++ b/patches/timer-fd-avoid-live-lock.patch @@ -14,10 +14,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> fs/timerfd.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -Index: linux-rt-devel/fs/timerfd.c -=================================================================== ---- linux-rt-devel.orig/fs/timerfd.c -+++ linux-rt-devel/fs/timerfd.c +--- a/fs/timerfd.c ++++ b/fs/timerfd.c @@ -450,7 +450,10 @@ static int do_timerfd_settime(int ufd, i break; } diff --git a/patches/timers-avoid-the-base-null-otptimization-on-rt.patch b/patches/timers-avoid-the-base-null-otptimization-on-rt.patch index 4d49cec2f6d9cf..0177c34be8cb89 100644 --- a/patches/timers-avoid-the-base-null-otptimization-on-rt.patch +++ b/patches/timers-avoid-the-base-null-otptimization-on-rt.patch @@ -10,10 +10,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/time/timer.c | 40 ++++++++++++++++++++++++++++++++-------- 1 file changed, 32 insertions(+), 8 deletions(-) -Index: linux-rt-devel/kernel/time/timer.c -=================================================================== ---- linux-rt-devel.orig/kernel/time/timer.c -+++ linux-rt-devel/kernel/time/timer.c +--- a/kernel/time/timer.c ++++ b/kernel/time/timer.c @@ -771,6 +771,36 @@ static struct tvec_base *lock_timer_base } } @@ -51,7 +49,7 @@ Index: linux-rt-devel/kernel/time/timer.c static inline int __mod_timer(struct timer_list *timer, unsigned long expires, bool pending_only, int pinned) -@@ -801,14 +831,8 @@ __mod_timer(struct timer_list *timer, un +@@ -801,14 +831,8 @@ static inline int * handler yet has not finished. This also guarantees that * the timer is serialized wrt itself. */ diff --git a/patches/timers-preempt-rt-support.patch b/patches/timers-preempt-rt-support.patch index 84c2daca6e4aa1..580251f50dec17 100644 --- a/patches/timers-preempt-rt-support.patch +++ b/patches/timers-preempt-rt-support.patch @@ -17,10 +17,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/time/timer.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) -Index: linux-rt-devel/kernel/time/timer.c -=================================================================== ---- linux-rt-devel.orig/kernel/time/timer.c -+++ linux-rt-devel/kernel/time/timer.c +--- a/kernel/time/timer.c ++++ b/kernel/time/timer.c @@ -1395,6 +1395,14 @@ unsigned long get_next_timer_interrupt(u if (cpu_is_offline(smp_processor_id())) return expires; diff --git a/patches/timers-prepare-for-full-preemption.patch b/patches/timers-prepare-for-full-preemption.patch index 49b92d33dce3e3..6d57691d471488 100644 --- a/patches/timers-prepare-for-full-preemption.patch +++ b/patches/timers-prepare-for-full-preemption.patch @@ -15,10 +15,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/time/timer.c | 37 ++++++++++++++++++++++++++++++++++--- 3 files changed, 41 insertions(+), 6 deletions(-) -Index: linux-rt-devel/include/linux/timer.h -=================================================================== ---- linux-rt-devel.orig/include/linux/timer.h -+++ linux-rt-devel/include/linux/timer.h +--- a/include/linux/timer.h ++++ b/include/linux/timer.h @@ -241,7 +241,7 @@ extern void add_timer(struct timer_list extern int try_to_del_timer_sync(struct timer_list *timer); @@ -28,10 +26,8 @@ Index: linux-rt-devel/include/linux/timer.h extern int del_timer_sync(struct timer_list *timer); #else # define del_timer_sync(t) del_timer(t) -Index: linux-rt-devel/kernel/sched/core.c -=================================================================== ---- linux-rt-devel.orig/kernel/sched/core.c -+++ linux-rt-devel/kernel/sched/core.c +--- a/kernel/sched/core.c ++++ b/kernel/sched/core.c @@ -641,12 +641,14 @@ void resched_cpu(int cpu) */ int get_nohz_timer_target(int pinned) @@ -58,10 +54,8 @@ Index: linux-rt-devel/kernel/sched/core.c return cpu; } /* -Index: linux-rt-devel/kernel/time/timer.c -=================================================================== ---- linux-rt-devel.orig/kernel/time/timer.c -+++ linux-rt-devel/kernel/time/timer.c +--- a/kernel/time/timer.c ++++ b/kernel/time/timer.c @@ -78,6 +78,9 @@ struct tvec_root { struct tvec_base { spinlock_t lock; diff --git a/patches/tracing-account-for-preempt-off-in-preempt_schedule.patch b/patches/tracing-account-for-preempt-off-in-preempt_schedule.patch index bbf767cec252b3..1368779148c117 100644 --- a/patches/tracing-account-for-preempt-off-in-preempt_schedule.patch +++ b/patches/tracing-account-for-preempt-off-in-preempt_schedule.patch @@ -25,11 +25,9 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/sched/core.c | 9 +++++++++ 1 file changed, 9 insertions(+) -Index: linux-rt-devel/kernel/sched/core.c -=================================================================== ---- linux-rt-devel.orig/kernel/sched/core.c -+++ linux-rt-devel/kernel/sched/core.c -@@ -2970,7 +2970,16 @@ asmlinkage __visible void __sched notrac +--- a/kernel/sched/core.c ++++ b/kernel/sched/core.c +@@ -2977,7 +2977,16 @@ asmlinkage __visible void __sched notrac * an infinite recursion. */ prev_ctx = exception_enter(); diff --git a/patches/upstream-net-rt-remove-preemption-disabling-in-netif_rx.patch b/patches/upstream-net-rt-remove-preemption-disabling-in-netif_rx.patch index 4f1d16c0e2d724..5a909aeda83b72 100644 --- a/patches/upstream-net-rt-remove-preemption-disabling-in-netif_rx.patch +++ b/patches/upstream-net-rt-remove-preemption-disabling-in-netif_rx.patch @@ -35,10 +35,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> net/core/dev.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -Index: linux-rt-devel/net/core/dev.c -=================================================================== ---- linux-rt-devel.orig/net/core/dev.c -+++ linux-rt-devel/net/core/dev.c +--- a/net/core/dev.c ++++ b/net/core/dev.c @@ -3386,7 +3386,7 @@ static int netif_rx_internal(struct sk_b struct rps_dev_flow voidflow, *rflow = &voidflow; int cpu; diff --git a/patches/usb-use-_nort-in-giveback.patch b/patches/usb-use-_nort-in-giveback.patch index 5eefb953b5f770..edcf460aed4dc8 100644 --- a/patches/usb-use-_nort-in-giveback.patch +++ b/patches/usb-use-_nort-in-giveback.patch @@ -41,10 +41,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> drivers/usb/core/hcd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -Index: linux-rt-devel/drivers/usb/core/hcd.c -=================================================================== ---- linux-rt-devel.orig/drivers/usb/core/hcd.c -+++ linux-rt-devel/drivers/usb/core/hcd.c +--- a/drivers/usb/core/hcd.c ++++ b/drivers/usb/core/hcd.c @@ -1684,9 +1684,9 @@ static void __usb_hcd_giveback_urb(struc * and no one may trigger the above deadlock situation when * running complete() in tasklet. diff --git a/patches/user-use-local-irq-nort.patch b/patches/user-use-local-irq-nort.patch index e25f71719b247e..3150b0cce30b8d 100644 --- a/patches/user-use-local-irq-nort.patch +++ b/patches/user-use-local-irq-nort.patch @@ -11,10 +11,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/user.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -Index: linux-rt-devel/kernel/user.c -=================================================================== ---- linux-rt-devel.orig/kernel/user.c -+++ linux-rt-devel/kernel/user.c +--- a/kernel/user.c ++++ b/kernel/user.c @@ -161,11 +161,11 @@ void free_uid(struct user_struct *up) if (!up) return; diff --git a/patches/vtime-split-lock-and-seqcount.patch b/patches/vtime-split-lock-and-seqcount.patch index 2383b4b86ede1b..5b02e38ea2fb9f 100644 --- a/patches/vtime-split-lock-and-seqcount.patch +++ b/patches/vtime-split-lock-and-seqcount.patch @@ -12,10 +12,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/fork.c | 3 +- kernel/sched/cputime.c | 62 +++++++++++++++++++++++++++++----------------- 4 files changed, 46 insertions(+), 25 deletions(-) -Index: linux-rt-devel/include/linux/init_task.h -=================================================================== ---- linux-rt-devel.orig/include/linux/init_task.h -+++ linux-rt-devel/include/linux/init_task.h +--- a/include/linux/init_task.h ++++ b/include/linux/init_task.h @@ -149,7 +149,8 @@ extern struct task_group root_task_group #ifdef CONFIG_VIRT_CPU_ACCOUNTING_GEN @@ -26,10 +24,8 @@ Index: linux-rt-devel/include/linux/init_task.h .vtime_snap = 0, \ .vtime_snap_whence = VTIME_SYS, #else -Index: linux-rt-devel/include/linux/sched.h -=================================================================== ---- linux-rt-devel.orig/include/linux/sched.h -+++ linux-rt-devel/include/linux/sched.h +--- a/include/linux/sched.h ++++ b/include/linux/sched.h @@ -1478,7 +1478,8 @@ struct task_struct { struct cputime prev_cputime; #endif @@ -40,10 +36,8 @@ Index: linux-rt-devel/include/linux/sched.h unsigned long long vtime_snap; enum { VTIME_SLEEPING = 0, -Index: linux-rt-devel/kernel/fork.c -=================================================================== ---- linux-rt-devel.orig/kernel/fork.c -+++ linux-rt-devel/kernel/fork.c +--- a/kernel/fork.c ++++ b/kernel/fork.c @@ -1345,7 +1345,8 @@ static struct task_struct *copy_process( p->prev_cputime.utime = p->prev_cputime.stime = 0; #endif @@ -54,10 +48,8 @@ Index: linux-rt-devel/kernel/fork.c p->vtime_snap = 0; p->vtime_snap_whence = VTIME_SLEEPING; #endif -Index: linux-rt-devel/kernel/sched/cputime.c -=================================================================== ---- linux-rt-devel.orig/kernel/sched/cputime.c -+++ linux-rt-devel/kernel/sched/cputime.c +--- a/kernel/sched/cputime.c ++++ b/kernel/sched/cputime.c @@ -675,37 +675,45 @@ static void __vtime_account_system(struc void vtime_account_system(struct task_struct *tsk) diff --git a/patches/wait-simple-implementation.patch b/patches/wait-simple-implementation.patch index babee2e0a696ec..4bbd029be7634d 100644 --- a/patches/wait-simple-implementation.patch +++ b/patches/wait-simple-implementation.patch @@ -21,10 +21,8 @@ wakeups vs adding items to the list. kernel/sched/wait-simple.c | 115 ++++++++++++++++++++++++ 3 files changed, 323 insertions(+), 1 deletion(-) -Index: linux-rt-devel/include/linux/wait-simple.h -=================================================================== --- /dev/null -+++ linux-rt-devel/include/linux/wait-simple.h ++++ b/include/linux/wait-simple.h @@ -0,0 +1,207 @@ +#ifndef _LINUX_WAIT_SIMPLE_H +#define _LINUX_WAIT_SIMPLE_H @@ -233,10 +231,8 @@ Index: linux-rt-devel/include/linux/wait-simple.h +}) + +#endif -Index: linux-rt-devel/kernel/sched/Makefile -=================================================================== ---- linux-rt-devel.orig/kernel/sched/Makefile -+++ linux-rt-devel/kernel/sched/Makefile +--- a/kernel/sched/Makefile ++++ b/kernel/sched/Makefile @@ -13,7 +13,7 @@ endif obj-y += core.o proc.o clock.o cputime.o @@ -246,10 +242,8 @@ Index: linux-rt-devel/kernel/sched/Makefile obj-$(CONFIG_SMP) += cpupri.o cpudeadline.o obj-$(CONFIG_SCHED_AUTOGROUP) += auto_group.o obj-$(CONFIG_SCHEDSTATS) += stats.o -Index: linux-rt-devel/kernel/sched/wait-simple.c -=================================================================== --- /dev/null -+++ linux-rt-devel/kernel/sched/wait-simple.c ++++ b/kernel/sched/wait-simple.c @@ -0,0 +1,115 @@ +/* + * Simple waitqueues without fancy flags and callbacks diff --git a/patches/wait.h-include-atomic.h.patch b/patches/wait.h-include-atomic.h.patch index d614f57ea9798a..9274a288c62376 100644 --- a/patches/wait.h-include-atomic.h.patch +++ b/patches/wait.h-include-atomic.h.patch @@ -20,10 +20,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> include/linux/wait.h | 1 + 1 file changed, 1 insertion(+) -Index: linux-rt-devel/include/linux/wait.h -=================================================================== ---- linux-rt-devel.orig/include/linux/wait.h -+++ linux-rt-devel/include/linux/wait.h +--- a/include/linux/wait.h ++++ b/include/linux/wait.h @@ -8,6 +8,7 @@ #include <linux/spinlock.h> #include <asm/current.h> diff --git a/patches/work-queue-work-around-irqsafe-timer-optimization.patch b/patches/work-queue-work-around-irqsafe-timer-optimization.patch index d816ed048bbbcf..20956776fff3bc 100644 --- a/patches/work-queue-work-around-irqsafe-timer-optimization.patch +++ b/patches/work-queue-work-around-irqsafe-timer-optimization.patch @@ -111,10 +111,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> kernel/workqueue.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -Index: linux-rt-devel/kernel/workqueue.c -=================================================================== ---- linux-rt-devel.orig/kernel/workqueue.c -+++ linux-rt-devel/kernel/workqueue.c +--- a/kernel/workqueue.c ++++ b/kernel/workqueue.c @@ -49,6 +49,7 @@ #include <linux/moduleparam.h> #include <linux/uaccess.h> @@ -123,7 +121,7 @@ Index: linux-rt-devel/kernel/workqueue.c #include "workqueue_internal.h" -@@ -1239,7 +1240,7 @@ fail: +@@ -1239,7 +1240,7 @@ static int try_to_grab_pending(struct wo local_unlock_irqrestore(pendingb_lock, *flags); if (work_is_canceling(work)) return -ENOENT; diff --git a/patches/work-simple-Simple-work-queue-implemenation.patch b/patches/work-simple-Simple-work-queue-implemenation.patch index 3da5ddbb346c22..38ea28323ca1b8 100644 --- a/patches/work-simple-Simple-work-queue-implemenation.patch +++ b/patches/work-simple-Simple-work-queue-implemenation.patch @@ -17,10 +17,8 @@ Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de> create mode 100644 include/linux/work-simple.h create mode 100644 kernel/sched/work-simple.c -Index: linux-rt-devel/include/linux/work-simple.h -=================================================================== --- /dev/null -+++ linux-rt-devel/include/linux/work-simple.h ++++ b/include/linux/work-simple.h @@ -0,0 +1,24 @@ +#ifndef _LINUX_SWORK_H +#define _LINUX_SWORK_H @@ -46,10 +44,8 @@ Index: linux-rt-devel/include/linux/work-simple.h +void swork_put(void); + +#endif /* _LINUX_SWORK_H */ -Index: linux-rt-devel/kernel/sched/Makefile -=================================================================== ---- linux-rt-devel.orig/kernel/sched/Makefile -+++ linux-rt-devel/kernel/sched/Makefile +--- a/kernel/sched/Makefile ++++ b/kernel/sched/Makefile @@ -13,7 +13,7 @@ endif obj-y += core.o proc.o clock.o cputime.o @@ -59,10 +55,8 @@ Index: linux-rt-devel/kernel/sched/Makefile obj-$(CONFIG_SMP) += cpupri.o cpudeadline.o obj-$(CONFIG_SCHED_AUTOGROUP) += auto_group.o obj-$(CONFIG_SCHEDSTATS) += stats.o -Index: linux-rt-devel/kernel/sched/work-simple.c -=================================================================== --- /dev/null -+++ linux-rt-devel/kernel/sched/work-simple.c ++++ b/kernel/sched/work-simple.c @@ -0,0 +1,173 @@ +/* + * Copyright (C) 2014 BMW Car IT GmbH, Daniel Wagner daniel.wagner@bmw-carit.de diff --git a/patches/workqueue-distangle-from-rq-lock.patch b/patches/workqueue-distangle-from-rq-lock.patch index 8d3326d4ac429f..07f1cd49d196f1 100644 --- a/patches/workqueue-distangle-from-rq-lock.patch +++ b/patches/workqueue-distangle-from-rq-lock.patch @@ -29,10 +29,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/workqueue_internal.h | 5 +-- 3 files changed, 41 insertions(+), 89 deletions(-) -Index: linux-rt-devel/kernel/sched/core.c -=================================================================== ---- linux-rt-devel.orig/kernel/sched/core.c -+++ linux-rt-devel/kernel/sched/core.c +--- a/kernel/sched/core.c ++++ b/kernel/sched/core.c @@ -1517,10 +1517,6 @@ static void ttwu_activate(struct rq *rq, { activate_task(rq, p, en_flags); @@ -44,7 +42,7 @@ Index: linux-rt-devel/kernel/sched/core.c } /* -@@ -1797,42 +1793,6 @@ out: +@@ -1797,42 +1793,6 @@ try_to_wake_up(struct task_struct *p, un } /** @@ -87,7 +85,7 @@ Index: linux-rt-devel/kernel/sched/core.c * wake_up_process - Wake up a specific process * @p: The process to be woken up. * -@@ -2995,21 +2955,6 @@ static void __sched __schedule(void) +@@ -3002,21 +2962,6 @@ static void __sched __schedule(void) } else { deactivate_task(rq, prev, DEQUEUE_SLEEP); prev->on_rq = 0; @@ -109,7 +107,7 @@ Index: linux-rt-devel/kernel/sched/core.c } switch_count = &prev->nvcsw; } -@@ -3041,6 +2986,14 @@ static inline void sched_submit_work(str +@@ -3048,6 +2993,14 @@ static inline void sched_submit_work(str { if (!tsk->state || tsk_is_pi_blocked(tsk)) return; @@ -124,7 +122,7 @@ Index: linux-rt-devel/kernel/sched/core.c /* * If we are going to sleep and we have plugged IO queued, * make sure to submit it to avoid deadlocks. -@@ -3049,6 +3002,12 @@ static inline void sched_submit_work(str +@@ -3056,6 +3009,12 @@ static inline void sched_submit_work(str blk_schedule_flush_plug(tsk); } @@ -137,7 +135,7 @@ Index: linux-rt-devel/kernel/sched/core.c asmlinkage __visible void __sched schedule(void) { struct task_struct *tsk = current; -@@ -3057,6 +3016,7 @@ asmlinkage __visible void __sched schedu +@@ -3064,6 +3023,7 @@ asmlinkage __visible void __sched schedu do { __schedule(); } while (need_resched()); @@ -145,10 +143,8 @@ Index: linux-rt-devel/kernel/sched/core.c } EXPORT_SYMBOL(schedule); -Index: linux-rt-devel/kernel/workqueue.c -=================================================================== ---- linux-rt-devel.orig/kernel/workqueue.c -+++ linux-rt-devel/kernel/workqueue.c +--- a/kernel/workqueue.c ++++ b/kernel/workqueue.c @@ -804,44 +804,31 @@ static void wake_up_worker(struct worker } @@ -242,10 +238,8 @@ Index: linux-rt-devel/kernel/workqueue.c } /** -Index: linux-rt-devel/kernel/workqueue_internal.h -=================================================================== ---- linux-rt-devel.orig/kernel/workqueue_internal.h -+++ linux-rt-devel/kernel/workqueue_internal.h +--- a/kernel/workqueue_internal.h ++++ b/kernel/workqueue_internal.h @@ -43,6 +43,7 @@ struct worker { unsigned long last_active; /* L: last active timestamp */ unsigned int flags; /* X: flags */ diff --git a/patches/workqueue-prevent-deadlock-stall.patch b/patches/workqueue-prevent-deadlock-stall.patch index 03307d72304ce3..8d62354c0b5dec 100644 --- a/patches/workqueue-prevent-deadlock-stall.patch +++ b/patches/workqueue-prevent-deadlock-stall.patch @@ -41,11 +41,9 @@ Cc: Steven Rostedt <rostedt@goodmis.org> kernel/workqueue.c | 61 ++++++++++++++++++++++++++++++++++++++++------------ 2 files changed, 53 insertions(+), 15 deletions(-) -Index: linux-rt-devel/kernel/sched/core.c -=================================================================== ---- linux-rt-devel.orig/kernel/sched/core.c -+++ linux-rt-devel/kernel/sched/core.c -@@ -3022,9 +3022,8 @@ static void __sched __schedule(void) +--- a/kernel/sched/core.c ++++ b/kernel/sched/core.c +@@ -3029,9 +3029,8 @@ static void __sched __schedule(void) static inline void sched_submit_work(struct task_struct *tsk) { @@ -56,7 +54,7 @@ Index: linux-rt-devel/kernel/sched/core.c /* * If a worker went to sleep, notify and ask workqueue whether * it wants to wake up a task to maintain concurrency. -@@ -3032,6 +3031,10 @@ static inline void sched_submit_work(str +@@ -3039,6 +3038,10 @@ static inline void sched_submit_work(str if (tsk->flags & PF_WQ_WORKER) wq_worker_sleeping(tsk); @@ -67,10 +65,8 @@ Index: linux-rt-devel/kernel/sched/core.c /* * If we are going to sleep and we have plugged IO queued, * make sure to submit it to avoid deadlocks. -Index: linux-rt-devel/kernel/workqueue.c -=================================================================== ---- linux-rt-devel.orig/kernel/workqueue.c -+++ linux-rt-devel/kernel/workqueue.c +--- a/kernel/workqueue.c ++++ b/kernel/workqueue.c @@ -123,6 +123,11 @@ enum { * cpu or grabbing pool->lock is enough for read access. If * POOL_DISASSOCIATED is set, it's identical to L. diff --git a/patches/workqueue-use-locallock.patch b/patches/workqueue-use-locallock.patch index cbab1cd7198238..ce3b20786b72a0 100644 --- a/patches/workqueue-use-locallock.patch +++ b/patches/workqueue-use-locallock.patch @@ -10,10 +10,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/workqueue.c | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) -Index: linux-rt-devel/kernel/workqueue.c -=================================================================== ---- linux-rt-devel.orig/kernel/workqueue.c -+++ linux-rt-devel/kernel/workqueue.c +--- a/kernel/workqueue.c ++++ b/kernel/workqueue.c @@ -48,6 +48,7 @@ #include <linux/nodemask.h> #include <linux/moduleparam.h> diff --git a/patches/workqueue-use-rcu.patch b/patches/workqueue-use-rcu.patch index 28a68e86a70080..e03025ee8146cb 100644 --- a/patches/workqueue-use-rcu.patch +++ b/patches/workqueue-use-rcu.patch @@ -12,10 +12,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/workqueue.c | 92 +++++++++++++++++++++++++++++------------------------ 1 file changed, 51 insertions(+), 41 deletions(-) -Index: linux-rt-devel/kernel/workqueue.c -=================================================================== ---- linux-rt-devel.orig/kernel/workqueue.c -+++ linux-rt-devel/kernel/workqueue.c +--- a/kernel/workqueue.c ++++ b/kernel/workqueue.c @@ -125,11 +125,11 @@ enum { * * PL: wq_pool_mutex protected. @@ -144,7 +142,7 @@ Index: linux-rt-devel/kernel/workqueue.c retry: if (req_cpu == WORK_CPU_UNBOUND) cpu = raw_smp_processor_id(); -@@ -1366,10 +1371,8 @@ retry: +@@ -1366,10 +1371,8 @@ static void __queue_work(int cpu, struct /* pwq determined, queue */ trace_workqueue_queue_work(req_cpu, pwq, work); @@ -157,7 +155,7 @@ Index: linux-rt-devel/kernel/workqueue.c pwq->nr_in_flight[pwq->work_color]++; work_flags = work_color_to_flags(pwq->work_color); -@@ -1385,7 +1388,9 @@ retry: +@@ -1385,7 +1388,9 @@ static void __queue_work(int cpu, struct insert_work(pwq, work, worklist, work_flags); diff --git a/patches/x86-UV-raw_spinlock-conversion.patch b/patches/x86-UV-raw_spinlock-conversion.patch index e793aa6593db39..f7a749e1894a09 100644 --- a/patches/x86-UV-raw_spinlock-conversion.patch +++ b/patches/x86-UV-raw_spinlock-conversion.patch @@ -15,10 +15,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> arch/x86/platform/uv/uv_time.c | 21 +++++++++++++-------- 5 files changed, 35 insertions(+), 30 deletions(-) -Index: linux-rt-devel/arch/x86/include/asm/uv/uv_bau.h -=================================================================== ---- linux-rt-devel.orig/arch/x86/include/asm/uv/uv_bau.h -+++ linux-rt-devel/arch/x86/include/asm/uv/uv_bau.h +--- a/arch/x86/include/asm/uv/uv_bau.h ++++ b/arch/x86/include/asm/uv/uv_bau.h @@ -615,9 +615,9 @@ struct bau_control { cycles_t send_message; cycles_t period_end; @@ -52,10 +50,8 @@ Index: linux-rt-devel/arch/x86/include/asm/uv/uv_bau.h return 1; } -Index: linux-rt-devel/arch/x86/include/asm/uv/uv_hub.h -=================================================================== ---- linux-rt-devel.orig/arch/x86/include/asm/uv/uv_hub.h -+++ linux-rt-devel/arch/x86/include/asm/uv/uv_hub.h +--- a/arch/x86/include/asm/uv/uv_hub.h ++++ b/arch/x86/include/asm/uv/uv_hub.h @@ -492,7 +492,7 @@ struct uv_blade_info { unsigned short nr_online_cpus; unsigned short pnode; @@ -65,10 +61,8 @@ Index: linux-rt-devel/arch/x86/include/asm/uv/uv_hub.h unsigned long nmi_count; /* obsolete, see uv_hub_nmi */ }; extern struct uv_blade_info *uv_blade_info; -Index: linux-rt-devel/arch/x86/kernel/apic/x2apic_uv_x.c -=================================================================== ---- linux-rt-devel.orig/arch/x86/kernel/apic/x2apic_uv_x.c -+++ linux-rt-devel/arch/x86/kernel/apic/x2apic_uv_x.c +--- a/arch/x86/kernel/apic/x2apic_uv_x.c ++++ b/arch/x86/kernel/apic/x2apic_uv_x.c @@ -949,7 +949,7 @@ void __init uv_system_init(void) uv_blade_info[blade].pnode = pnode; uv_blade_info[blade].nr_possible_cpus = 0; @@ -78,10 +72,8 @@ Index: linux-rt-devel/arch/x86/kernel/apic/x2apic_uv_x.c min_pnode = min(pnode, min_pnode); max_pnode = max(pnode, max_pnode); blade++; -Index: linux-rt-devel/arch/x86/platform/uv/tlb_uv.c -=================================================================== ---- linux-rt-devel.orig/arch/x86/platform/uv/tlb_uv.c -+++ linux-rt-devel/arch/x86/platform/uv/tlb_uv.c +--- a/arch/x86/platform/uv/tlb_uv.c ++++ b/arch/x86/platform/uv/tlb_uv.c @@ -714,9 +714,9 @@ static void destination_plugged(struct b quiesce_local_uvhub(hmaster); @@ -168,10 +160,8 @@ Index: linux-rt-devel/arch/x86/platform/uv/tlb_uv.c } } -Index: linux-rt-devel/arch/x86/platform/uv/uv_time.c -=================================================================== ---- linux-rt-devel.orig/arch/x86/platform/uv/uv_time.c -+++ linux-rt-devel/arch/x86/platform/uv/uv_time.c +--- a/arch/x86/platform/uv/uv_time.c ++++ b/arch/x86/platform/uv/uv_time.c @@ -58,7 +58,7 @@ static DEFINE_PER_CPU(struct clock_event /* There is one of these allocated per node */ diff --git a/patches/x86-crypto-reduce-preempt-disabled-regions.patch b/patches/x86-crypto-reduce-preempt-disabled-regions.patch index fd3d6240c2c4c3..0650758353b663 100644 --- a/patches/x86-crypto-reduce-preempt-disabled-regions.patch +++ b/patches/x86-crypto-reduce-preempt-disabled-regions.patch @@ -16,10 +16,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> arch/x86/crypto/aesni-intel_glue.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) -Index: linux-rt-devel/arch/x86/crypto/aesni-intel_glue.c -=================================================================== ---- linux-rt-devel.orig/arch/x86/crypto/aesni-intel_glue.c -+++ linux-rt-devel/arch/x86/crypto/aesni-intel_glue.c +--- a/arch/x86/crypto/aesni-intel_glue.c ++++ b/arch/x86/crypto/aesni-intel_glue.c @@ -382,14 +382,14 @@ static int ecb_encrypt(struct blkcipher_ err = blkcipher_walk_virt(desc, &walk); desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP; diff --git a/patches/x86-highmem-add-a-already-used-pte-check.patch b/patches/x86-highmem-add-a-already-used-pte-check.patch index 2fe2c266081ae4..a3493efae2809b 100644 --- a/patches/x86-highmem-add-a-already-used-pte-check.patch +++ b/patches/x86-highmem-add-a-already-used-pte-check.patch @@ -9,10 +9,8 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> arch/x86/mm/iomap_32.c | 2 ++ 1 file changed, 2 insertions(+) -Index: linux-rt-devel/arch/x86/mm/iomap_32.c -=================================================================== ---- linux-rt-devel.orig/arch/x86/mm/iomap_32.c -+++ linux-rt-devel/arch/x86/mm/iomap_32.c +--- a/arch/x86/mm/iomap_32.c ++++ b/arch/x86/mm/iomap_32.c @@ -66,6 +66,8 @@ void *kmap_atomic_prot_pfn(unsigned long type = kmap_atomic_idx_push(); idx = type + KM_TYPE_NR * smp_processor_id(); diff --git a/patches/x86-io-apic-migra-no-unmask.patch b/patches/x86-io-apic-migra-no-unmask.patch index 904310624e88cc..76fadb9a913cbf 100644 --- a/patches/x86-io-apic-migra-no-unmask.patch +++ b/patches/x86-io-apic-migra-no-unmask.patch @@ -12,10 +12,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> arch/x86/kernel/apic/io_apic.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -Index: linux-rt-devel/arch/x86/kernel/apic/io_apic.c -=================================================================== ---- linux-rt-devel.orig/arch/x86/kernel/apic/io_apic.c -+++ linux-rt-devel/arch/x86/kernel/apic/io_apic.c +--- a/arch/x86/kernel/apic/io_apic.c ++++ b/arch/x86/kernel/apic/io_apic.c @@ -1891,7 +1891,8 @@ static bool io_apic_level_ack_pending(st static inline bool ioapic_irqd_mask(struct irq_data *data, struct irq_cfg *cfg) { diff --git a/patches/x86-kvm-require-const-tsc-for-rt.patch b/patches/x86-kvm-require-const-tsc-for-rt.patch index 53585972e65c41..7ef8da21b0c1de 100644 --- a/patches/x86-kvm-require-const-tsc-for-rt.patch +++ b/patches/x86-kvm-require-const-tsc-for-rt.patch @@ -12,10 +12,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> arch/x86/kvm/x86.c | 7 +++++++ 1 file changed, 7 insertions(+) -Index: linux-rt-devel/arch/x86/kvm/x86.c -=================================================================== ---- linux-rt-devel.orig/arch/x86/kvm/x86.c -+++ linux-rt-devel/arch/x86/kvm/x86.c +--- a/arch/x86/kvm/x86.c ++++ b/arch/x86/kvm/x86.c @@ -5813,6 +5813,13 @@ int kvm_arch_init(void *opaque) goto out; } diff --git a/patches/x86-mce-timer-hrtimer.patch b/patches/x86-mce-timer-hrtimer.patch index a99ce6b08917f0..af21becd3a7d3a 100644 --- a/patches/x86-mce-timer-hrtimer.patch +++ b/patches/x86-mce-timer-hrtimer.patch @@ -24,10 +24,8 @@ fold in: arch/x86/kernel/cpu/mcheck/mce.c | 52 +++++++++++++++------------------------ 1 file changed, 20 insertions(+), 32 deletions(-) -Index: linux-rt-devel/arch/x86/kernel/cpu/mcheck/mce.c -=================================================================== ---- linux-rt-devel.orig/arch/x86/kernel/cpu/mcheck/mce.c -+++ linux-rt-devel/arch/x86/kernel/cpu/mcheck/mce.c +--- a/arch/x86/kernel/cpu/mcheck/mce.c ++++ b/arch/x86/kernel/cpu/mcheck/mce.c @@ -41,6 +41,7 @@ #include <linux/debugfs.h> #include <linux/irq_work.h> @@ -93,7 +91,7 @@ Index: linux-rt-devel/arch/x86/kernel/cpu/mcheck/mce.c } /* -@@ -1332,7 +1319,7 @@ done: +@@ -1332,7 +1319,7 @@ static void mce_timer_fn(unsigned long d */ void mce_timer_kick(unsigned long interval) { diff --git a/patches/x86-mce-use-swait-queue-for-mce-wakeups.patch b/patches/x86-mce-use-swait-queue-for-mce-wakeups.patch index 2545db5ebc29f1..ae8a65288fa476 100644 --- a/patches/x86-mce-use-swait-queue-for-mce-wakeups.patch +++ b/patches/x86-mce-use-swait-queue-for-mce-wakeups.patch @@ -58,10 +58,8 @@ Signed-off-by: Daniel Wagner <daniel.wagner@bmw-carit.de> arch/x86/kernel/cpu/mcheck/mce.c | 68 ++++++++++++++++++++++++++++++++------- 1 file changed, 56 insertions(+), 12 deletions(-) -Index: linux-rt-devel/arch/x86/kernel/cpu/mcheck/mce.c -=================================================================== ---- linux-rt-devel.orig/arch/x86/kernel/cpu/mcheck/mce.c -+++ linux-rt-devel/arch/x86/kernel/cpu/mcheck/mce.c +--- a/arch/x86/kernel/cpu/mcheck/mce.c ++++ b/arch/x86/kernel/cpu/mcheck/mce.c @@ -42,6 +42,7 @@ #include <linux/irq_work.h> #include <linux/export.h> diff --git a/patches/x86-preempt-lazy.patch b/patches/x86-preempt-lazy.patch index 3912aa82ddc02f..01f0d19a1bad58 100644 --- a/patches/x86-preempt-lazy.patch +++ b/patches/x86-preempt-lazy.patch @@ -13,10 +13,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> arch/x86/kernel/entry_64.S | 24 ++++++++++++++++++++---- 5 files changed, 47 insertions(+), 6 deletions(-) -Index: linux-rt-devel/arch/x86/Kconfig -=================================================================== ---- linux-rt-devel.orig/arch/x86/Kconfig -+++ linux-rt-devel/arch/x86/Kconfig +--- a/arch/x86/Kconfig ++++ b/arch/x86/Kconfig @@ -22,6 +22,7 @@ config X86_64 ### Arch settings config X86 @@ -25,10 +23,8 @@ Index: linux-rt-devel/arch/x86/Kconfig select ACPI_SYSTEM_POWER_STATES_SUPPORT if ACPI select ARCH_MIGHT_HAVE_ACPI_PDC if ACPI select ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS -Index: linux-rt-devel/arch/x86/include/asm/thread_info.h -=================================================================== ---- linux-rt-devel.orig/arch/x86/include/asm/thread_info.h -+++ linux-rt-devel/arch/x86/include/asm/thread_info.h +--- a/arch/x86/include/asm/thread_info.h ++++ b/arch/x86/include/asm/thread_info.h @@ -55,6 +55,8 @@ struct thread_info { __u32 status; /* thread synchronous flags */ __u32 cpu; /* current CPU */ @@ -63,10 +59,8 @@ Index: linux-rt-devel/arch/x86/include/asm/thread_info.h #define STACK_WARN (THREAD_SIZE/8) /* -Index: linux-rt-devel/arch/x86/kernel/asm-offsets.c -=================================================================== ---- linux-rt-devel.orig/arch/x86/kernel/asm-offsets.c -+++ linux-rt-devel/arch/x86/kernel/asm-offsets.c +--- a/arch/x86/kernel/asm-offsets.c ++++ b/arch/x86/kernel/asm-offsets.c @@ -32,6 +32,7 @@ void common(void) { OFFSET(TI_flags, thread_info, flags); OFFSET(TI_status, thread_info, status); @@ -81,10 +75,8 @@ Index: linux-rt-devel/arch/x86/kernel/asm-offsets.c DEFINE(PTREGS_SIZE, sizeof(struct pt_regs)); + DEFINE(_PREEMPT_ENABLED, PREEMPT_ENABLED); } -Index: linux-rt-devel/arch/x86/kernel/entry_32.S -=================================================================== ---- linux-rt-devel.orig/arch/x86/kernel/entry_32.S -+++ linux-rt-devel/arch/x86/kernel/entry_32.S +--- a/arch/x86/kernel/entry_32.S ++++ b/arch/x86/kernel/entry_32.S @@ -359,8 +359,24 @@ END(ret_from_exception) ENTRY(resume_kernel) DISABLE_INTERRUPTS(CLBR_ANY) @@ -119,7 +111,7 @@ Index: linux-rt-devel/arch/x86/kernel/entry_32.S jz work_notifysig work_resched: call schedule -@@ -607,7 +623,7 @@ work_resched: +@@ -607,7 +623,7 @@ ENDPROC(system_call) andl $_TIF_WORK_MASK, %ecx # is there any work to be done other # than syscall tracing? jz restore_all @@ -128,10 +120,8 @@ Index: linux-rt-devel/arch/x86/kernel/entry_32.S jnz work_resched work_notifysig: # deal with pending signals and -Index: linux-rt-devel/arch/x86/kernel/entry_64.S -=================================================================== ---- linux-rt-devel.orig/arch/x86/kernel/entry_64.S -+++ linux-rt-devel/arch/x86/kernel/entry_64.S +--- a/arch/x86/kernel/entry_64.S ++++ b/arch/x86/kernel/entry_64.S @@ -370,8 +370,8 @@ GLOBAL(int_with_check) /* First do a reschedule test. */ /* edx: work, edi: workmask */ @@ -143,7 +133,7 @@ Index: linux-rt-devel/arch/x86/kernel/entry_64.S TRACE_IRQS_ON ENABLE_INTERRUPTS(CLBR_NONE) pushq_cfi %rdi -@@ -776,7 +776,23 @@ retint_kernel: +@@ -776,7 +776,23 @@ retint_swapgs: /* return to user-space bt $9,EFLAGS(%rsp) /* interrupts were off? */ jnc 1f 0: cmpl $0,PER_CPU_VAR(__preempt_count) @@ -167,7 +157,7 @@ Index: linux-rt-devel/arch/x86/kernel/entry_64.S call preempt_schedule_irq jmp 0b 1: -@@ -844,8 +860,8 @@ native_irq_return_ldt: +@@ -844,8 +860,8 @@ ENTRY(native_iret) /* edi: workmask, edx: work */ retint_careful: CFI_RESTORE_STATE diff --git a/patches/x86-stackprot-no-random-on-rt.patch b/patches/x86-stackprot-no-random-on-rt.patch index 26cca669cccad9..5c3ca09908af5e 100644 --- a/patches/x86-stackprot-no-random-on-rt.patch +++ b/patches/x86-stackprot-no-random-on-rt.patch @@ -17,10 +17,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> arch/x86/include/asm/stackprotector.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) -Index: linux-rt-devel/arch/x86/include/asm/stackprotector.h -=================================================================== ---- linux-rt-devel.orig/arch/x86/include/asm/stackprotector.h -+++ linux-rt-devel/arch/x86/include/asm/stackprotector.h +--- a/arch/x86/include/asm/stackprotector.h ++++ b/arch/x86/include/asm/stackprotector.h @@ -57,7 +57,7 @@ */ static __always_inline void boot_init_stack_canary(void) diff --git a/patches/x86-use-gen-rwsem-spinlocks-rt.patch b/patches/x86-use-gen-rwsem-spinlocks-rt.patch index 6e204b04f7ba7f..a32937dd889c76 100644 --- a/patches/x86-use-gen-rwsem-spinlocks-rt.patch +++ b/patches/x86-use-gen-rwsem-spinlocks-rt.patch @@ -11,10 +11,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> arch/x86/Kconfig | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -Index: linux-rt-devel/arch/x86/Kconfig -=================================================================== ---- linux-rt-devel.orig/arch/x86/Kconfig -+++ linux-rt-devel/arch/x86/Kconfig +--- a/arch/x86/Kconfig ++++ b/arch/x86/Kconfig @@ -203,8 +203,11 @@ config ARCH_MAY_HAVE_PC_FDC def_bool y depends on ISA_DMA_API diff --git a/patches/xfs--clean-up-inode-lockdep-annotations b/patches/xfs--clean-up-inode-lockdep-annotations index b11e5f69263467..110db4a4672f20 100644 --- a/patches/xfs--clean-up-inode-lockdep-annotations +++ b/patches/xfs--clean-up-inode-lockdep-annotations @@ -56,10 +56,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> fs/xfs/xfs_inode.h | 79 +++++++++++++++++++++++++++++++++++++---------------- 2 files changed, 107 insertions(+), 40 deletions(-) -Index: linux-rt-devel/fs/xfs/xfs_inode.c -=================================================================== ---- linux-rt-devel.orig/fs/xfs/xfs_inode.c -+++ linux-rt-devel/fs/xfs/xfs_inode.c +--- a/fs/xfs/xfs_inode.c ++++ b/fs/xfs/xfs_inode.c @@ -164,7 +164,7 @@ xfs_ilock( (XFS_MMAPLOCK_SHARED | XFS_MMAPLOCK_EXCL)); ASSERT((lock_flags & (XFS_ILOCK_SHARED | XFS_ILOCK_EXCL)) != @@ -182,10 +180,8 @@ Index: linux-rt-devel/fs/xfs/xfs_inode.c try_lock = 0; i = 0; -Index: linux-rt-devel/fs/xfs/xfs_inode.h -=================================================================== ---- linux-rt-devel.orig/fs/xfs/xfs_inode.h -+++ linux-rt-devel/fs/xfs/xfs_inode.h +--- a/fs/xfs/xfs_inode.h ++++ b/fs/xfs/xfs_inode.h @@ -284,9 +284,9 @@ static inline int xfs_isiflocked(struct * Flags for lockdep annotations. * |