projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[ACPI] merge 3549 4320 4485 4588 4980 5483 5651 acpica asus fops pnpacpi branches...
[powerpc.git]
/
arch
/
i386
/
kernel
/
acpi
/
boot.c
diff --git
a/arch/i386/kernel/acpi/boot.c
b/arch/i386/kernel/acpi/boot.c
index
447fa9e
..
f21fa0d
100644
(file)
--- a/
arch/i386/kernel/acpi/boot.c
+++ b/
arch/i386/kernel/acpi/boot.c
@@
-108,7
+108,7
@@
char *__acpi_map_table(unsigned long phys_addr, unsigned long size)
if (!phys_addr || !size)
return NULL;
if (!phys_addr || !size)
return NULL;
- if (phys_addr
< (end_pfn_map << PAGE_SHIFT)
)
+ if (phys_addr
+size <= (end_pfn_map << PAGE_SHIFT) + PAGE_SIZE
)
return __va(phys_addr);
return NULL;
return __va(phys_addr);
return NULL;
@@
-464,7
+464,7
@@
int acpi_gsi_to_irq(u32 gsi, unsigned int *irq)
* success: return IRQ number (>=0)
* failure: return < 0
*/
* success: return IRQ number (>=0)
* failure: return < 0
*/
-int acpi_register_gsi(u32 gsi, int
edge_level, int active_high_low
)
+int acpi_register_gsi(u32 gsi, int
triggering, int polarity
)
{
unsigned int irq;
unsigned int plat_gsi = gsi;
{
unsigned int irq;
unsigned int plat_gsi = gsi;
@@
-476,14
+476,14
@@
int acpi_register_gsi(u32 gsi, int edge_level, int active_high_low)
if (acpi_irq_model == ACPI_IRQ_MODEL_PIC) {
extern void eisa_set_level_irq(unsigned int irq);
if (acpi_irq_model == ACPI_IRQ_MODEL_PIC) {
extern void eisa_set_level_irq(unsigned int irq);
- if (
edge_level
== ACPI_LEVEL_SENSITIVE)
+ if (
triggering
== ACPI_LEVEL_SENSITIVE)
eisa_set_level_irq(gsi);
}
#endif
#ifdef CONFIG_X86_IO_APIC
if (acpi_irq_model == ACPI_IRQ_MODEL_IOAPIC) {
eisa_set_level_irq(gsi);
}
#endif
#ifdef CONFIG_X86_IO_APIC
if (acpi_irq_model == ACPI_IRQ_MODEL_IOAPIC) {
- plat_gsi = mp_register_gsi(gsi,
edge_level, active_high_low
);
+ plat_gsi = mp_register_gsi(gsi,
triggering, polarity
);
}
#endif
acpi_gsi_to_irq(plat_gsi, &irq);
}
#endif
acpi_gsi_to_irq(plat_gsi, &irq);