[POWERPC] PS3: Fix printing of os-area magic numbers

[linux-2.6-omap-h63xx.git] / arch / powerpc / platforms / ps3 / setup.c

diff --git a/arch/powerpc/platforms/ps3/setup.c b/arch/powerpc/platforms/ps3/setup.c
index aa05288de64e13b89aadecc06191ea08b474c7bc..5c2cbb08eb52f82a212503137ebae0cf5d8dca55 100644 (file)
--- a/arch/powerpc/platforms/ps3/setup.c
+++ b/arch/powerpc/platforms/ps3/setup.c
@@ -63,7 +63,8 @@ int ps3_compare_firmware_version(u16 major, u16 minor, u16 rev)
        x.minor = minor;
        x.rev = rev;
 
-       return (ps3_firmware_version.raw - x.raw);
+       return (ps3_firmware_version.raw > x.raw) -
+              (ps3_firmware_version.raw < x.raw);
 }
 EXPORT_SYMBOL_GPL(ps3_compare_firmware_version);
 
@@ -109,7 +110,7 @@ static void ps3_panic(char *str)
 
 #if defined(CONFIG_FB_PS3) || defined(CONFIG_FB_PS3_MODULE) || \
     defined(CONFIG_PS3_FLASH) || defined(CONFIG_PS3_FLASH_MODULE)
-static void prealloc(struct ps3_prealloc *p)
+static void __init prealloc(struct ps3_prealloc *p)
 {
        if (!p->size)
                return;
@@ -205,6 +206,7 @@ static void __init ps3_setup_arch(void)
        prealloc_ps3flash_bounce_buffer();
 
        ppc_md.power_save = ps3_power_save;
+       ps3_os_area_init();
 
        DBG(" <- %s:%d\n", __func__, __LINE__);
 }
@@ -227,7 +229,7 @@ static int __init ps3_probe(void)
 
        powerpc_firmware_features |= FW_FEATURE_PS3_POSSIBLE;
 
-       ps3_os_area_init();
+       ps3_os_area_save_params();
        ps3_mm_init();
        ps3_mm_vas_create(&htab_size);
        ps3_hpte_init(htab_size);