rpms/kernel/F-9 linux-2.6-x86-mm-ioremap-64-bit-resource-on-32-bit-kernel.patch, NONE, 1.1 kernel.spec, 1.720, 1.721

[Chuck Ebbert (cebbert)]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2455

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-x86-mm-ioremap-64-bit-resource-on-32-bit-kernel.patch 
Log Message:
Fix 64-bit resource checking on 32-bit kernels. (#447143)

linux-2.6-x86-mm-ioremap-64-bit-resource-on-32-bit-kernel.patch:

--- NEW FILE linux-2.6-x86-mm-ioremap-64-bit-resource-on-32-bit-kernel.patch ---
From: Ingo Molnar <mingo at elte.hu>
Date: Tue, 25 Mar 2008 07:31:17 +0000 (+0100)
Subject: x86: ioremap of 64-bit resource on 32-bit kernel fix
X-Git-Tag: v2.6.26-rc1~1154^2~109
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=756a6c68556600aec9460346332884d891d5beb4

x86: ioremap of 64-bit resource on 32-bit kernel fix

Signed-off-by: Ingo Molnar <mingo at elte.hu>
---

diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
index 7338c5d..c590fd2 100644
--- a/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c
@@ -47,7 +47,7 @@ static inline int phys_addr_valid(unsigned long addr)
 
 int page_is_ram(unsigned long pagenr)
 {
-	unsigned long addr, end;
+	resource_size_t addr, end;
 	int i;
 
 	/*
@@ -120,7 +120,8 @@ int ioremap_change_attr(unsigned long vaddr, unsigned long size,
 static void __iomem *__ioremap(resource_size_t phys_addr, unsigned long size,
 			       enum ioremap_mode mode)
 {
-	unsigned long pfn, offset, last_addr, vaddr;
+	unsigned long pfn, offset, vaddr;
+	resource_size_t last_addr;
 	struct vm_struct *area;
 	pgprot_t prot;
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.720
retrieving revision 1.721
diff -u -r1.720 -r1.721
--- kernel.spec	25 Jul 2008 23:22:52 -0000	1.720
+++ kernel.spec	26 Jul 2008 00:30:10 -0000	1.721
@@ -580,6 +580,7 @@
 Patch85: linux-2.6-x86-dont-map-vdso-when-disabled.patch
 Patch86: linux-2.6-x86-dont-use-disabled-vdso-for-signals.patch
 Patch87: linux-2.6-x86-apic-dump-all-regs-v3.patch
+Patch88: linux-2.6-x86-mm-ioremap-64-bit-resource-on-32-bit-kernel.patch
 
 # ppc
 Patch123: linux-2.6-ppc-rtc.patch
@@ -1063,6 +1064,8 @@
 ApplyPatch linux-2.6-x86-dont-use-disabled-vdso-for-signals.patch
 # dump *PIC state at boot with apic=debug
 ApplyPatch linux-2.6-x86-apic-dump-all-regs-v3.patch
+# fix 64-bit resource on 32-bit kernels
+ApplyPatch linux-2.6-x86-mm-ioremap-64-bit-resource-on-32-bit-kernel.patch
 
 #
 # PowerPC
@@ -1883,6 +1886,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Fri Jul 25 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.25.12-102
+- Fix 64-bit resource checking on 32-bit kernels. (#447143)
+
 * Fri Jul 25 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.25.12-101
 - Set default powersave timeout to 0 for the AC97 driver. (#450395)