Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
drivers
/
acpi
/
acpica
/
tbfadt.c
diff --git
a/kernel/drivers/acpi/acpica/tbfadt.c
b/kernel/drivers/acpi/acpica/tbfadt.c
index
05be59c
..
a6454f4
100644
(file)
--- a/
kernel/drivers/acpi/acpica/tbfadt.c
+++ b/
kernel/drivers/acpi/acpica/tbfadt.c
@@
-298,7
+298,7
@@
acpi_tb_select_address(char *register_name, u32 address32, u64 address64)
*
* FUNCTION: acpi_tb_parse_fadt
*
*
* FUNCTION: acpi_tb_parse_fadt
*
- * PARAMETERS:
table_index - Index for the FADT
+ * PARAMETERS:
None
*
* RETURN: None
*
*
* RETURN: None
*
@@
-307,7
+307,7
@@
acpi_tb_select_address(char *register_name, u32 address32, u64 address64)
*
******************************************************************************/
*
******************************************************************************/
-void acpi_tb_parse_fadt(
u32 table_index
)
+void acpi_tb_parse_fadt(
void
)
{
u32 length;
struct acpi_table_header *table;
{
u32 length;
struct acpi_table_header *table;
@@
-319,11
+319,11
@@
void acpi_tb_parse_fadt(u32 table_index)
* Get a local copy of the FADT and convert it to a common format
* Map entire FADT, assumed to be smaller than one page.
*/
* Get a local copy of the FADT and convert it to a common format
* Map entire FADT, assumed to be smaller than one page.
*/
- length = acpi_gbl_root_table_list.tables[
table
_index].length;
+ length = acpi_gbl_root_table_list.tables[
acpi_gbl_fadt
_index].length;
table =
table =
- acpi_os_map_memory(acpi_gbl_root_table_list.
tables[table_index].
- address, length);
+ acpi_os_map_memory(acpi_gbl_root_table_list.
+
tables[acpi_gbl_fadt_index].
address, length);
if (!table) {
return;
}
if (!table) {
return;
}
@@
-345,7
+345,7
@@
void acpi_tb_parse_fadt(u32 table_index)
/* Obtain the DSDT and FACS tables via their addresses within the FADT */
acpi_tb_install_fixed_table((acpi_physical_address) acpi_gbl_FADT.Xdsdt,
/* Obtain the DSDT and FACS tables via their addresses within the FADT */
acpi_tb_install_fixed_table((acpi_physical_address) acpi_gbl_FADT.Xdsdt,
- ACPI_SIG_DSDT,
ACPI_TABLE_INDEX_DSDT
);
+ ACPI_SIG_DSDT,
&acpi_gbl_dsdt_index
);
/* If Hardware Reduced flag is set, there is no FACS */
/* If Hardware Reduced flag is set, there is no FACS */
@@
-354,13
+354,13
@@
void acpi_tb_parse_fadt(u32 table_index)
acpi_tb_install_fixed_table((acpi_physical_address)
acpi_gbl_FADT.facs,
ACPI_SIG_FACS,
acpi_tb_install_fixed_table((acpi_physical_address)
acpi_gbl_FADT.facs,
ACPI_SIG_FACS,
-
ACPI_TABLE_INDEX_FACS
);
+
&acpi_gbl_facs_index
);
}
if (acpi_gbl_FADT.Xfacs) {
acpi_tb_install_fixed_table((acpi_physical_address)
acpi_gbl_FADT.Xfacs,
ACPI_SIG_FACS,
}
if (acpi_gbl_FADT.Xfacs) {
acpi_tb_install_fixed_table((acpi_physical_address)
acpi_gbl_FADT.Xfacs,
ACPI_SIG_FACS,
-
ACPI_TABLE_INDEX_X_FACS
);
+
&acpi_gbl_xfacs_index
);
}
}
}
}
}
}
@@
-398,12
+398,12
@@
void acpi_tb_create_local_fadt(struct acpi_table_header *table, u32 length)
/* Clear the entire local FADT */
/* Clear the entire local FADT */
-
ACPI_MEMSET
(&acpi_gbl_FADT, 0, sizeof(struct acpi_table_fadt));
+
memset
(&acpi_gbl_FADT, 0, sizeof(struct acpi_table_fadt));
/* Copy the original FADT, up to sizeof (struct acpi_table_fadt) */
/* Copy the original FADT, up to sizeof (struct acpi_table_fadt) */
-
ACPI_MEMCPY
(&acpi_gbl_FADT, table,
-
ACPI_MIN(length, sizeof(struct acpi_table_fadt)));
+
memcpy
(&acpi_gbl_FADT, table,
+ ACPI_MIN(length, sizeof(struct acpi_table_fadt)));
/* Take a copy of the Hardware Reduced flag */
/* Take a copy of the Hardware Reduced flag */