Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Signed-off-by: Steve French <sfrench@us.ibm.com>

5 files changed, 11 insertions, 77 deletions

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 64f5ae0ff9..8cf6d437a6 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -14,10 +14,6 @@ config SUPERH
           gaming console.  The SuperH port has a home page at
           <http://www.linux-sh.org/>.
 
-config UID16
-        bool
-        default y
-
 config RWSEM_GENERIC_SPINLOCK
         bool
         default y
diff --git a/arch/sh/kernel/process.c b/arch/sh/kernel/process.c
index fd4f240b83..aac15e42d0 100644
--- a/arch/sh/kernel/process.c
+++ b/arch/sh/kernel/process.c
@@ -191,13 +191,8 @@ void flush_thread(void)
 {
 #if defined(CONFIG_SH_FPU)
         struct task_struct *tsk = current;
-        struct pt_regs *regs = (struct pt_regs *)
-                                ((unsigned long)tsk->thread_info
-                                 + THREAD_SIZE - sizeof(struct pt_regs)
-                                 - sizeof(unsigned long));
-
         /* Forget lazy FPU state */
-        clear_fpu(tsk, regs);
+        clear_fpu(tsk, task_pt_regs(tsk));
         clear_used_math();
 #endif
 }
@@ -232,13 +227,7 @@ int dump_task_regs(struct task_struct *tsk, elf_gregset_t *regs)
 {
         struct pt_regs ptregs;
         
-        ptregs = *(struct pt_regs *)
-                ((unsigned long)tsk->thread_info + THREAD_SIZE
-                 - sizeof(struct pt_regs)
-#ifdef CONFIG_SH_DSP
-                 - sizeof(struct pt_dspregs)
-#endif
-                 - sizeof(unsigned long));
+        ptregs = *task_pt_regs(tsk);
         elf_core_copy_regs(regs, &ptregs);
 
         return 1;
@@ -252,11 +241,7 @@ dump_task_fpu (struct task_struct *tsk, elf_fpregset_t *fpu)
 #if defined(CONFIG_SH_FPU)
         fpvalid = !!tsk_used_math(tsk);
         if (fpvalid) {
-                struct pt_regs *regs = (struct pt_regs *)
-                                        ((unsigned long)tsk->thread_info
-                                         + THREAD_SIZE - sizeof(struct pt_regs)
-                                         - sizeof(unsigned long));
-                unlazy_fpu(tsk, regs);
+                unlazy_fpu(tsk, task_pt_regs(tsk));
                 memcpy(fpu, &tsk->thread.fpu.hard, sizeof(*fpu));
         }
 #endif
@@ -279,18 +264,13 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
         copy_to_stopped_child_used_math(p);
 #endif
 
-        childregs = ((struct pt_regs *)
-                (THREAD_SIZE + (unsigned long) p->thread_info)
-#ifdef CONFIG_SH_DSP
-                - sizeof(struct pt_dspregs)
-#endif
-                - sizeof(unsigned long)) - 1;
+        childregs = task_pt_regs(p);
         *childregs = *regs;
 
         if (user_mode(regs)) {
                 childregs->regs[15] = usp;
         } else {
-                childregs->regs[15] = (unsigned long)p->thread_info + THREAD_SIZE;
+                childregs->regs[15] = (unsigned long)task_stack_page(p) + THREAD_SIZE;
         }
         if (clone_flags & CLONE_SETTLS) {
                 childregs->gbr = childregs->regs[0];
@@ -305,26 +285,6 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
         return 0;
 }
 
-/*
- * fill in the user structure for a core dump..
- */
-void dump_thread(struct pt_regs * regs, struct user * dump)
-{
-        dump->magic = CMAGIC;
-        dump->start_code = current->mm->start_code;
-        dump->start_data  = current->mm->start_data;
-        dump->start_stack = regs->regs[15] & ~(PAGE_SIZE - 1);
-        dump->u_tsize = (current->mm->end_code - dump->start_code) >> PAGE_SHIFT;
-        dump->u_dsize = (current->mm->brk + (PAGE_SIZE-1) - dump->start_data) >> PAGE_SHIFT;
-        dump->u_ssize = (current->mm->start_stack - dump->start_stack +
-                         PAGE_SIZE - 1) >> PAGE_SHIFT;
-        /* Debug registers will come here. */
-
-        dump->regs = *regs;
-
-        dump->u_fpvalid = dump_fpu(regs, &dump->fpu);
-}
-
 /* Tracing by user break controller.  */
 static void
 ubc_set_tracing(int asid, unsigned long pc)
@@ -353,11 +313,7 @@ ubc_set_tracing(int asid, unsigned long pc)
 struct task_struct *__switch_to(struct task_struct *prev, struct task_struct *next)
 {
 #if defined(CONFIG_SH_FPU)
-        struct pt_regs *regs = (struct pt_regs *)
-                                ((unsigned long)prev->thread_info
-                                 + THREAD_SIZE - sizeof(struct pt_regs)
-                                 - sizeof(unsigned long));
-        unlazy_fpu(prev, regs);
+        unlazy_fpu(prev, task_pt_regs(prev));
 #endif
 
 #ifdef CONFIG_PREEMPT
@@ -366,13 +322,7 @@ struct task_struct *__switch_to(struct task_struct *prev, struct task_struct *ne
                 struct pt_regs *regs;
 
                 local_irq_save(flags);
-                regs = (struct pt_regs *)
-                        ((unsigned long)prev->thread_info
-                         + THREAD_SIZE - sizeof(struct pt_regs)
-#ifdef CONFIG_SH_DSP
-                         - sizeof(struct pt_dspregs)
-#endif
-                         - sizeof(unsigned long));
+                regs = task_pt_regs(prev);
                 if (user_mode(regs) && regs->regs[15] >= 0xc0000000) {
                         int offset = (int)regs->regs[15];
 
@@ -392,7 +342,7 @@ struct task_struct *__switch_to(struct task_struct *prev, struct task_struct *ne
          */
         asm volatile("ldc       %0, r7_bank"
                      : /* no output */
-                     : "r" (next->thread_info));
+                     : "r" (task_thread_info(next)));
 
 #ifdef CONFIG_MMU
         /* If no tasks are using the UBC, we're done */
diff --git a/arch/sh/kernel/ptrace.c b/arch/sh/kernel/ptrace.c
index 1a8be06519..3887b4f6fe 100644
--- a/arch/sh/kernel/ptrace.c
+++ b/arch/sh/kernel/ptrace.c
@@ -41,12 +41,7 @@ static inline int get_stack_long(struct task_struct *task, int offset)
 {
         unsigned char *stack;
 
-        stack = (unsigned char *)
-                task->thread_info + THREAD_SIZE - sizeof(struct pt_regs)
-#ifdef CONFIG_SH_DSP
-                - sizeof(struct pt_dspregs)
-#endif
-                - sizeof(unsigned long);
+        stack = (unsigned char *)task_pt_regs(task);
         stack += offset;
         return (*((int *)stack));
 }
@@ -59,12 +54,7 @@ static inline int put_stack_long(struct task_struct *task, int offset,
 {
         unsigned char *stack;
 
-        stack = (unsigned char *)
-                task->thread_info + THREAD_SIZE - sizeof(struct pt_regs)
-#ifdef CONFIG_SH_DSP
-                - sizeof(struct pt_dspregs)
-#endif
-                - sizeof(unsigned long);
+        stack = (unsigned char *)task_pt_regs(task);
         stack += offset;
         *(unsigned long *) stack = data;
         return 0;
diff --git a/arch/sh/kernel/sh_ksyms.c b/arch/sh/kernel/sh_ksyms.c
index 6954fd6247..1cf94a618b 100644
--- a/arch/sh/kernel/sh_ksyms.c
+++ b/arch/sh/kernel/sh_ksyms.c
@@ -21,14 +21,12 @@
 #include <asm/cacheflush.h>
 #include <asm/checksum.h>
 
-extern void dump_thread(struct pt_regs *, struct user *);
 extern int dump_fpu(struct pt_regs *, elf_fpregset_t *);
 extern struct hw_interrupt_type no_irq_type;
 
 EXPORT_SYMBOL(sh_mv);
 
 /* platform dependent support */
-EXPORT_SYMBOL(dump_thread);
 EXPORT_SYMBOL(dump_fpu);
 EXPORT_SYMBOL(iounmap);
 EXPORT_SYMBOL(enable_irq);
diff --git a/arch/sh/kernel/smp.c b/arch/sh/kernel/smp.c
index 59e49b1825..62c7d1c0ad 100644
--- a/arch/sh/kernel/smp.c
+++ b/arch/sh/kernel/smp.c
@@ -103,7 +103,7 @@ int __cpu_up(unsigned int cpu)
         if (IS_ERR(tsk))
                 panic("Failed forking idle task for cpu %d\n", cpu);
         
-        tsk->thread_info->cpu = cpu;
+        task_thread_info(tsk)->cpu = cpu;
 
         cpu_set(cpu, cpu_online_map);