diff options
| author |   Lv Zheng <lv.zheng@intel.com> | 2015-12-29 13:52:32 +0800 |
|---|---|---|
| committer |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-01-01 03:26:44 +0100 |
| commit | 5431b6543fb45f6c61dbb1394c918f3bc5acefae (patch) | |
| tree | f650faee3089b7860f203f96ea3cc61b1a19c49d /drivers/acpi/acpica/utobject.c | |
| parent | Merge branch 'acpi-debug' into acpica (diff) | |
| download | linux-dev-5431b6543fb45f6c61dbb1394c918f3bc5acefae.tar.xz linux-dev-5431b6543fb45f6c61dbb1394c918f3bc5acefae.zip | |
ACPICA: Linuxize: reduce divergences for 20151218 release
The patch reduces source code differences between the Linux kernel and the
ACPICA upstream so that the linuxized ACPICA 20151218 release can be
applied with reduced human intervention.
The pscode.c has already been out of sync for months, and it becomes more
and more difficult to merge pscode.c changes, so instead of update the
affected lines of pscode.c, this patch synchronizes entire pscode.c file.
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/acpica/utobject.c')
| -rw-r--r-- | drivers/acpi/acpica/utobject.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/acpica/utobject.c b/drivers/acpi/acpica/utobject.c index 7d83efe1ea29..c7e11ccb09ba 100644 --- a/drivers/acpi/acpica/utobject.c +++ b/drivers/acpi/acpica/utobject.c @@ -253,7 +253,7 @@ union acpi_operand_object *acpi_ut_create_buffer_object(acpi_size buffer_size) buffer = ACPI_ALLOCATE_ZEROED(buffer_size); if (!buffer) { ACPI_ERROR((AE_INFO, "Could not allocate size %u", - (u32) buffer_size)); + (u32)buffer_size)); acpi_ut_remove_reference(buffer_desc); return_PTR(NULL); } @@ -305,7 +305,7 @@ union acpi_operand_object *acpi_ut_create_string_object(acpi_size string_size) string = ACPI_ALLOCATE_ZEROED(string_size + 1); if (!string) { ACPI_ERROR((AE_INFO, "Could not allocate size %u", - (u32) string_size)); + (u32)string_size)); acpi_ut_remove_reference(string_desc); return_PTR(NULL); } |