[kernel/2.6.38] fix gcc-4.6 set but unused warnings

[openwrt.git] / target / linux / generic / patches-3.1 / 335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch

diff --git a/target/linux/generic/patches-3.1/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch b/target/linux/generic/patches-3.1/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch
index abc8971..f31e767 100644 (file)
--- a/target/linux/generic/patches-3.1/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch
+++ b/target/linux/generic/patches-3.1/335-mips-kexec-cleanup-kexec-tools-parameter-handling.patch
@@ -39,7 +39,7 @@
 -      int i, argc = 0;
 -      char *bootloader = "kexec";
 -      int *kexec_argv = (int *)kexec_args[1];
 -      int i, argc = 0;
 -      char *bootloader = "kexec";
 -      int *kexec_argv = (int *)kexec_args[1];

-+      void __user *buf;
++      void __user *buf = NULL;

 +      size_t bufsz;
 +      size_t size;
 +      int i;
 +      size_t bufsz;
 +      size_t size;
 +      int i;


@@ -92,7 +92,7 @@
 +              break;
 +      }
 +
 +              break;
 +      }
 +

-+      if (i >= image->nr_segments)
++      if (!buf)

 +              return;
 +
 +      size = KEXEC_MIPS_ARGV_BUF_SIZE - 1;
 +              return;
 +
 +      size = KEXEC_MIPS_ARGV_BUF_SIZE - 1;