From: Benjamin Berg Date: Sun, 3 Nov 2024 15:05:05 +0000 (+0100) Subject: um: remove duplicate UM_NSEC_PER_SEC definition X-Git-Tag: v6.13-rc1~18^2~11 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b69f22dfd6973ec54da5e2b8fd1f1cd138b533b0;p=thirdparty%2Fkernel%2Flinux.git um: remove duplicate UM_NSEC_PER_SEC definition Just remove the first entry as there is a second later on. Signed-off-by: Benjamin Berg Link: https://patch.msgid.link/20241103150506.1367695-4-benjamin@sipsolutions.net Signed-off-by: Johannes Berg --- diff --git a/arch/um/include/shared/common-offsets.h b/arch/um/include/shared/common-offsets.h index 1d00fc6b6e925..73f3a4792ed8b 100644 --- a/arch/um/include/shared/common-offsets.h +++ b/arch/um/include/shared/common-offsets.h @@ -6,7 +6,6 @@ DEFINE(KERNEL_MADV_REMOVE, MADV_REMOVE); DEFINE(UM_KERN_PAGE_SIZE, PAGE_SIZE); DEFINE(UM_KERN_PAGE_MASK, PAGE_MASK); DEFINE(UM_KERN_PAGE_SHIFT, PAGE_SHIFT); -DEFINE(UM_NSEC_PER_SEC, NSEC_PER_SEC); DEFINE(UM_GFP_KERNEL, GFP_KERNEL); DEFINE(UM_GFP_ATOMIC, GFP_ATOMIC);