diff options
| author | Florian Fainelli <florian@openwrt.org> | 2012-04-18 15:36:30 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2012-04-18 15:36:30 +0000 |
| commit | 9b0b00129dc0802fae0421d437edd3544293a858 (patch) | |
| tree | 80a0910823aed4c6da9946afa65ac8d24ca30bf8 /target/linux/generic/patches-3.0/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch | |
| parent | f357674b30f65d766e4db2bb78076b220f272bb0 (diff) | |
| download | upstream-9b0b00129dc0802fae0421d437edd3544293a858.tar.gz upstream-9b0b00129dc0802fae0421d437edd3544293a858.tar.bz2 upstream-9b0b00129dc0802fae0421d437edd3544293a858.zip | |
[generic] fix 335-mips-kexec patch for all 3+ kernels
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31344 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.0/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch')
| -rw-r--r-- | target/linux/generic/patches-3.0/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-3.0/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch b/target/linux/generic/patches-3.0/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch index f31e767a35..f7a8eed000 100644 --- a/target/linux/generic/patches-3.0/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch +++ b/target/linux/generic/patches-3.0/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) @@ -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; + |