diff options
| author | Len Brown <len.brown@intel.com> | 2009-04-05 01:51:51 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-04-05 01:51:51 -0400 |
| commit | 33526a53600ac887d100e3c9b4be3637ac8ae3a5 (patch) | |
| tree | 646cb10e5f02bbbd913eafe9dbc1cfa80166f20e /include/acpi | |
| parent | 47ae106d3f37e1fd715975eaf8130e20e171cf52 (diff) | |
| parent | 786c221a37d3931189d9c9421f63dec92f4d698b (diff) | |
Merge branch 'x2apic' into release
Diffstat (limited to 'include/acpi')
| -rw-r--r-- | include/acpi/actbl1.h | 6 |
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 { | |||
| 1016 | struct acpi_madt_local_x2apic { | 1016 | struct acpi_madt_local_x2apic { |
| 1017 | struct acpi_subtable_header header; | 1017 | struct acpi_subtable_header header; |
| 1018 | u16 reserved; /* Reserved - must be zero */ | 1018 | u16 reserved; /* Reserved - must be zero */ |
| 1019 | u32 local_apic_id; /* Processor X2_APIC ID */ | 1019 | u32 local_apic_id; /* Processor x2APIC ID */ |
| 1020 | u32 lapic_flags; | 1020 | u32 lapic_flags; |
| 1021 | u32 uid; /* Extended X2_APIC processor ID */ | 1021 | u32 uid; /* ACPI processor UID */ |
| 1022 | }; | 1022 | }; |
| 1023 | 1023 | ||
| 1024 | /* 10: Local X2APIC NMI (07/2008) */ | 1024 | /* 10: Local X2APIC NMI (07/2008) */ |
| @@ -1026,7 +1026,7 @@ struct acpi_madt_local_x2apic { | |||
| 1026 | struct acpi_madt_local_x2apic_nmi { | 1026 | struct acpi_madt_local_x2apic_nmi { |
| 1027 | struct acpi_subtable_header header; | 1027 | struct acpi_subtable_header header; |
| 1028 | u16 inti_flags; | 1028 | u16 inti_flags; |
| 1029 | u32 uid; /* Processor X2_APIC ID */ | 1029 | u32 uid; /* ACPI processor UID */ |
| 1030 | u8 lint; /* LINTn to which NMI is connected */ | 1030 | u8 lint; /* LINTn to which NMI is connected */ |
| 1031 | u8 reserved[3]; | 1031 | u8 reserved[3]; |
| 1032 | }; | 1032 | }; |