git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
kernel
/
acpi
/
boot.c
diff --git
a/arch/x86/kernel/acpi/boot.c
b/arch/x86/kernel/acpi/boot.c
index 8dcbf68907146512a839da60817c6b292c135e47..9fc92e4539d8aee344616336e58dba8d9781b341 100644
(file)
--- a/
arch/x86/kernel/acpi/boot.c
+++ b/
arch/x86/kernel/acpi/boot.c
@@
-197,7
+197,7
@@
static int acpi_register_lapic(int id, u32 acpiid, u8 enabled)
}
static int __init
}
static int __init
-acpi_parse_x2apic(
struct acpi_subtable_header
*header, const unsigned long end)
+acpi_parse_x2apic(
union acpi_subtable_headers
*header, const unsigned long end)
{
struct acpi_madt_local_x2apic *processor = NULL;
#ifdef CONFIG_X86_X2APIC
{
struct acpi_madt_local_x2apic *processor = NULL;
#ifdef CONFIG_X86_X2APIC
@@
-210,7
+210,7
@@
acpi_parse_x2apic(struct acpi_subtable_header *header, const unsigned long end)
if (BAD_MADT_ENTRY(processor, end))
return -EINVAL;
if (BAD_MADT_ENTRY(processor, end))
return -EINVAL;
- acpi_table_print_madt_entry(
header
);
+ acpi_table_print_madt_entry(
&header->common
);
#ifdef CONFIG_X86_X2APIC
apic_id = processor->local_apic_id;
#ifdef CONFIG_X86_X2APIC
apic_id = processor->local_apic_id;
@@
-242,7
+242,7
@@
acpi_parse_x2apic(struct acpi_subtable_header *header, const unsigned long end)
}
static int __init
}
static int __init
-acpi_parse_lapic(
struct acpi_subtable_header
* header, const unsigned long end)
+acpi_parse_lapic(
union acpi_subtable_headers
* header, const unsigned long end)
{
struct acpi_madt_local_apic *processor = NULL;
{
struct acpi_madt_local_apic *processor = NULL;
@@
-251,7
+251,7
@@
acpi_parse_lapic(struct acpi_subtable_header * header, const unsigned long end)
if (BAD_MADT_ENTRY(processor, end))
return -EINVAL;
if (BAD_MADT_ENTRY(processor, end))
return -EINVAL;
- acpi_table_print_madt_entry(
header
);
+ acpi_table_print_madt_entry(
&header->common
);
/* Ignore invalid ID */
if (processor->id == 0xff)
/* Ignore invalid ID */
if (processor->id == 0xff)
@@
-272,7
+272,7
@@
acpi_parse_lapic(struct acpi_subtable_header * header, const unsigned long end)
}
static int __init
}
static int __init
-acpi_parse_sapic(
struct acpi_subtable_header
*header, const unsigned long end)
+acpi_parse_sapic(
union acpi_subtable_headers
*header, const unsigned long end)
{
struct acpi_madt_local_sapic *processor = NULL;
{
struct acpi_madt_local_sapic *processor = NULL;
@@
-281,7
+281,7
@@
acpi_parse_sapic(struct acpi_subtable_header *header, const unsigned long end)
if (BAD_MADT_ENTRY(processor, end))
return -EINVAL;
if (BAD_MADT_ENTRY(processor, end))
return -EINVAL;
- acpi_table_print_madt_entry(
header
);
+ acpi_table_print_madt_entry(
&header->common
);
acpi_register_lapic((processor->id << 8) | processor->eid,/* APIC ID */
processor->processor_id, /* ACPI ID */
acpi_register_lapic((processor->id << 8) | processor->eid,/* APIC ID */
processor->processor_id, /* ACPI ID */
@@
-291,7
+291,7
@@
acpi_parse_sapic(struct acpi_subtable_header *header, const unsigned long end)
}
static int __init
}
static int __init
-acpi_parse_lapic_addr_ovr(
struct acpi_subtable_header
* header,
+acpi_parse_lapic_addr_ovr(
union acpi_subtable_headers
* header,
const unsigned long end)
{
struct acpi_madt_local_apic_override *lapic_addr_ovr = NULL;
const unsigned long end)
{
struct acpi_madt_local_apic_override *lapic_addr_ovr = NULL;
@@
-301,7
+301,7
@@
acpi_parse_lapic_addr_ovr(struct acpi_subtable_header * header,
if (BAD_MADT_ENTRY(lapic_addr_ovr, end))
return -EINVAL;
if (BAD_MADT_ENTRY(lapic_addr_ovr, end))
return -EINVAL;
- acpi_table_print_madt_entry(
header
);
+ acpi_table_print_madt_entry(
&header->common
);
acpi_lapic_addr = lapic_addr_ovr->address;
acpi_lapic_addr = lapic_addr_ovr->address;
@@
-309,7
+309,7
@@
acpi_parse_lapic_addr_ovr(struct acpi_subtable_header * header,
}
static int __init
}
static int __init
-acpi_parse_x2apic_nmi(
struct acpi_subtable_header
*header,
+acpi_parse_x2apic_nmi(
union acpi_subtable_headers
*header,
const unsigned long end)
{
struct acpi_madt_local_x2apic_nmi *x2apic_nmi = NULL;
const unsigned long end)
{
struct acpi_madt_local_x2apic_nmi *x2apic_nmi = NULL;
@@
-319,7
+319,7
@@
acpi_parse_x2apic_nmi(struct acpi_subtable_header *header,
if (BAD_MADT_ENTRY(x2apic_nmi, end))
return -EINVAL;
if (BAD_MADT_ENTRY(x2apic_nmi, end))
return -EINVAL;
- acpi_table_print_madt_entry(
header
);
+ acpi_table_print_madt_entry(
&header->common
);
if (x2apic_nmi->lint != 1)
printk(KERN_WARNING PREFIX "NMI not connected to LINT 1!\n");
if (x2apic_nmi->lint != 1)
printk(KERN_WARNING PREFIX "NMI not connected to LINT 1!\n");
@@
-328,7
+328,7
@@
acpi_parse_x2apic_nmi(struct acpi_subtable_header *header,
}
static int __init
}
static int __init
-acpi_parse_lapic_nmi(
struct acpi_subtable_header
* header, const unsigned long end)
+acpi_parse_lapic_nmi(
union acpi_subtable_headers
* header, const unsigned long end)
{
struct acpi_madt_local_apic_nmi *lapic_nmi = NULL;
{
struct acpi_madt_local_apic_nmi *lapic_nmi = NULL;
@@
-337,7
+337,7
@@
acpi_parse_lapic_nmi(struct acpi_subtable_header * header, const unsigned long e
if (BAD_MADT_ENTRY(lapic_nmi, end))
return -EINVAL;
if (BAD_MADT_ENTRY(lapic_nmi, end))
return -EINVAL;
- acpi_table_print_madt_entry(
header
);
+ acpi_table_print_madt_entry(
&header->common
);
if (lapic_nmi->lint != 1)
printk(KERN_WARNING PREFIX "NMI not connected to LINT 1!\n");
if (lapic_nmi->lint != 1)
printk(KERN_WARNING PREFIX "NMI not connected to LINT 1!\n");
@@
-449,7
+449,7
@@
static int __init mp_register_ioapic_irq(u8 bus_irq, u8 polarity,
}
static int __init
}
static int __init
-acpi_parse_ioapic(
struct acpi_subtable_header
* header, const unsigned long end)
+acpi_parse_ioapic(
union acpi_subtable_headers
* header, const unsigned long end)
{
struct acpi_madt_io_apic *ioapic = NULL;
struct ioapic_domain_cfg cfg = {
{
struct acpi_madt_io_apic *ioapic = NULL;
struct ioapic_domain_cfg cfg = {
@@
-462,7
+462,7
@@
acpi_parse_ioapic(struct acpi_subtable_header * header, const unsigned long end)
if (BAD_MADT_ENTRY(ioapic, end))
return -EINVAL;
if (BAD_MADT_ENTRY(ioapic, end))
return -EINVAL;
- acpi_table_print_madt_entry(
header
);
+ acpi_table_print_madt_entry(
&header->common
);
/* Statically assign IRQ numbers for IOAPICs hosting legacy IRQs */
if (ioapic->global_irq_base < nr_legacy_irqs())
/* Statically assign IRQ numbers for IOAPICs hosting legacy IRQs */
if (ioapic->global_irq_base < nr_legacy_irqs())
@@
-508,7
+508,7
@@
static void __init acpi_sci_ioapic_setup(u8 bus_irq, u16 polarity, u16 trigger,
}
static int __init
}
static int __init
-acpi_parse_int_src_ovr(
struct acpi_subtable_header
* header,
+acpi_parse_int_src_ovr(
union acpi_subtable_headers
* header,
const unsigned long end)
{
struct acpi_madt_interrupt_override *intsrc = NULL;
const unsigned long end)
{
struct acpi_madt_interrupt_override *intsrc = NULL;
@@
-518,7
+518,7
@@
acpi_parse_int_src_ovr(struct acpi_subtable_header * header,
if (BAD_MADT_ENTRY(intsrc, end))
return -EINVAL;
if (BAD_MADT_ENTRY(intsrc, end))
return -EINVAL;
- acpi_table_print_madt_entry(
header
);
+ acpi_table_print_madt_entry(
&header->common
);
if (intsrc->source_irq == acpi_gbl_FADT.sci_interrupt) {
acpi_sci_ioapic_setup(intsrc->source_irq,
if (intsrc->source_irq == acpi_gbl_FADT.sci_interrupt) {
acpi_sci_ioapic_setup(intsrc->source_irq,
@@
-550,7
+550,7
@@
acpi_parse_int_src_ovr(struct acpi_subtable_header * header,
}
static int __init
}
static int __init
-acpi_parse_nmi_src(
struct acpi_subtable_header
* header, const unsigned long end)
+acpi_parse_nmi_src(
union acpi_subtable_headers
* header, const unsigned long end)
{
struct acpi_madt_nmi_source *nmi_src = NULL;
{
struct acpi_madt_nmi_source *nmi_src = NULL;
@@
-559,7
+559,7
@@
acpi_parse_nmi_src(struct acpi_subtable_header * header, const unsigned long end
if (BAD_MADT_ENTRY(nmi_src, end))
return -EINVAL;
if (BAD_MADT_ENTRY(nmi_src, end))
return -EINVAL;
- acpi_table_print_madt_entry(
header
);
+ acpi_table_print_madt_entry(
&header->common
);
/* TBD: Support nimsrc entries? */
/* TBD: Support nimsrc entries? */