From: Simon Glass <sjg@chromium.org>
Date: Mon, 3 Feb 2020 14:35:57 +0000 (-0700)
Subject: sandbox: Rename 'free' variable
X-Git-Tag: v2020.04-rc2~2^2~21
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=cf23c7c1dd11ca8f47bb7146c72729efc81eafd0;p=oweals%2Fu-boot.git

sandbox: Rename 'free' variable

This name conflicts with our desire to #define free() to something else on
sandbox. Rename it.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

diff --git a/arch/sandbox/cpu/state.c b/arch/sandbox/cpu/state.c
index cd46e000f5..ef2e63f37a 100644
--- a/arch/sandbox/cpu/state.c
+++ b/arch/sandbox/cpu/state.c
@@ -16,14 +16,14 @@ static struct sandbox_state *state;	/* Pointer to current state record */
 static int state_ensure_space(int extra_size)
 {
 	void *blob = state->state_fdt;
-	int used, size, free;
+	int used, size, free_bytes;
 	void *buf;
 	int ret;
 
 	used = fdt_off_dt_strings(blob) + fdt_size_dt_strings(blob);
 	size = fdt_totalsize(blob);
-	free = size - used;
-	if (free > extra_size)
+	free_bytes = size - used;
+	if (free_bytes > extra_size)
 		return 0;
 
 	size = used + extra_size;