浏览代码

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: 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>
Dominik Dingel 10 年之前
父节点
当前提交
cf54e2fce5
共有 2 个文件被更改,包括 2 次插入2 次删除
  1. 1 1
      arch/s390/include/asm/page.h
  2. 1 1
      arch/s390/mm/pgtable.c

+ 1 - 1
arch/s390/include/asm/page.h

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

+ 1 - 1
arch/s390/mm/pgtable.c

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