--- 2.4.0-test3-pre8/arch/alpha/kernel/pci_iommu.c.~1~	Sat Jun 24 16:02:27 2000
+++ 2.4.0-test3-pre8/arch/alpha/kernel/pci_iommu.c	Tue Jul 11 00:36:05 2000
@@ -416,7 +416,9 @@
 	ptes = &arena->ptes[dma_ofs];
 	sg = leader;
 	do {
+#if DEBUG_ALLOC > 0
 		struct scatterlist *last_sg = sg;
+#endif
 
 		size = sg->length;
 		paddr = virt_to_phys(sg->address);
--- 2.4.0-test3-pre8/arch/alpha/mm/extable.c.~1~	Sat Jun 24 16:02:27 2000
+++ 2.4.0-test3-pre8/arch/alpha/mm/extable.c	Tue Jul 11 00:56:19 2000
@@ -88,7 +88,7 @@
 	 */
 	ret = search_exception_table_without_gp(addr);
 	if (ret) {
-		printk(KERN_ALERT, "%s: [%lx] EX_TABLE search fail with"
+		printk(KERN_ALERT "%s: [%lx] EX_TABLE search fail with"
 		       "exc frame GP, success with raw GP\n",
 		       current->comm, addr);
 		return ret;
--- 2.4.0-test3-pre8/arch/alpha/Makefile.~1~	Mon Jul 10 18:15:21 2000
+++ 2.4.0-test3-pre8/arch/alpha/Makefile	Tue Jul 11 01:03:37 2000
@@ -117,6 +117,10 @@
 
 archdep:
 	@$(MAKEBOOT) dep
+
+vmlinux: arch/alpha/vmlinux.lds
+
+arch/alpha/vmlinux.lds: arch/alpha/vmlinux.lds.in
 	$(CPP) $(CPPFLAGS) -xc -P arch/alpha/vmlinux.lds.in -o arch/alpha/vmlinux.lds
 
 bootpfile:
--- 2.4.0-test3-pre8/include/asm-alpha/elf.h.~1~	Thu Apr 27 17:56:42 2000
+++ 2.4.0-test3-pre8/include/asm-alpha/elf.h	Tue Jul 11 00:32:26 2000
@@ -127,7 +127,7 @@
 
 #ifdef __KERNEL__
 #define SET_PERSONALITY(EX, IBCS2)				\
-	set_personality((EX).e_flags & EF_ALPHA_32BIT		\
+	set_personality(((EX).e_flags & EF_ALPHA_32BIT)		\
 	   ? PER_LINUX_32BIT : (IBCS2) ? PER_SVR4 : PER_LINUX)
 #endif