diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-06-06 10:31:26 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-06-06 10:31:26 -0400 |
| commit | 4b01abc977574253f466f65463019de2571c6401 (patch) | |
| tree | c330615fe9f277ad51a91da3db2d690a3336fb02 /arch/alpha/kernel/sys_titan.c | |
| parent | 47c96298cd0b04b4478206fde55fd6a6431de980 (diff) | |
| parent | 1def630a6a49dda5bc89dfbd86656293640456f0 (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/alpha/kernel/sys_titan.c')
| -rw-r--r-- | arch/alpha/kernel/sys_titan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/kernel/sys_titan.c b/arch/alpha/kernel/sys_titan.c index 5f84417eeb7b..2551fb49ae09 100644 --- a/arch/alpha/kernel/sys_titan.c +++ b/arch/alpha/kernel/sys_titan.c | |||
| @@ -66,7 +66,7 @@ titan_update_irq_hw(unsigned long mask) | |||
| 66 | register int bcpu = boot_cpuid; | 66 | register int bcpu = boot_cpuid; |
| 67 | 67 | ||
| 68 | #ifdef CONFIG_SMP | 68 | #ifdef CONFIG_SMP |
| 69 | cpumask_t cpm = cpu_present_mask; | 69 | cpumask_t cpm = cpu_present_map; |
| 70 | volatile unsigned long *dim0, *dim1, *dim2, *dim3; | 70 | volatile unsigned long *dim0, *dim1, *dim2, *dim3; |
| 71 | unsigned long mask0, mask1, mask2, mask3, dummy; | 71 | unsigned long mask0, mask1, mask2, mask3, dummy; |
| 72 | 72 | ||