diff options
| author | Jeremy Fitzhardinge <jeremy@goop.org> | 2010-06-24 12:05:41 -0400 |
|---|---|---|
| committer | Stefano Stabellini <stefano.stabellini@eu.citrix.com> | 2010-10-22 16:25:42 -0400 |
| commit | 90f6881e6430ea7b38b9e0f9837719b1935616e0 (patch) | |
| tree | 490291932ab87a62bd05519fa39496ef54068845 /arch/x86/kernel | |
| parent | 2f065aef17b8d50a51a72451d03c7d7304249fb5 (diff) | |
xen: add xen hvm acpi_register_gsi variant
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Acked-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/acpi/boot.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index 031f0c238916..71232b941b6c 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c | |||
| @@ -537,7 +537,8 @@ static int acpi_register_gsi_ioapic(struct device *dev, u32 gsi, | |||
| 537 | return gsi; | 537 | return gsi; |
| 538 | } | 538 | } |
| 539 | 539 | ||
| 540 | static int (*__acpi_register_gsi)(struct device *dev, u32 gsi, int trigger, int polarity) = acpi_register_gsi_pic; | 540 | int (*__acpi_register_gsi)(struct device *dev, u32 gsi, |
| 541 | int trigger, int polarity) = acpi_register_gsi_pic; | ||
| 541 | 542 | ||
| 542 | /* | 543 | /* |
| 543 | * success: return IRQ number (>=0) | 544 | * success: return IRQ number (>=0) |