| Message ID | 20210602105348.13387-7-rppt@kernel.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Remove DISCINTIGMEM memory model | expand |
On 02.06.21 12:53, Mike Rapoport wrote: > From: Mike Rapoport <rppt@linux.ibm.com> > > There are several places that mention DISCONIGMEM in comments or have stale > code guarded by CONFIG_DISCONTIGMEM. > > Remove the dead code and update the comments. > > Signed-off-by: Mike Rapoport <rppt@linux.ibm.com> > --- > arch/ia64/kernel/topology.c | 5 ++--- > arch/ia64/mm/numa.c | 5 ++--- > arch/mips/include/asm/mmzone.h | 6 ------ > arch/mips/mm/init.c | 3 --- > arch/nds32/include/asm/memory.h | 6 ------ > arch/xtensa/include/asm/page.h | 4 ---- > include/linux/gfp.h | 4 ++-- > 7 files changed, 6 insertions(+), 27 deletions(-) > > diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c > index 09fc385c2acd..3639e0a7cb3b 100644 > --- a/arch/ia64/kernel/topology.c > +++ b/arch/ia64/kernel/topology.c > @@ -3,9 +3,8 @@ > * License. See the file "COPYING" in the main directory of this archive > * for more details. > * > - * This file contains NUMA specific variables and functions which can > - * be split away from DISCONTIGMEM and are used on NUMA machines with > - * contiguous memory. > + * This file contains NUMA specific variables and functions which are used on > + * NUMA machines with contiguous memory. > * 2002/08/07 Erich Focht <efocht@ess.nec.de> > * Populate cpu entries in sysfs for non-numa systems as well > * Intel Corporation - Ashok Raj > diff --git a/arch/ia64/mm/numa.c b/arch/ia64/mm/numa.c > index 46b6e5f3a40f..d6579ec3ea32 100644 > --- a/arch/ia64/mm/numa.c > +++ b/arch/ia64/mm/numa.c > @@ -3,9 +3,8 @@ > * License. See the file "COPYING" in the main directory of this archive > * for more details. > * > - * This file contains NUMA specific variables and functions which can > - * be split away from DISCONTIGMEM and are used on NUMA machines with > - * contiguous memory. > + * This file contains NUMA specific variables and functions which are used on > + * NUMA machines with contiguous memory. > * > * 2002/08/07 Erich Focht <efocht@ess.nec.de> > */ > diff --git a/arch/mips/include/asm/mmzone.h b/arch/mips/include/asm/mmzone.h > index b826b8473e95..7649ab45e80c 100644 > --- a/arch/mips/include/asm/mmzone.h > +++ b/arch/mips/include/asm/mmzone.h > @@ -20,10 +20,4 @@ > #define nid_to_addrbase(nid) 0 > #endif > > -#ifdef CONFIG_DISCONTIGMEM > - > -#define pfn_to_nid(pfn) pa_to_nid((pfn) << PAGE_SHIFT) > - > -#endif /* CONFIG_DISCONTIGMEM */ > - > #endif /* _ASM_MMZONE_H_ */ > diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c > index c36358758969..97f6ca341448 100644 > --- a/arch/mips/mm/init.c > +++ b/arch/mips/mm/init.c > @@ -454,9 +454,6 @@ void __init mem_init(void) > BUILD_BUG_ON(IS_ENABLED(CONFIG_32BIT) && (_PFN_SHIFT > PAGE_SHIFT)); > > #ifdef CONFIG_HIGHMEM > -#ifdef CONFIG_DISCONTIGMEM > -#error "CONFIG_HIGHMEM and CONFIG_DISCONTIGMEM dont work together yet" > -#endif > max_mapnr = highend_pfn ? highend_pfn : max_low_pfn; > #else > max_mapnr = max_low_pfn; > diff --git a/arch/nds32/include/asm/memory.h b/arch/nds32/include/asm/memory.h > index 940d32842793..62faafbc28e4 100644 > --- a/arch/nds32/include/asm/memory.h > +++ b/arch/nds32/include/asm/memory.h > @@ -76,18 +76,12 @@ > * virt_to_page(k) convert a _valid_ virtual address to struct page * > * virt_addr_valid(k) indicates whether a virtual address is valid > */ > -#ifndef CONFIG_DISCONTIGMEM > - > #define ARCH_PFN_OFFSET PHYS_PFN_OFFSET > #define pfn_valid(pfn) ((pfn) >= PHYS_PFN_OFFSET && (pfn) < (PHYS_PFN_OFFSET + max_mapnr)) > > #define virt_to_page(kaddr) (pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)) > #define virt_addr_valid(kaddr) ((unsigned long)(kaddr) >= PAGE_OFFSET && (unsigned long)(kaddr) < (unsigned long)high_memory) > > -#else /* CONFIG_DISCONTIGMEM */ > -#error CONFIG_DISCONTIGMEM is not supported yet. > -#endif /* !CONFIG_DISCONTIGMEM */ > - > #define page_to_phys(page) (page_to_pfn(page) << PAGE_SHIFT) > > #endif > diff --git a/arch/xtensa/include/asm/page.h b/arch/xtensa/include/asm/page.h > index 37ce25ef92d6..493eb7083b1a 100644 > --- a/arch/xtensa/include/asm/page.h > +++ b/arch/xtensa/include/asm/page.h > @@ -192,10 +192,6 @@ static inline unsigned long ___pa(unsigned long va) > #define pfn_valid(pfn) \ > ((pfn) >= ARCH_PFN_OFFSET && ((pfn) - ARCH_PFN_OFFSET) < max_mapnr) > > -#ifdef CONFIG_DISCONTIGMEM > -# error CONFIG_DISCONTIGMEM not supported > -#endif > - > #define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT) > #define page_to_virt(page) __va(page_to_pfn(page) << PAGE_SHIFT) > #define virt_addr_valid(kaddr) pfn_valid(__pa(kaddr) >> PAGE_SHIFT) > diff --git a/include/linux/gfp.h b/include/linux/gfp.h > index 11da8af06704..dbe1f5fc901d 100644 > --- a/include/linux/gfp.h > +++ b/include/linux/gfp.h > @@ -494,8 +494,8 @@ static inline int gfp_zonelist(gfp_t flags) > * There are two zonelists per node, one for all zones with memory and > * one containing just zones from the node the zonelist belongs to. > * > - * For the normal case of non-DISCONTIGMEM systems the NODE_DATA() gets > - * optimized to &contig_page_data at compile-time. > + * For the case of non-NUMA systems the NODE_DATA() gets optimized to > + * &contig_page_data at compile-time. > */ > static inline struct zonelist *node_zonelist(int nid, gfp_t flags) > { > Reviewed-by: David Hildenbrand <david@redhat.com>
diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c index 09fc385c2acd..3639e0a7cb3b 100644 --- a/arch/ia64/kernel/topology.c +++ b/arch/ia64/kernel/topology.c @@ -3,9 +3,8 @@ * License. See the file "COPYING" in the main directory of this archive * for more details. * - * This file contains NUMA specific variables and functions which can - * be split away from DISCONTIGMEM and are used on NUMA machines with - * contiguous memory. + * This file contains NUMA specific variables and functions which are used on + * NUMA machines with contiguous memory. * 2002/08/07 Erich Focht <efocht@ess.nec.de> * Populate cpu entries in sysfs for non-numa systems as well * Intel Corporation - Ashok Raj diff --git a/arch/ia64/mm/numa.c b/arch/ia64/mm/numa.c index 46b6e5f3a40f..d6579ec3ea32 100644 --- a/arch/ia64/mm/numa.c +++ b/arch/ia64/mm/numa.c @@ -3,9 +3,8 @@ * License. See the file "COPYING" in the main directory of this archive * for more details. * - * This file contains NUMA specific variables and functions which can - * be split away from DISCONTIGMEM and are used on NUMA machines with - * contiguous memory. + * This file contains NUMA specific variables and functions which are used on + * NUMA machines with contiguous memory. * * 2002/08/07 Erich Focht <efocht@ess.nec.de> */ diff --git a/arch/mips/include/asm/mmzone.h b/arch/mips/include/asm/mmzone.h index b826b8473e95..7649ab45e80c 100644 --- a/arch/mips/include/asm/mmzone.h +++ b/arch/mips/include/asm/mmzone.h @@ -20,10 +20,4 @@ #define nid_to_addrbase(nid) 0 #endif -#ifdef CONFIG_DISCONTIGMEM - -#define pfn_to_nid(pfn) pa_to_nid((pfn) << PAGE_SHIFT) - -#endif /* CONFIG_DISCONTIGMEM */ - #endif /* _ASM_MMZONE_H_ */ diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c index c36358758969..97f6ca341448 100644 --- a/arch/mips/mm/init.c +++ b/arch/mips/mm/init.c @@ -454,9 +454,6 @@ void __init mem_init(void) BUILD_BUG_ON(IS_ENABLED(CONFIG_32BIT) && (_PFN_SHIFT > PAGE_SHIFT)); #ifdef CONFIG_HIGHMEM -#ifdef CONFIG_DISCONTIGMEM -#error "CONFIG_HIGHMEM and CONFIG_DISCONTIGMEM dont work together yet" -#endif max_mapnr = highend_pfn ? highend_pfn : max_low_pfn; #else max_mapnr = max_low_pfn; diff --git a/arch/nds32/include/asm/memory.h b/arch/nds32/include/asm/memory.h index 940d32842793..62faafbc28e4 100644 --- a/arch/nds32/include/asm/memory.h +++ b/arch/nds32/include/asm/memory.h @@ -76,18 +76,12 @@ * virt_to_page(k) convert a _valid_ virtual address to struct page * * virt_addr_valid(k) indicates whether a virtual address is valid */ -#ifndef CONFIG_DISCONTIGMEM - #define ARCH_PFN_OFFSET PHYS_PFN_OFFSET #define pfn_valid(pfn) ((pfn) >= PHYS_PFN_OFFSET && (pfn) < (PHYS_PFN_OFFSET + max_mapnr)) #define virt_to_page(kaddr) (pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)) #define virt_addr_valid(kaddr) ((unsigned long)(kaddr) >= PAGE_OFFSET && (unsigned long)(kaddr) < (unsigned long)high_memory) -#else /* CONFIG_DISCONTIGMEM */ -#error CONFIG_DISCONTIGMEM is not supported yet. -#endif /* !CONFIG_DISCONTIGMEM */ - #define page_to_phys(page) (page_to_pfn(page) << PAGE_SHIFT) #endif diff --git a/arch/xtensa/include/asm/page.h b/arch/xtensa/include/asm/page.h index 37ce25ef92d6..493eb7083b1a 100644 --- a/arch/xtensa/include/asm/page.h +++ b/arch/xtensa/include/asm/page.h @@ -192,10 +192,6 @@ static inline unsigned long ___pa(unsigned long va) #define pfn_valid(pfn) \ ((pfn) >= ARCH_PFN_OFFSET && ((pfn) - ARCH_PFN_OFFSET) < max_mapnr) -#ifdef CONFIG_DISCONTIGMEM -# error CONFIG_DISCONTIGMEM not supported -#endif - #define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT) #define page_to_virt(page) __va(page_to_pfn(page) << PAGE_SHIFT) #define virt_addr_valid(kaddr) pfn_valid(__pa(kaddr) >> PAGE_SHIFT) diff --git a/include/linux/gfp.h b/include/linux/gfp.h index 11da8af06704..dbe1f5fc901d 100644 --- a/include/linux/gfp.h +++ b/include/linux/gfp.h @@ -494,8 +494,8 @@ static inline int gfp_zonelist(gfp_t flags) * There are two zonelists per node, one for all zones with memory and * one containing just zones from the node the zonelist belongs to. * - * For the normal case of non-DISCONTIGMEM systems the NODE_DATA() gets - * optimized to &contig_page_data at compile-time. + * For the case of non-NUMA systems the NODE_DATA() gets optimized to + * &contig_page_data at compile-time. */ static inline struct zonelist *node_zonelist(int nid, gfp_t flags) {