Skip to content

Commit

Permalink
[S390] Rearrange mmap.c
Browse files Browse the repository at this point in the history
Shuffle code around so it looks more like x86 and powerpc.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
  • Loading branch information
Heiko Carstens authored and Martin Schwidefsky committed Jan 12, 2011
1 parent 7e0d485 commit 1060f62
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions arch/s390/mm/mmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,15 @@ static unsigned long stack_maxrandom_size(void)
#define MIN_GAP (32*1024*1024)
#define MAX_GAP (STACK_TOP/6*5)

static inline int mmap_is_legacy(void)
{
if (current->personality & ADDR_COMPAT_LAYOUT)
return 1;
if (rlimit(RLIMIT_STACK) == RLIM_INFINITY)
return 1;
return sysctl_legacy_va_layout;
}

static inline unsigned long mmap_base(void)
{
unsigned long gap = rlimit(RLIMIT_STACK);
Expand All @@ -59,15 +68,6 @@ static inline unsigned long mmap_base(void)
return STACK_TOP - stack_maxrandom_size() - (gap & PAGE_MASK);
}

static inline int mmap_is_legacy(void)
{
if (current->personality & ADDR_COMPAT_LAYOUT)
return 1;
if (rlimit(RLIMIT_STACK) == RLIM_INFINITY)
return 1;
return sysctl_legacy_va_layout;
}

#ifndef CONFIG_64BIT

/*
Expand Down

0 comments on commit 1060f62

Please sign in to comment.