diff options
Diffstat (limited to 'drivers/acpi/acpica/utaddress.c')
-rw-r--r-- | drivers/acpi/acpica/utaddress.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/drivers/acpi/acpica/utaddress.c b/drivers/acpi/acpica/utaddress.c index e0a2e2779c2e..2c2b6ae5dfc4 100644 --- a/drivers/acpi/acpica/utaddress.c +++ b/drivers/acpi/acpica/utaddress.c | |||
@@ -224,10 +224,11 @@ acpi_ut_check_address_range(acpi_adr_space_type space_id, | |||
224 | 224 | ||
225 | while (range_info) { | 225 | while (range_info) { |
226 | /* | 226 | /* |
227 | * Check if the requested Address/Length overlaps this address_range. | 227 | * Check if the requested address/length overlaps this |
228 | * Four cases to consider: | 228 | * address range. There are four cases to consider: |
229 | * | 229 | * |
230 | * 1) Input address/length is contained completely in the address range | 230 | * 1) Input address/length is contained completely in the |
231 | * address range | ||
231 | * 2) Input address/length overlaps range at the range start | 232 | * 2) Input address/length overlaps range at the range start |
232 | * 3) Input address/length overlaps range at the range end | 233 | * 3) Input address/length overlaps range at the range end |
233 | * 4) Input address/length completely encompasses the range | 234 | * 4) Input address/length completely encompasses the range |
@@ -244,11 +245,17 @@ acpi_ut_check_address_range(acpi_adr_space_type space_id, | |||
244 | region_node); | 245 | region_node); |
245 | 246 | ||
246 | ACPI_WARNING((AE_INFO, | 247 | ACPI_WARNING((AE_INFO, |
247 | "0x%p-0x%p %s conflicts with Region %s %d", | 248 | "%s range 0x%p-0x%p conflicts with OpRegion 0x%p-0x%p (%s)", |
249 | acpi_ut_get_region_name(space_id), | ||
248 | ACPI_CAST_PTR(void, address), | 250 | ACPI_CAST_PTR(void, address), |
249 | ACPI_CAST_PTR(void, end_address), | 251 | ACPI_CAST_PTR(void, end_address), |
250 | acpi_ut_get_region_name(space_id), | 252 | ACPI_CAST_PTR(void, |
251 | pathname, overlap_count)); | 253 | range_info-> |
254 | start_address), | ||
255 | ACPI_CAST_PTR(void, | ||
256 | range_info-> | ||
257 | end_address), | ||
258 | pathname)); | ||
252 | ACPI_FREE(pathname); | 259 | ACPI_FREE(pathname); |
253 | } | 260 | } |
254 | } | 261 | } |