From 0741e658e1968bcc77ec1915b2f4f95002c962f4 Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yinghai@kernel.org>
Date: Fri, 16 Nov 2012 19:39:20 -0800
Subject: [PATCH] --- yaml --- r: 356223 b: refs/heads/master c:
 c074eaac2ab264c94520efff7e896b771de885ae h: refs/heads/master i:   356221:
 27cf9a4454983d914a9c670102e4ea14e48418ec   356219:
 e17a2a21c7e2504b3a8e902963d4513af7204965   356215:
 e5ab2c5956b4b5b3e6e30ee1f64f7183febf8cfc   356207:
 4509840d8819f683e4dae92a6876df0fa605d028   356191:
 697963c3bd9cec8be1cdcfa5417107f9e1b5e0ee   356159:
 a57e6969266f04895ef2e0011e774eef0b4b508f   356095:
 e047899bc7cb5717f27d9d7172af692723a37da1 v: v3

---
 [refs]                               | 2 +-
 trunk/arch/x86/include/asm/numa.h    | 2 --
 trunk/arch/x86/include/asm/numa_64.h | 4 ----
 trunk/arch/x86/kernel/acpi/boot.c    | 1 -
 trunk/arch/x86/kernel/cpu/amd.c      | 1 -
 trunk/arch/x86/kernel/cpu/intel.c    | 1 -
 trunk/arch/x86/kernel/setup.c        | 3 ---
 7 files changed, 1 insertion(+), 13 deletions(-)
 delete mode 100644 trunk/arch/x86/include/asm/numa_64.h

diff --git a/[refs] b/[refs]
index 86cd2123e59c..950f08f6c689 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 94b43c3d86dddf95064fc83e9087448b35f985ff
+refs/heads/master: c074eaac2ab264c94520efff7e896b771de885ae
diff --git a/trunk/arch/x86/include/asm/numa.h b/trunk/arch/x86/include/asm/numa.h
index 49119fcea2dc..52560a2038e1 100644
--- a/trunk/arch/x86/include/asm/numa.h
+++ b/trunk/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/trunk/arch/x86/include/asm/numa_64.h b/trunk/arch/x86/include/asm/numa_64.h
deleted file mode 100644
index fe4d2d410ad2..000000000000
--- a/trunk/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/trunk/arch/x86/kernel/acpi/boot.c b/trunk/arch/x86/kernel/acpi/boot.c
index e651f7a589ac..4b23aa18518d 100644
--- a/trunk/arch/x86/kernel/acpi/boot.c
+++ b/trunk/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/trunk/arch/x86/kernel/cpu/amd.c b/trunk/arch/x86/kernel/cpu/amd.c
index 9619ba6528ca..913f94f9e8d9 100644
--- a/trunk/arch/x86/kernel/cpu/amd.c
+++ b/trunk/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/trunk/arch/x86/kernel/cpu/intel.c b/trunk/arch/x86/kernel/cpu/intel.c
index 198e019a531a..3b547cc4bd03 100644
--- a/trunk/arch/x86/kernel/cpu/intel.c
+++ b/trunk/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/trunk/arch/x86/kernel/setup.c b/trunk/arch/x86/kernel/setup.c
index 85b62f1c8071..6d29d1fcf068 100644
--- a/trunk/arch/x86/kernel/setup.c
+++ b/trunk/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>