Commit cf54e2fc authored by Dominik Dingel's avatar Dominik Dingel Committed by Linus Torvalds

s390/mm: change HPAGE_SHIFT type to int

With making HPAGE_SHIFT an unsigned integer we also accidentally changed
pageblock_order.  In order to avoid compiler warnings we make
HPAGE_SHFIT an int again.
Signed-off-by: default avatarDominik Dingel <dingel@linux.vnet.ibm.com>
Suggested-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent cbd7d9c2
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include <asm/setup.h> #include <asm/setup.h>
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
extern unsigned int HPAGE_SHIFT; extern int HPAGE_SHIFT;
#define HPAGE_SIZE (1UL << HPAGE_SHIFT) #define HPAGE_SIZE (1UL << HPAGE_SHIFT)
#define HPAGE_MASK (~(HPAGE_SIZE - 1)) #define HPAGE_MASK (~(HPAGE_SIZE - 1))
#define HUGETLB_PAGE_ORDER (HPAGE_SHIFT - PAGE_SHIFT) #define HUGETLB_PAGE_ORDER (HPAGE_SHIFT - PAGE_SHIFT)
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#define ALLOC_ORDER 2 #define ALLOC_ORDER 2
#define FRAG_MASK 0x03 #define FRAG_MASK 0x03
unsigned int HPAGE_SHIFT; int HPAGE_SHIFT;
unsigned long *crst_table_alloc(struct mm_struct *mm) unsigned long *crst_table_alloc(struct mm_struct *mm)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment