diff for duplicates of <200701041219.12225.lenb@kernel.org> diff --git a/a/1.txt b/N1/1.txt index af19dc1..c51051a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -29,22 +29,20 @@ On Friday 22 December 2006 12:50, John Keller wrote: > > > Index: linux/arch/ia64/kernel/acpi.c -> =================================================================== -> --- linux.orig/arch/ia64/kernel/acpi.c 2006-10-24 02:38:54.000000000 -0500 +> =================================> --- linux.orig/arch/ia64/kernel/acpi.c 2006-10-24 02:38:54.000000000 -0500 > +++ linux/arch/ia64/kernel/acpi.c 2006-12-22 10:54:36.930343639 -0600 > @@ -590,6 +590,9 @@ void __init acpi_numa_arch_fixup(void) > */ > int acpi_register_gsi(u32 gsi, int triggering, int polarity) > { -> + if (acpi_irq_model == ACPI_IRQ_MODEL_PLATFORM) +> + if (acpi_irq_model = ACPI_IRQ_MODEL_PLATFORM) > + return gsi; > + > if (has_8259 && gsi < 16) > return isa_irq_to_vector(gsi); > > Index: linux/arch/ia64/sn/kernel/io_acpi_init.c -> =================================================================== -> --- linux.orig/arch/ia64/sn/kernel/io_acpi_init.c 2006-12-21 00:51:59.000000000 -0600 +> =================================> --- linux.orig/arch/ia64/sn/kernel/io_acpi_init.c 2006-12-21 00:51:59.000000000 -0600 > +++ linux/arch/ia64/sn/kernel/io_acpi_init.c 2006-12-22 10:53:45.504213484 -0600 > @@ -223,6 +223,9 @@ sn_io_acpi_init(void) > u64 result; @@ -57,8 +55,7 @@ On Friday 22 December 2006 12:50, John Keller wrote: > status = sal_ioif_init(&result); > if (status || result) > Index: linux/drivers/acpi/bus.c -> =================================================================== -> --- linux.orig/drivers/acpi/bus.c 2006-08-28 20:40:10.000000000 -0500 +> =================================> --- linux.orig/drivers/acpi/bus.c 2006-08-28 20:40:10.000000000 -0500 > +++ linux/drivers/acpi/bus.c 2006-12-22 10:52:32.155474439 -0600 > @@ -561,6 +561,9 @@ static int __init acpi_bus_init_irq(void > case ACPI_IRQ_MODEL_IOSAPIC: @@ -71,8 +68,7 @@ On Friday 22 December 2006 12:50, John Keller wrote: > printk(KERN_WARNING PREFIX "Unknown interrupt routing model\n"); > return -ENODEV; > Index: linux/include/linux/acpi.h -> =================================================================== -> --- linux.orig/include/linux/acpi.h 2006-10-24 02:38:54.000000000 -0500 +> =================================> --- linux.orig/include/linux/acpi.h 2006-10-24 02:38:54.000000000 -0500 > +++ linux/include/linux/acpi.h 2006-12-22 10:52:53.337997675 -0600 > @@ -47,6 +47,7 @@ enum acpi_irq_model_id { > ACPI_IRQ_MODEL_PIC = 0, diff --git a/a/content_digest b/N1/content_digest index 6121ff3..6d756db 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020061222175004.1603.74655.sendpatchset@attica.americas.sgi.com\0" "From\0Len Brown <lenb@kernel.org>\0" "Subject\0Re: [PATCH 1/1] - Altix: ACPI _PRT support\0" - "Date\0Thu, 4 Jan 2007 12:19:12 -0500\0" + "Date\0Thu, 04 Jan 2007 17:19:12 +0000\0" "To\0John Keller <jpk@sgi.com>\0" "Cc\0linux-acpi@vger.kernel.org" ayoung@agi.com @@ -41,22 +41,20 @@ "> \n" "> \n" "> Index: linux/arch/ia64/kernel/acpi.c\n" - "> ===================================================================\n" - "> --- linux.orig/arch/ia64/kernel/acpi.c\t2006-10-24 02:38:54.000000000 -0500\n" + "> =================================> --- linux.orig/arch/ia64/kernel/acpi.c\t2006-10-24 02:38:54.000000000 -0500\n" "> +++ linux/arch/ia64/kernel/acpi.c\t2006-12-22 10:54:36.930343639 -0600\n" "> @@ -590,6 +590,9 @@ void __init acpi_numa_arch_fixup(void)\n" "> */\n" "> int acpi_register_gsi(u32 gsi, int triggering, int polarity)\n" "> {\n" - "> +\tif (acpi_irq_model == ACPI_IRQ_MODEL_PLATFORM)\n" + "> +\tif (acpi_irq_model = ACPI_IRQ_MODEL_PLATFORM)\n" "> +\t\treturn gsi;\n" "> +\n" "> \tif (has_8259 && gsi < 16)\n" "> \t\treturn isa_irq_to_vector(gsi);\n" "> \n" "> Index: linux/arch/ia64/sn/kernel/io_acpi_init.c\n" - "> ===================================================================\n" - "> --- linux.orig/arch/ia64/sn/kernel/io_acpi_init.c\t2006-12-21 00:51:59.000000000 -0600\n" + "> =================================> --- linux.orig/arch/ia64/sn/kernel/io_acpi_init.c\t2006-12-21 00:51:59.000000000 -0600\n" "> +++ linux/arch/ia64/sn/kernel/io_acpi_init.c\t2006-12-22 10:53:45.504213484 -0600\n" "> @@ -223,6 +223,9 @@ sn_io_acpi_init(void)\n" "> \tu64 result;\n" @@ -69,8 +67,7 @@ "> \tstatus = sal_ioif_init(&result);\n" "> \tif (status || result)\n" "> Index: linux/drivers/acpi/bus.c\n" - "> ===================================================================\n" - "> --- linux.orig/drivers/acpi/bus.c\t2006-08-28 20:40:10.000000000 -0500\n" + "> =================================> --- linux.orig/drivers/acpi/bus.c\t2006-08-28 20:40:10.000000000 -0500\n" "> +++ linux/drivers/acpi/bus.c\t2006-12-22 10:52:32.155474439 -0600\n" "> @@ -561,6 +561,9 @@ static int __init acpi_bus_init_irq(void\n" "> \tcase ACPI_IRQ_MODEL_IOSAPIC:\n" @@ -83,8 +80,7 @@ "> \t\tprintk(KERN_WARNING PREFIX \"Unknown interrupt routing model\\n\");\n" "> \t\treturn -ENODEV;\n" "> Index: linux/include/linux/acpi.h\n" - "> ===================================================================\n" - "> --- linux.orig/include/linux/acpi.h\t2006-10-24 02:38:54.000000000 -0500\n" + "> =================================> --- linux.orig/include/linux/acpi.h\t2006-10-24 02:38:54.000000000 -0500\n" "> +++ linux/include/linux/acpi.h\t2006-12-22 10:52:53.337997675 -0600\n" "> @@ -47,6 +47,7 @@ enum acpi_irq_model_id {\n" "> \tACPI_IRQ_MODEL_PIC = 0,\n" @@ -100,4 +96,4 @@ "> More majordomo info at http://vger.kernel.org/majordomo-info.html\n" > -1404b5c77b4881ec24bde795ea53c97a75d72b318038ac4196bed3d6bd682357 +e2b196a93373019e9879b84560997aad7f0110608856202ade028db46a561153
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.