tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Hexagon: Make pfn accessors statics inlines

Making virt_to_pfn() a static inline taking a strongly typed
(const void *) makes the contract of a passing a pointer of that
type to the function explicit and exposes any misuse of the
macro virt_to_pfn() acting polymorphic and accepting many types
such as (void *), (unitptr_t) or (unsigned long) as arguments
without warnings.

For symmetry do the same with pfn_to_virt().

For compiletime resolution of __pa() we need PAGE_OFFSET which
was not available to __pa() and resolved by the preprocessor
wherever __pa() was used. Fix this by explicitly including
<asm/mem-layout.h> where required, following the pattern of the
architectures page.h file.

Acked-by: Brian Cain <bcain@quicinc.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

authored by

Linus Walleij and committed by
Arnd Bergmann d6e81532 da4382a7

+13 -2
+13 -2
arch/hexagon/include/asm/page.h
··· 78 78 #define __pgd(x) ((pgd_t) { (x) }) 79 79 #define __pgprot(x) ((pgprot_t) { (x) }) 80 80 81 + /* Needed for PAGE_OFFSET used in the macro right below */ 82 + #include <asm/mem-layout.h> 83 + 81 84 /* 82 85 * We need a __pa and a __va routine for kernel space. 83 86 * MIPS says they're only used during mem_init. ··· 128 125 */ 129 126 #define page_to_phys(page) (page_to_pfn(page) << PAGE_SHIFT) 130 127 131 - #define virt_to_pfn(kaddr) (__pa(kaddr) >> PAGE_SHIFT) 132 - #define pfn_to_virt(pfn) __va((pfn) << PAGE_SHIFT) 128 + static inline unsigned long virt_to_pfn(const void *kaddr) 129 + { 130 + return __pa(kaddr) >> PAGE_SHIFT; 131 + } 132 + 133 + static inline void *pfn_to_virt(unsigned long pfn) 134 + { 135 + return (void *)((unsigned long)__va(pfn) << PAGE_SHIFT); 136 + } 137 + 133 138 134 139 #define page_to_virt(page) __va(page_to_phys(page)) 135 140