projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 573f8c8 b28748f)
Merge branch 'misc' into for-linus
authorRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 20 Feb 2013 14:35:58 +0000 (14:35 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 20 Feb 2013 14:35:58 +0000 (14:35 +0000)
Conflicts:
arch/arm/include/asm/memory.h

1  2 
MAINTAINERS patch | diff1 | diff2 | blob | history
arch/arm/include/asm/memory.h patch | diff1 | diff2 | blob | history
arch/arm/mm/mmu.c patch | diff1 | diff2 | blob | history

diff --cc MAINTAINERS
Simple merge
diff --cc arch/arm/include/asm/memory.h
index 1c4df27f93322604398d70f9c585332e97374b10,924320f4f22acbc92ba84cd1bbebc3c449827187..64c770d24198462c0260ccf87d771fd96fc512cd
--- 1/arch/arm/include/asm/memory.h
--- 2/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.
diff --cc arch/arm/mm/mmu.c
Simple merge