7 files changed, 51 insertions, 37 deletions

diff --git a/arch/m68knommu/kernel/m68k_ksyms.c b/arch/m68knommu/kernel/m68k_ksyms.c
index 1e62150f3588..25327c9eadd7 100644
--- a/arch/m68knommu/kernel/m68k_ksyms.c
+++ b/arch/m68knommu/kernel/m68k_ksyms.c
@@ -38,7 +38,7 @@ EXPORT_SYMBOL(ip_fast_csum);
 EXPORT_SYMBOL(kernel_thread);
 
 /* Networking helper routines. */
-EXPORT_SYMBOL(csum_partial_copy);
+EXPORT_SYMBOL(csum_partial_copy_nocheck);
 
 /* The following are special because they're not called
    explicitly (the C compiler generates them).  Fortunately,
diff --git a/arch/m68knommu/kernel/process.c b/arch/m68knommu/kernel/process.c
index c18a83306953..941955dc3b7c 100644
--- a/arch/m68knommu/kernel/process.c
+++ b/arch/m68knommu/kernel/process.c
@@ -290,7 +290,7 @@ void dump(struct pt_regs *fp)
         unsigned char   *tp;
         int             i;
 
-        printk(KERN_EMERG "\nCURRENT PROCESS:\n\n");
+        printk(KERN_EMERG "\n" KERN_EMERG "CURRENT PROCESS:\n" KERN_EMERG "\n");
         printk(KERN_EMERG "COMM=%s PID=%d\n", current->comm, current->pid);
 
         if (current->mm) {
@@ -301,7 +301,8 @@ void dump(struct pt_regs *fp)
                         (int) current->mm->end_data,
                         (int) current->mm->end_data,
                         (int) current->mm->brk);
-                printk(KERN_EMERG "USER-STACK=%08x  KERNEL-STACK=%08x\n\n",
+                printk(KERN_EMERG "USER-STACK=%08x KERNEL-STACK=%08x\n"
+                        KERN_EMERG "\n",
                         (int) current->mm->start_stack,
                         (int)(((unsigned long) current) + THREAD_SIZE));
         }
@@ -312,36 +313,35 @@ void dump(struct pt_regs *fp)
                 fp->d0, fp->d1, fp->d2, fp->d3);
         printk(KERN_EMERG "d4: %08lx    d5: %08lx    a0: %08lx    a1: %08lx\n",
                 fp->d4, fp->d5, fp->a0, fp->a1);
-        printk(KERN_EMERG "\nUSP: %08x   TRAPFRAME: %08x\n", (unsigned int) rdusp(),
-                (unsigned int) fp);
+        printk(KERN_EMERG "\n" KERN_EMERG "USP: %08x   TRAPFRAME: %08x\n",
+                (unsigned int) rdusp(), (unsigned int) fp);
 
-        printk(KERN_EMERG "\nCODE:");
+        printk(KERN_EMERG "\n" KERN_EMERG "CODE:");
         tp = ((unsigned char *) fp->pc) - 0x20;
         for (sp = (unsigned long *) tp, i = 0; (i < 0x40);  i += 4) {
                 if ((i % 0x10) == 0)
-                        printk(KERN_EMERG "\n%08x: ", (int) (tp + i));
-                printk(KERN_EMERG "%08x ", (int) *sp++);
+                        printk("\n" KERN_EMERG "%08x: ", (int) (tp + i));
+                printk("%08x ", (int) *sp++);
         }
-        printk(KERN_EMERG "\n");
+        printk("\n" KERN_EMERG "\n");
 
-        printk(KERN_EMERG "\nKERNEL STACK:");
+        printk(KERN_EMERG "KERNEL STACK:");
         tp = ((unsigned char *) fp) - 0x40;
         for (sp = (unsigned long *) tp, i = 0; (i < 0xc0); i += 4) {
                 if ((i % 0x10) == 0)
-                        printk(KERN_EMERG "\n%08x: ", (int) (tp + i));
-                printk(KERN_EMERG "%08x ", (int) *sp++);
+                        printk("\n" KERN_EMERG "%08x: ", (int) (tp + i));
+                printk("%08x ", (int) *sp++);
         }
-        printk(KERN_EMERG "\n");
-        printk(KERN_EMERG "\n");
+        printk("\n" KERN_EMERG "\n");
 
-        printk(KERN_EMERG "\nUSER STACK:");
+        printk(KERN_EMERG "USER STACK:");
         tp = (unsigned char *) (rdusp() - 0x10);
         for (sp = (unsigned long *) tp, i = 0; (i < 0x80); i += 4) {
                 if ((i % 0x10) == 0)
-                        printk(KERN_EMERG "\n%08x: ", (int) (tp + i));
-                printk(KERN_EMERG "%08x ", (int) *sp++);
+                        printk("\n" KERN_EMERG "%08x: ", (int) (tp + i));
+                printk("%08x ", (int) *sp++);
         }
-        printk(KERN_EMERG "\n\n");
+        printk("\n" KERN_EMERG "\n");
 }
 
 /*
diff --git a/arch/m68knommu/kernel/setup.c b/arch/m68knommu/kernel/setup.c
index bde9811cf98c..9cf2e4d1fc77 100644
--- a/arch/m68knommu/kernel/setup.c
+++ b/arch/m68knommu/kernel/setup.c
@@ -36,10 +36,7 @@
 #include <asm/setup.h>
 #include <asm/irq.h>
 #include <asm/machdep.h>
-
-#ifdef CONFIG_BLK_DEV_INITRD
 #include <asm/pgtable.h>
-#endif
 
 unsigned long memory_start;
 unsigned long memory_end;
@@ -62,7 +59,7 @@ int (*mach_kbdrate) (struct kbd_repeat *);
 void (*mach_kbd_leds) (unsigned int);
 /* machine dependent irq functions */
 void (*mach_init_IRQ) (void);
-irqreturn_t (*(*mach_default_handler)[]) (int, void *, struct pt_regs *);
+irq_handler_t mach_default_handler;
 int (*mach_get_irq_list) (struct seq_file *, void *);
 void (*mach_process_int) (int irq, struct pt_regs *fp);
 void (*mach_trap_init) (void);
diff --git a/arch/m68knommu/kernel/sys_m68k.c b/arch/m68knommu/kernel/sys_m68k.c
index c3494b8447d1..3265b2d734db 100644
--- a/arch/m68knommu/kernel/sys_m68k.c
+++ b/arch/m68knommu/kernel/sys_m68k.c
@@ -137,7 +137,7 @@ asmlinkage int old_select(struct sel_arg_struct *arg)
 asmlinkage int sys_ipc (uint call, int first, int second,
                         int third, void *ptr, long fifth)
 {
-        int version;
+        int version, ret;
 
         version = call >> 16; /* hack for backward compatibility */
         call &= 0xffff;
@@ -190,6 +190,27 @@ asmlinkage int sys_ipc (uint call, int first, int second,
                 default:
                         return -EINVAL;
                 }
+        if (call <= SHMCTL)
+                switch (call) {
+                case SHMAT:
+                        switch (version) {
+                        default: {
+                                ulong raddr;
+                                ret = do_shmat (first, ptr, second, &raddr);
+                                if (ret)
+                                        return ret;
+                                return put_user (raddr, (ulong __user *) third);
+                        }
+                        }
+                case SHMDT:
+                        return sys_shmdt (ptr);
+                case SHMGET:
+                        return sys_shmget (first, second, third);
+                case SHMCTL:
+                        return sys_shmctl (first, second, ptr);
+                default:
+                        return -ENOSYS;
+                }
 
         return -EINVAL;
 }
diff --git a/arch/m68knommu/kernel/time.c b/arch/m68knommu/kernel/time.c
index c5667bdddd5e..9226264abf1a 100644
--- a/arch/m68knommu/kernel/time.c
+++ b/arch/m68knommu/kernel/time.c
@@ -54,7 +54,7 @@ static irqreturn_t timer_interrupt(int irq, void *dummy, struct pt_regs * regs)
         update_process_times(user_mode(regs));
 #endif
         if (current->pid)
-                profile_tick(CPU_PROFILING, regs);
+                profile_tick(CPU_PROFILING);
 
         /*
          * If we have an externally synchronized Linux clock, then update
diff --git a/arch/m68knommu/kernel/traps.c b/arch/m68knommu/kernel/traps.c
index 17649d2543ef..9129b3a5258b 100644
--- a/arch/m68knommu/kernel/traps.c
+++ b/arch/m68knommu/kernel/traps.c
@@ -127,11 +127,12 @@ void show_stack(struct task_struct *task, unsigned long *stack)
                 if (stack + 1 > endstack)
                         break;
                 if (i % 8 == 0)
-                        printk(KERN_EMERG "\n       ");
-                printk(KERN_EMERG " %08lx", *stack++);
+                        printk("\n" KERN_EMERG "       ");
+                printk(" %08lx", *stack++);
         }
+        printk("\n");
 
-        printk(KERN_EMERG "\nCall Trace:");
+        printk(KERN_EMERG "Call Trace:");
         i = 0;
         while (stack + 1 <= endstack) {
                 addr = *stack++;
@@ -146,12 +147,12 @@ void show_stack(struct task_struct *task, unsigned long *stack)
                 if (((addr >= (unsigned long) &_start) &&
                      (addr <= (unsigned long) &_etext))) {
                         if (i % 4 == 0)
-                                printk(KERN_EMERG "\n       ");
-                        printk(KERN_EMERG " [<%08lx>]", addr);
+                                printk("\n" KERN_EMERG "       ");
+                        printk(" [<%08lx>]", addr);
                         i++;
                 }
         }
-        printk(KERN_EMERG "\n");
+        printk("\n");
 }
 
 void bad_super_trap(struct frame *fp)
diff --git a/arch/m68knommu/kernel/vmlinux.lds.S b/arch/m68knommu/kernel/vmlinux.lds.S
index ccd2ceb05cfb..2b2a10da64a4 100644
--- a/arch/m68knommu/kernel/vmlinux.lds.S
+++ b/arch/m68knommu/kernel/vmlinux.lds.S
@@ -60,6 +60,7 @@ SECTIONS {
 #endif
 
         .text : {
+                _text = .;
                 _stext = . ;
                 *(.text)
                 SCHED_TEXT
@@ -140,13 +141,7 @@ SECTIONS {
                 *(.init.setup)
                 __setup_end = .;
                 __initcall_start = .;
-                *(.initcall1.init)
-                *(.initcall2.init)
-                *(.initcall3.init)
-                *(.initcall4.init)
-                *(.initcall5.init)
-                *(.initcall6.init)
-                *(.initcall7.init)
+                INITCALLS
                 __initcall_end = .;
                 __con_initcall_start = .;
                 *(.con_initcall.init)