diff -Naur -X exclude-files ac_cur/arch/um/Makefile ac/arch/um/Makefile
--- ac_cur/arch/um/Makefile	Mon Jul  9 13:05:03 2001
+++ ac/arch/um/Makefile	Mon Jul  9 13:26:21 2001
@@ -20,6 +20,8 @@
 LINK_PROFILE = $(PROFILE) -Wl,--wrap,__monstartup
 endif
 
+CFLAGS := $(subst -fno-common,,$(CFLAGS))
+
 SUBDIRS += $(ARCH_DIR)/fs $(ARCH_DIR)/drivers $(ARCH_DIR)/kernel \
 	$(ARCH_DIR)/sys-$(SUBARCH)
 
diff -Naur -X exclude-files ac_cur/arch/um/kernel/irq.c ac/arch/um/kernel/irq.c
--- ac_cur/arch/um/kernel/irq.c	Mon Jul  9 13:03:09 2001
+++ ac/arch/um/kernel/irq.c	Mon Jul  9 13:17:07 2001
@@ -327,7 +327,7 @@
 	desc->handler->end(irq);
 	spin_unlock(&desc->lock);
 
-	if (softirq_active(cpu) & softirq_mask(cpu))
+	if (softirq_pending(cpu))
 		do_softirq();
 	return 1;
 }
diff -Naur -X exclude-files ac_cur/arch/um/kernel/process_kern.c ac/arch/um/kernel/process_kern.c
--- ac_cur/arch/um/kernel/process_kern.c	Mon Jul  9 13:03:09 2001
+++ ac/arch/um/kernel/process_kern.c	Mon Jul  9 13:17:29 2001
@@ -219,7 +219,7 @@
 void do_bh(void)
 {
 #ifndef CONFIG_SMP
-	if (softirq_active(0) & softirq_mask(0)){
+	if (softirq_pending(0)){
 		do_softirq();
 		unblock_signals();
 	}