# This is a BitKeeper generated diff -Nru style patch.
#
# include/asm-x86_64/hw_irq.h
#   2005/05/12 19:35:59-03:00 mikpe@user.it.uu.se +1 -1
#   x86_64 linkage error on UP_IOAPIC
# 
# ChangeSet
#   2005/05/13 10:22:15-03:00 willy@w.ods.org 
#   [PATCH] floppy typo fix
#   
#   just in case you release an -rc3, would you please include this typo fix
#   from Jurgen Quade. I have it in my tree since 2.4.23, it's a pure copy-paste
#   typo which causes the driver either to print an incomplete message or a
#   seconde unexpected one. BTW, it's fixed in 2.6.
#   TAG: MailDone
# 
# drivers/block/floppy.c
#   2003/12/22 08:44:00-02:00 willy@w.ods.org +2 -2
#   floppy typo fix
# 
# ChangeSet
#   2005/05/13 10:19:23-03:00 mikpe@user.it.uu.se 
#   [PATCH] x86_64 linkage error on UP_IOAPIC
#   
#   When 2.4.31-pre2 is configured for X86_64 && !SMP && UP_IOAPIC
#   it fails to link:
#   
#   arch/x86_64/kernel/kernel.o(.text+0x4591): In function `enable_irq':
#   : undefined reference to `send_IPI_self'
#   make: *** [vmlinux] Error 1
#   
#   A broken change in 2.4.31-pre{1,2} made the UP kernel reference
#   a symbol which is only defined in the SMP kernel.
#   
#   The patch below fixes this by reverting that change.
#   
#   Signed-off-by: Mikael Pettersson <mikpe@csd.uu.se>
# 
diff -Nru a/drivers/block/floppy.c b/drivers/block/floppy.c
--- a/drivers/block/floppy.c	2005-05-13 12:02:43 -07:00
+++ b/drivers/block/floppy.c	2005-05-13 12:02:43 -07:00
@@ -2548,7 +2548,7 @@
 			       current_count_sectors);
 			if (CT(COMMAND) == FD_READ)
 				printk("read\n");
-			if (CT(COMMAND) == FD_READ)
+			if (CT(COMMAND) == FD_WRITE)
 				printk("write\n");
 			break;
 		}
@@ -2889,7 +2889,7 @@
 			       current_count_sectors);
 			if (CT(COMMAND) == FD_READ)
 				printk("read\n");
-			if (CT(COMMAND) == FD_READ)
+			if (CT(COMMAND) == FD_WRITE)
 				printk("write\n");
 			return 0;
 		}
diff -Nru a/include/asm-x86_64/hw_irq.h b/include/asm-x86_64/hw_irq.h
--- a/include/asm-x86_64/hw_irq.h	2005-05-13 12:02:43 -07:00
+++ b/include/asm-x86_64/hw_irq.h	2005-05-13 12:02:43 -07:00
@@ -156,7 +156,7 @@
 	atomic_inc((atomic_t *)&prof_buffer[eip]);
 }
 
-#ifdef CONFIG_X86_IO_APIC
+#ifdef CONFIG_SMP /*more of this file should probably be ifdefed SMP */
 static inline void hw_resend_irq(struct hw_interrupt_type *h, unsigned int i) {
 	if (IO_APIC_IRQ(i))
 		send_IPI_self(IO_APIC_VECTOR(i));