projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'berlin-fixes-for-4.4-rc1-1' of git://git.infradead.org/users/hesselba...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
acpi
/
acpica
/
uttrack.c
diff --git
a/drivers/acpi/acpica/uttrack.c
b/drivers/acpi/acpica/uttrack.c
index 130dd9f96f0fe72ee03f79f6fa3631d70e608086..9a7dc8196a5da76779f10c855d17fc0e5f4430c8 100644
(file)
--- a/
drivers/acpi/acpica/uttrack.c
+++ b/
drivers/acpi/acpica/uttrack.c
@@
-100,7
+100,7
@@
acpi_ut_create_list(char *list_name,
return (AE_NO_MEMORY);
}
return (AE_NO_MEMORY);
}
-
ACPI_MEMSET
(cache, 0, sizeof(struct acpi_memory_list));
+
memset
(cache, 0, sizeof(struct acpi_memory_list));
cache->list_name = list_name;
cache->object_size = object_size;
cache->list_name = list_name;
cache->object_size = object_size;
@@
-402,7
+402,7
@@
acpi_ut_track_allocation(struct acpi_debug_mem_block *allocation,
allocation->component = component;
allocation->line = line;
allocation->component = component;
allocation->line = line;
-
ACPI_STRNCPY
(allocation->module, module, ACPI_MAX_MODULE_NAME);
+
strncpy
(allocation->module, module, ACPI_MAX_MODULE_NAME);
allocation->module[ACPI_MAX_MODULE_NAME - 1] = 0;
if (!element) {
allocation->module[ACPI_MAX_MODULE_NAME - 1] = 0;
if (!element) {
@@
-497,7
+497,7
@@
acpi_ut_remove_allocation(struct acpi_debug_mem_block *allocation,
/* Mark the segment as deleted */
/* Mark the segment as deleted */
-
ACPI_MEMSET
(&allocation->user_space, 0xEA, allocation->size);
+
memset
(&allocation->user_space, 0xEA, allocation->size);
status = acpi_ut_release_mutex(ACPI_MTX_MEMORY);
return (status);
status = acpi_ut_release_mutex(ACPI_MTX_MEMORY);
return (status);
@@
-595,7
+595,7
@@
void acpi_ut_dump_allocations(u32 component, const char *module)
while (element) {
if ((element->component & component) &&
((module == NULL)
while (element) {
if ((element->component & component) &&
((module == NULL)
- || (0 ==
ACPI_STRCMP
(module, element->module)))) {
+ || (0 ==
strcmp
(module, element->module)))) {
descriptor =
ACPI_CAST_PTR(union acpi_descriptor,
&element->user_space);
descriptor =
ACPI_CAST_PTR(union acpi_descriptor,
&element->user_space);