History

Merge branches 'acpi-mm', 'acpi-tables', 'acpi-apei' and 'acpi-misc'

* acpi-mm: ACPI: OSL: Clean up the removal of unused memory mappings ACPI: OSL: Use deferred unmapping in acpi_os_unmap_iomem() ACPI: OSL: Use deferred unmapping in acpi_os_unmap_generic_address() ACPICA: Preserve memory opregion mappings ACPI: OSL: Implement deferred unmapping of ACPI memory * acpi-tables: ACPI: NUMA: Remove the useless 'node >= MAX_NUMNODES' check ACPI: NUMA: Remove the useless sub table pointer check ACPI: tables: Remove the duplicated checks for acpi_parse_entries_array() ACPI: tables: avoid relocations for table signature array * acpi-apei: ACPI: APEI: remove redundant assignment to variable rc * acpi-misc: ACPI: Replace HTTP links with HTTPS ones ACPI: Use valid link to the ACPI specification ACPI: Use fallthrough pseudo-keyword

Rafael J. Wysocki committed 6 years ago

Commit db1da2f5 parents 3fa5faf 5003ad7 5b1e802 eb27e5a 4ce779626 files · +139 −115Browse files

Showing the changes to include (2 of 26 files). Show all

Unified · Split

2 files
  1. include/acpi/actypes.h +9 −3
  2. include/linux/tboot.h +1 −1
include/acpi/actypes.h+9−3
@@ -1201,12 +1201,18 @@ struct acpi_pci_id { · 1200 unmodified lines
1201 u16 function;1201 u16 function;
1202};1202};
1203 1203
1204struct acpi_mem_mapping {
1205 acpi_physical_address physical_address;
1206 u8 *logical_address;
1207 acpi_size length;
1208 struct acpi_mem_mapping *next_mm;
1209};
1210
1204struct acpi_mem_space_context {1211struct acpi_mem_space_context {
1205 u32 length;1212 u32 length;
1206 acpi_physical_address address;1213 acpi_physical_address address;
1207 acpi_physical_address mapped_physical_address;1214 struct acpi_mem_mapping *cur_mm;
1208 u8 *mapped_logical_address;1215 struct acpi_mem_mapping *first_mm;
1209 acpi_size mapped_length;
1210};1216};
1211 1217
1212/*1218/*
include/linux/tboot.h+1−1
@@ -44,7 +44,7 @@ struct tboot_acpi_generic_address { · 43 unmodified lines
44 44
45/*45/*
46 * combines Sx info from FADT and FACS tables per ACPI 2.0+ spec46 * combines Sx info from FADT and FACS tables per ACPI 2.0+ spec
47 * (http://www.acpi.info/)47 * (https://uefi.org/specifications)
48 */48 */
49struct tboot_acpi_sleep_info {49struct tboot_acpi_sleep_info {
50 struct tboot_acpi_generic_address pm1a_cnt_blk;50 struct tboot_acpi_generic_address pm1a_cnt_blk;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t