Skip to content

Commit c1884e1

Browse files
linuswguoren83
authored andcommitted
csky: Make pfn accessors static 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 to the same thing with pfn_to_virt(). In order to do this we move the virt_to_phys() and phys_to_virt() below the definitions of the __pa() and __va() macros so it compiles. The macro version was also able to do recursive symbol resolution. Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Guo Ren <guoren@linux.alibaba.com> Signed-off-by: Guo Ren <guoren@kernel.org>
1 parent ee12fe2 commit c1884e1

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

arch/csky/include/asm/page.h

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@
3434

3535
#include <linux/pfn.h>
3636

37-
#define virt_to_pfn(kaddr) (__pa(kaddr) >> PAGE_SHIFT)
38-
#define pfn_to_virt(pfn) __va((pfn) << PAGE_SHIFT)
39-
4037
#define virt_addr_valid(kaddr) ((void *)(kaddr) >= (void *)PAGE_OFFSET && \
4138
(void *)(kaddr) < high_memory)
4239

@@ -80,6 +77,16 @@ extern unsigned long va_pa_offset;
8077

8178
#define __pa_symbol(x) __pa(RELOC_HIDE((unsigned long)(x), 0))
8279

80+
static inline unsigned long virt_to_pfn(const void *kaddr)
81+
{
82+
return __pa(kaddr) >> PAGE_SHIFT;
83+
}
84+
85+
static inline void * pfn_to_virt(unsigned long pfn)
86+
{
87+
return (void *)((unsigned long)__va(pfn) << PAGE_SHIFT);
88+
}
89+
8390
#define MAP_NR(x) PFN_DOWN((unsigned long)(x) - PAGE_OFFSET - \
8491
PHYS_OFFSET_OFFSET)
8592
#define virt_to_page(x) (mem_map + MAP_NR(x))

0 commit comments

Comments
 (0)