[POWERPC] Add starting of secondary 86xx CPUs.

[karo-tx-linux.git] / arch / powerpc / kernel / lparcfg.c

diff --git a/arch/powerpc/kernel/lparcfg.c b/arch/powerpc/kernel/lparcfg.c
index 8be687700a50f8e8aadfa238175db412a29c2359..c02deaab26c78d241f15b6c805a38309fdfe52b7 100644 (file)
--- a/arch/powerpc/kernel/lparcfg.c
+++ b/arch/powerpc/kernel/lparcfg.c
@@ -37,7 +37,7 @@
 #include <asm/prom.h>
 #include <asm/vdso_datapage.h>
 
-#define MODULE_VERS "1.6"
+#define MODULE_VERS "1.7"
 #define MODULE_NAME "lparcfg"
 
 /* #define LPARCFG_DEBUG */
@@ -242,7 +242,7 @@ static void parse_system_parameter_string(struct seq_file *m)
 {
        int call_status;
 
-       char *local_buffer = kmalloc(SPLPAR_MAXLENGTH, GFP_KERNEL);
+       unsigned char *local_buffer = kmalloc(SPLPAR_MAXLENGTH, GFP_KERNEL);
        if (!local_buffer) {
                printk(KERN_ERR "%s %s kmalloc failure at line %d \n",
                       __FILE__, __FUNCTION__, __LINE__);
@@ -254,7 +254,8 @@ static void parse_system_parameter_string(struct seq_file *m)
        call_status = rtas_call(rtas_token("ibm,get-system-parameter"), 3, 1,
                                NULL,
                                SPLPAR_CHARACTERISTICS_TOKEN,
-                               __pa(rtas_data_buf));
+                               __pa(rtas_data_buf),
+                               RTAS_DATA_BUF_SIZE);
        memcpy(local_buffer, rtas_data_buf, SPLPAR_MAXLENGTH);
        spin_unlock(&rtas_data_buf_lock);
 
@@ -275,7 +276,7 @@ static void parse_system_parameter_string(struct seq_file *m)
 #ifdef LPARCFG_DEBUG
                printk(KERN_INFO "success calling get-system-parameter \n");
 #endif
-               splpar_strlen = local_buffer[0] * 16 + local_buffer[1];
+               splpar_strlen = local_buffer[0] * 256 + local_buffer[1];
                local_buffer += 2;      /* step over strlen value */
 
                memset(workbuffer, 0, SPLPAR_MAXLENGTH);
@@ -520,10 +521,10 @@ static ssize_t lparcfg_write(struct file *file, const char __user * buf,
 
        current_weight = (resource >> 5 * 8) & 0xFF;
 
-       pr_debug("%s: current_entitled = %lu, current_weight = %lu\n",
+       pr_debug("%s: current_entitled = %lu, current_weight = %u\n",
                 __FUNCTION__, current_entitled, current_weight);
 
-       pr_debug("%s: new_entitled = %lu, new_weight = %lu\n",
+       pr_debug("%s: new_entitled = %lu, new_weight = %u\n",
                 __FUNCTION__, *new_entitled_ptr, *new_weight_ptr);
 
        retval = plpar_hcall_norets(H_SET_PPP, *new_entitled_ptr,