Merge branch 'master' of /home/sam/kernel/linux-2.6/

[karo-tx-linux.git] / kernel / compat.c

diff --git a/kernel/compat.c b/kernel/compat.c
index ccea93e28954fb5594eaef0b8982d4ef98ad977d..126dee9530aacc13a37d304ee8a4b54f69355a82 100644 (file)
--- a/kernel/compat.c
+++ b/kernel/compat.c
@@ -730,17 +730,10 @@ void
 sigset_from_compat (sigset_t *set, compat_sigset_t *compat)
 {
        switch (_NSIG_WORDS) {
-#if defined (__COMPAT_ENDIAN_SWAP__)
-       case 4: set->sig[3] = compat->sig[7] | (((long)compat->sig[6]) << 32 );
-       case 3: set->sig[2] = compat->sig[5] | (((long)compat->sig[4]) << 32 );
-       case 2: set->sig[1] = compat->sig[3] | (((long)compat->sig[2]) << 32 );
-       case 1: set->sig[0] = compat->sig[1] | (((long)compat->sig[0]) << 32 );
-#else
        case 4: set->sig[3] = compat->sig[6] | (((long)compat->sig[7]) << 32 );
        case 3: set->sig[2] = compat->sig[4] | (((long)compat->sig[5]) << 32 );
        case 2: set->sig[1] = compat->sig[2] | (((long)compat->sig[3]) << 32 );
        case 1: set->sig[0] = compat->sig[0] | (((long)compat->sig[1]) << 32 );
-#endif
        }
 }
 
@@ -938,7 +931,7 @@ asmlinkage long compat_sys_adjtimex(struct compat_timex __user *utp)
 
 #ifdef CONFIG_NUMA
 asmlinkage long compat_sys_move_pages(pid_t pid, unsigned long nr_pages,
-               void __user *pages32,
+               compat_uptr_t __user *pages32,
                const int __user *nodes,
                int __user *status,
                int flags)
@@ -950,7 +943,7 @@ asmlinkage long compat_sys_move_pages(pid_t pid, unsigned long nr_pages,
        for (i = 0; i < nr_pages; i++) {
                compat_uptr_t p;
 
-               if (get_user(p, (compat_uptr_t *)(pages32 + i)) ||
+               if (get_user(p, pages32 + i) ||
                        put_user(compat_ptr(p), pages + i))
                        return -EFAULT;
        }