rangeh-move-resource-api-and-constant-to-respective-files.patch removed from -mm tree

merged mm-nonmm-stable Andrew Morton 1 participant 1 message Aug 12, 2023

Share & tools

Andrew Morton

author tree notice Applied

2023-08-12 22:06 UTC #0 lore raw

The quilt patch titled
Subject: range.h: Move resource API and constant to respective files
has been removed from the -mm tree. Its filename was
rangeh-move-resource-api-and-constant-to-respective-files.patch

This patch was dropped because it was merged into the mm-nonmm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Andy Shevchenko <[email protected]>
Subject: range.h: Move resource API and constant to respective files
Date: Fri, 4 Aug 2023 09:46:36 +0300

range.h works with struct range data type. The resource_size_t is an alien here.

(1) Move cap_resource() implementation into its only user, and
(2) rename and move RESOURCE_SIZE_MAX to limits.h.

Link https://lkml.kernel.org/r/[email protected] open here

Signed-off-by Andy Shevchenko <[email protected]>

Acked-by Bjorn Helgaas <[email protected]>

Cc Alexander Sverdlin <[email protected]>

Cc Borislav Petkov (AMD) <[email protected]>

Cc Dave Hansen <[email protected]>

Cc "H. Peter Anvin" <[email protected]>

Cc Ingo Molnar <[email protected]>

Cc Rasmus Villemoes <[email protected]>

Cc Thomas Bogendoerfer <[email protected]>

Cc Thomas Gleixner <[email protected]>

Signed-off-by Andrew Morton <[email protected]>

---

 arch/mips/cavium-octeon/setup.c |    2 +-
 arch/x86/pci/amd_bus.c          |    8 ++++++++
 arch/x86/pci/bus_numa.c         |    2 +-
 include/linux/limits.h          |    2 ++
 include/linux/range.h           |    8 --------
 5 files changed, 12 insertions(+), 10 deletions(-)

arch/mips/cavium-octeon/setup.c renamed from arch/mips/cavium-octeon/setup.c~rangeh-move-resource-api-and-constant-to-respective-files +1 -1

@@ -1240,7 +1240,7 @@ static int __init octeon_no_pci_init(voi
 	 */
 	octeon_dummy_iospace = vzalloc(IO_SPACE_LIMIT);
 	set_io_port_base((unsigned long)octeon_dummy_iospace);
-	ioport_resource.start = MAX_RESOURCE;
+	ioport_resource.start = RESOURCE_SIZE_MAX;
 	ioport_resource.end = 0;
 	return 0;
 }

arch/x86/pci/amd_bus.c renamed from arch/x86/pci/amd_bus.c~rangeh-move-resource-api-and-constant-to-respective-files +8 -0

@@ -51,6 +51,14 @@ static struct pci_root_info __init *find
 	return NULL;
 }
 
+static inline resource_size_t cap_resource(u64 val)
+{
+	if (val > RESOURCE_SIZE_MAX)
+		return RESOURCE_SIZE_MAX;
+
+	return val;
+}
+
 /**
  * early_root_info_init()
  * called before pcibios_scan_root and pci_scan_bus

arch/x86/pci/bus_numa.c renamed from arch/x86/pci/bus_numa.c~rangeh-move-resource-api-and-constant-to-respective-files +1 -1

@@ -101,7 +101,7 @@ void update_res(struct pci_root_info *in
 	if (start > end)
 		return;
 
-	if (start == MAX_RESOURCE)
+	if (start == RESOURCE_SIZE_MAX)
 		return;
 
 	if (!merge)

include/linux/limits.h renamed from include/linux/limits.h~rangeh-move-resource-api-and-constant-to-respective-files +2 -0

@@ -10,6 +10,8 @@
 #define SSIZE_MAX	((ssize_t)(SIZE_MAX >> 1))
 #define PHYS_ADDR_MAX	(~(phys_addr_t)0)
 
+#define RESOURCE_SIZE_MAX	((resource_size_t)~0)
+
 #define U8_MAX		((u8)~0U)
 #define S8_MAX		((s8)(U8_MAX >> 1))
 #define S8_MIN		((s8)(-S8_MAX - 1))

include/linux/range.h renamed from include/linux/range.h~rangeh-move-resource-api-and-constant-to-respective-files +0 -8

@@ -31,12 +31,4 @@ int clean_sort_range(struct range *range
 
 void sort_range(struct range *range, int nr_range);
 
-#define MAX_RESOURCE ((resource_size_t)~0)
-static inline resource_size_t cap_resource(u64 val)
-{
-	if (val > MAX_RESOURCE)
-		return MAX_RESOURCE;
-
-	return val;
-}
 #endif

Patches currently in -mm which might be from [email protected] are