---
drivers/acpi/dispatcher/dsopcode.c | 4 +++-
include/acpi/acpiosxf.h | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
Index: lenb/drivers/acpi/dispatcher/dsopcode.c
===================================================================
--- lenb.orig/drivers/acpi/dispatcher/dsopcode.c
+++ lenb/drivers/acpi/dispatcher/dsopcode.c
@@ -359,7 +359,9 @@ acpi_status acpi_ds_get_region_arguments
status = acpi_os_validate_address(obj_desc->region.space_id,
obj_desc->region.address,
- (acpi_size) obj_desc->region.length);
+ (acpi_size) obj_desc->region.length,
+ acpi_ut_get_node_name(node));
+
if (ACPI_FAILURE(status)) {
/*
* Invalid address/length. We will emit an error message and mark
Index: lenb/include/acpi/acpiosxf.h
===================================================================
--- lenb.orig/include/acpi/acpiosxf.h
+++ lenb/include/acpi/acpiosxf.h
@@ -239,8 +239,8 @@ acpi_status acpi_os_validate_interface(c
acpi_status acpi_osi_invalidate(char* interface);
acpi_status
-acpi_os_validate_address(u8 space_id,
- acpi_physical_address address, acpi_size length);
+acpi_os_validate_address(u8 space_id, acpi_physical_address address,
+ acpi_size length, char *name);
u64 acpi_os_get_timer(void);
this patch introduces a compile error:
drivers/acpi/osl.c:1203: error: conflicting types for 'acpi_os_validate_address'
include/acpi/acpiosxf.h:243: error: previous declaration of 'acpi_os_validate_address' was here
which the next patch fixes. This breaks git-bisection and will cause great
gnashing of teeth to those who hit it.
Also, please fix this:
drivers/acpi/osl.c: In function 'acpi_os_validate_address':
drivers/acpi/osl.c:1365: warning: format '%llx' expects type 'long long unsigned int', but argument 4 has type 'long unsigned int'
drivers/acpi/osl.c:1365: warning: format '%s' expects type 'char *', but argument 5 has type 'long unsigned int'
it's all covered in Documentation/SubmitChecklist but it seems that
file was write-only.
<goes back to fixing build errors>