# This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.1133 -> 1.1134 # drivers/acpi/dispatcher/dsopcode.c 1.18 -> 1.19 # # The following is the BitKeeper ChangeSet Log # -------------------------------------------- # 03/10/28 len.brown@intel.com 1.1134 # [ACPI] REVERT ACPICA-20030918 CONFIG_ACPI_DEBUG printk that caused crash # http://bugzilla.kernel.org/show_bug.cgi?id=1341 # -------------------------------------------- # diff -Nru a/drivers/acpi/dispatcher/dsopcode.c b/drivers/acpi/dispatcher/dsopcode.c --- a/drivers/acpi/dispatcher/dsopcode.c Tue Oct 28 22:06:21 2003 +++ b/drivers/acpi/dispatcher/dsopcode.c Tue Oct 28 22:06:21 2003 @@ -514,16 +514,14 @@ goto cleanup; } + /* Entire field must fit within the current length of the buffer */ if ((bit_offset + bit_count) > (8 * (u32) buffer_desc->buffer.length)) { ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, - "Field [%4.4s] size %d exceeds Buffer [%4.4s] size %d (bits)\n", - ((struct acpi_namespace_node *) result_desc)->name.ascii, - bit_offset + bit_count, - buffer_desc->buffer.node->name.ascii, - 8 * (u32) buffer_desc->buffer.length)); + "Field size %d exceeds Buffer size %d (bits)\n", + bit_offset + bit_count, 8 * (u32) buffer_desc->buffer.length)); status = AE_AML_BUFFER_LIMIT; goto cleanup; }