qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-24 04:26:16 +02:00
Code

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

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30785 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
florian 2012-03-02 13:19:13 +00:00
parent fe9bc76c6b
commit 057ff99ae1
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
target/linux/generic/patches-2.6.39/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch
View File

@ -9,7 +9,7 @@
+#define KEXEC_MIPS_ARGV_MAX_ARGS (COMMAND_LINE_SIZE / 15) +#define KEXEC_MIPS_ARGV_MAX_ARGS (COMMAND_LINE_SIZE / 15)
+ +
+char kexec_argv_buf[KEXEC_MIPS_ARGV_BUF_SIZE] __kexec; +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 +static void
+machine_kexec_print_args(void) +machine_kexec_print_args(void)
@ -28,7 +28,7 @@
-#define ARGV_MAX_ARGS (COMMAND_LINE_SIZE / 15) -#define ARGV_MAX_ARGS (COMMAND_LINE_SIZE / 15)
+ for (i = 0; i < kexec_args[0]; i++) + 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]); + (char *)kexec_argv[i], (char *)kexec_argv[i]);
+} +}
@ -98,7 +98,7 @@
+ size = KEXEC_MIPS_ARGV_BUF_SIZE - 1; + size = KEXEC_MIPS_ARGV_BUF_SIZE - 1;
+ size = min(size, bufsz); + size = min(size, bufsz);
+ if (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 to kernel space */
+ copy_from_user(kexec_argv_buf, buf, size); + copy_from_user(kexec_argv_buf, buf, size);
@ -126,7 +126,7 @@
+ continue; + continue;
} }
+ +
+ kexec_argv[argc++] = (int) ptr; + kexec_argv[argc++] = ptr;
+ ptr = strchr(ptr, ' '); + ptr = strchr(ptr, ' ');
} }
@ -138,7 +138,7 @@
- return 0; - return 0;
+ kexec_args[0] = argc; + kexec_args[0] = argc;
+ kexec_args[1] = (int) kexec_argv; + kexec_args[1] = (unsigned long)kexec_argv;
+ kexec_args[2] = 0; + kexec_args[2] = 0;
+ kexec_args[3] = 0; + kexec_args[3] = 0;
+ +