5 files changed, 21 insertions, 17 deletions

diff --git a/arch/m68knommu/kernel/ptrace.c b/arch/m68knommu/kernel/ptrace.c
index 9130119537b9..72d349623575 100644
--- a/arch/m68knommu/kernel/ptrace.c
+++ b/arch/m68knommu/kernel/ptrace.c
@@ -62,7 +62,7 @@ static inline long get_reg(struct task_struct *task, int regno)
 
         if (regno == PT_USP)
                 addr = &task->thread.usp;
-        else if (regno < sizeof(regoff)/sizeof(regoff[0]))
+        else if (regno < ARRAY_SIZE(regoff))
                 addr = (unsigned long *)(task->thread.esp0 + regoff[regno]);
         else
                 return 0;
@@ -79,7 +79,7 @@ static inline int put_reg(struct task_struct *task, int regno,
 
         if (regno == PT_USP)
                 addr = &task->thread.usp;
-        else if (regno < sizeof(regoff)/sizeof(regoff[0]))
+        else if (regno < ARRAY_SIZE(regoff))
                 addr = (unsigned long *) (task->thread.esp0 + regoff[regno]);
         else
                 return -1;
diff --git a/arch/m68knommu/kernel/setup.c b/arch/m68knommu/kernel/setup.c
index 9cf2e4d1fc77..d5c25d27b64d 100644
--- a/arch/m68knommu/kernel/setup.c
+++ b/arch/m68knommu/kernel/setup.c
@@ -44,7 +44,7 @@ unsigned long memory_end;
 EXPORT_SYMBOL(memory_start);
 EXPORT_SYMBOL(memory_end);
 
-char command_line[COMMAND_LINE_SIZE];
+char __initdata command_line[COMMAND_LINE_SIZE];
 
 /* setup some dummy routines */
 static void dummy_waitbut(void)
@@ -231,8 +231,8 @@ void setup_arch(char **cmdline_p)
 
         /* Keep a copy of command line */
         *cmdline_p = &command_line[0];
-        memcpy(saved_command_line, command_line, COMMAND_LINE_SIZE);
-        saved_command_line[COMMAND_LINE_SIZE-1] = 0;
+        memcpy(boot_command_line, command_line, COMMAND_LINE_SIZE);
+        boot_command_line[COMMAND_LINE_SIZE-1] = 0;
 
 #ifdef DEBUG
         if (strlen(*cmdline_p))
diff --git a/arch/m68knommu/kernel/time.c b/arch/m68knommu/kernel/time.c
index 9226264abf1a..467053da2d08 100644
--- a/arch/m68knommu/kernel/time.c
+++ b/arch/m68knommu/kernel/time.c
@@ -23,6 +23,7 @@
 
 #include <asm/machdep.h>
 #include <asm/io.h>
+#include <asm/irq_regs.h>
 
 #define TICK_SIZE (tick_nsec / 1000)
 
@@ -38,7 +39,7 @@ static inline int set_rtc_mmss(unsigned long nowtime)
  * timer_interrupt() needs to keep up the real-time clock,
  * as well as call the "do_timer()" routine every clocktick
  */
-static irqreturn_t timer_interrupt(int irq, void *dummy, struct pt_regs * regs)
+static irqreturn_t timer_interrupt(int irq, void *dummy)
 {
         /* last time the cmos clock got updated */
         static long last_rtc_update=0;
@@ -51,7 +52,7 @@ static irqreturn_t timer_interrupt(int irq, void *dummy, struct pt_regs * regs)
 
         do_timer(1);
 #ifndef CONFIG_SMP
-        update_process_times(user_mode(regs));
+        update_process_times(user_mode(get_irq_regs()));
 #endif
         if (current->pid)
                 profile_tick(CPU_PROFILING);
@@ -173,13 +174,4 @@ int do_settimeofday(struct timespec *tv)
         clock_was_set();
         return 0;
 }
-
-/*
- * Scheduler clock - returns current time in nanosec units.
- */
-unsigned long long sched_clock(void)
-{
-        return (unsigned long long)jiffies * (1000000000 / HZ);
-}
-
 EXPORT_SYMBOL(do_settimeofday);
diff --git a/arch/m68knommu/kernel/traps.c b/arch/m68knommu/kernel/traps.c
index 9129b3a5258b..bed5f47bf568 100644
--- a/arch/m68knommu/kernel/traps.c
+++ b/arch/m68knommu/kernel/traps.c
@@ -158,7 +158,7 @@ void show_stack(struct task_struct *task, unsigned long *stack)
 void bad_super_trap(struct frame *fp)
 {
         console_verbose();
-        if (fp->ptregs.vector < 4*sizeof(vec_names)/sizeof(vec_names[0]))
+        if (fp->ptregs.vector < 4 * ARRAY_SIZE(vec_names))
                 printk (KERN_WARNING "*** %s ***   FORMAT=%X\n",
                         vec_names[(fp->ptregs.vector) >> 2],
                         fp->ptregs.format);
diff --git a/arch/m68knommu/kernel/vmlinux.lds.S b/arch/m68knommu/kernel/vmlinux.lds.S
index 2b2a10da64a4..c86a1bf589d4 100644
--- a/arch/m68knommu/kernel/vmlinux.lds.S
+++ b/arch/m68knommu/kernel/vmlinux.lds.S
@@ -87,6 +87,16 @@ SECTIONS {
                 *(__ksymtab_gpl)
                 __stop___ksymtab_gpl = .;
 
+                /* Kernel symbol table: Normal unused symbols */
+                __start___ksymtab_unused = .;
+                *(__ksymtab_unused)
+                __stop___ksymtab_unused = .;
+
+                /* Kernel symbol table: GPL-only unused symbols */
+                __start___ksymtab_unused_gpl = .;
+                *(__ksymtab_unused_gpl)
+                __stop___ksymtab_unused_gpl = .;
+
                 /* Kernel symbol table: GPL-future symbols */
                 __start___ksymtab_gpl_future = .;
                 *(__ksymtab_gpl_future)
@@ -149,10 +159,12 @@ SECTIONS {
                 __security_initcall_start = .;
                 *(.security_initcall.init)
                 __security_initcall_end = .;
+#ifdef CONFIG_BLK_DEV_INITRD
                 . = ALIGN(4);
                 __initramfs_start = .;
                 *(.init.ramfs)
                 __initramfs_end = .;
+#endif
                 . = ALIGN(4096);
                 __init_end = .;
         } > INIT