diff options
author | Takashi Iwai <tiwai@suse.de> | 2013-02-01 07:22:47 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2013-02-01 07:22:47 +0100 |
commit | 8058e14259ddc8c1824387198fc53700ed4cccc9 (patch) | |
tree | faffb83ca5173e5f3cbfd4170de603ada4812e23 /arch/arm/mm/mmu.c | |
parent | 9ddf1aeb2134e72275c97a2c6ff2e3eb04f2f27a (diff) | |
parent | 7da58046482fceb17c4a0d4afefd9507ec56de7f (diff) | |
download | op-kernel-dev-8058e14259ddc8c1824387198fc53700ed4cccc9.zip op-kernel-dev-8058e14259ddc8c1824387198fc53700ed4cccc9.tar.gz |
Merge branch 'usb-audio-fix' of git://git.alsa-project.org/alsa-kprivate into for-linus
Diffstat (limited to 'arch/arm/mm/mmu.c')
-rw-r--r-- | arch/arm/mm/mmu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index 9f06102..ce328c7 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c @@ -283,7 +283,7 @@ static struct mem_type mem_types[] = { }, [MT_MEMORY_SO] = { .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY | - L_PTE_MT_UNCACHED, + L_PTE_MT_UNCACHED | L_PTE_XN, .prot_l1 = PMD_TYPE_TABLE, .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE | PMD_SECT_S | PMD_SECT_UNCACHED | PMD_SECT_XN, |