Commit 17e0a7cb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86-cleanups-2020-06-01' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 cleanups from Ingo Molnar:
 "Misc cleanups, with an emphasis on removing obsolete/dead code"

* tag 'x86-cleanups-2020-06-01' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/spinlock: Remove obsolete ticket spinlock macros and types
  x86/mm: Drop deprecated DISCONTIGMEM support for 32-bit
  x86/apb_timer: Drop unused declaration and macro
  x86/apb_timer: Drop unused TSC calibration
  x86/io_apic: Remove unused function mp_init_irq_at_boot()
  x86/mm: Stop printing BRK addresses
  x86/audit: Fix a -Wmissing-prototypes warning for ia32_classify_syscall()
  x86/nmi: Remove edac.h include leftover
  mm: Remove MPX leftovers
  x86/mm/mmap: Fix -Wmissing-prototypes warnings
  x86/early_printk: Remove unused includes
  crash_dump: Remove no longer used saved_max_pfn
  x86/smpboot: Remove the last ICPU() macro
parents bb548bed 2ca41f55

arch/x86/Kconfig

+0 −9
Original line number Diff line number Diff line
@@ -1611,19 +1611,10 @@ config NODES_SHIFT 
	  Specify the maximum number of NUMA Nodes available on the target

	  system.  Increases memory reserved to accommodate various tables.



config ARCH_HAVE_MEMORY_PRESENT

	def_bool y

	depends on X86_32 && DISCONTIGMEM



config ARCH_FLATMEM_ENABLE

	def_bool y

	depends on X86_32 && !NUMA



config ARCH_DISCONTIGMEM_ENABLE

	def_bool n

	depends on NUMA && X86_32

	depends on BROKEN



config ARCH_SPARSEMEM_ENABLE

	def_bool y

	depends on X86_64 || NUMA || X86_32 || X86_32_NON_STANDARD

arch/x86/ia32/audit.c

+1 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#include <asm/unistd_32.h>

#include <asm/audit.h>



unsigned ia32_dir_class[] = {

#include <asm-generic/audit_dir_write.h>

arch/x86/include/asm/apb_timer.h

+0 −5
Original line number Diff line number Diff line
@@ -25,11 +25,7 @@ 
#define APBT_MIN_FREQ          1000000

#define APBT_MMAP_SIZE         1024



#define APBT_DEV_USED  1



extern void apbt_time_init(void);

extern unsigned long apbt_quick_calibrate(void);

extern int arch_setup_apbt_irqs(int irq, int trigger, int mask, int cpu);

extern void apbt_setup_secondary_clock(void);



extern struct sfi_timer_table_entry *sfi_get_mtmr(int hint);
@@ -38,7 +34,6 @@ extern int sfi_mtimer_num; 


#else /* CONFIG_APB_TIMER */



static inline unsigned long apbt_quick_calibrate(void) {return 0; }

static inline void apbt_time_init(void) { }



#endif

arch/x86/include/asm/audit.h

0 → 100644
+7 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef _ASM_X86_AUDIT_H

#define _ASM_X86_AUDIT_H



int ia32_classify_syscall(unsigned int syscall);



#endif /* _ASM_X86_AUDIT_H */

arch/x86/include/asm/mmzone_32.h

+0 −39
Original line number Diff line number Diff line
@@ -14,43 +14,4 @@ extern struct pglist_data *node_data[]; 
#define NODE_DATA(nid)	(node_data[nid])

#endif /* CONFIG_NUMA */



#ifdef CONFIG_DISCONTIGMEM



/*

 * generic node memory support, the following assumptions apply:

 *

 * 1) memory comes in 64Mb contiguous chunks which are either present or not

 * 2) we will not have more than 64Gb in total

 *

 * for now assume that 64Gb is max amount of RAM for whole system

 *    64Gb / 4096bytes/page = 16777216 pages

 */

#define MAX_NR_PAGES 16777216

#define MAX_SECTIONS 1024

#define PAGES_PER_SECTION (MAX_NR_PAGES/MAX_SECTIONS)



extern s8 physnode_map[];



static inline int pfn_to_nid(unsigned long pfn)

{

#ifdef CONFIG_NUMA

	return((int) physnode_map[(pfn) / PAGES_PER_SECTION]);

#else

	return 0;

#endif

}



static inline int pfn_valid(int pfn)

{

	int nid = pfn_to_nid(pfn);



	if (nid >= 0)

		return (pfn < node_end_pfn(nid));

	return 0;

}



#define early_pfn_valid(pfn)	pfn_valid((pfn))



#endif /* CONFIG_DISCONTIGMEM */



#endif /* _ASM_X86_MMZONE_32_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE