ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 12:43:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

x86/mm: Add early_memremap_pgprot_adjust() prototype

Browse Source 
early_memremap_pgprot_adjust() is a __weak function with a local
prototype, but x86 has a custom implementation that does not
see the prototype, causing a W=1 warning:

arch/x86/mm/ioremap.c:785:17: error: no previous prototype for 'early_memremap_pgprot_adjust' [-Werror=missing-prototypes]

Move the declaration into the global linux/io.h header to avoid this.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Reviewed-by: Alexander Lobakin <aleksander.lobakin@intel.com>
Link: https://lore.kernel.org/all/20230516193549.544673-19-arnd%40kernel.org
This commit is contained in:
Arnd Bergmann
2023-05-16 21:35:47 +02:00
committed by Dave Hansen
parent 3b939ba0c2
commit 4d312ac057
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/linux/io.h
View File

@@ -68,6 +68,11 @@ void *devm_memremap(struct device *dev, resource_size_t offset,
size_t size, unsigned long flags); size_t size, unsigned long flags);
void devm_memunmap(struct device *dev, void *addr); void devm_memunmap(struct device *dev, void *addr);
/* architectures can override this */
pgprot_t __init early_memremap_pgprot_adjust(resource_size_t phys_addr,
unsigned long size, pgprot_t prot);
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
/* /*
* The PCI specifications (Rev 3.0, 3.2.5 "Transaction Ordering and * The PCI specifications (Rev 3.0, 3.2.5 "Transaction Ordering and

6
mm/internal.h
View File

@@ -178,12 +178,6 @@ extern unsigned long highest_memmap_pfn;
*/ */
#define MAX_RECLAIM_RETRIES 16 #define MAX_RECLAIM_RETRIES 16
/*
* in mm/early_ioremap.c
*/
pgprot_t __init early_memremap_pgprot_adjust(resource_size_t phys_addr,
unsigned long size, pgprot_t prot);
/* /*
* in mm/vmscan.c: * in mm/vmscan.c:
*/ */