Commit d3c251ab authored by Mike Rapoport's avatar Mike Rapoport Committed by Linus Torvalds
Browse files

arch, mm: remove stale mentions of DISCONIGMEM 

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.

Link: https://lkml.kernel.org/r/20210608091316.3622-7-rppt@kernel.org


Signed-off-by: default avatarMike Rapoport <rppt@linux.ibm.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Vineet Gupta <vgupta@synopsys.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent bb1c50d3

arch/ia64/kernel/topology.c

+2 −3
Original line number Diff line number Diff line
@@ -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

arch/ia64/mm/numa.c

+2 −3
Original line number Diff line number Diff line
@@ -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>

 */

arch/mips/include/asm/mmzone.h

+0 −6
Original line number Diff line number Diff line
@@ -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_ */

arch/mips/mm/init.c

+0 −3
Original line number Diff line number Diff line
@@ -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;

arch/nds32/include/asm/memory.h

+0 −6
Original line number Diff line number Diff line
@@ -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