diff options
Diffstat (limited to 'arch/ia64/kernel/smpboot.c')
| -rw-r--r-- | arch/ia64/kernel/smpboot.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c index 7700e23034bb..de100aa7ff03 100644 --- a/arch/ia64/kernel/smpboot.c +++ b/arch/ia64/kernel/smpboot.c | |||
| @@ -678,7 +678,7 @@ extern void fixup_irqs(void); | |||
| 678 | int migrate_platform_irqs(unsigned int cpu) | 678 | int migrate_platform_irqs(unsigned int cpu) |
| 679 | { | 679 | { |
| 680 | int new_cpei_cpu; | 680 | int new_cpei_cpu; |
| 681 | irq_desc_t *desc = NULL; | 681 | struct irq_desc *desc = NULL; |
| 682 | const struct cpumask *mask; | 682 | const struct cpumask *mask; |
| 683 | int retval = 0; | 683 | int retval = 0; |
| 684 | 684 | ||
| @@ -865,7 +865,7 @@ init_smp_config(void) | |||
| 865 | void __devinit | 865 | void __devinit |
| 866 | identify_siblings(struct cpuinfo_ia64 *c) | 866 | identify_siblings(struct cpuinfo_ia64 *c) |
| 867 | { | 867 | { |
| 868 | s64 status; | 868 | long status; |
| 869 | u16 pltid; | 869 | u16 pltid; |
| 870 | pal_logical_to_physical_t info; | 870 | pal_logical_to_physical_t info; |
| 871 | 871 | ||
