Skip to content

Commit

Permalink
s390/mm: change HPAGE_SHIFT type to int
Browse files Browse the repository at this point in the history
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: Dominik Dingel <dingel@linux.vnet.ibm.com>
Suggested-by: Andrew 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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Dominik Dingel authored and Linus Torvalds committed Jun 26, 2015
1 parent cbd7d9c commit cf54e2f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion arch/s390/include/asm/page.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include <asm/setup.h>
#ifndef __ASSEMBLY__

extern unsigned int HPAGE_SHIFT;
extern int HPAGE_SHIFT;
#define HPAGE_SIZE (1UL << HPAGE_SHIFT)
#define HPAGE_MASK (~(HPAGE_SIZE - 1))
#define HUGETLB_PAGE_ORDER (HPAGE_SHIFT - PAGE_SHIFT)
Expand Down
2 changes: 1 addition & 1 deletion arch/s390/mm/pgtable.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#define ALLOC_ORDER 2
#define FRAG_MASK 0x03

unsigned int HPAGE_SHIFT;
int HPAGE_SHIFT;

unsigned long *crst_table_alloc(struct mm_struct *mm)
{
Expand Down

0 comments on commit cf54e2f

Please sign in to comment.