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
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
arch
/
parisc
/
kernel
/
sys_parisc32.c
diff --git
a/arch/parisc/kernel/sys_parisc32.c
b/arch/parisc/kernel/sys_parisc32.c
index
cd320b2
..
74db7f6
100644
(file)
--- a/
arch/parisc/kernel/sys_parisc32.c
+++ b/
arch/parisc/kernel/sys_parisc32.c
@@
-205,10
+205,11
@@
static inline long get_ts32(struct timespec *o, struct compat_timeval *i)
asmlinkage long sys32_time(compat_time_t *tloc)
{
asmlinkage long sys32_time(compat_time_t *tloc)
{
- struct timeval tv;
+ struct timeval tv;
+ compat_time_t now32;
do_gettimeofday(&tv);
do_gettimeofday(&tv);
-
compat_time_t
now32 = tv.tv_sec;
+ now32 = tv.tv_sec;
if (tloc)
if (put_user(now32, tloc))
if (tloc)
if (put_user(now32, tloc))
@@
-344,7
+345,7
@@
filldir32 (void *__buf, const char *name, int namlen, loff_t offset, ino_t ino,
put_user(reclen, &dirent->d_reclen);
copy_to_user(dirent->d_name, name, namlen);
put_user(0, dirent->d_name + namlen);
put_user(reclen, &dirent->d_reclen);
copy_to_user(dirent->d_name, name, namlen);
put_user(0, dirent->d_name + namlen);
-
((char *) dirent) += reclen
;
+
dirent = (struct linux32_dirent *)((char *)dirent + reclen)
;
buf->current_dir = dirent;
buf->count -= reclen;
return 0;
buf->current_dir = dirent;
buf->count -= reclen;
return 0;