# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2004/02/03 21:41:43-05:00 jeffpc@optonline.net 
#   Fixed UML with CONFIG_SMP set
# 
# arch/um/kernel/irq.c
#   2004/02/03 21:37:21-05:00 jeffpc@optonline.net +1 -1
#   Fixed UML with CONFIG_SMP set
# 
# arch/um/Makefile
#   2004/02/03 21:37:21-05:00 jeffpc@optonline.net +1 -1
#   Fixed UML with CONFIG_SMP set
# 
diff -Nru a/arch/um/Makefile b/arch/um/Makefile
--- a/arch/um/Makefile	Tue Feb  3 21:48:38 2004
+++ b/arch/um/Makefile	Tue Feb  3 21:48:38 2004
@@ -170,7 +170,7 @@
 	ln -sf $(basename $(notdir $@))-$(SUBARCH)$(suffix $@) $(notdir $@)
 
 include/asm-um/arch:
-	cd $(TOPDIR)/include/asm-um && ln -sf ../asm-$(SUBARCH) arch
+	cd $(TOPDIR)/include/asm-um && ln -sf ../asm-$(SUBARCH) arch && ln -sf arch/spinlock.h
 
 $(ARCH_DIR)/include/sysdep:
 	cd $(ARCH_DIR)/include && ln -sf sysdep-$(SUBARCH) sysdep
diff -Nru a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c
--- a/arch/um/kernel/irq.c	Tue Feb  3 21:48:38 2004
+++ b/arch/um/kernel/irq.c	Tue Feb  3 21:48:38 2004
@@ -584,7 +584,7 @@
 					unsigned long count, void *data)
 {
 	int irq = (long) data, full_count = count, err;
-	cpumask_t new_value;
+	cpumask_t new_value, tmp;
 
 	if (!irq_desc[irq].handler->set_affinity)
 		return -EIO;