* [PATCH] arm: fixmap: Annotate page flags with pgprot
@ 2016-02-25 17:42 Suzuki K Poulose
2016-02-25 18:26 ` Stefan Agner
0 siblings, 1 reply; 2+ messages in thread
From: Suzuki K Poulose @ 2016-02-25 17:42 UTC (permalink / raw)
To: linux-arm-kernel
With STRICT_MM_TYPECHECKS, the kernel build fails like :
CC mm/early_ioremap.o
mm/early_ioremap.c: In function ?early_ioremap?:
mm/early_ioremap.c:211:2: error: incompatible type for argument 3 of ?__early_ioremap?
mm/early_ioremap.c:98:1: note: expected ?pgprot_t? but argument is of type ?long long unsigned int?
mm/early_ioremap.c: In function ?early_memremap?:
mm/early_ioremap.c:219:13: error: incompatible type for argument 3 of ?__early_ioremap?
mm/early_ioremap.c:98:1: note: expected ?pgprot_t? but argument is of type ?long long unsigned int?
mm/early_ioremap.c: In function ?early_memremap_ro?:
mm/early_ioremap.c:225:2: error: incompatible type for argument 3 of ?__early_ioremap?
mm/early_ioremap.c:98:1: note: expected ?pgprot_t? but argument is of type ?long long unsigned int?
mm/early_ioremap.c:226:1: warning: control reaches end of non-void function [-Wreturn-type]
mm/early_ioremap.c: In function ?early_memremap?:
mm/early_ioremap.c:220:1: warning: control reaches end of non-void function [-Wreturn-type]
mm/early_ioremap.c: In function ?early_ioremap?:
mm/early_ioremap.c:212:1: warning: control reaches end of non-void function [-Wreturn-type]
make[1]: *** [mm/early_ioremap.o] Error 1
make: *** [mm] Error 2
make: *** Waiting for unfinished jobs....
CC arch/arm/mm/mmu.o
CC arch/arm/kernel/patch.o
arch/arm/kernel/patch.c: In function ?patch_map?:
arch/arm/kernel/patch.c:39:2: error: incompatible type for argument 3 of ?__set_fixmap?
./arch/arm/include/asm/fixmap.h:55:6: note: expected ?pgprot_t? but argument is of type ?long long unsigned int?
make[1]: *** [arch/arm/kernel/patch.o] Error 1
Fixes Commit a5f4c561b ("ARM: 8415/1: early fixmap support for earlycon").
Annotate the page flags properly using __pgprot.
Cc: Stefan Agner <stefan@agner.ch>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Rob Herring <robh@kernel.org>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: stable at vger.kernel.org # v4.3+
Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
---
arch/arm/include/asm/fixmap.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/include/asm/fixmap.h b/arch/arm/include/asm/fixmap.h
index 5c17d2d..8d48d5a 100644
--- a/arch/arm/include/asm/fixmap.h
+++ b/arch/arm/include/asm/fixmap.h
@@ -39,13 +39,13 @@ static const enum fixed_addresses __end_of_fixed_addresses =
__end_of_fixmap_region > __end_of_early_ioremap_region ?
__end_of_fixmap_region : __end_of_early_ioremap_region;
-#define FIXMAP_PAGE_COMMON (L_PTE_YOUNG | L_PTE_PRESENT | L_PTE_XN | L_PTE_DIRTY)
+#define FIXMAP_PAGE_COMMON __pgprot(L_PTE_YOUNG | L_PTE_PRESENT | L_PTE_XN | L_PTE_DIRTY)
-#define FIXMAP_PAGE_NORMAL (FIXMAP_PAGE_COMMON | L_PTE_MT_WRITEBACK)
-#define FIXMAP_PAGE_RO (FIXMAP_PAGE_NORMAL | L_PTE_RDONLY)
+#define FIXMAP_PAGE_NORMAL __pgprot(pgprot_val(FIXMAP_PAGE_COMMON) | L_PTE_MT_WRITEBACK)
+#define FIXMAP_PAGE_RO __pgprot(pgprot_val(FIXMAP_PAGE_NORMAL) | L_PTE_RDONLY)
/* Used by set_fixmap_(io|nocache), both meant for mapping a device */
-#define FIXMAP_PAGE_IO (FIXMAP_PAGE_COMMON | L_PTE_MT_DEV_SHARED | L_PTE_SHARED)
+#define FIXMAP_PAGE_IO __pgprot(pgprot_val(FIXMAP_PAGE_COMMON) | L_PTE_MT_DEV_SHARED | L_PTE_SHARED)
#define FIXMAP_PAGE_NOCACHE FIXMAP_PAGE_IO
#define __early_set_fixmap __set_fixmap
--
1.7.9.5
^ permalink raw reply related [flat|nested] 2+ messages in thread* [PATCH] arm: fixmap: Annotate page flags with pgprot
2016-02-25 17:42 [PATCH] arm: fixmap: Annotate page flags with pgprot Suzuki K Poulose
@ 2016-02-25 18:26 ` Stefan Agner
0 siblings, 0 replies; 2+ messages in thread
From: Stefan Agner @ 2016-02-25 18:26 UTC (permalink / raw)
To: linux-arm-kernel
On 2016-02-25 09:42, Suzuki K Poulose wrote:
> With STRICT_MM_TYPECHECKS, the kernel build fails like :
>
> CC mm/early_ioremap.o
> mm/early_ioremap.c: In function ?early_ioremap?:
> mm/early_ioremap.c:211:2: error: incompatible type for argument 3 of
> ?__early_ioremap?
> mm/early_ioremap.c:98:1: note: expected ?pgprot_t? but argument is of
> type ?long long unsigned int?
> mm/early_ioremap.c: In function ?early_memremap?:
> mm/early_ioremap.c:219:13: error: incompatible type for argument 3 of
> ?__early_ioremap?
> mm/early_ioremap.c:98:1: note: expected ?pgprot_t? but argument is of
> type ?long long unsigned int?
> mm/early_ioremap.c: In function ?early_memremap_ro?:
> mm/early_ioremap.c:225:2: error: incompatible type for argument 3 of
> ?__early_ioremap?
> mm/early_ioremap.c:98:1: note: expected ?pgprot_t? but argument is of
> type ?long long unsigned int?
> mm/early_ioremap.c:226:1: warning: control reaches end of non-void
> function [-Wreturn-type]
> mm/early_ioremap.c: In function ?early_memremap?:
> mm/early_ioremap.c:220:1: warning: control reaches end of non-void
> function [-Wreturn-type]
> mm/early_ioremap.c: In function ?early_ioremap?:
> mm/early_ioremap.c:212:1: warning: control reaches end of non-void
> function [-Wreturn-type]
> make[1]: *** [mm/early_ioremap.o] Error 1
> make: *** [mm] Error 2
> make: *** Waiting for unfinished jobs....
> CC arch/arm/mm/mmu.o
> CC arch/arm/kernel/patch.o
> arch/arm/kernel/patch.c: In function ?patch_map?:
> arch/arm/kernel/patch.c:39:2: error: incompatible type for argument 3
> of ?__set_fixmap?
> ./arch/arm/include/asm/fixmap.h:55:6: note: expected ?pgprot_t? but
> argument is of type ?long long unsigned int?
> make[1]: *** [arch/arm/kernel/patch.o] Error 1
>
> Fixes Commit a5f4c561b ("ARM: 8415/1: early fixmap support for earlycon").
>
> Annotate the page flags properly using __pgprot.
Acked-by: Stefan Agner <stefan@agner.ch>
--
Stefan
>
> Cc: Stefan Agner <stefan@agner.ch>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Rob Herring <robh@kernel.org>
> Cc: Russell King <rmk+kernel@arm.linux.org.uk>
> Cc: stable at vger.kernel.org # v4.3+
> Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
> ---
> arch/arm/include/asm/fixmap.h | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/include/asm/fixmap.h b/arch/arm/include/asm/fixmap.h
> index 5c17d2d..8d48d5a 100644
> --- a/arch/arm/include/asm/fixmap.h
> +++ b/arch/arm/include/asm/fixmap.h
> @@ -39,13 +39,13 @@ static const enum fixed_addresses __end_of_fixed_addresses =
> __end_of_fixmap_region > __end_of_early_ioremap_region ?
> __end_of_fixmap_region : __end_of_early_ioremap_region;
>
> -#define FIXMAP_PAGE_COMMON (L_PTE_YOUNG | L_PTE_PRESENT | L_PTE_XN |
> L_PTE_DIRTY)
> +#define FIXMAP_PAGE_COMMON __pgprot(L_PTE_YOUNG | L_PTE_PRESENT |
> L_PTE_XN | L_PTE_DIRTY)
>
> -#define FIXMAP_PAGE_NORMAL (FIXMAP_PAGE_COMMON | L_PTE_MT_WRITEBACK)
> -#define FIXMAP_PAGE_RO (FIXMAP_PAGE_NORMAL | L_PTE_RDONLY)
> +#define FIXMAP_PAGE_NORMAL __pgprot(pgprot_val(FIXMAP_PAGE_COMMON) |
> L_PTE_MT_WRITEBACK)
> +#define FIXMAP_PAGE_RO __pgprot(pgprot_val(FIXMAP_PAGE_NORMAL) | L_PTE_RDONLY)
>
> /* Used by set_fixmap_(io|nocache), both meant for mapping a device */
> -#define FIXMAP_PAGE_IO (FIXMAP_PAGE_COMMON | L_PTE_MT_DEV_SHARED |
> L_PTE_SHARED)
> +#define FIXMAP_PAGE_IO __pgprot(pgprot_val(FIXMAP_PAGE_COMMON) |
> L_PTE_MT_DEV_SHARED | L_PTE_SHARED)
> #define FIXMAP_PAGE_NOCACHE FIXMAP_PAGE_IO
>
> #define __early_set_fixmap __set_fixmap
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-02-25 18:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-25 17:42 [PATCH] arm: fixmap: Annotate page flags with pgprot Suzuki K Poulose
2016-02-25 18:26 ` Stefan Agner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox