7 files changed, 9 insertions, 82 deletions

diff --git a/arch/parisc/kernel/perf.c b/arch/parisc/kernel/perf.c
index ac8ee205c351..a46bc62b643e 100644
--- a/arch/parisc/kernel/perf.c
+++ b/arch/parisc/kernel/perf.c
@@ -479,7 +479,7 @@ static long perf_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
         return error;
 }
 
-static struct file_operations perf_fops = {
+static const struct file_operations perf_fops = {
         .llseek = no_llseek,
         .read = perf_read,
         .write = perf_write,
diff --git a/arch/parisc/kernel/setup.c b/arch/parisc/kernel/setup.c
index 21b9fb17b409..bd2116e03f34 100644
--- a/arch/parisc/kernel/setup.c
+++ b/arch/parisc/kernel/setup.c
@@ -45,7 +45,7 @@
 #include <asm/io.h>
 #include <asm/setup.h>
 
-char    command_line[COMMAND_LINE_SIZE] __read_mostly;
+char    __initdata command_line[COMMAND_LINE_SIZE] __read_mostly;
 
 /* Intended for ccio/sba/cpu statistics under /proc/bus/{runway|gsc} */
 struct proc_dir_entry * proc_runway_root __read_mostly = NULL;
@@ -71,9 +71,9 @@ void __init setup_cmdline(char **cmdline_p)
         /* boot_args[0] is free-mem start, boot_args[1] is ptr to command line */
         if (boot_args[0] < 64) {
                 /* called from hpux boot loader */
-                saved_command_line[0] = '\0';
+                boot_command_line[0] = '\0';
         } else {
-                strcpy(saved_command_line, (char *)__va(boot_args[1]));
+                strcpy(boot_command_line, (char *)__va(boot_args[1]));
 
 #ifdef CONFIG_BLK_DEV_INITRD
                 if (boot_args[2] != 0) /* did palo pass us a ramdisk? */
@@ -84,7 +84,7 @@ void __init setup_cmdline(char **cmdline_p)
 #endif
         }
 
-        strcpy(command_line, saved_command_line);
+        strcpy(command_line, boot_command_line);
         *cmdline_p = command_line;
 }
 
diff --git a/arch/parisc/kernel/sys_parisc32.c b/arch/parisc/kernel/sys_parisc32.c
index 29be4377aca6..ce3245f87fdd 100644
--- a/arch/parisc/kernel/sys_parisc32.c
+++ b/arch/parisc/kernel/sys_parisc32.c
@@ -579,70 +579,6 @@ asmlinkage int sys32_sendfile64(int out_fd, int in_fd, compat_loff_t __user *off
 }
 
 
-struct sysinfo32 {
-        s32 uptime;
-        u32 loads[3];
-        u32 totalram;
-        u32 freeram;
-        u32 sharedram;
-        u32 bufferram;
-        u32 totalswap;
-        u32 freeswap;
-        unsigned short procs;
-        u32 totalhigh;
-        u32 freehigh;
-        u32 mem_unit;
-        char _f[12];
-};
-
-/* We used to call sys_sysinfo and translate the result.  But sys_sysinfo
- * undoes the good work done elsewhere, and rather than undoing the
- * damage, I decided to just duplicate the code from sys_sysinfo here.
- */
-
-asmlinkage int sys32_sysinfo(struct sysinfo32 __user *info)
-{
-        struct sysinfo val;
-        int err;
-        unsigned long seq;
-
-        /* We don't need a memset here because we copy the
-         * struct to userspace once element at a time.
-         */
-
-        do {
-                seq = read_seqbegin(&xtime_lock);
-                val.uptime = jiffies / HZ;
-
-                val.loads[0] = avenrun[0] << (SI_LOAD_SHIFT - FSHIFT);
-                val.loads[1] = avenrun[1] << (SI_LOAD_SHIFT - FSHIFT);
-                val.loads[2] = avenrun[2] << (SI_LOAD_SHIFT - FSHIFT);
-
-                val.procs = nr_threads;
-        } while (read_seqretry(&xtime_lock, seq));
-
-
-        si_meminfo(&val);
-        si_swapinfo(&val);
-        
-        err = put_user (val.uptime, &info->uptime);
-        err |= __put_user (val.loads[0], &info->loads[0]);
-        err |= __put_user (val.loads[1], &info->loads[1]);
-        err |= __put_user (val.loads[2], &info->loads[2]);
-        err |= __put_user (val.totalram, &info->totalram);
-        err |= __put_user (val.freeram, &info->freeram);
-        err |= __put_user (val.sharedram, &info->sharedram);
-        err |= __put_user (val.bufferram, &info->bufferram);
-        err |= __put_user (val.totalswap, &info->totalswap);
-        err |= __put_user (val.freeswap, &info->freeswap);
-        err |= __put_user (val.procs, &info->procs);
-        err |= __put_user (val.totalhigh, &info->totalhigh);
-        err |= __put_user (val.freehigh, &info->freehigh);
-        err |= __put_user (val.mem_unit, &info->mem_unit);
-        return err ? -EFAULT : 0;
-}
-
-
 /* lseek() needs a wrapper because 'offset' can be negative, but the top
  * half of the argument has been zeroed by syscall.S.
  */
diff --git a/arch/parisc/kernel/syscall_table.S b/arch/parisc/kernel/syscall_table.S
index 7d665de6bd04..8bf87e5d9c37 100644
--- a/arch/parisc/kernel/syscall_table.S
+++ b/arch/parisc/kernel/syscall_table.S
@@ -197,7 +197,7 @@
         /* struct rusage contains longs... */
         ENTRY_COMP(wait4)
         ENTRY_SAME(swapoff)             /* 115 */
-        ENTRY_DIFF(sysinfo)
+        ENTRY_COMP(sysinfo)
         ENTRY_SAME(shutdown)
         ENTRY_SAME(fsync)
         ENTRY_SAME(madvise)
diff --git a/arch/parisc/kernel/time.c b/arch/parisc/kernel/time.c
index ccdce6ef67cc..d1db8e518654 100644
--- a/arch/parisc/kernel/time.c
+++ b/arch/parisc/kernel/time.c
@@ -205,17 +205,6 @@ static int cr16_update_callback(void)
 }
 
 
-/*
- * XXX: We can do better than this.
- * Returns nanoseconds
- */
-
-unsigned long long sched_clock(void)
-{
-        return (unsigned long long)jiffies * (1000000000 / HZ);
-}
-
-
 void __init start_cpu_itimer(void)
 {
         unsigned int cpu = smp_processor_id();
diff --git a/arch/parisc/kernel/topology.c b/arch/parisc/kernel/topology.c
index 068b20d822e7..d71cb018a21e 100644
--- a/arch/parisc/kernel/topology.c
+++ b/arch/parisc/kernel/topology.c
@@ -1,5 +1,5 @@
 /*
- * arch/parisc/kernel/topology.c - Populate driverfs with topology information
+ * arch/parisc/kernel/topology.c - Populate sysfs with topology information
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/arch/parisc/kernel/vmlinux.lds.S b/arch/parisc/kernel/vmlinux.lds.S
index 7b149df9d422..2a8253358c6c 100644
--- a/arch/parisc/kernel/vmlinux.lds.S
+++ b/arch/parisc/kernel/vmlinux.lds.S
@@ -175,10 +175,12 @@ SECTIONS
      from .altinstructions and .eh_frame */
   .exit.text : { *(.exit.text) }
   .exit.data : { *(.exit.data) }
+#ifdef CONFIG_BLK_DEV_INITRD
   . = ALIGN(ASM_PAGE_SIZE);
   __initramfs_start = .;
   .init.ramfs : { *(.init.ramfs) }
   __initramfs_end = .;
+#endif
   . = ALIGN(32);
   __per_cpu_start = .;
   .data.percpu  : { *(.data.percpu) }