Attachment 191881 Details for Bug 224373 – fixed patch for RHEL 5 2.6.18

[patch] fixed patch for RHEL 5 2.6.18

diff-rh.txt (text/plain), 6.22 KB, created by Ben Romer on 2007-09-10 19:19:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ben Romer

Created: 2007-09-10 19:19:29 UTC

Size: 6.22 KB

patch

obsolete

>diff -ur linux-2.6.18.x86_64.orig/arch/x86_64/kernel/io_apic.c linux-2.6.18.x86_64/arch/x86_64/kernel/io_apic.c
>--- linux-2.6.18.x86_64.orig/arch/x86_64/kernel/io_apic.c	2007-09-07 14:30:30.000000000 -0400
>+++ linux-2.6.18.x86_64/arch/x86_64/kernel/io_apic.c	2007-09-07 15:45:16.000000000 -0400
>@@ -908,7 +908,7 @@
> 		entry.delivery_mode = INT_DELIVERY_MODE;
> 		entry.dest_mode = INT_DEST_MODE;
> 		entry.mask = 0;				/* enable IRQ */
>-		entry.dest.logical.logical_dest = cpu_mask_to_apicid(TARGET_CPUS);
>+		entry.dest = cpu_mask_to_apicid(TARGET_CPUS);
> 
> 		idx = find_irq_entry(apic,pin,mp_INT);
> 		if (idx == -1) {
>@@ -926,7 +926,7 @@
> 		if (irq_trigger(idx)) {
> 			entry.trigger = 1;
> 			entry.mask = 1;
>-			entry.dest.logical.logical_dest = cpu_mask_to_apicid(TARGET_CPUS);
>+			entry.dest = cpu_mask_to_apicid(TARGET_CPUS);
> 		}
> 
> 		irq = pin_2_irq(idx, apic, pin);
>@@ -977,7 +977,7 @@
> 	 */
> 	entry.dest_mode = INT_DEST_MODE;
> 	entry.mask = 0;					/* unmask IRQ now */
>-	entry.dest.logical.logical_dest = cpu_mask_to_apicid(TARGET_CPUS);
>+	entry.dest = cpu_mask_to_apicid(TARGET_CPUS);
> 	entry.delivery_mode = INT_DELIVERY_MODE;
> 	entry.polarity = 0;
> 	entry.trigger = 0;
>@@ -1077,7 +1077,7 @@
> 
> 	printk(KERN_DEBUG ".... IRQ redirection table:\n");
> 
>-	printk(KERN_DEBUG " NR Log Phy Mask Trig IRR Pol"
>+	printk(KERN_DEBUG " NR Dst Mask Trig IRR Pol"
> 			  " Stat Dest Deli Vect:   \n");
> 
> 	for (i = 0; i <= reg_01.bits.entries; i++) {
>@@ -1088,10 +1088,9 @@
> 		*(((int *)&entry)+1) = io_apic_read(apic, 0x11+i*2);
> 		spin_unlock_irqrestore(&ioapic_lock, flags);
> 
>-		printk(KERN_DEBUG " %02x %03X %02X  ",
>+		printk(KERN_DEBUG " %02x %03X ",
> 			i,
>-			entry.dest.logical.logical_dest,
>-			entry.dest.physical.physical_dest
>+			entry.dest
> 		);
> 
> 		printk("%1d    %1d    %1d   %1d   %1d    %1d    %1d    %02X\n",
>@@ -1366,8 +1365,7 @@
> 		entry.dest_mode       = 0; /* Physical */
> 		entry.delivery_mode   = dest_ExtINT; /* ExtInt */
> 		entry.vector          = 0;
>-		entry.dest.physical.physical_dest =
>-					GET_APIC_ID(apic_read(APIC_ID));
>+		entry.dest            = GET_APIC_ID(apic_read(APIC_ID));
> 
> 		/*
> 		 * Add it to the IO-APIC irq-routing table:
>@@ -1778,7 +1776,7 @@
> 
> 	entry1.dest_mode = 0;			/* physical delivery */
> 	entry1.mask = 0;			/* unmask IRQ now */
>-	entry1.dest.physical.physical_dest = hard_smp_processor_id();
>+	entry1.dest = hard_smp_processor_id();
> 	entry1.delivery_mode = dest_ExtINT;
> 	entry1.polarity = entry0.polarity;
> 	entry1.trigger = 0;
>@@ -2124,7 +2122,7 @@
> 
> 	entry.delivery_mode = INT_DELIVERY_MODE;
> 	entry.dest_mode = INT_DEST_MODE;
>-	entry.dest.logical.logical_dest = cpu_mask_to_apicid(TARGET_CPUS);
>+	entry.dest = cpu_mask_to_apicid(TARGET_CPUS);
> 	entry.trigger = triggering;
> 	entry.polarity = polarity;
> 	entry.mask = 1;					 /* Disabled (masked) */
>diff -ur linux-2.6.18.x86_64.orig/arch/x86_64/kernel/io_apic-xen.c linux-2.6.18.x86_64/arch/x86_64/kernel/io_apic-xen.c
>--- linux-2.6.18.x86_64.orig/arch/x86_64/kernel/io_apic-xen.c	2007-09-07 14:30:30.000000000 -0400
>+++ linux-2.6.18.x86_64/arch/x86_64/kernel/io_apic-xen.c	2007-09-10 15:07:12.000000000 -0400
>@@ -956,7 +956,7 @@
> 		entry.delivery_mode = INT_DELIVERY_MODE;
> 		entry.dest_mode = INT_DEST_MODE;
> 		entry.mask = 0;				/* enable IRQ */
>-		entry.dest.logical.logical_dest = cpu_mask_to_apicid(TARGET_CPUS);
>+		entry.dest = cpu_mask_to_apicid(TARGET_CPUS);
> 
> 		idx = find_irq_entry(apic,pin,mp_INT);
> 		if (idx == -1) {
>@@ -974,7 +974,7 @@
> 		if (irq_trigger(idx)) {
> 			entry.trigger = 1;
> 			entry.mask = 1;
>-			entry.dest.logical.logical_dest = cpu_mask_to_apicid(TARGET_CPUS);
>+			entry.dest = cpu_mask_to_apicid(TARGET_CPUS);
> 		}
> 
> 		irq = pin_2_irq(idx, apic, pin);
>@@ -1026,7 +1026,7 @@
> 	 */
> 	entry.dest_mode = INT_DEST_MODE;
> 	entry.mask = 0;					/* unmask IRQ now */
>-	entry.dest.logical.logical_dest = cpu_mask_to_apicid(TARGET_CPUS);
>+	entry.dest = cpu_mask_to_apicid(TARGET_CPUS);
> 	entry.delivery_mode = INT_DELIVERY_MODE;
> 	entry.polarity = 0;
> 	entry.trigger = 0;
>@@ -1126,7 +1126,7 @@
> 
> 	printk(KERN_DEBUG ".... IRQ redirection table:\n");
> 
>-	printk(KERN_DEBUG " NR Log Phy Mask Trig IRR Pol"
>+	printk(KERN_DEBUG " NR Dst Mask Trig IRR Pol"
> 			  " Stat Dest Deli Vect:   \n");
> 
> 	for (i = 0; i <= reg_01.bits.entries; i++) {
>@@ -1137,10 +1137,9 @@
> 		*(((int *)&entry)+1) = io_apic_read(apic, 0x11+i*2);
> 		spin_unlock_irqrestore(&ioapic_lock, flags);
> 
>-		printk(KERN_DEBUG " %02x %03X %02X  ",
>+		printk(KERN_DEBUG " %02x %03X ",
> 			i,
>-			entry.dest.logical.logical_dest,
>-			entry.dest.physical.physical_dest
>+			entry.dest
> 		);
> 
> 		printk("%1d    %1d    %1d   %1d   %1d    %1d    %1d    %02X\n",
>@@ -1424,8 +1423,7 @@
> 		entry.dest_mode       = 0; /* Physical */
> 		entry.delivery_mode   = dest_ExtINT; /* ExtInt */
> 		entry.vector          = 0;
>-		entry.dest.physical.physical_dest =
>-					GET_APIC_ID(apic_read(APIC_ID));
>+		entry.dest            = GET_APIC_ID(apic_read(APIC_ID));
> 
> 		/*
> 		 * Add it to the IO-APIC irq-routing table:
>@@ -1846,7 +1844,7 @@
> 
> 	entry1.dest_mode = 0;			/* physical delivery */
> 	entry1.mask = 0;			/* unmask IRQ now */
>-	entry1.dest.physical.physical_dest = hard_smp_processor_id();
>+	entry1.dest = hard_smp_processor_id();
> 	entry1.delivery_mode = dest_ExtINT;
> 	entry1.polarity = entry0.polarity;
> 	entry1.trigger = 0;
>@@ -2198,7 +2196,7 @@
> 
> 	entry.delivery_mode = INT_DELIVERY_MODE;
> 	entry.dest_mode = INT_DEST_MODE;
>-	entry.dest.logical.logical_dest = cpu_mask_to_apicid(TARGET_CPUS);
>+	entry.dest = cpu_mask_to_apicid(TARGET_CPUS);
> 	entry.trigger = edge_level;
> 	entry.polarity = active_high_low;
> 	entry.mask = 1;					 /* Disabled (masked) */
>diff -ur linux-2.6.18.x86_64.orig/include/asm-x86_64/io_apic.h linux-2.6.18.x86_64/include/asm-x86_64/io_apic.h
>--- linux-2.6.18.x86_64.orig/include/asm-x86_64/io_apic.h	2007-09-07 14:30:38.000000000 -0400
>+++ linux-2.6.18.x86_64/include/asm-x86_64/io_apic.h	2007-09-07 14:34:50.000000000 -0400
>@@ -130,19 +130,8 @@
> 		trigger		:  1,	/* 0: edge, 1: level */
> 		mask		:  1,	/* 0: enabled, 1: disabled */
> 		__reserved_2	: 15;
>-
>-	union {		struct { __u32
>-					__reserved_1	: 24,
>-					physical_dest	:  4,
>-					__reserved_2	:  4;
>-			} physical;
>-
>-			struct { __u32
>-					__reserved_1	: 24,
>-					logical_dest	:  8;
>-			} logical;
>-	} dest;
>-
>+       __u32	__reserved_3	: 24,
>+		dest		: 8;
> } __attribute__ ((packed));
> 
> /*

Actions: View | Diff

Attachments on bug 224373: 146542 | 190441 | 191881 | 192911