From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Wed, 20 Feb 2013 14:35:58 +0000 (+0000)
Subject: Merge branch 'misc' into for-linus
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=1b1c7409b75a8b62906b78b84c8469002072b738;p=~shefty%2Frdma-dev.git

Merge branch 'misc' into for-linus

Conflicts:
	arch/arm/include/asm/memory.h
---

1b1c7409b75a8b62906b78b84c8469002072b738
diff --cc arch/arm/include/asm/memory.h
index 1c4df27f933,924320f4f22..64c770d2419
--- a/arch/arm/include/asm/memory.h
+++ b/arch/arm/include/asm/memory.h
@@@ -36,8 -36,8 +36,8 @@@
   * TASK_UNMAPPED_BASE - the lower boundary of the mmap VM area
   */
  #define PAGE_OFFSET		UL(CONFIG_PAGE_OFFSET)
- #define TASK_SIZE		(UL(CONFIG_PAGE_OFFSET) - UL(0x01000000))
+ #define TASK_SIZE		(UL(CONFIG_PAGE_OFFSET) - UL(SZ_16M))
 -#define TASK_UNMAPPED_BASE	(UL(CONFIG_PAGE_OFFSET) / 3)
 +#define TASK_UNMAPPED_BASE	ALIGN(TASK_SIZE / 3, SZ_16M)
  
  /*
   * The maximum size of a 26-bit user space task.