Commit 71b400b6 authored May 13, 2015 by Martin Schwidefsky Committed by Sasha Levin Jun 10, 2015

s390/mm: correct return value of pmd_pfn



[ Upstream commit 7cded342c09f633666e71ee1ce048f218a9c5836 ]

Git commit 152125b7
"s390/mm: implement dirty bits for large segment table entries"
broke the pmd_pfn function, it changed the return value from
'unsigned long' to 'int'. This breaks all machine configurations
with memory above the 8TB line.

Cc: stable@vger.kernel.org # 3.17+
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>

parent 6cf5b617

arch/s390/include/asm/pgtable.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -582,7 +582,7 @@ static inline int pmd_large(pmd_t pmd)
		return (pmd_val(pmd) & _SEGMENT_ENTRY_LARGE) != 0;
		}

		static inline int pmd_pfn(pmd_t pmd)
		static inline unsigned long pmd_pfn(pmd_t pmd)
		{
		unsigned long origin_mask;