Commit 7b82e904 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'asm-generic-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic 

Pull asm-generic updates from Arnd Bergmann:
 "These are cleanups for architecture specific header files:

   - the comments in include/linux/syscalls.h have gone out of sync and
     are really pointless, so these get removed

   - The asm/bitsperlong.h header no longer needs to be architecture
     specific on modern compilers, so use a generic version for newer
     architectures that use new enough userspace compilers

   - A cleanup for virt_to_pfn/virt_to_bus to have proper type checking,
     forcing the use of pointers"

* tag 'asm-generic-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
  syscalls: Remove file path comments from headers
  tools arch: Remove uapi bitsperlong.h of hexagon and microblaze
  asm-generic: Unify uapi bitsperlong.h for arm64, riscv and loongarch
  m68k/mm: Make pfn accessors static inlines
  arm64: memory: Make virt_to_pfn() a static inline
  ARM: mm: Make virt_to_pfn() a static inline
  asm-generic/page.h: Make pfn accessors static inlines
  xen/netback: Pass (void *) to virt_to_page()
  netfs: Pass a pointer to virt_to_page()
  cifs: Pass a pointer to virt_to_page() in cifsglob
  cifs: Pass a pointer to virt_to_page()
  riscv: mm: init: Pass a pointer to virt_to_page()
  ARC: init: Pass a pointer to virt_to_pfn() in init
  m68k: Pass a pointer to virt_to_pfn() virt_to_page()
  fs/proc/kcore.c: Pass a pointer to virt_addr_valid()
parents 9f57c13f 4dd595c3

arch/arc/mm/init.c

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ void __init setup_arch_memory(void) 
	setup_initial_init_mm(_text, _etext, _edata, _end);



	/* first page of system - kernel .vector starts here */

	min_low_pfn = virt_to_pfn(CONFIG_LINUX_RAM_BASE);

	min_low_pfn = virt_to_pfn((void *)CONFIG_LINUX_RAM_BASE);



	/* Last usable page of low mem */

	max_low_pfn = max_pfn = PFN_DOWN(low_mem_start + low_mem_sz);

arch/arm/common/sharpsl_param.c

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
#include <linux/module.h>

#include <linux/string.h>

#include <asm/mach/sharpsl_param.h>

#include <asm/memory.h>

#include <asm/page.h>



/*

 * Certain hardware parameters determined at the time of device manufacture,

arch/arm/include/asm/delay.h

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
#ifndef __ASM_ARM_DELAY_H

#define __ASM_ARM_DELAY_H



#include <asm/memory.h>

#include <asm/page.h>

#include <asm/param.h>	/* HZ */



/*

arch/arm/include/asm/io.h

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include <linux/string.h>

#include <linux/types.h>

#include <asm/byteorder.h>

#include <asm/memory.h>

#include <asm/page.h>

#include <asm-generic/pci_iomap.h>



/*

arch/arm/include/asm/memory.h

+12 −5
Original line number Diff line number Diff line
@@ -5,11 +5,16 @@ 
 *  Copyright (C) 2000-2002 Russell King

 *  modification for nommu, Hyok S. Choi, 2004

 *

 *  Note: this file should not be included by non-asm/.h files

 *  Note: this file should not be included explicitly, include <asm/page.h>

 *  to get access to these definitions.

 */

#ifndef __ASM_ARM_MEMORY_H

#define __ASM_ARM_MEMORY_H



#ifndef _ASMARM_PAGE_H

#error "Do not include <asm/memory.h> directly"

#endif



#include <linux/compiler.h>

#include <linux/const.h>

#include <linux/types.h>
@@ -288,10 +293,12 @@ static inline unsigned long __phys_to_virt(phys_addr_t x) 


#endif



#define virt_to_pfn(kaddr) \

	((((unsigned long)(kaddr) - PAGE_OFFSET) >> PAGE_SHIFT) + \

	 PHYS_PFN_OFFSET)



static inline unsigned long virt_to_pfn(const void *p)

{

	unsigned long kaddr = (unsigned long)p;

	return (((kaddr - PAGE_OFFSET) >> PAGE_SHIFT) +

		PHYS_PFN_OFFSET);

}

#define __pa_symbol_nodebug(x)	__virt_to_phys_nodebug((x))



#ifdef CONFIG_DEBUG_VIRTUAL