From patchwork Tue Aug 8 22:53:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1819075 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=seco.com header.i=@seco.com header.a=rsa-sha256 header.s=selector1 header.b=uOmZep55; dkim=pass (2048-bit key) header.d=seco.com header.i=@seco.com header.a=rsa-sha256 header.s=selector1 header.b=uOmZep55; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RL7lv3jyXz1yfB for ; Wed, 9 Aug 2023 08:54:03 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 85F4786688; Wed, 9 Aug 2023 00:53:49 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=seco.com header.i=@seco.com header.b="uOmZep55"; dkim=pass (2048-bit key) header.d=seco.com header.i=@seco.com header.b="uOmZep55"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 04855867C3; Wed, 9 Aug 2023 00:53:48 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0601.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe02::601]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 754C986763 for ; Wed, 9 Aug 2023 00:53:45 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sean.anderson@seco.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=seco.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=MG1BE2ZxvEiKIqxaJxGIwLqRWWW4HIY4XKunHz4WoM0=; b=uOmZep55PIJjEGi9pTzjOlIEgXE7DmSFMwrIYYAf8e8H3g1oXfiRftZN2g7nF3HSHpuAiZ1Nb//ZlG+NKp9hgFcVwpIKWecsAP79bKgNRo2pHddxvxdm/nYnZF/pwD0Cv+Woba6UkrGi9KqWmUSNmRltGSAHnOsbACTqGbqJuyBfJoB941JB3nzPtbQF0Dh0yfuyNvxYQXl6nl6PM99Nj+EP6YeH3BlcKtYGRRZu2DRYJb6Loh4+BsPnT6Dhi/595OU8OP9esMeISSUYkgdc5z2pB8vRah1I+d0HFySCFEsXOPVKgnj6iiovJ6l5ySOXimD09wC10L1XSJ+Z3zTxaw== Received: from DU2PR04CA0027.eurprd04.prod.outlook.com (2603:10a6:10:3b::32) by VI1PR03MB6400.eurprd03.prod.outlook.com (2603:10a6:800:17e::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.27; Tue, 8 Aug 2023 22:53:42 +0000 Received: from DB8EUR05FT017.eop-eur05.prod.protection.outlook.com (2603:10a6:10:3b:cafe::c2) by DU2PR04CA0027.outlook.office365.com (2603:10a6:10:3b::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.28 via Frontend Transport; Tue, 8 Aug 2023 22:53:42 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 20.160.56.85) smtp.mailfrom=seco.com; dkim=pass (signature was verified) header.d=seco.com;dmarc=pass action=none header.from=seco.com; Received-SPF: Pass (protection.outlook.com: domain of seco.com designates 20.160.56.85 as permitted sender) receiver=protection.outlook.com; client-ip=20.160.56.85; helo=inpost-eu.tmcas.trendmicro.com; pr=C Received: from inpost-eu.tmcas.trendmicro.com (20.160.56.85) by DB8EUR05FT017.mail.protection.outlook.com (10.233.239.55) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.16 via Frontend Transport; Tue, 8 Aug 2023 22:53:42 +0000 Received: from outmta (unknown [192.168.82.132]) by inpost-eu.tmcas.trendmicro.com (Trend Micro CAS) with ESMTP id EB5B02008009E; Tue, 8 Aug 2023 22:53:41 +0000 (UTC) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (unknown [104.47.14.59]) by repre.tmcas.trendmicro.com (Trend Micro CAS) with ESMTPS id 88C2720080073; Tue, 8 Aug 2023 22:53:35 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ki5eyyJvEAssdg0h4oD4iTpKrwCYotRPVXjIWvWAqnpgjo38aHK3ahbl4iie90lueQuWOTJRMkHVZH3zVZQVPr77D+T3fthkbNNiuFlCxOIFxu2cUnO/YnwbLZZBr5oxYN/3TSjVF8XlVu1qt4hk6Q/kaCxHl94OKhne8j/QnYNJe7skPuBoVb9YKZSr4GaxzoMx/YdiS81oeMhhES+6s2wUrE0UtD7L5o6SYltoqiIFo2rfUgvNa/xPfKGdhpMGfadIlpRvEhmNcX9rAguArhfQ8N3gxbv2BSpCz0XJSPBUzPsfJznG1S0+cqasCsEJw98MDWM6Qgy5coi/oY/Q4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=MG1BE2ZxvEiKIqxaJxGIwLqRWWW4HIY4XKunHz4WoM0=; b=FstBV5bd1w/sxsSwp8attEY9U8hZgORS4S2QGWZR0Of1HCsEpf0lXSxz2npdIlatfbdaGM0xY87WiiuaDnozVA1uQlFalj0IeINv7NY5lVPlZvJK2Lj/CLmpDnAJR4oc/71tTXjK1g+oAaxWVsI3a7F0fs9zelmSYQq7s6TFGB668pVtM2RTPBIWItpB/1Y6JWTSF1SNvnZU9U2kq9ZfJaIT82X0dComQSzpXx9ledPJo5JOcm9fXdnuOgHBbArwLpBhR1zCc5fr57IEm0ZBUsCWwXPHy1ewX6dORiqTxEuqWreiYBGQExNubPbYnuEUBiZl8kKUMyN6tNzPA30fww== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=seco.com; dmarc=pass action=none header.from=seco.com; dkim=pass header.d=seco.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=seco.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=MG1BE2ZxvEiKIqxaJxGIwLqRWWW4HIY4XKunHz4WoM0=; b=uOmZep55PIJjEGi9pTzjOlIEgXE7DmSFMwrIYYAf8e8H3g1oXfiRftZN2g7nF3HSHpuAiZ1Nb//ZlG+NKp9hgFcVwpIKWecsAP79bKgNRo2pHddxvxdm/nYnZF/pwD0Cv+Woba6UkrGi9KqWmUSNmRltGSAHnOsbACTqGbqJuyBfJoB941JB3nzPtbQF0Dh0yfuyNvxYQXl6nl6PM99Nj+EP6YeH3BlcKtYGRRZu2DRYJb6Loh4+BsPnT6Dhi/595OU8OP9esMeISSUYkgdc5z2pB8vRah1I+d0HFySCFEsXOPVKgnj6iiovJ6l5ySOXimD09wC10L1XSJ+Z3zTxaw== Authentication-Results-Original: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=seco.com; Received: from DB9PR03MB8847.eurprd03.prod.outlook.com (2603:10a6:10:3dd::13) by PR3PR03MB6634.eurprd03.prod.outlook.com (2603:10a6:102:7d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.27; Tue, 8 Aug 2023 22:53:34 +0000 Received: from DB9PR03MB8847.eurprd03.prod.outlook.com ([fe80::65d7:d7d8:711b:2514]) by DB9PR03MB8847.eurprd03.prod.outlook.com ([fe80::65d7:d7d8:711b:2514%5]) with mapi id 15.20.6652.025; Tue, 8 Aug 2023 22:53:34 +0000 From: Sean Anderson To: Tom Rini , u-boot@lists.denx.de Cc: Simon Glass , Heinrich Schuchardt , Sean Anderson Subject: [PATCH v2 2/4] malloc: Don't use ifdefs for SYS_MALLOC_DEFAULT_TO_INIT Date: Tue, 8 Aug 2023 18:53:18 -0400 Message-Id: <20230808225320.310926-3-sean.anderson@seco.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230808225320.310926-1-sean.anderson@seco.com> References: <20230808225320.310926-1-sean.anderson@seco.com> X-ClientProxiedBy: MN2PR05CA0036.namprd05.prod.outlook.com (2603:10b6:208:c0::49) To DB9PR03MB8847.eurprd03.prod.outlook.com (2603:10a6:10:3dd::13) MIME-Version: 1.0 X-MS-TrafficTypeDiagnostic: DB9PR03MB8847:EE_|PR3PR03MB6634:EE_|DB8EUR05FT017:EE_|VI1PR03MB6400:EE_ X-MS-Office365-Filtering-Correlation-Id: f461dbc1-1f09-44c3-0ad2-08db98625037 X-TrendMicro-CAS-OUT-LOOP-IDENTIFIER: 656f966764b7fb185830381c646b41a1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: QwxwSo8uimhi6SSoM2KgLxr2JKGRKj6nF95EIRaP7zBlWX+CfW1zZlWmhd7lg5WX8m3bydMHP9jDc61K97nYIKuVWOnPRjh3qVZyGbVBMu87Be+8c+dEMxVV5h5TI90Z1EoSXy4CZmoa34Sj8S0bQG8cLzN80j2fPX9PXGVwj6jHU85ji0PkXkoXJGijhuUxGVXGo0sgaDpT9Lw1/l7HAmFg3GBleswm8eHv6Zu2NxkOYqAtL2a06H32qt0wpMv2cqcM58HGO0KERxTXdssg+bk7a/QV7wGBnD6fiPaigscvCebC14wlz55ON0WV9wDLhMVr87lvorjAkZknMkRbx0Wvq0G6q9D21vFLVk6tENeTtiVt064y1ytJbpOlrPEre9psMn2EY+gPiFswD4LKWl+SaYLRclwd0m+CVPD6jC7lkzsJN62jIdOdW71kwbQsn5M+4A225pWX5oLMPigyAAezc/tC7ubqoIoC7bM1xkMpjHzpierqNXIQVUvp4pryfXUrb5VAzuB8WTo0KpKsPzDkRLm+V4QL2lbp3ym6N4oTFnuxsQB6a8S3BSFHpGtNhscDgVidpFh5np/wdYVSBG7LvTXKkwrz/uAPrRdyfK5NPTyrSoaD4lzEB8sPZOCI X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB9PR03MB8847.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(346002)(366004)(39850400004)(396003)(136003)(376002)(186006)(1800799006)(451199021)(2616005)(36756003)(1076003)(26005)(52116002)(6506007)(107886003)(6486002)(6512007)(6666004)(478600001)(38350700002)(38100700002)(54906003)(66476007)(66946007)(66556008)(4326008)(316002)(41300700001)(8936002)(5660300002)(44832011)(8676002)(2906002)(83380400001)(86362001); DIR:OUT; SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR03MB6634 X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DB8EUR05FT017.eop-eur05.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: c48b971e-7333-4dc6-c7c7-08db98624b8f X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7TkdTDNWtINQ2ppohMZI4i+BtdJDv+hTmeX52m6vQpvZpAx6nvA0XyRQRzqVPT5ba5l0pEo3g5PVniD2lyi+wth9acR5+q3TRuQwDOei9LODOJ5cDOT0fHh8vd9/TZ2XCrYZSCDWhVqwOxZX2lxw+2V+MwYq79kDTPdjVZr4Tm18uCRfjvM8UAvxbs8RMIW0nxtLcQm8IZon7Chbg3LUY4EIe8w03Lmimx5HBvG67KHpT4nvQlZ0rUNUWM8kKRWzQaONz/jKQPO6UqtjLb7hD1RsWBITyD3Jofd/cJzgWj4/LY7bK2+9B9I0bZQQLK+PdvbUH/kLU6ayJvgeA8yQ58EXydbwolRS8rRzOynkvG/FxQqfr9zYbetLSvnD9+KYaO8q7l3IpsC5c0KFcx0C9j86bgUNHC5i+Vg+WY1OWXksC7NwwsZBdhQWPBp4AknlYePatplQ+4C7kDJG7kAbe8RBxJjPIrmMz4Y5M0okIHxLQo5bdZv0bExD7pXQeKusu/u8K7zIezHuHUUnoDvSFlssmyHfw0BIQtAYKzF/2MIXVXYvgDm0GHTXA+BVM76IWIcIjGoqDN1mVlMR+tkuHy2hmPLciIbEHtKC7MekBZYN5JBfNjCKps9PZFEdEBqarlur/zT5cOfQMZ76k/jU74ez7IEbYf0+ZvumHQ0K9e1PMKZWdxUY1kpEJHEFlcQhNdM8+c3CJArfTHz1ZVj6mRAwA3DLP65qUSRqbaCuWzsedwaTEo4lBRKEcDnWSXdx X-Forefront-Antispam-Report: CIP:20.160.56.85; CTRY:NL; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:inpost-eu.tmcas.trendmicro.com; PTR:inpost-eu.tmcas.trendmicro.com; CAT:NONE; SFS:(13230028)(39850400004)(346002)(396003)(136003)(376002)(451199021)(186006)(1800799006)(82310400008)(46966006)(36840700001)(47076005)(2906002)(83380400001)(36756003)(2616005)(5660300002)(36860700001)(54906003)(6486002)(6666004)(7596003)(7636003)(70586007)(70206006)(356005)(6512007)(4326008)(82740400003)(316002)(40480700001)(41300700001)(86362001)(44832011)(107886003)(8676002)(8936002)(26005)(1076003)(6506007)(336012)(478600001)(34070700002); DIR:OUT; SFP:1101; X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2023 22:53:42.2277 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f461dbc1-1f09-44c3-0ad2-08db98625037 X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=bebe97c3-6438-442e-ade3-ff17aa50e733; Ip=[20.160.56.85]; Helo=[inpost-eu.tmcas.trendmicro.com] X-MS-Exchange-CrossTenant-AuthSource: DB8EUR05FT017.eop-eur05.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR03MB6400 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean With CONFIG_IS_ENABLED we can eliminate some ifdefs. Signed-off-by: Sean Anderson Reviewed-by: Heinrich Schuchardt Reviewed-by: Simon Glass --- (no changes since v1) common/dlmalloc.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/common/dlmalloc.c b/common/dlmalloc.c index 0f9b7262d51..30c78ae976b 100644 --- a/common/dlmalloc.c +++ b/common/dlmalloc.c @@ -588,9 +588,7 @@ static void malloc_bin_reloc(void) static inline void malloc_bin_reloc(void) {} #endif -#ifdef CONFIG_SYS_MALLOC_DEFAULT_TO_INIT static void malloc_init(void); -#endif ulong mem_malloc_start = 0; ulong mem_malloc_end = 0; @@ -625,9 +623,8 @@ void mem_malloc_init(ulong start, ulong size) mem_malloc_end = start + size; mem_malloc_brk = start; -#ifdef CONFIG_SYS_MALLOC_DEFAULT_TO_INIT - malloc_init(); -#endif + if (CONFIG_IS_ENABLED(SYS_MALLOC_DEFAULT_TO_INIT)) + malloc_init(); debug("using memory %#lx-%#lx for malloc()\n", mem_malloc_start, mem_malloc_end); @@ -733,7 +730,6 @@ static unsigned int max_n_mmaps = 0; static unsigned long max_mmapped_mem = 0; #endif -#ifdef CONFIG_SYS_MALLOC_DEFAULT_TO_INIT static void malloc_init(void) { int i, j; @@ -762,7 +758,6 @@ static void malloc_init(void) memset((void *)¤t_mallinfo, 0, sizeof(struct mallinfo)); #endif } -#endif /* Debugging support