## Automatically generated incremental diff
## From:   linux-2.4.21-bk38
## To:     linux-2.4.21-bk39
## Robot:  $Id: make-incremental-diff,v 1.11 2002/02/20 02:59:33 hpa Exp $

diff -urN linux-2.4.21-bk38/Makefile linux-2.4.21-bk39/Makefile
--- linux-2.4.21-bk38/Makefile	2003-08-25 02:55:28.000000000 -0700
+++ linux-2.4.21-bk39/Makefile	2003-08-25 02:55:39.000000000 -0700
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 4
 SUBLEVEL = 21
-EXTRAVERSION = -bk38
+EXTRAVERSION = -bk39
 
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 
diff -urN linux-2.4.21-bk38/arch/mips/defconfig-atlas linux-2.4.21-bk39/arch/mips/defconfig-atlas
--- linux-2.4.21-bk38/arch/mips/defconfig-atlas	2003-08-25 02:55:29.000000000 -0700
+++ linux-2.4.21-bk39/arch/mips/defconfig-atlas	2003-08-25 02:55:40.000000000 -0700
@@ -404,7 +404,6 @@
 # CONFIG_SUNDANCE is not set
 # CONFIG_SUNDANCE_MMIO is not set
 # CONFIG_TLAN is not set
-# CONFIG_TC35815 is not set
 # CONFIG_VIA_RHINE is not set
 # CONFIG_VIA_RHINE_MMIO is not set
 # CONFIG_WINBOND_840 is not set
diff -urN linux-2.4.21-bk38/arch/mips/defconfig-bosporus linux-2.4.21-bk39/arch/mips/defconfig-bosporus
--- linux-2.4.21-bk38/arch/mips/defconfig-bosporus	2003-08-25 02:55:29.000000000 -0700
+++ linux-2.4.21-bk39/arch/mips/defconfig-bosporus	2003-08-25 02:55:40.000000000 -0700
@@ -130,7 +130,6 @@
 # CONFIG_HOTPLUG_PCI is not set
 # CONFIG_HOTPLUG_PCI_COMPAQ is not set
 # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
-# CONFIG_HOTPLUG_PCI_ACPI is not set
 CONFIG_SYSVIPC=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 CONFIG_SYSCTL=y
diff -urN linux-2.4.21-bk38/arch/mips/defconfig-capcella linux-2.4.21-bk39/arch/mips/defconfig-capcella
--- linux-2.4.21-bk38/arch/mips/defconfig-capcella	2003-08-25 02:55:29.000000000 -0700
+++ linux-2.4.21-bk39/arch/mips/defconfig-capcella	2003-08-25 02:55:40.000000000 -0700
@@ -360,7 +360,6 @@
 # CONFIG_SUNDANCE is not set
 # CONFIG_SUNDANCE_MMIO is not set
 # CONFIG_TLAN is not set
-# CONFIG_TC35815 is not set
 # CONFIG_VIA_RHINE is not set
 # CONFIG_VIA_RHINE_MMIO is not set
 # CONFIG_WINBOND_840 is not set
diff -urN linux-2.4.21-bk38/arch/mips/defconfig-cobalt linux-2.4.21-bk39/arch/mips/defconfig-cobalt
--- linux-2.4.21-bk38/arch/mips/defconfig-cobalt	2003-08-25 02:55:29.000000000 -0700
+++ linux-2.4.21-bk39/arch/mips/defconfig-cobalt	2003-08-25 02:55:40.000000000 -0700
@@ -388,7 +388,6 @@
 # CONFIG_SUNDANCE is not set
 # CONFIG_SUNDANCE_MMIO is not set
 # CONFIG_TLAN is not set
-# CONFIG_TC35815 is not set
 # CONFIG_VIA_RHINE is not set
 # CONFIG_VIA_RHINE_MMIO is not set
 # CONFIG_WINBOND_840 is not set
diff -urN linux-2.4.21-bk38/arch/mips/defconfig-db1000 linux-2.4.21-bk39/arch/mips/defconfig-db1000
--- linux-2.4.21-bk38/arch/mips/defconfig-db1000	2003-08-25 02:55:29.000000000 -0700
+++ linux-2.4.21-bk39/arch/mips/defconfig-db1000	2003-08-25 02:55:40.000000000 -0700
@@ -140,7 +140,6 @@
 # CONFIG_HOTPLUG_PCI is not set
 # CONFIG_HOTPLUG_PCI_COMPAQ is not set
 # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
-# CONFIG_HOTPLUG_PCI_ACPI is not set
 CONFIG_SYSVIPC=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 CONFIG_SYSCTL=y
diff -urN linux-2.4.21-bk38/arch/mips/defconfig-db1100 linux-2.4.21-bk39/arch/mips/defconfig-db1100
--- linux-2.4.21-bk38/arch/mips/defconfig-db1100	2003-08-25 02:55:29.000000000 -0700
+++ linux-2.4.21-bk39/arch/mips/defconfig-db1100	2003-08-25 02:55:40.000000000 -0700
@@ -139,7 +139,6 @@
 # CONFIG_HOTPLUG_PCI is not set
 # CONFIG_HOTPLUG_PCI_COMPAQ is not set
 # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
-# CONFIG_HOTPLUG_PCI_ACPI is not set
 CONFIG_SYSVIPC=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 CONFIG_SYSCTL=y
diff -urN linux-2.4.21-bk38/arch/mips/defconfig-db1500 linux-2.4.21-bk39/arch/mips/defconfig-db1500
--- linux-2.4.21-bk38/arch/mips/defconfig-db1500	2003-08-25 02:55:29.000000000 -0700
+++ linux-2.4.21-bk39/arch/mips/defconfig-db1500	2003-08-25 02:55:40.000000000 -0700
@@ -139,7 +139,6 @@
 # CONFIG_HOTPLUG_PCI is not set
 # CONFIG_HOTPLUG_PCI_COMPAQ is not set
 # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
-# CONFIG_HOTPLUG_PCI_ACPI is not set
 CONFIG_SYSVIPC=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 CONFIG_SYSCTL=y
diff -urN linux-2.4.21-bk38/arch/mips/defconfig-ddb5476 linux-2.4.21-bk39/arch/mips/defconfig-ddb5476
--- linux-2.4.21-bk38/arch/mips/defconfig-ddb5476	2003-08-25 02:55:29.000000000 -0700
+++ linux-2.4.21-bk39/arch/mips/defconfig-ddb5476	2003-08-25 02:55:40.000000000 -0700
@@ -397,7 +397,6 @@
 # CONFIG_SUNDANCE is not set
 # CONFIG_SUNDANCE_MMIO is not set
 # CONFIG_TLAN is not set
-# CONFIG_TC35815 is not set
 # CONFIG_VIA_RHINE is not set
 # CONFIG_VIA_RHINE_MMIO is not set
 # CONFIG_WINBOND_840 is not set
diff -urN linux-2.4.21-bk38/arch/mips/defconfig-ddb5477 linux-2.4.21-bk39/arch/mips/defconfig-ddb5477
--- linux-2.4.21-bk38/arch/mips/defconfig-ddb5477	2003-08-25 02:55:29.000000000 -0700
+++ linux-2.4.21-bk39/arch/mips/defconfig-ddb5477	2003-08-25 02:55:40.000000000 -0700
@@ -324,7 +324,6 @@
 # CONFIG_SUNDANCE is not set
 # CONFIG_SUNDANCE_MMIO is not set
 # CONFIG_TLAN is not set
-# CONFIG_TC35815 is not set
 # CONFIG_VIA_RHINE is not set
 # CONFIG_VIA_RHINE_MMIO is not set
 # CONFIG_WINBOND_840 is not set
diff -urN linux-2.4.21-bk38/arch/mips/defconfig-eagle linux-2.4.21-bk39/arch/mips/defconfig-eagle
--- linux-2.4.21-bk38/arch/mips/defconfig-eagle	2003-08-25 02:55:29.000000000 -0700
+++ linux-2.4.21-bk39/arch/mips/defconfig-eagle	2003-08-25 02:55:40.000000000 -0700
@@ -136,7 +136,6 @@
 # CONFIG_HOTPLUG_PCI is not set
 # CONFIG_HOTPLUG_PCI_COMPAQ is not set
 # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
-# CONFIG_HOTPLUG_PCI_ACPI is not set
 CONFIG_SYSVIPC=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 CONFIG_SYSCTL=y
@@ -453,7 +452,6 @@
 # CONFIG_SUNDANCE is not set
 # CONFIG_SUNDANCE_MMIO is not set
 # CONFIG_TLAN is not set
-# CONFIG_TC35815 is not set
 # CONFIG_VIA_RHINE is not set
 # CONFIG_VIA_RHINE_MMIO is not set
 # CONFIG_WINBOND_840 is not set
diff -urN linux-2.4.21-bk38/arch/mips/defconfig-ev64120 linux-2.4.21-bk39/arch/mips/defconfig-ev64120
--- linux-2.4.21-bk38/arch/mips/defconfig-ev64120	2003-08-25 02:55:29.000000000 -0700
+++ linux-2.4.21-bk39/arch/mips/defconfig-ev64120	2003-08-25 02:55:40.000000000 -0700
@@ -325,7 +325,6 @@
 # CONFIG_SUNDANCE is not set
 # CONFIG_SUNDANCE_MMIO is not set
 # CONFIG_TLAN is not set
-# CONFIG_TC35815 is not set
 # CONFIG_VIA_RHINE is not set
 # CONFIG_VIA_RHINE_MMIO is not set
 # CONFIG_WINBOND_840 is not set
diff -urN linux-2.4.21-bk38/arch/mips/defconfig-ev96100 linux-2.4.21-bk39/arch/mips/defconfig-ev96100
--- linux-2.4.21-bk38/arch/mips/defconfig-ev96100	2003-08-25 02:55:29.000000000 -0700
+++ linux-2.4.21-bk39/arch/mips/defconfig-ev96100	2003-08-25 02:55:40.000000000 -0700
@@ -329,7 +329,6 @@
 # CONFIG_SUNDANCE is not set
 # CONFIG_SUNDANCE_MMIO is not set
 # CONFIG_TLAN is not set
-# CONFIG_TC35815 is not set
 # CONFIG_VIA_RHINE is not set
 # CONFIG_VIA_RHINE_MMIO is not set
 # CONFIG_WINBOND_840 is not set
diff -urN linux-2.4.21-bk38/arch/mips/defconfig-hp-lj linux-2.4.21-bk39/arch/mips/defconfig-hp-lj
--- linux-2.4.21-bk38/arch/mips/defconfig-hp-lj	2003-08-25 02:55:29.000000000 -0700
+++ linux-2.4.21-bk39/arch/mips/defconfig-hp-lj	2003-08-25 02:55:40.000000000 -0700
@@ -469,7 +469,6 @@
 # CONFIG_SUNDANCE is not set
 # CONFIG_SUNDANCE_MMIO is not set
 # CONFIG_TLAN is not set
-# CONFIG_TC35815 is not set
 # CONFIG_VIA_RHINE is not set
 # CONFIG_VIA_RHINE_MMIO is not set
 # CONFIG_WINBOND_840 is not set
diff -urN linux-2.4.21-bk38/arch/mips/defconfig-it8172 linux-2.4.21-bk39/arch/mips/defconfig-it8172
--- linux-2.4.21-bk38/arch/mips/defconfig-it8172	2003-08-25 02:55:29.000000000 -0700
+++ linux-2.4.21-bk39/arch/mips/defconfig-it8172	2003-08-25 02:55:40.000000000 -0700
@@ -471,7 +471,6 @@
 # CONFIG_SUNDANCE is not set
 # CONFIG_SUNDANCE_MMIO is not set
 # CONFIG_TLAN is not set
-# CONFIG_TC35815 is not set
 # CONFIG_VIA_RHINE is not set
 # CONFIG_VIA_RHINE_MMIO is not set
 # CONFIG_WINBOND_840 is not set
diff -urN linux-2.4.21-bk38/arch/mips/defconfig-ivr linux-2.4.21-bk39/arch/mips/defconfig-ivr
--- linux-2.4.21-bk38/arch/mips/defconfig-ivr	2003-08-25 02:55:29.000000000 -0700
+++ linux-2.4.21-bk39/arch/mips/defconfig-ivr	2003-08-25 02:55:40.000000000 -0700
@@ -396,7 +396,6 @@
 # CONFIG_SUNDANCE is not set
 # CONFIG_SUNDANCE_MMIO is not set
 # CONFIG_TLAN is not set
-# CONFIG_TC35815 is not set
 # CONFIG_VIA_RHINE is not set
 # CONFIG_VIA_RHINE_MMIO is not set
 # CONFIG_WINBOND_840 is not set
diff -urN linux-2.4.21-bk38/arch/mips/defconfig-lasat linux-2.4.21-bk39/arch/mips/defconfig-lasat
--- linux-2.4.21-bk38/arch/mips/defconfig-lasat	2003-08-25 02:55:29.000000000 -0700
+++ linux-2.4.21-bk39/arch/mips/defconfig-lasat	2003-08-25 02:55:40.000000000 -0700
@@ -464,7 +464,6 @@
 # CONFIG_SUNDANCE is not set
 # CONFIG_SUNDANCE_MMIO is not set
 # CONFIG_TLAN is not set
-# CONFIG_TC35815 is not set
 # CONFIG_VIA_RHINE is not set
 # CONFIG_VIA_RHINE_MMIO is not set
 # CONFIG_WINBOND_840 is not set
diff -urN linux-2.4.21-bk38/arch/mips/defconfig-malta linux-2.4.21-bk39/arch/mips/defconfig-malta
--- linux-2.4.21-bk38/arch/mips/defconfig-malta	2003-08-25 02:55:29.000000000 -0700
+++ linux-2.4.21-bk39/arch/mips/defconfig-malta	2003-08-25 02:55:40.000000000 -0700
@@ -400,7 +400,6 @@
 # CONFIG_SUNDANCE is not set
 # CONFIG_SUNDANCE_MMIO is not set
 # CONFIG_TLAN is not set
-# CONFIG_TC35815 is not set
 # CONFIG_VIA_RHINE is not set
 # CONFIG_VIA_RHINE_MMIO is not set
 # CONFIG_WINBOND_840 is not set
diff -urN linux-2.4.21-bk38/arch/mips/defconfig-mirage linux-2.4.21-bk39/arch/mips/defconfig-mirage
--- linux-2.4.21-bk38/arch/mips/defconfig-mirage	2003-08-25 02:55:29.000000000 -0700
+++ linux-2.4.21-bk39/arch/mips/defconfig-mirage	2003-08-25 02:55:40.000000000 -0700
@@ -130,7 +130,6 @@
 # CONFIG_HOTPLUG_PCI is not set
 # CONFIG_HOTPLUG_PCI_COMPAQ is not set
 # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
-# CONFIG_HOTPLUG_PCI_ACPI is not set
 CONFIG_SYSVIPC=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 CONFIG_SYSCTL=y
diff -urN linux-2.4.21-bk38/arch/mips/defconfig-ocelot linux-2.4.21-bk39/arch/mips/defconfig-ocelot
--- linux-2.4.21-bk38/arch/mips/defconfig-ocelot	2003-08-25 02:55:29.000000000 -0700
+++ linux-2.4.21-bk39/arch/mips/defconfig-ocelot	2003-08-25 02:55:40.000000000 -0700
@@ -397,7 +397,6 @@
 # CONFIG_SUNDANCE is not set
 # CONFIG_SUNDANCE_MMIO is not set
 # CONFIG_TLAN is not set
-# CONFIG_TC35815 is not set
 # CONFIG_VIA_RHINE is not set
 # CONFIG_VIA_RHINE_MMIO is not set
 # CONFIG_WINBOND_840 is not set
diff -urN linux-2.4.21-bk38/arch/mips/defconfig-pb1000 linux-2.4.21-bk39/arch/mips/defconfig-pb1000
--- linux-2.4.21-bk38/arch/mips/defconfig-pb1000	2003-08-25 02:55:29.000000000 -0700
+++ linux-2.4.21-bk39/arch/mips/defconfig-pb1000	2003-08-25 02:55:40.000000000 -0700
@@ -141,7 +141,6 @@
 # CONFIG_HOTPLUG_PCI is not set
 # CONFIG_HOTPLUG_PCI_COMPAQ is not set
 # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
-# CONFIG_HOTPLUG_PCI_ACPI is not set
 CONFIG_SYSVIPC=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 CONFIG_SYSCTL=y
diff -urN linux-2.4.21-bk38/arch/mips/defconfig-pb1500 linux-2.4.21-bk39/arch/mips/defconfig-pb1500
--- linux-2.4.21-bk38/arch/mips/defconfig-pb1500	2003-08-25 02:55:29.000000000 -0700
+++ linux-2.4.21-bk39/arch/mips/defconfig-pb1500	2003-08-25 02:55:40.000000000 -0700
@@ -139,7 +139,6 @@
 # CONFIG_HOTPLUG_PCI is not set
 # CONFIG_HOTPLUG_PCI_COMPAQ is not set
 # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
-# CONFIG_HOTPLUG_PCI_ACPI is not set
 CONFIG_SYSVIPC=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 CONFIG_SYSCTL=y
@@ -502,7 +501,6 @@
 # CONFIG_SUNDANCE is not set
 # CONFIG_SUNDANCE_MMIO is not set
 # CONFIG_TLAN is not set
-# CONFIG_TC35815 is not set
 # CONFIG_VIA_RHINE is not set
 # CONFIG_VIA_RHINE_MMIO is not set
 # CONFIG_WINBOND_840 is not set
diff -urN linux-2.4.21-bk38/arch/mips/defconfig-tb0226 linux-2.4.21-bk39/arch/mips/defconfig-tb0226
--- linux-2.4.21-bk38/arch/mips/defconfig-tb0226	2003-08-25 02:55:29.000000000 -0700
+++ linux-2.4.21-bk39/arch/mips/defconfig-tb0226	2003-08-25 02:55:40.000000000 -0700
@@ -397,7 +397,6 @@
 # CONFIG_SUNDANCE is not set
 # CONFIG_SUNDANCE_MMIO is not set
 # CONFIG_TLAN is not set
-# CONFIG_TC35815 is not set
 # CONFIG_VIA_RHINE is not set
 # CONFIG_VIA_RHINE_MMIO is not set
 # CONFIG_WINBOND_840 is not set
diff -urN linux-2.4.21-bk38/arch/mips/defconfig-tb0229 linux-2.4.21-bk39/arch/mips/defconfig-tb0229
--- linux-2.4.21-bk38/arch/mips/defconfig-tb0229	2003-08-25 02:55:29.000000000 -0700
+++ linux-2.4.21-bk39/arch/mips/defconfig-tb0229	2003-08-25 02:55:40.000000000 -0700
@@ -336,7 +336,6 @@
 # CONFIG_SUNDANCE is not set
 # CONFIG_SUNDANCE_MMIO is not set
 # CONFIG_TLAN is not set
-# CONFIG_TC35815 is not set
 # CONFIG_VIA_RHINE is not set
 # CONFIG_VIA_RHINE_MMIO is not set
 # CONFIG_WINBOND_840 is not set
diff -urN linux-2.4.21-bk38/arch/mips/defconfig-ti1500 linux-2.4.21-bk39/arch/mips/defconfig-ti1500
--- linux-2.4.21-bk38/arch/mips/defconfig-ti1500	2003-08-25 02:55:29.000000000 -0700
+++ linux-2.4.21-bk39/arch/mips/defconfig-ti1500	2003-08-25 02:55:40.000000000 -0700
@@ -139,7 +139,6 @@
 # CONFIG_HOTPLUG_PCI is not set
 # CONFIG_HOTPLUG_PCI_COMPAQ is not set
 # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
-# CONFIG_HOTPLUG_PCI_ACPI is not set
 CONFIG_SYSVIPC=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 CONFIG_SYSCTL=y
diff -urN linux-2.4.21-bk38/arch/mips/defconfig-xxs1500 linux-2.4.21-bk39/arch/mips/defconfig-xxs1500
--- linux-2.4.21-bk38/arch/mips/defconfig-xxs1500	2003-08-25 02:55:29.000000000 -0700
+++ linux-2.4.21-bk39/arch/mips/defconfig-xxs1500	2003-08-25 02:55:40.000000000 -0700
@@ -139,7 +139,6 @@
 # CONFIG_HOTPLUG_PCI is not set
 # CONFIG_HOTPLUG_PCI_COMPAQ is not set
 # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
-# CONFIG_HOTPLUG_PCI_ACPI is not set
 CONFIG_SYSVIPC=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 CONFIG_SYSCTL=y
@@ -500,7 +499,6 @@
 # CONFIG_SUNDANCE is not set
 # CONFIG_SUNDANCE_MMIO is not set
 # CONFIG_TLAN is not set
-# CONFIG_TC35815 is not set
 # CONFIG_VIA_RHINE is not set
 # CONFIG_VIA_RHINE_MMIO is not set
 # CONFIG_WINBOND_840 is not set
diff -urN linux-2.4.21-bk38/arch/ppc/lib/string.S linux-2.4.21-bk39/arch/ppc/lib/string.S
--- linux-2.4.21-bk38/arch/ppc/lib/string.S	2003-08-25 02:55:29.000000000 -0700
+++ linux-2.4.21-bk39/arch/ppc/lib/string.S	2003-08-25 02:55:40.000000000 -0700
@@ -77,6 +77,8 @@
 	bne	1b
 	blr
 
+/* This clears out any unused part of the destination buffer,
+   just as the libc version does.  -- paulus */
 	.globl	strncpy
 strncpy:
 	cmpwi	0,r5,0
@@ -88,6 +90,12 @@
 	cmpwi	0,r0,0
 	stbu	r0,1(r6)
 	bdnzf	2,1b		/* dec ctr, branch if ctr != 0 && !cr0.eq */
+	bnelr			/* if we didn't hit a null char, we're done */
+	mfctr	r5
+	cmpwi	0,r5,0		/* any space left in destination buffer? */
+	beqlr			/* we know r0 == 0 here */
+2:	stbu	r0,1(r6)	/* clear it out if so */
+	bdnz	2b
 	blr
 
 	.globl	strcat
diff -urN linux-2.4.21-bk38/arch/ppc/vmlinux.lds linux-2.4.21-bk39/arch/ppc/vmlinux.lds
--- linux-2.4.21-bk38/arch/ppc/vmlinux.lds	2003-08-25 02:55:29.000000000 -0700
+++ linux-2.4.21-bk39/arch/ppc/vmlinux.lds	2003-08-25 02:55:40.000000000 -0700
@@ -64,6 +64,7 @@
   _edata  =  .;
   PROVIDE (edata = .);
 
+  . = ALIGN(8);
   .fixup   : { *(.fixup) }
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
@@ -73,6 +74,7 @@
   __ksymtab : { *(__ksymtab) }
   __stop___ksymtab = .;
 
+  . = ALIGN(8);
   __start___ftr_fixup = .;
   __ftr_fixup : { *(__ftr_fixup) }
   __stop___ftr_fixup = .;
@@ -138,6 +140,7 @@
    *(.bss)
    *(COMMON)
   }
+  . = ALIGN(4);
   _end = . ;
   PROVIDE (end = .);
 }
diff -urN linux-2.4.21-bk38/arch/x86_64/kernel/traps.c linux-2.4.21-bk39/arch/x86_64/kernel/traps.c
--- linux-2.4.21-bk38/arch/x86_64/kernel/traps.c	2003-08-25 02:55:30.000000000 -0700
+++ linux-2.4.21-bk39/arch/x86_64/kernel/traps.c	2003-08-25 02:55:44.000000000 -0700
@@ -846,7 +846,7 @@
 	set_intr_gate(19,&simd_coprocessor_error);
 
 #ifdef CONFIG_IA32_EMULATION
-	set_intr_gate(IA32_SYSCALL_VECTOR, ia32_syscall);
+	set_system_gate(IA32_SYSCALL_VECTOR, ia32_syscall);
 #endif
 
 	/*
diff -urN linux-2.4.21-bk38/drivers/net/Config.in linux-2.4.21-bk39/drivers/net/Config.in
--- linux-2.4.21-bk38/drivers/net/Config.in	2003-08-25 02:55:31.000000000 -0700
+++ linux-2.4.21-bk39/drivers/net/Config.in	2003-08-25 02:55:55.000000000 -0700
@@ -210,7 +210,9 @@
       if [ "$CONFIG_PCI" = "y" -o "$CONFIG_EISA" = "y" ]; then
          tristate '    TI ThunderLAN support' CONFIG_TLAN
       fi
-      dep_tristate '    TOSHIBA TC35815 Ethernet support' CONFIG_TC35815  $CONFIG_TOSHIBA_JMR3927 $CONFIG_PCI
+      if [ "$CONFIG_TOSHIBA_JMR3927" = "y" ]; then
+         dep_tristate '    TOSHIBA TC35815 Ethernet support' CONFIG_TC35815 $CONFIG_PCI
+      fi
       dep_tristate '    VIA Rhine support' CONFIG_VIA_RHINE $CONFIG_PCI
       dep_mbool '      Use MMIO instead of PIO (EXPERIMENTAL)' CONFIG_VIA_RHINE_MMIO $CONFIG_VIA_RHINE $CONFIG_EXPERIMENTAL
       dep_tristate '    Winbond W89c840 Ethernet support' CONFIG_WINBOND_840 $CONFIG_PCI
