git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
drivers
/
char
/
vc_screen.c
diff --git
a/drivers/char/vc_screen.c
b/drivers/char/vc_screen.c
index
5b51a76
..
c357ab7
100644
(file)
--- a/
drivers/char/vc_screen.c
+++ b/
drivers/char/vc_screen.c
@@
-102,7
+102,7
@@
extern char con_buf[PAGE_SIZE];
extern struct semaphore con_buf_sem;
static ssize_t
extern struct semaphore con_buf_sem;
static ssize_t
-vcs_read(struct file *file, char *buf, size_t count, loff_t *ppos)
+vcs_read(struct file *file, char
__user
*buf, size_t count, loff_t *ppos)
{
struct inode *inode = file->f_dentry->d_inode;
unsigned int currcons = iminor(inode);
{
struct inode *inode = file->f_dentry->d_inode;
unsigned int currcons = iminor(inode);
@@
-271,7
+271,7
@@
unlock_out:
}
static ssize_t
}
static ssize_t
-vcs_write(struct file *file, const char *buf, size_t count, loff_t *ppos)
+vcs_write(struct file *file, const char
__user
*buf, size_t count, loff_t *ppos)
{
struct inode *inode = file->f_dentry->d_inode;
unsigned int currcons = iminor(inode);
{
struct inode *inode = file->f_dentry->d_inode;
unsigned int currcons = iminor(inode);