Drop mm-add-page_align_down-macro.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

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 (file)
index a76a4cd..0000000
--- 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 <sashal@kernel.org>
-Date: Fri, 1 Jul 2022 17:16:19 +0800
-Subject: mm: Add PAGE_ALIGN_DOWN macro
-
-From: David Gow <davidgow@google.com>
-
-[ Upstream commit 335e52c28cf9954d65b819cb68912fd32de3c844 ]
-
-This is just the same as PAGE_ALIGN(), but rounds the address down, not
-up.
-
-Suggested-by: Dmitry Vyukov <dvyukov@google.com>
-Signed-off-by: David Gow <davidgow@google.com>
-Acked-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Richard Weinberger <richard@nod.at>
-Stable-dep-of: be35d91c8880 ("xen: tolerate ACPI NVS memory overlapping with Xen allocated memory")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- 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 0cba482f4fefda0e67f32f4eb3edff261381b7d5..05ef90b5afbdb75d8721d8c765854f38862585bb 100644 (file)
--- 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 (file)
index 3bbb846..0000000
--- 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 <sashal@kernel.org>
-Date: Fri, 1 Jul 2022 17:16:19 +0800
-Subject: mm: Add PAGE_ALIGN_DOWN macro
-
-From: David Gow <davidgow@google.com>
-
-[ Upstream commit 335e52c28cf9954d65b819cb68912fd32de3c844 ]
-
-This is just the same as PAGE_ALIGN(), but rounds the address down, not
-up.
-
-Suggested-by: Dmitry Vyukov <dvyukov@google.com>
-Signed-off-by: David Gow <davidgow@google.com>
-Acked-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Richard Weinberger <richard@nod.at>
-Stable-dep-of: be35d91c8880 ("xen: tolerate ACPI NVS memory overlapping with Xen allocated memory")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- 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 16afda1e565d5fc895a83d2dda1278a60ad73625..6431d85143ff6fc0e5cb33714a448c321da8c7f4 100644 (file)
--- 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 (file)
index 5dc29d0..0000000
--- 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 <sashal@kernel.org>
-Date: Fri, 1 Jul 2022 17:16:19 +0800
-Subject: mm: Add PAGE_ALIGN_DOWN macro
-
-From: David Gow <davidgow@google.com>
-
-[ Upstream commit 335e52c28cf9954d65b819cb68912fd32de3c844 ]
-
-This is just the same as PAGE_ALIGN(), but rounds the address down, not
-up.
-
-Suggested-by: Dmitry Vyukov <dvyukov@google.com>
-Signed-off-by: David Gow <davidgow@google.com>
-Acked-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Richard Weinberger <richard@nod.at>
-Stable-dep-of: be35d91c8880 ("xen: tolerate ACPI NVS memory overlapping with Xen allocated memory")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- 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 63b2d4b10f0b21c1d61e3dce47a055d44998e028..fd5a7ab2f5c15604ca2ea0378489b0f6485f3387 100644 (file)
--- 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 (file)
index e1774bf..0000000
--- 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 <sashal@kernel.org>
-Date: Fri, 1 Jul 2022 17:16:19 +0800
-Subject: mm: Add PAGE_ALIGN_DOWN macro
-
-From: David Gow <davidgow@google.com>
-
-[ Upstream commit 335e52c28cf9954d65b819cb68912fd32de3c844 ]
-
-This is just the same as PAGE_ALIGN(), but rounds the address down, not
-up.
-
-Suggested-by: Dmitry Vyukov <dvyukov@google.com>
-Signed-off-by: David Gow <davidgow@google.com>
-Acked-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Richard Weinberger <richard@nod.at>
-Stable-dep-of: be35d91c8880 ("xen: tolerate ACPI NVS memory overlapping with Xen allocated memory")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- 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 5bfd3096f6f06a87e4dbef3e43a11d46384aa87b..151fb2d15d1234979849ac6e3437ec545cbc48a9 100644 (file)
--- 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