diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2003-05-12 03:56:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2003-05-12 03:56:34 -0700 |
| commit | 037ed25370a1d0bda0251d320c9d70c15565b060 (patch) | |
| tree | 182ff069f2d0acb8425dfc2d0aa96396be4b3f95 /include/linux | |
| parent | f5bda5bc978626bf1f508370c25702366bc2c214 (diff) | |
| parent | 9630291c752eb3cf2666b7ddf836dc350827dca0 (diff) | |
Merge bk://kernel.bkbits.net/davem/net-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/fs.h | 2 | ||||
| -rw-r--r-- | include/linux/time.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 6433033ad2b5..6363727f6204 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1017,7 +1017,7 @@ static inline int break_lease(struct inode *inode, unsigned int mode) /* fs/open.c */ -asmlinkage long sys_open(const char *, int, int); +asmlinkage long sys_open(const char __user *, int, int); asmlinkage long sys_close(unsigned int); /* yes, it's really unsigned */ extern int do_truncate(struct dentry *, loff_t start); diff --git a/include/linux/time.h b/include/linux/time.h index fdab2abc43be..92146a97c217 100644 --- a/include/linux/time.h +++ b/include/linux/time.h @@ -204,7 +204,7 @@ extern void do_settimeofday(struct timeval *tv); extern int do_sys_settimeofday(struct timeval *tv, struct timezone *tz); extern void clock_was_set(void); // call when ever the clock is set extern long do_nanosleep(struct timespec *t); -extern long do_utimes(char * filename, struct timeval * times); +extern long do_utimes(char __user * filename, struct timeval * times); #endif #define FD_SETSIZE __FD_SETSIZE |