---

 /dev/null                                               |    7 -------
 25-akpm/arch/m68knommu/platform/68360/config.c          |    1 -
 25-akpm/arch/m68knommu/platform/68EZ328/config.c        |    1 -
 25-akpm/arch/m68knommu/platform/68VZ328/ucdimm/config.c |    1 -
 25-akpm/drivers/media/dvb/frontends/alps_tdlb7.c        |    2 --
 25-akpm/drivers/media/dvb/frontends/sp887x.c            |    2 --
 25-akpm/drivers/sbus/char/bbc_envctrl.c                 |    1 -
 25-akpm/drivers/sbus/char/envctrl.c                     |    1 -
 25-akpm/fs/afs/fsclient.c                               |    2 +-
 25-akpm/include/linux/unistd.h                          |    2 --
 25-akpm/lib/Makefile                                    |    2 +-
 11 files changed, 2 insertions(+), 20 deletions(-)

diff -puN arch/m68knommu/platform/68360/config.c~remove-errno-refs arch/m68knommu/platform/68360/config.c
--- 25/arch/m68knommu/platform/68360/config.c~remove-errno-refs	2004-05-01 18:15:32.918428680 -0700
+++ 25-akpm/arch/m68knommu/platform/68360/config.c	2004-05-01 18:15:32.935426096 -0700
@@ -151,7 +151,6 @@ void BSP_reset (void)
 }
 
 unsigned char *scc1_hwaddr;
-static int errno;
 
 #if defined (CONFIG_UCQUICC)
 _bsc0(char *, getserialnum)
diff -puN arch/m68knommu/platform/68EZ328/config.c~remove-errno-refs arch/m68knommu/platform/68EZ328/config.c
--- 25/arch/m68knommu/platform/68EZ328/config.c~remove-errno-refs	2004-05-01 18:15:32.919428528 -0700
+++ 25-akpm/arch/m68knommu/platform/68EZ328/config.c	2004-05-01 18:15:32.936425944 -0700
@@ -94,7 +94,6 @@ void BSP_reset (void)
 }
 
 unsigned char *cs8900a_hwaddr;
-static int errno;
 
 #ifdef CONFIG_UCSIMM
 _bsc0(char *, getserialnum)
diff -puN arch/m68knommu/platform/68VZ328/ucdimm/config.c~remove-errno-refs arch/m68knommu/platform/68VZ328/ucdimm/config.c
--- 25/arch/m68knommu/platform/68VZ328/ucdimm/config.c~remove-errno-refs	2004-05-01 18:15:32.920428376 -0700
+++ 25-akpm/arch/m68knommu/platform/68VZ328/ucdimm/config.c	2004-05-01 18:15:32.936425944 -0700
@@ -89,7 +89,6 @@ void BSP_reset (void)
 }
 
 unsigned char *cs8900a_hwaddr;
-static int errno;
 
 _bsc0(char *, getserialnum)
 _bsc1(unsigned char *, gethwaddr, int, a)
diff -puN drivers/media/dvb/frontends/alps_tdlb7.c~remove-errno-refs drivers/media/dvb/frontends/alps_tdlb7.c
--- 25/drivers/media/dvb/frontends/alps_tdlb7.c~remove-errno-refs	2004-05-01 18:15:32.922428072 -0700
+++ 25-akpm/drivers/media/dvb/frontends/alps_tdlb7.c	2004-05-01 18:15:32.937425792 -0700
@@ -57,8 +57,6 @@ static int debug = 0;
 #define SP8870_FIRMWARE_OFFSET 0x0A
 
 
-static int errno;
-
 static struct dvb_frontend_info tdlb7_info = {
 	.name			= "Alps TDLB7",
 	.type			= FE_OFDM,
diff -puN drivers/media/dvb/frontends/sp887x.c~remove-errno-refs drivers/media/dvb/frontends/sp887x.c
--- 25/drivers/media/dvb/frontends/sp887x.c~remove-errno-refs	2004-05-01 18:15:32.923427920 -0700
+++ 25-akpm/drivers/media/dvb/frontends/sp887x.c	2004-05-01 18:15:32.937425792 -0700
@@ -68,8 +68,6 @@ struct dvb_frontend_info sp887x_info = {
                 FE_CAN_RECOVER
 };
 
-static int errno;
-
 static
 int i2c_writebytes (struct dvb_frontend *fe, u8 addr, u8 *buf, u8 len)
 {
diff -puN drivers/sbus/char/bbc_envctrl.c~remove-errno-refs drivers/sbus/char/bbc_envctrl.c
--- 25/drivers/sbus/char/bbc_envctrl.c~remove-errno-refs	2004-05-01 18:15:32.925427616 -0700
+++ 25-akpm/drivers/sbus/char/bbc_envctrl.c	2004-05-01 18:15:32.939425488 -0700
@@ -10,7 +10,6 @@
 #include <asm/oplib.h>
 #include <asm/ebus.h>
 #define __KERNEL_SYSCALLS__
-static int errno;
 #include <asm/unistd.h>
 
 #include "bbc_i2c.h"
diff -puN drivers/sbus/char/envctrl.c~remove-errno-refs drivers/sbus/char/envctrl.c
--- 25/drivers/sbus/char/envctrl.c~remove-errno-refs	2004-05-01 18:15:32.926427464 -0700
+++ 25-akpm/drivers/sbus/char/envctrl.c	2004-05-01 18:15:32.938425640 -0700
@@ -36,7 +36,6 @@
 #include <asm/envctrl.h>
 
 #define __KERNEL_SYSCALLS__
-static int errno;
 #include <asm/unistd.h>
 
 #define ENVCTRL_MINOR	162
diff -puN fs/afs/fsclient.c~remove-errno-refs fs/afs/fsclient.c
--- 25/fs/afs/fsclient.c~remove-errno-refs	2004-05-01 18:15:32.927427312 -0700
+++ 25-akpm/fs/afs/fsclient.c	2004-05-01 18:15:32.940425336 -0700
@@ -744,7 +744,7 @@ int afs_rxfs_lookup(struct afs_server *s
 				   RXRPC_CALL_READ_ALL);
 	if (ret < 0) {
 		if (ret == -ECONNABORTED) {
-			ret = call->app_errno;
+			ret = call->app_lerrno;
 			goto out_unwait;
 		}
 		goto abort;
diff -puN include/linux/unistd.h~remove-errno-refs include/linux/unistd.h
--- 25/include/linux/unistd.h~remove-errno-refs	2004-05-01 18:15:32.929427008 -0700
+++ 25-akpm/include/linux/unistd.h	2004-05-01 18:15:32.939425488 -0700
@@ -1,8 +1,6 @@
 #ifndef _LINUX_UNISTD_H_
 #define _LINUX_UNISTD_H_
 
-extern int errno;
-
 /*
  * Include machine specific syscallX macros
  */
diff -L lib/errno.c -puN lib/errno.c~remove-errno-refs /dev/null
--- 25/lib/errno.c
+++ /dev/null	2003-09-15 06:40:47.000000000 -0700
@@ -1,7 +0,0 @@
-/*
- *  linux/lib/errno.c
- *
- *  Copyright (C) 1991, 1992  Linus Torvalds
- */
-
-int errno;
diff -puN lib/Makefile~remove-errno-refs lib/Makefile
--- 25/lib/Makefile~remove-errno-refs	2004-05-01 18:15:32.931426704 -0700
+++ 25-akpm/lib/Makefile	2004-05-01 18:15:32.941425184 -0700
@@ -3,7 +3,7 @@
 #
 
 
-lib-y := errno.o ctype.o string.o vsprintf.o cmdline.o \
+lib-y := ctype.o string.o vsprintf.o cmdline.o \
 	 bust_spinlocks.o rbtree.o radix-tree.o dump_stack.o \
 	 kobject.o idr.o div64.o parser.o int_sqrt.o \
 	 bitmap.o extable.o

_