[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1435927569-41132-2-git-send-email-dingel@linux.vnet.ibm.com>
Date: Fri, 3 Jul 2015 14:46:06 +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,
Gerald Schaefer <gerald.schaefer@...ibm.com>
Subject: [PATCH 1/4] Revert "s390/mm: change HPAGE_SHIFT type to int"
This reverts commit cf54e2fce51c7ad2479fe8cf213a2ed618a8189b.
---
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 dd34523..0844b78 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 int HPAGE_SHIFT;
+extern unsigned 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 33082d0..16154720 100644
--- a/arch/s390/mm/pgtable.c
+++ b/arch/s390/mm/pgtable.c
@@ -31,7 +31,7 @@
#define ALLOC_ORDER 2
#define FRAG_MASK 0x03
-int HPAGE_SHIFT;
+unsigned 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