[kernel] r14364 - in dists/lenny/linux-2.6/debian: . patches/bugfix/all patches/series

[Ben Hutchings]

Author: benh
Date: Fri Oct  9 03:35:49 2009
New Revision: 14364

Log:
proc: Fix truncation of entries in /proc/*/pagemap on 32-bit architectures (Closes: #511419)

Added:
   dists/lenny/linux-2.6/debian/patches/bugfix/all/pagemap-fix-32-bit-pagemap-regression.patch
Modified:
   dists/lenny/linux-2.6/debian/changelog
   dists/lenny/linux-2.6/debian/patches/series/20

Modified: dists/lenny/linux-2.6/debian/changelog
==============================================================================
--- dists/lenny/linux-2.6/debian/changelog	Fri Oct  9 03:27:05 2009	(r14363)
+++ dists/lenny/linux-2.6/debian/changelog	Fri Oct  9 03:35:49 2009	(r14364)
@@ -16,6 +16,8 @@
   * sis190: Correct DMA sync handling on small packets (Closes: #541169)
   * mmc: Increase power-up delay (Closes: #508599)
   * v4l2: Improve 32/64-bit ioctl translation (Closes: #508649)
+  * proc: Fix truncation of entries in /proc/*/pagemap on 32-bit
+    architectures (Closes: #511419)
 
   [ dann frazier ]
   * autofs4: don't make expiring dentry negative, avoiding an oops

Added: dists/lenny/linux-2.6/debian/patches/bugfix/all/pagemap-fix-32-bit-pagemap-regression.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/lenny/linux-2.6/debian/patches/bugfix/all/pagemap-fix-32-bit-pagemap-regression.patch	Fri Oct  9 03:35:49 2009	(r14364)
@@ -0,0 +1,40 @@
+From 49c50342c728344b79c8f9e8293637fe80ef5ad5 Mon Sep 17 00:00:00 2001
+From: Matt Mackall <mpm at selenic.com>
+Date: Tue, 9 Dec 2008 13:14:21 -0800
+Subject: [PATCH] pagemap: fix 32-bit pagemap regression
+
+The large pages fix from bcf8039ed45 broke 32-bit pagemap by pulling the
+pagemap entry code out into a function with the wrong return type.
+Pagemap entries are 64 bits on all systems and unsigned long is only 32
+bits on 32-bit systems.
+
+Signed-off-by: Matt Mackall <mpm at selenic.com>
+Reported-by: Doug Graham <dgraham at nortel.com>
+Cc: Alexey Dobriyan <adobriyan at gmail.com>
+Cc: Dave Hansen <dave at linux.vnet.ibm.com>
+Cc: <stable at kernel.org>		[2.6.26.x, 2.6.27.x]
+Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
+---
+ fs/proc/task_mmu.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
+index b770c09..3a8bdd7 100644
+--- a/fs/proc/task_mmu.c
++++ b/fs/proc/task_mmu.c
+@@ -557,9 +557,9 @@ static u64 swap_pte_to_pagemap_entry(pte_t pte)
+ 	return swp_type(e) | (swp_offset(e) << MAX_SWAPFILES_SHIFT);
+ }
+ 
+-static unsigned long pte_to_pagemap_entry(pte_t pte)
++static u64 pte_to_pagemap_entry(pte_t pte)
+ {
+-	unsigned long pme = 0;
++	u64 pme = 0;
+ 	if (is_swap_pte(pte))
+ 		pme = PM_PFRAME(swap_pte_to_pagemap_entry(pte))
+ 			| PM_PSHIFT(PAGE_SHIFT) | PM_SWAP;
+-- 
+1.6.4.3
+

Modified: dists/lenny/linux-2.6/debian/patches/series/20
==============================================================================
--- dists/lenny/linux-2.6/debian/patches/series/20	Fri Oct  9 03:27:05 2009	(r14363)
+++ dists/lenny/linux-2.6/debian/patches/series/20	Fri Oct  9 03:35:49 2009	(r14364)
@@ -9,4 +9,5 @@
 + bugfix/all/mmc-increase-power-up-delay.patch
 + bugfix/all/v4l2-add-some-missing-compat32-ioctls.patch
 + bugfix/all/v4l2-compat-test-for-unlocked_ioctl.patch
++ bugfix/all/pagemap-fix-32-bit-pagemap-regression.patch
 + features/all/ftdi_sio-openrd.patch