[PATCH] DVB: "errno" undefined

Actually, the problem has its origin in my removal of all in-kernel
syscalls (except execve, which is non-trivial) earlier this year.  This
change was blindly reverted by the maintainer, while at the same time the
local errno variable was removed.  See also
http://linux.bkbits.net:8080/linux-2.5/hist/drivers/media/dvb/frontends/tda=
1004x.c

This patch is the one that was already merged earlier.  I'm now also
removing the definitions for the kernel syscalls on i386 to make it harder
to reintroduce them again.  This was already done for ppc64, the others
should probably follow.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/media/dvb/frontends/alps_tdlb7.c b/drivers/media/dvb/frontends/alps_tdlb7.c
index 64d95f2f88c95b6970c28b4a716db36b764ce2d0..cf165f2d576704b0a5da8fd314db4c9b5a710599 100644 (file)
--- a/drivers/media/dvb/frontends/alps_tdlb7.c
+++ b/drivers/media/dvb/frontends/alps_tdlb7.c
@@ -28,8 +28,6 @@
     
 */  
 
-
-#define __KERNEL_SYSCALLS__
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/vmalloc.h>
@@ -151,13 +149,13 @@ static int sp8870_read_firmware_file (const char *fn, char **fp)
        loff_t filesize;
        char *dp;
 
-       fd = open(fn, 0, 0);
+       fd = sys_open(fn, 0, 0);
        if (fd == -1) {
                 printk("%s: unable to open '%s'.\n", __FUNCTION__, fn);
                return -EIO;
        }
 
-       filesize = lseek(fd, 0L, 2);
+       filesize = sys_lseek(fd, 0L, 2);
        if (filesize <= 0 || filesize < SP8870_FIRMWARE_OFFSET + SP8870_FIRMWARE_SIZE) {
                printk("%s: firmware filesize to small '%s'\n", __FUNCTION__, fn);
                sys_close(fd);
@@ -171,8 +169,8 @@ static int sp8870_read_firmware_file (const char *fn, char **fp)
                return -EIO;
        }
 
-       lseek(fd, SP8870_FIRMWARE_OFFSET, 0);
-       if (read(fd, dp, SP8870_FIRMWARE_SIZE) != SP8870_FIRMWARE_SIZE) {
+       sys_lseek(fd, SP8870_FIRMWARE_OFFSET, 0);
+       if (sys_read(fd, dp, SP8870_FIRMWARE_SIZE) != SP8870_FIRMWARE_SIZE) {
                printk("%s: failed to read '%s'.\n",__FUNCTION__, fn);
                vfree(dp);
                sys_close(fd);

diff --git a/drivers/media/dvb/frontends/sp887x.c b/drivers/media/dvb/frontends/sp887x.c
index 3b3a73bb00d7373ab7822de260e9f4c5eb6819c1..53ebf4a69b07e299265837a94e48312932b9c9a9 100644 (file)
--- a/drivers/media/dvb/frontends/sp887x.c
+++ b/drivers/media/dvb/frontends/sp887x.c
@@ -12,7 +12,6 @@
    next 0x4000 loaded. This may change in future versions.
  */
 
-#define __KERNEL_SYSCALLS__
 #include <linux/kernel.h>
 #include <linux/vmalloc.h>
 #include <linux/module.h>
@@ -211,13 +210,13 @@ int sp887x_initial_setup (struct dvb_frontend *fe)
 
        // Load the firmware
        set_fs(get_ds());
-       fd = open(sp887x_firmware, 0, 0);
+       fd = sys_open(sp887x_firmware, 0, 0);
        if (fd < 0) {
                printk(KERN_WARNING "%s: Unable to open firmware %s\n", __FUNCTION__,
                       sp887x_firmware);
                return -EIO;
        }
-       filesize = lseek(fd, 0L, 2);
+       filesize = sys_lseek(fd, 0L, 2);
        if (filesize <= 0) {
                printk(KERN_WARNING "%s: Firmware %s is empty\n", __FUNCTION__,
                       sp887x_firmware);
@@ -239,8 +238,8 @@ int sp887x_initial_setup (struct dvb_frontend *fe)
        // read it!
        // read the first 16384 bytes from the file
        // ignore the first 10 bytes
-       lseek(fd, 10, 0);
-       if (read(fd, firmware, fw_size) != fw_size) {
+       sys_lseek(fd, 10, 0);
+       if (sys_read(fd, firmware, fw_size) != fw_size) {
                printk(KERN_WARNING "%s: Failed to read firmware\n", __FUNCTION__);
                vfree(firmware);
                sys_close(fd);

diff --git a/drivers/media/dvb/frontends/tda1004x.c b/drivers/media/dvb/frontends/tda1004x.c
index 76a6027dbdb61a650a4b17b032351836bb699e30..28dc299a8cd5adbb2b869dc12bd0f0d5628e572b 100644 (file)
--- a/drivers/media/dvb/frontends/tda1004x.c
+++ b/drivers/media/dvb/frontends/tda1004x.c
@@ -32,7 +32,6 @@
  */
 
 
-#define __KERNEL_SYSCALLS__
 #include <linux/kernel.h>
 #include <linux/vmalloc.h>
 #include <linux/module.h>
@@ -40,7 +39,6 @@
 #include <linux/string.h>
 #include <linux/slab.h>
 #include <linux/fs.h>
-#include <linux/unistd.h>
 #include <linux/fcntl.h>
 #include <linux/errno.h>
 #include <linux/syscalls.h>
@@ -399,13 +397,13 @@ static int tda1004x_fwupload(struct dvb_i2c_bus *i2c, struct tda1004x_state *tda
 
        // Load the firmware
        set_fs(get_ds());
-       fd = open(tda1004x_firmware, 0, 0);
+       fd = sys_open(tda1004x_firmware, 0, 0);
        if (fd < 0) {
                printk("%s: Unable to open firmware %s\n", __FUNCTION__,
                       tda1004x_firmware);
                return -EIO;
        }
-       filesize = lseek(fd, 0L, 2);
+       filesize = sys_lseek(fd, 0L, 2);
        if (filesize <= 0) {
                printk("%s: Firmware %s is empty\n", __FUNCTION__,
                       tda1004x_firmware);
@@ -436,8 +434,8 @@ static int tda1004x_fwupload(struct dvb_i2c_bus *i2c, struct tda1004x_state *tda
        }
 
        // read it!
-       lseek(fd, fw_offset, 0);
-       if (read(fd, firmware, fw_size) != fw_size) {
+       sys_lseek(fd, fw_offset, 0);
+       if (sys_read(fd, firmware, fw_size) != fw_size) {
                printk("%s: Failed to read firmware\n", __FUNCTION__);
                vfree(firmware);
                sys_close(fd);

diff --git a/drivers/net/wireless/prism54/isl_38xx.c b/drivers/net/wireless/prism54/isl_38xx.c
index dd50660379043a01754198ecc3be0563a6abcd03..3ee31021f1b054c70c879a109e6ef1295bc5ae41 100644 (file)
--- a/drivers/net/wireless/prism54/isl_38xx.c
+++ b/drivers/net/wireless/prism54/isl_38xx.c
@@ -18,8 +18,6 @@
  *
  */
 
-#define __KERNEL_SYSCALLS__
-
 #include <linux/version.h>
 #include <linux/module.h>
 #include <linux/types.h>

diff --git a/include/asm-i386/unistd.h b/include/asm-i386/unistd.h
index 0df3f9b0a2ff42c38f77d2a0cc6c2edcca24786c..ef936b8614045e030dc1594fd7d255ee1a49db8a 100644 (file)
--- a/include/asm-i386/unistd.h
+++ b/include/asm-i386/unistd.h
@@ -425,15 +425,7 @@ __syscall_return(type,__res); \
  * won't be any messing with the stack from main(), but we define
  * some others too.
  */
-static inline _syscall0(pid_t,setsid)
-static inline _syscall3(int,write,int,fd,const char *,buf,off_t,count)
-static inline _syscall3(int,read,int,fd,char *,buf,off_t,count)
-static inline _syscall3(off_t,lseek,int,fd,off_t,offset,int,count)
-static inline _syscall1(int,dup,int,fd)
 static inline _syscall3(int,execve,const char *,file,char **,argv,char **,envp)
-static inline _syscall3(int,open,const char *,file,int,flag,int,mode)
-static inline _syscall1(int,close,int,fd)
-static inline _syscall3(pid_t,waitpid,pid_t,pid,int *,wait_stat,int,options)
 
 asmlinkage int sys_modify_ldt(int func, void __user *ptr, unsigned long bytecount);
 asmlinkage long sys_mmap2(unsigned long addr, unsigned long len,