8 files changed, 12 insertions, 62 deletions

diff --git a/arch/m68knommu/Kconfig b/arch/m68knommu/Kconfig
index b96498120fe9..e2a6e8648960 100644
--- a/arch/m68knommu/Kconfig
+++ b/arch/m68knommu/Kconfig
@@ -17,10 +17,6 @@ config FPU
         bool
         default n
 
-config UID16
-        bool
-        default y
-
 config RWSEM_GENERIC_SPINLOCK
         bool
         default y
diff --git a/arch/m68knommu/Makefile b/arch/m68knommu/Makefile
index b6b5c14e55fd..6f880cbff1c8 100644
--- a/arch/m68knommu/Makefile
+++ b/arch/m68knommu/Makefile
@@ -99,7 +99,6 @@ cflags-$(CONFIG_M68360)		:= -m68332
 AFLAGS += $(cflags-y)
 
 CFLAGS += $(cflags-y)
-CFLAGS += -O1 -g
 CFLAGS += -D__linux__
 CFLAGS += -DUTS_SYSNAME=\"uClinux\"
 
diff --git a/arch/m68knommu/kernel/m68k_ksyms.c b/arch/m68knommu/kernel/m68k_ksyms.c
index e93a5ad56496..eddb8d3e130a 100644
--- a/arch/m68knommu/kernel/m68k_ksyms.c
+++ b/arch/m68knommu/kernel/m68k_ksyms.c
@@ -18,7 +18,6 @@
 #include <asm/checksum.h>
 #include <asm/current.h>
 
-extern void dump_thread(struct pt_regs *, struct user *);
 extern int dump_fpu(struct pt_regs *, elf_fpregset_t *);
 
 /* platform dependent support */
@@ -26,7 +25,6 @@ extern int dump_fpu(struct pt_regs *, elf_fpregset_t *);
 EXPORT_SYMBOL(__ioremap);
 EXPORT_SYMBOL(iounmap);
 EXPORT_SYMBOL(dump_fpu);
-EXPORT_SYMBOL(dump_thread);
 EXPORT_SYMBOL(strnlen);
 EXPORT_SYMBOL(strrchr);
 EXPORT_SYMBOL(strstr);
@@ -38,8 +36,6 @@ EXPORT_SYMBOL(strncmp);
 
 EXPORT_SYMBOL(ip_fast_csum);
 
-EXPORT_SYMBOL(mach_enable_irq);
-EXPORT_SYMBOL(mach_disable_irq);
 EXPORT_SYMBOL(kernel_thread);
 
 /* Networking helper routines. */
diff --git a/arch/m68knommu/kernel/process.c b/arch/m68knommu/kernel/process.c
index 82e7ec888806..99bf43824795 100644
--- a/arch/m68knommu/kernel/process.c
+++ b/arch/m68knommu/kernel/process.c
@@ -198,10 +198,9 @@ int copy_thread(int nr, unsigned long clone_flags,
 {
         struct pt_regs * childregs;
         struct switch_stack * childstack, *stack;
-        unsigned long stack_offset, *retp;
+        unsigned long *retp;
 
-        stack_offset = THREAD_SIZE - sizeof(struct pt_regs);
-        childregs = (struct pt_regs *) ((unsigned long) p->thread_info + stack_offset);
+        childregs = (struct pt_regs *) (task_stack_page(p) + THREAD_SIZE) - 1;
 
         *childregs = *regs;
         childregs->d0 = 0;
@@ -276,52 +275,6 @@ int dump_fpu(struct pt_regs *regs, struct user_m68kfp_struct *fpu)
 }
 
 /*
- * fill in the user structure for a core dump..
- */
-void dump_thread(struct pt_regs * regs, struct user * dump)
-{
-        struct switch_stack *sw;
-
-        /* changed the size calculations - should hopefully work better. lbt */
-        dump->magic = CMAGIC;
-        dump->start_code = 0;
-        dump->start_stack = rdusp() & ~(PAGE_SIZE - 1);
-        dump->u_tsize = ((unsigned long) current->mm->end_code) >> PAGE_SHIFT;
-        dump->u_dsize = ((unsigned long) (current->mm->brk +
-                                          (PAGE_SIZE-1))) >> PAGE_SHIFT;
-        dump->u_dsize -= dump->u_tsize;
-        dump->u_ssize = 0;
-
-        if (dump->start_stack < TASK_SIZE)
-                dump->u_ssize = ((unsigned long) (TASK_SIZE - dump->start_stack)) >> PAGE_SHIFT;
-
-        dump->u_ar0 = (struct user_regs_struct *)((int)&dump->regs - (int)dump);
-        sw = ((struct switch_stack *)regs) - 1;
-        dump->regs.d1 = regs->d1;
-        dump->regs.d2 = regs->d2;
-        dump->regs.d3 = regs->d3;
-        dump->regs.d4 = regs->d4;
-        dump->regs.d5 = regs->d5;
-        dump->regs.d6 = sw->d6;
-        dump->regs.d7 = sw->d7;
-        dump->regs.a0 = regs->a0;
-        dump->regs.a1 = regs->a1;
-        dump->regs.a2 = regs->a2;
-        dump->regs.a3 = sw->a3;
-        dump->regs.a4 = sw->a4;
-        dump->regs.a5 = sw->a5;
-        dump->regs.a6 = sw->a6;
-        dump->regs.d0 = regs->d0;
-        dump->regs.orig_d0 = regs->orig_d0;
-        dump->regs.stkadj = regs->stkadj;
-        dump->regs.sr = regs->sr;
-        dump->regs.pc = regs->pc;
-        dump->regs.fmtvec = (regs->format << 12) | regs->vector;
-        /* dump floating point stuff */
-        dump->u_fpvalid = dump_fpu (regs, &dump->m68kfp);
-}
-
-/*
  *      Generic dumping code. Used for panic and debug.
  */
 void dump(struct pt_regs *fp)
diff --git a/arch/m68knommu/kernel/ptrace.c b/arch/m68knommu/kernel/ptrace.c
index 262ab8c72e5f..382ca5797b97 100644
--- a/arch/m68knommu/kernel/ptrace.c
+++ b/arch/m68knommu/kernel/ptrace.c
@@ -101,7 +101,7 @@ void ptrace_disable(struct task_struct *child)
         put_reg(child, PT_SR, tmp);
 }
 
-long arch_ptrace(truct task_struct *child, long request, long addr, long data)
+long arch_ptrace(struct task_struct *child, long request, long addr, long data)
 {
         int ret;
 
diff --git a/arch/m68knommu/kernel/setup.c b/arch/m68knommu/kernel/setup.c
index abb80fa2b940..93120b9bfff1 100644
--- a/arch/m68knommu/kernel/setup.c
+++ b/arch/m68knommu/kernel/setup.c
@@ -65,8 +65,6 @@ void (*mach_kbd_leds) (unsigned int) = NULL;
 /* machine dependent irq functions */
 void (*mach_init_IRQ) (void) = NULL;
 irqreturn_t (*(*mach_default_handler)[]) (int, void *, struct pt_regs *) = NULL;
-void (*mach_enable_irq) (unsigned int) = NULL;
-void (*mach_disable_irq) (unsigned int) = NULL;
 int (*mach_get_irq_list) (struct seq_file *, void *) = NULL;
 void (*mach_process_int) (int irq, struct pt_regs *fp) = NULL;
 void (*mach_trap_init) (void);
diff --git a/arch/m68knommu/kernel/signal.c b/arch/m68knommu/kernel/signal.c
index 43a2726c0d0a..e1b3aa39e270 100644
--- a/arch/m68knommu/kernel/signal.c
+++ b/arch/m68knommu/kernel/signal.c
@@ -285,6 +285,7 @@ restore_sigcontext(struct pt_regs *regs, struct sigcontext *usc, void *fp,
         regs->d1 = context.sc_d1;
         regs->a0 = context.sc_a0;
         regs->a1 = context.sc_a1;
+        ((struct switch_stack *)regs - 1)->a5 = context.sc_a5;
         regs->sr = (regs->sr & 0xff00) | (context.sc_sr & 0xff);
         regs->pc = context.sc_pc;
         regs->orig_d0 = -1;             /* disable syscall checks */
@@ -498,6 +499,7 @@ static void setup_sigcontext(struct sigcontext *sc, struct pt_regs *regs,
         sc->sc_d1 = regs->d1;
         sc->sc_a0 = regs->a0;
         sc->sc_a1 = regs->a1;
+        sc->sc_a5 = ((struct switch_stack *)regs - 1)->a5;
         sc->sc_sr = regs->sr;
         sc->sc_pc = regs->pc;
         sc->sc_formatvec = regs->format << 12 | regs->vector;
@@ -597,6 +599,9 @@ static void setup_frame (int sig, struct k_sigaction *ka,
         /* Set up registers for signal handler */
         wrusp ((unsigned long) frame);
         regs->pc = (unsigned long) ka->sa.sa_handler;
+        ((struct switch_stack *)regs - 1)->a5 = current->mm->start_data;
+        regs->format = 0x4; /*set format byte to make stack appear modulo 4 
+                                                which it will be when doing the rte */
 
 adjust_stack:
         /* Prepare to skip over the extra stuff in the exception frame.  */
@@ -664,6 +669,9 @@ static void setup_rt_frame (int sig, struct k_sigaction *ka, siginfo_t *info,
         /* Set up registers for signal handler */
         wrusp ((unsigned long) frame);
         regs->pc = (unsigned long) ka->sa.sa_handler;
+        ((struct switch_stack *)regs - 1)->a5 = current->mm->start_data;
+        regs->format = 0x4; /*set format byte to make stack appear modulo 4 
+                                                which it will be when doing the rte */
 
 adjust_stack:
         /* Prepare to skip over the extra stuff in the exception frame.  */
diff --git a/arch/m68knommu/kernel/vmlinux.lds.S b/arch/m68knommu/kernel/vmlinux.lds.S
index 0eab92ca4b97..ac9de2661c0b 100644
--- a/arch/m68knommu/kernel/vmlinux.lds.S
+++ b/arch/m68knommu/kernel/vmlinux.lds.S
@@ -129,7 +129,7 @@
  */
 #if defined(CONFIG_M5208EVB)
 #define RAM_START       0x40020000
-#define RAM_LENGTH      0x01e00000
+#define RAM_LENGTH      0x01fe0000
 #endif
 
 /*