These custom definitions where added in commit 7f053812dab3 ("random:
vDSO: minimize and simplify header includes") to avoid pulling in
non-vDSO-safe headers from linux/page.h. Today we have vdso/page.h which
provides these definitions for the vDSO.
Use vdso/page.h instead.
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
---
lib/vdso/getrandom.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/lib/vdso/getrandom.c b/lib/vdso/getrandom.c
index 7e29005aa208..2851afa9154f 100644
--- a/lib/vdso/getrandom.c
+++ b/lib/vdso/getrandom.c
@@ -8,6 +8,7 @@
#include <vdso/datapage.h>
#include <vdso/getrandom.h>
#include <vdso/limits.h>
+#include <vdso/page.h>
#include <vdso/unaligned.h>
#include <asm/barrier.h>
#include <asm/vdso/getrandom.h>
@@ -18,11 +19,6 @@
/* Bring in default accessors */
#include <vdso/vsyscall.h>
-#undef PAGE_SIZE
-#undef PAGE_MASK
-#define PAGE_SIZE (1UL << CONFIG_PAGE_SHIFT)
-#define PAGE_MASK (~(PAGE_SIZE - 1))
-
#define MEMCPY_AND_ZERO_SRC(type, dst, src, len) do { \
while (len >= sizeof(type)) { \
__put_unaligned_t(type, __get_unaligned_t(type, src), dst); \
---
base-commit: dc59e4fea9d83f03bad6bddf3fa2e52491777482
change-id: 20260720-vdso-random-page-size-ef8b25ffbb8e
Best regards,
--
Thomas Weißschuh <thomas.weissschuh@linutronix.de>