summaryrefslogtreecommitdiff
path: root/include/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2009-04-05 09:51:51 +0400
committerLen Brown <len.brown@intel.com>2009-04-05 09:51:51 +0400
commit33526a53600ac887d100e3c9b4be3637ac8ae3a5 (patch)
tree646cb10e5f02bbbd913eafe9dbc1cfa80166f20e /include/acpi
parent47ae106d3f37e1fd715975eaf8130e20e171cf52 (diff)
parent786c221a37d3931189d9c9421f63dec92f4d698b (diff)
downloadlinux-33526a53600ac887d100e3c9b4be3637ac8ae3a5.tar.xz
Merge branch 'x2apic' into release
Diffstat (limited to 'include/acpi')
-rw-r--r--include/acpi/actbl1.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/acpi/actbl1.h b/include/acpi/actbl1.h
index 18963b968114..59ade0752473 100644
--- a/include/acpi/actbl1.h
+++ b/include/acpi/actbl1.h
@@ -1016,9 +1016,9 @@ struct acpi_madt_interrupt_source {
struct acpi_madt_local_x2apic {
struct acpi_subtable_header header;
u16 reserved; /* Reserved - must be zero */
- u32 local_apic_id; /* Processor X2_APIC ID */
+ u32 local_apic_id; /* Processor x2APIC ID */
u32 lapic_flags;
- u32 uid; /* Extended X2_APIC processor ID */
+ u32 uid; /* ACPI processor UID */
};
/* 10: Local X2APIC NMI (07/2008) */
@@ -1026,7 +1026,7 @@ struct acpi_madt_local_x2apic {
struct acpi_madt_local_x2apic_nmi {
struct acpi_subtable_header header;
u16 inti_flags;
- u32 uid; /* Processor X2_APIC ID */
+ u32 uid; /* ACPI processor UID */
u8 lint; /* LINTn to which NMI is connected */
u8 reserved[3];
};