From: Yinghai Lu <yinghai@kernel.org>
To: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>, Jacob Shin <jacob.shin@amd.com>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Stefano Stabellini <stefano.stabellini@eu.citrix.com>,
Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>,
linux-kernel@vger.kernel.org, Yinghai Lu <yinghai@kernel.org>
Subject: [PATCH v9 43/46] x86, mm: kill numa_64.h
Date: Wed, 28 Nov 2012 13:47:54 -0800 [thread overview]
Message-ID: <1354139277-17376-44-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1354139277-17376-1-git-send-email-yinghai@kernel.org>
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---
arch/x86/include/asm/numa.h | 2 --
arch/x86/include/asm/numa_64.h | 4 ----
arch/x86/kernel/acpi/boot.c | 1 -
arch/x86/kernel/cpu/amd.c | 1 -
arch/x86/kernel/cpu/intel.c | 1 -
arch/x86/kernel/setup.c | 3 ---
6 files changed, 0 insertions(+), 12 deletions(-)
delete mode 100644 arch/x86/include/asm/numa_64.h
diff --git a/arch/x86/include/asm/numa.h b/arch/x86/include/asm/numa.h
index 49119fc..52560a2 100644
--- a/arch/x86/include/asm/numa.h
+++ b/arch/x86/include/asm/numa.h
@@ -54,8 +54,6 @@ static inline int numa_cpu_node(int cpu)
#ifdef CONFIG_X86_32
# include <asm/numa_32.h>
-#else
-# include <asm/numa_64.h>
#endif
#ifdef CONFIG_NUMA
diff --git a/arch/x86/include/asm/numa_64.h b/arch/x86/include/asm/numa_64.h
deleted file mode 100644
index fe4d2d4..0000000
--- a/arch/x86/include/asm/numa_64.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _ASM_X86_NUMA_64_H
-#define _ASM_X86_NUMA_64_H
-
-#endif /* _ASM_X86_NUMA_64_H */
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index e651f7a..4b23aa1 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -51,7 +51,6 @@ EXPORT_SYMBOL(acpi_disabled);
#ifdef CONFIG_X86_64
# include <asm/proto.h>
-# include <asm/numa_64.h>
#endif /* X86 */
#define BAD_MADT_ENTRY(entry, end) ( \
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index 9619ba6..913f94f 100644
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -12,7 +12,6 @@
#include <asm/pci-direct.h>
#ifdef CONFIG_X86_64
-# include <asm/numa_64.h>
# include <asm/mmconfig.h>
# include <asm/cacheflush.h>
#endif
diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
index 198e019..3b547cc 100644
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@ -17,7 +17,6 @@
#ifdef CONFIG_X86_64
#include <linux/topology.h>
-#include <asm/numa_64.h>
#endif
#include "cpu.h"
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 85b62f1..6d29d1f 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -108,9 +108,6 @@
#include <asm/topology.h>
#include <asm/apicdef.h>
#include <asm/amd_nb.h>
-#ifdef CONFIG_X86_64
-#include <asm/numa_64.h>
-#endif
#include <asm/mce.h>
#include <asm/alternative.h>
#include <asm/prom.h>
--
1.7.7
next prev parent reply other threads:[~2012-11-28 22:00 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-28 21:47 [PATCH v9 00/46] x86, mm: map ram from top-down with BRK and memblock Yinghai Lu
2012-11-28 21:47 ` [PATCH v9 01/46] x86, mm: Add global page_size_mask and probe one time only Yinghai Lu
2012-11-28 21:47 ` [PATCH v9 02/46] x86, mm: Split out split_mem_range from init_memory_mapping Yinghai Lu
2012-11-29 10:40 ` Yasuaki Ishimatsu
2012-11-28 21:47 ` [PATCH v9 03/46] x86, mm: Move down find_early_table_space() Yinghai Lu
2012-11-28 21:47 ` [PATCH v9 04/46] x86, mm: Move init_memory_mapping calling out of setup.c Yinghai Lu
2012-11-28 21:47 ` [PATCH v9 05/46] x86, mm: Revert back good_end setting for 64bit Yinghai Lu
2012-12-21 8:22 ` Dave Young
2012-12-21 16:16 ` Yinghai Lu
2012-12-21 16:47 ` H. Peter Anvin
2012-11-28 21:47 ` [PATCH v9 06/46] x86, mm: Change find_early_table_space() paramters Yinghai Lu
2012-11-28 21:47 ` [PATCH v9 07/46] x86, mm: Find early page table buffer together Yinghai Lu
2012-11-28 21:47 ` [PATCH v9 08/46] x86, mm: Separate out calculate_table_space_size() Yinghai Lu
2012-11-28 21:47 ` [PATCH v9 09/46] x86, mm: Set memblock initial limit to 1M Yinghai Lu
2012-11-28 21:47 ` [PATCH v9 10/46] x86, mm: if kernel .text .data .bss are not marked as E820_RAM, complain and fix Yinghai Lu
2012-11-28 21:47 ` [PATCH v9 11/46] x86, mm: Fixup code testing if a pfn is direct mapped Yinghai Lu
2012-11-28 21:47 ` [PATCH v9 12/46] x86, mm: use pfn_range_is_mapped() with CPA Yinghai Lu
2012-11-28 21:47 ` [PATCH v9 13/46] x86, mm: use pfn_range_is_mapped() with gart Yinghai Lu
2012-11-28 21:47 ` [PATCH v9 14/46] x86, mm: use pfn_range_is_mapped() with reserve_initrd Yinghai Lu
2012-11-28 21:47 ` [PATCH v9 15/46] x86, mm: Only direct map addresses that are marked as E820_RAM Yinghai Lu
2012-11-28 21:47 ` [PATCH v9 16/46] x86, mm: relocate initrd under all mem for 64bit Yinghai Lu
2012-11-28 21:47 ` [PATCH v9 17/46] x86, mm: Align start address to correct big page size Yinghai Lu
2012-11-28 21:47 ` [PATCH v9 18/46] x86, mm: Use big page size for small memory range Yinghai Lu
2012-11-28 21:47 ` [PATCH v9 19/46] x86, mm: Don't clear page table if range is ram Yinghai Lu
2012-11-28 21:47 ` [PATCH v9 20/46] x86, mm: Break down init_all_memory_mapping Yinghai Lu
2012-11-28 21:47 ` [PATCH v9 21/46] x86, mm: setup page table in top-down Yinghai Lu
2012-11-28 21:47 ` [PATCH v9 22/46] x86, mm: Remove early_memremap workaround for page table accessing on 64bit Yinghai Lu
2012-11-28 21:47 ` [PATCH v9 23/46] x86, mm: Remove parameter in alloc_low_page for 64bit Yinghai Lu
2012-11-28 21:47 ` [PATCH v9 24/46] x86, mm: Merge alloc_low_page between 64bit and 32bit Yinghai Lu
2012-11-28 21:47 ` [PATCH v9 25/46] x86, mm: Move min_pfn_mapped back to mm/init.c Yinghai Lu
2012-11-28 21:47 ` [PATCH v9 26/46] x86, mm, Xen: Remove mapping_pagetable_reserve() Yinghai Lu
2012-11-28 21:47 ` [PATCH v9 27/46] x86, mm: Add alloc_low_pages(num) Yinghai Lu
2012-11-28 21:47 ` [PATCH v9 28/46] x86, mm: Add pointer about Xen mmu requirement for alloc_low_pages Yinghai Lu
2012-11-28 21:47 ` [PATCH v9 29/46] x86, mm: only call early_ioremap_page_table_range_init() once Yinghai Lu
2012-11-28 21:47 ` [PATCH v9 30/46] x86, mm: Move back pgt_buf_* to mm/init.c Yinghai Lu
2012-11-28 21:47 ` [PATCH v9 31/46] x86, mm: Move init_gbpages() out of setup.c Yinghai Lu
2012-11-28 21:47 ` [PATCH v9 32/46] x86, mm: change low/hignmem_pfn_init to static on 32bit Yinghai Lu
2012-11-28 21:47 ` [PATCH v9 33/46] x86, mm: Move function declaration into mm_internal.h Yinghai Lu
2012-11-28 21:47 ` [PATCH v9 34/46] x86, mm: Add check before clear pte above max_low_pfn on 32bit Yinghai Lu
2012-11-28 21:47 ` [PATCH v9 35/46] x86, mm: use round_up/down in split_mem_range() Yinghai Lu
2012-11-28 21:47 ` [PATCH v9 36/46] x86, mm: use PFN_DOWN " Yinghai Lu
2012-11-28 21:47 ` [PATCH v9 37/46] x86, mm: use pfn instead of pos in split_mem_range Yinghai Lu
2012-11-28 21:47 ` [PATCH v9 38/46] x86, mm: use limit_pfn for end pfn Yinghai Lu
2012-11-28 21:47 ` [PATCH v9 39/46] x86, mm: Unifying after_bootmem for 32bit and 64bit Yinghai Lu
2012-11-28 21:47 ` [PATCH v9 40/46] x86, mm: Move after_bootmem to mm_internel.h Yinghai Lu
2012-11-28 21:47 ` [PATCH v9 41/46] x86, mm: Use clamp_t() in init_range_memory_mapping Yinghai Lu
2012-11-28 21:47 ` [PATCH v9 42/46] x86, mm: kill numa_free_all_bootmem() Yinghai Lu
2012-11-28 21:47 ` Yinghai Lu [this message]
2012-11-28 21:47 ` [PATCH v9 44/46] sparc, mm: Remove calling of free_all_bootmem_node() Yinghai Lu
2012-11-28 21:47 ` [PATCH v9 45/46] mm: Kill NO_BOOTMEM version free_all_bootmem_node() Yinghai Lu
2012-11-28 21:47 ` [PATCH v9 46/46] x86, mm: Let "memmap=" take more entries one time Yinghai Lu
2012-11-28 21:54 ` [PATCH v9 00/46] x86, mm: map ram from top-down with BRK and memblock H. Peter Anvin
2012-11-28 23:49 ` Yinghai Lu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1354139277-17376-44-git-send-email-yinghai@kernel.org \
--to=yinghai@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=hpa@zytor.com \
--cc=jacob.shin@amd.com \
--cc=konrad.wilk@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=stefano.stabellini@eu.citrix.com \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome