From b14ff4dbc79114c948eef5599df9bda55b60e85b Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 21 Mar 2012 12:55:00 -0700 Subject: [PATCH] --- yaml --- r: 298035 b: refs/heads/master c: b11de07ce561574b6e03c8192b28bad540da8f79 h: refs/heads/master i: 298033: 9ad6e68f3edc449b0b5d200a97901d521f3027cd 298031: 597859e8b208ce24f8948b06c101c0c70c97664d v: v3 --- [refs] | 2 +- trunk/drivers/acpi/acpica/tbfadt.c | 8 ++++---- trunk/drivers/thermal/thermal_sys.c | 3 +-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 090219a54e56..e17dad93c061 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3e80acd1af40fcd91a200b0416a7616b20c5d647 +refs/heads/master: b11de07ce561574b6e03c8192b28bad540da8f79 diff --git a/trunk/drivers/acpi/acpica/tbfadt.c b/trunk/drivers/acpi/acpica/tbfadt.c index 4c9c760db4a4..c5d870406f41 100644 --- a/trunk/drivers/acpi/acpica/tbfadt.c +++ b/trunk/drivers/acpi/acpica/tbfadt.c @@ -363,6 +363,10 @@ static void acpi_tb_convert_fadt(void) u32 address32; u32 i; + /* Update the local FADT table header length */ + + acpi_gbl_FADT.header.length = sizeof(struct acpi_table_fadt); + /* * Expand the 32-bit FACS and DSDT addresses to 64-bit as necessary. * Later code will always use the X 64-bit field. Also, check for an @@ -404,10 +408,6 @@ static void acpi_tb_convert_fadt(void) acpi_gbl_FADT.boot_flags = 0; } - /* Update the local FADT table header length */ - - acpi_gbl_FADT.header.length = sizeof(struct acpi_table_fadt); - /* * Expand the ACPI 1.0 32-bit addresses to the ACPI 2.0 64-bit "X" * generic address structures as necessary. Later code will always use diff --git a/trunk/drivers/thermal/thermal_sys.c b/trunk/drivers/thermal/thermal_sys.c index 220ce7e31cf5..859b80b6d376 100644 --- a/trunk/drivers/thermal/thermal_sys.c +++ b/trunk/drivers/thermal/thermal_sys.c @@ -60,8 +60,6 @@ static LIST_HEAD(thermal_tz_list); static LIST_HEAD(thermal_cdev_list); static DEFINE_MUTEX(thermal_list_lock); -static unsigned int thermal_event_seqnum; - static int get_idr(struct idr *idr, struct mutex *lock, int *id) { int err; @@ -1312,6 +1310,7 @@ int thermal_generate_netlink_event(u32 orig, enum events event) void *msg_header; int size; int result; + static unsigned int thermal_event_seqnum; /* allocate memory */ size = nla_total_size(sizeof(struct thermal_genl_event)) + \