projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
[linux-drm-fsl-dcu.git]
/
drivers
/
acpi
/
resources
/
rslist.c
diff --git
a/drivers/acpi/resources/rslist.c
b/drivers/acpi/resources/rslist.c
index 50bbb19bf4aee7301ab43816b8fa9ff56f22a5df..a92755c8877d63fd57a12d6cb4f3747a14499f23 100644
(file)
--- a/
drivers/acpi/resources/rslist.c
+++ b/
drivers/acpi/resources/rslist.c
@@
-5,7
+5,7
@@
******************************************************************************/
/*
******************************************************************************/
/*
- * Copyright (C) 2000 - 200
6
, R. Byron Moore
+ * Copyright (C) 2000 - 200
7
, R. Byron Moore
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@
-64,18
+64,20
@@
ACPI_MODULE_NAME("rslist")
acpi_status
acpi_rs_convert_aml_to_resources(u8 * aml,
u32 length,
acpi_status
acpi_rs_convert_aml_to_resources(u8 * aml,
u32 length,
- u32 offset,
- u8 resource_index, void **resource_ptr)
+ u32 offset, u8 resource_index, void **context)
{
{
- struct acpi_resource *resource = *resource_ptr;
+ struct acpi_resource **resource_ptr =
+ ACPI_CAST_INDIRECT_PTR(struct acpi_resource, context);
+ struct acpi_resource *resource;
acpi_status status;
acpi_status status;
- ACPI_FUNCTION_TRACE(
"rs_convert_aml_to_resources"
);
+ ACPI_FUNCTION_TRACE(
rs_convert_aml_to_resources
);
/*
* Check that the input buffer and all subsequent pointers into it
* are aligned on a native word boundary. Most important on IA64
*/
/*
* Check that the input buffer and all subsequent pointers into it
* are aligned on a native word boundary. Most important on IA64
*/
+ resource = *resource_ptr;
if (ACPI_IS_MISALIGNED(resource)) {
ACPI_WARNING((AE_INFO,
"Misaligned resource pointer %p", resource));
if (ACPI_IS_MISALIGNED(resource)) {
ACPI_WARNING((AE_INFO,
"Misaligned resource pointer %p", resource));
@@
-97,7
+99,7
@@
acpi_rs_convert_aml_to_resources(u8 * aml,
}
ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES,
}
ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES,
- "Type %.2X,
aml_length %.2X internal_l
ength %.2X\n",
+ "Type %.2X,
AmlLength %.2X InternalL
ength %.2X\n",
acpi_ut_get_resource_type(aml), length,
resource->length));
acpi_ut_get_resource_type(aml), length,
resource->length));
@@
-134,7
+136,7
@@
acpi_rs_convert_resources_to_aml(struct acpi_resource *resource,
u8 *end_aml = output_buffer + aml_size_needed;
acpi_status status;
u8 *end_aml = output_buffer + aml_size_needed;
acpi_status status;
- ACPI_FUNCTION_TRACE(
"rs_convert_resources_to_aml"
);
+ ACPI_FUNCTION_TRACE(
rs_convert_resources_to_aml
);
/* Walk the resource descriptor list, convert each descriptor */
/* Walk the resource descriptor list, convert each descriptor */