fix offset changes in ia64-irq-affinity-upfix.patch

svn path=/dists/trunk/linux-2.6/; revision=4572
This commit is contained in:
dann frazier 2005-10-20 23:33:20 +00:00
parent 822253a0d8
commit ef74000e58
3 changed files with 7 additions and 12 deletions

View File

@ -3,10 +3,6 @@ Disabled because not applying cleanly, need investigating :
drivers-scsi-megaraid_splitup.patch
FAILS: 1 hunk (drivers/scsi/megaraid/Kconfig.megaraid)
ia64-irq-affinity-upfix.patch
FAILS 1 hunk (arch/ia64/kernel/irq.c)
remove-references-to-removed-drivers.patch
FAILS 1 hunk (drivers/usb/misc/Makefile)
@ -55,7 +51,7 @@ fs-asfs-2.patch
APPLIES Offset
ia64-irq-affinity-upfix.patch
FAILS 1 hunk (arch/ia64/kernel/irq.c)
APPLIES Offset
m68k-42_dma.patch
APPLIES Offset

View File

@ -2,14 +2,13 @@
## DP: Patch author: dann frazier <dannf@hp.com>
## DP: Upstream status: Submitted
#
diff -aurN a/arch/ia64/kernel/irq.c b/arch/ia64/kernel/irq.c
--- a/arch/ia64/kernel/irq.c 2005-06-06 11:22:29.000000000 -0400
+++ b/arch/ia64/kernel/irq.c 2005-06-15 22:13:24.000000000 -0400
@@ -141,7 +141,10 @@
--- linux-2.6-2.6.13/arch/ia64/kernel/irq.c~ 2005-10-20 17:28:56.000000000 -0600
+++ linux-2.6-2.6.13/arch/ia64/kernel/irq.c 2005-10-20 17:29:41.000000000 -0600
@@ -105,6 +105,11 @@
irq_redir[irq] = (char) (redir & 0xff);
}
}
-
+
+#else /* !CONFIG_SMP */
+void set_irq_affinity_info (unsigned int irq, int hwid, int redir)
+{

View File

@ -2,7 +2,7 @@
#+ drivers-scsi-megaraid_splitup.patch
+ fbdev-radeon-noaccel.patch
+ fs-asfs-2.patch
#+ ia64-irq-affinity-upfix.patch
+ ia64-irq-affinity-upfix.patch
#- m68k-42_dma.patch
#- m68k-sonic.patch
#+ m68k-arch.patch