[<prev] [next>] [day] [month] [year] [list]
Message-Id: <1435243021-65315-1-git-send-email-dingel@linux.vnet.ibm.com>
Date: Thu, 25 Jun 2015 16:37:01 +0200
From: Dominik Dingel <dingel@...ux.vnet.ibm.com>
To: Andrew Morton <akpm@...ux-foundation.org>,
linux-kernel@...r.kernel.org
Cc: Martin Schwidefsky <schwidefsky@...ibm.com>,
Heiko Carstens <heiko.carstens@...ibm.com>,
linux390@...ibm.com, Dominik Dingel <dingel@...ux.vnet.ibm.com>,
Christian Borntraeger <borntraeger@...ibm.com>,
Michael Holzheu <holzheu@...ux.vnet.ibm.com>,
linux-s390@...r.kernel.org, linux-mm@...ck.org
Subject: [PATCH] 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.
Suggested-by: Andrew Morton <akpm@...ux-foundation.org>
Signed-off-by: Dominik Dingel <dingel@...ux.vnet.ibm.com>
---
arch/s390/include/asm/page.h | 2 +-
arch/s390/mm/pgtable.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/s390/include/asm/page.h b/arch/s390/include/asm/page.h
index 0844b78..dd34523 100644
--- a/arch/s390/include/asm/page.h
+++ b/arch/s390/include/asm/page.h
@@ -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)
diff --git a/arch/s390/mm/pgtable.c b/arch/s390/mm/pgtable.c
index f76791e..1bae5dd 100644
--- a/arch/s390/mm/pgtable.c
+++ b/arch/s390/mm/pgtable.c
@@ -36,7 +36,7 @@
#endif
-unsigned int HPAGE_SHIFT;
+int HPAGE_SHIFT;
unsigned long *crst_table_alloc(struct mm_struct *mm)
{
--
2.3.8
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists