Commit 49c50342 authored Dec 09, 2008 by Matt Mackall Committed by Linus Torvalds Dec 10, 2008

pagemap: fix 32-bit pagemap regression



The large pages fix from bcf8039e 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@selenic.com>
Reported-by: Doug Graham <dgraham@nortel.com>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Dave Hansen <dave@linux.vnet.ibm.com>
Cc: <stable@kernel.org>		[2.6.26.x, 2.6.27.x]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 653d22c0

fs/proc/task_mmu.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;

Admin message