diff options
| author | Florian Fainelli <florian@openwrt.org> | 2012-03-02 13:19:13 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2012-03-02 13:19:13 +0000 |
| commit | c856eefc9d5995d7bbf348f0861fb39c513b4c92 (patch) | |
| tree | c6f584340d809384abf4ea9dbb5682b747bad70e /target | |
| parent | a14d3d39a6815ef14812dd84b770c64af742b928 (diff) | |
| download | master-187ad058-c856eefc9d5995d7bbf348f0861fb39c513b4c92.tar.gz master-187ad058-c856eefc9d5995d7bbf348f0861fb39c513b4c92.tar.bz2 master-187ad058-c856eefc9d5995d7bbf348f0861fb39c513b4c92.zip | |
[kernel/2.6.39] MIPS: fix kexec build on 64-bits targets
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30785 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
| -rw-r--r-- | target/linux/generic/patches-2.6.39/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/generic/patches-2.6.39/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch b/target/linux/generic/patches-2.6.39/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch index 3df7b0b2d3..f7a8eed000 100644 --- a/target/linux/generic/patches-2.6.39/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch +++ b/target/linux/generic/patches-2.6.39/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch @@ -9,7 +9,7 @@ +#define KEXEC_MIPS_ARGV_MAX_ARGS (COMMAND_LINE_SIZE / 15) + +char kexec_argv_buf[KEXEC_MIPS_ARGV_BUF_SIZE] __kexec; -+int kexec_argv[KEXEC_MIPS_ARGV_MAX_ARGS] __kexec; ++char *kexec_argv[KEXEC_MIPS_ARGV_MAX_ARGS] __kexec; + +static void +machine_kexec_print_args(void) @@ -28,7 +28,7 @@ -#define ARGV_MAX_ARGS (COMMAND_LINE_SIZE / 15) + for (i = 0; i < kexec_args[0]; i++) -+ pr_info("kexec_argv[%zd] = %p, %s\n", i, ++ pr_info("kexec_argv[%d] = %p, %s\n", i, + (char *)kexec_argv[i], (char *)kexec_argv[i]); +} @@ -98,7 +98,7 @@ + size = KEXEC_MIPS_ARGV_BUF_SIZE - 1; + size = min(size, bufsz); + if (size < bufsz) -+ pr_warn("kexec command line truncated to %d bytes\n", size); ++ pr_warn("kexec command line truncated to %zd bytes\n", size); + + /* Copy to kernel space */ + copy_from_user(kexec_argv_buf, buf, size); @@ -126,7 +126,7 @@ + continue; } + -+ kexec_argv[argc++] = (int) ptr; ++ kexec_argv[argc++] = ptr; + ptr = strchr(ptr, ' '); } @@ -138,7 +138,7 @@ - return 0; + kexec_args[0] = argc; -+ kexec_args[1] = (int) kexec_argv; ++ kexec_args[1] = (unsigned long)kexec_argv; + kexec_args[2] = 0; + kexec_args[3] = 0; + |