aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schwidefsky <schwidefsky@de.ibm.com>2015-05-13 14:33:22 +0200
committerSasha Levin <sasha.levin@oracle.com>2015-06-10 13:42:30 -0400
commit71b400b61c03f9982187a92d14ad643d9aa76bff (patch)
tree4c9d7362e3538f4f92f2b5fa3bd9fe7e6cf5cfcd
parent6cf5b617a17408dcade9147f552ebe9695b1fa84 (diff)
downloadlinux-linaro-stable-71b400b61c03f9982187a92d14ad643d9aa76bff.tar.gz
s390/mm: correct return value of pmd_pfn
[ Upstream commit 7cded342c09f633666e71ee1ce048f218a9c5836 ] Git commit 152125b7a882df36a55a8eadbea6d0edf1461ee7 "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>
-rw-r--r--arch/s390/include/asm/pgtable.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/include/asm/pgtable.h b/arch/s390/include/asm/pgtable.h
index 57c882761dea..b0373b44b320 100644
--- a/arch/s390/include/asm/pgtable.h
+++ b/arch/s390/include/asm/pgtable.h
@@ -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;