diff options
| author | Mike Travis <travis@sgi.com> | 2009-01-05 17:09:41 -0800 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-06 13:26:50 +0100 |
| commit | 4d9f94319c485f5af6717dfd7a333949636aed16 (patch) | |
| tree | 9aa9bc93e02b093914e879b079c53cd5a40159eb | |
| parent | e39ad415ac15116df213dfa2aa2a4f1b0857af9c (diff) | |
| download | linux-3.10-4d9f94319c485f5af6717dfd7a333949636aed16.tar.gz linux-3.10-4d9f94319c485f5af6717dfd7a333949636aed16.tar.bz2 linux-3.10-4d9f94319c485f5af6717dfd7a333949636aed16.zip | |
x86: fix x86_32 builds for summit and es7000 arch's
Fix the following build errors reported by Yinghai Lu:
| In file included from arch/x86/mach-generic/summit.c:16:
| tip/linux-2.6/arch/x86/include/asm/summit/apic.h:
| In function 'cpu_mask_to_apicid_and':
| tip/linux-2.6/arch/x86/include/asm/summit/apic.h:179:
| error: 'GFP_ATOMIC' undeclared (first use in this function)
Reported-by: Yinghai Lu <Yinghai.Lu@Sun.COM>
Signed-off-by: Mike Travis <travis@sgi.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | arch/x86/include/asm/es7000/apic.h | 2 | ||||
| -rw-r--r-- | arch/x86/include/asm/summit/apic.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/include/asm/es7000/apic.h b/arch/x86/include/asm/es7000/apic.h index bc53d5ef138..c58b9cc7446 100644 --- a/arch/x86/include/asm/es7000/apic.h +++ b/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) diff --git a/arch/x86/include/asm/summit/apic.h b/arch/x86/include/asm/summit/apic.h index 4bb5fb34f03..93d2c8667cf 100644 --- a/arch/x86/include/asm/summit/apic.h +++ b/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) |