Message ID | 20200112120216.11.Ifb04203c2bf46c05eaf0015b1140a2ae4bb3e090@changeid |
---|---|
State | Superseded |
Delegated to: | Simon Glass |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=OsA2sJPp; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47wmV2502Jz9s4Y for <incoming@patchwork.ozlabs.org>; Mon, 13 Jan 2020 06:08:58 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id EF87080E80; Sun, 12 Jan 2020 20:07:25 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="OsA2sJPp"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0F4B4817C6; Sun, 12 Jan 2020 20:07:14 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.1 required=5.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-io1-xd44.google.com (mail-io1-xd44.google.com [IPv6:2607:f8b0:4864:20::d44]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 2CBE980E80 for <u-boot@lists.denx.de>; Sun, 12 Jan 2020 20:07:11 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-io1-xd44.google.com with SMTP id t26so7246298ioi.13 for <u-boot@lists.denx.de>; Sun, 12 Jan 2020 11:07:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CYvWKqTEfxlhtUo71Hjjkw2PbZheEKKgFNbcQotTMQY=; b=OsA2sJPpH7OD7wZ92WSVPcpMjJsfk1nDebgkbOn/9l2Kh/c4l3R4aza2toSTK0uDMl BRTN4pmRBfqFnPphz94Ia9bSYxDEJ117KtlIOd3ulsSvMdXvsr6b9WaFVrV0pt6QpPOz 5Jbs0GLB5mCUL/0LwKe4KD84glW0gtsG+Wbzk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CYvWKqTEfxlhtUo71Hjjkw2PbZheEKKgFNbcQotTMQY=; b=RfJfqD6EuOm93yM4y+iwR8qQzVWmXXUe+CF/6W2ej8ItRGEJJGRhc2Ui1aIzctk+l7 QIcyU6MM5AAyWwn6hzBP+JcHpcS2n0ISYTysLNh7tCg7Z/tbcSjezBQI9+HE9276eEV9 QdjyDKdvdMvTNz0QJao3C9YB1G0zdkUz8m2I/fGfpyz875Lwl0fx9QcodOfHNtBakgab VF2nkBfs1oJkJXOH5mVpF75FtAKKshH+U/tnzwCfjGVTCzAs/S2066ReOHnOAF4Q458I Jb6EXhUs7ohXGNos1BbrC4l2mLeW8k05/g7ZuH9ncPqj3tkZ0qFqWe4P6HckUFekyU3H AvyA== X-Gm-Message-State: APjAAAX3Kty/I70uWKOv55+bCQJlE0QATVuKTtB9uggRWOu8eHshwbmq hg1Po7mXZv8KNvBLTw0W+U4lj4eA3JQ= X-Google-Smtp-Source: APXvYqygCh4wYrLDQufFuS//Rwu25xg38aeZ0Eltwk8NSe3HLwH1teg+tfh0eJ4e4UqcQ75/EloOvw== X-Received: by 2002:a6b:7201:: with SMTP id n1mr8919082ioc.37.1578856030005; Sun, 12 Jan 2020 11:07:10 -0800 (PST) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id r22sm3039219ilb.25.2020.01.12.11.07.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Jan 2020 11:07:09 -0800 (PST) From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Subject: [PATCH 11/33] sandbox: Rename 'free' variable Date: Sun, 12 Jan 2020 12:06:02 -0700 Message-Id: <20200112120216.11.Ifb04203c2bf46c05eaf0015b1140a2ae4bb3e090@changeid> X-Mailer: git-send-email 2.25.0.rc1.283.g88dfdc4193-goog In-Reply-To: <20200112190624.79077-1-sjg@chromium.org> References: <20200112190624.79077-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.26 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.101.4 at phobos.denx.de X-Virus-Status: Clean |
Series |
sandbox: Move to SDL2
|
expand
|
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;
This name conflicts with our desire to #define free() to something else on sandbox. Rename it. Signed-off-by: Simon Glass <sjg@chromium.org> --- arch/sandbox/cpu/state.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)