lkml.org 
[lkml]   [2012]   [Nov]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 40/42] x86, mm: kill numa_64.h
    Date
    Signed-off-by: Yinghai Lu <yinghai@kernel.org>
    ---
    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 457de1d..8b0fb6fd 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


    \
     
     \ /
      Last update: 2012-11-05 22:02    [W:4.420 / U:0.496 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site