Skip to content

Commit d6e8153

Browse files
Linus Walleijarndb
authored andcommitted
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>
1 parent da4382a commit d6e8153

1 file changed

Lines changed: 13 additions & 2 deletions

File tree

  • arch/hexagon/include/asm

arch/hexagon/include/asm/page.h

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,9 @@ typedef struct page *pgtable_t;
7878
#define __pgd(x) ((pgd_t) { (x) })
7979
#define __pgprot(x) ((pgprot_t) { (x) })
8080

81+
/* Needed for PAGE_OFFSET used in the macro right below */
82+
#include <asm/mem-layout.h>
83+
8184
/*
8285
* We need a __pa and a __va routine for kernel space.
8386
* MIPS says they're only used during mem_init.
@@ -125,8 +128,16 @@ static inline void clear_page(void *page)
125128
*/
126129
#define page_to_phys(page) (page_to_pfn(page) << PAGE_SHIFT)
127130

128-
#define virt_to_pfn(kaddr) (__pa(kaddr) >> PAGE_SHIFT)
129-
#define pfn_to_virt(pfn) __va((pfn) << PAGE_SHIFT)
131+
static inline unsigned long virt_to_pfn(const void *kaddr)
132+
{
133+
return __pa(kaddr) >> PAGE_SHIFT;
134+
}
135+
136+
static inline void *pfn_to_virt(unsigned long pfn)
137+
{
138+
return (void *)((unsigned long)__va(pfn) << PAGE_SHIFT);
139+
}
140+
130141

131142
#define page_to_virt(page) __va(page_to_phys(page))
132143

0 commit comments

Comments
 (0)