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

Merge branches 'debug-choice', 'devel-stable' and 'misc' into for-linus

Browse Source
This commit is contained in:
Russell King
2013-09-05 10:34:15 +01:00
parent d8dfad3876 8d258beb76 5cc91e0460 9fc2105aea
commit 141b97433d
103 changed files with 1592 additions and 1345 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/mm/mmu.c
View File

@@ -1186,7 +1186,7 @@ void __init arm_mm_memblock_reserve(void)
* called function. This means you can't use any function or debugging
* method which may touch any device, otherwise the kernel _will_ crash.
*/
static void __init devicemaps_init(struct machine_desc *mdesc)
static void __init devicemaps_init(const struct machine_desc *mdesc)
{
struct map_desc map;
unsigned long addr;
@@ -1319,7 +1319,7 @@ static void __init map_lowmem(void)
* paging_init() sets up the page tables, initialises the zone memory
* maps, and sets up the zero page, bad page and bad page tables.
*/
void __init paging_init(struct machine_desc *mdesc)
void __init paging_init(const struct machine_desc *mdesc)
{
void *zero_page;