diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2022-06-01 11:47:06 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2023-05-29 11:27:08 +0200 |
| commit | 2d78057f0dd41c5e24b824a3ea254a0672ec73eb (patch) | |
| tree | d3ea72ee65dfc1c556a14ca647272259c0abb25e /include | |
| parent | xen/netback: Pass (void *) to virt_to_page() (diff) | |
| download | linux-2d78057f0dd41c5e24b824a3ea254a0672ec73eb.tar.xz linux-2d78057f0dd41c5e24b824a3ea254a0672ec73eb.zip | |
asm-generic/page.h: 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 we do the same change for pfn_to_virt.
Immediately define virt_to_pfn and pfn_to_virt to the static
inline after the static inline since this style of defining
functions is used for the generic helpers.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-generic/page.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/include/asm-generic/page.h b/include/asm-generic/page.h index c0be2edeb484..9773582fd96e 100644 --- a/include/asm-generic/page.h +++ b/include/asm-generic/page.h @@ -74,8 +74,16 @@ extern unsigned long memory_end; #define __va(x) ((void *)((unsigned long) (x))) #define __pa(x) ((unsigned long) (x)) -#define virt_to_pfn(kaddr) (__pa(kaddr) >> PAGE_SHIFT) -#define pfn_to_virt(pfn) __va((pfn) << PAGE_SHIFT) +static inline unsigned long virt_to_pfn(const void *kaddr) +{ + return __pa(kaddr) >> PAGE_SHIFT; +} +#define virt_to_pfn virt_to_pfn +static inline void *pfn_to_virt(unsigned long pfn) +{ + return __va(pfn) << PAGE_SHIFT; +} +#define pfn_to_virt pfn_to_virt #define virt_to_page(addr) pfn_to_page(virt_to_pfn(addr)) #define page_to_virt(page) pfn_to_virt(page_to_pfn(page)) |