Merge branch 'linux-2.6' into for-2.6.22

3 files changed, 16 insertions, 12 deletions

diff --git a/arch/sparc/kernel/process.c b/arch/sparc/kernel/process.c
index 113bd48a89bd..fc874e63a499 100644
--- a/arch/sparc/kernel/process.c
+++ b/arch/sparc/kernel/process.c
@@ -348,7 +348,7 @@ void exit_thread(void)
 #ifndef CONFIG_SMP
         if(last_task_used_math == current) {
 #else
-        if(current_thread_info()->flags & _TIF_USEDFPU) {
+        if (test_thread_flag(TIF_USEDFPU)) {
 #endif
                 /* Keep process from leaving FPU in a bogon state. */
                 put_psr(get_psr() | PSR_EF);
@@ -357,7 +357,7 @@ void exit_thread(void)
 #ifndef CONFIG_SMP
                 last_task_used_math = NULL;
 #else
-                current_thread_info()->flags &= ~_TIF_USEDFPU;
+                clear_thread_flag(TIF_USEDFPU);
 #endif
         }
 }
@@ -371,7 +371,7 @@ void flush_thread(void)
 #ifndef CONFIG_SMP
         if(last_task_used_math == current) {
 #else
-        if(current_thread_info()->flags & _TIF_USEDFPU) {
+        if (test_thread_flag(TIF_USEDFPU)) {
 #endif
                 /* Clean the fpu. */
                 put_psr(get_psr() | PSR_EF);
@@ -380,7 +380,7 @@ void flush_thread(void)
 #ifndef CONFIG_SMP
                 last_task_used_math = NULL;
 #else
-                current_thread_info()->flags &= ~_TIF_USEDFPU;
+                clear_thread_flag(TIF_USEDFPU);
 #endif
         }
 
@@ -466,13 +466,13 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long sp,
 #ifndef CONFIG_SMP
         if(last_task_used_math == current) {
 #else
-        if(current_thread_info()->flags & _TIF_USEDFPU) {
+        if (test_thread_flag(TIF_USEDFPU)) {
 #endif
                 put_psr(get_psr() | PSR_EF);
                 fpsave(&p->thread.float_regs[0], &p->thread.fsr,
                        &p->thread.fpqueue[0], &p->thread.fpqdepth);
 #ifdef CONFIG_SMP
-                current_thread_info()->flags &= ~_TIF_USEDFPU;
+                clear_thread_flag(TIF_USEDFPU);
 #endif
         }
 
@@ -609,13 +609,13 @@ int dump_fpu (struct pt_regs * regs, elf_fpregset_t * fpregs)
                 return 1;
         }
 #ifdef CONFIG_SMP
-        if (current_thread_info()->flags & _TIF_USEDFPU) {
+        if (test_thread_flag(TIF_USEDFPU)) {
                 put_psr(get_psr() | PSR_EF);
                 fpsave(&current->thread.float_regs[0], &current->thread.fsr,
                        &current->thread.fpqueue[0], &current->thread.fpqdepth);
                 if (regs != NULL) {
                         regs->psr &= ~(PSR_EF);
-                        current_thread_info()->flags &= ~(_TIF_USEDFPU);
+                        clear_thread_flag(TIF_USEDFPU);
                 }
         }
 #else
diff --git a/arch/sparc/kernel/systbls.S b/arch/sparc/kernel/systbls.S
index ea75ca569052..3a69778c8366 100644
--- a/arch/sparc/kernel/systbls.S
+++ b/arch/sparc/kernel/systbls.S
@@ -78,7 +78,8 @@ sys_call_table:
 /*285*/ .long sys_mkdirat, sys_mknodat, sys_fchownat, sys_futimesat, sys_fstatat64
 /*290*/ .long sys_unlinkat, sys_renameat, sys_linkat, sys_symlinkat, sys_readlinkat
 /*295*/ .long sys_fchmodat, sys_faccessat, sys_pselect6, sys_ppoll, sys_unshare
-/*300*/ .long sys_set_robust_list, sys_get_robust_list, sys_migrate_pages
+/*300*/ .long sys_set_robust_list, sys_get_robust_list, sys_migrate_pages, sys_mbind, sys_get_mempolicy
+/*305*/ .long sys_set_mempolicy, sys_kexec_load, sys_move_pages, sys_getcpu, sys_epoll_pwait
 
 #ifdef CONFIG_SUNOS_EMUL
         /* Now the SunOS syscall table. */
@@ -192,5 +193,8 @@ sunos_sys_table:
         .long sunos_nosys, sunos_nosys, sunos_nosys
         .long sunos_nosys
 /*300*/ .long sunos_nosys, sunos_nosys, sunos_nosys
+        .long sunos_nosys, sunos_nosys, sunos_nosys
+        .long sunos_nosys, sunos_nosys, sunos_nosys
+        .long sunos_nosys
 
 #endif
diff --git a/arch/sparc/kernel/traps.c b/arch/sparc/kernel/traps.c
index 6a70d215fd04..527687afc1c4 100644
--- a/arch/sparc/kernel/traps.c
+++ b/arch/sparc/kernel/traps.c
@@ -259,7 +259,7 @@ void do_fpd_trap(struct pt_regs *regs, unsigned long pc, unsigned long npc,
         } else {
                 fpload(&current->thread.float_regs[0], &current->thread.fsr);
         }
-        current_thread_info()->flags |= _TIF_USEDFPU;
+        set_thread_flag(TIF_USEDFPU);
 #endif
 }
 
@@ -290,7 +290,7 @@ void do_fpe_trap(struct pt_regs *regs, unsigned long pc, unsigned long npc,
 #ifndef CONFIG_SMP
         if(!fpt) {
 #else
-        if(!(task_thread_info(fpt)->flags & _TIF_USEDFPU)) {
+        if (!test_tsk_thread_flag(fpt, TIF_USEDFPU)) {
 #endif
                 fpsave(&fake_regs[0], &fake_fsr, &fake_queue[0], &fake_depth);
                 regs->psr &= ~PSR_EF;
@@ -333,7 +333,7 @@ void do_fpe_trap(struct pt_regs *regs, unsigned long pc, unsigned long npc,
         /* nope, better SIGFPE the offending process... */
                
 #ifdef CONFIG_SMP
-        task_thread_info(fpt)->flags &= ~_TIF_USEDFPU;
+        clear_tsk_thread_flag(fpt, TIF_USEDFPU);
 #endif
         if(psr & PSR_PS) {
                 /* The first fsr store/load we tried trapped,