This commit was manufactured by cvs2svn to create tag
[linux-2.6.git] / arch / parisc / kernel / sys_parisc32.c
index e783325..cd320b2 100644 (file)
@@ -205,11 +205,10 @@ static inline long get_ts32(struct timespec *o, struct compat_timeval *i)
 
 asmlinkage long sys32_time(compat_time_t *tloc)
 {
-       struct timeval tv;
-       compat_time_t now32;
+    struct timeval tv;
 
        do_gettimeofday(&tv);
-       now32 = tv.tv_sec;
+       compat_time_t now32 = tv.tv_sec;
 
        if (tloc)
                if (put_user(now32, tloc))
@@ -345,7 +344,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);
-       dirent = (struct linux32_dirent *)((char *)dirent + reclen);
+       ((char *) dirent) += reclen;
        buf->current_dir = dirent;
        buf->count -= reclen;
        return 0;
@@ -677,6 +676,7 @@ asmlinkage int sys32_sysinfo(struct sysinfo32 *info)
 
        do {
                seq = read_seqbegin(&xtime_lock);
+               /* requires vx virtualization */
                val.uptime = jiffies / HZ;
 
                val.loads[0] = avenrun[0] << (SI_LOAD_SHIFT - FSHIFT);