xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'devel-stable' into for-next

Browse Source 
Conflicts:
	arch/arm/kernel/perf_event_cpu.c
This commit is contained in:
Russell King
2014-08-05 10:27:25 +01:00
parent c89c3a6acb c70fbb01b1
commit f15bdfe4fb
10 changed files with 362 additions and 1107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/include/asm/memory.h
View File

@@ -91,9 +91,7 @@
* of this define that was meant to.
* Fortunately, there is no reference for this in noMMU mode, for now.
*/
#ifndef TASK_SIZE
#define TASK_SIZE (CONFIG_DRAM_SIZE)
#endif
#define TASK_SIZE UL(0xffffffff)
#ifndef TASK_UNMAPPED_BASE
#define TASK_UNMAPPED_BASE UL(0x00000000)