diff options
| author | Luis R. Rodriguez <mcgrof@kernel.org> | 2018-04-27 11:19:49 -0700 |
|---|---|---|
| committer | Luis R. Rodriguez <mcgrof@kernel.org> | 2018-04-27 11:25:11 -0700 |
| commit | 4d3c0497b19671be458e17aff80cbb15508515d6 (patch) | |
| tree | 0a996097ba146a2aa51d4f150316563235a35736 | |
| parent | 3be4aaf4e2d3eb95cce7835e8df797ae65ae5ac1 (diff) | |
| download | linux-20180427-mm-PAGE_KERNEL_RO-generic.tar.gz | |
mm: provide a fallback for PAGE_KERNEL_RO for architectures20180427-mm-PAGE_KERNEL_RO-generic
Some architectures do not define PAGE_KERNEL_RO, best we can do
for them is to provide a fallback onto PAGE_KERNEL. Remove the
hack from the firmware loader and move it onto the asm-generic
header, and document while at it the affected architectures
which do not have a PAGE_KERNEL_RO:
o alpha
o ia64
o m68k
o mips
o sparc64
o sparc
Signed-off-by: Luis R. Rodriguez <mcgrof@kernel.org>
| -rw-r--r-- | drivers/base/firmware_loader/fallback.c | 5 | ||||
| -rw-r--r-- | include/asm-generic/pgtable.h | 15 |
2 files changed, 15 insertions, 5 deletions
diff --git a/drivers/base/firmware_loader/fallback.c b/drivers/base/firmware_loader/fallback.c index 31b5015b59fecb..90f36be9e5cacb 100644 --- a/drivers/base/firmware_loader/fallback.c +++ b/drivers/base/firmware_loader/fallback.c @@ -219,11 +219,6 @@ static ssize_t firmware_loading_show(struct device *dev, return sprintf(buf, "%d\n", loading); } -/* Some architectures don't have PAGE_KERNEL_RO */ -#ifndef PAGE_KERNEL_RO -#define PAGE_KERNEL_RO PAGE_KERNEL -#endif - /* one pages buffer should be mapped/unmapped only once */ static int map_fw_priv_pages(struct fw_priv *fw_priv) { diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h index f59639afaa3908..da47fe81df51cc 100644 --- a/include/asm-generic/pgtable.h +++ b/include/asm-generic/pgtable.h @@ -1083,6 +1083,21 @@ int phys_mem_access_prot_allowed(struct file *file, unsigned long pfn, static inline void init_espfix_bsp(void) { } #endif +/* + * Some architectures don't have PAGE_KERNEL_RO. This is the best + * we can do for them buggers for now. Currently known to not have it: + * + * o alpha + * o ia64 + * o m68k + * o mips + * o sparc64 + * o sparc + */ +#ifndef PAGE_KERNEL_RO +#define PAGE_KERNEL_RO PAGE_KERNEL +#endif + #endif /* !__ASSEMBLY__ */ #ifndef io_remap_pfn_range |