rpms/kernel/F-12 highmem-fix-arm-powerpc-kmap_types.patch, NONE, 1.1 kernel.spec, 1.1930, 1.1931

[Kyle McMartin]

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11617

Modified Files:
	kernel.spec 
Added Files:
	highmem-fix-arm-powerpc-kmap_types.patch 
Log Message:
* Fri Nov 21 2009 Kyle McMartin <kyle at redhat.com>
- Fix up ssp' highmem fixes with fixes for arm & ppc.


highmem-fix-arm-powerpc-kmap_types.patch:
 arm/include/asm/kmap_types.h     |    6 ++++++
 powerpc/include/asm/kmap_types.h |    7 ++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

--- NEW FILE highmem-fix-arm-powerpc-kmap_types.patch ---
>From 37197359d55c867af776d4eb941ee143a1667889 Mon Sep 17 00:00:00 2001
From: Kyle McMartin <kyle at ihatethathostname.lab.bos.redhat.com>
Date: Thu, 19 Nov 2009 09:58:45 -0500
Subject: [PATCH] fixes for arm & powerpc kmap types

cribbed from rmk
---
 arch/arm/include/asm/kmap_types.h     |    6 ++++++
 arch/powerpc/include/asm/kmap_types.h |    6 ++++++
 2 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/arch/arm/include/asm/kmap_types.h b/arch/arm/include/asm/kmap_types.h
index d16ec97..fc085ba 100644
--- 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
diff --git a/arch/powerpc/include/asm/kmap_types.h b/arch/powerpc/include/asm/kmap_types.h
index b6bac6f..5e041a8 100644
--- a/arch/powerpc/include/asm/kmap_types.h
+++ b/arch/powerpc/include/asm/kmap_types.h
@@ -29,5 +29,11 @@ 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	/* __KERNEL__ */
 #endif	/* _ASM_POWERPC_KMAP_TYPES_H */
-- 
1.6.5.2



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1930
retrieving revision 1.1931
diff -u -p -r1.1930 -r1.1931
--- kernel.spec	20 Nov 2009 23:05:11 -0000	1.1930
+++ kernel.spec	21 Nov 2009 16:04:12 -0000	1.1931
@@ -798,6 +798,7 @@ Patch14456: tg3-06-fix-5906-transmit-han
 
 Patch14460: highmem-Fix-debug_kmap_atomic-to-also-handle-KM_IRQ_.patch
 Patch14461: highmem-Fix-race-in-debug_kmap_atomic-which-could-ca.patch
+Patch14462: highmem-fix-arm-powerpc-kmap_types.patch
 
 %endif
 
@@ -1484,8 +1485,9 @@ ApplyPatch sched-retune-scheduler-latenc
 # fix wakeup latency
 ApplyPatch sched-update-the-clock-of-runqueue-select-task-rq-selected.patch
 
-#ApplyPatch highmem-Fix-debug_kmap_atomic-to-also-handle-KM_IRQ_.patch
-#ApplyPatch highmem-Fix-race-in-debug_kmap_atomic-which-could-ca.patch
+ApplyPatch highmem-Fix-debug_kmap_atomic-to-also-handle-KM_IRQ_.patch
+ApplyPatch highmem-Fix-race-in-debug_kmap_atomic-which-could-ca.patch
+ApplyPatch highmem-fix-arm-powerpc-kmap_types.patch
 
 # END OF PATCH APPLICATIONS
 
@@ -2136,6 +2138,9 @@ fi
 # and build.
 
 %changelog
+* Fri Nov 21 2009 Kyle McMartin <kyle at redhat.com>
+- Fix up ssp' highmem fixes with fixes for arm & ppc.
+
 * Thu Nov 20 2009 Chris Wright <chrisw at redhat.com> 2.6.31.6-144
 - VT-d: another fallback for another BIOS bug (#524808)