|
From: James S. <jsi...@us...> - 2002-11-23 00:55:54
|
Update of /cvsroot/linuxconsole/ruby/linux/arch/x86_64/ia32
In directory sc8-pr-cvs1:/tmp/cvs-serv1514/linux/arch/x86_64/ia32
Modified Files:
ia32_ioctl.c
Log Message:
Synced to 2.5.49 console BK tree.
Index: ia32_ioctl.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/x86_64/ia32/ia32_ioctl.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ia32_ioctl.c 18 Jun 2002 18:51:54 -0000 1.7
+++ ia32_ioctl.c 23 Nov 2002 00:55:49 -0000 1.8
@@ -21,6 +21,7 @@
#include <linux/hdreg.h>
#include <linux/raid/md.h>
#include <linux/kd.h>
+#include <linux/dirent.h>
#include <linux/route.h>
#include <linux/in6.h>
#include <linux/ipv6_route.h>
@@ -55,6 +56,9 @@
#include <linux/module.h>
#include <linux/serial.h>
#include <linux/reiserfs_fs.h>
[...2303 lines suppressed...]
+ sprintf(buf,"'%c'", (cmd>>24) & 0x3f);
+ if (!isprint(buf[1]))
+ sprintf(buf, "%02x", buf[1]);
+ printk("ioctl32(%s:%d): Unknown cmd fd(%d) "
+ "cmd(%08x){%s} arg(%08x) on %s\n",
current->comm, current->pid,
- (int)fd, (unsigned int)cmd, (unsigned int)arg);
+ (int)fd, (unsigned int)cmd, buf, (unsigned int)arg,
+ fn);
+ if (path)
+ free_page((unsigned long)path);
+ }
error = -EINVAL;
}
out:
@@ -3993,3 +5238,4 @@
out2:
return error;
}
+
|