From d5f18b8e57267141a4b91b78a9af817d744e3a83 Mon Sep 17 00:00:00 2001
From: Jes Sorensen <jes@wildopensource.com>
Date: Tue, 13 Jan 2004 18:56:03 -0800
Subject: [PATCH] [PATCH] ia64: header cleanup

I fixed the code to compile with CONFIG_ACPI_NUMA and
!CONFIG_DISCONTIG since it's actually possible to compile that
configuration as well as cleaned up the #include usage a litte.
---
 arch/ia64/mm/numa.c       | 3 ++-
 include/asm-ia64/acpi.h   | 3 ++-
 include/asm-ia64/mmzone.h | 2 ++
 include/asm-ia64/numa.h   | 1 -
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/arch/ia64/mm/numa.c b/arch/ia64/mm/numa.c
index 5e2db339cf888..34752bedd5044 100644
--- a/arch/ia64/mm/numa.c
+++ b/arch/ia64/mm/numa.c
@@ -18,6 +18,7 @@
 #include <linux/node.h>
 #include <linux/init.h>
 #include <linux/bootmem.h>
+#include <asm/mmzone.h>
 #include <asm/numa.h>
 
 static struct memblk *sysfs_memblks;
@@ -28,7 +29,7 @@ static struct cpu *sysfs_cpus;
  * The following structures are usually initialized by ACPI or
  * similar mechanisms and describe the NUMA characteristics of the machine.
  */
-int num_memblks = 0;
+int num_memblks;
 struct node_memblk_s node_memblk[NR_MEMBLKS];
 struct node_cpuid_s node_cpuid[NR_CPUS];
 /*
diff --git a/include/asm-ia64/acpi.h b/include/asm-ia64/acpi.h
index 8f11f8f345f7b..61d715c8914db 100644
--- a/include/asm-ia64/acpi.h
+++ b/include/asm-ia64/acpi.h
@@ -30,6 +30,8 @@
 
 #ifdef __KERNEL__
 
+#include <linux/init.h>
+#include <linux/numa.h>
 #include <asm/system.h>
 
 #define COMPILER_DEPENDENT_INT64	long
@@ -92,7 +94,6 @@ int acpi_register_irq (u32 gsi, u32 polarity, u32 trigger);
 int acpi_irq_to_vector (u32 irq);
 
 #ifdef CONFIG_ACPI_NUMA
-#include <asm/numa.h>
 /* Proximity bitmap length; _PXM is at most 255 (8 bit)*/
 #define MAX_PXM_DOMAINS (256)
 extern int __initdata pxm_to_nid_map[MAX_PXM_DOMAINS];
diff --git a/include/asm-ia64/mmzone.h b/include/asm-ia64/mmzone.h
index e811b18c31d7f..9b9afd467f764 100644
--- a/include/asm-ia64/mmzone.h
+++ b/include/asm-ia64/mmzone.h
@@ -33,5 +33,7 @@ extern unsigned long max_low_pfn;
 #define page_to_pfn(page)	((unsigned long) (page - vmem_map))
 #define pfn_to_page(pfn)	(vmem_map + (pfn))
 
+#else /* CONFIG_DISCONTIGMEM */
+# define NR_MEMBLKS		1
 #endif /* CONFIG_DISCONTIGMEM */
 #endif /* _ASM_IA64_MMZONE_H */
diff --git a/include/asm-ia64/numa.h b/include/asm-ia64/numa.h
index bdf62e67eb4e2..12acb2eb1ce3b 100644
--- a/include/asm-ia64/numa.h
+++ b/include/asm-ia64/numa.h
@@ -15,7 +15,6 @@
 
 #ifdef CONFIG_NUMA
 
-#include <linux/cache.h>
 #include <linux/cache.h>
 #include <linux/cpumask.h>
 #include <linux/numa.h>
-- 
2.53.0