diff options
Diffstat (limited to 'arch/ia64/kernel/acpi.c')
-rw-r--r-- | arch/ia64/kernel/acpi.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c index a7ca07f3754e..c6c90f39f4d9 100644 --- a/arch/ia64/kernel/acpi.c +++ b/arch/ia64/kernel/acpi.c | |||
@@ -44,6 +44,8 @@ | |||
44 | #include <linux/efi.h> | 44 | #include <linux/efi.h> |
45 | #include <linux/mmzone.h> | 45 | #include <linux/mmzone.h> |
46 | #include <linux/nodemask.h> | 46 | #include <linux/nodemask.h> |
47 | #include <linux/slab.h> | ||
48 | #include <acpi/processor.h> | ||
47 | #include <asm/io.h> | 49 | #include <asm/io.h> |
48 | #include <asm/iosapic.h> | 50 | #include <asm/iosapic.h> |
49 | #include <asm/machvec.h> | 51 | #include <asm/machvec.h> |
@@ -783,6 +785,14 @@ int acpi_gsi_to_irq(u32 gsi, unsigned int *irq) | |||
783 | return 0; | 785 | return 0; |
784 | } | 786 | } |
785 | 787 | ||
788 | int acpi_isa_irq_to_gsi(unsigned isa_irq, u32 *gsi) | ||
789 | { | ||
790 | if (isa_irq >= 16) | ||
791 | return -1; | ||
792 | *gsi = isa_irq; | ||
793 | return 0; | ||
794 | } | ||
795 | |||
786 | /* | 796 | /* |
787 | * ACPI based hotplug CPU support | 797 | * ACPI based hotplug CPU support |
788 | */ | 798 | */ |
@@ -907,6 +917,8 @@ int acpi_map_lsapic(acpi_handle handle, int *pcpu) | |||
907 | cpu_set(cpu, cpu_present_map); | 917 | cpu_set(cpu, cpu_present_map); |
908 | ia64_cpu_to_sapicid[cpu] = physid; | 918 | ia64_cpu_to_sapicid[cpu] = physid; |
909 | 919 | ||
920 | acpi_processor_set_pdc(handle); | ||
921 | |||
910 | *pcpu = cpu; | 922 | *pcpu = cpu; |
911 | return (0); | 923 | return (0); |
912 | } | 924 | } |