From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sat, 16 Feb 2013 17:56:32 +0000 (+0000)
Subject: Merge branch 'misc' into for-next
X-Git-Tag: next-20130218~117^2~1
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=90f53d4ec26f9b0af2ac257abbe8c42f278a7f8b;p=karo-tx-linux.git

Merge branch 'misc' into for-next

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

90f53d4ec26f9b0af2ac257abbe8c42f278a7f8b
diff --cc arch/arm/include/asm/memory.h
index 1c4df27f9332,924320f4f22a..64c770d24198
--- 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.