[PATCH] x86: fix x86_32 builds for summit and es7000 arch's

[Mike Travis <travis@sgi.com>]

Mike Travis wrote:
> Yinghai Lu wrote:
>> In file included from arch/x86/mach-generic/summit.c:16:
>> /home/yhlu/xx/xx/kernel/tip/linux-2.6/arch/x86/include/asm/summit/apic.h:
>> In function ‘cpu_mask_to_apicid_and’:
>> /home/yhlu/xx/xx/kernel/tip/linux-2.6/arch/x86/include/asm/summit/apic.h:179:
>> error: ‘GFP_ATOMIC’ undeclared (first use in this function)
>> /home/yhlu/xx/xx/kernel/tip/linux-2.6/arch/x86/include/asm/summit/apic.h:179:
>> error: (Each undeclared identifier is reported only once
>> /home/yhlu/xx/xx/kernel/tip/linux-2.6/arch/x86/include/asm/summit/apic.h:179:
>> error: for each function it appears in.)
>>
>> YH
>>
> 
> Hi Yinghai,
> 
> Thanks for catching this, I'm looking at it now.  We had a bit of a power
> problem here and have been down for a while.
> 
> Thanks,
> Mike

Subject: x86: fix x86_32 builds for summit and es7000 arch's

Impact: fix build errors on x86_32

Fix the following build errors reported by Yinghai Lu:

| In file included from arch/x86/mach-generic/summit.c:16:
| /home/yhlu/xx/xx/kernel/tip/linux-2.6/arch/x86/include/asm/summit/apic.h:
| In function ââ?¬Ë?cpu_mask_to_apicid_andââ?¬â?¢:
| /home/yhlu/xx/xx/kernel/tip/linux-2.6/arch/x86/include/asm/summit/apic.h:179:
| error: ââ?¬Ë?GFP_ATOMICââ?¬â?¢ undeclared (first use in this function)
| /home/yhlu/xx/xx/kernel/tip/linux-2.6/arch/x86/include/asm/summit/apic.h:179:
| error: (Each undeclared identifier is reported only once
| /home/yhlu/xx/xx/kernel/tip/linux-2.6/arch/x86/include/asm/summit/apic.h:179:
| error: for each function it appears in.)
| 
| YH

Note: tested build only.

Based on tip/cpus4096: v2.6.28-5703-g1d1a70e

Signed-off-by: Mike Travis <travis@sgi.com>
---
 arch/x86/include/asm/es7000/apic.h |    2 ++
 arch/x86/include/asm/summit/apic.h |    1 +
 2 files changed, 3 insertions(+)

--- linux-2.6-for-ingo.orig/arch/x86/include/asm/es7000/apic.h
+++ linux-2.6-for-ingo/arch/x86/include/asm/es7000/apic.h
@@ -1,6 +1,8 @@
 #ifndef __ASM_ES7000_APIC_H
 #define __ASM_ES7000_APIC_H
 
+#include <linux/gfp.h>
+
 #define xapic_phys_to_log_apicid(cpu) per_cpu(x86_bios_cpu_apicid, cpu)
 #define esr_disable (1)
 
--- linux-2.6-for-ingo.orig/arch/x86/include/asm/summit/apic.h
+++ linux-2.6-for-ingo/arch/x86/include/asm/summit/apic.h
@@ -2,6 +2,7 @@
 #define __ASM_SUMMIT_APIC_H
 
 #include <asm/smp.h>
+#include <linux/gfp.h>
 
 #define esr_disable (1)
 #define NO_BALANCE_IRQ (0)