path: root/arch
diff options
authorMartin Schwidefsky <schwidefsky@de.ibm.com>2015-05-13 14:33:22 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2015-05-19 10:35:09 +0200
commit7cded342c09f633666e71ee1ce048f218a9c5836 (patch)
tree9220755c5b17478576769ab560ee1f7480b7fd23 /arch
parentc431761dddff87039edb3300b9b29d1f9e0af2c9 (diff)
s390/mm: correct return value of pmd_pfn
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>
Diffstat (limited to 'arch')
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/include/asm/pgtable.h b/arch/s390/include/asm/pgtable.h
index fc642399b489..ef24a212eeb7 100644
--- a/arch/s390/include/asm/pgtable.h
+++ b/arch/s390/include/asm/pgtable.h
@@ -494,7 +494,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;

Privacy Policy