forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

s390/mm: change HPAGE_SHIFT type to int

Browse source 
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>
This commit is contained in:
Dominik Dingel 2015-06-25 14:59:52 -07:00 • committed by Linus Torvalds
commit cf54e2fce5
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
arch/s390/include/asm/page.h
View file

@ -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)

2
arch/s390/mm/pgtable.c
View file

@ -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)
{