Skip to contentSkip to conversation

ARM: mm: fix PMD_SECT_RDONLY undeclared compile error

PATCH New Victor Kamensky 3 participants 4 messages Jan 7, 2015 – Jan 9, 2015 Arm (32-bit)

lore
Share & tools
lore

Victor Kamensky

author
#0 lore raw

PATCH 1/1 ARM: mm: fix PMD_SECT_RDONLY undeclared compile error

From: Victor Kamensky <[email protected]>

In v3.19-rc3 tree when CONFIG_ARM_LPAE and CONFIG_DEBUG_RODATA are enabled image failed to compile with the following error:

arch/arm/mm/init.c:661:14: error: ?PMD_SECT_RDONLY? undeclared here (not in a function)

It seems that '80d6b0c ARM: mm: allow text and rodata sections to be read-only' and 'ded9477 ARM: 8109/1: mm: Modify pte_write and pmd_write logic for LPAE' commits crossed. 80d6b0c uses PMD_SECT_RDONLY macro but ded9477 renames it and uses software bits L_PMD_SECT_RDONLY instead.

Fix is to use L_PMD_SECT_RDONLY instead PMD_SECT_RDONLY as ded9477 does in another places.

Signed-off-by Victor Kamensky <[email protected]>
---
 arch/arm/mm/init.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/mm/init.c +2 -2
index 98ad9c7..2495c8c 100644
@@ -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,
Signature · 1 line
1.9.3
#1 lore raw

PATCH 1/1 ARM: mm: fix PMD_SECT_RDONLY undeclared compile error

Quoted 12 lines · Victor Kamensky

From: Victor Kamensky <[email protected]>

In v3.19-rc3 tree when CONFIG_ARM_LPAE and CONFIG_DEBUG_RODATA are enabled image failed to compile with the following error:

arch/arm/mm/init.c:661:14: error: ?PMD_SECT_RDONLY? undeclared here (not in a function)

It seems that '80d6b0c ARM: mm: allow text and rodata sections to be read-only' and 'ded9477 ARM: 8109/1: mm: Modify pte_write and pmd_write logic for LPAE' commits crossed. 80d6b0c uses PMD_SECT_RDONLY macro but ded9477 renames it and uses software bits L_PMD_SECT_RDONLY instead.

Quoted 7 lines

Fix is to use L_PMD_SECT_RDONLY instead PMD_SECT_RDONLY as ded9477 does in another places.

Signed-off-by Victor Kamensky <[email protected]>
---
 arch/arm/mm/init.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Acked-by Will Deacon <[email protected]>

Will

Quoted 19 lines
arch/arm/mm/init.c +2 -2
index 98ad9c7..2495c8c 100644
@@ -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,
Signature · 1 line
1.9.3
#2 lore raw

PATCH 1/1 ARM: mm: fix PMD_SECT_RDONLY undeclared compile error

In reply to Victor Kamensky
Quoted 12 lines · Victor Kamensky

From: Victor Kamensky <[email protected]>

In v3.19-rc3 tree when CONFIG_ARM_LPAE and CONFIG_DEBUG_RODATA are enabled image failed to compile with the following error:

arch/arm/mm/init.c:661:14: error: ?PMD_SECT_RDONLY? undeclared here (not in a function)

It seems that '80d6b0c ARM: mm: allow text and rodata sections to be read-only' and 'ded9477 ARM: 8109/1: mm: Modify pte_write and pmd_write logic for LPAE' commits crossed. 80d6b0c uses PMD_SECT_RDONLY macro but ded9477 renames it and uses software bits L_PMD_SECT_RDONLY instead.

Quoted 4 lines

Fix is to use L_PMD_SECT_RDONLY instead PMD_SECT_RDONLY as ded9477 does in another places.

Signed-off-by Victor Kamensky <[email protected]>

Please can you put it in the patch system with Will's ack if not already done, thanks.

Signature · 2 lines
FTTC broadband for 0.8mile line: currently at 10.5Mbps down 400kbps up
according to speedtest.net.
author
#3 lore raw

PATCH 1/1 ARM: mm: fix PMD_SECT_RDONLY undeclared compile error

Quoted 13 lines · Russell King - ARM Linux
Quoted 12 lines · Victor Kamensky

From: Victor Kamensky <[email protected]>

In v3.19-rc3 tree when CONFIG_ARM_LPAE and CONFIG_DEBUG_RODATA are enabled image failed to compile with the following error:

arch/arm/mm/init.c:661:14: error: ?PMD_SECT_RDONLY? undeclared here (not in a function)

It seems that '80d6b0c ARM: mm: allow text and rodata sections to be read-only' and 'ded9477 ARM: 8109/1: mm: Modify pte_write and pmd_write logic for LPAE' commits crossed. 80d6b0c uses PMD_SECT_RDONLY macro but ded9477 renames it and uses software bits L_PMD_SECT_RDONLY instead.

Quoted 7 lines
Quoted 4 lines

Fix is to use L_PMD_SECT_RDONLY instead PMD_SECT_RDONLY as ded9477 does in another places.

Signed-off-by Victor Kamensky <[email protected]>

Please can you put it in the patch system with Will's ack if not already done, thanks.

Submitted as
http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=8275/1

Also fixed previously messed up Author field.

Thanks,
Victor

Quoted 3 lines

--
FTTC broadband for 0.8mile line: currently at 10.5Mbps down 400kbps up according to speedtest.net.