Commit 03823964 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm 

Pull ARM fixes from Russell King:
 "Three fixes for ARM:

   - unbreak the RiscPC build

   - fix wrong pg_level in page table dumper

   - make MT_MEMORY_RO really read-only with LPAE"

* tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: 9247/1: mm: set readonly for MT_MEMORY_RO with ARM_LPAE
  ARM: 9244/1: dump: Fix wrong pg_level in walk_pmd()
  ARM: 9243/1: riscpc: Unbreak the build
parents 75003fa7 14ca1a46

arch/arm/boot/compressed/misc.c

+2 −0
Original line number Diff line number Diff line
@@ -23,7 +23,9 @@ unsigned int __machine_arch_type; 
#include <linux/types.h>

#include <linux/linkage.h>

#include "misc.h"

#ifdef CONFIG_ARCH_EP93XX

#include "misc-ep93xx.h"

#endif



static void putstr(const char *ptr);

arch/arm/mm/dump.c

+1 −1
Original line number Diff line number Diff line
@@ -346,7 +346,7 @@ static void walk_pmd(struct pg_state *st, pud_t *pud, unsigned long start) 
		addr = start + i * PMD_SIZE;

		domain = get_domain_name(pmd);

		if (pmd_none(*pmd) || pmd_large(*pmd) || !pmd_present(*pmd))

			note_page(st, addr, 3, pmd_val(*pmd), domain);

			note_page(st, addr, 4, pmd_val(*pmd), domain);

		else

			walk_pte(st, pmd, addr, domain);

arch/arm/mm/mmu.c

+4 −0
Original line number Diff line number Diff line
@@ -300,7 +300,11 @@ static struct mem_type mem_types[] __ro_after_init = { 
		.prot_pte  = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |

			     L_PTE_XN | L_PTE_RDONLY,

		.prot_l1   = PMD_TYPE_TABLE,

#ifdef CONFIG_ARM_LPAE

		.prot_sect = PMD_TYPE_SECT | L_PMD_SECT_RDONLY | PMD_SECT_AP2,

#else

		.prot_sect = PMD_TYPE_SECT,

#endif

		.domain    = DOMAIN_KERNEL,

	},

	[MT_ROM] = {