diff -Naurp -X /home/jbarnes/dontdiff 020-acpi-numa-quiet.patch/drivers/acpi/tables.c 030-acpi-tables-quiet.patch/drivers/acpi/tables.c --- 020-acpi-numa-quiet.patch/drivers/acpi/tables.c Tue Dec 30 16:38:59 2003 +++ 030-acpi-tables-quiet.patch/drivers/acpi/tables.c Tue Dec 30 16:39:04 2003 @@ -35,6 +35,13 @@ #include #include +#undef ACPI_TABLES_DEBUG +#ifdef ACPI_TABLES_DEBUG +#define Dprintk(x...) printk(x) +#else +#define Dprintk(x...) +#endif + #define PREFIX "ACPI: " #define ACPI_MAX_TABLES 256 @@ -118,7 +125,7 @@ acpi_table_print_madt_entry ( { struct acpi_table_lapic *p = (struct acpi_table_lapic*) header; - printk(KERN_INFO PREFIX "LAPIC (acpi_id[0x%02x] lapic_id[0x%02x] %s)\n", + Dprintk(KERN_INFO PREFIX "LAPIC (acpi_id[0x%02x] lapic_id[0x%02x] %s)\n", p->acpi_id, p->id, p->flags.enabled?"enabled":"disabled"); } break; @@ -127,7 +134,7 @@ acpi_table_print_madt_entry ( { struct acpi_table_ioapic *p = (struct acpi_table_ioapic*) header; - printk(KERN_INFO PREFIX "IOAPIC (id[0x%02x] address[0x%08x] global_irq_base[0x%x])\n", + Dprintk(KERN_INFO PREFIX "IOAPIC (id[0x%02x] address[0x%08x] global_irq_base[0x%x])\n", p->id, p->address, p->global_irq_base); } break; @@ -136,7 +143,7 @@ acpi_table_print_madt_entry ( { struct acpi_table_int_src_ovr *p = (struct acpi_table_int_src_ovr*) header; - printk(KERN_INFO PREFIX "INT_SRC_OVR (bus[%d] irq[0x%x] global_irq[0x%x] polarity[0x%x] trigger[0x%x])\n", + Dprintk(KERN_INFO PREFIX "INT_SRC_OVR (bus[%d] irq[0x%x] global_irq[0x%x] polarity[0x%x] trigger[0x%x])\n", p->bus, p->bus_irq, p->global_irq, p->flags.polarity, p->flags.trigger); } break; @@ -145,7 +152,7 @@ acpi_table_print_madt_entry ( { struct acpi_table_nmi_src *p = (struct acpi_table_nmi_src*) header; - printk(KERN_INFO PREFIX "NMI_SRC (polarity[0x%x] trigger[0x%x] global_irq[0x%x])\n", + Dprintk(KERN_INFO PREFIX "NMI_SRC (polarity[0x%x] trigger[0x%x] global_irq[0x%x])\n", p->flags.polarity, p->flags.trigger, p->global_irq); } break; @@ -154,7 +161,7 @@ acpi_table_print_madt_entry ( { struct acpi_table_lapic_nmi *p = (struct acpi_table_lapic_nmi*) header; - printk(KERN_INFO PREFIX "LAPIC_NMI (acpi_id[0x%02x] polarity[0x%x] trigger[0x%x] lint[0x%x])\n", + Dprintk(KERN_INFO PREFIX "LAPIC_NMI (acpi_id[0x%02x] polarity[0x%x] trigger[0x%x] lint[0x%x])\n", p->acpi_id, p->flags.polarity, p->flags.trigger, p->lint); } break; @@ -163,7 +170,7 @@ acpi_table_print_madt_entry ( { struct acpi_table_lapic_addr_ovr *p = (struct acpi_table_lapic_addr_ovr*) header; - printk(KERN_INFO PREFIX "LAPIC_ADDR_OVR (address[%p])\n", + Dprintk(KERN_INFO PREFIX "LAPIC_ADDR_OVR (address[%p])\n", (void *) (unsigned long) p->address); } break; @@ -172,7 +179,7 @@ acpi_table_print_madt_entry ( { struct acpi_table_iosapic *p = (struct acpi_table_iosapic*) header; - printk(KERN_INFO PREFIX "IOSAPIC (id[0x%x] global_irq_base[0x%x] address[%p])\n", + Dprintk(KERN_INFO PREFIX "IOSAPIC (id[0x%x] global_irq_base[0x%x] address[%p])\n", p->id, p->global_irq_base, (void *) (unsigned long) p->address); } break; @@ -181,7 +188,7 @@ acpi_table_print_madt_entry ( { struct acpi_table_lsapic *p = (struct acpi_table_lsapic*) header; - printk(KERN_INFO PREFIX "LSAPIC (acpi_id[0x%02x] lsapic_id[0x%02x] lsapic_eid[0x%02x] %s)\n", + Dprintk(KERN_INFO PREFIX "LSAPIC (acpi_id[0x%02x] lsapic_id[0x%02x] lsapic_eid[0x%02x] %s)\n", p->acpi_id, p->id, p->eid, p->flags.enabled?"enabled":"disabled"); } break; @@ -190,7 +197,7 @@ acpi_table_print_madt_entry ( { struct acpi_table_plat_int_src *p = (struct acpi_table_plat_int_src*) header; - printk(KERN_INFO PREFIX "PLAT_INT_SRC (polarity[0x%x] trigger[0x%x] type[0x%x] id[0x%04x] eid[0x%x] iosapic_vector[0x%x] global_irq[0x%x]\n", + Dprintk(KERN_INFO PREFIX "PLAT_INT_SRC (polarity[0x%x] trigger[0x%x] type[0x%x] id[0x%04x] eid[0x%x] iosapic_vector[0x%x] global_irq[0x%x]\n", p->flags.polarity, p->flags.trigger, p->type, p->id, p->eid, p->iosapic_vector, p->global_irq); } break;