5 files changed, 78 insertions, 19 deletions

diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig
index 7561d7b72e75..cea237413aa2 100644
--- a/arch/frv/Kconfig
+++ b/arch/frv/Kconfig
@@ -6,6 +6,10 @@ config FRV
         bool
         default y
 
+config ZONE_DMA
+        bool
+        default y
+
 config RWSEM_GENERIC_SPINLOCK
         bool
         default y
diff --git a/arch/frv/kernel/pm.c b/arch/frv/kernel/pm.c
index ee677ced7b68..c57ce3f1f2e2 100644
--- a/arch/frv/kernel/pm.c
+++ b/arch/frv/kernel/pm.c
@@ -125,7 +125,6 @@ unsigned long sleep_phys_sp(void *sp)
  * Use a temporary sysctl number. Horrid, but will be cleaned up in 2.6
  * when all the PM interfaces exist nicely.
  */
-#define CTL_PM 9899
 #define CTL_PM_SUSPEND 1
 #define CTL_PM_CMODE 2
 #define CTL_PM_P0 4
@@ -402,17 +401,53 @@ static int cm_sysctl(ctl_table *table, int __user *name, int nlen,
 
 static struct ctl_table pm_table[] =
 {
-        {CTL_PM_SUSPEND, "suspend", NULL, 0, 0200, NULL, &sysctl_pm_do_suspend},
-        {CTL_PM_CMODE, "cmode", &clock_cmode_current, sizeof(int), 0644, NULL, &cmode_procctl, &cmode_sysctl, NULL},
-        {CTL_PM_P0, "p0", &clock_p0_current, sizeof(int), 0644, NULL, &p0_procctl, &p0_sysctl, NULL},
-        {CTL_PM_CM, "cm", &clock_cm_current, sizeof(int), 0644, NULL, &cm_procctl, &cm_sysctl, NULL},
-        {0}
+        {
+                .ctl_name       = CTL_PM_SUSPEND,
+                .procname       = "suspend",
+                .data           = NULL,
+                .maxlen         = 0,
+                .mode           = 0200,
+                .proc_handler   = &sysctl_pm_do_suspend,
+        },
+        {
+                .ctl_name       = CTL_PM_CMODE,
+                .procname       = "cmode",
+                .data           = &clock_cmode_current,
+                .maxlen         = sizeof(int),
+                .mode           = 0644,
+                .proc_handler   = &cmode_procctl,
+                .strategy       = &cmode_sysctl,
+        },
+        {
+                .ctl_name       = CTL_PM_P0,
+                .procname       = "p0",
+                .data           = &clock_p0_current,
+                .maxlen         = sizeof(int),
+                .mode           = 0644,
+                .proc_handler   = &p0_procctl,
+                .strategy       = &p0_sysctl,
+        },
+        {
+                .ctl_name       = CTL_PM_CM,
+                .procname       = "cm",
+                .data           = &clock_cm_current,
+                .maxlen         = sizeof(int),
+                .mode           = 0644,
+                .proc_handler   = &cm_procctl,
+                .strategy       = &cm_sysctl,
+        },
+        { .ctl_name = 0}
 };
 
 static struct ctl_table pm_dir_table[] =
 {
-        {CTL_PM, "pm", NULL, 0, 0555, pm_table},
-        {0}
+        {
+                .ctl_name       = CTL_PM,
+                .procname       = "pm",
+                .mode           = 0555,
+                .child          = pm_table,
+        },
+        { .ctl_name = 0}
 };
 
 /*
@@ -420,7 +455,7 @@ static struct ctl_table pm_dir_table[] =
  */
 static int __init pm_init(void)
 {
-        register_sysctl_table(pm_dir_table, 1);
+        register_sysctl_table(pm_dir_table);
         return 0;
 }
 
diff --git a/arch/frv/kernel/setup.c b/arch/frv/kernel/setup.c
index 1a5eb6c301c9..8ea3ca2aba62 100644
--- a/arch/frv/kernel/setup.c
+++ b/arch/frv/kernel/setup.c
@@ -110,7 +110,7 @@ unsigned long __initdata num_mappedpages;
 
 struct cpuinfo_frv __nongprelbss boot_cpu_data;
 
-char command_line[COMMAND_LINE_SIZE];
+char __initdata command_line[COMMAND_LINE_SIZE];
 char __initdata redboot_command_line[COMMAND_LINE_SIZE];
 
 #ifdef CONFIG_PM
@@ -762,7 +762,7 @@ void __init setup_arch(char **cmdline_p)
         printk("uClinux FR-V port done by Red Hat Inc <dhowells@redhat.com>\n");
 #endif
 
-        memcpy(saved_command_line, redboot_command_line, COMMAND_LINE_SIZE);
+        memcpy(boot_command_line, redboot_command_line, COMMAND_LINE_SIZE);
 
         determine_cpu();
         determine_clocks(1);
@@ -803,7 +803,7 @@ void __init setup_arch(char **cmdline_p)
 #endif
 
         /* deal with the command line - RedBoot may have passed one to the kernel */
-        memcpy(command_line, saved_command_line, sizeof(command_line));
+        memcpy(command_line, boot_command_line, sizeof(command_line));
         *cmdline_p = &command_line[0];
         parse_cmdline_early(command_line);
 
diff --git a/arch/frv/kernel/sysctl.c b/arch/frv/kernel/sysctl.c
index ce676803eb6f..3e9d7e03fb95 100644
--- a/arch/frv/kernel/sysctl.c
+++ b/arch/frv/kernel/sysctl.c
@@ -175,22 +175,40 @@ static int procctl_frv_pin_cxnr(ctl_table *table, int write, struct file *filp,
  */
 static struct ctl_table frv_table[] =
 {
-        { 1, "cache-mode",      NULL, 0, 0644, NULL, &procctl_frv_cachemode },
+        {
+                .ctl_name       = 1,
+                .procname       = "cache-mode",
+                .data           = NULL,
+                .maxlen         = 0,
+                .mode           = 0644,
+                .proc_handler   = &procctl_frv_cachemode,
+        },
 #ifdef CONFIG_MMU
-        { 2, "pin-cxnr",        NULL, 0, 0644, NULL, &procctl_frv_pin_cxnr },
+        {
+                .ctl_name       = 2,
+                .procname       = "pin-cxnr",
+                .data           = NULL,
+                .maxlen         = 0,
+                .mode           = 0644,
+                .proc_handler   = &procctl_frv_pin_cxnr
+        },
 #endif
-        { 0 }
+        {}
 };
 
 /*
  * Use a temporary sysctl number. Horrid, but will be cleaned up in 2.6
  * when all the PM interfaces exist nicely.
  */
-#define CTL_FRV 9898
 static struct ctl_table frv_dir_table[] =
 {
-        {CTL_FRV, "frv", NULL, 0, 0555, frv_table},
-        {0}
+        {
+                .ctl_name       = CTL_FRV,
+                .procname       = "frv",
+                .mode           = 0555,
+                .child          = frv_table
+        },
+        {}
 };
 
 /*
@@ -198,7 +216,7 @@ static struct ctl_table frv_dir_table[] =
  */
 static int __init frv_sysctl_init(void)
 {
-        register_sysctl_table(frv_dir_table, 1);
+        register_sysctl_table(frv_dir_table);
         return 0;
 }
 
diff --git a/arch/frv/kernel/vmlinux.lds.S b/arch/frv/kernel/vmlinux.lds.S
index 9c1fb12367fa..97910e016825 100644
--- a/arch/frv/kernel/vmlinux.lds.S
+++ b/arch/frv/kernel/vmlinux.lds.S
@@ -61,10 +61,12 @@ SECTIONS
   .data.percpu  : { *(.data.percpu) }
   __per_cpu_end = .;
 
+#ifdef CONFIG_BLK_DEV_INITRD
   . = ALIGN(4096);
   __initramfs_start = .;
   .init.ramfs : { *(.init.ramfs) }
   __initramfs_end = .;
+#endif
 
   . = ALIGN(THREAD_SIZE);
   __init_end = .;