diff -Naurp -X /home/jbarnes/dontdiff 002-2.6.0-ia64.patch/Makefile 020-acpi-numa-quiet.patch/Makefile --- 002-2.6.0-ia64.patch/Makefile Tue Dec 30 16:38:56 2003 +++ 020-acpi-numa-quiet.patch/Makefile Tue Dec 30 16:39:01 2003 @@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 0 -EXTRAVERSION = +EXTRAVERSION = -jb1 # *DOCUMENTATION* # To see a list of typical targets execute "make help" diff -Naurp -X /home/jbarnes/dontdiff 002-2.6.0-ia64.patch/drivers/acpi/numa.c 020-acpi-numa-quiet.patch/drivers/acpi/numa.c --- 002-2.6.0-ia64.patch/drivers/acpi/numa.c Wed Dec 17 18:59:17 2003 +++ 020-acpi-numa-quiet.patch/drivers/acpi/numa.c Tue Dec 30 16:39:01 2003 @@ -31,6 +31,13 @@ #include #include +#undef ACPI_NUMA_DEBUG +#ifdef ACPI_NUMA_DEBUG +#define Dprintk(x...) printk(x) +#else +#define Dprintk(x...) +#endif + extern int __init acpi_table_parse_madt_family (enum acpi_table_id id, unsigned long madt_size, int entry_id, acpi_madt_entry_handler handler); void __init @@ -46,7 +53,7 @@ acpi_table_print_srat_entry ( { struct acpi_table_processor_affinity *p = (struct acpi_table_processor_affinity*) header; - printk(KERN_INFO PREFIX "SRAT Processor (id[0x%02x] eid[0x%02x]) in proximity domain %d %s\n", + Dprintk(KERN_INFO PREFIX "SRAT Processor (id[0x%02x] eid[0x%02x]) in proximity domain %d %s\n", p->apic_id, p->lsapic_eid, p->proximity_domain, p->flags.enabled?"enabled":"disabled"); } @@ -56,7 +63,7 @@ acpi_table_print_srat_entry ( { struct acpi_table_memory_affinity *p = (struct acpi_table_memory_affinity*) header; - printk(KERN_INFO PREFIX "SRAT Memory (0x%08x%08x length 0x%08x%08x type 0x%x) in proximity domain %d %s%s\n", + Dprintk(KERN_INFO PREFIX "SRAT Memory (0x%08x%08x length 0x%08x%08x type 0x%x) in proximity domain %d %s%s\n", p->base_addr_hi, p->base_addr_lo, p->length_hi, p->length_lo, p->memory_type, p->proximity_domain, p->flags.enabled ? "enabled" : "disabled",