Kexec Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Nikolaus Schulz <nikolaus.schulz@avionic-design.de>
To: Simon Horman <horms@verge.net.au>
Cc: Alban Bedel <alban.bedel@avionic-design.de>, kexec@lists.infradead.org
Subject: [PATCH v2 1/3] zImage-arm: Fix a return value check that use the wrong variable
Date: Fri, 29 Apr 2016 16:22:21 +0200	[thread overview]
Message-ID: <1461939743-21775-2-git-send-email-nikolaus.schulz@avionic-design.de> (raw)
In-Reply-To: <1461939743-21775-1-git-send-email-nikolaus.schulz@avionic-design.de>

From: Alban Bedel <alban.bedel@avionic-design.de>

When looking for a hole to put the initrd in the error check used the
wrong variable.

Signed-off-by: Alban Bedel <alban.bedel@avionic-design.de>
---
 kexec/arch/arm/kexec-zImage-arm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kexec/arch/arm/kexec-zImage-arm.c b/kexec/arch/arm/kexec-zImage-arm.c
index d85ab9b..0ac194d 100644
--- a/kexec/arch/arm/kexec-zImage-arm.c
+++ b/kexec/arch/arm/kexec-zImage-arm.c
@@ -529,7 +529,7 @@ int zImage_arm_load(int argc, char **argv, const char *buf, off_t len,
 			unsigned long initrd_base_new = locate_hole(info,
 					hole_size, page_size,
 					initrd_base, ULONG_MAX, INT_MAX);
-			if (base == ULONG_MAX)
+			if (initrd_base_new == ULONG_MAX)
 				return -1;
 			initrd_base = initrd_base_new;
 		}
-- 
2.1.4


_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

  reply	other threads:[~2016-04-29 14:23 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-29 14:22 Nikolaus Schulz
2016-04-29 14:22 ` Nikolaus Schulz [this message]
2016-04-29 14:22 ` [PATCH v2 2/3] zImage-arm: Add support for booting android images Nikolaus Schulz
2016-04-29 14:22 ` [PATCH v2 3/3] arm: Change setup_dtb_prop to create nodes by offset and node name Nikolaus Schulz

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1461939743-21775-2-git-send-email-nikolaus.schulz@avionic-design.de \
    --to=nikolaus.schulz@avionic-design.de \
    --cc=alban.bedel@avionic-design.de \
    --cc=horms@verge.net.au \
    --cc=kexec@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox