iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86, NUMA: trivial cleanups

Browse Source 
* Kill no longer used struct bootnode.

* Kill dangling declaration of pxm_to_nid() in numa_32.h.

* Make setup_node_bootmem() static.

Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: David Rientjes <rientjes@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
This commit is contained in:
Tejun Heo 2011-05-02 14:18:52 +02:00
parent 797390d855
commit 1201e10a09
5 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/include/asm/acpi.h
View File

@ -183,8 +183,6 @@ static inline void disable_acpi(void) { }
#define ARCH_HAS_POWER_INIT 1 #define ARCH_HAS_POWER_INIT 1
struct bootnode;
#ifdef CONFIG_ACPI_NUMA #ifdef CONFIG_ACPI_NUMA
extern int acpi_numa; extern int acpi_numa;
extern int x86_acpi_numa_init(void); extern int x86_acpi_numa_init(void);

1
arch/x86/include/asm/amd_nb.h
View File

@ -11,7 +11,6 @@ struct amd_nb_bus_dev_range {
extern const struct pci_device_id amd_nb_misc_ids[]; extern const struct pci_device_id amd_nb_misc_ids[];
extern const struct amd_nb_bus_dev_range amd_nb_bus_dev_ranges[]; extern const struct amd_nb_bus_dev_range amd_nb_bus_dev_ranges[];
struct bootnode;
extern bool early_is_amd_nb(u32 value); extern bool early_is_amd_nb(u32 value);
extern int amd_cache_northbridges(void); extern int amd_cache_northbridges(void);

2
arch/x86/include/asm/numa_32.h
View File

@ -3,8 +3,6 @@
extern int numa_off; extern int numa_off;
extern int pxm_to_nid(int pxm);
#ifdef CONFIG_HIGHMEM #ifdef CONFIG_HIGHMEM
extern void set_highmem_pages_init(void); extern void set_highmem_pages_init(void);
#else #else

7
arch/x86/include/asm/numa_64.h
View File

@ -3,18 +3,11 @@
#include <linux/nodemask.h> #include <linux/nodemask.h>
struct bootnode {
u64 start;
u64 end;
};
#define ZONE_ALIGN (1UL << (MAX_ORDER+PAGE_SHIFT)) #define ZONE_ALIGN (1UL << (MAX_ORDER+PAGE_SHIFT))
extern int numa_off; extern int numa_off;
extern unsigned long numa_free_all_bootmem(void); extern unsigned long numa_free_all_bootmem(void);
extern void setup_node_bootmem(int nodeid, unsigned long start,
unsigned long end);
#ifdef CONFIG_NUMA #ifdef CONFIG_NUMA
/* /*

2
arch/x86/mm/numa_64.c
View File

@ -95,7 +95,7 @@ int __init numa_add_memblk(int nid, u64 start, u64 end)
} }
/* Initialize bootmem allocator for a node */ /* Initialize bootmem allocator for a node */
void __init static void __init
setup_node_bootmem(int nid, unsigned long start, unsigned long end) setup_node_bootmem(int nid, unsigned long start, unsigned long end)
{ {
const u64 nd_low = (u64)MAX_DMA_PFN << PAGE_SHIFT; const u64 nd_low = (u64)MAX_DMA_PFN << PAGE_SHIFT;