From 326a8d116032de72e584943875964c73d8a60c5e Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Sun, 6 Oct 2024 04:06:50 -0400 Subject: [PATCH] Drop mm-add-page_align_down-macro.patch Signed-off-by: Sasha Levin --- queue-4.19/mm-add-page_align_down-macro.patch | 39 ------------------- queue-4.19/series | 1 - queue-5.10/mm-add-page_align_down-macro.patch | 39 ------------------- queue-5.10/series | 1 - queue-5.15/mm-add-page_align_down-macro.patch | 39 ------------------- queue-5.15/series | 1 - queue-5.4/mm-add-page_align_down-macro.patch | 39 ------------------- queue-5.4/series | 1 - 8 files changed, 160 deletions(-) delete mode 100644 queue-4.19/mm-add-page_align_down-macro.patch delete mode 100644 queue-5.10/mm-add-page_align_down-macro.patch delete mode 100644 queue-5.15/mm-add-page_align_down-macro.patch delete mode 100644 queue-5.4/mm-add-page_align_down-macro.patch diff --git a/queue-4.19/mm-add-page_align_down-macro.patch b/queue-4.19/mm-add-page_align_down-macro.patch deleted file mode 100644 index a76a4cd58ba..00000000000 --- a/queue-4.19/mm-add-page_align_down-macro.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 1010ea86092ac587fbb3c0526eb6844f51365440 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 1 Jul 2022 17:16:19 +0800 -Subject: mm: Add PAGE_ALIGN_DOWN macro - -From: David Gow - -[ Upstream commit 335e52c28cf9954d65b819cb68912fd32de3c844 ] - -This is just the same as PAGE_ALIGN(), but rounds the address down, not -up. - -Suggested-by: Dmitry Vyukov -Signed-off-by: David Gow -Acked-by: Andrew Morton -Signed-off-by: Richard Weinberger -Stable-dep-of: be35d91c8880 ("xen: tolerate ACPI NVS memory overlapping with Xen allocated memory") -Signed-off-by: Sasha Levin ---- - include/linux/mm.h | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/include/linux/mm.h b/include/linux/mm.h -index 26a5fba226644..e76bbe77e0f7d 100644 ---- a/include/linux/mm.h -+++ b/include/linux/mm.h -@@ -143,6 +143,9 @@ extern int overcommit_kbytes_handler(struct ctl_table *, int, void __user *, - /* to align the pointer to the (next) page boundary */ - #define PAGE_ALIGN(addr) ALIGN(addr, PAGE_SIZE) - -+/* to align the pointer to the (prev) page boundary */ -+#define PAGE_ALIGN_DOWN(addr) ALIGN_DOWN(addr, PAGE_SIZE) -+ - /* test whether an address (unsigned long or pointer) is aligned to PAGE_SIZE */ - #define PAGE_ALIGNED(addr) IS_ALIGNED((unsigned long)(addr), PAGE_SIZE) - --- -2.43.0 - diff --git a/queue-4.19/series b/queue-4.19/series index 0cba482f4fe..05ef90b5afb 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -61,7 +61,6 @@ drm-msm-a5xx-fix-races-in-preemption-evaluation-stag.patch ipmi-docs-don-t-advertise-deprecated-sysfs-entries.patch drm-msm-fix-s-null-argument-error.patch xen-use-correct-end-address-of-kernel-for-conflict-c.patch -mm-add-page_align_down-macro.patch xen-introduce-generic-helper-checking-for-memory-map.patch xen-move-max_pfn-in-xen_memory_setup-out-of-function.patch xen-add-capability-to-remap-non-ram-pages-to-differe.patch diff --git a/queue-5.10/mm-add-page_align_down-macro.patch b/queue-5.10/mm-add-page_align_down-macro.patch deleted file mode 100644 index 3bbb84675a5..00000000000 --- a/queue-5.10/mm-add-page_align_down-macro.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 63a710c8057063736ac1383e69cfa17c7464b986 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 1 Jul 2022 17:16:19 +0800 -Subject: mm: Add PAGE_ALIGN_DOWN macro - -From: David Gow - -[ Upstream commit 335e52c28cf9954d65b819cb68912fd32de3c844 ] - -This is just the same as PAGE_ALIGN(), but rounds the address down, not -up. - -Suggested-by: Dmitry Vyukov -Signed-off-by: David Gow -Acked-by: Andrew Morton -Signed-off-by: Richard Weinberger -Stable-dep-of: be35d91c8880 ("xen: tolerate ACPI NVS memory overlapping with Xen allocated memory") -Signed-off-by: Sasha Levin ---- - include/linux/mm.h | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/include/linux/mm.h b/include/linux/mm.h -index b8b677f47a8da..329ba91a11abe 100644 ---- a/include/linux/mm.h -+++ b/include/linux/mm.h -@@ -221,6 +221,9 @@ int overcommit_policy_handler(struct ctl_table *, int, void *, size_t *, - /* to align the pointer to the (next) page boundary */ - #define PAGE_ALIGN(addr) ALIGN(addr, PAGE_SIZE) - -+/* to align the pointer to the (prev) page boundary */ -+#define PAGE_ALIGN_DOWN(addr) ALIGN_DOWN(addr, PAGE_SIZE) -+ - /* test whether an address (unsigned long or pointer) is aligned to PAGE_SIZE */ - #define PAGE_ALIGNED(addr) IS_ALIGNED((unsigned long)(addr), PAGE_SIZE) - --- -2.43.0 - diff --git a/queue-5.10/series b/queue-5.10/series index 16afda1e565..6431d85143f 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -131,7 +131,6 @@ ipmi-docs-don-t-advertise-deprecated-sysfs-entries.patch drm-msm-fix-s-null-argument-error.patch drivers-drm-exynos_drm_gsc-fix-wrong-assignment-in-g.patch xen-use-correct-end-address-of-kernel-for-conflict-c.patch -mm-add-page_align_down-macro.patch xen-introduce-generic-helper-checking-for-memory-map.patch xen-move-max_pfn-in-xen_memory_setup-out-of-function.patch xen-add-capability-to-remap-non-ram-pages-to-differe.patch diff --git a/queue-5.15/mm-add-page_align_down-macro.patch b/queue-5.15/mm-add-page_align_down-macro.patch deleted file mode 100644 index 5dc29d0adae..00000000000 --- a/queue-5.15/mm-add-page_align_down-macro.patch +++ /dev/null @@ -1,39 +0,0 @@ -From edf5b793e14e480399c03adb14a7128f98590271 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 1 Jul 2022 17:16:19 +0800 -Subject: mm: Add PAGE_ALIGN_DOWN macro - -From: David Gow - -[ Upstream commit 335e52c28cf9954d65b819cb68912fd32de3c844 ] - -This is just the same as PAGE_ALIGN(), but rounds the address down, not -up. - -Suggested-by: Dmitry Vyukov -Signed-off-by: David Gow -Acked-by: Andrew Morton -Signed-off-by: Richard Weinberger -Stable-dep-of: be35d91c8880 ("xen: tolerate ACPI NVS memory overlapping with Xen allocated memory") -Signed-off-by: Sasha Levin ---- - include/linux/mm.h | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/include/linux/mm.h b/include/linux/mm.h -index 5692055f202cb..f26b044024416 100644 ---- a/include/linux/mm.h -+++ b/include/linux/mm.h -@@ -233,6 +233,9 @@ int __add_to_page_cache_locked(struct page *page, struct address_space *mapping, - /* to align the pointer to the (next) page boundary */ - #define PAGE_ALIGN(addr) ALIGN(addr, PAGE_SIZE) - -+/* to align the pointer to the (prev) page boundary */ -+#define PAGE_ALIGN_DOWN(addr) ALIGN_DOWN(addr, PAGE_SIZE) -+ - /* test whether an address (unsigned long or pointer) is aligned to PAGE_SIZE */ - #define PAGE_ALIGNED(addr) IS_ALIGNED((unsigned long)(addr), PAGE_SIZE) - --- -2.43.0 - diff --git a/queue-5.15/series b/queue-5.15/series index 63b2d4b10f0..fd5a7ab2f5c 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -172,7 +172,6 @@ ipmi-docs-don-t-advertise-deprecated-sysfs-entries.patch drm-msm-fix-s-null-argument-error.patch drivers-drm-exynos_drm_gsc-fix-wrong-assignment-in-g.patch xen-use-correct-end-address-of-kernel-for-conflict-c.patch -mm-add-page_align_down-macro.patch xen-introduce-generic-helper-checking-for-memory-map.patch xen-move-max_pfn-in-xen_memory_setup-out-of-function.patch xen-add-capability-to-remap-non-ram-pages-to-differe.patch diff --git a/queue-5.4/mm-add-page_align_down-macro.patch b/queue-5.4/mm-add-page_align_down-macro.patch deleted file mode 100644 index e1774bf1e4d..00000000000 --- a/queue-5.4/mm-add-page_align_down-macro.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 7b6f5179c8fee7072ab3aeb9a444db71a1490bf1 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 1 Jul 2022 17:16:19 +0800 -Subject: mm: Add PAGE_ALIGN_DOWN macro - -From: David Gow - -[ Upstream commit 335e52c28cf9954d65b819cb68912fd32de3c844 ] - -This is just the same as PAGE_ALIGN(), but rounds the address down, not -up. - -Suggested-by: Dmitry Vyukov -Signed-off-by: David Gow -Acked-by: Andrew Morton -Signed-off-by: Richard Weinberger -Stable-dep-of: be35d91c8880 ("xen: tolerate ACPI NVS memory overlapping with Xen allocated memory") -Signed-off-by: Sasha Levin ---- - include/linux/mm.h | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/include/linux/mm.h b/include/linux/mm.h -index d14aba548ff4e..7e26146938ec2 100644 ---- a/include/linux/mm.h -+++ b/include/linux/mm.h -@@ -218,6 +218,9 @@ extern int overcommit_kbytes_handler(struct ctl_table *, int, void __user *, - /* to align the pointer to the (next) page boundary */ - #define PAGE_ALIGN(addr) ALIGN(addr, PAGE_SIZE) - -+/* to align the pointer to the (prev) page boundary */ -+#define PAGE_ALIGN_DOWN(addr) ALIGN_DOWN(addr, PAGE_SIZE) -+ - /* test whether an address (unsigned long or pointer) is aligned to PAGE_SIZE */ - #define PAGE_ALIGNED(addr) IS_ALIGNED((unsigned long)(addr), PAGE_SIZE) - --- -2.43.0 - diff --git a/queue-5.4/series b/queue-5.4/series index 5bfd3096f6f..151fb2d15d1 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -83,7 +83,6 @@ ipmi-docs-don-t-advertise-deprecated-sysfs-entries.patch drm-msm-fix-s-null-argument-error.patch drivers-drm-exynos_drm_gsc-fix-wrong-assignment-in-g.patch xen-use-correct-end-address-of-kernel-for-conflict-c.patch -mm-add-page_align_down-macro.patch xen-introduce-generic-helper-checking-for-memory-map.patch xen-move-max_pfn-in-xen_memory_setup-out-of-function.patch xen-add-capability-to-remap-non-ram-pages-to-differe.patch -- 2.47.3