Changeset 30785


Ignore:
Timestamp:
2012-03-02T14:19:13+01:00 (5 years ago)
Author:
florian
Message:

[kernel/2.6.39] MIPS: fix kexec build on 64-bits targets

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/generic/patches-2.6.39/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch

    r30783 r30785  
    1010+ 
    1111+char kexec_argv_buf[KEXEC_MIPS_ARGV_BUF_SIZE] __kexec; 
    12 +int kexec_argv[KEXEC_MIPS_ARGV_MAX_ARGS] __kexec; 
     12+char *kexec_argv[KEXEC_MIPS_ARGV_MAX_ARGS] __kexec; 
    1313+ 
    1414+static void 
     
    2929-#define ARGV_MAX_ARGS (COMMAND_LINE_SIZE / 15) 
    3030+       for (i = 0; i < kexec_args[0]; i++) 
    31 +               pr_info("kexec_argv[%zd] = %p, %s\n", i, 
     31+               pr_info("kexec_argv[%d] = %p, %s\n", i, 
    3232+                       (char *)kexec_argv[i], (char *)kexec_argv[i]); 
    3333+} 
     
    9999+       size = min(size, bufsz); 
    100100+       if (size < bufsz) 
    101 +               pr_warn("kexec command line truncated to %d bytes\n", size); 
     101+               pr_warn("kexec command line truncated to %zd bytes\n", size); 
    102102+ 
    103103+       /* Copy to kernel space */ 
     
    127127                } 
    128128+ 
    129 +               kexec_argv[argc++] = (int) ptr; 
     129+               kexec_argv[argc++] = ptr; 
    130130+               ptr = strchr(ptr, ' '); 
    131131        } 
     
    139139-       return 0; 
    140140+       kexec_args[0] = argc; 
    141 +       kexec_args[1] = (int) kexec_argv; 
     141+       kexec_args[1] = (unsigned long)kexec_argv; 
    142142+       kexec_args[2] = 0; 
    143143+       kexec_args[3] = 0; 
Note: See TracChangeset for help on using the changeset viewer.