--- /dev/null
+From 4ff1fa278b0bd1b2dd3c42efc0cb86788ffe05d5 Mon Sep 17 00:00:00 2001
+From: Russell King <rmk+kernel@arm.linux.org.uk>
+Date: Wed, 18 Nov 2009 18:03:19 +0000
+Subject: [ARM] kmap: fix build errors with DEBUG_HIGHMEM enabled
+
+From: Russell King <rmk+kernel@arm.linux.org.uk>
+
+commit 4ff1fa278b0bd1b2dd3c42efc0cb86788ffe05d5 upstream.
+
+d451564 broke ARM by requiring KM_IRQ_PTE, KM_NMI and KM_NMI_PTE to
+always be defined. Solve this by providing invalid definitions for
+these constants, but only if CONFIG_DEBUG_HIGHMEM is enabled.
+
+Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ arch/arm/include/asm/kmap_types.h | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- a/arch/arm/include/asm/kmap_types.h
++++ b/arch/arm/include/asm/kmap_types.h
+@@ -22,4 +22,10 @@ enum km_type {
+ KM_TYPE_NR
+ };
+
++#ifdef CONFIG_DEBUG_HIGHMEM
++#define KM_NMI (-1)
++#define KM_NMI_PTE (-1)
++#define KM_IRQ_PTE (-1)
++#endif
++
+ #endif
--- /dev/null
+From e8105903d78c81119754a42926951d9d17e191ba Mon Sep 17 00:00:00 2001
+From: Becky Bruce <beckyb@kernel.crashing.org>
+Date: Mon, 23 Nov 2009 12:28:53 +0000
+Subject: powerpc: Fix DEBUG_HIGHMEM build break from d4515646699
+
+From: Becky Bruce <beckyb@kernel.crashing.org>
+
+commit e8105903d78c81119754a42926951d9d17e191ba upstream.
+
+Code was added to mm/higmem.c that depends on several
+kmap types that powerpc does not support. We add dummy
+invalid definitions for KM_NMI, KM_NM_PTE, and KM_IRQ_PTE.
+
+According to list discussion, this fix should not be needed
+anymore starting with 2.6.33. The code is commented to this
+effect so hopefully we will remember to remove this.
+
+Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>
+Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ arch/powerpc/include/asm/kmap_types.h | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+--- a/arch/powerpc/include/asm/kmap_types.h
++++ b/arch/powerpc/include/asm/kmap_types.h
+@@ -29,5 +29,16 @@ enum km_type {
+ KM_TYPE_NR
+ };
+
++/*
++ * This is a temporary build fix that (so they say on lkml....) should no longer
++ * be required after 2.6.33, because of changes planned to the kmap code.
++ * Let's try to remove this cruft then.
++ */
++#ifdef CONFIG_DEBUG_HIGHMEM
++#define KM_NMI (-1)
++#define KM_NMI_PTE (-1)
++#define KM_IRQ_PTE (-1)
++#endif
++
+ #endif /* __KERNEL__ */
+ #endif /* _ASM_POWERPC_KMAP_TYPES_H */
--- /dev/null
+From bdddd2963c0264c56f18043f6fa829d3c1d3d1c0 Mon Sep 17 00:00:00 2001
+From: Rusty Russell <rusty@rustcorp.com.au>
+Date: Wed, 2 Dec 2009 14:09:16 +1030
+Subject: sched: Fix isolcpus boot option
+
+From: Rusty Russell <rusty@rustcorp.com.au>
+
+commit bdddd2963c0264c56f18043f6fa829d3c1d3d1c0 upstream.
+
+Anton Blanchard wrote:
+
+> We allocate and zero cpu_isolated_map after the isolcpus
+> __setup option has run. This means cpu_isolated_map always
+> ends up empty and if CPUMASK_OFFSTACK is enabled we write to a
+> cpumask that hasn't been allocated.
+
+I introduced this regression in 49557e620339cb13 (sched: Fix
+boot crash by zalloc()ing most of the cpu masks).
+
+Use the bootmem allocator if they set isolcpus=, otherwise
+allocate and zero like normal.
+
+Reported-by: Anton Blanchard <anton@samba.org>
+Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
+Cc: peterz@infradead.org
+Cc: Linus Torvalds <torvalds@linux-foundation.org>
+LKML-Reference: <200912021409.17013.rusty@rustcorp.com.au>
+Signed-off-by: Ingo Molnar <mingo@elte.hu>
+Tested-by: Anton Blanchard <anton@samba.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ kernel/sched.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+--- a/kernel/sched.c
++++ b/kernel/sched.c
+@@ -7945,6 +7945,7 @@ static cpumask_var_t cpu_isolated_map;
+ /* Setup the mask of cpus configured for isolated domains */
+ static int __init isolated_cpu_setup(char *str)
+ {
++ alloc_bootmem_cpumask_var(&cpu_isolated_map);
+ cpulist_parse(str, cpu_isolated_map);
+ return 1;
+ }
+@@ -9389,7 +9390,9 @@ void __init sched_init(void)
+ zalloc_cpumask_var(&nohz.cpu_mask, GFP_NOWAIT);
+ alloc_cpumask_var(&nohz.ilb_grp_nohz_mask, GFP_NOWAIT);
+ #endif
+- zalloc_cpumask_var(&cpu_isolated_map, GFP_NOWAIT);
++ /* May be allocated at isolcpus cmdline parse time */
++ if (cpu_isolated_map == NULL)
++ zalloc_cpumask_var(&cpu_isolated_map, GFP_NOWAIT);
+ #endif /* SMP */
+
+ perf_counter_init();
sound-rawmidi-fix-midi-device-o_append-error-handling.patch
highmem-fix-race-in-debug_kmap_atomic-which-could-cause-warn_count-to-underflow.patch
highmem-fix-debug_kmap_atomic-to-also-handle-km_irq_pte-km_nmi-and-km_nmi_pte.patch
+powerpc-fix-debug_highmem-build-break-from-d4515646699.patch
+kmap-fix-build-errors-with-debug_highmem-enabled.patch
v4l-dvb-13169-bttv-fix-potential-out-of-order-field-processing.patch
v4l-dvb-13170-bttv-fix-reversed-polarity-error-when-switching-video-standard.patch
v4l-dvb-13109-tda18271-fix-signedness-issue-in-tda18271_rf_tracking_filters_init.patch
sparc64-replace-parentheses-in-pmul.patch
sparc-move-of_set_property_mutex-acquisition-outside-of-devtree_lock-grab.patch
sched-fix-boot-crash-by-zalloc-ing-most-of-the-cpu-masks.patch
+sched-fix-isolcpus-boot-option.patch
v4l-dvb-13202-smsusb-add-autodetection-support-for-three-additional-hauppauge-usb-ids.patch
v4l-dvb-13313-saa7134-add-support-for-force_ts_valid-mode-for-mpeg-ts-input.patch
v4l-dvb-13314-saa7134-set-ts_force_val-for-the-hauppauge-wintv-hvr-1150.patch
projects / thirdparty / kernel / stable-queue.git / commitdiff
