diff options
| author | Jan Kara <jack@suse.cz> | 2015-01-30 10:16:33 +0100 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2015-01-30 10:16:33 +0100 |
| commit | 1cd6b7be92016538ea1f2a8e1f955e9b974d93ea (patch) | |
| tree | 77ca10be1da7aaf19cde95de0cb9c4bfcde636a0 /arch/arm/mm/init.c | |
| parent | a39427007e7ccd83dbb7cd81b18156cebeab4d1e (diff) | |
| parent | 14bf61ffe6ac54afcd1e888a4407fe16054483db (diff) | |
Merge branch 'for_linus' into for_next
Diffstat (limited to 'arch/arm/mm/init.c')
| -rw-r--r-- | arch/arm/mm/init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index 98ad9c79ea0e..2495c8cb47ba 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c @@ -658,8 +658,8 @@ static struct section_perm ro_perms[] = { .start = (unsigned long)_stext, .end = (unsigned long)__init_begin, #ifdef CONFIG_ARM_LPAE - .mask = ~PMD_SECT_RDONLY, - .prot = PMD_SECT_RDONLY, + .mask = ~L_PMD_SECT_RDONLY, + .prot = L_PMD_SECT_RDONLY, #else .mask = ~(PMD_SECT_APX | PMD_SECT_AP_WRITE), .prot = PMD_SECT_APX | PMD_SECT_AP_WRITE, |