rpms/kernel/F-10 linux-2.6-hotfixes.patch,1.3,1.4

[Chuck Ebbert]

Author: cebbert

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

Modified Files:
	linux-2.6-hotfixes.patch 
Log Message:
add hotfixes from rawhide

linux-2.6-hotfixes.patch:

Index: linux-2.6-hotfixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-hotfixes.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-hotfixes.patch	15 Feb 2008 20:40:46 -0000	1.3
+++ linux-2.6-hotfixes.patch	1 Mar 2009 04:28:55 -0000	1.4
@@ -0,0 +1,60 @@
+Ingo Molnar (1):
+      x86: i915 needs pgprot_writecombine() and is_io_mapping_possible()
+
+
+ arch/x86/mm/iomap_32.c |   15 ++++-----------
+ arch/x86/mm/pat.c      |    2 ++
+ 2 files changed, 6 insertions(+), 11 deletions(-)
+
+diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c
+index 6c2b1af..04102d4 100644
+--- a/arch/x86/mm/iomap_32.c
++++ b/arch/x86/mm/iomap_32.c
+@@ -20,23 +20,16 @@
+ #include <asm/pat.h>
+ #include <linux/module.h>
+ 
+-#ifdef CONFIG_X86_PAE
+-int
+-is_io_mapping_possible(resource_size_t base, unsigned long size)
+-{
+-	return 1;
+-}
+-#else
+-int
+-is_io_mapping_possible(resource_size_t base, unsigned long size)
++int is_io_mapping_possible(resource_size_t base, unsigned long size)
+ {
++#ifndef CONFIG_X86_PAE
+ 	/* There is no way to map greater than 1 << 32 address without PAE */
+ 	if (base + size > 0x100000000ULL)
+ 		return 0;
+-
++#endif
+ 	return 1;
+ }
+-#endif
++EXPORT_SYMBOL_GPL(is_io_mapping_possible);
+ 
+ /* Map 'pfn' using fixed map 'type' and protections 'prot'
+  */
+diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
+index aebbf67..e0ab173 100644
+--- a/arch/x86/mm/pat.c
++++ b/arch/x86/mm/pat.c
+@@ -11,6 +11,7 @@
+ #include <linux/bootmem.h>
+ #include <linux/debugfs.h>
+ #include <linux/kernel.h>
++#include <linux/module.h>
+ #include <linux/gfp.h>
+ #include <linux/mm.h>
+ #include <linux/fs.h>
+@@ -868,6 +869,7 @@ pgprot_t pgprot_writecombine(pgprot_t prot)
+ 	else
+ 		return pgprot_noncached(prot);
+ }
++EXPORT_SYMBOL_GPL(pgprot_writecombine);
+ 
+ #if defined(CONFIG_DEBUG_FS) && defined(CONFIG_X86_PAT)
+