diff for duplicates of <20040609175910.GS1444@holomorphy.com> diff --git a/a/1.txt b/N1/1.txt index 87661d8..b6e7b4f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -17,7 +17,8 @@ incarnation. vs. 2.6.7-rc3-mm1 -- wli Index: mm1-2.6.7-rc3/include/linux/interrupt.h -=================================--- mm1-2.6.7-rc3.orig/include/linux/interrupt.h 2004-06-07 12:14:25.000000000 -0700 +=================================================================== +--- mm1-2.6.7-rc3.orig/include/linux/interrupt.h 2004-06-07 12:14:25.000000000 -0700 +++ mm1-2.6.7-rc3/include/linux/interrupt.h 2004-06-09 10:40:12.684107000 -0700 @@ -7,6 +7,7 @@ #include <linux/linkage.h> @@ -37,7 +38,8 @@ Index: mm1-2.6.7-rc3/include/linux/interrupt.h void *dev_id; struct irqaction *next; Index: mm1-2.6.7-rc3/include/linux/cpumask.h -=================================--- mm1-2.6.7-rc3.orig/include/linux/cpumask.h 2004-06-09 07:11:49.439889000 -0700 +=================================================================== +--- mm1-2.6.7-rc3.orig/include/linux/cpumask.h 2004-06-09 07:11:49.439889000 -0700 +++ mm1-2.6.7-rc3/include/linux/cpumask.h 2004-06-09 10:44:34.137360000 -0700 @@ -248,9 +248,9 @@ #endif @@ -52,7 +54,8 @@ Index: mm1-2.6.7-rc3/include/linux/cpumask.h #define cpus_addr(src) ((src).bits) Index: mm1-2.6.7-rc3/arch/ppc/kernel/irq.c -=================================--- mm1-2.6.7-rc3.orig/arch/ppc/kernel/irq.c 2004-06-07 12:14:56.000000000 -0700 +=================================================================== +--- mm1-2.6.7-rc3.orig/arch/ppc/kernel/irq.c 2004-06-07 12:14:56.000000000 -0700 +++ mm1-2.6.7-rc3/arch/ppc/kernel/irq.c 2004-06-09 10:40:12.760095000 -0700 @@ -241,7 +241,7 @@ @@ -64,7 +67,8 @@ Index: mm1-2.6.7-rc3/arch/ppc/kernel/irq.c action->dev_id = dev_id; action->next = NULL; Index: mm1-2.6.7-rc3/arch/alpha/kernel/irq.c -=================================--- mm1-2.6.7-rc3.orig/arch/alpha/kernel/irq.c 2004-06-07 12:14:56.000000000 -0700 +=================================================================== +--- mm1-2.6.7-rc3.orig/arch/alpha/kernel/irq.c 2004-06-07 12:14:56.000000000 -0700 +++ mm1-2.6.7-rc3/arch/alpha/kernel/irq.c 2004-06-09 10:40:12.844083000 -0700 @@ -457,7 +457,7 @@ @@ -76,7 +80,8 @@ Index: mm1-2.6.7-rc3/arch/alpha/kernel/irq.c action->next = NULL; action->dev_id = dev_id; Index: mm1-2.6.7-rc3/arch/arm/kernel/irq.c -=================================--- mm1-2.6.7-rc3.orig/arch/arm/kernel/irq.c 2004-06-07 12:13:34.000000000 -0700 +=================================================================== +--- mm1-2.6.7-rc3.orig/arch/arm/kernel/irq.c 2004-06-07 12:13:34.000000000 -0700 +++ mm1-2.6.7-rc3/arch/arm/kernel/irq.c 2004-06-09 10:40:12.895075000 -0700 @@ -674,7 +674,7 @@ @@ -88,7 +93,8 @@ Index: mm1-2.6.7-rc3/arch/arm/kernel/irq.c action->next = NULL; action->dev_id = dev_id; Index: mm1-2.6.7-rc3/arch/arm/mach-clps7500/core.c -=================================--- mm1-2.6.7-rc3.orig/arch/arm/mach-clps7500/core.c 2004-06-07 12:14:33.000000000 -0700 +=================================================================== +--- mm1-2.6.7-rc3.orig/arch/arm/mach-clps7500/core.c 2004-06-07 12:14:33.000000000 -0700 +++ mm1-2.6.7-rc3/arch/arm/mach-clps7500/core.c 2004-06-09 10:40:12.944067000 -0700 @@ -187,7 +187,7 @@ .unmask = cl7500_no_action, @@ -100,7 +106,8 @@ Index: mm1-2.6.7-rc3/arch/arm/mach-clps7500/core.c static void __init clps7500_init_irq(void) { Index: mm1-2.6.7-rc3/arch/arm26/kernel/irq.c -=================================--- mm1-2.6.7-rc3.orig/arch/arm26/kernel/irq.c 2004-06-07 12:14:58.000000000 -0700 +=================================================================== +--- mm1-2.6.7-rc3.orig/arch/arm26/kernel/irq.c 2004-06-07 12:14:58.000000000 -0700 +++ mm1-2.6.7-rc3/arch/arm26/kernel/irq.c 2004-06-09 10:40:13.024055000 -0700 @@ -549,7 +549,7 @@ @@ -112,7 +119,8 @@ Index: mm1-2.6.7-rc3/arch/arm26/kernel/irq.c action->next = NULL; action->dev_id = dev_id; Index: mm1-2.6.7-rc3/arch/cris/kernel/irq.c -=================================--- mm1-2.6.7-rc3.orig/arch/cris/kernel/irq.c 2004-06-07 12:15:12.000000000 -0700 +=================================================================== +--- mm1-2.6.7-rc3.orig/arch/cris/kernel/irq.c 2004-06-07 12:15:12.000000000 -0700 +++ mm1-2.6.7-rc3/arch/cris/kernel/irq.c 2004-06-09 10:40:13.065049000 -0700 @@ -240,7 +240,7 @@ @@ -124,7 +132,8 @@ Index: mm1-2.6.7-rc3/arch/cris/kernel/irq.c action->next = NULL; action->dev_id = dev_id; Index: mm1-2.6.7-rc3/arch/cris/arch-v10/kernel/time.c -=================================--- mm1-2.6.7-rc3.orig/arch/cris/arch-v10/kernel/time.c 2004-06-07 12:14:42.000000000 -0700 +=================================================================== +--- mm1-2.6.7-rc3.orig/arch/cris/arch-v10/kernel/time.c 2004-06-07 12:14:42.000000000 -0700 +++ mm1-2.6.7-rc3/arch/cris/arch-v10/kernel/time.c 2004-06-09 10:40:13.155035000 -0700 @@ -253,7 +253,7 @@ */ @@ -136,7 +145,8 @@ Index: mm1-2.6.7-rc3/arch/cris/arch-v10/kernel/time.c void __init time_init(void) Index: mm1-2.6.7-rc3/arch/i386/kernel/irq.c -=================================--- mm1-2.6.7-rc3.orig/arch/i386/kernel/irq.c 2004-06-09 07:10:49.966930000 -0700 +=================================================================== +--- mm1-2.6.7-rc3.orig/arch/i386/kernel/irq.c 2004-06-09 07:10:49.966930000 -0700 +++ mm1-2.6.7-rc3/arch/i386/kernel/irq.c 2004-06-09 10:40:13.221025000 -0700 @@ -654,7 +654,7 @@ @@ -148,7 +158,8 @@ Index: mm1-2.6.7-rc3/arch/i386/kernel/irq.c action->next = NULL; action->dev_id = dev_id; Index: mm1-2.6.7-rc3/arch/i386/kernel/i8259.c -=================================--- mm1-2.6.7-rc3.orig/arch/i386/kernel/i8259.c 2004-06-09 07:11:34.007235000 -0700 +=================================================================== +--- mm1-2.6.7-rc3.orig/arch/i386/kernel/i8259.c 2004-06-09 07:11:34.007235000 -0700 +++ mm1-2.6.7-rc3/arch/i386/kernel/i8259.c 2004-06-09 10:40:13.230024000 -0700 @@ -333,7 +333,7 @@ * New motherboards sometimes make IRQ 13 be a PCI interrupt, @@ -160,7 +171,8 @@ Index: mm1-2.6.7-rc3/arch/i386/kernel/i8259.c void __init init_ISA_irqs (void) { Index: mm1-2.6.7-rc3/arch/i386/mach-default/setup.c -=================================--- mm1-2.6.7-rc3.orig/arch/i386/mach-default/setup.c 2004-06-07 12:14:05.000000000 -0700 +=================================================================== +--- mm1-2.6.7-rc3.orig/arch/i386/mach-default/setup.c 2004-06-07 12:14:05.000000000 -0700 +++ mm1-2.6.7-rc3/arch/i386/mach-default/setup.c 2004-06-09 10:40:13.267018000 -0700 @@ -27,7 +27,7 @@ /* @@ -181,7 +193,8 @@ Index: mm1-2.6.7-rc3/arch/i386/mach-default/setup.c /** * time_init_hook - do any specific initialisations for the system timer. Index: mm1-2.6.7-rc3/arch/i386/mach-pc9800/setup.c -=================================--- mm1-2.6.7-rc3.orig/arch/i386/mach-pc9800/setup.c 2004-06-07 12:13:34.000000000 -0700 +=================================================================== +--- mm1-2.6.7-rc3.orig/arch/i386/mach-pc9800/setup.c 2004-06-07 12:13:34.000000000 -0700 +++ mm1-2.6.7-rc3/arch/i386/mach-pc9800/setup.c 2004-06-09 10:40:13.287015000 -0700 @@ -34,7 +34,7 @@ /* @@ -202,7 +215,8 @@ Index: mm1-2.6.7-rc3/arch/i386/mach-pc9800/setup.c /** * time_init_hook - do any specific initialisations for the system timer. Index: mm1-2.6.7-rc3/arch/ia64/kernel/irq.c -=================================--- mm1-2.6.7-rc3.orig/arch/ia64/kernel/irq.c 2004-06-09 07:10:24.000000000 -0700 +=================================================================== +--- mm1-2.6.7-rc3.orig/arch/ia64/kernel/irq.c 2004-06-09 07:10:24.000000000 -0700 +++ mm1-2.6.7-rc3/arch/ia64/kernel/irq.c 2004-06-09 10:40:13.355005000 -0700 @@ -612,7 +612,7 @@ @@ -214,7 +228,8 @@ Index: mm1-2.6.7-rc3/arch/ia64/kernel/irq.c action->next = NULL; action->dev_id = dev_id; Index: mm1-2.6.7-rc3/arch/ia64/lib/kgdb_serial.c -=================================--- mm1-2.6.7-rc3.orig/arch/ia64/lib/kgdb_serial.c 2004-06-09 07:10:25.000000000 -0700 +=================================================================== +--- mm1-2.6.7-rc3.orig/arch/ia64/lib/kgdb_serial.c 2004-06-09 07:10:25.000000000 -0700 +++ mm1-2.6.7-rc3/arch/ia64/lib/kgdb_serial.c 2004-06-09 10:40:13.429993000 -0700 @@ -486,7 +486,7 @@ irq_desc_t *desc; @@ -226,7 +241,8 @@ Index: mm1-2.6.7-rc3/arch/ia64/lib/kgdb_serial.c kgdb_action.next = NULL; kgdb_action.dev_id = NULL; Index: mm1-2.6.7-rc3/arch/mips/baget/irq.c -=================================--- mm1-2.6.7-rc3.orig/arch/mips/baget/irq.c 2004-06-07 12:14:42.000000000 -0700 +=================================================================== +--- mm1-2.6.7-rc3.orig/arch/mips/baget/irq.c 2004-06-07 12:14:42.000000000 -0700 +++ mm1-2.6.7-rc3/arch/mips/baget/irq.c 2004-06-09 10:40:13.512981000 -0700 @@ -325,7 +325,7 @@ @@ -240,24 +256,28 @@ Index: mm1-2.6.7-rc3/arch/mips/baget/irq.c @@ -389,7 +389,7 @@ } - static struct irqaction irq0 -{ write_err_interrupt, SA_INTERRUPT, 0, "bus write error", NULL, NULL}; + static struct irqaction irq0 = +-{ write_err_interrupt, SA_INTERRUPT, 0, "bus write error", NULL, NULL}; +{ write_err_interrupt, SA_INTERRUPT, CPU_MASK_NONE, "bus write error", NULL, NULL}; void __init init_IRQ(void) { Index: mm1-2.6.7-rc3/arch/mips/baget/time.c -=================================--- mm1-2.6.7-rc3.orig/arch/mips/baget/time.c 2004-06-07 12:13:34.000000000 -0700 +=================================================================== +--- mm1-2.6.7-rc3.orig/arch/mips/baget/time.c 2004-06-07 12:13:34.000000000 -0700 +++ mm1-2.6.7-rc3/arch/mips/baget/time.c 2004-06-09 10:40:13.545976000 -0700 @@ -67,7 +67,7 @@ } - static struct irqaction timer_irq -{ timer_interrupt, SA_INTERRUPT, 0, "timer", NULL, NULL}; + static struct irqaction timer_irq = +-{ timer_interrupt, SA_INTERRUPT, 0, "timer", NULL, NULL}; +{ timer_interrupt, SA_INTERRUPT, CPU_MASK_NONE, "timer", NULL, NULL}; void __init time_init(void) { Index: mm1-2.6.7-rc3/arch/mips/kernel/irq.c -=================================--- mm1-2.6.7-rc3.orig/arch/mips/kernel/irq.c 2004-06-07 12:13:39.000000000 -0700 +=================================================================== +--- mm1-2.6.7-rc3.orig/arch/mips/kernel/irq.c 2004-06-07 12:13:39.000000000 -0700 +++ mm1-2.6.7-rc3/arch/mips/kernel/irq.c 2004-06-09 10:40:13.578971000 -0700 @@ -487,7 +487,7 @@ @@ -269,20 +289,24 @@ Index: mm1-2.6.7-rc3/arch/mips/kernel/irq.c action->next = NULL; action->dev_id = dev_id; Index: mm1-2.6.7-rc3/arch/mips/vr4181/common/irq.c -=================================--- mm1-2.6.7-rc3.orig/arch/mips/vr4181/common/irq.c 2004-06-07 12:15:11.000000000 -0700 +=================================================================== +--- mm1-2.6.7-rc3.orig/arch/mips/vr4181/common/irq.c 2004-06-07 12:15:11.000000000 -0700 +++ mm1-2.6.7-rc3/arch/mips/vr4181/common/irq.c 2004-06-09 10:40:13.634962000 -0700 @@ -180,9 +180,9 @@ extern void mips_cpu_irq_init(u32 irq_base); - static struct irqaction cascade - { no_action, SA_INTERRUPT, 0, "cascade", NULL, NULL }; + static struct irqaction cascade = +- { no_action, SA_INTERRUPT, 0, "cascade", NULL, NULL }; + { no_action, SA_INTERRUPT, CPU_MASK_NONE, "cascade", NULL, NULL }; - static struct irqaction reserved - { no_action, SA_INTERRUPT, 0, "cascade", NULL, NULL }; + static struct irqaction reserved = +- { no_action, SA_INTERRUPT, 0, "cascade", NULL, NULL }; + { no_action, SA_INTERRUPT, CPU_MASK_NONE, "cascade", NULL, NULL }; void __init init_IRQ(void) { Index: mm1-2.6.7-rc3/arch/mips/gt64120/common/time.c -=================================--- mm1-2.6.7-rc3.orig/arch/mips/gt64120/common/time.c 2004-06-07 12:14:58.000000000 -0700 +=================================================================== +--- mm1-2.6.7-rc3.orig/arch/mips/gt64120/common/time.c 2004-06-07 12:14:58.000000000 -0700 +++ mm1-2.6.7-rc3/arch/mips/gt64120/common/time.c 2004-06-09 10:40:13.676956000 -0700 @@ -80,7 +80,7 @@ timer.name = "timer"; @@ -294,7 +318,8 @@ Index: mm1-2.6.7-rc3/arch/mips/gt64120/common/time.c enable_irq(GT_TIMER); Index: mm1-2.6.7-rc3/arch/mips/vr41xx/common/giu.c -=================================--- mm1-2.6.7-rc3.orig/arch/mips/vr41xx/common/giu.c 2004-06-07 12:13:38.000000000 -0700 +=================================================================== +--- mm1-2.6.7-rc3.orig/arch/mips/vr41xx/common/giu.c 2004-06-07 12:13:38.000000000 -0700 +++ mm1-2.6.7-rc3/arch/mips/vr41xx/common/giu.c 2004-06-09 10:40:13.722949000 -0700 @@ -209,7 +209,7 @@ }; @@ -306,11 +331,12 @@ Index: mm1-2.6.7-rc3/arch/mips/vr41xx/common/giu.c static int no_irq_number(int irq) { Index: mm1-2.6.7-rc3/arch/mips/vr41xx/common/icu.c -=================================--- mm1-2.6.7-rc3.orig/arch/mips/vr41xx/common/icu.c 2004-06-07 12:13:35.000000000 -0700 +=================================================================== +--- mm1-2.6.7-rc3.orig/arch/mips/vr41xx/common/icu.c 2004-06-07 12:13:35.000000000 -0700 +++ mm1-2.6.7-rc3/arch/mips/vr41xx/common/icu.c 2004-06-09 10:40:13.738946000 -0700 @@ -288,7 +288,7 @@ - /*====================================*/ + /*=======================================================================*/ -static struct irqaction icu_cascade = {no_action, 0, 0, "cascade", NULL, NULL}; +static struct irqaction icu_cascade = {no_action, 0, CPU_MASK_NONE, "cascade", NULL, NULL}; @@ -318,7 +344,8 @@ Index: mm1-2.6.7-rc3/arch/mips/vr41xx/common/icu.c static void __init vr41xx_icu_init(void) { Index: mm1-2.6.7-rc3/arch/mips/momentum/jaguar_atx/irq.c -=================================--- mm1-2.6.7-rc3.orig/arch/mips/momentum/jaguar_atx/irq.c 2004-06-07 12:14:34.000000000 -0700 +=================================================================== +--- mm1-2.6.7-rc3.orig/arch/mips/momentum/jaguar_atx/irq.c 2004-06-07 12:14:34.000000000 -0700 +++ mm1-2.6.7-rc3/arch/mips/momentum/jaguar_atx/irq.c 2004-06-09 10:40:13.781940000 -0700 @@ -42,7 +42,7 @@ extern asmlinkage void jaguar_handle_int(void); @@ -330,7 +357,8 @@ Index: mm1-2.6.7-rc3/arch/mips/momentum/jaguar_atx/irq.c void __init init_IRQ(void) Index: mm1-2.6.7-rc3/arch/mips/momentum/ocelot_c/irq.c -=================================--- mm1-2.6.7-rc3.orig/arch/mips/momentum/ocelot_c/irq.c 2004-06-07 12:14:56.000000000 -0700 +=================================================================== +--- mm1-2.6.7-rc3.orig/arch/mips/momentum/ocelot_c/irq.c 2004-06-07 12:14:56.000000000 -0700 +++ mm1-2.6.7-rc3/arch/mips/momentum/ocelot_c/irq.c 2004-06-09 10:40:13.806936000 -0700 @@ -53,11 +53,11 @@ extern void cpci_irq_init(void); @@ -347,7 +375,8 @@ Index: mm1-2.6.7-rc3/arch/mips/momentum/ocelot_c/irq.c void __init init_IRQ(void) Index: mm1-2.6.7-rc3/arch/mips/jmr3927/rbhma3100/irq.c -=================================--- mm1-2.6.7-rc3.orig/arch/mips/jmr3927/rbhma3100/irq.c 2004-06-07 12:14:10.000000000 -0700 +=================================================================== +--- mm1-2.6.7-rc3.orig/arch/mips/jmr3927/rbhma3100/irq.c 2004-06-07 12:14:10.000000000 -0700 +++ mm1-2.6.7-rc3/arch/mips/jmr3927/rbhma3100/irq.c 2004-06-09 10:40:13.850929000 -0700 @@ -301,7 +301,7 @@ } @@ -386,7 +415,8 @@ Index: mm1-2.6.7-rc3/arch/mips/jmr3927/rbhma3100/irq.c int jmr3927_ether1_irq = 0; Index: mm1-2.6.7-rc3/arch/mips/ddb5xxx/ddb5074/irq.c -=================================--- mm1-2.6.7-rc3.orig/arch/mips/ddb5xxx/ddb5074/irq.c 2004-06-07 12:15:11.000000000 -0700 +=================================================================== +--- mm1-2.6.7-rc3.orig/arch/mips/ddb5xxx/ddb5074/irq.c 2004-06-07 12:15:11.000000000 -0700 +++ mm1-2.6.7-rc3/arch/mips/ddb5xxx/ddb5074/irq.c 2004-06-09 10:40:13.880925000 -0700 @@ -24,7 +24,7 @@ @@ -398,7 +428,8 @@ Index: mm1-2.6.7-rc3/arch/mips/ddb5xxx/ddb5074/irq.c #define M1543_PNP_CONFIG 0x03f0 /* PnP Config Port */ #define M1543_PNP_INDEX 0x03f0 /* PnP Index Port */ Index: mm1-2.6.7-rc3/arch/mips/ddb5xxx/ddb5477/irq.c -=================================--- mm1-2.6.7-rc3.orig/arch/mips/ddb5xxx/ddb5477/irq.c 2004-06-07 12:13:39.000000000 -0700 +=================================================================== +--- mm1-2.6.7-rc3.orig/arch/mips/ddb5xxx/ddb5477/irq.c 2004-06-07 12:13:39.000000000 -0700 +++ mm1-2.6.7-rc3/arch/mips/ddb5xxx/ddb5477/irq.c 2004-06-09 10:40:13.901922000 -0700 @@ -77,7 +77,7 @@ extern void mips_cpu_irq_init(u32 base); @@ -410,7 +441,8 @@ Index: mm1-2.6.7-rc3/arch/mips/ddb5xxx/ddb5477/irq.c void ddb5477_irq_setup(void) Index: mm1-2.6.7-rc3/arch/mips/ddb5xxx/ddb5476/irq.c -=================================--- mm1-2.6.7-rc3.orig/arch/mips/ddb5xxx/ddb5476/irq.c 2004-06-07 12:14:57.000000000 -0700 +=================================================================== +--- mm1-2.6.7-rc3.orig/arch/mips/ddb5xxx/ddb5476/irq.c 2004-06-07 12:14:57.000000000 -0700 +++ mm1-2.6.7-rc3/arch/mips/ddb5xxx/ddb5476/irq.c 2004-06-09 10:40:13.924918000 -0700 @@ -107,8 +107,8 @@ /* memory resource acquire in ddb_setup */ @@ -424,7 +456,8 @@ Index: mm1-2.6.7-rc3/arch/mips/ddb5xxx/ddb5476/irq.c extern asmlinkage void ddb5476_handle_int(void); extern int setup_irq(unsigned int irq, struct irqaction *irqaction); Index: mm1-2.6.7-rc3/arch/mips/sibyte/sb1250/irq.c -=================================--- mm1-2.6.7-rc3.orig/arch/mips/sibyte/sb1250/irq.c 2004-06-07 12:14:59.000000000 -0700 +=================================================================== +--- mm1-2.6.7-rc3.orig/arch/mips/sibyte/sb1250/irq.c 2004-06-07 12:14:59.000000000 -0700 +++ mm1-2.6.7-rc3/arch/mips/sibyte/sb1250/irq.c 2004-06-09 10:40:13.969911000 -0700 @@ -279,7 +279,7 @@ static struct irqaction sb1250_dummy_action = { @@ -436,7 +469,8 @@ Index: mm1-2.6.7-rc3/arch/mips/sibyte/sb1250/irq.c .next = NULL, .dev_id = 0 Index: mm1-2.6.7-rc3/arch/mips/tx4927/common/tx4927_irq.c -=================================--- mm1-2.6.7-rc3.orig/arch/mips/tx4927/common/tx4927_irq.c 2004-06-07 12:15:11.000000000 -0700 +=================================================================== +--- mm1-2.6.7-rc3.orig/arch/mips/tx4927/common/tx4927_irq.c 2004-06-07 12:15:11.000000000 -0700 +++ mm1-2.6.7-rc3/arch/mips/tx4927/common/tx4927_irq.c 2004-06-09 10:40:14.010905000 -0700 @@ -172,7 +172,7 @@ .set_affinity = NULL @@ -444,10 +478,12 @@ Index: mm1-2.6.7-rc3/arch/mips/tx4927/common/tx4927_irq.c -#define TX4927_PIC_ACTION(s) { no_action, 0, 0, s, NULL, NULL } +#define TX4927_PIC_ACTION(s) { no_action, 0, CPU_MASK_NONE, s, NULL, NULL } - static struct irqaction tx4927_irq_pic_action TX4927_PIC_ACTION(TX4927_PIC_NAME); + static struct irqaction tx4927_irq_pic_action = + TX4927_PIC_ACTION(TX4927_PIC_NAME); Index: mm1-2.6.7-rc3/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c -=================================--- mm1-2.6.7-rc3.orig/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c 2004-06-07 12:14:04.000000000 -0700 +=================================================================== +--- mm1-2.6.7-rc3.orig/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c 2004-06-07 12:14:04.000000000 -0700 +++ mm1-2.6.7-rc3/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c 2004-06-09 10:40:14.037901000 -0700 @@ -337,8 +337,8 @@ return (sw_irq); @@ -457,10 +493,12 @@ Index: mm1-2.6.7-rc3/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c -#define TOSHIBA_RBTX4927_PIC_ACTION(s) { no_action, SA_SHIRQ, 0, s, NULL, NULL } +//#define TOSHIBA_RBTX4927_PIC_ACTION(s) { no_action, 0, CPU_MASK_NONE, s, NULL, NULL } +#define TOSHIBA_RBTX4927_PIC_ACTION(s) { no_action, SA_SHIRQ, CPU_MASK_NONE, s, NULL, NULL } - static struct irqaction toshiba_rbtx4927_irq_ioc_action TOSHIBA_RBTX4927_PIC_ACTION(TOSHIBA_RBTX4927_IOC_NAME); + static struct irqaction toshiba_rbtx4927_irq_ioc_action = + TOSHIBA_RBTX4927_PIC_ACTION(TOSHIBA_RBTX4927_IOC_NAME); #ifdef CONFIG_TOSHIBA_FPCIB0 Index: mm1-2.6.7-rc3/arch/mips/sgi-ip32/ip32-irq.c -=================================--- mm1-2.6.7-rc3.orig/arch/mips/sgi-ip32/ip32-irq.c 2004-06-07 12:14:24.000000000 -0700 +=================================================================== +--- mm1-2.6.7-rc3.orig/arch/mips/sgi-ip32/ip32-irq.c 2004-06-07 12:14:24.000000000 -0700 +++ mm1-2.6.7-rc3/arch/mips/sgi-ip32/ip32-irq.c 2004-06-09 10:40:14.082894000 -0700 @@ -123,9 +123,9 @@ struct pt_regs *regs); @@ -475,7 +513,8 @@ Index: mm1-2.6.7-rc3/arch/mips/sgi-ip32/ip32-irq.c extern void ip32_handle_int(void); Index: mm1-2.6.7-rc3/arch/parisc/kernel/irq.c -=================================--- mm1-2.6.7-rc3.orig/arch/parisc/kernel/irq.c 2004-06-07 12:14:05.000000000 -0700 +=================================================================== +--- mm1-2.6.7-rc3.orig/arch/parisc/kernel/irq.c 2004-06-07 12:14:05.000000000 -0700 +++ mm1-2.6.7-rc3/arch/parisc/kernel/irq.c 2004-06-09 10:40:14.151884000 -0700 @@ -644,7 +644,7 @@ @@ -487,7 +526,8 @@ Index: mm1-2.6.7-rc3/arch/parisc/kernel/irq.c action->next = NULL; action->dev_id = dev_id; Index: mm1-2.6.7-rc3/arch/ppc64/kernel/irq.c -=================================--- mm1-2.6.7-rc3.orig/arch/ppc64/kernel/irq.c 2004-06-09 07:11:49.715847000 -0700 +=================================================================== +--- mm1-2.6.7-rc3.orig/arch/ppc64/kernel/irq.c 2004-06-09 07:11:49.715847000 -0700 +++ mm1-2.6.7-rc3/arch/ppc64/kernel/irq.c 2004-06-09 10:40:14.181879000 -0700 @@ -206,7 +206,7 @@ @@ -499,7 +539,8 @@ Index: mm1-2.6.7-rc3/arch/ppc64/kernel/irq.c action->dev_id = dev_id; action->next = NULL; Index: mm1-2.6.7-rc3/arch/sh/kernel/irq.c -=================================--- mm1-2.6.7-rc3.orig/arch/sh/kernel/irq.c 2004-06-07 12:14:05.000000000 -0700 +=================================================================== +--- mm1-2.6.7-rc3.orig/arch/sh/kernel/irq.c 2004-06-07 12:14:05.000000000 -0700 +++ mm1-2.6.7-rc3/arch/sh/kernel/irq.c 2004-06-09 10:40:14.243870000 -0700 @@ -436,7 +436,7 @@ @@ -511,7 +552,8 @@ Index: mm1-2.6.7-rc3/arch/sh/kernel/irq.c action->next = NULL; action->dev_id = dev_id; Index: mm1-2.6.7-rc3/arch/sh/kernel/time.c -=================================--- mm1-2.6.7-rc3.orig/arch/sh/kernel/time.c 2004-06-07 12:13:34.000000000 -0700 +=================================================================== +--- mm1-2.6.7-rc3.orig/arch/sh/kernel/time.c 2004-06-07 12:13:34.000000000 -0700 +++ mm1-2.6.7-rc3/arch/sh/kernel/time.c 2004-06-09 10:40:14.278864000 -0700 @@ -391,7 +391,7 @@ } @@ -523,7 +565,8 @@ Index: mm1-2.6.7-rc3/arch/sh/kernel/time.c void get_current_frequency_divisors(unsigned int *ifc, unsigned int *bfc, unsigned int *pfc) { Index: mm1-2.6.7-rc3/arch/sh/cchips/hd6446x/hd64465/setup.c -=================================--- mm1-2.6.7-rc3.orig/arch/sh/cchips/hd6446x/hd64465/setup.c 2004-06-07 12:15:12.000000000 -0700 +=================================================================== +--- mm1-2.6.7-rc3.orig/arch/sh/cchips/hd6446x/hd64465/setup.c 2004-06-07 12:15:12.000000000 -0700 +++ mm1-2.6.7-rc3/arch/sh/cchips/hd6446x/hd64465/setup.c 2004-06-09 10:40:14.334856000 -0700 @@ -154,7 +154,7 @@ return irq; @@ -535,7 +578,8 @@ Index: mm1-2.6.7-rc3/arch/sh/cchips/hd6446x/hd64465/setup.c static int __init setup_hd64465(void) Index: mm1-2.6.7-rc3/arch/sh/cchips/hd6446x/hd64461/setup.c -=================================--- mm1-2.6.7-rc3.orig/arch/sh/cchips/hd6446x/hd64461/setup.c 2004-06-07 12:14:56.000000000 -0700 +=================================================================== +--- mm1-2.6.7-rc3.orig/arch/sh/cchips/hd6446x/hd64461/setup.c 2004-06-07 12:14:56.000000000 -0700 +++ mm1-2.6.7-rc3/arch/sh/cchips/hd6446x/hd64461/setup.c 2004-06-09 10:40:14.355853000 -0700 @@ -134,7 +134,7 @@ return __irq_demux(irq); @@ -547,7 +591,8 @@ Index: mm1-2.6.7-rc3/arch/sh/cchips/hd6446x/hd64461/setup.c int __init setup_hd64461(void) { Index: mm1-2.6.7-rc3/arch/sparc/kernel/irq.c -=================================--- mm1-2.6.7-rc3.orig/arch/sparc/kernel/irq.c 2004-06-07 12:13:36.000000000 -0700 +=================================================================== +--- mm1-2.6.7-rc3.orig/arch/sparc/kernel/irq.c 2004-06-07 12:13:36.000000000 -0700 +++ mm1-2.6.7-rc3/arch/sparc/kernel/irq.c 2004-06-09 10:40:14.433841000 -0700 @@ -449,7 +449,7 @@ @@ -568,7 +613,8 @@ Index: mm1-2.6.7-rc3/arch/sparc/kernel/irq.c action->next = NULL; action->dev_id = dev_id; Index: mm1-2.6.7-rc3/arch/sparc/kernel/sun4d_irq.c -=================================--- mm1-2.6.7-rc3.orig/arch/sparc/kernel/sun4d_irq.c 2004-06-07 12:13:34.000000000 -0700 +=================================================================== +--- mm1-2.6.7-rc3.orig/arch/sparc/kernel/sun4d_irq.c 2004-06-07 12:13:34.000000000 -0700 +++ mm1-2.6.7-rc3/arch/sparc/kernel/sun4d_irq.c 2004-06-09 10:40:14.477834000 -0700 @@ -336,7 +336,7 @@ @@ -580,7 +626,8 @@ Index: mm1-2.6.7-rc3/arch/sparc/kernel/sun4d_irq.c action->next = NULL; action->dev_id = dev_id; Index: mm1-2.6.7-rc3/arch/sparc64/kernel/irq.c -=================================--- mm1-2.6.7-rc3.orig/arch/sparc64/kernel/irq.c 2004-06-09 07:11:45.739451000 -0700 +=================================================================== +--- mm1-2.6.7-rc3.orig/arch/sparc64/kernel/irq.c 2004-06-09 07:11:45.739451000 -0700 +++ mm1-2.6.7-rc3/arch/sparc64/kernel/irq.c 2004-06-09 10:55:57.626454000 -0700 @@ -118,10 +118,6 @@ action->flags |= __irq_ino(irq) << 48; @@ -721,7 +768,8 @@ Index: mm1-2.6.7-rc3/arch/sparc64/kernel/irq.c set_intr_affinity(irq, new_value); Index: mm1-2.6.7-rc3/arch/sparc64/kernel/smp.c -=================================--- mm1-2.6.7-rc3.orig/arch/sparc64/kernel/smp.c 2004-06-09 07:11:49.087942000 -0700 +=================================================================== +--- mm1-2.6.7-rc3.orig/arch/sparc64/kernel/smp.c 2004-06-09 07:11:49.087942000 -0700 +++ mm1-2.6.7-rc3/arch/sparc64/kernel/smp.c 2004-06-09 10:40:14.539825000 -0700 @@ -414,9 +414,6 @@ * packet, but we have no use for that. However we do take advantage of @@ -734,7 +782,8 @@ Index: mm1-2.6.7-rc3/arch/sparc64/kernel/smp.c { u64 pstate, ver; Index: mm1-2.6.7-rc3/arch/um/kernel/irq.c -=================================--- mm1-2.6.7-rc3.orig/arch/um/kernel/irq.c 2004-06-07 12:14:56.000000000 -0700 +=================================================================== +--- mm1-2.6.7-rc3.orig/arch/um/kernel/irq.c 2004-06-07 12:14:56.000000000 -0700 +++ mm1-2.6.7-rc3/arch/um/kernel/irq.c 2004-06-09 10:40:14.575819000 -0700 @@ -419,7 +419,7 @@ @@ -746,7 +795,8 @@ Index: mm1-2.6.7-rc3/arch/um/kernel/irq.c action->next = NULL; action->dev_id = dev_id; Index: mm1-2.6.7-rc3/arch/v850/kernel/irq.c -=================================--- mm1-2.6.7-rc3.orig/arch/v850/kernel/irq.c 2004-06-07 12:14:56.000000000 -0700 +=================================================================== +--- mm1-2.6.7-rc3.orig/arch/v850/kernel/irq.c 2004-06-07 12:14:56.000000000 -0700 +++ mm1-2.6.7-rc3/arch/v850/kernel/irq.c 2004-06-09 10:40:14.611814000 -0700 @@ -392,7 +392,7 @@ @@ -758,7 +808,8 @@ Index: mm1-2.6.7-rc3/arch/v850/kernel/irq.c action->next = NULL; action->dev_id = dev_id; Index: mm1-2.6.7-rc3/arch/v850/kernel/time.c -=================================--- mm1-2.6.7-rc3.orig/arch/v850/kernel/time.c 2004-06-07 12:14:42.000000000 -0700 +=================================================================== +--- mm1-2.6.7-rc3.orig/arch/v850/kernel/time.c 2004-06-07 12:14:42.000000000 -0700 +++ mm1-2.6.7-rc3/arch/v850/kernel/time.c 2004-06-09 10:40:14.628811000 -0700 @@ -203,7 +203,7 @@ static struct irqaction timer_irqaction = { @@ -770,7 +821,8 @@ Index: mm1-2.6.7-rc3/arch/v850/kernel/time.c &timer_dev_id, NULL Index: mm1-2.6.7-rc3/arch/v850/kernel/fpga85e2c.c -=================================--- mm1-2.6.7-rc3.orig/arch/v850/kernel/fpga85e2c.c 2004-06-07 12:14:58.000000000 -0700 +=================================================================== +--- mm1-2.6.7-rc3.orig/arch/v850/kernel/fpga85e2c.c 2004-06-07 12:14:58.000000000 -0700 +++ mm1-2.6.7-rc3/arch/v850/kernel/fpga85e2c.c 2004-06-09 10:40:14.642809000 -0700 @@ -168,5 +168,5 @@ @@ -780,7 +832,8 @@ Index: mm1-2.6.7-rc3/arch/v850/kernel/fpga85e2c.c + make_reg_snap, 0, CPU_MASK_NONE, "reg_snap", ®_snap_dev_id, 0 }; Index: mm1-2.6.7-rc3/arch/x86_64/kernel/irq.c -=================================--- mm1-2.6.7-rc3.orig/arch/x86_64/kernel/irq.c 2004-06-09 07:10:24.000000000 -0700 +=================================================================== +--- mm1-2.6.7-rc3.orig/arch/x86_64/kernel/irq.c 2004-06-09 07:10:24.000000000 -0700 +++ mm1-2.6.7-rc3/arch/x86_64/kernel/irq.c 2004-06-09 10:40:14.688802000 -0700 @@ -491,7 +491,7 @@ @@ -792,7 +845,8 @@ Index: mm1-2.6.7-rc3/arch/x86_64/kernel/irq.c action->next = NULL; action->dev_id = dev_id; Index: mm1-2.6.7-rc3/arch/x86_64/kernel/i8259.c -=================================--- mm1-2.6.7-rc3.orig/arch/x86_64/kernel/i8259.c 2004-06-09 07:11:50.439737000 -0700 +=================================================================== +--- mm1-2.6.7-rc3.orig/arch/x86_64/kernel/i8259.c 2004-06-09 07:11:50.439737000 -0700 +++ mm1-2.6.7-rc3/arch/x86_64/kernel/i8259.c 2004-06-09 10:40:14.701800000 -0700 @@ -390,7 +390,7 @@ * IRQ2 is cascade interrupt to second interrupt controller @@ -804,7 +858,8 @@ Index: mm1-2.6.7-rc3/arch/x86_64/kernel/i8259.c void __init init_ISA_irqs (void) { Index: mm1-2.6.7-rc3/arch/x86_64/kernel/time.c -=================================--- mm1-2.6.7-rc3.orig/arch/x86_64/kernel/time.c 2004-06-07 12:14:42.000000000 -0700 +=================================================================== +--- mm1-2.6.7-rc3.orig/arch/x86_64/kernel/time.c 2004-06-07 12:14:42.000000000 -0700 +++ mm1-2.6.7-rc3/arch/x86_64/kernel/time.c 2004-06-09 10:40:14.736795000 -0700 @@ -689,7 +689,7 @@ } diff --git a/a/content_digest b/N1/content_digest index 0dc1ba6..0d87757 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020040609015001.31d249ca.akpm@osdl.org\0" "From\0William Lee Irwin III <wli@holomorphy.com>\0" "Subject\0Re: 2.6.7-rc3-mm1\0" - "Date\0Wed, 09 Jun 2004 17:59:10 +0000\0" + "Date\0Wed, 9 Jun 2004 10:59:10 -0700\0" "To\0Andrew Morton <akpm@osdl.org>\0" "Cc\0linux-kernel@vger.kernel.org" " sparclinux@vger.kernel.org\0" @@ -26,7 +26,8 @@ "-- wli\n" "\n" "Index: mm1-2.6.7-rc3/include/linux/interrupt.h\n" - "=================================--- mm1-2.6.7-rc3.orig/include/linux/interrupt.h\t2004-06-07 12:14:25.000000000 -0700\n" + "===================================================================\n" + "--- mm1-2.6.7-rc3.orig/include/linux/interrupt.h\t2004-06-07 12:14:25.000000000 -0700\n" "+++ mm1-2.6.7-rc3/include/linux/interrupt.h\t2004-06-09 10:40:12.684107000 -0700\n" "@@ -7,6 +7,7 @@\n" " #include <linux/linkage.h>\n" @@ -46,7 +47,8 @@ " \tvoid *dev_id;\n" " \tstruct irqaction *next;\n" "Index: mm1-2.6.7-rc3/include/linux/cpumask.h\n" - "=================================--- mm1-2.6.7-rc3.orig/include/linux/cpumask.h\t2004-06-09 07:11:49.439889000 -0700\n" + "===================================================================\n" + "--- mm1-2.6.7-rc3.orig/include/linux/cpumask.h\t2004-06-09 07:11:49.439889000 -0700\n" "+++ mm1-2.6.7-rc3/include/linux/cpumask.h\t2004-06-09 10:44:34.137360000 -0700\n" "@@ -248,9 +248,9 @@\n" " #endif\n" @@ -61,7 +63,8 @@ " #define cpus_addr(src) ((src).bits)\n" " \n" "Index: mm1-2.6.7-rc3/arch/ppc/kernel/irq.c\n" - "=================================--- mm1-2.6.7-rc3.orig/arch/ppc/kernel/irq.c\t2004-06-07 12:14:56.000000000 -0700\n" + "===================================================================\n" + "--- mm1-2.6.7-rc3.orig/arch/ppc/kernel/irq.c\t2004-06-07 12:14:56.000000000 -0700\n" "+++ mm1-2.6.7-rc3/arch/ppc/kernel/irq.c\t2004-06-09 10:40:12.760095000 -0700\n" "@@ -241,7 +241,7 @@\n" " \n" @@ -73,7 +76,8 @@ " \taction->dev_id = dev_id;\n" " \taction->next = NULL;\n" "Index: mm1-2.6.7-rc3/arch/alpha/kernel/irq.c\n" - "=================================--- mm1-2.6.7-rc3.orig/arch/alpha/kernel/irq.c\t2004-06-07 12:14:56.000000000 -0700\n" + "===================================================================\n" + "--- mm1-2.6.7-rc3.orig/arch/alpha/kernel/irq.c\t2004-06-07 12:14:56.000000000 -0700\n" "+++ mm1-2.6.7-rc3/arch/alpha/kernel/irq.c\t2004-06-09 10:40:12.844083000 -0700\n" "@@ -457,7 +457,7 @@\n" " \n" @@ -85,7 +89,8 @@ " \taction->next = NULL;\n" " \taction->dev_id = dev_id;\n" "Index: mm1-2.6.7-rc3/arch/arm/kernel/irq.c\n" - "=================================--- mm1-2.6.7-rc3.orig/arch/arm/kernel/irq.c\t2004-06-07 12:13:34.000000000 -0700\n" + "===================================================================\n" + "--- mm1-2.6.7-rc3.orig/arch/arm/kernel/irq.c\t2004-06-07 12:13:34.000000000 -0700\n" "+++ mm1-2.6.7-rc3/arch/arm/kernel/irq.c\t2004-06-09 10:40:12.895075000 -0700\n" "@@ -674,7 +674,7 @@\n" " \n" @@ -97,7 +102,8 @@ " \taction->next = NULL;\n" " \taction->dev_id = dev_id;\n" "Index: mm1-2.6.7-rc3/arch/arm/mach-clps7500/core.c\n" - "=================================--- mm1-2.6.7-rc3.orig/arch/arm/mach-clps7500/core.c\t2004-06-07 12:14:33.000000000 -0700\n" + "===================================================================\n" + "--- mm1-2.6.7-rc3.orig/arch/arm/mach-clps7500/core.c\t2004-06-07 12:14:33.000000000 -0700\n" "+++ mm1-2.6.7-rc3/arch/arm/mach-clps7500/core.c\t2004-06-09 10:40:12.944067000 -0700\n" "@@ -187,7 +187,7 @@\n" " \t.unmask\t= cl7500_no_action,\n" @@ -109,7 +115,8 @@ " static void __init clps7500_init_irq(void)\n" " {\n" "Index: mm1-2.6.7-rc3/arch/arm26/kernel/irq.c\n" - "=================================--- mm1-2.6.7-rc3.orig/arch/arm26/kernel/irq.c\t2004-06-07 12:14:58.000000000 -0700\n" + "===================================================================\n" + "--- mm1-2.6.7-rc3.orig/arch/arm26/kernel/irq.c\t2004-06-07 12:14:58.000000000 -0700\n" "+++ mm1-2.6.7-rc3/arch/arm26/kernel/irq.c\t2004-06-09 10:40:13.024055000 -0700\n" "@@ -549,7 +549,7 @@\n" " \n" @@ -121,7 +128,8 @@ " \taction->next = NULL;\n" " \taction->dev_id = dev_id;\n" "Index: mm1-2.6.7-rc3/arch/cris/kernel/irq.c\n" - "=================================--- mm1-2.6.7-rc3.orig/arch/cris/kernel/irq.c\t2004-06-07 12:15:12.000000000 -0700\n" + "===================================================================\n" + "--- mm1-2.6.7-rc3.orig/arch/cris/kernel/irq.c\t2004-06-07 12:15:12.000000000 -0700\n" "+++ mm1-2.6.7-rc3/arch/cris/kernel/irq.c\t2004-06-09 10:40:13.065049000 -0700\n" "@@ -240,7 +240,7 @@\n" " \n" @@ -133,7 +141,8 @@ " \taction->next = NULL;\n" " \taction->dev_id = dev_id;\n" "Index: mm1-2.6.7-rc3/arch/cris/arch-v10/kernel/time.c\n" - "=================================--- mm1-2.6.7-rc3.orig/arch/cris/arch-v10/kernel/time.c\t2004-06-07 12:14:42.000000000 -0700\n" + "===================================================================\n" + "--- mm1-2.6.7-rc3.orig/arch/cris/arch-v10/kernel/time.c\t2004-06-07 12:14:42.000000000 -0700\n" "+++ mm1-2.6.7-rc3/arch/cris/arch-v10/kernel/time.c\t2004-06-09 10:40:13.155035000 -0700\n" "@@ -253,7 +253,7 @@\n" " */\n" @@ -145,7 +154,8 @@ " void __init\n" " time_init(void)\n" "Index: mm1-2.6.7-rc3/arch/i386/kernel/irq.c\n" - "=================================--- mm1-2.6.7-rc3.orig/arch/i386/kernel/irq.c\t2004-06-09 07:10:49.966930000 -0700\n" + "===================================================================\n" + "--- mm1-2.6.7-rc3.orig/arch/i386/kernel/irq.c\t2004-06-09 07:10:49.966930000 -0700\n" "+++ mm1-2.6.7-rc3/arch/i386/kernel/irq.c\t2004-06-09 10:40:13.221025000 -0700\n" "@@ -654,7 +654,7 @@\n" " \n" @@ -157,7 +167,8 @@ " \taction->next = NULL;\n" " \taction->dev_id = dev_id;\n" "Index: mm1-2.6.7-rc3/arch/i386/kernel/i8259.c\n" - "=================================--- mm1-2.6.7-rc3.orig/arch/i386/kernel/i8259.c\t2004-06-09 07:11:34.007235000 -0700\n" + "===================================================================\n" + "--- mm1-2.6.7-rc3.orig/arch/i386/kernel/i8259.c\t2004-06-09 07:11:34.007235000 -0700\n" "+++ mm1-2.6.7-rc3/arch/i386/kernel/i8259.c\t2004-06-09 10:40:13.230024000 -0700\n" "@@ -333,7 +333,7 @@\n" " * New motherboards sometimes make IRQ 13 be a PCI interrupt,\n" @@ -169,7 +180,8 @@ " void __init init_ISA_irqs (void)\n" " {\n" "Index: mm1-2.6.7-rc3/arch/i386/mach-default/setup.c\n" - "=================================--- mm1-2.6.7-rc3.orig/arch/i386/mach-default/setup.c\t2004-06-07 12:14:05.000000000 -0700\n" + "===================================================================\n" + "--- mm1-2.6.7-rc3.orig/arch/i386/mach-default/setup.c\t2004-06-07 12:14:05.000000000 -0700\n" "+++ mm1-2.6.7-rc3/arch/i386/mach-default/setup.c\t2004-06-09 10:40:13.267018000 -0700\n" "@@ -27,7 +27,7 @@\n" " /*\n" @@ -190,7 +202,8 @@ " /**\n" " * time_init_hook - do any specific initialisations for the system timer.\n" "Index: mm1-2.6.7-rc3/arch/i386/mach-pc9800/setup.c\n" - "=================================--- mm1-2.6.7-rc3.orig/arch/i386/mach-pc9800/setup.c\t2004-06-07 12:13:34.000000000 -0700\n" + "===================================================================\n" + "--- mm1-2.6.7-rc3.orig/arch/i386/mach-pc9800/setup.c\t2004-06-07 12:13:34.000000000 -0700\n" "+++ mm1-2.6.7-rc3/arch/i386/mach-pc9800/setup.c\t2004-06-09 10:40:13.287015000 -0700\n" "@@ -34,7 +34,7 @@\n" " /*\n" @@ -211,7 +224,8 @@ " /**\n" " * time_init_hook - do any specific initialisations for the system timer.\n" "Index: mm1-2.6.7-rc3/arch/ia64/kernel/irq.c\n" - "=================================--- mm1-2.6.7-rc3.orig/arch/ia64/kernel/irq.c\t2004-06-09 07:10:24.000000000 -0700\n" + "===================================================================\n" + "--- mm1-2.6.7-rc3.orig/arch/ia64/kernel/irq.c\t2004-06-09 07:10:24.000000000 -0700\n" "+++ mm1-2.6.7-rc3/arch/ia64/kernel/irq.c\t2004-06-09 10:40:13.355005000 -0700\n" "@@ -612,7 +612,7 @@\n" " \n" @@ -223,7 +237,8 @@ " \taction->next = NULL;\n" " \taction->dev_id = dev_id;\n" "Index: mm1-2.6.7-rc3/arch/ia64/lib/kgdb_serial.c\n" - "=================================--- mm1-2.6.7-rc3.orig/arch/ia64/lib/kgdb_serial.c\t2004-06-09 07:10:25.000000000 -0700\n" + "===================================================================\n" + "--- mm1-2.6.7-rc3.orig/arch/ia64/lib/kgdb_serial.c\t2004-06-09 07:10:25.000000000 -0700\n" "+++ mm1-2.6.7-rc3/arch/ia64/lib/kgdb_serial.c\t2004-06-09 10:40:13.429993000 -0700\n" "@@ -486,7 +486,7 @@\n" " \t\tirq_desc_t *desc;\n" @@ -235,7 +250,8 @@ " \t\tkgdb_action.next = NULL;\n" " \t\tkgdb_action.dev_id = NULL;\n" "Index: mm1-2.6.7-rc3/arch/mips/baget/irq.c\n" - "=================================--- mm1-2.6.7-rc3.orig/arch/mips/baget/irq.c\t2004-06-07 12:14:42.000000000 -0700\n" + "===================================================================\n" + "--- mm1-2.6.7-rc3.orig/arch/mips/baget/irq.c\t2004-06-07 12:14:42.000000000 -0700\n" "+++ mm1-2.6.7-rc3/arch/mips/baget/irq.c\t2004-06-09 10:40:13.512981000 -0700\n" "@@ -325,7 +325,7 @@\n" " \n" @@ -249,24 +265,28 @@ "@@ -389,7 +389,7 @@\n" " }\n" " \n" - " static struct irqaction irq0 -{ write_err_interrupt, SA_INTERRUPT, 0, \"bus write error\", NULL, NULL};\n" + " static struct irqaction irq0 =\n" + "-{ write_err_interrupt, SA_INTERRUPT, 0, \"bus write error\", NULL, NULL};\n" "+{ write_err_interrupt, SA_INTERRUPT, CPU_MASK_NONE, \"bus write error\", NULL, NULL};\n" " \n" " void __init init_IRQ(void)\n" " {\n" "Index: mm1-2.6.7-rc3/arch/mips/baget/time.c\n" - "=================================--- mm1-2.6.7-rc3.orig/arch/mips/baget/time.c\t2004-06-07 12:13:34.000000000 -0700\n" + "===================================================================\n" + "--- mm1-2.6.7-rc3.orig/arch/mips/baget/time.c\t2004-06-07 12:13:34.000000000 -0700\n" "+++ mm1-2.6.7-rc3/arch/mips/baget/time.c\t2004-06-09 10:40:13.545976000 -0700\n" "@@ -67,7 +67,7 @@\n" " }\n" " \n" - " static struct irqaction timer_irq -{ timer_interrupt, SA_INTERRUPT, 0, \"timer\", NULL, NULL};\n" + " static struct irqaction timer_irq =\n" + "-{ timer_interrupt, SA_INTERRUPT, 0, \"timer\", NULL, NULL};\n" "+{ timer_interrupt, SA_INTERRUPT, CPU_MASK_NONE, \"timer\", NULL, NULL};\n" " \n" " void __init time_init(void)\n" " {\n" "Index: mm1-2.6.7-rc3/arch/mips/kernel/irq.c\n" - "=================================--- mm1-2.6.7-rc3.orig/arch/mips/kernel/irq.c\t2004-06-07 12:13:39.000000000 -0700\n" + "===================================================================\n" + "--- mm1-2.6.7-rc3.orig/arch/mips/kernel/irq.c\t2004-06-07 12:13:39.000000000 -0700\n" "+++ mm1-2.6.7-rc3/arch/mips/kernel/irq.c\t2004-06-09 10:40:13.578971000 -0700\n" "@@ -487,7 +487,7 @@\n" " \n" @@ -278,20 +298,24 @@ " \taction->next = NULL;\n" " \taction->dev_id = dev_id;\n" "Index: mm1-2.6.7-rc3/arch/mips/vr4181/common/irq.c\n" - "=================================--- mm1-2.6.7-rc3.orig/arch/mips/vr4181/common/irq.c\t2004-06-07 12:15:11.000000000 -0700\n" + "===================================================================\n" + "--- mm1-2.6.7-rc3.orig/arch/mips/vr4181/common/irq.c\t2004-06-07 12:15:11.000000000 -0700\n" "+++ mm1-2.6.7-rc3/arch/mips/vr4181/common/irq.c\t2004-06-09 10:40:13.634962000 -0700\n" "@@ -180,9 +180,9 @@\n" " extern void mips_cpu_irq_init(u32 irq_base);\n" " \n" - " static struct irqaction cascade -\t{ no_action, SA_INTERRUPT, 0, \"cascade\", NULL, NULL };\n" + " static struct irqaction cascade =\n" + "-\t{ no_action, SA_INTERRUPT, 0, \"cascade\", NULL, NULL };\n" "+\t{ no_action, SA_INTERRUPT, CPU_MASK_NONE, \"cascade\", NULL, NULL };\n" - " static struct irqaction reserved -\t{ no_action, SA_INTERRUPT, 0, \"cascade\", NULL, NULL };\n" + " static struct irqaction reserved =\n" + "-\t{ no_action, SA_INTERRUPT, 0, \"cascade\", NULL, NULL };\n" "+\t{ no_action, SA_INTERRUPT, CPU_MASK_NONE, \"cascade\", NULL, NULL };\n" " \n" " void __init init_IRQ(void)\n" " {\n" "Index: mm1-2.6.7-rc3/arch/mips/gt64120/common/time.c\n" - "=================================--- mm1-2.6.7-rc3.orig/arch/mips/gt64120/common/time.c\t2004-06-07 12:14:58.000000000 -0700\n" + "===================================================================\n" + "--- mm1-2.6.7-rc3.orig/arch/mips/gt64120/common/time.c\t2004-06-07 12:14:58.000000000 -0700\n" "+++ mm1-2.6.7-rc3/arch/mips/gt64120/common/time.c\t2004-06-09 10:40:13.676956000 -0700\n" "@@ -80,7 +80,7 @@\n" " \ttimer.name = \"timer\";\n" @@ -303,7 +327,8 @@ " \n" " \tenable_irq(GT_TIMER);\n" "Index: mm1-2.6.7-rc3/arch/mips/vr41xx/common/giu.c\n" - "=================================--- mm1-2.6.7-rc3.orig/arch/mips/vr41xx/common/giu.c\t2004-06-07 12:13:38.000000000 -0700\n" + "===================================================================\n" + "--- mm1-2.6.7-rc3.orig/arch/mips/vr41xx/common/giu.c\t2004-06-07 12:13:38.000000000 -0700\n" "+++ mm1-2.6.7-rc3/arch/mips/vr41xx/common/giu.c\t2004-06-09 10:40:13.722949000 -0700\n" "@@ -209,7 +209,7 @@\n" " };\n" @@ -315,11 +340,12 @@ " static int no_irq_number(int irq)\n" " {\n" "Index: mm1-2.6.7-rc3/arch/mips/vr41xx/common/icu.c\n" - "=================================--- mm1-2.6.7-rc3.orig/arch/mips/vr41xx/common/icu.c\t2004-06-07 12:13:35.000000000 -0700\n" + "===================================================================\n" + "--- mm1-2.6.7-rc3.orig/arch/mips/vr41xx/common/icu.c\t2004-06-07 12:13:35.000000000 -0700\n" "+++ mm1-2.6.7-rc3/arch/mips/vr41xx/common/icu.c\t2004-06-09 10:40:13.738946000 -0700\n" "@@ -288,7 +288,7 @@\n" " \n" - " /*====================================*/\n" + " /*=======================================================================*/\n" " \n" "-static struct irqaction icu_cascade = {no_action, 0, 0, \"cascade\", NULL, NULL};\n" "+static struct irqaction icu_cascade = {no_action, 0, CPU_MASK_NONE, \"cascade\", NULL, NULL};\n" @@ -327,7 +353,8 @@ " static void __init vr41xx_icu_init(void)\n" " {\n" "Index: mm1-2.6.7-rc3/arch/mips/momentum/jaguar_atx/irq.c\n" - "=================================--- mm1-2.6.7-rc3.orig/arch/mips/momentum/jaguar_atx/irq.c\t2004-06-07 12:14:34.000000000 -0700\n" + "===================================================================\n" + "--- mm1-2.6.7-rc3.orig/arch/mips/momentum/jaguar_atx/irq.c\t2004-06-07 12:14:34.000000000 -0700\n" "+++ mm1-2.6.7-rc3/arch/mips/momentum/jaguar_atx/irq.c\t2004-06-09 10:40:13.781940000 -0700\n" "@@ -42,7 +42,7 @@\n" " extern asmlinkage void jaguar_handle_int(void);\n" @@ -339,7 +366,8 @@ " \n" " void __init init_IRQ(void)\n" "Index: mm1-2.6.7-rc3/arch/mips/momentum/ocelot_c/irq.c\n" - "=================================--- mm1-2.6.7-rc3.orig/arch/mips/momentum/ocelot_c/irq.c\t2004-06-07 12:14:56.000000000 -0700\n" + "===================================================================\n" + "--- mm1-2.6.7-rc3.orig/arch/mips/momentum/ocelot_c/irq.c\t2004-06-07 12:14:56.000000000 -0700\n" "+++ mm1-2.6.7-rc3/arch/mips/momentum/ocelot_c/irq.c\t2004-06-09 10:40:13.806936000 -0700\n" "@@ -53,11 +53,11 @@\n" " extern void cpci_irq_init(void);\n" @@ -356,7 +384,8 @@ " \n" " void __init init_IRQ(void)\n" "Index: mm1-2.6.7-rc3/arch/mips/jmr3927/rbhma3100/irq.c\n" - "=================================--- mm1-2.6.7-rc3.orig/arch/mips/jmr3927/rbhma3100/irq.c\t2004-06-07 12:14:10.000000000 -0700\n" + "===================================================================\n" + "--- mm1-2.6.7-rc3.orig/arch/mips/jmr3927/rbhma3100/irq.c\t2004-06-07 12:14:10.000000000 -0700\n" "+++ mm1-2.6.7-rc3/arch/mips/jmr3927/rbhma3100/irq.c\t2004-06-09 10:40:13.850929000 -0700\n" "@@ -301,7 +301,7 @@\n" " }\n" @@ -395,7 +424,8 @@ " \n" " int jmr3927_ether1_irq = 0;\n" "Index: mm1-2.6.7-rc3/arch/mips/ddb5xxx/ddb5074/irq.c\n" - "=================================--- mm1-2.6.7-rc3.orig/arch/mips/ddb5xxx/ddb5074/irq.c\t2004-06-07 12:15:11.000000000 -0700\n" + "===================================================================\n" + "--- mm1-2.6.7-rc3.orig/arch/mips/ddb5xxx/ddb5074/irq.c\t2004-06-07 12:15:11.000000000 -0700\n" "+++ mm1-2.6.7-rc3/arch/mips/ddb5xxx/ddb5074/irq.c\t2004-06-09 10:40:13.880925000 -0700\n" "@@ -24,7 +24,7 @@\n" " \n" @@ -407,7 +437,8 @@ " #define M1543_PNP_CONFIG\t0x03f0\t/* PnP Config Port */\n" " #define M1543_PNP_INDEX\t\t0x03f0\t/* PnP Index Port */\n" "Index: mm1-2.6.7-rc3/arch/mips/ddb5xxx/ddb5477/irq.c\n" - "=================================--- mm1-2.6.7-rc3.orig/arch/mips/ddb5xxx/ddb5477/irq.c\t2004-06-07 12:13:39.000000000 -0700\n" + "===================================================================\n" + "--- mm1-2.6.7-rc3.orig/arch/mips/ddb5xxx/ddb5477/irq.c\t2004-06-07 12:13:39.000000000 -0700\n" "+++ mm1-2.6.7-rc3/arch/mips/ddb5xxx/ddb5477/irq.c\t2004-06-09 10:40:13.901922000 -0700\n" "@@ -77,7 +77,7 @@\n" " extern void mips_cpu_irq_init(u32 base);\n" @@ -419,7 +450,8 @@ " void\n" " ddb5477_irq_setup(void)\n" "Index: mm1-2.6.7-rc3/arch/mips/ddb5xxx/ddb5476/irq.c\n" - "=================================--- mm1-2.6.7-rc3.orig/arch/mips/ddb5xxx/ddb5476/irq.c\t2004-06-07 12:14:57.000000000 -0700\n" + "===================================================================\n" + "--- mm1-2.6.7-rc3.orig/arch/mips/ddb5xxx/ddb5476/irq.c\t2004-06-07 12:14:57.000000000 -0700\n" "+++ mm1-2.6.7-rc3/arch/mips/ddb5xxx/ddb5476/irq.c\t2004-06-09 10:40:13.924918000 -0700\n" "@@ -107,8 +107,8 @@\n" " \t/* memory resource acquire in ddb_setup */\n" @@ -433,7 +465,8 @@ " extern asmlinkage void ddb5476_handle_int(void);\n" " extern int setup_irq(unsigned int irq, struct irqaction *irqaction);\n" "Index: mm1-2.6.7-rc3/arch/mips/sibyte/sb1250/irq.c\n" - "=================================--- mm1-2.6.7-rc3.orig/arch/mips/sibyte/sb1250/irq.c\t2004-06-07 12:14:59.000000000 -0700\n" + "===================================================================\n" + "--- mm1-2.6.7-rc3.orig/arch/mips/sibyte/sb1250/irq.c\t2004-06-07 12:14:59.000000000 -0700\n" "+++ mm1-2.6.7-rc3/arch/mips/sibyte/sb1250/irq.c\t2004-06-09 10:40:13.969911000 -0700\n" "@@ -279,7 +279,7 @@\n" " static struct irqaction sb1250_dummy_action = {\n" @@ -445,7 +478,8 @@ " \t.next = NULL,\n" " \t.dev_id = 0\n" "Index: mm1-2.6.7-rc3/arch/mips/tx4927/common/tx4927_irq.c\n" - "=================================--- mm1-2.6.7-rc3.orig/arch/mips/tx4927/common/tx4927_irq.c\t2004-06-07 12:15:11.000000000 -0700\n" + "===================================================================\n" + "--- mm1-2.6.7-rc3.orig/arch/mips/tx4927/common/tx4927_irq.c\t2004-06-07 12:15:11.000000000 -0700\n" "+++ mm1-2.6.7-rc3/arch/mips/tx4927/common/tx4927_irq.c\t2004-06-09 10:40:14.010905000 -0700\n" "@@ -172,7 +172,7 @@\n" " \t.set_affinity\t= NULL\n" @@ -453,10 +487,12 @@ " \n" "-#define TX4927_PIC_ACTION(s) { no_action, 0, 0, s, NULL, NULL }\n" "+#define TX4927_PIC_ACTION(s) { no_action, 0, CPU_MASK_NONE, s, NULL, NULL }\n" - " static struct irqaction tx4927_irq_pic_action TX4927_PIC_ACTION(TX4927_PIC_NAME);\n" + " static struct irqaction tx4927_irq_pic_action =\n" + " TX4927_PIC_ACTION(TX4927_PIC_NAME);\n" " \n" "Index: mm1-2.6.7-rc3/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c\n" - "=================================--- mm1-2.6.7-rc3.orig/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c\t2004-06-07 12:14:04.000000000 -0700\n" + "===================================================================\n" + "--- mm1-2.6.7-rc3.orig/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c\t2004-06-07 12:14:04.000000000 -0700\n" "+++ mm1-2.6.7-rc3/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c\t2004-06-09 10:40:14.037901000 -0700\n" "@@ -337,8 +337,8 @@\n" " \treturn (sw_irq);\n" @@ -466,10 +502,12 @@ "-#define TOSHIBA_RBTX4927_PIC_ACTION(s) { no_action, SA_SHIRQ, 0, s, NULL, NULL }\n" "+//#define TOSHIBA_RBTX4927_PIC_ACTION(s) { no_action, 0, CPU_MASK_NONE, s, NULL, NULL }\n" "+#define TOSHIBA_RBTX4927_PIC_ACTION(s) { no_action, SA_SHIRQ, CPU_MASK_NONE, s, NULL, NULL }\n" - " static struct irqaction toshiba_rbtx4927_irq_ioc_action TOSHIBA_RBTX4927_PIC_ACTION(TOSHIBA_RBTX4927_IOC_NAME);\n" + " static struct irqaction toshiba_rbtx4927_irq_ioc_action =\n" + " TOSHIBA_RBTX4927_PIC_ACTION(TOSHIBA_RBTX4927_IOC_NAME);\n" " #ifdef CONFIG_TOSHIBA_FPCIB0\n" "Index: mm1-2.6.7-rc3/arch/mips/sgi-ip32/ip32-irq.c\n" - "=================================--- mm1-2.6.7-rc3.orig/arch/mips/sgi-ip32/ip32-irq.c\t2004-06-07 12:14:24.000000000 -0700\n" + "===================================================================\n" + "--- mm1-2.6.7-rc3.orig/arch/mips/sgi-ip32/ip32-irq.c\t2004-06-07 12:14:24.000000000 -0700\n" "+++ mm1-2.6.7-rc3/arch/mips/sgi-ip32/ip32-irq.c\t2004-06-09 10:40:14.082894000 -0700\n" "@@ -123,9 +123,9 @@\n" " \t\t\t\t struct pt_regs *regs);\n" @@ -484,7 +522,8 @@ " extern void ip32_handle_int(void);\n" " \n" "Index: mm1-2.6.7-rc3/arch/parisc/kernel/irq.c\n" - "=================================--- mm1-2.6.7-rc3.orig/arch/parisc/kernel/irq.c\t2004-06-07 12:14:05.000000000 -0700\n" + "===================================================================\n" + "--- mm1-2.6.7-rc3.orig/arch/parisc/kernel/irq.c\t2004-06-07 12:14:05.000000000 -0700\n" "+++ mm1-2.6.7-rc3/arch/parisc/kernel/irq.c\t2004-06-09 10:40:14.151884000 -0700\n" "@@ -644,7 +644,7 @@\n" " \n" @@ -496,7 +535,8 @@ " \taction->next = NULL;\n" " \taction->dev_id = dev_id;\n" "Index: mm1-2.6.7-rc3/arch/ppc64/kernel/irq.c\n" - "=================================--- mm1-2.6.7-rc3.orig/arch/ppc64/kernel/irq.c\t2004-06-09 07:11:49.715847000 -0700\n" + "===================================================================\n" + "--- mm1-2.6.7-rc3.orig/arch/ppc64/kernel/irq.c\t2004-06-09 07:11:49.715847000 -0700\n" "+++ mm1-2.6.7-rc3/arch/ppc64/kernel/irq.c\t2004-06-09 10:40:14.181879000 -0700\n" "@@ -206,7 +206,7 @@\n" " \n" @@ -508,7 +548,8 @@ " \taction->dev_id = dev_id;\n" " \taction->next = NULL;\n" "Index: mm1-2.6.7-rc3/arch/sh/kernel/irq.c\n" - "=================================--- mm1-2.6.7-rc3.orig/arch/sh/kernel/irq.c\t2004-06-07 12:14:05.000000000 -0700\n" + "===================================================================\n" + "--- mm1-2.6.7-rc3.orig/arch/sh/kernel/irq.c\t2004-06-07 12:14:05.000000000 -0700\n" "+++ mm1-2.6.7-rc3/arch/sh/kernel/irq.c\t2004-06-09 10:40:14.243870000 -0700\n" "@@ -436,7 +436,7 @@\n" " \n" @@ -520,7 +561,8 @@ " \taction->next = NULL;\n" " \taction->dev_id = dev_id;\n" "Index: mm1-2.6.7-rc3/arch/sh/kernel/time.c\n" - "=================================--- mm1-2.6.7-rc3.orig/arch/sh/kernel/time.c\t2004-06-07 12:13:34.000000000 -0700\n" + "===================================================================\n" + "--- mm1-2.6.7-rc3.orig/arch/sh/kernel/time.c\t2004-06-07 12:13:34.000000000 -0700\n" "+++ mm1-2.6.7-rc3/arch/sh/kernel/time.c\t2004-06-09 10:40:14.278864000 -0700\n" "@@ -391,7 +391,7 @@\n" " }\n" @@ -532,7 +574,8 @@ " void get_current_frequency_divisors(unsigned int *ifc, unsigned int *bfc, unsigned int *pfc)\n" " {\n" "Index: mm1-2.6.7-rc3/arch/sh/cchips/hd6446x/hd64465/setup.c\n" - "=================================--- mm1-2.6.7-rc3.orig/arch/sh/cchips/hd6446x/hd64465/setup.c\t2004-06-07 12:15:12.000000000 -0700\n" + "===================================================================\n" + "--- mm1-2.6.7-rc3.orig/arch/sh/cchips/hd6446x/hd64465/setup.c\t2004-06-07 12:15:12.000000000 -0700\n" "+++ mm1-2.6.7-rc3/arch/sh/cchips/hd6446x/hd64465/setup.c\t2004-06-09 10:40:14.334856000 -0700\n" "@@ -154,7 +154,7 @@\n" " \treturn irq;\n" @@ -544,7 +587,8 @@ " \n" " static int __init setup_hd64465(void)\n" "Index: mm1-2.6.7-rc3/arch/sh/cchips/hd6446x/hd64461/setup.c\n" - "=================================--- mm1-2.6.7-rc3.orig/arch/sh/cchips/hd6446x/hd64461/setup.c\t2004-06-07 12:14:56.000000000 -0700\n" + "===================================================================\n" + "--- mm1-2.6.7-rc3.orig/arch/sh/cchips/hd6446x/hd64461/setup.c\t2004-06-07 12:14:56.000000000 -0700\n" "+++ mm1-2.6.7-rc3/arch/sh/cchips/hd6446x/hd64461/setup.c\t2004-06-09 10:40:14.355853000 -0700\n" "@@ -134,7 +134,7 @@\n" " \treturn __irq_demux(irq);\n" @@ -556,7 +600,8 @@ " int __init setup_hd64461(void)\n" " {\n" "Index: mm1-2.6.7-rc3/arch/sparc/kernel/irq.c\n" - "=================================--- mm1-2.6.7-rc3.orig/arch/sparc/kernel/irq.c\t2004-06-07 12:13:36.000000000 -0700\n" + "===================================================================\n" + "--- mm1-2.6.7-rc3.orig/arch/sparc/kernel/irq.c\t2004-06-07 12:13:36.000000000 -0700\n" "+++ mm1-2.6.7-rc3/arch/sparc/kernel/irq.c\t2004-06-09 10:40:14.433841000 -0700\n" "@@ -449,7 +449,7 @@\n" " \n" @@ -577,7 +622,8 @@ " \taction->next = NULL;\n" " \taction->dev_id = dev_id;\n" "Index: mm1-2.6.7-rc3/arch/sparc/kernel/sun4d_irq.c\n" - "=================================--- mm1-2.6.7-rc3.orig/arch/sparc/kernel/sun4d_irq.c\t2004-06-07 12:13:34.000000000 -0700\n" + "===================================================================\n" + "--- mm1-2.6.7-rc3.orig/arch/sparc/kernel/sun4d_irq.c\t2004-06-07 12:13:34.000000000 -0700\n" "+++ mm1-2.6.7-rc3/arch/sparc/kernel/sun4d_irq.c\t2004-06-09 10:40:14.477834000 -0700\n" "@@ -336,7 +336,7 @@\n" " \n" @@ -589,7 +635,8 @@ " \taction->next = NULL;\n" " \taction->dev_id = dev_id;\n" "Index: mm1-2.6.7-rc3/arch/sparc64/kernel/irq.c\n" - "=================================--- mm1-2.6.7-rc3.orig/arch/sparc64/kernel/irq.c\t2004-06-09 07:11:45.739451000 -0700\n" + "===================================================================\n" + "--- mm1-2.6.7-rc3.orig/arch/sparc64/kernel/irq.c\t2004-06-09 07:11:45.739451000 -0700\n" "+++ mm1-2.6.7-rc3/arch/sparc64/kernel/irq.c\t2004-06-09 10:55:57.626454000 -0700\n" "@@ -118,10 +118,6 @@\n" " \t\taction->flags |= __irq_ino(irq) << 48;\n" @@ -730,7 +777,8 @@ " \n" " \tset_intr_affinity(irq, new_value);\n" "Index: mm1-2.6.7-rc3/arch/sparc64/kernel/smp.c\n" - "=================================--- mm1-2.6.7-rc3.orig/arch/sparc64/kernel/smp.c\t2004-06-09 07:11:49.087942000 -0700\n" + "===================================================================\n" + "--- mm1-2.6.7-rc3.orig/arch/sparc64/kernel/smp.c\t2004-06-09 07:11:49.087942000 -0700\n" "+++ mm1-2.6.7-rc3/arch/sparc64/kernel/smp.c\t2004-06-09 10:40:14.539825000 -0700\n" "@@ -414,9 +414,6 @@\n" " * packet, but we have no use for that. However we do take advantage of\n" @@ -743,7 +791,8 @@ " {\n" " \tu64 pstate, ver;\n" "Index: mm1-2.6.7-rc3/arch/um/kernel/irq.c\n" - "=================================--- mm1-2.6.7-rc3.orig/arch/um/kernel/irq.c\t2004-06-07 12:14:56.000000000 -0700\n" + "===================================================================\n" + "--- mm1-2.6.7-rc3.orig/arch/um/kernel/irq.c\t2004-06-07 12:14:56.000000000 -0700\n" "+++ mm1-2.6.7-rc3/arch/um/kernel/irq.c\t2004-06-09 10:40:14.575819000 -0700\n" "@@ -419,7 +419,7 @@\n" " \n" @@ -755,7 +804,8 @@ " \taction->next = NULL;\n" " \taction->dev_id = dev_id;\n" "Index: mm1-2.6.7-rc3/arch/v850/kernel/irq.c\n" - "=================================--- mm1-2.6.7-rc3.orig/arch/v850/kernel/irq.c\t2004-06-07 12:14:56.000000000 -0700\n" + "===================================================================\n" + "--- mm1-2.6.7-rc3.orig/arch/v850/kernel/irq.c\t2004-06-07 12:14:56.000000000 -0700\n" "+++ mm1-2.6.7-rc3/arch/v850/kernel/irq.c\t2004-06-09 10:40:14.611814000 -0700\n" "@@ -392,7 +392,7 @@\n" " \n" @@ -767,7 +817,8 @@ " \taction->next = NULL;\n" " \taction->dev_id = dev_id;\n" "Index: mm1-2.6.7-rc3/arch/v850/kernel/time.c\n" - "=================================--- mm1-2.6.7-rc3.orig/arch/v850/kernel/time.c\t2004-06-07 12:14:42.000000000 -0700\n" + "===================================================================\n" + "--- mm1-2.6.7-rc3.orig/arch/v850/kernel/time.c\t2004-06-07 12:14:42.000000000 -0700\n" "+++ mm1-2.6.7-rc3/arch/v850/kernel/time.c\t2004-06-09 10:40:14.628811000 -0700\n" "@@ -203,7 +203,7 @@\n" " static struct irqaction timer_irqaction = {\n" @@ -779,7 +830,8 @@ " \t&timer_dev_id,\n" " \tNULL\n" "Index: mm1-2.6.7-rc3/arch/v850/kernel/fpga85e2c.c\n" - "=================================--- mm1-2.6.7-rc3.orig/arch/v850/kernel/fpga85e2c.c\t2004-06-07 12:14:58.000000000 -0700\n" + "===================================================================\n" + "--- mm1-2.6.7-rc3.orig/arch/v850/kernel/fpga85e2c.c\t2004-06-07 12:14:58.000000000 -0700\n" "+++ mm1-2.6.7-rc3/arch/v850/kernel/fpga85e2c.c\t2004-06-09 10:40:14.642809000 -0700\n" "@@ -168,5 +168,5 @@\n" " \n" @@ -789,7 +841,8 @@ "+\tmake_reg_snap, 0, CPU_MASK_NONE, \"reg_snap\", ®_snap_dev_id, 0\n" " };\n" "Index: mm1-2.6.7-rc3/arch/x86_64/kernel/irq.c\n" - "=================================--- mm1-2.6.7-rc3.orig/arch/x86_64/kernel/irq.c\t2004-06-09 07:10:24.000000000 -0700\n" + "===================================================================\n" + "--- mm1-2.6.7-rc3.orig/arch/x86_64/kernel/irq.c\t2004-06-09 07:10:24.000000000 -0700\n" "+++ mm1-2.6.7-rc3/arch/x86_64/kernel/irq.c\t2004-06-09 10:40:14.688802000 -0700\n" "@@ -491,7 +491,7 @@\n" " \n" @@ -801,7 +854,8 @@ " \taction->next = NULL;\n" " \taction->dev_id = dev_id;\n" "Index: mm1-2.6.7-rc3/arch/x86_64/kernel/i8259.c\n" - "=================================--- mm1-2.6.7-rc3.orig/arch/x86_64/kernel/i8259.c\t2004-06-09 07:11:50.439737000 -0700\n" + "===================================================================\n" + "--- mm1-2.6.7-rc3.orig/arch/x86_64/kernel/i8259.c\t2004-06-09 07:11:50.439737000 -0700\n" "+++ mm1-2.6.7-rc3/arch/x86_64/kernel/i8259.c\t2004-06-09 10:40:14.701800000 -0700\n" "@@ -390,7 +390,7 @@\n" " * IRQ2 is cascade interrupt to second interrupt controller\n" @@ -813,7 +867,8 @@ " void __init init_ISA_irqs (void)\n" " {\n" "Index: mm1-2.6.7-rc3/arch/x86_64/kernel/time.c\n" - "=================================--- mm1-2.6.7-rc3.orig/arch/x86_64/kernel/time.c\t2004-06-07 12:14:42.000000000 -0700\n" + "===================================================================\n" + "--- mm1-2.6.7-rc3.orig/arch/x86_64/kernel/time.c\t2004-06-07 12:14:42.000000000 -0700\n" "+++ mm1-2.6.7-rc3/arch/x86_64/kernel/time.c\t2004-06-09 10:40:14.736795000 -0700\n" "@@ -689,7 +689,7 @@\n" " }\n" @@ -825,4 +880,4 @@ " \n" extern void __init config_acpi_tables(void); -ed2ddb7c68b6f186a5ac1d87d2b8caeec24fa4f62115fd9ea5b80d1a6ead2d94 +1035f784fcb9f89baabd00b33532c6795b0557788b7b4865d67950fb522965af
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.