lkml.org 
[lkml]   [2015]   [Jul]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/4] Revert "s390/mm: change HPAGE_SHIFT type to int"
    Date
    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


    \
     
     \ /
      Last update: 2015-07-03 15:21    [W:2.406 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site