Commit 4d312ac0 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Dave Hansen
Browse files

x86/mm: Add early_memremap_pgprot_adjust() prototype 



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: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarDave Hansen <dave.hansen@linux.intel.com>
Reviewed-by: default avatarAlexander Lobakin <aleksander.lobakin@intel.com>
Link: https://lore.kernel.org/all/20230516193549.544673-19-arnd%40kernel.org
parent 3b939ba0

include/linux/io.h

+5 −0
Original line number Diff line number Diff line
@@ -68,6 +68,11 @@ void *devm_memremap(struct device *dev, resource_size_t offset, 
		size_t size, unsigned long flags);

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

/*

 * The PCI specifications (Rev 3.0, 3.2.5 "Transaction Ordering and

mm/internal.h

+0 −6
Original line number Diff line number Diff line
@@ -178,12 +178,6 @@ extern unsigned long highest_memmap_pfn; 
 */

#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:

 */