Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0b3c32e authored by Will Deacon's avatar Will Deacon
Browse files

arm64: memory: Cosmetic cleanups 



Cleanup memory.h so that the indentation is consistent, remove pointless
line-wrapping and use consistent parameter names for different versions
of the same macro.

Reviewed-by: default avatarSteve Capper <steve.capper@arm.com>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Reviewed-by: default avatarMark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent 68933aa9

arch/arm64/include/asm/memory.h

+11 −12
Original line number Diff line number Diff line
@@ -12,10 +12,10 @@ 


#include <linux/compiler.h>

#include <linux/const.h>

#include <linux/sizes.h>

#include <linux/types.h>

#include <asm/bug.h>

#include <asm/page-def.h>

#include <linux/sizes.h>



/*

 * Size of the PCI I/O space. This must remain a power of two so that
@@ -253,8 +253,7 @@ static inline const void *__tag_set(const void *addr, u8 tag) 


#define __virt_to_phys_nodebug(x) ({					\

	phys_addr_t __x = (phys_addr_t)(__tag_reset(x));		\

	__is_lm_address(__x) ? __lm_to_phys(__x) :			\

			       __kimg_to_phys(__x);			\

	__is_lm_address(__x) ? __lm_to_phys(__x) : __kimg_to_phys(__x);	\

})



#define __pa_symbol_nodebug(x)	__kimg_to_phys((phys_addr_t)(x))
@@ -305,13 +304,13 @@ static inline void *phys_to_virt(phys_addr_t x) 
#define sym_to_pfn(x)		__phys_to_pfn(__pa_symbol(x))



/*

 *  virt_to_page(k)	convert a _valid_ virtual address to struct page *

 *  virt_addr_valid(k)	indicates whether a virtual address is valid

 *  virt_to_page(x)	convert a _valid_ virtual address to struct page *

 *  virt_addr_valid(x)	indicates whether a virtual address is valid

 */

#define ARCH_PFN_OFFSET		((unsigned long)PHYS_PFN_OFFSET)



#if !defined(CONFIG_SPARSEMEM_VMEMMAP) || defined(CONFIG_DEBUG_VIRTUAL)

#define virt_to_page(kaddr)	pfn_to_page(virt_to_pfn(kaddr))

#define virt_to_page(x)		pfn_to_page(virt_to_pfn(x))

#else

#define page_to_virt(x)	({						\

	__typeof__(x) __page = x;					\