[PATCH] ARM: Change 'param_offset' to 'boot_params'

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 35b7273cfdb4252cb6b886b306870924f5abb38a..c9b69771f92ebb7b3ec8145b796336a176b64ad5 100644 (file)
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -737,8 +737,8 @@ void __init setup_arch(char **cmdline_p)
        if (mdesc->soft_reboot)
                reboot_setup("s");
 
-       if (mdesc->param_offset)
-               tags = phys_to_virt(mdesc->param_offset);
+       if (mdesc->boot_params)
+               tags = phys_to_virt(mdesc->boot_params);
 
        /*
         * If we have the old style parameters, convert them to

diff --git a/include/asm-arm/mach/arch.h b/include/asm-arm/mach/arch.h
index a2fbb6558c15a9f9014e92901a0820b18e41f1b6..56c6bf4ab0c3932de2f650cb5c29cafeae0efc9c 100644 (file)
--- a/include/asm-arm/mach/arch.h
+++ b/include/asm-arm/mach/arch.h
@@ -26,7 +26,7 @@ struct machine_desc {
                                                 * page tabe entry      */
 
        const char              *name;          /* architecture name    */
-       unsigned int            param_offset;   /* parameter page       */
+       unsigned long           boot_params;    /* tagged list          */
 
        unsigned int            video_start;    /* start of video RAM   */
        unsigned int            video_end;      /* end of video RAM     */