diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-17 16:57:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-17 16:57:41 -0700 |
| commit | 360afb033277688f145030c80fd2853dbfaebba5 (patch) | |
| tree | dd212a11a29467034ec6e5a8cb7a343c4f0b69cc /include | |
| parent | cd05a1f818073a623455a58e756c5b419fc98db9 (diff) | |
| parent | 92b35e910fe14e6e3a5d498157375fb55ea5fd03 (diff) | |
Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6
* 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6:
[PATCH] x86: Export _proxy_pda for gcc 4.2
[PATCH] i386: Don't use the TSC in sched_clock if unstable
[PATCH] x86-64: fix section mismatch warnings
[PATCH] i386: Enforce GPLness of VMI ROM
[PATCH] x86-64: wire up compat sched_rr_get_interval(2)
[PATCH] i386: Update defconfig
[PATCH] x86-64: Update defconfig
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-x86_64/proto.h | 2 | ||||
| -rw-r--r-- | include/asm-x86_64/smp.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/asm-x86_64/proto.h b/include/asm-x86_64/proto.h index f54f3abf93c..b6e65a699f2 100644 --- a/include/asm-x86_64/proto.h +++ b/include/asm-x86_64/proto.h @@ -99,7 +99,7 @@ extern int force_iommu, no_iommu; extern int iommu_detected; #ifdef CONFIG_IOMMU extern void gart_iommu_init(void); -extern void gart_parse_options(char *); +extern void __init gart_parse_options(char *); extern void iommu_hole_init(void); extern int fallback_aper_order; extern int fallback_aper_force; diff --git a/include/asm-x86_64/smp.h b/include/asm-x86_64/smp.h index e17b9ec42e9..de592a408c0 100644 --- a/include/asm-x86_64/smp.h +++ b/include/asm-x86_64/smp.h @@ -7,6 +7,7 @@ #include <linux/threads.h> #include <linux/cpumask.h> #include <linux/bitops.h> +#include <linux/init.h> extern int disable_apic; #include <asm/fixmap.h> @@ -68,7 +69,7 @@ extern int __cpu_disable(void); extern void __cpu_die(unsigned int cpu); extern void prefill_possible_map(void); extern unsigned num_processors; -extern unsigned disabled_cpus; +extern unsigned __cpuinitdata disabled_cpus; #define NO_PROC_ID 0xFF /* No processor magic marker */ |