Merge "ARM: mm: fix reporting of read-only PMD bits" (d302ffbc) · Commits · e / devices / android_kernel_sony_msm8994

arch/arm/mm/dump.c

+32 −15

Original line number	Diff line number	Diff line
		@@ -120,7 +120,34 @@ static const struct prot_bits pte_bits[] = {
		};

		static const struct prot_bits section_bits[] = {
		#ifndef CONFIG_ARM_LPAE
		#ifdef CONFIG_ARM_LPAE
		{
		.mask = PMD_SECT_USER,
		.val = PMD_SECT_USER,
		.set = "USR",
		}, {
		.mask = PMD_SECT_RDONLY,
		.val = PMD_SECT_RDONLY,
		.set = "ro",
		.clear = "RW",
		#elif __LINUX_ARM_ARCH__ >= 6
		{
		.mask = PMD_SECT_APX \| PMD_SECT_AP_READ \| PMD_SECT_AP_WRITE,
		.val = PMD_SECT_APX \| PMD_SECT_AP_WRITE,
		.set = " ro",
		}, {
		.mask = PMD_SECT_APX \| PMD_SECT_AP_READ \| PMD_SECT_AP_WRITE,
		.val = PMD_SECT_AP_WRITE,
		.set = " RW",
		}, {
		.mask = PMD_SECT_APX \| PMD_SECT_AP_READ \| PMD_SECT_AP_WRITE,
		.val = PMD_SECT_AP_READ,
		.set = "USR ro",
		}, {
		.mask = PMD_SECT_APX \| PMD_SECT_AP_READ \| PMD_SECT_AP_WRITE,
		.val = PMD_SECT_AP_READ \| PMD_SECT_AP_WRITE,
		.set = "USR RW",
		#else /* ARMv4/ARMv5 */
		/* These are approximate */
		{
		.mask = PMD_SECT_AP_READ \| PMD_SECT_AP_WRITE,
		@@ -138,16 +165,6 @@ static const struct prot_bits section_bits[] = {
		.mask = PMD_SECT_AP_READ \| PMD_SECT_AP_WRITE,
		.val = PMD_SECT_AP_READ \| PMD_SECT_AP_WRITE,
		.set = "USR RW",
		#else
		{
		.mask = PMD_SECT_USER,
		.val = PMD_SECT_USER,
		.set = "USR",
		}, {
		.mask = PMD_SECT_RDONLY,
		.val = PMD_SECT_RDONLY,
		.set = "ro",
		.clear = "RW",
		#endif
		}, {
		.mask = PMD_SECT_XN,