diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-05-15 16:11:17 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-05-15 16:11:17 -0400 |
| commit | 6684e323a236d40461f27d36b38c6b70aabc9e71 (patch) | |
| tree | 7eb6e0a22b7083c5e08f4f2cf3f15be7d938a572 /include/asm-alpha | |
| parent | 7531d692d4174789d583eb50fcb83cefa121b790 (diff) | |
| parent | 0560551dca0c02a4b23f95a9c339882ff291e1c7 (diff) | |
Merge branch 'origin'
Diffstat (limited to 'include/asm-alpha')
| -rw-r--r-- | include/asm-alpha/mmu_context.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-alpha/mmu_context.h b/include/asm-alpha/mmu_context.h index 0bd7bd2ccb90..6a5be1f7debf 100644 --- a/include/asm-alpha/mmu_context.h +++ b/include/asm-alpha/mmu_context.h | |||
| @@ -85,8 +85,8 @@ __reload_thread(struct pcb_struct *pcb) | |||
| 85 | * +-------------+----------------+--------------+ | 85 | * +-------------+----------------+--------------+ |
| 86 | */ | 86 | */ |
| 87 | 87 | ||
| 88 | #ifdef CONFIG_SMP | ||
| 89 | #include <asm/smp.h> | 88 | #include <asm/smp.h> |
| 89 | #ifdef CONFIG_SMP | ||
| 90 | #define cpu_last_asn(cpuid) (cpu_data[cpuid].last_asn) | 90 | #define cpu_last_asn(cpuid) (cpu_data[cpuid].last_asn) |
| 91 | #else | 91 | #else |
| 92 | extern unsigned long last_asn; | 92 | extern unsigned long last_asn; |