diff options
author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-08-21 19:10:09 -0400 |
---|---|---|
committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-08-21 19:10:09 -0400 |
commit | 833e94ff5e4f995835d12ab16b3eb45cbfb7b119 (patch) | |
tree | 62981c625d3bfc7b4063bad24ee60732110ec560 | |
parent | 8545e9a6bc20f37f1760027b6c1279ba55529bc6 (diff) | |
download | 3.4-rt-patches-833e94ff5e4f995835d12ab16b3eb45cbfb7b119.tar.gz |
patches-3.4-rc5-rt6.tar.xz3.4-rt73.4-rc5-rt6
No announce on RT list. Lots of patches refreshed to have a 3.4
reference instead of a 3.2 reference.
md5sum:
cee0911f540c444d4e56374ea8c5eb8b patches-3.4-rc5-rt6.tar.xz
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
138 files changed, 739 insertions, 769 deletions
diff --git a/patches/acpi-use-local-irq-nort.patch b/patches/acpi-use-local-irq-nort.patch index 6b6c57e..afa44ee 100644 --- a/patches/acpi-use-local-irq-nort.patch +++ b/patches/acpi-use-local-irq-nort.patch @@ -10,10 +10,10 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> arch/x86/include/asm/acpi.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -Index: linux-3.2/arch/x86/include/asm/acpi.h +Index: linux-3.4/arch/x86/include/asm/acpi.h =================================================================== ---- linux-3.2.orig/arch/x86/include/asm/acpi.h -+++ linux-3.2/arch/x86/include/asm/acpi.h +--- linux-3.4.orig/arch/x86/include/asm/acpi.h ++++ linux-3.4/arch/x86/include/asm/acpi.h @@ -51,8 +51,8 @@ #define ACPI_ASM_MACROS diff --git a/patches/arch-use-pagefault-disabled.patch b/patches/arch-use-pagefault-disabled.patch index 20ae3b1..9916b82 100644 --- a/patches/arch-use-pagefault-disabled.patch +++ b/patches/arch-use-pagefault-disabled.patch @@ -254,7 +254,7 @@ Index: linux-3.4/arch/sparc/mm/fault_32.c =================================================================== --- linux-3.4.orig/arch/sparc/mm/fault_32.c +++ linux-3.4/arch/sparc/mm/fault_32.c -@@ -246,8 +246,8 @@ asmlinkage void do_sparc_fault(struct pt +@@ -248,8 +248,8 @@ asmlinkage void do_sparc_fault(struct pt * If we're in an interrupt or have no user * context, we must not take the fault.. */ @@ -269,7 +269,7 @@ Index: linux-3.4/arch/sparc/mm/fault_64.c =================================================================== --- linux-3.4.orig/arch/sparc/mm/fault_64.c +++ linux-3.4/arch/sparc/mm/fault_64.c -@@ -322,7 +322,7 @@ asmlinkage void __kprobes do_sparc64_fau +@@ -323,7 +323,7 @@ asmlinkage void __kprobes do_sparc64_fau * If we're in an interrupt or have no user * context, we must not take the fault.. */ @@ -282,7 +282,7 @@ Index: linux-3.4/arch/tile/mm/fault.c =================================================================== --- linux-3.4.orig/arch/tile/mm/fault.c +++ linux-3.4/arch/tile/mm/fault.c -@@ -345,7 +345,7 @@ static int handle_page_fault(struct pt_r +@@ -355,7 +355,7 @@ static int handle_page_fault(struct pt_r * If we're in an interrupt, have no user context or are running in an * atomic region then we must not take the fault. */ 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 da12ab8..c6cfd48 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 @@ -18,7 +18,7 @@ Index: linux-3.4/arch/arm/mach-at91/at91rm9200_time.c =================================================================== --- linux-3.4.orig/arch/arm/mach-at91/at91rm9200_time.c +++ linux-3.4/arch/arm/mach-at91/at91rm9200_time.c -@@ -129,6 +129,7 @@ clkevt32k_mode(enum clock_event_mode mod +@@ -130,6 +130,7 @@ clkevt32k_mode(enum clock_event_mode mod break; case CLOCK_EVT_MODE_SHUTDOWN: case CLOCK_EVT_MODE_UNUSED: 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 d2364d0..c61e1bb 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,11 +11,11 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> drivers/misc/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -Index: linux-3.2/drivers/misc/Kconfig +Index: linux-3.4/drivers/misc/Kconfig =================================================================== ---- linux-3.2.orig/drivers/misc/Kconfig -+++ linux-3.2/drivers/misc/Kconfig -@@ -82,6 +82,7 @@ config AB8500_PWM +--- linux-3.4.orig/drivers/misc/Kconfig ++++ linux-3.4/drivers/misc/Kconfig +@@ -72,6 +72,7 @@ config AB8500_PWM config ATMEL_TCLIB bool "Atmel AT32/AT91 Timer/Counter Library" depends on (AVR32 || ARCH_AT91) @@ -23,7 +23,7 @@ Index: linux-3.2/drivers/misc/Kconfig help Select this if you want a library to allocate the Timer/Counter blocks found on many Atmel processors. This facilitates using -@@ -114,7 +115,7 @@ config ATMEL_TCB_CLKSRC_BLOCK +@@ -104,7 +105,7 @@ config ATMEL_TCB_CLKSRC_BLOCK config ATMEL_TCB_CLKSRC_USE_SLOW_CLOCK bool "TC Block use 32 KiHz clock" depends on ATMEL_TCB_CLKSRC diff --git a/patches/arm-disable-highmem-on-rt.patch b/patches/arm-disable-highmem-on-rt.patch index 05a00c6..0d0c20d 100644 --- a/patches/arm-disable-highmem-on-rt.patch +++ b/patches/arm-disable-highmem-on-rt.patch @@ -7,11 +7,11 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> arch/arm/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux-3.2/arch/arm/Kconfig +Index: linux-3.4/arch/arm/Kconfig =================================================================== ---- linux-3.2.orig/arch/arm/Kconfig -+++ linux-3.2/arch/arm/Kconfig -@@ -1668,7 +1668,7 @@ config HAVE_ARCH_PFN_VALID +--- linux-3.4.orig/arch/arm/Kconfig ++++ linux-3.4/arch/arm/Kconfig +@@ -1716,7 +1716,7 @@ config HAVE_ARCH_PFN_VALID config HIGHMEM bool "High Memory Support" diff --git a/patches/arm-enable-interrupts-in-signal-code.patch b/patches/arm-enable-interrupts-in-signal-code.patch index e201cb8..1187330 100644 --- a/patches/arm-enable-interrupts-in-signal-code.patch +++ b/patches/arm-enable-interrupts-in-signal-code.patch @@ -7,11 +7,11 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> arch/arm/kernel/signal.c | 3 +++ 1 file changed, 3 insertions(+) -Index: linux-3.2/arch/arm/kernel/signal.c +Index: linux-3.4/arch/arm/kernel/signal.c =================================================================== ---- linux-3.2.orig/arch/arm/kernel/signal.c -+++ linux-3.2/arch/arm/kernel/signal.c -@@ -672,6 +672,9 @@ static void do_signal(struct pt_regs *re +--- linux-3.4.orig/arch/arm/kernel/signal.c ++++ linux-3.4/arch/arm/kernel/signal.c +@@ -664,6 +664,9 @@ static void do_signal(struct pt_regs *re if (!user_mode(regs)) return; diff --git a/patches/arm-mark-pmu-interupt-no-thread.patch b/patches/arm-mark-pmu-interupt-no-thread.patch index bb73020..d2076ca 100644 --- a/patches/arm-mark-pmu-interupt-no-thread.patch +++ b/patches/arm-mark-pmu-interupt-no-thread.patch @@ -10,11 +10,11 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> arch/arm/kernel/perf_event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux-3.2/arch/arm/kernel/perf_event.c +Index: linux-3.4/arch/arm/kernel/perf_event.c =================================================================== ---- linux-3.2.orig/arch/arm/kernel/perf_event.c -+++ linux-3.2/arch/arm/kernel/perf_event.c -@@ -441,7 +441,7 @@ armpmu_reserve_hardware(struct arm_pmu * +--- linux-3.4.orig/arch/arm/kernel/perf_event.c ++++ linux-3.4/arch/arm/kernel/perf_event.c +@@ -433,7 +433,7 @@ armpmu_reserve_hardware(struct arm_pmu * } err = request_irq(irq, handle_irq, diff --git a/patches/block-shorten-interrupt-disabled-regions.patch b/patches/block-shorten-interrupt-disabled-regions.patch index b4916db..06cc09b 100644 --- a/patches/block-shorten-interrupt-disabled-regions.patch +++ b/patches/block-shorten-interrupt-disabled-regions.patch @@ -63,7 +63,7 @@ Index: linux-3.4/block/blk-core.c q->request_fn(q); } EXPORT_SYMBOL(__blk_run_queue); -@@ -2778,11 +2782,11 @@ static void queue_unplugged(struct reque +@@ -2779,11 +2783,11 @@ static void queue_unplugged(struct reque * this lock). */ if (from_schedule) { @@ -77,7 +77,7 @@ Index: linux-3.4/block/blk-core.c } } -@@ -2808,7 +2812,6 @@ static void flush_plug_callbacks(struct +@@ -2809,7 +2813,6 @@ static void flush_plug_callbacks(struct void blk_flush_plug_list(struct blk_plug *plug, bool from_schedule) { struct request_queue *q; @@ -85,7 +85,7 @@ Index: linux-3.4/block/blk-core.c struct request *rq; LIST_HEAD(list); unsigned int depth; -@@ -2829,11 +2832,6 @@ void blk_flush_plug_list(struct blk_plug +@@ -2830,11 +2833,6 @@ void blk_flush_plug_list(struct blk_plug q = NULL; depth = 0; @@ -97,7 +97,7 @@ Index: linux-3.4/block/blk-core.c while (!list_empty(&list)) { rq = list_entry_rq(list.next); list_del_init(&rq->queuelist); -@@ -2846,7 +2844,7 @@ void blk_flush_plug_list(struct blk_plug +@@ -2847,7 +2845,7 @@ void blk_flush_plug_list(struct blk_plug queue_unplugged(q, depth, from_schedule); q = rq->q; depth = 0; @@ -106,7 +106,7 @@ Index: linux-3.4/block/blk-core.c } /* -@@ -2873,8 +2871,6 @@ void blk_flush_plug_list(struct blk_plug +@@ -2874,8 +2872,6 @@ void blk_flush_plug_list(struct blk_plug */ if (q) queue_unplugged(q, depth, from_schedule); diff --git a/patches/bug-rt-dependend-variants.patch b/patches/bug-rt-dependend-variants.patch index c8715f4..9960759 100644 --- a/patches/bug-rt-dependend-variants.patch +++ b/patches/bug-rt-dependend-variants.patch @@ -9,10 +9,10 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> include/asm-generic/bug.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) -Index: linux-3.2/include/asm-generic/bug.h +Index: linux-3.4/include/asm-generic/bug.h =================================================================== ---- linux-3.2.orig/include/asm-generic/bug.h -+++ linux-3.2/include/asm-generic/bug.h +--- linux-3.4.orig/include/asm-generic/bug.h ++++ linux-3.4/include/asm-generic/bug.h @@ -3,6 +3,10 @@ #include <linux/compiler.h> diff --git a/patches/cond-resched-softirq-rt.patch b/patches/cond-resched-softirq-rt.patch index 2f83634..2f89bbc 100644 --- a/patches/cond-resched-softirq-rt.patch +++ b/patches/cond-resched-softirq-rt.patch @@ -5,14 +5,14 @@ Date: Thu, 14 Jul 2011 09:56:44 +0200 Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- include/linux/sched.h | 4 ++++ - kernel/sched/core.c | 2 ++ + kernel/sched/core.c | 2 ++ 2 files changed, 6 insertions(+) -Index: linux-3.2/include/linux/sched.h +Index: linux-3.4/include/linux/sched.h =================================================================== ---- linux-3.2.orig/include/linux/sched.h -+++ linux-3.2/include/linux/sched.h -@@ -2602,12 +2602,16 @@ extern int __cond_resched_lock(spinlock_ +--- linux-3.4.orig/include/linux/sched.h ++++ linux-3.4/include/linux/sched.h +@@ -2700,12 +2700,16 @@ extern int __cond_resched_lock(spinlock_ __cond_resched_lock(lock); \ }) @@ -29,11 +29,11 @@ Index: linux-3.2/include/linux/sched.h /* * Does a critical section need to be broken due to another -Index: linux-3.2/kernel/sched/core.c +Index: linux-3.4/kernel/sched/core.c =================================================================== ---- linux-3.2.orig/kernel/sched/core.c -+++ linux-3.2/kernel/sched/core.c -@@ -5826,6 +5826,7 @@ int __cond_resched_lock(spinlock_t *lock +--- linux-3.4.orig/kernel/sched/core.c ++++ linux-3.4/kernel/sched/core.c +@@ -4605,6 +4605,7 @@ int __cond_resched_lock(spinlock_t *lock } EXPORT_SYMBOL(__cond_resched_lock); @@ -41,7 +41,7 @@ Index: linux-3.2/kernel/sched/core.c int __sched __cond_resched_softirq(void) { BUG_ON(!in_softirq()); -@@ -5839,6 +5840,7 @@ int __sched __cond_resched_softirq(void) +@@ -4618,6 +4619,7 @@ int __sched __cond_resched_softirq(void) return 0; } EXPORT_SYMBOL(__cond_resched_softirq); 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 4fde268..2f0c879 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,10 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/cpu.c | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) -Index: linux-3.2/kernel/cpu.c +Index: linux-3.4/kernel/cpu.c =================================================================== ---- linux-3.2.orig/kernel/cpu.c -+++ linux-3.2/kernel/cpu.c +--- linux-3.4.orig/kernel/cpu.c ++++ linux-3.4/kernel/cpu.c @@ -46,7 +46,12 @@ static int cpu_hotplug_disabled; static struct { diff --git a/patches/cpu-rt-variants.patch b/patches/cpu-rt-variants.patch index b2ab2fb..0e49fdb 100644 --- a/patches/cpu-rt-variants.patch +++ b/patches/cpu-rt-variants.patch @@ -7,11 +7,11 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> include/linux/smp.h | 8 ++++++++ 1 file changed, 8 insertions(+) -Index: linux-3.2/include/linux/smp.h +Index: linux-3.4/include/linux/smp.h =================================================================== ---- linux-3.2.orig/include/linux/smp.h -+++ linux-3.2/include/linux/smp.h -@@ -173,6 +173,14 @@ smp_call_function_any(const struct cpuma +--- linux-3.4.orig/include/linux/smp.h ++++ linux-3.4/include/linux/smp.h +@@ -219,6 +219,14 @@ smp_call_function_any(const struct cpuma #define get_cpu() ({ preempt_disable(); smp_processor_id(); }) #define put_cpu() preempt_enable() diff --git a/patches/cpumask-disable-offstack-on-rt.patch b/patches/cpumask-disable-offstack-on-rt.patch index 5ba57de..541a2da 100644 --- a/patches/cpumask-disable-offstack-on-rt.patch +++ b/patches/cpumask-disable-offstack-on-rt.patch @@ -11,11 +11,11 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> lib/Kconfig | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) -Index: linux-3.2/arch/x86/Kconfig +Index: linux-3.4/arch/x86/Kconfig =================================================================== ---- linux-3.2.orig/arch/x86/Kconfig -+++ linux-3.2/arch/x86/Kconfig -@@ -730,7 +730,7 @@ config IOMMU_HELPER +--- linux-3.4.orig/arch/x86/Kconfig ++++ linux-3.4/arch/x86/Kconfig +@@ -750,7 +750,7 @@ config IOMMU_HELPER config MAXSMP bool "Enable Maximum number of SMP Processors and NUMA Nodes" depends on X86_64 && SMP && DEBUG_KERNEL && EXPERIMENTAL @@ -24,11 +24,11 @@ Index: linux-3.2/arch/x86/Kconfig ---help--- Enable maximum number of CPUS and NUMA Nodes for this architecture. If unsure, say N. -Index: linux-3.2/lib/Kconfig +Index: linux-3.4/lib/Kconfig =================================================================== ---- linux-3.2.orig/lib/Kconfig -+++ linux-3.2/lib/Kconfig -@@ -231,6 +231,7 @@ config CHECK_SIGNATURE +--- linux-3.4.orig/lib/Kconfig ++++ linux-3.4/lib/Kconfig +@@ -303,6 +303,7 @@ config CHECK_SIGNATURE config CPUMASK_OFFSTACK bool "Force CPU masks off stack" if DEBUG_PER_CPU_MAPS diff --git a/patches/debugobjects-rt.patch b/patches/debugobjects-rt.patch index 8646555..cdbcddb 100644 --- a/patches/debugobjects-rt.patch +++ b/patches/debugobjects-rt.patch @@ -7,11 +7,11 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> lib/debugobjects.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) -Index: linux-3.2/lib/debugobjects.c +Index: linux-3.4/lib/debugobjects.c =================================================================== ---- linux-3.2.orig/lib/debugobjects.c -+++ linux-3.2/lib/debugobjects.c -@@ -306,7 +306,10 @@ __debug_object_init(void *addr, struct d +--- linux-3.4.orig/lib/debugobjects.c ++++ linux-3.4/lib/debugobjects.c +@@ -310,7 +310,10 @@ __debug_object_init(void *addr, struct d struct debug_obj *obj; unsigned long flags; @@ -23,7 +23,7 @@ Index: linux-3.2/lib/debugobjects.c db = get_bucket((unsigned long) addr); -@@ -1015,9 +1018,9 @@ static int __init debug_objects_replace_ +@@ -1053,9 +1056,9 @@ static int __init debug_objects_replace_ } } diff --git a/patches/dm-make-rt-aware.patch b/patches/dm-make-rt-aware.patch index 9b2d0f2..216853a 100644 --- a/patches/dm-make-rt-aware.patch +++ b/patches/dm-make-rt-aware.patch @@ -13,10 +13,10 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> drivers/md/dm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -Index: linux-3.2/drivers/md/dm.c +Index: linux-3.4/drivers/md/dm.c =================================================================== ---- linux-3.2.orig/drivers/md/dm.c -+++ linux-3.2/drivers/md/dm.c +--- linux-3.4.orig/drivers/md/dm.c ++++ linux-3.4/drivers/md/dm.c @@ -1648,14 +1648,14 @@ static void dm_request_fn(struct request if (map_request(ti, clone, md)) goto requeued; diff --git a/patches/drivers-net-gianfar-make-rt-aware.patch b/patches/drivers-net-gianfar-make-rt-aware.patch index fc4714c..9bfc2b4 100644 --- a/patches/drivers-net-gianfar-make-rt-aware.patch +++ b/patches/drivers-net-gianfar-make-rt-aware.patch @@ -15,11 +15,11 @@ Tested-by: Xianghua Xiao <xiaoxianghua@gmail.com> drivers/net/ethernet/freescale/gianfar.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -Index: linux-3.2/drivers/net/ethernet/freescale/gianfar.c +Index: linux-3.4/drivers/net/ethernet/freescale/gianfar.c =================================================================== ---- linux-3.2.orig/drivers/net/ethernet/freescale/gianfar.c -+++ linux-3.2/drivers/net/ethernet/freescale/gianfar.c -@@ -1671,7 +1671,7 @@ void stop_gfar(struct net_device *dev) +--- linux-3.4.orig/drivers/net/ethernet/freescale/gianfar.c ++++ linux-3.4/drivers/net/ethernet/freescale/gianfar.c +@@ -1643,7 +1643,7 @@ void stop_gfar(struct net_device *dev) /* Lock it down */ @@ -28,7 +28,7 @@ Index: linux-3.2/drivers/net/ethernet/freescale/gianfar.c lock_tx_qs(priv); lock_rx_qs(priv); -@@ -1679,7 +1679,7 @@ void stop_gfar(struct net_device *dev) +@@ -1651,7 +1651,7 @@ void stop_gfar(struct net_device *dev) unlock_rx_qs(priv); unlock_tx_qs(priv); @@ -37,7 +37,7 @@ Index: linux-3.2/drivers/net/ethernet/freescale/gianfar.c /* Free the IRQs */ if (priv->device_flags & FSL_GIANFAR_DEV_HAS_MULTI_INTR) { -@@ -2949,7 +2949,7 @@ static void adjust_link(struct net_devic +@@ -2948,7 +2948,7 @@ static void adjust_link(struct net_devic struct phy_device *phydev = priv->phydev; int new_state = 0; @@ -46,7 +46,7 @@ Index: linux-3.2/drivers/net/ethernet/freescale/gianfar.c lock_tx_qs(priv); if (phydev->link) { -@@ -3016,7 +3016,7 @@ static void adjust_link(struct net_devic +@@ -3015,7 +3015,7 @@ static void adjust_link(struct net_devic if (new_state && netif_msg_link(priv)) phy_print_status(phydev); unlock_tx_qs(priv); diff --git a/patches/drivers-net-vortex-fix-locking-issues.patch b/patches/drivers-net-vortex-fix-locking-issues.patch index 49f1708..5fbd0ee 100644 --- a/patches/drivers-net-vortex-fix-locking-issues.patch +++ b/patches/drivers-net-vortex-fix-locking-issues.patch @@ -17,10 +17,10 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu> -Index: linux-3.2/drivers/net/ethernet/3com/3c59x.c +Index: linux-3.4/drivers/net/ethernet/3com/3c59x.c =================================================================== ---- linux-3.2.orig/drivers/net/ethernet/3com/3c59x.c -+++ linux-3.2/drivers/net/ethernet/3com/3c59x.c +--- linux-3.4.orig/drivers/net/ethernet/3com/3c59x.c ++++ linux-3.4/drivers/net/ethernet/3com/3c59x.c @@ -843,9 +843,9 @@ static void poll_vortex(struct net_devic { struct vortex_private *vp = netdev_priv(dev); @@ -33,7 +33,7 @@ Index: linux-3.2/drivers/net/ethernet/3com/3c59x.c } #endif -@@ -1921,12 +1921,12 @@ static void vortex_tx_timeout(struct net +@@ -1920,12 +1920,12 @@ static void vortex_tx_timeout(struct net * Block interrupts because vortex_interrupt does a bare spin_lock() */ unsigned long flags; diff --git a/patches/drivers-serial-call-flush_to_ldisc-when-the-irq-is-t.patch b/patches/drivers-serial-call-flush_to_ldisc-when-the-irq-is-t.patch index 4ae2468..95e225f 100644 --- a/patches/drivers-serial-call-flush_to_ldisc-when-the-irq-is-t.patch +++ b/patches/drivers-serial-call-flush_to_ldisc-when-the-irq-is-t.patch @@ -13,7 +13,7 @@ Index: linux-3.4/drivers/tty/serial/8250/8250.c =================================================================== --- linux-3.4.orig/drivers/tty/serial/8250/8250.c +++ linux-3.4/drivers/tty/serial/8250/8250.c -@@ -1586,12 +1586,14 @@ static irqreturn_t serial8250_interrupt( +@@ -1584,12 +1584,14 @@ static irqreturn_t serial8250_interrupt( l = l->next; diff --git a/patches/early-printk-consolidate.patch b/patches/early-printk-consolidate.patch index 8758c25..47b9cd1 100644 --- a/patches/early-printk-consolidate.patch +++ b/patches/early-printk-consolidate.patch @@ -128,7 +128,7 @@ Index: linux-3.4/arch/microblaze/kernel/early_printk.c return; printk(KERN_INFO "early_printk_console remapping from 0x%x to ", base_addr); -@@ -193,9 +175,9 @@ void __init remap_early_printk(void) +@@ -195,9 +177,9 @@ void __init remap_early_printk(void) void __init disable_early_printk(void) { diff --git a/patches/epoll-use-get-cpu-light.patch b/patches/epoll-use-get-cpu-light.patch index 201973f..e706ea7 100644 --- a/patches/epoll-use-get-cpu-light.patch +++ b/patches/epoll-use-get-cpu-light.patch @@ -7,11 +7,11 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> fs/eventpoll.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -Index: linux-3.2/fs/eventpoll.c +Index: linux-3.4/fs/eventpoll.c =================================================================== ---- linux-3.2.orig/fs/eventpoll.c -+++ linux-3.2/fs/eventpoll.c -@@ -464,12 +464,12 @@ static int ep_poll_wakeup_proc(void *pri +--- linux-3.4.orig/fs/eventpoll.c ++++ linux-3.4/fs/eventpoll.c +@@ -488,12 +488,12 @@ static int ep_poll_wakeup_proc(void *pri */ static void ep_poll_safewake(wait_queue_head_t *wq) { diff --git a/patches/fs-block-rt-support.patch b/patches/fs-block-rt-support.patch index 0e2747f..44f531e 100644 --- a/patches/fs-block-rt-support.patch +++ b/patches/fs-block-rt-support.patch @@ -8,11 +8,11 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> fs/file.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) -Index: linux-3.2/block/blk-core.c +Index: linux-3.4/block/blk-core.c =================================================================== ---- linux-3.2.orig/block/blk-core.c -+++ linux-3.2/block/blk-core.c -@@ -235,7 +235,7 @@ EXPORT_SYMBOL(blk_delay_queue); +--- linux-3.4.orig/block/blk-core.c ++++ linux-3.4/block/blk-core.c +@@ -237,7 +237,7 @@ EXPORT_SYMBOL(blk_delay_queue); **/ void blk_start_queue(struct request_queue *q) { @@ -21,10 +21,10 @@ Index: linux-3.2/block/blk-core.c queue_flag_clear(QUEUE_FLAG_STOPPED, q); __blk_run_queue(q); -Index: linux-3.2/fs/file.c +Index: linux-3.4/fs/file.c =================================================================== ---- linux-3.2.orig/fs/file.c -+++ linux-3.2/fs/file.c +--- linux-3.4.orig/fs/file.c ++++ linux-3.4/fs/file.c @@ -105,14 +105,14 @@ void free_fdtable_rcu(struct rcu_head *r kfree(fdt->open_fds); kfree(fdt); diff --git a/patches/fs-jbd-replace-bh_state-lock.patch b/patches/fs-jbd-replace-bh_state-lock.patch index 505b705..90a31fc 100644 --- a/patches/fs-jbd-replace-bh_state-lock.patch +++ b/patches/fs-jbd-replace-bh_state-lock.patch @@ -13,10 +13,10 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> include/linux/jbd_common.h | 24 ++++++++++++++++++++++++ 2 files changed, 34 insertions(+) -Index: linux-3.2/include/linux/buffer_head.h +Index: linux-3.4/include/linux/buffer_head.h =================================================================== ---- linux-3.2.orig/include/linux/buffer_head.h -+++ linux-3.2/include/linux/buffer_head.h +--- linux-3.4.orig/include/linux/buffer_head.h ++++ linux-3.4/include/linux/buffer_head.h @@ -74,6 +74,11 @@ struct buffer_head { atomic_t b_count; /* users using this buffer_head */ #ifdef CONFIG_PREEMPT_RT_BASE @@ -41,10 +41,10 @@ Index: linux-3.2/include/linux/buffer_head.h #endif } -Index: linux-3.2/include/linux/jbd_common.h +Index: linux-3.4/include/linux/jbd_common.h =================================================================== ---- linux-3.2.orig/include/linux/jbd_common.h -+++ linux-3.2/include/linux/jbd_common.h +--- linux-3.4.orig/include/linux/jbd_common.h ++++ linux-3.4/include/linux/jbd_common.h @@ -37,32 +37,56 @@ static inline struct journal_head *bh2jh static inline void jbd_lock_bh_state(struct buffer_head *bh) diff --git a/patches/fs-replace-bh_uptodate_lock-for-rt.patch b/patches/fs-replace-bh_uptodate_lock-for-rt.patch index fbcb059..100f00a 100644 --- a/patches/fs-replace-bh_uptodate_lock-for-rt.patch +++ b/patches/fs-replace-bh_uptodate_lock-for-rt.patch @@ -75,7 +75,7 @@ Index: linux-3.4/fs/buffer.c } EXPORT_SYMBOL(end_buffer_async_write); -@@ -3186,6 +3178,7 @@ struct buffer_head *alloc_buffer_head(gf +@@ -3185,6 +3177,7 @@ struct buffer_head *alloc_buffer_head(gf struct buffer_head *ret = kmem_cache_zalloc(bh_cachep, gfp_flags); if (ret) { INIT_LIST_HEAD(&ret->b_assoc_buffers); diff --git a/patches/futex-requeue-pi-fix.patch b/patches/futex-requeue-pi-fix.patch index 9a0cf93..cc22b0c 100644 --- a/patches/futex-requeue-pi-fix.patch +++ b/patches/futex-requeue-pi-fix.patch @@ -54,10 +54,10 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/rtmutex_common.h | 1 + 2 files changed, 32 insertions(+), 1 deletion(-) -Index: linux-3.2/kernel/rtmutex.c +Index: linux-3.4/kernel/rtmutex.c =================================================================== ---- linux-3.2.orig/kernel/rtmutex.c -+++ linux-3.2/kernel/rtmutex.c +--- linux-3.4.orig/kernel/rtmutex.c ++++ linux-3.4/kernel/rtmutex.c @@ -69,7 +69,8 @@ static void fixup_rt_mutex_waiters(struc static int rt_mutex_real_waiter(struct rt_mutex_waiter *waiter) @@ -68,7 +68,7 @@ Index: linux-3.2/kernel/rtmutex.c } /* -@@ -1010,6 +1011,35 @@ int rt_mutex_start_proxy_lock(struct rt_ +@@ -1002,6 +1003,35 @@ int rt_mutex_start_proxy_lock(struct rt_ return 1; } @@ -104,10 +104,10 @@ Index: linux-3.2/kernel/rtmutex.c ret = task_blocks_on_rt_mutex(lock, waiter, task, detect_deadlock); if (ret && !rt_mutex_owner(lock)) { -Index: linux-3.2/kernel/rtmutex_common.h +Index: linux-3.4/kernel/rtmutex_common.h =================================================================== ---- linux-3.2.orig/kernel/rtmutex_common.h -+++ linux-3.2/kernel/rtmutex_common.h +--- linux-3.4.orig/kernel/rtmutex_common.h ++++ linux-3.4/kernel/rtmutex_common.h @@ -104,6 +104,7 @@ static inline struct task_struct *rt_mut * PI-futex support (proxy locking functions, etc.): */ diff --git a/patches/genirq-disable-irqpoll-on-rt.patch b/patches/genirq-disable-irqpoll-on-rt.patch index ec454ae..5bddf23 100644 --- a/patches/genirq-disable-irqpoll-on-rt.patch +++ b/patches/genirq-disable-irqpoll-on-rt.patch @@ -11,10 +11,10 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/irq/spurious.c | 10 ++++++++++ 1 file changed, 10 insertions(+) -Index: linux-3.2/kernel/irq/spurious.c +Index: linux-3.4/kernel/irq/spurious.c =================================================================== ---- linux-3.2.orig/kernel/irq/spurious.c -+++ linux-3.2/kernel/irq/spurious.c +--- linux-3.4.orig/kernel/irq/spurious.c ++++ linux-3.4/kernel/irq/spurious.c @@ -341,6 +341,11 @@ MODULE_PARM_DESC(noirqdebug, "Disable ir static int __init irqfixup_setup(char *str) diff --git a/patches/genirq-disable-random-call-on-preempt-rt.patch b/patches/genirq-disable-random-call-on-preempt-rt.patch index 34d54c4..bac9e80 100644 --- a/patches/genirq-disable-random-call-on-preempt-rt.patch +++ b/patches/genirq-disable-random-call-on-preempt-rt.patch @@ -11,11 +11,11 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/irq/handle.c | 3 +++ 1 file changed, 3 insertions(+) -Index: linux-3.2/kernel/irq/handle.c +Index: linux-3.4/kernel/irq/handle.c =================================================================== ---- linux-3.2.orig/kernel/irq/handle.c -+++ linux-3.2/kernel/irq/handle.c -@@ -156,8 +156,11 @@ handle_irq_event_percpu(struct irq_desc +--- linux-3.4.orig/kernel/irq/handle.c ++++ linux-3.4/kernel/irq/handle.c +@@ -172,8 +172,11 @@ handle_irq_event_percpu(struct irq_desc action = action->next; } while (action); diff --git a/patches/genirq-force-threading.patch b/patches/genirq-force-threading.patch index e8536fa..b841d80 100644 --- a/patches/genirq-force-threading.patch +++ b/patches/genirq-force-threading.patch @@ -8,11 +8,11 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/irq/manage.c | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) -Index: linux-3.2/include/linux/interrupt.h +Index: linux-3.4/include/linux/interrupt.h =================================================================== ---- linux-3.2.orig/include/linux/interrupt.h -+++ linux-3.2/include/linux/interrupt.h -@@ -396,9 +396,13 @@ static inline int disable_irq_wake(unsig +--- linux-3.4.orig/include/linux/interrupt.h ++++ linux-3.4/include/linux/interrupt.h +@@ -394,9 +394,13 @@ static inline int disable_irq_wake(unsig #ifdef CONFIG_IRQ_FORCED_THREADING @@ -28,10 +28,10 @@ Index: linux-3.2/include/linux/interrupt.h #endif #ifndef __ARCH_SET_SOFTIRQ_PENDING -Index: linux-3.2/kernel/irq/manage.c +Index: linux-3.4/kernel/irq/manage.c =================================================================== ---- linux-3.2.orig/kernel/irq/manage.c -+++ linux-3.2/kernel/irq/manage.c +--- linux-3.4.orig/kernel/irq/manage.c ++++ linux-3.4/kernel/irq/manage.c @@ -18,6 +18,7 @@ #include "internals.h" diff --git a/patches/genirq-nodebug-shirq.patch b/patches/genirq-nodebug-shirq.patch index e95bb71..e58f287 100644 --- a/patches/genirq-nodebug-shirq.patch +++ b/patches/genirq-nodebug-shirq.patch @@ -7,10 +7,10 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> lib/Kconfig.debug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux-3.2/lib/Kconfig.debug +Index: linux-3.4/lib/Kconfig.debug =================================================================== ---- linux-3.2.orig/lib/Kconfig.debug -+++ linux-3.2/lib/Kconfig.debug +--- linux-3.4.orig/lib/Kconfig.debug ++++ linux-3.4/lib/Kconfig.debug @@ -151,7 +151,7 @@ config DEBUG_KERNEL config DEBUG_SHIRQ diff --git a/patches/harirq-h-define-softirq_count-as-oul-to-kill-build-warning.patch b/patches/harirq-h-define-softirq_count-as-oul-to-kill-build-warning.patch index 4b431d3..1212379 100644 --- a/patches/harirq-h-define-softirq_count-as-oul-to-kill-build-warning.patch +++ b/patches/harirq-h-define-softirq_count-as-oul-to-kill-build-warning.patch @@ -22,10 +22,10 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> include/linux/hardirq.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux-3.2/include/linux/hardirq.h +Index: linux-3.4/include/linux/hardirq.h =================================================================== ---- linux-3.2.orig/include/linux/hardirq.h -+++ linux-3.2/include/linux/hardirq.h +--- linux-3.4.orig/include/linux/hardirq.h ++++ linux-3.4/include/linux/hardirq.h @@ -84,7 +84,7 @@ # define softirq_count() (preempt_count() & SOFTIRQ_MASK) # define in_serving_softirq() (softirq_count() & SOFTIRQ_OFFSET) diff --git a/patches/hotplug-call-cpu_unplug_begin-a-little-early.patch b/patches/hotplug-call-cpu_unplug_begin-a-little-early.patch index 3cfc6e9..15ae737 100644 --- a/patches/hotplug-call-cpu_unplug_begin-a-little-early.patch +++ b/patches/hotplug-call-cpu_unplug_begin-a-little-early.patch @@ -25,11 +25,11 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/cpu.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) -Index: linux-3.2/kernel/cpu.c +Index: linux-3.4/kernel/cpu.c =================================================================== ---- linux-3.2.orig/kernel/cpu.c -+++ linux-3.2/kernel/cpu.c -@@ -338,22 +338,20 @@ static int __ref _cpu_down(unsigned int +--- linux-3.4.orig/kernel/cpu.c ++++ linux-3.4/kernel/cpu.c +@@ -337,22 +337,20 @@ static int __ref _cpu_down(unsigned int return -EBUSY; } 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 c44c8f8..9094f60 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,10 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux-3.2/kernel/cpu.c +Index: linux-3.4/kernel/cpu.c =================================================================== ---- linux-3.2.orig/kernel/cpu.c -+++ linux-3.2/kernel/cpu.c +--- linux-3.4.orig/kernel/cpu.c ++++ linux-3.4/kernel/cpu.c @@ -138,7 +138,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 6a0902e..d818ae1 100644 --- a/patches/hotplug-use-migrate-disable.patch +++ b/patches/hotplug-use-migrate-disable.patch @@ -7,11 +7,11 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/cpu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -Index: linux-3.2/kernel/cpu.c +Index: linux-3.4/kernel/cpu.c =================================================================== ---- linux-3.2.orig/kernel/cpu.c -+++ linux-3.2/kernel/cpu.c -@@ -330,14 +330,13 @@ static int __ref _cpu_down(unsigned int +--- linux-3.4.orig/kernel/cpu.c ++++ linux-3.4/kernel/cpu.c +@@ -329,14 +329,13 @@ static int __ref _cpu_down(unsigned int cpumask_andnot(cpumask, cpu_online_mask, cpumask_of(cpu)); set_cpus_allowed_ptr(current, cpumask); free_cpumask_var(cpumask); @@ -28,7 +28,7 @@ Index: linux-3.2/kernel/cpu.c err = __cpu_notify(CPU_DOWN_PREPARE | mod, hcpu, -1, &nr_calls); if (err) { -@@ -387,6 +386,7 @@ static int __ref _cpu_down(unsigned int +@@ -386,6 +385,7 @@ static int __ref _cpu_down(unsigned int out_release: cpu_unplug_done(cpu); out_cancel: diff --git a/patches/hrtimer-add-missing-debug_activate-aid-was-re-announce-3-0-6-rt17.patch b/patches/hrtimer-add-missing-debug_activate-aid-was-re-announce-3-0-6-rt17.patch index 20d081e..8e20b73 100644 --- a/patches/hrtimer-add-missing-debug_activate-aid-was-re-announce-3-0-6-rt17.patch +++ b/patches/hrtimer-add-missing-debug_activate-aid-was-re-announce-3-0-6-rt17.patch @@ -56,10 +56,10 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/hrtimer.c | 1 + 1 file changed, 1 insertion(+) -Index: linux-3.2/kernel/hrtimer.c +Index: linux-3.4/kernel/hrtimer.c =================================================================== ---- linux-3.2.orig/kernel/hrtimer.c -+++ linux-3.2/kernel/hrtimer.c +--- linux-3.4.orig/kernel/hrtimer.c ++++ linux-3.4/kernel/hrtimer.c @@ -1042,6 +1042,7 @@ int __hrtimer_start_range_ns(struct hrti * remove it again and report a failure. This avoids * stale base->first entries. diff --git a/patches/hrtimer-fix-reprogram-madness.patch b/patches/hrtimer-fix-reprogram-madness.patch index 1fe2d31..c257998 100644 --- a/patches/hrtimer-fix-reprogram-madness.patch +++ b/patches/hrtimer-fix-reprogram-madness.patch @@ -7,10 +7,10 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/hrtimer.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) -Index: linux-3.2/kernel/hrtimer.c +Index: linux-3.4/kernel/hrtimer.c =================================================================== ---- linux-3.2.orig/kernel/hrtimer.c -+++ linux-3.2/kernel/hrtimer.c +--- linux-3.4.orig/kernel/hrtimer.c ++++ linux-3.4/kernel/hrtimer.c @@ -1317,7 +1317,11 @@ static void hrtimer_rt_reprogram(int res if (!enqueue_hrtimer(timer, base)) return; diff --git a/patches/hwlatdetect.patch b/patches/hwlatdetect.patch index 9572014..e2e371a 100644 --- a/patches/hwlatdetect.patch +++ b/patches/hwlatdetect.patch @@ -89,7 +89,7 @@ Index: linux-3.4/MAINTAINERS =================================================================== --- linux-3.4.orig/MAINTAINERS +++ linux-3.4/MAINTAINERS -@@ -3083,6 +3083,15 @@ L: linuxppc-dev@lists.ozlabs.org +@@ -3082,6 +3082,15 @@ L: linuxppc-dev@lists.ozlabs.org S: Odd Fixes F: drivers/tty/hvc/ diff --git a/patches/inpt-gameport-use-local-irq-nort.patch b/patches/inpt-gameport-use-local-irq-nort.patch index 0cc3603..b1b6784 100644 --- a/patches/inpt-gameport-use-local-irq-nort.patch +++ b/patches/inpt-gameport-use-local-irq-nort.patch @@ -11,10 +11,10 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> drivers/input/gameport/gameport.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -Index: linux-3.2/drivers/input/gameport/gameport.c +Index: linux-3.4/drivers/input/gameport/gameport.c =================================================================== ---- linux-3.2.orig/drivers/input/gameport/gameport.c -+++ linux-3.2/drivers/input/gameport/gameport.c +--- linux-3.4.orig/drivers/input/gameport/gameport.c ++++ linux-3.4/drivers/input/gameport/gameport.c @@ -87,12 +87,12 @@ static int gameport_measure_speed(struct tx = 1 << 30; diff --git a/patches/intel_idle-convert-i7300_idle_lock-to-raw-spinlock.patch b/patches/intel_idle-convert-i7300_idle_lock-to-raw-spinlock.patch index 83e415e..9406b3a 100644 --- a/patches/intel_idle-convert-i7300_idle_lock-to-raw-spinlock.patch +++ b/patches/intel_idle-convert-i7300_idle_lock-to-raw-spinlock.patch @@ -27,10 +27,10 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> drivers/idle/i7300_idle.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -Index: linux-3.2/drivers/idle/i7300_idle.c +Index: linux-3.4/drivers/idle/i7300_idle.c =================================================================== ---- linux-3.2.orig/drivers/idle/i7300_idle.c -+++ linux-3.2/drivers/idle/i7300_idle.c +--- linux-3.4.orig/drivers/idle/i7300_idle.c ++++ linux-3.4/drivers/idle/i7300_idle.c @@ -75,7 +75,7 @@ static unsigned long past_skip; static struct pci_dev *fbd_dev; @@ -58,7 +58,7 @@ Index: linux-3.2/drivers/idle/i7300_idle.c return 0; } -@@ -554,7 +554,7 @@ struct debugfs_file_info { +@@ -548,7 +548,7 @@ struct debugfs_file_info { static int __init i7300_idle_init(void) { diff --git a/patches/ipc-sem-rework-semaphore-wakeups.patch b/patches/ipc-sem-rework-semaphore-wakeups.patch index a22bf95..0984945 100644 --- a/patches/ipc-sem-rework-semaphore-wakeups.patch +++ b/patches/ipc-sem-rework-semaphore-wakeups.patch @@ -31,10 +31,10 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> ipc/sem.c | 10 ++++++++++ 1 file changed, 10 insertions(+) -Index: linux-3.2/ipc/sem.c +Index: linux-3.4/ipc/sem.c =================================================================== ---- linux-3.2.orig/ipc/sem.c -+++ linux-3.2/ipc/sem.c +--- linux-3.4.orig/ipc/sem.c ++++ linux-3.4/ipc/sem.c @@ -461,6 +461,13 @@ undo: 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 edd6c86..2d19198 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 @@ -42,7 +42,7 @@ Index: linux-3.4/include/linux/irq.h =================================================================== --- linux-3.4.orig/include/linux/irq.h +++ linux-3.4/include/linux/irq.h -@@ -67,6 +67,7 @@ typedef void (*irq_preflow_handler_t)(st +@@ -73,6 +73,7 @@ typedef void (*irq_preflow_handler_t)(st * IRQ_MOVE_PCNTXT - Interrupt can be migrated from process context * IRQ_NESTED_TRHEAD - Interrupt nests into another thread * IRQ_PER_CPU_DEVID - Dev_id is a per-cpu variable @@ -50,7 +50,7 @@ Index: linux-3.4/include/linux/irq.h */ enum { IRQ_TYPE_NONE = 0x00000000, -@@ -90,12 +91,14 @@ enum { +@@ -97,12 +98,14 @@ enum { IRQ_NESTED_THREAD = (1 << 15), IRQ_NOTHREAD = (1 << 16), IRQ_PER_CPU_DEVID = (1 << 17), diff --git a/patches/lglocks-rt.patch b/patches/lglocks-rt.patch index 41e8859..47e23cd 100644 --- a/patches/lglocks-rt.patch +++ b/patches/lglocks-rt.patch @@ -7,10 +7,10 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> include/linux/lglock.h | 99 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) -Index: linux-3.2/include/linux/lglock.h +Index: linux-3.4/include/linux/lglock.h =================================================================== ---- linux-3.2.orig/include/linux/lglock.h -+++ linux-3.2/include/linux/lglock.h +--- linux-3.4.orig/include/linux/lglock.h ++++ linux-3.4/include/linux/lglock.h @@ -71,6 +71,8 @@ extern void name##_global_lock_online(void); \ extern void name##_global_unlock_online(void); \ diff --git a/patches/list-add-list-last-entry.patch b/patches/list-add-list-last-entry.patch index 48cdd88..a1442d8 100644 --- a/patches/list-add-list-last-entry.patch +++ b/patches/list-add-list-last-entry.patch @@ -7,10 +7,10 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> include/linux/list.h | 11 +++++++++++ 1 file changed, 11 insertions(+) -Index: linux-3.2/include/linux/list.h +Index: linux-3.4/include/linux/list.h =================================================================== ---- linux-3.2.orig/include/linux/list.h -+++ linux-3.2/include/linux/list.h +--- linux-3.4.orig/include/linux/list.h ++++ linux-3.4/include/linux/list.h @@ -362,6 +362,17 @@ static inline void list_splice_tail_init list_entry((ptr)->next, type, member) diff --git a/patches/local-irq-rt-depending-variants.patch b/patches/local-irq-rt-depending-variants.patch index 24706ee..96c8fb7 100644 --- a/patches/local-irq-rt-depending-variants.patch +++ b/patches/local-irq-rt-depending-variants.patch @@ -13,11 +13,11 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> include/linux/irqflags.h | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) -Index: linux-3.2/include/linux/interrupt.h +Index: linux-3.4/include/linux/interrupt.h =================================================================== ---- linux-3.2.orig/include/linux/interrupt.h -+++ linux-3.2/include/linux/interrupt.h -@@ -219,7 +219,7 @@ extern void devm_free_irq(struct device +--- linux-3.4.orig/include/linux/interrupt.h ++++ linux-3.4/include/linux/interrupt.h +@@ -217,7 +217,7 @@ extern void devm_free_irq(struct device #ifdef CONFIG_LOCKDEP # define local_irq_enable_in_hardirq() do { } while (0) #else @@ -26,10 +26,10 @@ Index: linux-3.2/include/linux/interrupt.h #endif extern void disable_irq_nosync(unsigned int irq); -Index: linux-3.2/include/linux/irqflags.h +Index: linux-3.4/include/linux/irqflags.h =================================================================== ---- linux-3.2.orig/include/linux/irqflags.h -+++ linux-3.2/include/linux/irqflags.h +--- linux-3.4.orig/include/linux/irqflags.h ++++ linux-3.4/include/linux/irqflags.h @@ -147,4 +147,23 @@ #endif /* CONFIG_TRACE_IRQFLAGS_SUPPORT */ diff --git a/patches/local-var.patch b/patches/local-var.patch index 3214d3b..3ba067b 100644 --- a/patches/local-var.patch +++ b/patches/local-var.patch @@ -7,10 +7,10 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> include/linux/percpu.h | 5 +++++ 1 file changed, 5 insertions(+) -Index: linux-3.2/include/linux/percpu.h +Index: linux-3.4/include/linux/percpu.h =================================================================== ---- linux-3.2.orig/include/linux/percpu.h -+++ linux-3.2/include/linux/percpu.h +--- linux-3.4.orig/include/linux/percpu.h ++++ linux-3.4/include/linux/percpu.h @@ -48,6 +48,11 @@ preempt_enable(); \ } while (0) diff --git a/patches/local-vars-migrate-disable.patch b/patches/local-vars-migrate-disable.patch index 31cfe7b..92c68b8 100644 --- a/patches/local-vars-migrate-disable.patch +++ b/patches/local-vars-migrate-disable.patch @@ -7,10 +7,10 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> include/linux/percpu.h | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) -Index: linux-3.2/include/linux/percpu.h +Index: linux-3.4/include/linux/percpu.h =================================================================== ---- linux-3.2.orig/include/linux/percpu.h -+++ linux-3.2/include/linux/percpu.h +--- linux-3.4.orig/include/linux/percpu.h ++++ linux-3.4/include/linux/percpu.h @@ -48,10 +48,30 @@ preempt_enable(); \ } while (0) diff --git a/patches/localversion.patch b/patches/localversion.patch index 5e66add..55e5d43 100644 --- a/patches/localversion.patch +++ b/patches/localversion.patch @@ -14,4 +14,4 @@ Index: linux-3.4/localversion-rt --- /dev/null +++ linux-3.4/localversion-rt @@ -0,0 +1 @@ -+-rt5 ++-rt6 diff --git a/patches/lockdep-no-softirq-accounting-on-rt.patch b/patches/lockdep-no-softirq-accounting-on-rt.patch index 9430a0d..b9155a4 100644 --- a/patches/lockdep-no-softirq-accounting-on-rt.patch +++ b/patches/lockdep-no-softirq-accounting-on-rt.patch @@ -8,10 +8,10 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/lockdep.c | 2 ++ 2 files changed, 9 insertions(+), 3 deletions(-) -Index: linux-3.2/include/linux/irqflags.h +Index: linux-3.4/include/linux/irqflags.h =================================================================== ---- linux-3.2.orig/include/linux/irqflags.h -+++ linux-3.2/include/linux/irqflags.h +--- linux-3.4.orig/include/linux/irqflags.h ++++ linux-3.4/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) @@ -38,11 +38,11 @@ Index: linux-3.2/include/linux/irqflags.h #endif #if defined(CONFIG_IRQSOFF_TRACER) || \ -Index: linux-3.2/kernel/lockdep.c +Index: linux-3.4/kernel/lockdep.c =================================================================== ---- linux-3.2.orig/kernel/lockdep.c -+++ linux-3.2/kernel/lockdep.c -@@ -3494,6 +3494,7 @@ static void check_flags(unsigned long fl +--- linux-3.4.orig/kernel/lockdep.c ++++ linux-3.4/kernel/lockdep.c +@@ -3495,6 +3495,7 @@ static void check_flags(unsigned long fl } } @@ -50,7 +50,7 @@ Index: linux-3.2/kernel/lockdep.c /* * We dont accurately track softirq state in e.g. * hardirq contexts (such as on 4KSTACKS), so only -@@ -3508,6 +3509,7 @@ static void check_flags(unsigned long fl +@@ -3509,6 +3510,7 @@ static void check_flags(unsigned long fl DEBUG_LOCKS_WARN_ON(!current->softirqs_enabled); } } diff --git a/patches/md-raid5-percpu-handling-rt-aware.patch b/patches/md-raid5-percpu-handling-rt-aware.patch index d4f2998..c1ee398 100644 --- a/patches/md-raid5-percpu-handling-rt-aware.patch +++ b/patches/md-raid5-percpu-handling-rt-aware.patch @@ -18,11 +18,11 @@ Tested-by: Udo van den Heuvel <udovdh@xs4all.nl> drivers/md/raid5.h | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) -Index: linux-3.2/drivers/md/raid5.c +Index: linux-3.4/drivers/md/raid5.c =================================================================== ---- linux-3.2.orig/drivers/md/raid5.c -+++ linux-3.2/drivers/md/raid5.c -@@ -1245,8 +1245,9 @@ static void __raid_run_ops(struct stripe +--- linux-3.4.orig/drivers/md/raid5.c ++++ linux-3.4/drivers/md/raid5.c +@@ -1309,8 +1309,9 @@ static void __raid_run_ops(struct stripe struct raid5_percpu *percpu; unsigned long cpu; @@ -33,7 +33,7 @@ Index: linux-3.2/drivers/md/raid5.c if (test_bit(STRIPE_OP_BIOFILL, &ops_request)) { ops_run_biofill(sh); overlap_clear++; -@@ -1298,7 +1299,8 @@ static void __raid_run_ops(struct stripe +@@ -1362,7 +1363,8 @@ static void __raid_run_ops(struct stripe if (test_and_clear_bit(R5_Overlap, &dev->flags)) wake_up(&sh->raid_conf->wait_for_overlap); } @@ -43,7 +43,7 @@ Index: linux-3.2/drivers/md/raid5.c } #ifdef CONFIG_MULTICORE_RAID456 -@@ -4539,6 +4541,7 @@ static int raid5_alloc_percpu(struct r5c +@@ -4758,6 +4760,7 @@ static int raid5_alloc_percpu(struct r5c break; } per_cpu_ptr(conf->percpu, cpu)->scribble = scribble; @@ -51,11 +51,11 @@ Index: linux-3.2/drivers/md/raid5.c } #ifdef CONFIG_HOTPLUG_CPU conf->cpu_notify.notifier_call = raid456_cpu_notify; -Index: linux-3.2/drivers/md/raid5.h +Index: linux-3.4/drivers/md/raid5.h =================================================================== ---- linux-3.2.orig/drivers/md/raid5.h -+++ linux-3.2/drivers/md/raid5.h -@@ -405,6 +405,7 @@ struct r5conf { +--- linux-3.4.orig/drivers/md/raid5.h ++++ linux-3.4/drivers/md/raid5.h +@@ -417,6 +417,7 @@ struct r5conf { int recovery_disabled; /* per cpu variables */ struct raid5_percpu { diff --git a/patches/migrate-disable-rt-variant.patch b/patches/migrate-disable-rt-variant.patch index 9ceb48b..e27d9c8 100644 --- a/patches/migrate-disable-rt-variant.patch +++ b/patches/migrate-disable-rt-variant.patch @@ -7,10 +7,10 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> include/linux/preempt.h | 4 ++++ 1 file changed, 4 insertions(+) -Index: linux-3.2/include/linux/preempt.h +Index: linux-3.4/include/linux/preempt.h =================================================================== ---- linux-3.2.orig/include/linux/preempt.h -+++ linux-3.2/include/linux/preempt.h +--- linux-3.4.orig/include/linux/preempt.h ++++ linux-3.4/include/linux/preempt.h @@ -121,11 +121,15 @@ extern void migrate_enable(void); # define preempt_enable_rt() preempt_enable() # define preempt_disable_nort() do { } while (0) diff --git a/patches/mips-disable-highmem-on-rt.patch b/patches/mips-disable-highmem-on-rt.patch index 3ad9810..305d3c7 100644 --- a/patches/mips-disable-highmem-on-rt.patch +++ b/patches/mips-disable-highmem-on-rt.patch @@ -7,11 +7,11 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> arch/mips/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux-3.2/arch/mips/Kconfig +Index: linux-3.4/arch/mips/Kconfig =================================================================== ---- linux-3.2.orig/arch/mips/Kconfig -+++ linux-3.2/arch/mips/Kconfig -@@ -2040,7 +2040,7 @@ config CPU_R4400_WORKAROUNDS +--- linux-3.4.orig/arch/mips/Kconfig ++++ linux-3.4/arch/mips/Kconfig +@@ -2081,7 +2081,7 @@ config CPU_R4400_WORKAROUNDS # config HIGHMEM bool "High Memory Support" diff --git a/patches/mips-enable-interrupts-in-signal.patch b/patches/mips-enable-interrupts-in-signal.patch index 4512cbb..bcb2d4b 100644 --- a/patches/mips-enable-interrupts-in-signal.patch +++ b/patches/mips-enable-interrupts-in-signal.patch @@ -7,11 +7,11 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> arch/mips/kernel/signal.c | 3 +++ 1 file changed, 3 insertions(+) -Index: linux-3.2/arch/mips/kernel/signal.c +Index: linux-3.4/arch/mips/kernel/signal.c =================================================================== ---- linux-3.2.orig/arch/mips/kernel/signal.c -+++ linux-3.2/arch/mips/kernel/signal.c -@@ -604,6 +604,9 @@ static void do_signal(struct pt_regs *re +--- linux-3.4.orig/arch/mips/kernel/signal.c ++++ linux-3.4/arch/mips/kernel/signal.c +@@ -605,6 +605,9 @@ static void do_signal(struct pt_regs *re if (!user_mode(regs)) return; diff --git a/patches/mm-page-alloc-fix.patch b/patches/mm-page-alloc-fix.patch index 3873c79..1356b18 100644 --- a/patches/mm-page-alloc-fix.patch +++ b/patches/mm-page-alloc-fix.patch @@ -11,7 +11,7 @@ Index: linux-3.4/mm/page_alloc.c =================================================================== --- linux-3.4.orig/mm/page_alloc.c +++ linux-3.4/mm/page_alloc.c -@@ -2094,8 +2094,8 @@ __alloc_pages_direct_compact(gfp_t gfp_m +@@ -2095,8 +2095,8 @@ __alloc_pages_direct_compact(gfp_t gfp_m if (*did_some_progress != COMPACT_SKIPPED) { /* Page migration frees to the PCP lists but we want merging */ diff --git a/patches/mm-page-alloc-use-list-last-entry.patch b/patches/mm-page-alloc-use-list-last-entry.patch index be05aa5..99caee2 100644 --- a/patches/mm-page-alloc-use-list-last-entry.patch +++ b/patches/mm-page-alloc-use-list-last-entry.patch @@ -7,11 +7,11 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> mm/page_alloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux-3.2/mm/page_alloc.c +Index: linux-3.4/mm/page_alloc.c =================================================================== ---- linux-3.2.orig/mm/page_alloc.c -+++ linux-3.2/mm/page_alloc.c -@@ -625,7 +625,7 @@ static void free_pcppages_bulk(struct zo +--- linux-3.4.orig/mm/page_alloc.c ++++ linux-3.4/mm/page_alloc.c +@@ -663,7 +663,7 @@ static void free_pcppages_bulk(struct zo batch_free = to_free; do { diff --git a/patches/mm-page_alloc-reduce-lock-sections-further.patch b/patches/mm-page_alloc-reduce-lock-sections-further.patch index cc1d09b..52527fa 100644 --- a/patches/mm-page_alloc-reduce-lock-sections-further.patch +++ b/patches/mm-page_alloc-reduce-lock-sections-further.patch @@ -157,7 +157,7 @@ Index: linux-3.4/mm/page_alloc.c } } -@@ -1301,8 +1331,15 @@ void free_hot_cold_page(struct page *pag +@@ -1302,8 +1332,15 @@ void free_hot_cold_page(struct page *pag list_add(&page->lru, &pcp->lists[migratetype]); pcp->count++; if (pcp->count >= pcp->high) { @@ -174,7 +174,7 @@ Index: linux-3.4/mm/page_alloc.c } out: -@@ -3873,12 +3910,14 @@ static int __zone_pcp_update(void *data) +@@ -3874,12 +3911,14 @@ static int __zone_pcp_update(void *data) for_each_possible_cpu(cpu) { struct per_cpu_pageset *pset; struct per_cpu_pages *pcp; diff --git a/patches/mm-protect-activate-switch-mm.patch b/patches/mm-protect-activate-switch-mm.patch index c56ee0d..fa18bfa 100644 --- a/patches/mm-protect-activate-switch-mm.patch +++ b/patches/mm-protect-activate-switch-mm.patch @@ -8,11 +8,11 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> mm/mmu_context.c | 2 ++ 2 files changed, 4 insertions(+) -Index: linux-3.2/fs/exec.c +Index: linux-3.4/fs/exec.c =================================================================== ---- linux-3.2.orig/fs/exec.c -+++ linux-3.2/fs/exec.c -@@ -837,10 +837,12 @@ static int exec_mmap(struct mm_struct *m +--- linux-3.4.orig/fs/exec.c ++++ linux-3.4/fs/exec.c +@@ -840,10 +840,12 @@ static int exec_mmap(struct mm_struct *m } } task_lock(tsk); @@ -25,10 +25,10 @@ Index: linux-3.2/fs/exec.c task_unlock(tsk); arch_pick_mmap_layout(mm); if (old_mm) { -Index: linux-3.2/mm/mmu_context.c +Index: linux-3.4/mm/mmu_context.c =================================================================== ---- linux-3.2.orig/mm/mmu_context.c -+++ linux-3.2/mm/mmu_context.c +--- linux-3.4.orig/mm/mmu_context.c ++++ linux-3.4/mm/mmu_context.c @@ -26,6 +26,7 @@ void use_mm(struct mm_struct *mm) struct task_struct *tsk = current; diff --git a/patches/mm-slab-more-lock-breaks.patch b/patches/mm-slab-more-lock-breaks.patch index e3356f4..3eb1a6e 100644 --- a/patches/mm-slab-more-lock-breaks.patch +++ b/patches/mm-slab-more-lock-breaks.patch @@ -12,11 +12,11 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> mm/slab.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 68 insertions(+), 22 deletions(-) -Index: linux-3.2/mm/slab.c +Index: linux-3.4/mm/slab.c =================================================================== ---- linux-3.2.orig/mm/slab.c -+++ linux-3.2/mm/slab.c -@@ -723,6 +723,7 @@ static void slab_set_debugobj_lock_class +--- linux-3.4.orig/mm/slab.c ++++ linux-3.4/mm/slab.c +@@ -727,6 +727,7 @@ static void slab_set_debugobj_lock_class #endif static DEFINE_PER_CPU(struct delayed_work, slab_reap_work); @@ -24,7 +24,7 @@ Index: linux-3.2/mm/slab.c static DEFINE_LOCAL_IRQ_LOCK(slab_lock); #ifndef CONFIG_PREEMPT_RT_BASE -@@ -738,14 +739,39 @@ slab_on_each_cpu(void (*func)(void *arg, +@@ -742,14 +743,39 @@ slab_on_each_cpu(void (*func)(void *arg, { unsigned int i; @@ -68,7 +68,7 @@ Index: linux-3.2/mm/slab.c static inline struct array_cache *cpu_cache_get(struct kmem_cache *cachep) { return cachep->array[smp_processor_id()]; -@@ -1230,7 +1256,7 @@ static void __cpuinit cpuup_canceled(lon +@@ -1245,7 +1271,7 @@ static void __cpuinit cpuup_canceled(lon free_block(cachep, nc->entry, nc->avail, node); if (!cpumask_empty(mask)) { @@ -77,7 +77,7 @@ Index: linux-3.2/mm/slab.c goto free_array_cache; } -@@ -1244,7 +1270,7 @@ static void __cpuinit cpuup_canceled(lon +@@ -1259,7 +1285,7 @@ static void __cpuinit cpuup_canceled(lon alien = l3->alien; l3->alien = NULL; @@ -86,7 +86,7 @@ Index: linux-3.2/mm/slab.c kfree(shared); if (alien) { -@@ -1525,6 +1551,8 @@ void __init kmem_cache_init(void) +@@ -1540,6 +1566,8 @@ void __init kmem_cache_init(void) use_alien_caches = 0; local_irq_lock_init(slab_lock); @@ -95,7 +95,7 @@ Index: linux-3.2/mm/slab.c for (i = 0; i < NUM_INIT_LISTS; i++) { kmem_list3_init(&initkmem_list3[i]); -@@ -1803,12 +1831,14 @@ static void *kmem_getpages(struct kmem_c +@@ -1868,12 +1896,14 @@ static void *kmem_getpages(struct kmem_c /* * Interface to system's page release. */ @@ -112,7 +112,7 @@ Index: linux-3.2/mm/slab.c kmemcheck_free_shadow(page, cachep->gfporder); if (cachep->flags & SLAB_RECLAIM_ACCOUNT) -@@ -1824,7 +1854,13 @@ static void kmem_freepages(struct kmem_c +@@ -1889,7 +1919,13 @@ static void kmem_freepages(struct kmem_c } if (current->reclaim_state) current->reclaim_state->reclaimed_slab += nr_freed; @@ -127,7 +127,7 @@ Index: linux-3.2/mm/slab.c } static void kmem_rcu_free(struct rcu_head *head) -@@ -1832,7 +1868,7 @@ static void kmem_rcu_free(struct rcu_hea +@@ -1897,7 +1933,7 @@ static void kmem_rcu_free(struct rcu_hea struct slab_rcu *slab_rcu = (struct slab_rcu *)head; struct kmem_cache *cachep = slab_rcu->cachep; @@ -136,7 +136,7 @@ Index: linux-3.2/mm/slab.c if (OFF_SLAB(cachep)) kmem_cache_free(cachep->slabp_cache, slab_rcu); } -@@ -2051,7 +2087,8 @@ static void slab_destroy_debugcheck(stru +@@ -2116,7 +2152,8 @@ static void slab_destroy_debugcheck(stru * Before calling the slab must have been unlinked from the cache. The * cache-lock is not held/needed. */ @@ -146,7 +146,7 @@ Index: linux-3.2/mm/slab.c { void *addr = slabp->s_mem - slabp->colouroff; -@@ -2064,7 +2101,7 @@ static void slab_destroy(struct kmem_cac +@@ -2129,7 +2166,7 @@ static void slab_destroy(struct kmem_cac slab_rcu->addr = addr; call_rcu(&slab_rcu->head, kmem_rcu_free); } else { @@ -155,7 +155,7 @@ Index: linux-3.2/mm/slab.c if (OFF_SLAB(cachep)) kmem_cache_free(cachep->slabp_cache, slabp); } -@@ -2586,9 +2623,15 @@ static void do_drain(void *arg) +@@ -2651,9 +2688,15 @@ static void do_drain(void *arg) __do_drain(arg, smp_processor_id()); } #else @@ -173,7 +173,7 @@ Index: linux-3.2/mm/slab.c } #endif -@@ -2646,7 +2689,7 @@ static int drain_freelist(struct kmem_ca +@@ -2711,7 +2754,7 @@ static int drain_freelist(struct kmem_ca */ l3->free_objects -= cache->num; local_spin_unlock_irq(slab_lock, &l3->list_lock); @@ -182,7 +182,7 @@ Index: linux-3.2/mm/slab.c nr_freed++; } out: -@@ -2981,7 +3024,7 @@ static int cache_grow(struct kmem_cache +@@ -3046,7 +3089,7 @@ static int cache_grow(struct kmem_cache spin_unlock(&l3->list_lock); return 1; opps1: @@ -191,7 +191,7 @@ Index: linux-3.2/mm/slab.c failed: if (local_flags & __GFP_WAIT) local_lock_irq(slab_lock); -@@ -3631,7 +3674,7 @@ static void free_block(struct kmem_cache +@@ -3700,7 +3743,7 @@ static void free_block(struct kmem_cache * a different cache, refer to comments before * alloc_slabmgmt. */ @@ -200,7 +200,7 @@ Index: linux-3.2/mm/slab.c } else { list_add(&slabp->list, &l3->slabs_free); } -@@ -3899,7 +3942,7 @@ void kmem_cache_free(struct kmem_cache * +@@ -3967,7 +4010,7 @@ void kmem_cache_free(struct kmem_cache * debug_check_no_obj_freed(objp, obj_size(cachep)); local_lock_irqsave(slab_lock, flags); __cache_free(cachep, objp, __builtin_return_address(0)); @@ -209,7 +209,7 @@ Index: linux-3.2/mm/slab.c trace_kmem_cache_free(_RET_IP_, objp); } -@@ -3929,7 +3972,7 @@ void kfree(const void *objp) +@@ -3997,7 +4040,7 @@ void kfree(const void *objp) debug_check_no_obj_freed(objp, obj_size(c)); local_lock_irqsave(slab_lock, flags); __cache_free(c, (void *)objp, __builtin_return_address(0)); @@ -218,7 +218,7 @@ Index: linux-3.2/mm/slab.c } EXPORT_SYMBOL(kfree); -@@ -3985,7 +4028,8 @@ static int alloc_kmemlist(struct kmem_ca +@@ -4053,7 +4096,8 @@ static int alloc_kmemlist(struct kmem_ca } l3->free_limit = (1 + nr_cpus_node(node)) * cachep->batchcount + cachep->num; @@ -228,7 +228,7 @@ Index: linux-3.2/mm/slab.c kfree(shared); free_alien_cache(new_alien); continue; -@@ -4051,7 +4095,9 @@ static void do_ccupdate_local(void *info +@@ -4119,7 +4163,9 @@ static void do_ccupdate_local(void *info #else static void do_ccupdate_local(void *info, int cpu) { @@ -238,7 +238,7 @@ Index: linux-3.2/mm/slab.c } #endif -@@ -4093,8 +4139,8 @@ static int do_tune_cpucache(struct kmem_ +@@ -4161,8 +4207,8 @@ static int do_tune_cpucache(struct kmem_ local_spin_lock_irq(slab_lock, &cachep->nodelists[cpu_to_mem(i)]->list_lock); free_block(cachep, ccold->entry, ccold->avail, cpu_to_mem(i)); diff --git a/patches/mm-slab-move-debug-out.patch b/patches/mm-slab-move-debug-out.patch index 460e684..6071f1e 100644 --- a/patches/mm-slab-move-debug-out.patch +++ b/patches/mm-slab-move-debug-out.patch @@ -7,11 +7,11 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> mm/slab.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -Index: linux-3.2/mm/slab.c +Index: linux-3.4/mm/slab.c =================================================================== ---- linux-3.2.orig/mm/slab.c -+++ linux-3.2/mm/slab.c -@@ -3851,10 +3851,10 @@ void kmem_cache_free(struct kmem_cache * +--- linux-3.4.orig/mm/slab.c ++++ linux-3.4/mm/slab.c +@@ -3919,10 +3919,10 @@ void kmem_cache_free(struct kmem_cache * { unsigned long flags; @@ -23,7 +23,7 @@ Index: linux-3.2/mm/slab.c __cache_free(cachep, objp, __builtin_return_address(0)); local_irq_restore(flags); -@@ -3880,11 +3880,11 @@ void kfree(const void *objp) +@@ -3948,11 +3948,11 @@ void kfree(const void *objp) if (unlikely(ZERO_OR_NULL_PTR(objp))) return; diff --git a/patches/mm-slab-wrap-functions.patch b/patches/mm-slab-wrap-functions.patch index 96b6800..6392b20 100644 --- a/patches/mm-slab-wrap-functions.patch +++ b/patches/mm-slab-wrap-functions.patch @@ -7,10 +7,10 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> mm/slab.c | 152 ++++++++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 104 insertions(+), 48 deletions(-) -Index: linux-3.2/mm/slab.c +Index: linux-3.4/mm/slab.c =================================================================== ---- linux-3.2.orig/mm/slab.c -+++ linux-3.2/mm/slab.c +--- linux-3.4.orig/mm/slab.c ++++ linux-3.4/mm/slab.c @@ -116,6 +116,7 @@ #include <linux/kmemcheck.h> #include <linux/memory.h> @@ -19,7 +19,7 @@ Index: linux-3.2/mm/slab.c #include <asm/cacheflush.h> #include <asm/tlbflush.h> -@@ -722,12 +723,40 @@ static void slab_set_debugobj_lock_class +@@ -726,12 +727,40 @@ static void slab_set_debugobj_lock_class #endif static DEFINE_PER_CPU(struct delayed_work, slab_reap_work); @@ -60,7 +60,7 @@ Index: linux-3.2/mm/slab.c static inline struct kmem_cache *__find_general_cachep(size_t size, gfp_t gfpflags) { -@@ -1065,9 +1094,10 @@ static void reap_alien(struct kmem_cache +@@ -1080,9 +1109,10 @@ static void reap_alien(struct kmem_cache if (l3->alien) { struct array_cache *ac = l3->alien[node]; @@ -73,7 +73,7 @@ Index: linux-3.2/mm/slab.c } } } -@@ -1082,9 +1112,9 @@ static void drain_alien_cache(struct kme +@@ -1097,9 +1127,9 @@ static void drain_alien_cache(struct kme for_each_online_node(i) { ac = alien[i]; if (ac) { @@ -85,7 +85,7 @@ Index: linux-3.2/mm/slab.c } } } -@@ -1163,11 +1193,11 @@ static int init_cache_nodelists_node(int +@@ -1178,11 +1208,11 @@ static int init_cache_nodelists_node(int cachep->nodelists[node] = l3; } @@ -99,7 +99,7 @@ Index: linux-3.2/mm/slab.c } return 0; } -@@ -1192,7 +1222,7 @@ static void __cpuinit cpuup_canceled(lon +@@ -1207,7 +1237,7 @@ static void __cpuinit cpuup_canceled(lon if (!l3) goto free_array_cache; @@ -108,7 +108,7 @@ Index: linux-3.2/mm/slab.c /* Free limit for this kmem_list3 */ l3->free_limit -= cachep->batchcount; -@@ -1200,7 +1230,7 @@ static void __cpuinit cpuup_canceled(lon +@@ -1215,7 +1245,7 @@ static void __cpuinit cpuup_canceled(lon free_block(cachep, nc->entry, nc->avail, node); if (!cpumask_empty(mask)) { @@ -117,7 +117,7 @@ Index: linux-3.2/mm/slab.c goto free_array_cache; } -@@ -1214,7 +1244,7 @@ static void __cpuinit cpuup_canceled(lon +@@ -1229,7 +1259,7 @@ static void __cpuinit cpuup_canceled(lon alien = l3->alien; l3->alien = NULL; @@ -126,7 +126,7 @@ Index: linux-3.2/mm/slab.c kfree(shared); if (alien) { -@@ -1288,7 +1318,7 @@ static int __cpuinit cpuup_prepare(long +@@ -1303,7 +1333,7 @@ static int __cpuinit cpuup_prepare(long l3 = cachep->nodelists[node]; BUG_ON(!l3); @@ -135,7 +135,7 @@ Index: linux-3.2/mm/slab.c if (!l3->shared) { /* * We are serialised from CPU_DEAD or -@@ -1303,7 +1333,7 @@ static int __cpuinit cpuup_prepare(long +@@ -1318,7 +1348,7 @@ static int __cpuinit cpuup_prepare(long alien = NULL; } #endif @@ -144,7 +144,7 @@ Index: linux-3.2/mm/slab.c kfree(shared); free_alien_cache(alien); if (cachep->flags & SLAB_DEBUG_OBJECTS) -@@ -1494,6 +1524,8 @@ void __init kmem_cache_init(void) +@@ -1509,6 +1539,8 @@ void __init kmem_cache_init(void) if (num_possible_nodes() == 1) use_alien_caches = 0; @@ -153,7 +153,7 @@ Index: linux-3.2/mm/slab.c for (i = 0; i < NUM_INIT_LISTS; i++) { kmem_list3_init(&initkmem_list3[i]); if (i < MAX_NUMNODES) -@@ -2500,7 +2532,7 @@ EXPORT_SYMBOL(kmem_cache_create); +@@ -2565,7 +2597,7 @@ EXPORT_SYMBOL(kmem_cache_create); #if DEBUG static void check_irq_off(void) { @@ -162,7 +162,7 @@ Index: linux-3.2/mm/slab.c } static void check_irq_on(void) -@@ -2535,13 +2567,12 @@ static void drain_array(struct kmem_cach +@@ -2600,13 +2632,12 @@ static void drain_array(struct kmem_cach struct array_cache *ac, int force, int node); @@ -178,7 +178,7 @@ Index: linux-3.2/mm/slab.c ac = cpu_cache_get(cachep); spin_lock(&cachep->nodelists[node]->list_lock); free_block(cachep, ac->entry, ac->avail, node); -@@ -2549,12 +2580,24 @@ static void do_drain(void *arg) +@@ -2614,12 +2645,24 @@ static void do_drain(void *arg) ac->avail = 0; } @@ -204,7 +204,7 @@ Index: linux-3.2/mm/slab.c check_irq_on(); for_each_online_node(node) { l3 = cachep->nodelists[node]; -@@ -2585,10 +2628,10 @@ static int drain_freelist(struct kmem_ca +@@ -2650,10 +2693,10 @@ static int drain_freelist(struct kmem_ca nr_freed = 0; while (nr_freed < tofree && !list_empty(&l3->slabs_free)) { @@ -217,7 +217,7 @@ Index: linux-3.2/mm/slab.c goto out; } -@@ -2602,7 +2645,7 @@ static int drain_freelist(struct kmem_ca +@@ -2667,7 +2710,7 @@ static int drain_freelist(struct kmem_ca * to the cache. */ l3->free_objects -= cache->num; @@ -226,7 +226,7 @@ Index: linux-3.2/mm/slab.c slab_destroy(cache, slabp); nr_freed++; } -@@ -2897,7 +2940,7 @@ static int cache_grow(struct kmem_cache +@@ -2962,7 +3005,7 @@ static int cache_grow(struct kmem_cache offset *= cachep->colour_off; if (local_flags & __GFP_WAIT) @@ -235,7 +235,7 @@ Index: linux-3.2/mm/slab.c /* * The test for missing atomic flag is performed here, rather than -@@ -2927,7 +2970,7 @@ static int cache_grow(struct kmem_cache +@@ -2992,7 +3035,7 @@ static int cache_grow(struct kmem_cache cache_init_objs(cachep, slabp); if (local_flags & __GFP_WAIT) @@ -244,7 +244,7 @@ Index: linux-3.2/mm/slab.c check_irq_off(); spin_lock(&l3->list_lock); -@@ -2941,7 +2984,7 @@ opps1: +@@ -3006,7 +3049,7 @@ opps1: kmem_freepages(cachep, objp); failed: if (local_flags & __GFP_WAIT) @@ -253,7 +253,7 @@ Index: linux-3.2/mm/slab.c return 0; } -@@ -3333,11 +3376,11 @@ retry: +@@ -3400,11 +3443,11 @@ retry: * set and go into memory reserves if necessary. */ if (local_flags & __GFP_WAIT) @@ -267,7 +267,7 @@ Index: linux-3.2/mm/slab.c if (obj) { /* * Insert into the appropriate per node queues -@@ -3453,7 +3496,7 @@ __cache_alloc_node(struct kmem_cache *ca +@@ -3522,7 +3565,7 @@ __cache_alloc_node(struct kmem_cache *ca return NULL; cache_alloc_debugcheck_before(cachep, flags); @@ -276,7 +276,7 @@ Index: linux-3.2/mm/slab.c if (nodeid == NUMA_NO_NODE) nodeid = slab_node; -@@ -3478,7 +3521,7 @@ __cache_alloc_node(struct kmem_cache *ca +@@ -3547,7 +3590,7 @@ __cache_alloc_node(struct kmem_cache *ca /* ___cache_alloc_node can fall back to other nodes */ ptr = ____cache_alloc_node(cachep, flags, nodeid); out: @@ -285,7 +285,7 @@ Index: linux-3.2/mm/slab.c ptr = cache_alloc_debugcheck_after(cachep, flags, ptr, caller); kmemleak_alloc_recursive(ptr, obj_size(cachep), 1, cachep->flags, flags); -@@ -3538,9 +3581,9 @@ __cache_alloc(struct kmem_cache *cachep, +@@ -3607,9 +3650,9 @@ __cache_alloc(struct kmem_cache *cachep, return NULL; cache_alloc_debugcheck_before(cachep, flags); @@ -297,7 +297,7 @@ Index: linux-3.2/mm/slab.c objp = cache_alloc_debugcheck_after(cachep, flags, objp, caller); kmemleak_alloc_recursive(objp, obj_size(cachep), 1, cachep->flags, flags); -@@ -3854,9 +3897,9 @@ void kmem_cache_free(struct kmem_cache * +@@ -3922,9 +3965,9 @@ void kmem_cache_free(struct kmem_cache * debug_check_no_locks_freed(objp, obj_size(cachep)); if (!(cachep->flags & SLAB_DEBUG_OBJECTS)) debug_check_no_obj_freed(objp, obj_size(cachep)); @@ -309,7 +309,7 @@ Index: linux-3.2/mm/slab.c trace_kmem_cache_free(_RET_IP_, objp); } -@@ -3884,9 +3927,9 @@ void kfree(const void *objp) +@@ -3952,9 +3995,9 @@ void kfree(const void *objp) c = virt_to_cache(objp); debug_check_no_locks_freed(objp, obj_size(c)); debug_check_no_obj_freed(objp, obj_size(c)); @@ -321,7 +321,7 @@ Index: linux-3.2/mm/slab.c } EXPORT_SYMBOL(kfree); -@@ -3929,7 +3972,7 @@ static int alloc_kmemlist(struct kmem_ca +@@ -3997,7 +4040,7 @@ static int alloc_kmemlist(struct kmem_ca if (l3) { struct array_cache *shared = l3->shared; @@ -330,7 +330,7 @@ Index: linux-3.2/mm/slab.c if (shared) free_block(cachep, shared->entry, -@@ -3942,7 +3985,7 @@ static int alloc_kmemlist(struct kmem_ca +@@ -4010,7 +4053,7 @@ static int alloc_kmemlist(struct kmem_ca } l3->free_limit = (1 + nr_cpus_node(node)) * cachep->batchcount + cachep->num; @@ -339,7 +339,7 @@ Index: linux-3.2/mm/slab.c kfree(shared); free_alien_cache(new_alien); continue; -@@ -3989,17 +4032,28 @@ struct ccupdate_struct { +@@ -4057,17 +4100,28 @@ struct ccupdate_struct { struct array_cache *new[0]; }; @@ -373,7 +373,7 @@ Index: linux-3.2/mm/slab.c /* Always called with the cache_chain_mutex held */ static int do_tune_cpucache(struct kmem_cache *cachep, int limit, -@@ -4025,7 +4079,7 @@ static int do_tune_cpucache(struct kmem_ +@@ -4093,7 +4147,7 @@ static int do_tune_cpucache(struct kmem_ } new->cachep = cachep; @@ -382,7 +382,7 @@ Index: linux-3.2/mm/slab.c check_irq_on(); cachep->batchcount = batchcount; -@@ -4036,9 +4090,11 @@ static int do_tune_cpucache(struct kmem_ +@@ -4104,9 +4158,11 @@ static int do_tune_cpucache(struct kmem_ struct array_cache *ccold = new->new[i]; if (!ccold) continue; @@ -396,7 +396,7 @@ Index: linux-3.2/mm/slab.c kfree(ccold); } kfree(new); -@@ -4114,7 +4170,7 @@ static void drain_array(struct kmem_cach +@@ -4182,7 +4238,7 @@ static void drain_array(struct kmem_cach if (ac->touched && !force) { ac->touched = 0; } else { @@ -405,7 +405,7 @@ Index: linux-3.2/mm/slab.c if (ac->avail) { tofree = force ? ac->avail : (ac->limit + 4) / 5; if (tofree > ac->avail) -@@ -4124,7 +4180,7 @@ static void drain_array(struct kmem_cach +@@ -4192,7 +4248,7 @@ static void drain_array(struct kmem_cach memmove(ac->entry, &(ac->entry[tofree]), sizeof(void *) * ac->avail); } @@ -414,7 +414,7 @@ Index: linux-3.2/mm/slab.c } } -@@ -4263,7 +4319,7 @@ static int s_show(struct seq_file *m, vo +@@ -4331,7 +4387,7 @@ static int s_show(struct seq_file *m, vo continue; check_irq_on(); @@ -423,7 +423,7 @@ Index: linux-3.2/mm/slab.c list_for_each_entry(slabp, &l3->slabs_full, list) { if (slabp->inuse != cachep->num && !error) -@@ -4288,7 +4344,7 @@ static int s_show(struct seq_file *m, vo +@@ -4356,7 +4412,7 @@ static int s_show(struct seq_file *m, vo if (l3->shared) shared_avail += l3->shared->avail; @@ -432,7 +432,7 @@ Index: linux-3.2/mm/slab.c } num_slabs += active_slabs; num_objs = num_slabs * cachep->num; -@@ -4517,13 +4573,13 @@ static int leaks_show(struct seq_file *m +@@ -4585,13 +4641,13 @@ static int leaks_show(struct seq_file *m continue; check_irq_on(); diff --git a/patches/mm-vmalloc-use-get-cpu-light.patch b/patches/mm-vmalloc-use-get-cpu-light.patch index 0912bd9..82c485e 100644 --- a/patches/mm-vmalloc-use-get-cpu-light.patch +++ b/patches/mm-vmalloc-use-get-cpu-light.patch @@ -7,10 +7,10 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> mm/vmalloc.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) -Index: linux-3.2/mm/vmalloc.c +Index: linux-3.4/mm/vmalloc.c =================================================================== ---- linux-3.2.orig/mm/vmalloc.c -+++ linux-3.2/mm/vmalloc.c +--- linux-3.4.orig/mm/vmalloc.c ++++ linux-3.4/mm/vmalloc.c @@ -782,7 +782,7 @@ static struct vmap_block *new_vmap_block struct vmap_block *vb; struct vmap_area *va; diff --git a/patches/mutex-no-spin-on-rt.patch b/patches/mutex-no-spin-on-rt.patch index 4c8f452..1af4bb4 100644 --- a/patches/mutex-no-spin-on-rt.patch +++ b/patches/mutex-no-spin-on-rt.patch @@ -7,10 +7,10 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/Kconfig.locks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux-3.2/kernel/Kconfig.locks +Index: linux-3.4/kernel/Kconfig.locks =================================================================== ---- linux-3.2.orig/kernel/Kconfig.locks -+++ linux-3.2/kernel/Kconfig.locks +--- linux-3.4.orig/kernel/Kconfig.locks ++++ linux-3.4/kernel/Kconfig.locks @@ -199,4 +199,4 @@ config INLINE_WRITE_UNLOCK_IRQRESTORE def_bool !DEBUG_SPINLOCK && ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE diff --git a/patches/net-netif_rx_ni-migrate-disable.patch b/patches/net-netif_rx_ni-migrate-disable.patch index b0e77c0..007147d 100644 --- a/patches/net-netif_rx_ni-migrate-disable.patch +++ b/patches/net-netif_rx_ni-migrate-disable.patch @@ -7,11 +7,11 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> net/core/dev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -Index: linux-3.2/net/core/dev.c +Index: linux-3.4/net/core/dev.c =================================================================== ---- linux-3.2.orig/net/core/dev.c -+++ linux-3.2/net/core/dev.c -@@ -3034,11 +3034,11 @@ int netif_rx_ni(struct sk_buff *skb) +--- linux-3.4.orig/net/core/dev.c ++++ linux-3.4/net/core/dev.c +@@ -2986,11 +2986,11 @@ int netif_rx_ni(struct sk_buff *skb) { int err; diff --git a/patches/net-tx-action-avoid-livelock-on-rt.patch b/patches/net-tx-action-avoid-livelock-on-rt.patch index a556e42..5219bfd 100644 --- a/patches/net-tx-action-avoid-livelock-on-rt.patch +++ b/patches/net-tx-action-avoid-livelock-on-rt.patch @@ -42,11 +42,11 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> net/core/dev.c | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) -Index: linux-3.2/net/core/dev.c +Index: linux-3.4/net/core/dev.c =================================================================== ---- linux-3.2.orig/net/core/dev.c -+++ linux-3.2/net/core/dev.c -@@ -3044,6 +3044,36 @@ int netif_rx_ni(struct sk_buff *skb) +--- linux-3.4.orig/net/core/dev.c ++++ linux-3.4/net/core/dev.c +@@ -2996,6 +2996,36 @@ int netif_rx_ni(struct sk_buff *skb) } EXPORT_SYMBOL(netif_rx_ni); @@ -83,7 +83,7 @@ Index: linux-3.2/net/core/dev.c static void net_tx_action(struct softirq_action *h) { struct softnet_data *sd = &__get_cpu_var(softnet_data); -@@ -3082,7 +3112,7 @@ static void net_tx_action(struct softirq +@@ -3034,7 +3064,7 @@ static void net_tx_action(struct softirq head = head->next_sched; root_lock = qdisc_lock(q); diff --git a/patches/net-wireless-warn-nort.patch b/patches/net-wireless-warn-nort.patch index dc5d087..ef38c04 100644 --- a/patches/net-wireless-warn-nort.patch +++ b/patches/net-wireless-warn-nort.patch @@ -7,11 +7,11 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> net/mac80211/rx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux-3.2/net/mac80211/rx.c +Index: linux-3.4/net/mac80211/rx.c =================================================================== ---- linux-3.2.orig/net/mac80211/rx.c -+++ linux-3.2/net/mac80211/rx.c -@@ -2958,7 +2958,7 @@ void ieee80211_rx(struct ieee80211_hw *h +--- linux-3.4.orig/net/mac80211/rx.c ++++ linux-3.4/net/mac80211/rx.c +@@ -3015,7 +3015,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/perf-move-irq-work-to-softirq-in-rt.patch b/patches/perf-move-irq-work-to-softirq-in-rt.patch index 1c47ac9..982fb01 100644 --- a/patches/perf-move-irq-work-to-softirq-in-rt.patch +++ b/patches/perf-move-irq-work-to-softirq-in-rt.patch @@ -30,7 +30,7 @@ Index: linux-3.4/kernel/irq_work.c =================================================================== --- linux-3.4.orig/kernel/irq_work.c +++ linux-3.4/kernel/irq_work.c -@@ -105,8 +105,10 @@ void irq_work_run(void) +@@ -107,8 +107,10 @@ void irq_work_run(void) if (llist_empty(this_list)) return; diff --git a/patches/peter_zijlstra-frob-hrtimer.patch b/patches/peter_zijlstra-frob-hrtimer.patch index d188816..c9a8772 100644 --- a/patches/peter_zijlstra-frob-hrtimer.patch +++ b/patches/peter_zijlstra-frob-hrtimer.patch @@ -30,10 +30,10 @@ Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> kernel/hrtimer.c | 48 +++++++++++++++++++++++------------------------- 1 file changed, 23 insertions(+), 25 deletions(-) -Index: linux-3.2/kernel/hrtimer.c +Index: linux-3.4/kernel/hrtimer.c =================================================================== ---- linux-3.2.orig/kernel/hrtimer.c -+++ linux-3.2/kernel/hrtimer.c +--- linux-3.4.orig/kernel/hrtimer.c ++++ linux-3.4/kernel/hrtimer.c @@ -646,37 +646,24 @@ static inline int hrtimer_enqueue_reprog struct hrtimer_clock_base *base, int wakeup) diff --git a/patches/peter_zijlstra-frob-pagefault_disable.patch b/patches/peter_zijlstra-frob-pagefault_disable.patch index 9011dff..1f2d738 100644 --- a/patches/peter_zijlstra-frob-pagefault_disable.patch +++ b/patches/peter_zijlstra-frob-pagefault_disable.patch @@ -258,7 +258,7 @@ Index: linux-3.4/arch/sparc/mm/fault_32.c =================================================================== --- linux-3.4.orig/arch/sparc/mm/fault_32.c +++ linux-3.4/arch/sparc/mm/fault_32.c -@@ -246,7 +246,7 @@ asmlinkage void do_sparc_fault(struct pt +@@ -248,7 +248,7 @@ asmlinkage void do_sparc_fault(struct pt * If we're in an interrupt or have no user * context, we must not take the fault.. */ @@ -271,7 +271,7 @@ Index: linux-3.4/arch/sparc/mm/fault_64.c =================================================================== --- linux-3.4.orig/arch/sparc/mm/fault_64.c +++ linux-3.4/arch/sparc/mm/fault_64.c -@@ -322,7 +322,7 @@ asmlinkage void __kprobes do_sparc64_fau +@@ -323,7 +323,7 @@ asmlinkage void __kprobes do_sparc64_fau * If we're in an interrupt or have no user * context, we must not take the fault.. */ @@ -284,7 +284,7 @@ Index: linux-3.4/arch/tile/mm/fault.c =================================================================== --- linux-3.4.orig/arch/tile/mm/fault.c +++ linux-3.4/arch/tile/mm/fault.c -@@ -345,7 +345,7 @@ static int handle_page_fault(struct pt_r +@@ -355,7 +355,7 @@ static int handle_page_fault(struct pt_r * If we're in an interrupt, have no user context or are running in an * atomic region then we must not take the fault. */ diff --git a/patches/peter_zijlstra-frob-rcu.patch b/patches/peter_zijlstra-frob-rcu.patch index c6d7718..4b51fb7 100644 --- a/patches/peter_zijlstra-frob-rcu.patch +++ b/patches/peter_zijlstra-frob-rcu.patch @@ -153,11 +153,11 @@ Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> kernel/rcutree_plugin.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux-3.2/kernel/rcutree_plugin.h +Index: linux-3.4/kernel/rcutree_plugin.h =================================================================== ---- linux-3.2.orig/kernel/rcutree_plugin.h -+++ linux-3.2/kernel/rcutree_plugin.h -@@ -336,7 +336,7 @@ static noinline void rcu_read_unlock_spe +--- linux-3.4.orig/kernel/rcutree_plugin.h ++++ linux-3.4/kernel/rcutree_plugin.h +@@ -339,7 +339,7 @@ static noinline void rcu_read_unlock_spe } /* Hardware IRQ handlers cannot block. */ diff --git a/patches/pid-h-include-atomic-h.patch b/patches/pid-h-include-atomic-h.patch index 05c1f2f..324444e 100644 --- a/patches/pid-h-include-atomic-h.patch +++ b/patches/pid-h-include-atomic-h.patch @@ -7,10 +7,10 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> include/linux/pid.h | 1 + 1 file changed, 1 insertion(+) -Index: linux-3.2/include/linux/pid.h +Index: linux-3.4/include/linux/pid.h =================================================================== ---- linux-3.2.orig/include/linux/pid.h -+++ linux-3.2/include/linux/pid.h +--- linux-3.4.orig/include/linux/pid.h ++++ linux-3.4/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 b78f790..78b8922 100644 --- a/patches/ping-sysrq.patch +++ b/patches/ping-sysrq.patch @@ -18,10 +18,10 @@ 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-3.2/Documentation/sysrq.txt +Index: linux-3.4/Documentation/sysrq.txt =================================================================== ---- linux-3.2.orig/Documentation/sysrq.txt -+++ linux-3.2/Documentation/sysrq.txt +--- linux-3.4.orig/Documentation/sysrq.txt ++++ linux-3.4/Documentation/sysrq.txt @@ -57,10 +57,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 +42,10 @@ Index: linux-3.2/Documentation/sysrq.txt * What are the 'command' keys? ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 'b' - Will immediately reboot the system without syncing or unmounting -Index: linux-3.2/include/net/netns/ipv4.h +Index: linux-3.4/include/net/netns/ipv4.h =================================================================== ---- linux-3.2.orig/include/net/netns/ipv4.h -+++ linux-3.2/include/net/netns/ipv4.h +--- linux-3.4.orig/include/net/netns/ipv4.h ++++ linux-3.4/include/net/netns/ipv4.h @@ -47,6 +47,7 @@ struct netns_ipv4 { int sysctl_icmp_echo_ignore_all; @@ -54,11 +54,11 @@ Index: linux-3.2/include/net/netns/ipv4.h int sysctl_icmp_ignore_bogus_error_responses; int sysctl_icmp_ratelimit; int sysctl_icmp_ratemask; -Index: linux-3.2/net/ipv4/icmp.c +Index: linux-3.4/net/ipv4/icmp.c =================================================================== ---- linux-3.2.orig/net/ipv4/icmp.c -+++ linux-3.2/net/ipv4/icmp.c -@@ -67,6 +67,7 @@ +--- linux-3.4.orig/net/ipv4/icmp.c ++++ linux-3.4/net/ipv4/icmp.c +@@ -69,6 +69,7 @@ #include <linux/jiffies.h> #include <linux/kernel.h> #include <linux/fcntl.h> @@ -66,7 +66,7 @@ Index: linux-3.2/net/ipv4/icmp.c #include <linux/socket.h> #include <linux/in.h> #include <linux/inet.h> -@@ -801,6 +802,30 @@ out_err: +@@ -799,6 +800,30 @@ out_err: } /* @@ -97,7 +97,7 @@ Index: linux-3.2/net/ipv4/icmp.c * Handle ICMP_ECHO ("ping") requests. * * RFC 1122: 3.2.2.6 MUST have an echo server that answers ICMP echo -@@ -827,6 +852,11 @@ static void icmp_echo(struct sk_buff *sk +@@ -825,6 +850,11 @@ static void icmp_echo(struct sk_buff *sk icmp_param.data_len = skb->len; icmp_param.head_len = sizeof(struct icmphdr); icmp_reply(&icmp_param, skb); @@ -109,11 +109,11 @@ Index: linux-3.2/net/ipv4/icmp.c } } -Index: linux-3.2/net/ipv4/sysctl_net_ipv4.c +Index: linux-3.4/net/ipv4/sysctl_net_ipv4.c =================================================================== ---- linux-3.2.orig/net/ipv4/sysctl_net_ipv4.c -+++ linux-3.2/net/ipv4/sysctl_net_ipv4.c -@@ -680,6 +680,13 @@ static struct ctl_table ipv4_net_table[] +--- linux-3.4.orig/net/ipv4/sysctl_net_ipv4.c ++++ linux-3.4/net/ipv4/sysctl_net_ipv4.c +@@ -718,6 +718,13 @@ static struct ctl_table ipv4_net_table[] .proc_handler = proc_dointvec }, { diff --git a/patches/posix-timers-avoid-wakeups-when-no-timers-are-active.patch b/patches/posix-timers-avoid-wakeups-when-no-timers-are-active.patch index 9ed6d77..fe24274 100644 --- a/patches/posix-timers-avoid-wakeups-when-no-timers-are-active.patch +++ b/patches/posix-timers-avoid-wakeups-when-no-timers-are-active.patch @@ -10,11 +10,11 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/posix-cpu-timers.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) -Index: linux-3.2/kernel/posix-cpu-timers.c +Index: linux-3.4/kernel/posix-cpu-timers.c =================================================================== ---- linux-3.2.orig/kernel/posix-cpu-timers.c -+++ linux-3.2/kernel/posix-cpu-timers.c -@@ -1436,6 +1436,21 @@ wait_to_die: +--- linux-3.4.orig/kernel/posix-cpu-timers.c ++++ linux-3.4/kernel/posix-cpu-timers.c +@@ -1408,6 +1408,21 @@ wait_to_die: return 0; } @@ -36,7 +36,7 @@ Index: linux-3.2/kernel/posix-cpu-timers.c void run_posix_cpu_timers(struct task_struct *tsk) { unsigned long cpu = smp_processor_id(); -@@ -1448,7 +1463,7 @@ void run_posix_cpu_timers(struct task_st +@@ -1420,7 +1435,7 @@ void run_posix_cpu_timers(struct task_st tasklist = per_cpu(posix_timer_tasklist, cpu); /* check to see if we're already queued */ @@ -45,7 +45,7 @@ Index: linux-3.2/kernel/posix-cpu-timers.c get_task_struct(tsk); if (tasklist) { tsk->posix_timer_list = tasklist; -@@ -1460,9 +1475,9 @@ void run_posix_cpu_timers(struct task_st +@@ -1432,9 +1447,9 @@ void run_posix_cpu_timers(struct task_st tsk->posix_timer_list = tsk; } per_cpu(posix_timer_tasklist, cpu) = tsk; diff --git a/patches/posix-timers-no-broadcast.patch b/patches/posix-timers-no-broadcast.patch index 54fedba..05286cb 100644 --- a/patches/posix-timers-no-broadcast.patch +++ b/patches/posix-timers-no-broadcast.patch @@ -11,10 +11,10 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/posix-timers.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -Index: linux-3.2/kernel/posix-timers.c +Index: linux-3.4/kernel/posix-timers.c =================================================================== ---- linux-3.2.orig/kernel/posix-timers.c -+++ linux-3.2/kernel/posix-timers.c +--- linux-3.4.orig/kernel/posix-timers.c ++++ linux-3.4/kernel/posix-timers.c @@ -439,6 +439,7 @@ static enum hrtimer_restart posix_timer_ static struct pid *good_sigevent(sigevent_t * event) { diff --git a/patches/posix-timers-shorten-cpu-timers-thread.patch b/patches/posix-timers-shorten-cpu-timers-thread.patch index e82289d..b837a1e 100644 --- a/patches/posix-timers-shorten-cpu-timers-thread.patch +++ b/patches/posix-timers-shorten-cpu-timers-thread.patch @@ -13,11 +13,11 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/posix-cpu-timers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux-3.2/kernel/posix-cpu-timers.c +Index: linux-3.4/kernel/posix-cpu-timers.c =================================================================== ---- linux-3.2.orig/kernel/posix-cpu-timers.c -+++ linux-3.2/kernel/posix-cpu-timers.c -@@ -1479,7 +1479,7 @@ static int posix_cpu_thread_call(struct +--- linux-3.4.orig/kernel/posix-cpu-timers.c ++++ linux-3.4/kernel/posix-cpu-timers.c +@@ -1451,7 +1451,7 @@ static int posix_cpu_thread_call(struct switch (action) { case CPU_UP_PREPARE: p = kthread_create(posix_cpu_timers_thread, hcpu, diff --git a/patches/power-disable-highmem-on-rt.patch b/patches/power-disable-highmem-on-rt.patch index 9234b14..bca5ebb 100644 --- a/patches/power-disable-highmem-on-rt.patch +++ b/patches/power-disable-highmem-on-rt.patch @@ -7,11 +7,11 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> arch/powerpc/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux-3.2/arch/powerpc/Kconfig +Index: linux-3.4/arch/powerpc/Kconfig =================================================================== ---- linux-3.2.orig/arch/powerpc/Kconfig -+++ linux-3.2/arch/powerpc/Kconfig -@@ -276,7 +276,7 @@ menu "Kernel options" +--- linux-3.4.orig/arch/powerpc/Kconfig ++++ linux-3.4/arch/powerpc/Kconfig +@@ -283,7 +283,7 @@ menu "Kernel options" config HIGHMEM bool "High memory support" diff --git a/patches/power-use-generic-rwsem-on-rt.patch b/patches/power-use-generic-rwsem-on-rt.patch index 6b887ae..8477131 100644 --- a/patches/power-use-generic-rwsem-on-rt.patch +++ b/patches/power-use-generic-rwsem-on-rt.patch @@ -4,10 +4,10 @@ From: Thomas Gleixner <tglx@linutronix.de> arch/powerpc/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -Index: linux-3.2/arch/powerpc/Kconfig +Index: linux-3.4/arch/powerpc/Kconfig =================================================================== ---- linux-3.2.orig/arch/powerpc/Kconfig -+++ linux-3.2/arch/powerpc/Kconfig +--- linux-3.4.orig/arch/powerpc/Kconfig ++++ linux-3.4/arch/powerpc/Kconfig @@ -69,10 +69,11 @@ config LOCKDEP_SUPPORT config RWSEM_GENERIC_SPINLOCK diff --git a/patches/preempt-rt-allow-immediate-magic-sysrq-output-for-preempt_rt_full.patch b/patches/preempt-rt-allow-immediate-magic-sysrq-output-for-preempt_rt_full.patch index 72c0156..e7aa946 100644 --- a/patches/preempt-rt-allow-immediate-magic-sysrq-output-for-preempt_rt_full.patch +++ b/patches/preempt-rt-allow-immediate-magic-sysrq-output-for-preempt_rt_full.patch @@ -27,10 +27,10 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> lib/Kconfig.debug | 22 ++++++++++++++++++++++ 5 files changed, 54 insertions(+), 3 deletions(-) -Index: linux-3.2/drivers/tty/serial/cpm_uart/cpm_uart_core.c +Index: linux-3.4/drivers/tty/serial/cpm_uart/cpm_uart_core.c =================================================================== ---- linux-3.2.orig/drivers/tty/serial/cpm_uart/cpm_uart_core.c -+++ linux-3.2/drivers/tty/serial/cpm_uart/cpm_uart_core.c +--- linux-3.4.orig/drivers/tty/serial/cpm_uart/cpm_uart_core.c ++++ linux-3.4/drivers/tty/serial/cpm_uart/cpm_uart_core.c @@ -1226,7 +1226,7 @@ static void cpm_uart_console_write(struc { struct uart_cpm_port *pinfo = &cpm_uart_ports[co->index]; @@ -40,11 +40,11 @@ Index: linux-3.2/drivers/tty/serial/cpm_uart/cpm_uart_core.c if (unlikely(nolock)) { local_irq_save(flags); -Index: linux-3.2/drivers/tty/sysrq.c +Index: linux-3.4/drivers/tty/sysrq.c =================================================================== ---- linux-3.2.orig/drivers/tty/sysrq.c -+++ linux-3.2/drivers/tty/sysrq.c -@@ -492,6 +492,23 @@ static void __sysrq_put_key_op(int key, +--- linux-3.4.orig/drivers/tty/sysrq.c ++++ linux-3.4/drivers/tty/sysrq.c +@@ -495,6 +495,23 @@ static void __sysrq_put_key_op(int key, sysrq_key_table[i] = op_p; } @@ -68,7 +68,7 @@ Index: linux-3.2/drivers/tty/sysrq.c void __handle_sysrq(int key, bool check_mask) { struct sysrq_key_op *op_p; -@@ -500,6 +517,9 @@ void __handle_sysrq(int key, bool check_ +@@ -503,6 +520,9 @@ void __handle_sysrq(int key, bool check_ unsigned long flags; spin_lock_irqsave(&sysrq_key_table_lock, flags); @@ -78,7 +78,7 @@ Index: linux-3.2/drivers/tty/sysrq.c /* * Raise the apparent loglevel to maximum so that the sysrq header * is shown to provide the user with positive feedback. We do not -@@ -541,6 +561,9 @@ void __handle_sysrq(int key, bool check_ +@@ -544,6 +564,9 @@ void __handle_sysrq(int key, bool check_ printk("\n"); console_loglevel = orig_log_level; } @@ -88,10 +88,10 @@ Index: linux-3.2/drivers/tty/sysrq.c spin_unlock_irqrestore(&sysrq_key_table_lock, flags); } -Index: linux-3.2/include/linux/sysrq.h +Index: linux-3.4/include/linux/sysrq.h =================================================================== ---- linux-3.2.orig/include/linux/sysrq.h -+++ linux-3.2/include/linux/sysrq.h +--- linux-3.4.orig/include/linux/sysrq.h ++++ linux-3.4/include/linux/sysrq.h @@ -38,6 +38,11 @@ struct sysrq_key_op { int enable_mask; }; @@ -104,10 +104,10 @@ Index: linux-3.2/include/linux/sysrq.h #ifdef CONFIG_MAGIC_SYSRQ /* Generic SysRq interface -- you may call it from any device driver, supplying -Index: linux-3.2/kernel/printk.c +Index: linux-3.4/kernel/printk.c =================================================================== ---- linux-3.2.orig/kernel/printk.c -+++ linux-3.2/kernel/printk.c +--- linux-3.4.orig/kernel/printk.c ++++ linux-3.4/kernel/printk.c @@ -21,6 +21,7 @@ #include <linux/tty.h> #include <linux/tty_driver.h> @@ -116,7 +116,7 @@ Index: linux-3.2/kernel/printk.c #include <linux/init.h> #include <linux/jiffies.h> #include <linux/nmi.h> -@@ -834,8 +835,8 @@ static int console_trylock_for_printk(un +@@ -846,8 +847,8 @@ static int console_trylock_for_printk(un { int retval = 0, wake = 0; #ifdef CONFIG_PREEMPT_RT_FULL @@ -127,10 +127,10 @@ Index: linux-3.2/kernel/printk.c #else int lock = 1; #endif -Index: linux-3.2/lib/Kconfig.debug +Index: linux-3.4/lib/Kconfig.debug =================================================================== ---- linux-3.2.orig/lib/Kconfig.debug -+++ linux-3.2/lib/Kconfig.debug +--- linux-3.4.orig/lib/Kconfig.debug ++++ linux-3.4/lib/Kconfig.debug @@ -62,6 +62,28 @@ config MAGIC_SYSRQ keys are documented in <file:Documentation/sysrq.txt>. Don't say Y unless you really know what this hack does. diff --git a/patches/rcu-fix-macro-substitution.patch b/patches/rcu-fix-macro-substitution.patch index 9714893..0d91977 100644 --- a/patches/rcu-fix-macro-substitution.patch +++ b/patches/rcu-fix-macro-substitution.patch @@ -20,10 +20,10 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> include/linux/rcutree.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux-3.2/include/linux/rcutree.h +Index: linux-3.4/include/linux/rcutree.h =================================================================== ---- linux-3.2.orig/include/linux/rcutree.h -+++ linux-3.2/include/linux/rcutree.h +--- linux-3.4.orig/include/linux/rcutree.h ++++ linux-3.4/include/linux/rcutree.h @@ -60,7 +60,7 @@ static inline void exit_rcu(void) #ifndef CONFIG_PREEMPT_RT_FULL extern void synchronize_rcu_bh(void); diff --git a/patches/rcu-force-preempt-rcu-for-rt.patch b/patches/rcu-force-preempt-rcu-for-rt.patch index eb56950..a18cc01 100644 --- a/patches/rcu-force-preempt-rcu-for-rt.patch +++ b/patches/rcu-force-preempt-rcu-for-rt.patch @@ -14,11 +14,11 @@ Link: http://lkml.kernel.org/n/tip-j1y0phicu6s6pu8guku2vca0@git.kernel.org init/Kconfig | 1 - 1 file changed, 1 deletion(-) -Index: linux-3.2/init/Kconfig +Index: linux-3.4/init/Kconfig =================================================================== ---- linux-3.2.orig/init/Kconfig -+++ linux-3.2/init/Kconfig -@@ -731,7 +731,6 @@ config RT_GROUP_SCHED +--- linux-3.4.orig/init/Kconfig ++++ linux-3.4/init/Kconfig +@@ -746,7 +746,6 @@ config RT_GROUP_SCHED bool "Group scheduling for SCHED_RR/FIFO" depends on EXPERIMENTAL depends on CGROUP_SCHED 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 6c03e67..b7d1ffd 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 @@ -215,7 +215,7 @@ Index: linux-3.4/kernel/rcutree.c /* * Record the number of times rcutorture tests have been initiated and -@@ -1885,6 +1889,7 @@ void call_rcu_sched(struct rcu_head *hea +@@ -1884,6 +1888,7 @@ void call_rcu_sched(struct rcu_head *hea } EXPORT_SYMBOL_GPL(call_rcu_sched); @@ -223,7 +223,7 @@ Index: linux-3.4/kernel/rcutree.c /* * Queue an RCU callback for invocation after a quicker grace period. */ -@@ -1893,6 +1898,7 @@ void call_rcu_bh(struct rcu_head *head, +@@ -1892,6 +1897,7 @@ void call_rcu_bh(struct rcu_head *head, __call_rcu(head, func, &rcu_bh_state, 0); } EXPORT_SYMBOL_GPL(call_rcu_bh); @@ -231,7 +231,7 @@ Index: linux-3.4/kernel/rcutree.c /** * synchronize_sched - wait until an rcu-sched grace period has elapsed. -@@ -1929,6 +1935,7 @@ void synchronize_sched(void) +@@ -1928,6 +1934,7 @@ void synchronize_sched(void) } EXPORT_SYMBOL_GPL(synchronize_sched); @@ -239,7 +239,7 @@ Index: linux-3.4/kernel/rcutree.c /** * synchronize_rcu_bh - wait until an rcu_bh grace period has elapsed. * -@@ -1949,6 +1956,7 @@ void synchronize_rcu_bh(void) +@@ -1948,6 +1955,7 @@ void synchronize_rcu_bh(void) wait_rcu_gp(call_rcu_bh); } EXPORT_SYMBOL_GPL(synchronize_rcu_bh); @@ -247,7 +247,7 @@ Index: linux-3.4/kernel/rcutree.c static atomic_t sync_sched_expedited_started = ATOMIC_INIT(0); static atomic_t sync_sched_expedited_done = ATOMIC_INIT(0); -@@ -2224,6 +2232,7 @@ static void _rcu_barrier(struct rcu_stat +@@ -2223,6 +2231,7 @@ static void _rcu_barrier(struct rcu_stat mutex_unlock(&rcu_barrier_mutex); } @@ -255,7 +255,7 @@ Index: linux-3.4/kernel/rcutree.c /** * rcu_barrier_bh - Wait until all in-flight call_rcu_bh() callbacks complete. */ -@@ -2232,6 +2241,7 @@ void rcu_barrier_bh(void) +@@ -2231,6 +2240,7 @@ void rcu_barrier_bh(void) _rcu_barrier(&rcu_bh_state, call_rcu_bh); } EXPORT_SYMBOL_GPL(rcu_barrier_bh); diff --git a/patches/rcu-tiny-merge-bh.patch b/patches/rcu-tiny-merge-bh.patch index f3d8634..dda27f5 100644 --- a/patches/rcu-tiny-merge-bh.patch +++ b/patches/rcu-tiny-merge-bh.patch @@ -7,11 +7,11 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/rcutiny.c | 2 ++ 1 file changed, 2 insertions(+) -Index: linux-3.2/kernel/rcutiny.c +Index: linux-3.4/kernel/rcutiny.c =================================================================== ---- linux-3.2.orig/kernel/rcutiny.c -+++ linux-3.2/kernel/rcutiny.c -@@ -243,6 +243,7 @@ void call_rcu_sched(struct rcu_head *hea +--- linux-3.4.orig/kernel/rcutiny.c ++++ linux-3.4/kernel/rcutiny.c +@@ -368,6 +368,7 @@ void call_rcu_sched(struct rcu_head *hea } EXPORT_SYMBOL_GPL(call_rcu_sched); @@ -19,7 +19,7 @@ Index: linux-3.2/kernel/rcutiny.c /* * Post an RCU bottom-half callback to be invoked after any subsequent * quiescent state. -@@ -252,3 +253,4 @@ void call_rcu_bh(struct rcu_head *head, +@@ -377,3 +378,4 @@ void call_rcu_bh(struct rcu_head *head, __call_rcu(head, func, &rcu_bh_ctrlblk); } EXPORT_SYMBOL_GPL(call_rcu_bh); 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 6c28cdc..b068675 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,10 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -Index: linux-3.2/kernel/cpu.c +Index: linux-3.4/kernel/cpu.c =================================================================== ---- linux-3.2.orig/kernel/cpu.c -+++ linux-3.2/kernel/cpu.c +--- linux-3.4.orig/kernel/cpu.c ++++ linux-3.4/kernel/cpu.c @@ -76,9 +76,11 @@ static DEFINE_PER_CPU(struct hotplug_pcp */ void pin_current_cpu(void) diff --git a/patches/resource-counters-use-localirq-nort.patch b/patches/resource-counters-use-localirq-nort.patch index aba5b16..f2a249d 100644 --- a/patches/resource-counters-use-localirq-nort.patch +++ b/patches/resource-counters-use-localirq-nort.patch @@ -46,10 +46,10 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/res_counter.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -Index: linux-3.2/kernel/res_counter.c +Index: linux-3.4/kernel/res_counter.c =================================================================== ---- linux-3.2.orig/kernel/res_counter.c -+++ linux-3.2/kernel/res_counter.c +--- linux-3.4.orig/kernel/res_counter.c ++++ linux-3.4/kernel/res_counter.c @@ -43,7 +43,7 @@ int res_counter_charge(struct res_counte struct res_counter *c, *u; @@ -68,7 +68,7 @@ Index: linux-3.2/kernel/res_counter.c return ret; } -@@ -79,13 +79,13 @@ void res_counter_uncharge(struct res_cou +@@ -104,13 +104,13 @@ void res_counter_uncharge(struct res_cou unsigned long flags; struct res_counter *c; diff --git a/patches/rfc-futex-rt-fix-possible-lockup-when-taking-pi_lock-in-proxy-handler.patch b/patches/rfc-futex-rt-fix-possible-lockup-when-taking-pi_lock-in-proxy-handler.patch index aa118e4..fbb854b 100644 --- a/patches/rfc-futex-rt-fix-possible-lockup-when-taking-pi_lock-in-proxy-handler.patch +++ b/patches/rfc-futex-rt-fix-possible-lockup-when-taking-pi_lock-in-proxy-handler.patch @@ -17,13 +17,13 @@ Link: http://lkml.kernel.org/r/20120301190345.165160680@goodmis.org Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- kernel/rtmutex.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + 1 file changed, 3 insertions(+), 3 deletions(-) -diff --git a/kernel/rtmutex.c b/kernel/rtmutex.c -index 9850dc0..b525158 100644 ---- a/kernel/rtmutex.c -+++ b/kernel/rtmutex.c -@@ -1373,14 +1373,14 @@ int rt_mutex_start_proxy_lock(struct rt_mutex *lock, +Index: linux-3.4/kernel/rtmutex.c +=================================================================== +--- linux-3.4.orig/kernel/rtmutex.c ++++ linux-3.4/kernel/rtmutex.c +@@ -1365,14 +1365,14 @@ int rt_mutex_start_proxy_lock(struct rt_ * PI_REQUEUE_INPROGRESS, so that if the task is waking up * it will know that we are in the process of requeuing it. */ @@ -41,13 +41,3 @@ index 9850dc0..b525158 100644 #endif ret = task_blocks_on_rt_mutex(lock, waiter, task, detect_deadlock); --- -1.7.3.4 - - --- -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/rfc-lglock-rt-use-non-rt-for_each_cpu-in-rt-code.patch b/patches/rfc-lglock-rt-use-non-rt-for_each_cpu-in-rt-code.patch index a94f867..eb19630 100644 --- a/patches/rfc-lglock-rt-use-non-rt-for_each_cpu-in-rt-code.patch +++ b/patches/rfc-lglock-rt-use-non-rt-for_each_cpu-in-rt-code.patch @@ -31,12 +31,12 @@ Link: http://lkml.kernel.org/r/20120301190345.374756214@goodmis.org Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- include/linux/lglock.h | 35 ++++++++++++++++++++++++++++++++--- - 1 files changed, 32 insertions(+), 3 deletions(-) + 1 file changed, 32 insertions(+), 3 deletions(-) -diff --git a/include/linux/lglock.h b/include/linux/lglock.h -index 52b289f..cdfcef3 100644 ---- a/include/linux/lglock.h -+++ b/include/linux/lglock.h +Index: linux-3.4/include/linux/lglock.h +=================================================================== +--- linux-3.4.orig/include/linux/lglock.h ++++ linux-3.4/include/linux/lglock.h @@ -203,9 +203,31 @@ #else /* !PREEMPT_RT_FULL */ #define DEFINE_LGLOCK(name) \ @@ -106,13 +106,3 @@ index 52b289f..cdfcef3 100644 } \ EXPORT_SYMBOL(name##_global_unlock_online); \ \ --- -1.7.3.4 - - --- -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/rfc-ring-buffer-rt-check-for-irqs-disabled-before-grabbing-reader-lock.patch b/patches/rfc-ring-buffer-rt-check-for-irqs-disabled-before-grabbing-reader-lock.patch index 35f2d3d..c621057 100644 --- a/patches/rfc-ring-buffer-rt-check-for-irqs-disabled-before-grabbing-reader-lock.patch +++ b/patches/rfc-ring-buffer-rt-check-for-irqs-disabled-before-grabbing-reader-lock.patch @@ -18,11 +18,11 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/trace/ring_buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux-3.2/kernel/trace/ring_buffer.c +Index: linux-3.4/kernel/trace/ring_buffer.c =================================================================== ---- linux-3.2.orig/kernel/trace/ring_buffer.c -+++ linux-3.2/kernel/trace/ring_buffer.c -@@ -1054,7 +1054,7 @@ static inline int ok_to_lock(void) +--- linux-3.4.orig/kernel/trace/ring_buffer.c ++++ linux-3.4/kernel/trace/ring_buffer.c +@@ -1022,7 +1022,7 @@ static inline int ok_to_lock(void) if (in_nmi()) return 0; #ifdef CONFIG_PREEMPT_RT_FULL diff --git a/patches/rfc-sched-rt-fix-wait_task_interactive-to-test-rt_spin_lock-state.patch b/patches/rfc-sched-rt-fix-wait_task_interactive-to-test-rt_spin_lock-state.patch index d140559..51a5b3d 100644 --- a/patches/rfc-sched-rt-fix-wait_task_interactive-to-test-rt_spin_lock-state.patch +++ b/patches/rfc-sched-rt-fix-wait_task_interactive-to-test-rt_spin_lock-state.patch @@ -20,13 +20,13 @@ Link: http://lkml.kernel.org/r/20120301190345.979435764@goodmis.org Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- kernel/sched/core.c | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) + 1 file changed, 4 insertions(+), 2 deletions(-) -diff --git a/kernel/sched/core.c b/kernel/sched.c -index 81b340d..1cc706d 100644 ---- a/kernel/sched/core.c -+++ b/kernel/sched/core.c -@@ -2450,7 +2450,8 @@ unsigned long wait_task_inactive(struct task_struct *p, long match_state) +Index: linux-3.4/kernel/sched/core.c +=================================================================== +--- linux-3.4.orig/kernel/sched/core.c ++++ linux-3.4/kernel/sched/core.c +@@ -1174,7 +1174,8 @@ unsigned long wait_task_inactive(struct * is actually now running somewhere else! */ while (task_running(rq, p)) { @@ -36,7 +36,7 @@ index 81b340d..1cc706d 100644 return 0; cpu_relax(); } -@@ -2465,7 +2466,8 @@ unsigned long wait_task_inactive(struct task_struct *p, long match_state) +@@ -1189,7 +1190,8 @@ unsigned long wait_task_inactive(struct running = task_running(rq, p); on_rq = p->on_rq; ncsw = 0; @@ -46,13 +46,3 @@ index 81b340d..1cc706d 100644 ncsw = p->nvcsw | LONG_MIN; /* sets MSB */ task_rq_unlock(rq, p, &flags); --- -1.7.3.4 - - --- -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/rfc-timer-fix-hotplug-for-rt.patch b/patches/rfc-timer-fix-hotplug-for-rt.patch index 9c4ad00..e77d962 100644 --- a/patches/rfc-timer-fix-hotplug-for-rt.patch +++ b/patches/rfc-timer-fix-hotplug-for-rt.patch @@ -28,11 +28,11 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/timer.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) -Index: linux-3.2/kernel/timer.c +Index: linux-3.4/kernel/timer.c =================================================================== ---- linux-3.2.orig/kernel/timer.c -+++ linux-3.2/kernel/timer.c -@@ -1743,21 +1743,17 @@ static void __cpuinit migrate_timers(int +--- linux-3.4.orig/kernel/timer.c ++++ linux-3.4/kernel/timer.c +@@ -1793,21 +1793,17 @@ static void __cpuinit migrate_timers(int { struct tvec_base *old_base; struct tvec_base *new_base; @@ -57,7 +57,7 @@ Index: linux-3.2/kernel/timer.c BUG_ON(old_base->running_timer); -@@ -1771,10 +1767,8 @@ static void __cpuinit migrate_timers(int +@@ -1821,10 +1817,8 @@ static void __cpuinit migrate_timers(int } spin_unlock(&old_base->lock); diff --git a/patches/rt-add-rt-spinlock-to-headers.patch b/patches/rt-add-rt-spinlock-to-headers.patch index 0f7d311..b15a244 100644 --- a/patches/rt-add-rt-spinlock-to-headers.patch +++ b/patches/rt-add-rt-spinlock-to-headers.patch @@ -9,10 +9,10 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> include/linux/spinlock_types_rt.h | 49 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 90 insertions(+), 3 deletions(-) -Index: linux-3.2/include/linux/rwlock_types_rt.h +Index: linux-3.4/include/linux/rwlock_types_rt.h =================================================================== --- /dev/null -+++ linux-3.2/include/linux/rwlock_types_rt.h ++++ linux-3.4/include/linux/rwlock_types_rt.h @@ -0,0 +1,33 @@ +#ifndef __LINUX_RWLOCK_TYPES_RT_H +#define __LINUX_RWLOCK_TYPES_RT_H @@ -47,10 +47,10 @@ Index: linux-3.2/include/linux/rwlock_types_rt.h + rwlock_t name __cacheline_aligned_in_smp = __RW_LOCK_UNLOCKED(name) + +#endif -Index: linux-3.2/include/linux/spinlock_types.h +Index: linux-3.4/include/linux/spinlock_types.h =================================================================== ---- linux-3.2.orig/include/linux/spinlock_types.h -+++ linux-3.2/include/linux/spinlock_types.h +--- linux-3.4.orig/include/linux/spinlock_types.h ++++ linux-3.4/include/linux/spinlock_types.h @@ -11,8 +11,13 @@ #include <linux/spinlock_types_raw.h> @@ -68,10 +68,10 @@ Index: linux-3.2/include/linux/spinlock_types.h +#endif #endif /* __LINUX_SPINLOCK_TYPES_H */ -Index: linux-3.2/include/linux/spinlock_types_rt.h +Index: linux-3.4/include/linux/spinlock_types_rt.h =================================================================== --- /dev/null -+++ linux-3.2/include/linux/spinlock_types_rt.h ++++ linux-3.4/include/linux/spinlock_types_rt.h @@ -0,0 +1,49 @@ +#ifndef __LINUX_SPINLOCK_TYPES_RT_H +#define __LINUX_SPINLOCK_TYPES_RT_H diff --git a/patches/rt-add-rt-to-mutex-headers.patch b/patches/rt-add-rt-to-mutex-headers.patch index 808b9c3..cb0f6b8 100644 --- a/patches/rt-add-rt-to-mutex-headers.patch +++ b/patches/rt-add-rt-to-mutex-headers.patch @@ -8,10 +8,10 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> include/linux/mutex_rt.h | 84 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+), 7 deletions(-) -Index: linux-3.2/include/linux/mutex.h +Index: linux-3.4/include/linux/mutex.h =================================================================== ---- linux-3.2.orig/include/linux/mutex.h -+++ linux-3.2/include/linux/mutex.h +--- linux-3.4.orig/include/linux/mutex.h ++++ linux-3.4/include/linux/mutex.h @@ -17,6 +17,17 @@ #include <linux/atomic.h> @@ -54,10 +54,10 @@ Index: linux-3.2/include/linux/mutex.h extern int atomic_dec_and_mutex_lock(atomic_t *cnt, struct mutex *lock); #ifndef CONFIG_HAVE_ARCH_MUTEX_CPU_RELAX -Index: linux-3.2/include/linux/mutex_rt.h +Index: linux-3.4/include/linux/mutex_rt.h =================================================================== --- /dev/null -+++ linux-3.2/include/linux/mutex_rt.h ++++ linux-3.4/include/linux/mutex_rt.h @@ -0,0 +1,84 @@ +#ifndef __LINUX_MUTEX_RT_H +#define __LINUX_MUTEX_RT_H diff --git a/patches/rt-introduce-cpu-chill.patch b/patches/rt-introduce-cpu-chill.patch index 999c623..8f7ffe5 100644 --- a/patches/rt-introduce-cpu-chill.patch +++ b/patches/rt-introduce-cpu-chill.patch @@ -13,10 +13,10 @@ Cc: stable-rt@vger.kernel.org include/linux/delay.h | 6 ++++++ 1 file changed, 6 insertions(+) -Index: linux-3.2/include/linux/delay.h +Index: linux-3.4/include/linux/delay.h =================================================================== ---- linux-3.2.orig/include/linux/delay.h -+++ linux-3.2/include/linux/delay.h +--- linux-3.4.orig/include/linux/delay.h ++++ linux-3.4/include/linux/delay.h @@ -52,4 +52,10 @@ static inline void ssleep(unsigned int s msleep(seconds * 1000); } diff --git a/patches/rt-local-irq-lock.patch b/patches/rt-local-irq-lock.patch index 9bda645..d05af60 100644 --- a/patches/rt-local-irq-lock.patch +++ b/patches/rt-local-irq-lock.patch @@ -7,10 +7,10 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> include/linux/locallock.h | 230 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 230 insertions(+) -Index: linux-3.2/include/linux/locallock.h +Index: linux-3.4/include/linux/locallock.h =================================================================== --- /dev/null -+++ linux-3.2/include/linux/locallock.h ++++ linux-3.4/include/linux/locallock.h @@ -0,0 +1,230 @@ +#ifndef _LINUX_LOCALLOCK_H +#define _LINUX_LOCALLOCK_H diff --git a/patches/rt-rcutree-warn-fix.patch b/patches/rt-rcutree-warn-fix.patch index bbdec52..21cab1d 100644 --- a/patches/rt-rcutree-warn-fix.patch +++ b/patches/rt-rcutree-warn-fix.patch @@ -17,11 +17,11 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/rcutree.h | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) -Index: linux-3.2/kernel/rcutree.c +Index: linux-3.4/kernel/rcutree.c =================================================================== ---- linux-3.2.orig/kernel/rcutree.c -+++ linux-3.2/kernel/rcutree.c -@@ -171,6 +171,8 @@ void rcu_sched_qs(int cpu) +--- linux-3.4.orig/kernel/rcutree.c ++++ linux-3.4/kernel/rcutree.c +@@ -173,6 +173,8 @@ void rcu_sched_qs(int cpu) } #ifdef CONFIG_PREEMPT_RT_FULL @@ -30,11 +30,11 @@ Index: linux-3.2/kernel/rcutree.c void rcu_bh_qs(int cpu) { rcu_preempt_qs(cpu); -Index: linux-3.2/kernel/rcutree.h +Index: linux-3.4/kernel/rcutree.h =================================================================== ---- linux-3.2.orig/kernel/rcutree.h -+++ linux-3.2/kernel/rcutree.h -@@ -430,7 +430,6 @@ DECLARE_PER_CPU(char, rcu_cpu_has_work); +--- linux-3.4.orig/kernel/rcutree.h ++++ linux-3.4/kernel/rcutree.h +@@ -423,7 +423,6 @@ DECLARE_PER_CPU(char, rcu_cpu_has_work); /* Forward declarations for rcutree_plugin.h */ static void rcu_bootup_announce(void); long rcu_batches_completed(void); diff --git a/patches/rt-ring-buffer-convert-reader_lock-from-raw_spin_lock-into-spin_lock.patch b/patches/rt-ring-buffer-convert-reader_lock-from-raw_spin_lock-into-spin_lock.patch index e780367..4dd5156 100644 --- a/patches/rt-ring-buffer-convert-reader_lock-from-raw_spin_lock-into-spin_lock.patch +++ b/patches/rt-ring-buffer-convert-reader_lock-from-raw_spin_lock-into-spin_lock.patch @@ -44,11 +44,11 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/trace/ring_buffer.c | 151 ++++++++++++++++++++++++--------------------- 1 file changed, 81 insertions(+), 70 deletions(-) -Index: linux-3.2/kernel/trace/ring_buffer.c +Index: linux-3.4/kernel/trace/ring_buffer.c =================================================================== ---- linux-3.2.orig/kernel/trace/ring_buffer.c -+++ linux-3.2/kernel/trace/ring_buffer.c -@@ -478,7 +478,7 @@ struct ring_buffer_per_cpu { +--- linux-3.4.orig/kernel/trace/ring_buffer.c ++++ linux-3.4/kernel/trace/ring_buffer.c +@@ -446,7 +446,7 @@ struct ring_buffer_per_cpu { int cpu; atomic_t record_disabled; struct ring_buffer *buffer; @@ -57,7 +57,7 @@ Index: linux-3.2/kernel/trace/ring_buffer.c arch_spinlock_t lock; struct lock_class_key lock_key; struct list_head *pages; -@@ -1049,6 +1049,44 @@ static int rb_allocate_pages(struct ring +@@ -1017,6 +1017,44 @@ static int rb_allocate_pages(struct ring return -ENOMEM; } @@ -102,7 +102,7 @@ Index: linux-3.2/kernel/trace/ring_buffer.c static struct ring_buffer_per_cpu * rb_allocate_cpu_buffer(struct ring_buffer *buffer, int cpu) { -@@ -1064,7 +1102,7 @@ rb_allocate_cpu_buffer(struct ring_buffe +@@ -1032,7 +1070,7 @@ rb_allocate_cpu_buffer(struct ring_buffe cpu_buffer->cpu = cpu; cpu_buffer->buffer = buffer; @@ -111,7 +111,7 @@ Index: linux-3.2/kernel/trace/ring_buffer.c lockdep_set_class(&cpu_buffer->reader_lock, buffer->reader_lock_key); cpu_buffer->lock = (arch_spinlock_t)__ARCH_SPIN_LOCK_UNLOCKED; -@@ -1259,9 +1297,11 @@ rb_remove_pages(struct ring_buffer_per_c +@@ -1227,9 +1265,11 @@ rb_remove_pages(struct ring_buffer_per_c { struct buffer_page *bpage; struct list_head *p; @@ -124,7 +124,7 @@ Index: linux-3.2/kernel/trace/ring_buffer.c rb_head_page_deactivate(cpu_buffer); for (i = 0; i < nr_pages; i++) { -@@ -1279,7 +1319,7 @@ rb_remove_pages(struct ring_buffer_per_c +@@ -1247,7 +1287,7 @@ rb_remove_pages(struct ring_buffer_per_c rb_check_pages(cpu_buffer); out: @@ -133,7 +133,7 @@ Index: linux-3.2/kernel/trace/ring_buffer.c } static void -@@ -1288,9 +1328,11 @@ rb_insert_pages(struct ring_buffer_per_c +@@ -1256,9 +1296,11 @@ rb_insert_pages(struct ring_buffer_per_c { struct buffer_page *bpage; struct list_head *p; @@ -146,7 +146,7 @@ Index: linux-3.2/kernel/trace/ring_buffer.c rb_head_page_deactivate(cpu_buffer); for (i = 0; i < nr_pages; i++) { -@@ -1305,7 +1347,7 @@ rb_insert_pages(struct ring_buffer_per_c +@@ -1273,7 +1315,7 @@ rb_insert_pages(struct ring_buffer_per_c rb_check_pages(cpu_buffer); out: @@ -155,7 +155,7 @@ Index: linux-3.2/kernel/trace/ring_buffer.c } /** -@@ -2689,7 +2731,7 @@ unsigned long ring_buffer_oldest_event_t +@@ -2714,7 +2756,7 @@ unsigned long ring_buffer_oldest_event_t return 0; cpu_buffer = buffer->buffers[cpu]; @@ -164,7 +164,7 @@ Index: linux-3.2/kernel/trace/ring_buffer.c /* * if the tail is on reader_page, oldest time stamp is on the reader * page -@@ -2699,7 +2741,7 @@ unsigned long ring_buffer_oldest_event_t +@@ -2724,7 +2766,7 @@ unsigned long ring_buffer_oldest_event_t else bpage = rb_set_head_page(cpu_buffer); ret = bpage->page->time_stamp; @@ -173,7 +173,7 @@ Index: linux-3.2/kernel/trace/ring_buffer.c return ret; } -@@ -2863,15 +2905,16 @@ void ring_buffer_iter_reset(struct ring_ +@@ -2888,15 +2930,16 @@ void ring_buffer_iter_reset(struct ring_ { struct ring_buffer_per_cpu *cpu_buffer; unsigned long flags; @@ -192,7 +192,7 @@ Index: linux-3.2/kernel/trace/ring_buffer.c } EXPORT_SYMBOL_GPL(ring_buffer_iter_reset); -@@ -3289,21 +3332,6 @@ rb_iter_peek(struct ring_buffer_iter *it +@@ -3314,21 +3357,6 @@ rb_iter_peek(struct ring_buffer_iter *it } EXPORT_SYMBOL_GPL(ring_buffer_iter_peek); @@ -214,7 +214,7 @@ Index: linux-3.2/kernel/trace/ring_buffer.c /** * ring_buffer_peek - peek at the next event to be read * @buffer: The ring buffer to read -@@ -3321,22 +3349,17 @@ ring_buffer_peek(struct ring_buffer *buf +@@ -3346,22 +3374,17 @@ ring_buffer_peek(struct ring_buffer *buf struct ring_buffer_per_cpu *cpu_buffer = buffer->buffers[cpu]; struct ring_buffer_event *event; unsigned long flags; @@ -240,7 +240,7 @@ Index: linux-3.2/kernel/trace/ring_buffer.c if (event && event->type_len == RINGBUF_TYPE_PADDING) goto again; -@@ -3358,11 +3381,12 @@ ring_buffer_iter_peek(struct ring_buffer +@@ -3383,11 +3406,12 @@ ring_buffer_iter_peek(struct ring_buffer struct ring_buffer_per_cpu *cpu_buffer = iter->cpu_buffer; struct ring_buffer_event *event; unsigned long flags; @@ -255,7 +255,7 @@ Index: linux-3.2/kernel/trace/ring_buffer.c if (event && event->type_len == RINGBUF_TYPE_PADDING) goto again; -@@ -3388,9 +3412,7 @@ ring_buffer_consume(struct ring_buffer * +@@ -3413,9 +3437,7 @@ ring_buffer_consume(struct ring_buffer * struct ring_buffer_per_cpu *cpu_buffer; struct ring_buffer_event *event = NULL; unsigned long flags; @@ -266,7 +266,7 @@ Index: linux-3.2/kernel/trace/ring_buffer.c again: /* might be called in atomic */ -@@ -3400,9 +3422,7 @@ ring_buffer_consume(struct ring_buffer * +@@ -3425,9 +3447,7 @@ ring_buffer_consume(struct ring_buffer * goto out; cpu_buffer = buffer->buffers[cpu]; @@ -277,7 +277,7 @@ Index: linux-3.2/kernel/trace/ring_buffer.c event = rb_buffer_peek(cpu_buffer, ts, lost_events); if (event) { -@@ -3410,9 +3430,8 @@ ring_buffer_consume(struct ring_buffer * +@@ -3435,9 +3455,8 @@ ring_buffer_consume(struct ring_buffer * rb_advance_reader(cpu_buffer); } @@ -289,7 +289,7 @@ Index: linux-3.2/kernel/trace/ring_buffer.c out: preempt_enable(); -@@ -3497,17 +3516,18 @@ ring_buffer_read_start(struct ring_buffe +@@ -3522,17 +3541,18 @@ ring_buffer_read_start(struct ring_buffe { struct ring_buffer_per_cpu *cpu_buffer; unsigned long flags; @@ -310,7 +310,7 @@ Index: linux-3.2/kernel/trace/ring_buffer.c } EXPORT_SYMBOL_GPL(ring_buffer_read_start); -@@ -3541,8 +3561,9 @@ ring_buffer_read(struct ring_buffer_iter +@@ -3566,8 +3586,9 @@ ring_buffer_read(struct ring_buffer_iter struct ring_buffer_event *event; struct ring_buffer_per_cpu *cpu_buffer = iter->cpu_buffer; unsigned long flags; @@ -321,7 +321,7 @@ Index: linux-3.2/kernel/trace/ring_buffer.c again: event = rb_iter_peek(iter, ts); if (!event) -@@ -3553,7 +3574,7 @@ ring_buffer_read(struct ring_buffer_iter +@@ -3578,7 +3599,7 @@ ring_buffer_read(struct ring_buffer_iter rb_advance_iter(iter); out: @@ -330,7 +330,7 @@ Index: linux-3.2/kernel/trace/ring_buffer.c return event; } -@@ -3618,13 +3639,14 @@ void ring_buffer_reset_cpu(struct ring_b +@@ -3643,13 +3664,14 @@ void ring_buffer_reset_cpu(struct ring_b { struct ring_buffer_per_cpu *cpu_buffer = buffer->buffers[cpu]; unsigned long flags; @@ -346,7 +346,7 @@ Index: linux-3.2/kernel/trace/ring_buffer.c if (RB_WARN_ON(cpu_buffer, local_read(&cpu_buffer->committing))) goto out; -@@ -3636,7 +3658,7 @@ void ring_buffer_reset_cpu(struct ring_b +@@ -3661,7 +3683,7 @@ void ring_buffer_reset_cpu(struct ring_b arch_spin_unlock(&cpu_buffer->lock); out: @@ -355,7 +355,7 @@ Index: linux-3.2/kernel/trace/ring_buffer.c atomic_dec(&cpu_buffer->record_disabled); } -@@ -3663,22 +3685,16 @@ int ring_buffer_empty(struct ring_buffer +@@ -3688,22 +3710,16 @@ int ring_buffer_empty(struct ring_buffer { struct ring_buffer_per_cpu *cpu_buffer; unsigned long flags; @@ -381,7 +381,7 @@ Index: linux-3.2/kernel/trace/ring_buffer.c if (!ret) return 0; -@@ -3697,22 +3713,16 @@ int ring_buffer_empty_cpu(struct ring_bu +@@ -3722,22 +3738,16 @@ int ring_buffer_empty_cpu(struct ring_bu { struct ring_buffer_per_cpu *cpu_buffer; unsigned long flags; @@ -407,7 +407,7 @@ Index: linux-3.2/kernel/trace/ring_buffer.c return ret; } -@@ -3887,6 +3897,7 @@ int ring_buffer_read_page(struct ring_bu +@@ -3912,6 +3922,7 @@ int ring_buffer_read_page(struct ring_bu unsigned int commit; unsigned int read; u64 save_timestamp; @@ -415,7 +415,7 @@ Index: linux-3.2/kernel/trace/ring_buffer.c int ret = -1; if (!cpumask_test_cpu(cpu, buffer->cpumask)) -@@ -3908,7 +3919,7 @@ int ring_buffer_read_page(struct ring_bu +@@ -3933,7 +3944,7 @@ int ring_buffer_read_page(struct ring_bu if (!bpage) goto out; @@ -424,7 +424,7 @@ Index: linux-3.2/kernel/trace/ring_buffer.c reader = rb_get_reader_page(cpu_buffer); if (!reader) -@@ -4032,7 +4043,7 @@ int ring_buffer_read_page(struct ring_bu +@@ -4057,7 +4068,7 @@ int ring_buffer_read_page(struct ring_bu memset(&bpage->data[commit], 0, BUF_PAGE_SIZE - commit); out_unlock: diff --git a/patches/rt-sched-do-not-compare-cpu-masks-in-scheduler.patch b/patches/rt-sched-do-not-compare-cpu-masks-in-scheduler.patch index b3ae24a..b908fde 100644 --- a/patches/rt-sched-do-not-compare-cpu-masks-in-scheduler.patch +++ b/patches/rt-sched-do-not-compare-cpu-masks-in-scheduler.patch @@ -12,11 +12,11 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/sched/core.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) -Index: linux-3.2/kernel/sched/core.c +Index: linux-3.4/kernel/sched/core.c =================================================================== ---- linux-3.2.orig/kernel/sched/core.c -+++ linux-3.2/kernel/sched/core.c -@@ -4385,16 +4385,12 @@ static inline void update_migrate_disabl +--- linux-3.4.orig/kernel/sched/core.c ++++ linux-3.4/kernel/sched/core.c +@@ -3164,16 +3164,12 @@ static inline void update_migrate_disabl */ mask = tsk_cpus_allowed(p); diff --git a/patches/rt-sched-have-migrate_disable-ignore-bounded-threads.patch b/patches/rt-sched-have-migrate_disable-ignore-bounded-threads.patch index c1d9740..23eec22 100644 --- a/patches/rt-sched-have-migrate_disable-ignore-bounded-threads.patch +++ b/patches/rt-sched-have-migrate_disable-ignore-bounded-threads.patch @@ -12,11 +12,11 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/sched/core.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) -Index: linux-3.2/kernel/sched/core.c +Index: linux-3.4/kernel/sched/core.c =================================================================== ---- linux-3.2.orig/kernel/sched/core.c -+++ linux-3.2/kernel/sched/core.c -@@ -4397,7 +4397,7 @@ void migrate_disable(void) +--- linux-3.4.orig/kernel/sched/core.c ++++ linux-3.4/kernel/sched/core.c +@@ -3176,7 +3176,7 @@ void migrate_disable(void) { struct task_struct *p = current; @@ -25,7 +25,7 @@ Index: linux-3.2/kernel/sched/core.c #ifdef CONFIG_SCHED_DEBUG p->migrate_disable_atomic++; #endif -@@ -4428,7 +4428,7 @@ void migrate_enable(void) +@@ -3207,7 +3207,7 @@ void migrate_enable(void) unsigned long flags; struct rq *rq; @@ -34,7 +34,7 @@ Index: linux-3.2/kernel/sched/core.c #ifdef CONFIG_SCHED_DEBUG p->migrate_disable_atomic--; #endif -@@ -4449,26 +4449,21 @@ void migrate_enable(void) +@@ -3228,26 +3228,21 @@ void migrate_enable(void) if (unlikely(migrate_disabled_updated(p))) { /* diff --git a/patches/rt-serial-warn-fix.patch b/patches/rt-serial-warn-fix.patch index be31c12..66a21ff 100644 --- a/patches/rt-serial-warn-fix.patch +++ b/patches/rt-serial-warn-fix.patch @@ -37,7 +37,7 @@ Index: linux-3.4/drivers/tty/serial/8250/8250.c #define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE) -@@ -1586,14 +1595,12 @@ static irqreturn_t serial8250_interrupt( +@@ -1584,14 +1593,12 @@ static irqreturn_t serial8250_interrupt( l = l->next; diff --git a/patches/rt-slab-fix-__do_drain-to-use-the-right-array-cache.patch b/patches/rt-slab-fix-__do_drain-to-use-the-right-array-cache.patch index fe2efdd..bb4905e 100644 --- a/patches/rt-slab-fix-__do_drain-to-use-the-right-array-cache.patch +++ b/patches/rt-slab-fix-__do_drain-to-use-the-right-array-cache.patch @@ -38,11 +38,11 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> mm/slab.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux-3.2/mm/slab.c +Index: linux-3.4/mm/slab.c =================================================================== ---- linux-3.2.orig/mm/slab.c -+++ linux-3.2/mm/slab.c -@@ -2573,7 +2573,7 @@ static void __do_drain(void *arg, unsign +--- linux-3.4.orig/mm/slab.c ++++ linux-3.4/mm/slab.c +@@ -2638,7 +2638,7 @@ static void __do_drain(void *arg, unsign struct array_cache *ac; int node = cpu_to_mem(cpu); diff --git a/patches/rt-tracing-show-padding-as-unsigned-short.patch b/patches/rt-tracing-show-padding-as-unsigned-short.patch index 4aceb9e..6a057a5 100644 --- a/patches/rt-tracing-show-padding-as-unsigned-short.patch +++ b/patches/rt-tracing-show-padding-as-unsigned-short.patch @@ -33,10 +33,10 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/trace/trace_events.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux-3.2/kernel/trace/trace_events.c +Index: linux-3.4/kernel/trace/trace_events.c =================================================================== ---- linux-3.2.orig/kernel/trace/trace_events.c -+++ linux-3.2/kernel/trace/trace_events.c +--- linux-3.4.orig/kernel/trace/trace_events.c ++++ linux-3.4/kernel/trace/trace_events.c @@ -117,7 +117,7 @@ static int trace_define_common_fields(vo __common_field(unsigned char, preempt_count); __common_field(int, pid); diff --git a/patches/rtmutex-avoid-include-hell.patch b/patches/rtmutex-avoid-include-hell.patch index 063acf0..6a06ee7 100644 --- a/patches/rtmutex-avoid-include-hell.patch +++ b/patches/rtmutex-avoid-include-hell.patch @@ -7,10 +7,10 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> include/linux/rtmutex.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux-3.2/include/linux/rtmutex.h +Index: linux-3.4/include/linux/rtmutex.h =================================================================== ---- linux-3.2.orig/include/linux/rtmutex.h -+++ linux-3.2/include/linux/rtmutex.h +--- linux-3.4.orig/include/linux/rtmutex.h ++++ linux-3.4/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 bef9a87..564f395 100644 --- a/patches/rtmutex-futex-prepare-rt.patch +++ b/patches/rtmutex-futex-prepare-rt.patch @@ -9,11 +9,11 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/rtmutex_common.h | 2 + 3 files changed, 91 insertions(+), 19 deletions(-) -Index: linux-3.2/kernel/futex.c +Index: linux-3.4/kernel/futex.c =================================================================== ---- linux-3.2.orig/kernel/futex.c -+++ linux-3.2/kernel/futex.c -@@ -1422,6 +1422,16 @@ retry_private: +--- linux-3.4.orig/kernel/futex.c ++++ linux-3.4/kernel/futex.c +@@ -1423,6 +1423,16 @@ retry_private: requeue_pi_wake_futex(this, &key2, hb2); drop_count++; continue; @@ -30,7 +30,7 @@ Index: linux-3.2/kernel/futex.c } else if (ret) { /* -EDEADLK */ this->pi_state = NULL; -@@ -2266,7 +2276,7 @@ static int futex_wait_requeue_pi(u32 __u +@@ -2267,7 +2277,7 @@ static int futex_wait_requeue_pi(u32 __u struct hrtimer_sleeper timeout, *to = NULL; struct rt_mutex_waiter rt_waiter; struct rt_mutex *pi_mutex = NULL; @@ -39,7 +39,7 @@ Index: linux-3.2/kernel/futex.c union futex_key key2 = FUTEX_KEY_INIT; struct futex_q q = futex_q_init; int res, ret; -@@ -2310,20 +2320,55 @@ static int futex_wait_requeue_pi(u32 __u +@@ -2311,20 +2321,55 @@ static int futex_wait_requeue_pi(u32 __u /* Queue the futex_q, drop the hb lock, wait for wakeup. */ futex_wait_queue_me(hb, &q, to); @@ -106,7 +106,7 @@ Index: linux-3.2/kernel/futex.c /* Check if the requeue code acquired the second futex for us. */ if (!q.rt_waiter) { -@@ -2332,9 +2377,10 @@ static int futex_wait_requeue_pi(u32 __u +@@ -2333,9 +2378,10 @@ static int futex_wait_requeue_pi(u32 __u * did a lock-steal - fix up the PI-state in that case. */ if (q.pi_state && (q.pi_state->owner != current)) { @@ -119,7 +119,7 @@ Index: linux-3.2/kernel/futex.c } } else { /* -@@ -2347,7 +2393,8 @@ static int futex_wait_requeue_pi(u32 __u +@@ -2348,7 +2394,8 @@ static int futex_wait_requeue_pi(u32 __u ret = rt_mutex_finish_proxy_lock(pi_mutex, to, &rt_waiter, 1); debug_rt_mutex_free_waiter(&rt_waiter); @@ -129,10 +129,10 @@ Index: linux-3.2/kernel/futex.c /* * Fixup the pi_state owner and possibly acquire the lock if we * haven't already. -Index: linux-3.2/kernel/rtmutex.c +Index: linux-3.4/kernel/rtmutex.c =================================================================== ---- linux-3.2.orig/kernel/rtmutex.c -+++ linux-3.2/kernel/rtmutex.c +--- linux-3.4.orig/kernel/rtmutex.c ++++ linux-3.4/kernel/rtmutex.c @@ -67,6 +67,11 @@ static void fixup_rt_mutex_waiters(struc clear_rt_mutex_waiters(lock); } @@ -206,10 +206,10 @@ Index: linux-3.2/kernel/rtmutex.c raw_spin_unlock_irqrestore(&task->pi_lock, flags); return; } -Index: linux-3.2/kernel/rtmutex_common.h +Index: linux-3.4/kernel/rtmutex_common.h =================================================================== ---- linux-3.2.orig/kernel/rtmutex_common.h -+++ linux-3.2/kernel/rtmutex_common.h +--- linux-3.4.orig/kernel/rtmutex_common.h ++++ linux-3.4/kernel/rtmutex_common.h @@ -103,6 +103,8 @@ static inline struct task_struct *rt_mut /* * PI-futex support (proxy locking functions, etc.): diff --git a/patches/rtmutex-lock-killable.patch b/patches/rtmutex-lock-killable.patch index 949c6de..29e07a9 100644 --- a/patches/rtmutex-lock-killable.patch +++ b/patches/rtmutex-lock-killable.patch @@ -8,10 +8,10 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/rtmutex.c | 33 +++++++++++++++++++++++++++------ 2 files changed, 28 insertions(+), 6 deletions(-) -Index: linux-3.2/include/linux/rtmutex.h +Index: linux-3.4/include/linux/rtmutex.h =================================================================== ---- linux-3.2.orig/include/linux/rtmutex.h -+++ linux-3.2/include/linux/rtmutex.h +--- linux-3.4.orig/include/linux/rtmutex.h ++++ linux-3.4/include/linux/rtmutex.h @@ -90,6 +90,7 @@ extern void rt_mutex_destroy(struct rt_m extern void rt_mutex_lock(struct rt_mutex *lock); extern int rt_mutex_lock_interruptible(struct rt_mutex *lock, @@ -20,11 +20,11 @@ Index: linux-3.2/include/linux/rtmutex.h extern int rt_mutex_timed_lock(struct rt_mutex *lock, struct hrtimer_sleeper *timeout, int detect_deadlock); -Index: linux-3.2/kernel/rtmutex.c +Index: linux-3.4/kernel/rtmutex.c =================================================================== ---- linux-3.2.orig/kernel/rtmutex.c -+++ linux-3.2/kernel/rtmutex.c -@@ -799,12 +799,12 @@ EXPORT_SYMBOL_GPL(rt_mutex_lock); +--- linux-3.4.orig/kernel/rtmutex.c ++++ linux-3.4/kernel/rtmutex.c +@@ -791,12 +791,12 @@ EXPORT_SYMBOL_GPL(rt_mutex_lock); /** * rt_mutex_lock_interruptible - lock a rt_mutex interruptible * @@ -40,7 +40,7 @@ Index: linux-3.2/kernel/rtmutex.c * -EDEADLK when the lock would deadlock (when deadlock detection is on) */ int __sched rt_mutex_lock_interruptible(struct rt_mutex *lock, -@@ -818,17 +818,38 @@ int __sched rt_mutex_lock_interruptible( +@@ -810,17 +810,38 @@ int __sched rt_mutex_lock_interruptible( EXPORT_SYMBOL_GPL(rt_mutex_lock_interruptible); /** diff --git a/patches/sched-cond-resched.patch b/patches/sched-cond-resched.patch index 21f564c..c95479f 100644 --- a/patches/sched-cond-resched.patch +++ b/patches/sched-cond-resched.patch @@ -7,11 +7,11 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/sched/core.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) -Index: linux-3.2/kernel/sched/core.c +Index: linux-3.4/kernel/sched/core.c =================================================================== ---- linux-3.2.orig/kernel/sched/core.c -+++ linux-3.2/kernel/sched/core.c -@@ -5775,9 +5775,17 @@ static inline int should_resched(void) +--- linux-3.4.orig/kernel/sched/core.c ++++ linux-3.4/kernel/sched/core.c +@@ -4554,9 +4554,17 @@ static inline int should_resched(void) static void __cond_resched(void) { diff --git a/patches/sched-delay-put-task.patch b/patches/sched-delay-put-task.patch index 6aa1d92..e5a4b68 100644 --- a/patches/sched-delay-put-task.patch +++ b/patches/sched-delay-put-task.patch @@ -8,11 +8,11 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/fork.c | 11 +++++++++++ 2 files changed, 24 insertions(+) -Index: linux-3.2/include/linux/sched.h +Index: linux-3.4/include/linux/sched.h =================================================================== ---- linux-3.2.orig/include/linux/sched.h -+++ linux-3.2/include/linux/sched.h -@@ -1591,6 +1591,9 @@ struct task_struct { +--- linux-3.4.orig/include/linux/sched.h ++++ linux-3.4/include/linux/sched.h +@@ -1635,6 +1635,9 @@ struct task_struct { #ifdef CONFIG_HAVE_HW_BREAKPOINT atomic_t ptrace_bp_refcnt; #endif @@ -22,7 +22,7 @@ Index: linux-3.2/include/linux/sched.h }; /* Future-safe accessor for struct task_struct's cpus_allowed. */ -@@ -1775,6 +1778,15 @@ extern struct pid *cad_pid; +@@ -1819,6 +1822,15 @@ extern struct pid *cad_pid; extern void free_task(struct task_struct *tsk); #define get_task_struct(tsk) do { atomic_inc(&(tsk)->usage); } while(0) @@ -38,7 +38,7 @@ Index: linux-3.2/include/linux/sched.h extern void __put_task_struct(struct task_struct *t); static inline void put_task_struct(struct task_struct *t) -@@ -1782,6 +1794,7 @@ static inline void put_task_struct(struc +@@ -1826,6 +1838,7 @@ static inline void put_task_struct(struc if (atomic_dec_and_test(&t->usage)) __put_task_struct(t); } @@ -46,11 +46,11 @@ Index: linux-3.2/include/linux/sched.h extern void task_times(struct task_struct *p, cputime_t *ut, cputime_t *st); extern void thread_group_times(struct task_struct *p, cputime_t *ut, cputime_t *st); -Index: linux-3.2/kernel/fork.c +Index: linux-3.4/kernel/fork.c =================================================================== ---- linux-3.2.orig/kernel/fork.c -+++ linux-3.2/kernel/fork.c -@@ -196,7 +196,18 @@ void __put_task_struct(struct task_struc +--- linux-3.4.orig/kernel/fork.c ++++ linux-3.4/kernel/fork.c +@@ -201,7 +201,18 @@ void __put_task_struct(struct task_struc if (!profile_handoff_task(tsk)) free_task(tsk); } diff --git a/patches/sched-disable-rt-group-sched-on-rt.patch b/patches/sched-disable-rt-group-sched-on-rt.patch index fe82cff..e6e3b93 100644 --- a/patches/sched-disable-rt-group-sched-on-rt.patch +++ b/patches/sched-disable-rt-group-sched-on-rt.patch @@ -16,11 +16,11 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> init/Kconfig | 1 + 1 file changed, 1 insertion(+) -Index: linux-3.2/init/Kconfig +Index: linux-3.4/init/Kconfig =================================================================== ---- linux-3.2.orig/init/Kconfig -+++ linux-3.2/init/Kconfig -@@ -731,6 +731,7 @@ config RT_GROUP_SCHED +--- linux-3.4.orig/init/Kconfig ++++ linux-3.4/init/Kconfig +@@ -746,6 +746,7 @@ config RT_GROUP_SCHED bool "Group scheduling for SCHED_RR/FIFO" depends on EXPERIMENTAL depends on CGROUP_SCHED diff --git a/patches/sched-limit-nr-migrate.patch b/patches/sched-limit-nr-migrate.patch index 65d7ee8..3213842 100644 --- a/patches/sched-limit-nr-migrate.patch +++ b/patches/sched-limit-nr-migrate.patch @@ -7,11 +7,11 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/sched/core.c | 4 ++++ 1 file changed, 4 insertions(+) -Index: linux-3.2/kernel/sched/core.c +Index: linux-3.4/kernel/sched/core.c =================================================================== ---- linux-3.2.orig/kernel/sched/core.c -+++ linux-3.2/kernel/sched/core.c -@@ -942,7 +942,11 @@ late_initcall(sched_init_debug); +--- linux-3.4.orig/kernel/sched/core.c ++++ linux-3.4/kernel/sched/core.c +@@ -263,7 +263,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 11b9631..1bf06b9 100644 --- a/patches/sched-might-sleep-do-not-account-rcu-depth.patch +++ b/patches/sched-might-sleep-do-not-account-rcu-depth.patch @@ -37,7 +37,7 @@ Index: linux-3.4/kernel/sched/core.c =================================================================== --- linux-3.4.orig/kernel/sched/core.c +++ linux-3.4/kernel/sched/core.c -@@ -7082,7 +7082,8 @@ void __init sched_init(void) +@@ -7092,7 +7092,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-teach-migrate_disable-about-atomic-contexts.patch b/patches/sched-teach-migrate_disable-about-atomic-contexts.patch index 50bdc48..f1c3495 100644 --- a/patches/sched-teach-migrate_disable-about-atomic-contexts.patch +++ b/patches/sched-teach-migrate_disable-about-atomic-contexts.patch @@ -34,14 +34,14 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Link: http://lkml.kernel.org/n/tip-wbot4vsmwhi8vmbf83hsclk6@git.kernel.org --- include/linux/sched.h | 3 +++ - kernel/sched/core.c | 21 +++++++++++++++++++++ + kernel/sched/core.c | 21 +++++++++++++++++++++ 2 files changed, 24 insertions(+) -Index: linux-3.2/include/linux/sched.h +Index: linux-3.4/include/linux/sched.h =================================================================== ---- linux-3.2.orig/include/linux/sched.h -+++ linux-3.2/include/linux/sched.h -@@ -1261,6 +1261,9 @@ struct task_struct { +--- linux-3.4.orig/include/linux/sched.h ++++ linux-3.4/include/linux/sched.h +@@ -1304,6 +1304,9 @@ struct task_struct { unsigned int policy; #ifdef CONFIG_PREEMPT_RT_FULL int migrate_disable; @@ -51,11 +51,11 @@ Index: linux-3.2/include/linux/sched.h #endif cpumask_t cpus_allowed; -Index: linux-3.2/kernel/sched/core.c +Index: linux-3.4/kernel/sched/core.c =================================================================== ---- linux-3.2.orig/kernel/sched/core.c -+++ linux-3.2/kernel/sched/core.c -@@ -6307,6 +6307,17 @@ void migrate_disable(void) +--- linux-3.4.orig/kernel/sched/core.c ++++ linux-3.4/kernel/sched/core.c +@@ -5059,6 +5059,17 @@ void migrate_disable(void) unsigned long flags; struct rq *rq; @@ -73,7 +73,7 @@ Index: linux-3.2/kernel/sched/core.c preempt_disable(); if (p->migrate_disable) { p->migrate_disable++; -@@ -6355,6 +6366,16 @@ void migrate_enable(void) +@@ -5107,6 +5118,16 @@ void migrate_enable(void) unsigned long flags; struct rq *rq; diff --git a/patches/sched-ttwu-ensure-success-return-is-correct.patch b/patches/sched-ttwu-ensure-success-return-is-correct.patch index 238bfb9..9aeffde 100644 --- a/patches/sched-ttwu-ensure-success-return-is-correct.patch +++ b/patches/sched-ttwu-ensure-success-return-is-correct.patch @@ -18,11 +18,11 @@ Cc: stable-rt@vger.kernel.org kernel/sched/core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -Index: linux-3.2/kernel/sched/core.c +Index: linux-3.4/kernel/sched/core.c =================================================================== ---- linux-3.2.orig/kernel/sched/core.c -+++ linux-3.2/kernel/sched/core.c -@@ -2834,8 +2834,10 @@ try_to_wake_up(struct task_struct *p, un +--- linux-3.4.orig/kernel/sched/core.c ++++ linux-3.4/kernel/sched/core.c +@@ -1593,8 +1593,10 @@ try_to_wake_up(struct task_struct *p, un * if the wakeup condition is true. */ if (!(wake_flags & WF_LOCK_SLEEPER)) { diff --git a/patches/scsi-fcoe-rt-aware.patch b/patches/scsi-fcoe-rt-aware.patch index 8d9eee6..c362cab 100644 --- a/patches/scsi-fcoe-rt-aware.patch +++ b/patches/scsi-fcoe-rt-aware.patch @@ -9,11 +9,11 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> drivers/scsi/libfc/fc_exch.c | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) -Index: linux-3.2/drivers/scsi/fcoe/fcoe.c +Index: linux-3.4/drivers/scsi/fcoe/fcoe.c =================================================================== ---- linux-3.2.orig/drivers/scsi/fcoe/fcoe.c -+++ linux-3.2/drivers/scsi/fcoe/fcoe.c -@@ -1156,7 +1156,7 @@ static void fcoe_percpu_thread_destroy(u +--- linux-3.4.orig/drivers/scsi/fcoe/fcoe.c ++++ linux-3.4/drivers/scsi/fcoe/fcoe.c +@@ -1222,7 +1222,7 @@ static void fcoe_percpu_thread_destroy(u struct sk_buff *skb; #ifdef CONFIG_SMP struct fcoe_percpu_s *p0; @@ -22,7 +22,7 @@ Index: linux-3.2/drivers/scsi/fcoe/fcoe.c #endif /* CONFIG_SMP */ FCOE_DBG("Destroying receive thread for CPU %d\n", cpu); -@@ -1212,7 +1212,7 @@ static void fcoe_percpu_thread_destroy(u +@@ -1278,7 +1278,7 @@ static void fcoe_percpu_thread_destroy(u kfree_skb(skb); spin_unlock_bh(&p->fcoe_rx_list.lock); } @@ -31,7 +31,7 @@ Index: linux-3.2/drivers/scsi/fcoe/fcoe.c #else /* * This a non-SMP scenario where the singular Rx thread is -@@ -1435,11 +1435,11 @@ err2: +@@ -1494,11 +1494,11 @@ err2: static int fcoe_alloc_paged_crc_eof(struct sk_buff *skb, int tlen) { struct fcoe_percpu_s *fps; @@ -46,7 +46,7 @@ Index: linux-3.2/drivers/scsi/fcoe/fcoe.c return rc; } -@@ -1680,7 +1680,7 @@ static void fcoe_recv_frame(struct sk_bu +@@ -1738,7 +1738,7 @@ static void fcoe_recv_frame(struct sk_bu */ hp = (struct fcoe_hdr *) skb_network_header(skb); @@ -55,7 +55,7 @@ Index: linux-3.2/drivers/scsi/fcoe/fcoe.c if (unlikely(FC_FCOE_DECAPS_VER(hp) != FC_FCOE_VER)) { if (stats->ErrorFrames < 5) printk(KERN_WARNING "fcoe: FCoE version " -@@ -1712,13 +1712,13 @@ static void fcoe_recv_frame(struct sk_bu +@@ -1770,13 +1770,13 @@ static void fcoe_recv_frame(struct sk_bu goto drop; if (!fcoe_filter_frames(lport, fp)) { @@ -71,10 +71,10 @@ Index: linux-3.2/drivers/scsi/fcoe/fcoe.c kfree_skb(skb); } -Index: linux-3.2/drivers/scsi/fcoe/fcoe_ctlr.c +Index: linux-3.4/drivers/scsi/fcoe/fcoe_ctlr.c =================================================================== ---- linux-3.2.orig/drivers/scsi/fcoe/fcoe_ctlr.c -+++ linux-3.2/drivers/scsi/fcoe/fcoe_ctlr.c +--- linux-3.4.orig/drivers/scsi/fcoe/fcoe_ctlr.c ++++ linux-3.4/drivers/scsi/fcoe/fcoe_ctlr.c @@ -719,7 +719,7 @@ static unsigned long fcoe_ctlr_age_fcfs( unsigned long sel_time = 0; struct fcoe_dev_stats *stats; @@ -93,10 +93,10 @@ Index: linux-3.2/drivers/scsi/fcoe/fcoe_ctlr.c if (sel_time && !fip->sel_fcf && !fip->sel_time) { sel_time += msecs_to_jiffies(FCOE_CTLR_START_DELAY); fip->sel_time = sel_time; -Index: linux-3.2/drivers/scsi/libfc/fc_exch.c +Index: linux-3.4/drivers/scsi/libfc/fc_exch.c =================================================================== ---- linux-3.2.orig/drivers/scsi/libfc/fc_exch.c -+++ linux-3.2/drivers/scsi/libfc/fc_exch.c +--- linux-3.4.orig/drivers/scsi/libfc/fc_exch.c ++++ linux-3.4/drivers/scsi/libfc/fc_exch.c @@ -724,10 +724,10 @@ static struct fc_exch *fc_exch_em_alloc( } memset(ep, 0, sizeof(*ep)); diff --git a/patches/seqlock-prevent-rt-starvation.patch b/patches/seqlock-prevent-rt-starvation.patch index bc7346b..690490d 100644 --- a/patches/seqlock-prevent-rt-starvation.patch +++ b/patches/seqlock-prevent-rt-starvation.patch @@ -21,10 +21,10 @@ Cc: stable-rt@vger.kernel.org include/net/neighbour.h | 2 - 2 files changed, 46 insertions(+), 11 deletions(-) -Index: linux-3.2/include/linux/seqlock.h +Index: linux-3.4/include/linux/seqlock.h =================================================================== ---- linux-3.2.orig/include/linux/seqlock.h -+++ linux-3.2/include/linux/seqlock.h +--- linux-3.4.orig/include/linux/seqlock.h ++++ linux-3.4/include/linux/seqlock.h @@ -125,18 +125,30 @@ static inline int read_seqcount_retry(co * Sequence counter only version assumes that callers are using their * own mutexing. @@ -153,11 +153,11 @@ Index: linux-3.2/include/linux/seqlock.h spin_unlock_irqrestore(&sl->lock, flags); } -Index: linux-3.2/include/net/neighbour.h +Index: linux-3.4/include/net/neighbour.h =================================================================== ---- linux-3.2.orig/include/net/neighbour.h -+++ linux-3.2/include/net/neighbour.h -@@ -385,7 +385,7 @@ struct neighbour_cb { +--- linux-3.4.orig/include/net/neighbour.h ++++ linux-3.4/include/net/neighbour.h +@@ -394,7 +394,7 @@ struct neighbour_cb { #define NEIGH_CB(skb) ((struct neighbour_cb *)(skb)->cb) diff --git a/patches/seqlock-remove-unused-functions.patch b/patches/seqlock-remove-unused-functions.patch index 5bbffe1..367dfeb 100644 --- a/patches/seqlock-remove-unused-functions.patch +++ b/patches/seqlock-remove-unused-functions.patch @@ -7,10 +7,10 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> include/linux/seqlock.h | 21 --------------------- 1 file changed, 21 deletions(-) -Index: linux-3.2/include/linux/seqlock.h +Index: linux-3.4/include/linux/seqlock.h =================================================================== ---- linux-3.2.orig/include/linux/seqlock.h -+++ linux-3.2/include/linux/seqlock.h +--- linux-3.4.orig/include/linux/seqlock.h ++++ linux-3.4/include/linux/seqlock.h @@ -69,17 +69,6 @@ static inline void write_sequnlock(seqlo spin_unlock(&sl->lock); } diff --git a/patches/seqlock-use-seqcount.patch b/patches/seqlock-use-seqcount.patch index 35920c5..3a29253 100644 --- a/patches/seqlock-use-seqcount.patch +++ b/patches/seqlock-use-seqcount.patch @@ -9,10 +9,10 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> include/linux/seqlock.h | 176 +++++++++++++++++++++++++----------------------- 1 file changed, 93 insertions(+), 83 deletions(-) -Index: rt/include/linux/seqlock.h +Index: linux-3.4/include/linux/seqlock.h =================================================================== ---- rt.orig/include/linux/seqlock.h -+++ rt/include/linux/seqlock.h +--- linux-3.4.orig/include/linux/seqlock.h ++++ linux-3.4/include/linux/seqlock.h @@ -30,81 +30,12 @@ #include <linux/preempt.h> #include <asm/processor.h> diff --git a/patches/skbufhead-raw-lock.patch b/patches/skbufhead-raw-lock.patch index 94a51f3..b58cce7 100644 --- a/patches/skbufhead-raw-lock.patch +++ b/patches/skbufhead-raw-lock.patch @@ -33,7 +33,7 @@ Index: linux-3.4/include/linux/skbuff.h }; struct sk_buff; -@@ -965,6 +966,12 @@ static inline void skb_queue_head_init(s +@@ -967,6 +968,12 @@ static inline void skb_queue_head_init(s __skb_queue_head_init(list); } @@ -67,7 +67,7 @@ Index: linux-3.4/net/core/dev.c #endif } -@@ -3332,7 +3332,7 @@ static void flush_backlog(void *arg) +@@ -3353,7 +3353,7 @@ static void flush_backlog(void *arg) skb_queue_walk_safe(&sd->input_pkt_queue, skb, tmp) { if (skb->dev == dev) { __skb_unlink(skb, &sd->input_pkt_queue); @@ -76,7 +76,7 @@ Index: linux-3.4/net/core/dev.c input_queue_head_incr(sd); } } -@@ -3341,10 +3341,13 @@ static void flush_backlog(void *arg) +@@ -3362,10 +3362,13 @@ static void flush_backlog(void *arg) skb_queue_walk_safe(&sd->process_queue, skb, tmp) { if (skb->dev == dev) { __skb_unlink(skb, &sd->process_queue); @@ -91,7 +91,7 @@ Index: linux-3.4/net/core/dev.c } static int napi_gro_complete(struct sk_buff *skb) -@@ -3828,10 +3831,17 @@ static void net_rx_action(struct softirq +@@ -3849,10 +3852,17 @@ static void net_rx_action(struct softirq struct softnet_data *sd = &__get_cpu_var(softnet_data); unsigned long time_limit = jiffies + 2; int budget = netdev_budget; @@ -109,7 +109,7 @@ Index: linux-3.4/net/core/dev.c while (!list_empty(&sd->poll_list)) { struct napi_struct *n; int work, weight; -@@ -6290,6 +6300,9 @@ static int dev_cpu_callback(struct notif +@@ -6279,6 +6289,9 @@ static int dev_cpu_callback(struct notif netif_rx(skb); input_queue_head_incr(oldsd); } @@ -119,7 +119,7 @@ Index: linux-3.4/net/core/dev.c return NOTIFY_OK; } -@@ -6553,8 +6566,9 @@ static int __init net_dev_init(void) +@@ -6542,8 +6555,9 @@ static int __init net_dev_init(void) struct softnet_data *sd = &per_cpu(softnet_data, i); memset(sd, 0, sizeof(*sd)); diff --git a/patches/softirq-export-in-serving-softirq.patch b/patches/softirq-export-in-serving-softirq.patch index 2f00480..bfd034d 100644 --- a/patches/softirq-export-in-serving-softirq.patch +++ b/patches/softirq-export-in-serving-softirq.patch @@ -16,10 +16,10 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/softirq.c | 1 + 1 file changed, 1 insertion(+) -Index: linux-3.2/kernel/softirq.c +Index: linux-3.4/kernel/softirq.c =================================================================== ---- linux-3.2.orig/kernel/softirq.c -+++ linux-3.2/kernel/softirq.c +--- linux-3.4.orig/kernel/softirq.c ++++ linux-3.4/kernel/softirq.c @@ -439,6 +439,7 @@ int in_serving_softirq(void) preempt_enable(); return res; diff --git a/patches/softirq-fix-unplug-deadlock.patch b/patches/softirq-fix-unplug-deadlock.patch index 986a560..9789c5c 100644 --- a/patches/softirq-fix-unplug-deadlock.patch +++ b/patches/softirq-fix-unplug-deadlock.patch @@ -30,11 +30,11 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/softirq.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) -Index: linux-3.2/kernel/softirq.c +Index: linux-3.4/kernel/softirq.c =================================================================== ---- linux-3.2.orig/kernel/softirq.c -+++ linux-3.2/kernel/softirq.c -@@ -1086,9 +1086,8 @@ static int __cpuinit cpu_callback(struct +--- linux-3.4.orig/kernel/softirq.c ++++ linux-3.4/kernel/softirq.c +@@ -1078,9 +1078,8 @@ static int __cpuinit cpu_callback(struct int hotcpu = (unsigned long)hcpu; struct task_struct *p; @@ -45,7 +45,7 @@ Index: linux-3.2/kernel/softirq.c p = kthread_create_on_node(run_ksoftirqd, hcpu, cpu_to_node(hotcpu), -@@ -1101,19 +1100,16 @@ static int __cpuinit cpu_callback(struct +@@ -1093,19 +1092,16 @@ static int __cpuinit cpu_callback(struct per_cpu(ksoftirqd, hotcpu) = p; break; case CPU_ONLINE: diff --git a/patches/softirq-local-lock.patch b/patches/softirq-local-lock.patch index 6a8c9fc..9719c76 100644 --- a/patches/softirq-local-lock.patch +++ b/patches/softirq-local-lock.patch @@ -102,7 +102,7 @@ Index: linux-3.4/init/main.c =================================================================== --- linux-3.4.orig/init/main.c +++ linux-3.4/init/main.c -@@ -484,6 +484,7 @@ asmlinkage void __init start_kernel(void +@@ -490,6 +490,7 @@ asmlinkage void __init start_kernel(void * Interrupts are still disabled. Do necessary setups, then * enable them */ diff --git a/patches/softirq-preempt-fix-3-re.txt b/patches/softirq-preempt-fix-3-re.txt index bfa367b..154309e 100644 --- a/patches/softirq-preempt-fix-3-re.txt +++ b/patches/softirq-preempt-fix-3-re.txt @@ -103,7 +103,7 @@ Index: linux-3.4/net/core/dev.c =================================================================== --- linux-3.4.orig/net/core/dev.c +++ linux-3.4/net/core/dev.c -@@ -1782,6 +1782,7 @@ static inline void __netif_reschedule(st +@@ -1803,6 +1803,7 @@ static inline void __netif_reschedule(st sd->output_queue_tailp = &q->next_sched; raise_softirq_irqoff(NET_TX_SOFTIRQ); local_irq_restore(flags); @@ -111,7 +111,7 @@ Index: linux-3.4/net/core/dev.c } void __netif_schedule(struct Qdisc *q) -@@ -1803,6 +1804,7 @@ void dev_kfree_skb_irq(struct sk_buff *s +@@ -1824,6 +1825,7 @@ void dev_kfree_skb_irq(struct sk_buff *s sd->completion_queue = skb; raise_softirq_irqoff(NET_TX_SOFTIRQ); local_irq_restore(flags); @@ -119,7 +119,7 @@ Index: linux-3.4/net/core/dev.c } } EXPORT_SYMBOL(dev_kfree_skb_irq); -@@ -2902,6 +2904,7 @@ enqueue: +@@ -2923,6 +2925,7 @@ enqueue: rps_unlock(sd); local_irq_restore(flags); @@ -127,7 +127,7 @@ Index: linux-3.4/net/core/dev.c atomic_long_inc(&skb->dev->rx_dropped); kfree_skb(skb); -@@ -3715,6 +3718,7 @@ static void net_rps_action_and_irq_enabl +@@ -3736,6 +3739,7 @@ static void net_rps_action_and_irq_enabl } else #endif local_irq_enable(); @@ -135,7 +135,7 @@ Index: linux-3.4/net/core/dev.c } static int process_backlog(struct napi_struct *napi, int quota) -@@ -3787,6 +3791,7 @@ void __napi_schedule(struct napi_struct +@@ -3808,6 +3812,7 @@ void __napi_schedule(struct napi_struct local_irq_save(flags); ____napi_schedule(&__get_cpu_var(softnet_data), n); local_irq_restore(flags); @@ -143,7 +143,7 @@ Index: linux-3.4/net/core/dev.c } EXPORT_SYMBOL(__napi_schedule); -@@ -6320,6 +6325,7 @@ static int dev_cpu_callback(struct notif +@@ -6309,6 +6314,7 @@ static int dev_cpu_callback(struct notif raise_softirq_irqoff(NET_TX_SOFTIRQ); local_irq_enable(); diff --git a/patches/softirq-thread-do-softirq.patch b/patches/softirq-thread-do-softirq.patch index 6474d59..418233d 100644 --- a/patches/softirq-thread-do-softirq.patch +++ b/patches/softirq-thread-do-softirq.patch @@ -24,7 +24,7 @@ Index: linux-3.4/net/core/dev.c =================================================================== --- linux-3.4.orig/net/core/dev.c +++ linux-3.4/net/core/dev.c -@@ -2968,7 +2968,7 @@ int netif_rx_ni(struct sk_buff *skb) +@@ -2989,7 +2989,7 @@ int netif_rx_ni(struct sk_buff *skb) preempt_disable(); err = netif_rx(skb); if (local_softirq_pending()) diff --git a/patches/spinlock-types-separate-raw.patch b/patches/spinlock-types-separate-raw.patch index 6e259fc..e7ebba1 100644 --- a/patches/spinlock-types-separate-raw.patch +++ b/patches/spinlock-types-separate-raw.patch @@ -10,10 +10,10 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> include/linux/spinlock_types_raw.h | 56 +++++++++++++++++++++++++++ 4 files changed, 95 insertions(+), 72 deletions(-) -Index: linux-3.2/include/linux/rwlock_types.h +Index: linux-3.4/include/linux/rwlock_types.h =================================================================== ---- linux-3.2.orig/include/linux/rwlock_types.h -+++ linux-3.2/include/linux/rwlock_types.h +--- linux-3.4.orig/include/linux/rwlock_types.h ++++ linux-3.4/include/linux/rwlock_types.h @@ -1,6 +1,10 @@ #ifndef __LINUX_RWLOCK_TYPES_H #define __LINUX_RWLOCK_TYPES_H @@ -25,10 +25,10 @@ Index: linux-3.2/include/linux/rwlock_types.h /* * include/linux/rwlock_types.h - generic rwlock type definitions * and initializers -Index: linux-3.2/include/linux/spinlock_types.h +Index: linux-3.4/include/linux/spinlock_types.h =================================================================== ---- linux-3.2.orig/include/linux/spinlock_types.h -+++ linux-3.2/include/linux/spinlock_types.h +--- linux-3.4.orig/include/linux/spinlock_types.h ++++ linux-3.4/include/linux/spinlock_types.h @@ -9,79 +9,9 @@ * Released under the General Public License (GPL). */ @@ -111,10 +111,10 @@ Index: linux-3.2/include/linux/spinlock_types.h #include <linux/rwlock_types.h> -Index: linux-3.2/include/linux/spinlock_types_nort.h +Index: linux-3.4/include/linux/spinlock_types_nort.h =================================================================== --- /dev/null -+++ linux-3.2/include/linux/spinlock_types_nort.h ++++ linux-3.4/include/linux/spinlock_types_nort.h @@ -0,0 +1,33 @@ +#ifndef __LINUX_SPINLOCK_TYPES_NORT_H +#define __LINUX_SPINLOCK_TYPES_NORT_H @@ -149,10 +149,10 @@ Index: linux-3.2/include/linux/spinlock_types_nort.h +#define DEFINE_SPINLOCK(x) spinlock_t x = __SPIN_LOCK_UNLOCKED(x) + +#endif -Index: linux-3.2/include/linux/spinlock_types_raw.h +Index: linux-3.4/include/linux/spinlock_types_raw.h =================================================================== --- /dev/null -+++ linux-3.2/include/linux/spinlock_types_raw.h ++++ linux-3.4/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-mark-stomper-thread.patch b/patches/stomp-machine-mark-stomper-thread.patch index bc8717a..8445ba1 100644 --- a/patches/stomp-machine-mark-stomper-thread.patch +++ b/patches/stomp-machine-mark-stomper-thread.patch @@ -8,11 +8,11 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/stop_machine.c | 1 + 2 files changed, 2 insertions(+) -Index: linux-3.2/include/linux/sched.h +Index: linux-3.4/include/linux/sched.h =================================================================== ---- linux-3.2.orig/include/linux/sched.h -+++ linux-3.2/include/linux/sched.h -@@ -1822,6 +1822,7 @@ extern void thread_group_times(struct ta +--- linux-3.4.orig/include/linux/sched.h ++++ linux-3.4/include/linux/sched.h +@@ -1864,6 +1864,7 @@ extern void thread_group_times(struct ta #define PF_FROZEN 0x00010000 /* frozen for system suspend */ #define PF_FSTRANS 0x00020000 /* inside a filesystem transaction */ #define PF_KSWAPD 0x00040000 /* I am kswapd */ @@ -20,10 +20,10 @@ Index: linux-3.2/include/linux/sched.h #define PF_LESS_THROTTLE 0x00100000 /* Throttle me less: I clean memory */ #define PF_KTHREAD 0x00200000 /* I am a kernel thread */ #define PF_RANDOMIZE 0x00400000 /* randomize virtual address space */ -Index: linux-3.2/kernel/stop_machine.c +Index: linux-3.4/kernel/stop_machine.c =================================================================== ---- linux-3.2.orig/kernel/stop_machine.c -+++ linux-3.2/kernel/stop_machine.c +--- linux-3.4.orig/kernel/stop_machine.c ++++ linux-3.4/kernel/stop_machine.c @@ -327,6 +327,7 @@ static int __cpuinit cpu_stop_cpu_callba if (IS_ERR(p)) return notifier_from_errno(PTR_ERR(p)); diff --git a/patches/stomp-machine-raw-lock.patch b/patches/stomp-machine-raw-lock.patch index dce4325..bf9424d 100644 --- a/patches/stomp-machine-raw-lock.patch +++ b/patches/stomp-machine-raw-lock.patch @@ -7,10 +7,10 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/stop_machine.c | 58 +++++++++++++++++++++++++++++++++++--------------- 1 file changed, 41 insertions(+), 17 deletions(-) -Index: linux-3.2/kernel/stop_machine.c +Index: linux-3.4/kernel/stop_machine.c =================================================================== ---- linux-3.2.orig/kernel/stop_machine.c -+++ linux-3.2/kernel/stop_machine.c +--- linux-3.4.orig/kernel/stop_machine.c ++++ linux-3.4/kernel/stop_machine.c @@ -29,12 +29,12 @@ struct cpu_stop_done { atomic_t nr_todo; /* nr left to execute */ bool executed; /* actually executed? */ 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 d80cff9..0159c7f 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,10 +13,10 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/stop_machine.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) -Index: linux-3.2/kernel/stop_machine.c +Index: linux-3.4/kernel/stop_machine.c =================================================================== ---- linux-3.2.orig/kernel/stop_machine.c -+++ linux-3.2/kernel/stop_machine.c +--- linux-3.4.orig/kernel/stop_machine.c ++++ linux-3.4/kernel/stop_machine.c @@ -135,6 +135,7 @@ void stop_one_cpu_nowait(unsigned int cp /* static data for stop_cpus */ diff --git a/patches/suspend-prevernt-might-sleep-splats.patch b/patches/suspend-prevernt-might-sleep-splats.patch index aae02dc..6912473 100644 --- a/patches/suspend-prevernt-might-sleep-splats.patch +++ b/patches/suspend-prevernt-might-sleep-splats.patch @@ -40,7 +40,7 @@ Index: linux-3.4/kernel/power/hibernate.c =================================================================== --- linux-3.4.orig/kernel/power/hibernate.c +++ linux-3.4/kernel/power/hibernate.c -@@ -271,6 +271,8 @@ static int create_image(int platform_mod +@@ -270,6 +270,8 @@ static int create_image(int platform_mod local_irq_disable(); @@ -49,7 +49,7 @@ Index: linux-3.4/kernel/power/hibernate.c error = syscore_suspend(); if (error) { printk(KERN_ERR "PM: Some system devices failed to power down, " -@@ -298,6 +300,7 @@ static int create_image(int platform_mod +@@ -297,6 +299,7 @@ static int create_image(int platform_mod syscore_resume(); Enable_irqs: @@ -57,7 +57,7 @@ Index: linux-3.4/kernel/power/hibernate.c local_irq_enable(); Enable_cpus: -@@ -421,6 +424,7 @@ static int resume_target_kernel(bool pla +@@ -420,6 +423,7 @@ static int resume_target_kernel(bool pla goto Enable_cpus; local_irq_disable(); @@ -65,7 +65,7 @@ Index: linux-3.4/kernel/power/hibernate.c error = syscore_suspend(); if (error) -@@ -454,6 +458,7 @@ static int resume_target_kernel(bool pla +@@ -453,6 +457,7 @@ static int resume_target_kernel(bool pla syscore_resume(); Enable_irqs: @@ -73,7 +73,7 @@ Index: linux-3.4/kernel/power/hibernate.c local_irq_enable(); Enable_cpus: -@@ -533,6 +538,7 @@ int hibernation_platform_enter(void) +@@ -532,6 +537,7 @@ int hibernation_platform_enter(void) goto Platform_finish; local_irq_disable(); @@ -81,7 +81,7 @@ Index: linux-3.4/kernel/power/hibernate.c syscore_suspend(); if (pm_wakeup_pending()) { error = -EAGAIN; -@@ -545,6 +551,7 @@ int hibernation_platform_enter(void) +@@ -544,6 +550,7 @@ int hibernation_platform_enter(void) Power_up: syscore_resume(); @@ -93,7 +93,7 @@ Index: linux-3.4/kernel/power/suspend.c =================================================================== --- linux-3.4.orig/kernel/power/suspend.c +++ linux-3.4/kernel/power/suspend.c -@@ -170,6 +170,8 @@ static int suspend_enter(suspend_state_t +@@ -164,6 +164,8 @@ static int suspend_enter(suspend_state_t arch_suspend_disable_irqs(); BUG_ON(!irqs_disabled()); @@ -102,7 +102,7 @@ Index: linux-3.4/kernel/power/suspend.c error = syscore_suspend(); if (!error) { *wakeup = pm_wakeup_pending(); -@@ -180,6 +182,8 @@ static int suspend_enter(suspend_state_t +@@ -174,6 +176,8 @@ static int suspend_enter(suspend_state_t syscore_resume(); } diff --git a/patches/sysfs-realtime-entry.patch b/patches/sysfs-realtime-entry.patch index 4034018..d14cc0c 100644 --- a/patches/sysfs-realtime-entry.patch +++ b/patches/sysfs-realtime-entry.patch @@ -17,10 +17,10 @@ Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> kernel/ksysfs.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) -Index: linux-3.2/kernel/ksysfs.c +Index: linux-3.4/kernel/ksysfs.c =================================================================== ---- linux-3.2.orig/kernel/ksysfs.c -+++ linux-3.2/kernel/ksysfs.c +--- linux-3.4.orig/kernel/ksysfs.c ++++ linux-3.4/kernel/ksysfs.c @@ -133,6 +133,15 @@ KERNEL_ATTR_RO(vmcoreinfo); #endif /* CONFIG_KEXEC */ diff --git a/patches/tasklist-lock-fix-section-conflict.patch b/patches/tasklist-lock-fix-section-conflict.patch index 440f1d8..82be75d 100644 --- a/patches/tasklist-lock-fix-section-conflict.patch +++ b/patches/tasklist-lock-fix-section-conflict.patch @@ -33,10 +33,10 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/fork.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) -Index: linux-3.2/include/linux/rwlock_types.h +Index: linux-3.4/include/linux/rwlock_types.h =================================================================== ---- linux-3.2.orig/include/linux/rwlock_types.h -+++ linux-3.2/include/linux/rwlock_types.h +--- linux-3.4.orig/include/linux/rwlock_types.h ++++ linux-3.4/include/linux/rwlock_types.h @@ -47,6 +47,7 @@ typedef struct { RW_DEP_MAP_INIT(lockname) } #endif @@ -46,11 +46,11 @@ Index: linux-3.2/include/linux/rwlock_types.h + rwlock_t name __cacheline_aligned_in_smp = __RW_LOCK_UNLOCKED(name) #endif /* __LINUX_RWLOCK_TYPES_H */ -Index: linux-3.2/kernel/fork.c +Index: linux-3.4/kernel/fork.c =================================================================== ---- linux-3.2.orig/kernel/fork.c -+++ linux-3.2/kernel/fork.c -@@ -86,7 +86,7 @@ int max_threads; /* tunable limit on nr +--- linux-3.4.orig/kernel/fork.c ++++ linux-3.4/kernel/fork.c +@@ -90,7 +90,7 @@ int max_threads; /* tunable limit on nr DEFINE_PER_CPU(unsigned long, process_counts) = 0; diff --git a/patches/timer-fd-avoid-live-lock.patch b/patches/timer-fd-avoid-live-lock.patch index e53edfa..5544090 100644 --- a/patches/timer-fd-avoid-live-lock.patch +++ b/patches/timer-fd-avoid-live-lock.patch @@ -14,10 +14,10 @@ Cc: stable-rt@vger.kernel.org fs/timerfd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux-3.2/fs/timerfd.c +Index: linux-3.4/fs/timerfd.c =================================================================== ---- linux-3.2.orig/fs/timerfd.c -+++ linux-3.2/fs/timerfd.c +--- linux-3.4.orig/fs/timerfd.c ++++ linux-3.4/fs/timerfd.c @@ -313,7 +313,7 @@ SYSCALL_DEFINE4(timerfd_settime, int, uf if (hrtimer_try_to_cancel(&ctx->tmr) >= 0) break; diff --git a/patches/timer-handle-idle-trylock-in-get-next-timer-irq.patch b/patches/timer-handle-idle-trylock-in-get-next-timer-irq.patch index 402ed9c..4762fae 100644 --- a/patches/timer-handle-idle-trylock-in-get-next-timer-irq.patch +++ b/patches/timer-handle-idle-trylock-in-get-next-timer-irq.patch @@ -9,10 +9,10 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/timer.c | 7 ++++--- 3 files changed, 16 insertions(+), 10 deletions(-) -Index: linux-3.2/include/linux/spinlock_rt.h +Index: linux-3.4/include/linux/spinlock_rt.h =================================================================== ---- linux-3.2.orig/include/linux/spinlock_rt.h -+++ linux-3.2/include/linux/spinlock_rt.h +--- linux-3.4.orig/include/linux/spinlock_rt.h ++++ linux-3.4/include/linux/spinlock_rt.h @@ -51,7 +51,17 @@ extern void __lockfunc __rt_spin_unlock( #define spin_lock_irq(lock) spin_lock(lock) @@ -32,10 +32,10 @@ Index: linux-3.2/include/linux/spinlock_rt.h #ifdef CONFIG_LOCKDEP # define spin_lock_nested(lock, subclass) \ -Index: linux-3.2/kernel/rtmutex.c +Index: linux-3.4/kernel/rtmutex.c =================================================================== ---- linux-3.2.orig/kernel/rtmutex.c -+++ linux-3.2/kernel/rtmutex.c +--- linux-3.4.orig/kernel/rtmutex.c ++++ linux-3.4/kernel/rtmutex.c @@ -861,15 +861,10 @@ EXPORT_SYMBOL(rt_spin_unlock_wait); int __lockfunc rt_spin_trylock(spinlock_t *lock) @@ -53,11 +53,11 @@ Index: linux-3.2/kernel/rtmutex.c return ret; } EXPORT_SYMBOL(rt_spin_trylock); -Index: linux-3.2/kernel/timer.c +Index: linux-3.4/kernel/timer.c =================================================================== ---- linux-3.2.orig/kernel/timer.c -+++ linux-3.2/kernel/timer.c -@@ -1323,13 +1323,14 @@ unsigned long get_next_timer_interrupt(u +--- linux-3.4.orig/kernel/timer.c ++++ linux-3.4/kernel/timer.c +@@ -1373,13 +1373,14 @@ unsigned long get_next_timer_interrupt(u /* * On PREEMPT_RT we cannot sleep here. If the trylock does not * succeed then we return the worst-case 'expires in 1 tick' diff --git a/patches/tty-use-local-irq-nort.patch b/patches/tty-use-local-irq-nort.patch index 46e5378..e34dc82 100644 --- a/patches/tty-use-local-irq-nort.patch +++ b/patches/tty-use-local-irq-nort.patch @@ -25,11 +25,11 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> drivers/tty/tty_ldisc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -Index: linux-3.2/drivers/tty/tty_ldisc.c +Index: linux-3.4/drivers/tty/tty_ldisc.c =================================================================== ---- linux-3.2.orig/drivers/tty/tty_ldisc.c -+++ linux-3.2/drivers/tty/tty_ldisc.c -@@ -71,7 +71,7 @@ static void put_ldisc(struct tty_ldisc * +--- linux-3.4.orig/drivers/tty/tty_ldisc.c ++++ linux-3.4/drivers/tty/tty_ldisc.c +@@ -53,7 +53,7 @@ static void put_ldisc(struct tty_ldisc * * We really want an "atomic_dec_and_lock_irqsave()", * but we don't have it, so this does it by hand. */ @@ -38,7 +38,7 @@ Index: linux-3.2/drivers/tty/tty_ldisc.c if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) { struct tty_ldisc_ops *ldo = ld->ops; -@@ -82,7 +82,7 @@ static void put_ldisc(struct tty_ldisc * +@@ -64,7 +64,7 @@ static void put_ldisc(struct tty_ldisc * kfree(ld); return; } diff --git a/patches/usb-fix-mouse-problem-copying-large-data.patch b/patches/usb-fix-mouse-problem-copying-large-data.patch index 36591d0..008b53a 100644 --- a/patches/usb-fix-mouse-problem-copying-large-data.patch +++ b/patches/usb-fix-mouse-problem-copying-large-data.patch @@ -15,11 +15,11 @@ Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com> drivers/usb/host/ohci-hcd.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) -Index: linux-3.2/drivers/usb/host/ohci-hcd.c +Index: linux-3.4/drivers/usb/host/ohci-hcd.c =================================================================== ---- linux-3.2.orig/drivers/usb/host/ohci-hcd.c -+++ linux-3.2/drivers/usb/host/ohci-hcd.c -@@ -830,9 +830,13 @@ static irqreturn_t ohci_irq (struct usb_ +--- linux-3.4.orig/drivers/usb/host/ohci-hcd.c ++++ linux-3.4/drivers/usb/host/ohci-hcd.c +@@ -829,9 +829,13 @@ static irqreturn_t ohci_irq (struct usb_ } if (ints & OHCI_INTR_WDH) { diff --git a/patches/usb-hcd-use-local-irq-nort.patch b/patches/usb-hcd-use-local-irq-nort.patch index ad219e6..2a62a82 100644 --- a/patches/usb-hcd-use-local-irq-nort.patch +++ b/patches/usb-hcd-use-local-irq-nort.patch @@ -16,7 +16,7 @@ Index: linux-3.4/drivers/usb/core/hcd.c =================================================================== --- linux-3.4.orig/drivers/usb/core/hcd.c +++ linux-3.4/drivers/usb/core/hcd.c -@@ -2131,7 +2131,7 @@ irqreturn_t usb_hcd_irq (int irq, void * +@@ -2143,7 +2143,7 @@ irqreturn_t usb_hcd_irq (int irq, void * * when the first handler doesn't use it. So let's just * assume it's never used. */ @@ -25,7 +25,7 @@ Index: linux-3.4/drivers/usb/core/hcd.c if (unlikely(HCD_DEAD(hcd) || !HCD_HW_ACCESSIBLE(hcd))) rc = IRQ_NONE; -@@ -2140,7 +2140,7 @@ irqreturn_t usb_hcd_irq (int irq, void * +@@ -2152,7 +2152,7 @@ irqreturn_t usb_hcd_irq (int irq, void * else rc = IRQ_HANDLED; diff --git a/patches/user-use-local-irq-nort.patch b/patches/user-use-local-irq-nort.patch index 4331933..eb2ab4d 100644 --- a/patches/user-use-local-irq-nort.patch +++ b/patches/user-use-local-irq-nort.patch @@ -11,10 +11,10 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/user.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -Index: linux-3.2/kernel/user.c +Index: linux-3.4/kernel/user.c =================================================================== ---- linux-3.2.orig/kernel/user.c -+++ linux-3.2/kernel/user.c +--- linux-3.4.orig/kernel/user.c ++++ linux-3.4/kernel/user.c @@ -129,11 +129,11 @@ void free_uid(struct user_struct *up) if (!up) return; diff --git a/patches/workqueue-fix-PF_THREAD_BOUND.patch b/patches/workqueue-fix-PF_THREAD_BOUND.patch index 57f9c97..ef12b06 100644 --- a/patches/workqueue-fix-PF_THREAD_BOUND.patch +++ b/patches/workqueue-fix-PF_THREAD_BOUND.patch @@ -28,11 +28,11 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/workqueue.c | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) -Index: linux-3.2/kernel/workqueue.c +Index: linux-3.4/kernel/workqueue.c =================================================================== ---- linux-3.2.orig/kernel/workqueue.c -+++ linux-3.2/kernel/workqueue.c -@@ -1286,8 +1286,14 @@ __acquires(&gcwq->lock) +--- linux-3.4.orig/kernel/workqueue.c ++++ linux-3.4/kernel/workqueue.c +@@ -1283,8 +1283,14 @@ __acquires(&gcwq->lock) return false; if (task_cpu(task) == gcwq->cpu && cpumask_equal(¤t->cpus_allowed, @@ -48,7 +48,7 @@ Index: linux-3.2/kernel/workqueue.c spin_unlock_irq(&gcwq->lock); /* -@@ -1301,6 +1307,18 @@ __acquires(&gcwq->lock) +@@ -1298,6 +1304,18 @@ __acquires(&gcwq->lock) } } @@ -67,7 +67,7 @@ Index: linux-3.2/kernel/workqueue.c static struct worker *alloc_worker(void) { struct worker *worker; -@@ -1363,15 +1381,9 @@ static struct worker *create_worker(stru +@@ -1360,15 +1378,9 @@ static struct worker *create_worker(stru if (IS_ERR(worker->task)) goto fail; @@ -83,7 +83,7 @@ Index: linux-3.2/kernel/workqueue.c if (on_unbound_cpu) worker->flags |= WORKER_UNBOUND; } -@@ -2048,7 +2060,7 @@ repeat: +@@ -2045,7 +2057,7 @@ repeat: if (keep_working(gcwq)) wake_up_worker(gcwq); @@ -92,7 +92,7 @@ Index: linux-3.2/kernel/workqueue.c } schedule(); -@@ -2997,7 +3009,6 @@ struct workqueue_struct *__alloc_workque +@@ -2995,7 +3007,6 @@ struct workqueue_struct *__alloc_workque if (IS_ERR(rescuer->task)) goto err; diff --git a/patches/workqueue-hotplug-fix.patch b/patches/workqueue-hotplug-fix.patch index 3b4b54f..804d359 100644 --- a/patches/workqueue-hotplug-fix.patch +++ b/patches/workqueue-hotplug-fix.patch @@ -58,11 +58,11 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/workqueue.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -Index: linux-3.2/kernel/workqueue.c +Index: linux-3.4/kernel/workqueue.c =================================================================== ---- linux-3.2.orig/kernel/workqueue.c -+++ linux-3.2/kernel/workqueue.c -@@ -3299,14 +3299,14 @@ static void flush_gcwq(struct global_cwq +--- linux-3.4.orig/kernel/workqueue.c ++++ linux-3.4/kernel/workqueue.c +@@ -3297,14 +3297,14 @@ static void flush_gcwq(struct global_cwq spin_unlock_irq(&gcwq->lock); diff --git a/patches/workqueue-more-hotplug-fallout.patch b/patches/workqueue-more-hotplug-fallout.patch index 33569e0..99b4f5c 100644 --- a/patches/workqueue-more-hotplug-fallout.patch +++ b/patches/workqueue-more-hotplug-fallout.patch @@ -9,11 +9,11 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/workqueue.c | 5 +++++ 1 file changed, 5 insertions(+) -Index: linux-3.2/kernel/workqueue.c +Index: linux-3.4/kernel/workqueue.c =================================================================== ---- linux-3.2.orig/kernel/workqueue.c -+++ linux-3.2/kernel/workqueue.c -@@ -3217,6 +3217,11 @@ static int __devinit workqueue_cpu_up_ca +--- linux-3.4.orig/kernel/workqueue.c ++++ linux-3.4/kernel/workqueue.c +@@ -3215,6 +3215,11 @@ static int __devinit workqueue_cpu_up_ca new_worker = create_worker(gcwq, false); if (!new_worker) return NOTIFY_BAD; diff --git a/patches/workqueue-sanity.patch b/patches/workqueue-sanity.patch index c3b2070..7995c22 100644 --- a/patches/workqueue-sanity.patch +++ b/patches/workqueue-sanity.patch @@ -32,11 +32,11 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/workqueue.c | 560 ++++++++++++---------------------------------- 3 files changed, 154 insertions(+), 417 deletions(-) -Index: linux-3.2/include/linux/cpu.h +Index: linux-3.4/include/linux/cpu.h =================================================================== ---- linux-3.2.orig/include/linux/cpu.h -+++ linux-3.2/include/linux/cpu.h -@@ -66,8 +66,10 @@ enum { +--- linux-3.4.orig/include/linux/cpu.h ++++ linux-3.4/include/linux/cpu.h +@@ -75,8 +75,10 @@ enum { /* migration should happen before other stuff but after perf */ CPU_PRI_PERF = 20, CPU_PRI_MIGRATION = 10, @@ -49,10 +49,10 @@ Index: linux-3.2/include/linux/cpu.h }; #define CPU_ONLINE 0x0002 /* CPU (unsigned)v is up */ -Index: linux-3.2/include/linux/workqueue.h +Index: linux-3.4/include/linux/workqueue.h =================================================================== ---- linux-3.2.orig/include/linux/workqueue.h -+++ linux-3.2/include/linux/workqueue.h +--- linux-3.4.orig/include/linux/workqueue.h ++++ linux-3.4/include/linux/workqueue.h @@ -254,9 +254,10 @@ enum { WQ_MEM_RECLAIM = 1 << 3, /* may be used for memory reclaim */ WQ_HIGHPRI = 1 << 4, /* high priority */ @@ -66,10 +66,10 @@ Index: linux-3.2/include/linux/workqueue.h WQ_MAX_ACTIVE = 512, /* I like 512, better ideas? */ WQ_MAX_UNBOUND_PER_CPU = 4, /* 4 * #cpus for unbound wq */ -Index: linux-3.2/kernel/workqueue.c +Index: linux-3.4/kernel/workqueue.c =================================================================== ---- linux-3.2.orig/kernel/workqueue.c -+++ linux-3.2/kernel/workqueue.c +--- linux-3.4.orig/kernel/workqueue.c ++++ linux-3.4/kernel/workqueue.c @@ -41,6 +41,7 @@ #include <linux/debug_locks.h> #include <linux/lockdep.h> @@ -131,7 +131,7 @@ Index: linux-3.2/kernel/workqueue.c } ____cacheline_aligned_in_smp; /* -@@ -972,13 +959,38 @@ static bool is_chained_work(struct workq +@@ -969,13 +956,38 @@ static bool is_chained_work(struct workq return false; } @@ -173,7 +173,7 @@ Index: linux-3.2/kernel/workqueue.c unsigned long flags; debug_work_activate(work); -@@ -1024,27 +1036,32 @@ static void __queue_work(unsigned int cp +@@ -1021,27 +1033,32 @@ static void __queue_work(unsigned int cp spin_lock_irqsave(&gcwq->lock, flags); } @@ -223,7 +223,7 @@ Index: linux-3.2/kernel/workqueue.c } /** -@@ -1061,34 +1078,19 @@ int queue_work(struct workqueue_struct * +@@ -1058,34 +1075,19 @@ int queue_work(struct workqueue_struct * { int ret; @@ -261,7 +261,7 @@ Index: linux-3.2/kernel/workqueue.c } EXPORT_SYMBOL_GPL(queue_work_on); -@@ -1134,6 +1136,8 @@ int queue_delayed_work_on(int cpu, struc +@@ -1131,6 +1133,8 @@ int queue_delayed_work_on(int cpu, struc struct timer_list *timer = &dwork->timer; struct work_struct *work = &dwork->work; @@ -270,7 +270,7 @@ Index: linux-3.2/kernel/workqueue.c if (!test_and_set_bit(WORK_STRUCT_PENDING_BIT, work_data_bits(work))) { unsigned int lcpu; -@@ -1199,12 +1203,13 @@ static void worker_enter_idle(struct wor +@@ -1196,12 +1200,13 @@ static void worker_enter_idle(struct wor /* idle_list is LIFO */ list_add(&worker->entry, &gcwq->idle_list); @@ -290,7 +290,7 @@ Index: linux-3.2/kernel/workqueue.c /* sanity check nr_running */ WARN_ON_ONCE(gcwq->nr_workers == gcwq->nr_idle && -@@ -1296,23 +1301,6 @@ __acquires(&gcwq->lock) +@@ -1293,23 +1298,6 @@ __acquires(&gcwq->lock) } } @@ -314,7 +314,7 @@ Index: linux-3.2/kernel/workqueue.c static struct worker *alloc_worker(void) { struct worker *worker; -@@ -1321,7 +1309,6 @@ static struct worker *alloc_worker(void) +@@ -1318,7 +1306,6 @@ static struct worker *alloc_worker(void) if (worker) { INIT_LIST_HEAD(&worker->entry); INIT_LIST_HEAD(&worker->scheduled); @@ -322,7 +322,7 @@ Index: linux-3.2/kernel/workqueue.c /* on creation a worker is in !idle && prep state */ worker->flags = WORKER_PREP; } -@@ -1661,13 +1648,6 @@ static bool manage_workers(struct worker +@@ -1658,13 +1645,6 @@ static bool manage_workers(struct worker gcwq->flags &= ~GCWQ_MANAGING_WORKERS; @@ -336,7 +336,7 @@ Index: linux-3.2/kernel/workqueue.c return ret; } -@@ -3207,171 +3187,71 @@ EXPORT_SYMBOL_GPL(work_busy); +@@ -3205,171 +3185,71 @@ EXPORT_SYMBOL_GPL(work_busy); * gcwqs serve mix of short, long and very long running works making * blocked draining impractical. * @@ -559,7 +559,7 @@ Index: linux-3.2/kernel/workqueue.c int nr_works = 0; list_for_each_entry(work, &gcwq->worklist, entry) { -@@ -3385,200 +3265,55 @@ static int __cpuinit trustee_thread(void +@@ -3383,200 +3263,55 @@ static int __cpuinit trustee_thread(void wake_up_process(worker->task); } @@ -785,7 +785,7 @@ Index: linux-3.2/kernel/workqueue.c return notifier_from_errno(0); } -@@ -3775,7 +3510,8 @@ static int __init init_workqueues(void) +@@ -3773,7 +3508,8 @@ static int __init init_workqueues(void) unsigned int cpu; int i; @@ -795,7 +795,7 @@ Index: linux-3.2/kernel/workqueue.c /* initialize gcwqs */ for_each_gcwq_cpu(cpu) { -@@ -3798,9 +3534,7 @@ static int __init init_workqueues(void) +@@ -3796,9 +3532,7 @@ static int __init init_workqueues(void) (unsigned long)gcwq); ida_init(&gcwq->worker_ida); diff --git a/patches/workqueue-use-get-cpu-light.patch b/patches/workqueue-use-get-cpu-light.patch index 91298f2..99d9f32 100644 --- a/patches/workqueue-use-get-cpu-light.patch +++ b/patches/workqueue-use-get-cpu-light.patch @@ -7,11 +7,11 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> kernel/workqueue.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -Index: linux-3.2/kernel/workqueue.c +Index: linux-3.4/kernel/workqueue.c =================================================================== ---- linux-3.2.orig/kernel/workqueue.c -+++ linux-3.2/kernel/workqueue.c -@@ -1061,8 +1061,8 @@ int queue_work(struct workqueue_struct * +--- linux-3.4.orig/kernel/workqueue.c ++++ linux-3.4/kernel/workqueue.c +@@ -1058,8 +1058,8 @@ int queue_work(struct workqueue_struct * { int ret; diff --git a/patches/x86-crypto-reduce-preempt-disabled-regions.patch b/patches/x86-crypto-reduce-preempt-disabled-regions.patch index 0c67e85..545736d 100644 --- a/patches/x86-crypto-reduce-preempt-disabled-regions.patch +++ b/patches/x86-crypto-reduce-preempt-disabled-regions.patch @@ -16,11 +16,11 @@ 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-3.2/arch/x86/crypto/aesni-intel_glue.c +Index: linux-3.4/arch/x86/crypto/aesni-intel_glue.c =================================================================== ---- linux-3.2.orig/arch/x86/crypto/aesni-intel_glue.c -+++ linux-3.2/arch/x86/crypto/aesni-intel_glue.c -@@ -289,14 +289,14 @@ static int ecb_encrypt(struct blkcipher_ +--- linux-3.4.orig/arch/x86/crypto/aesni-intel_glue.c ++++ linux-3.4/arch/x86/crypto/aesni-intel_glue.c +@@ -290,14 +290,14 @@ static int ecb_encrypt(struct blkcipher_ err = blkcipher_walk_virt(desc, &walk); desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP; @@ -38,7 +38,7 @@ Index: linux-3.2/arch/x86/crypto/aesni-intel_glue.c return err; } -@@ -313,14 +313,14 @@ static int ecb_decrypt(struct blkcipher_ +@@ -314,14 +314,14 @@ static int ecb_decrypt(struct blkcipher_ err = blkcipher_walk_virt(desc, &walk); desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP; @@ -55,7 +55,7 @@ Index: linux-3.2/arch/x86/crypto/aesni-intel_glue.c return err; } -@@ -359,14 +359,14 @@ static int cbc_encrypt(struct blkcipher_ +@@ -360,14 +360,14 @@ static int cbc_encrypt(struct blkcipher_ err = blkcipher_walk_virt(desc, &walk); desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP; @@ -72,7 +72,7 @@ Index: linux-3.2/arch/x86/crypto/aesni-intel_glue.c return err; } -@@ -383,14 +383,14 @@ static int cbc_decrypt(struct blkcipher_ +@@ -384,14 +384,14 @@ static int cbc_decrypt(struct blkcipher_ err = blkcipher_walk_virt(desc, &walk); desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP; @@ -89,7 +89,7 @@ Index: linux-3.2/arch/x86/crypto/aesni-intel_glue.c return err; } -@@ -445,18 +445,20 @@ static int ctr_crypt(struct blkcipher_de +@@ -446,18 +446,20 @@ static int ctr_crypt(struct blkcipher_de err = blkcipher_walk_virt_block(desc, &walk, AES_BLOCK_SIZE); desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP; diff --git a/patches/x86-disable-debug-stack.patch b/patches/x86-disable-debug-stack.patch index 03ef21a..365e550 100644 --- a/patches/x86-disable-debug-stack.patch +++ b/patches/x86-disable-debug-stack.patch @@ -41,10 +41,10 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> arch/x86/kernel/dumpstack_64.c | 4 ++++ 3 files changed, 21 insertions(+), 6 deletions(-) -Index: linux-3.2/arch/x86/include/asm/page_64_types.h +Index: linux-3.4/arch/x86/include/asm/page_64_types.h =================================================================== ---- linux-3.2.orig/arch/x86/include/asm/page_64_types.h -+++ linux-3.2/arch/x86/include/asm/page_64_types.h +--- linux-3.4.orig/arch/x86/include/asm/page_64_types.h ++++ linux-3.4/arch/x86/include/asm/page_64_types.h @@ -14,12 +14,21 @@ #define IRQ_STACK_ORDER 2 #define IRQ_STACK_SIZE (PAGE_SIZE << IRQ_STACK_ORDER) @@ -73,11 +73,11 @@ Index: linux-3.2/arch/x86/include/asm/page_64_types.h #define PUD_PAGE_SIZE (_AC(1, UL) << PUD_SHIFT) #define PUD_PAGE_MASK (~(PUD_PAGE_SIZE-1)) -Index: linux-3.2/arch/x86/kernel/cpu/common.c +Index: linux-3.4/arch/x86/kernel/cpu/common.c =================================================================== ---- linux-3.2.orig/arch/x86/kernel/cpu/common.c -+++ linux-3.2/arch/x86/kernel/cpu/common.c -@@ -1055,7 +1055,9 @@ DEFINE_PER_CPU(unsigned int, irq_count) +--- linux-3.4.orig/arch/x86/kernel/cpu/common.c ++++ linux-3.4/arch/x86/kernel/cpu/common.c +@@ -1056,7 +1056,9 @@ DEFINE_PER_CPU(struct task_struct *, fpu */ static const unsigned int exception_stack_sizes[N_EXCEPTION_STACKS] = { [0 ... N_EXCEPTION_STACKS - 1] = EXCEPTION_STKSZ, @@ -87,10 +87,10 @@ Index: linux-3.2/arch/x86/kernel/cpu/common.c }; static DEFINE_PER_CPU_PAGE_ALIGNED(char, exception_stacks -Index: linux-3.2/arch/x86/kernel/dumpstack_64.c +Index: linux-3.4/arch/x86/kernel/dumpstack_64.c =================================================================== ---- linux-3.2.orig/arch/x86/kernel/dumpstack_64.c -+++ linux-3.2/arch/x86/kernel/dumpstack_64.c +--- linux-3.4.orig/arch/x86/kernel/dumpstack_64.c ++++ linux-3.4/arch/x86/kernel/dumpstack_64.c @@ -21,10 +21,14 @@ (N_EXCEPTION_STACKS + DEBUG_STKSZ/EXCEPTION_STKSZ - 2) diff --git a/patches/x86-highmem-warn.patch b/patches/x86-highmem-warn.patch index 86d9720..b02c61b 100644 --- a/patches/x86-highmem-warn.patch +++ b/patches/x86-highmem-warn.patch @@ -12,10 +12,10 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> arch/x86/mm/highmem_32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: linux-3.2/arch/x86/mm/highmem_32.c +Index: linux-3.4/arch/x86/mm/highmem_32.c =================================================================== ---- linux-3.2.orig/arch/x86/mm/highmem_32.c -+++ linux-3.2/arch/x86/mm/highmem_32.c +--- linux-3.4.orig/arch/x86/mm/highmem_32.c ++++ linux-3.4/arch/x86/mm/highmem_32.c @@ -43,7 +43,7 @@ void *kmap_atomic_prot(struct page *page type = kmap_atomic_idx_push(); idx = type + KM_TYPE_NR*smp_processor_id(); diff --git a/patches/x86-kvm-require-const-tsc-for-rt.patch b/patches/x86-kvm-require-const-tsc-for-rt.patch index 9356ec7..b30770e 100644 --- a/patches/x86-kvm-require-const-tsc-for-rt.patch +++ b/patches/x86-kvm-require-const-tsc-for-rt.patch @@ -7,11 +7,11 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> arch/x86/kvm/x86.c | 7 +++++++ 1 file changed, 7 insertions(+) -Index: linux-3.2/arch/x86/kvm/x86.c +Index: linux-3.4/arch/x86/kvm/x86.c =================================================================== ---- linux-3.2.orig/arch/x86/kvm/x86.c -+++ linux-3.2/arch/x86/kvm/x86.c -@@ -5184,6 +5184,13 @@ int kvm_arch_init(void *opaque) +--- linux-3.4.orig/arch/x86/kvm/x86.c ++++ linux-3.4/arch/x86/kvm/x86.c +@@ -4882,6 +4882,13 @@ int kvm_arch_init(void *opaque) goto out; } |