From patchwork Mon Jul 31 22:33:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1815287 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=85.214.62.61; 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=CwzDCUjl; dkim=pass (2048-bit key) header.d=seco.com header.i=@seco.com header.a=rsa-sha256 header.s=selector1 header.b=CwzDCUjl; 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 ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RFCht2NHjz1yfG for ; Tue, 1 Aug 2023 08:34:22 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4D28586AC7; Tue, 1 Aug 2023 00:34:02 +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="CwzDCUjl"; dkim=pass (2048-bit key) header.d=seco.com header.i=@seco.com header.b="CwzDCUjl"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C873C85F50; Tue, 1 Aug 2023 00:33:58 +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, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02on2060e.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe13::60e]) (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 4635186AB7 for ; Tue, 1 Aug 2023 00:33:51 +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=jyAw+vs7WtK0tUsZCGC1WRYGbyBjUNgjpNNYA9JdPmE=; b=CwzDCUjlqvALjR9CeX7JFYm7Q1szBq5bUqgadpAFzPvh+o1ung67ZEi8CDfNd0/MGoctQ4n+UEp3d8wJwCmmmH6z/vxbtLOd8Z1pJchwNMJFK13vlRQLE1PYH1qaXA6x41taclhMktAHKHkvKAoKuIKbVnb/xxCD1+xHGU4JdmfCPInDEDtIQWXe8SYr+etZ3isA0uuiOKgMZEyxp5ohIQgrEHx+fVqOR9Eo+w9tH9rdKdOfWF7bDicAkWNM7wLomSG3AVfvX2laLZiG2Quipc+1PITuyh65SyOeUSlHJ+VnGvNsN3So5ykoOxyHIAYpcb0r85onL035gMkpmqCKfw== Received: from FR3P281CA0187.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a4::15) by DB9PR03MB9710.eurprd03.prod.outlook.com (2603:10a6:10:452::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.43; Mon, 31 Jul 2023 22:33:49 +0000 Received: from VI1EUR05FT047.eop-eur05.prod.protection.outlook.com (2603:10a6:d10:a4:cafe::db) by FR3P281CA0187.outlook.office365.com (2603:10a6:d10:a4::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.17 via Frontend Transport; Mon, 31 Jul 2023 22:33:49 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 20.160.56.82) 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.82 as permitted sender) receiver=protection.outlook.com; client-ip=20.160.56.82; helo=inpost-eu.tmcas.trendmicro.com; pr=C Received: from inpost-eu.tmcas.trendmicro.com (20.160.56.82) by VI1EUR05FT047.mail.protection.outlook.com (10.233.243.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.43 via Frontend Transport; Mon, 31 Jul 2023 22:33:48 +0000 Received: from outmta (unknown [192.168.82.140]) by inpost-eu.tmcas.trendmicro.com (Trend Micro CAS) with ESMTP id 6EB0B2008008D; Mon, 31 Jul 2023 22:33:48 +0000 (UTC) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (unknown [104.47.12.51]) by repre.tmcas.trendmicro.com (Trend Micro CAS) with ESMTPS id 94F492008006F; Mon, 31 Jul 2023 22:33:41 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ae6xwPFVBgf67WOidZbuvkgGPI+vOyMN41gBrLjcsDWPei/caUa6lP78CMonUDP8L5vHphEYWBs2vqrNSelRte3yL4r0Ow1TwQ1xtakfzA2BJTL81lh1Zms+5ciY530nNgq02/armeZ3umdb+Gk8STkb2n2trotARiX+y4J3QIrZahnCiIoYdGk45yysCkfOj/xt7GaYDIlPivs9wOOZpUWRYgPkYdjhlL9dotVUAL3r53mzW3tx/wX6YOpzGQEJZ6rFNRoxNHECRu448adyjG+W2cjqlk70IIKYKacc2PLKhPja+oI8sUMhFZiHbNogpk0wAKFZvqDRfKn8wxxqog== 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=jyAw+vs7WtK0tUsZCGC1WRYGbyBjUNgjpNNYA9JdPmE=; b=VOBqxWjG/ZfH6+PF0fjaD5cNjrtvHmku+RbNt0XsxlY6cbdvTwnhXJdqcsfndOqr5f59yXePS2TRrSEgsugNjd2ESoCY/EcPEJEdY793UPVB6japK0q4Im2AJqDtPVK3+I7Sop9CUp8xUMLJooMMWrFDMSzvD1Y1x1/BxPBjjFTqM8ihCbvhbp2BHWUGUQE6HAxOZS/0RBVvzdJZkAIMEF0nREnvw5jcoWssalY9rjDGWeZK71jplAFNtL+ijyuhvTlEdWSdzaF1tHTH5/Ep2JcOwtnNPRIesNrvEaK2VxCvm/hCKgyKiYM0xtE7JbNodkzhn9YsOsLK7ldZzUJ4pg== 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=jyAw+vs7WtK0tUsZCGC1WRYGbyBjUNgjpNNYA9JdPmE=; b=CwzDCUjlqvALjR9CeX7JFYm7Q1szBq5bUqgadpAFzPvh+o1ung67ZEi8CDfNd0/MGoctQ4n+UEp3d8wJwCmmmH6z/vxbtLOd8Z1pJchwNMJFK13vlRQLE1PYH1qaXA6x41taclhMktAHKHkvKAoKuIKbVnb/xxCD1+xHGU4JdmfCPInDEDtIQWXe8SYr+etZ3isA0uuiOKgMZEyxp5ohIQgrEHx+fVqOR9Eo+w9tH9rdKdOfWF7bDicAkWNM7wLomSG3AVfvX2laLZiG2Quipc+1PITuyh65SyOeUSlHJ+VnGvNsN3So5ykoOxyHIAYpcb0r85onL035gMkpmqCKfw== 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 DB3PR0302MB8942.eurprd03.prod.outlook.com (2603:10a6:10:435::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.43; Mon, 31 Jul 2023 22:33:40 +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.6631.043; Mon, 31 Jul 2023 22:33:40 +0000 From: Sean Anderson To: Tom Rini , u-boot@lists.denx.de Cc: Simon Glass , Sean Anderson Subject: [PATCH 1/3] malloc: Don't use ifdefs for SYS_MALLOC_DEFAULT_TO_INIT Date: Mon, 31 Jul 2023 18:33:25 -0400 Message-Id: <20230731223327.109865-2-sean.anderson@seco.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230731223327.109865-1-sean.anderson@seco.com> References: <20230731223327.109865-1-sean.anderson@seco.com> X-ClientProxiedBy: BL0PR0102CA0010.prod.exchangelabs.com (2603:10b6:207:18::23) To DB9PR03MB8847.eurprd03.prod.outlook.com (2603:10a6:10:3dd::13) MIME-Version: 1.0 X-MS-TrafficTypeDiagnostic: DB9PR03MB8847:EE_|DB3PR0302MB8942:EE_|VI1EUR05FT047:EE_|DB9PR03MB9710:EE_ X-MS-Office365-Filtering-Correlation-Id: 721eb31a-5688-4184-88fb-08db921635a4 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: D1DEaPiXaEJy5L7oelML0mY9w5O//r7cNSpZkKmZE18XZpf67/Zzy7Ti0pfkcV1YQl3hXGnssl8WMnq4ZjHCGphlgqfP2Sa6kokTbgNjjsK3OK3Ag3fJO/+kBwESrW8yMnZC9bzajL9ZXABTk1GED+rNIbSKi18R3Gp7Rkf9AkjNRsNSygtB0jo1ldl+5scK9p2wv8OiOoRjfFsA+oViYmYCAdN1uWlhCUxLaS5ABjFWu6KWxGSRXqp68y98DafePS06ikeJb1og5WodLPDvyvQZPPtUPmfRiuI8X/HS32eM5GAHyHq8NH+4ZWpmiFGSyiaTKP7jS6+2TftDF0ySmDjlopBzLF7Uu7LI5BMcahqDiBCrp0lO6mk9keNrOZ1GeEuS0c5WLe+eWamztfWS+UH3UD5V0JcuhygMPNxBFF3YWbMFmz9x5MEUWqzFBraiipxAn7tjLdJWlP3EU1QfPPWX4ViIb/PVK8dsbJY60FoI1X4PMWoMjgTWWAx2SaUx2UlV6S9Gsw1LmEzVxv84kNn4cNn7QYWdTiySwiaFkT2njtBvqKfSZRhrgsndd++APxwVrYX+YNl1AavakoT7aRDEaTrcYaaWh4GYIAi2+rXMQbTH7IL68g0L5f+T6INL 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)(136003)(376002)(396003)(39850400004)(346002)(366004)(451199021)(38100700002)(66476007)(86362001)(8676002)(8936002)(5660300002)(316002)(4326008)(54906003)(66556008)(66946007)(38350700002)(41300700001)(478600001)(2906002)(6666004)(36756003)(44832011)(6512007)(52116002)(6486002)(107886003)(6506007)(26005)(1076003)(83380400001)(186003)(2616005); DIR:OUT; SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR0302MB8942 X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: VI1EUR05FT047.eop-eur05.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 3cb988ec-d92d-4ede-decb-08db92163029 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: y3u6QATuU5/U8WSQeZsH5uz/EyKEq3zEKG23T4p8msTnY63Vq9++DFA6atE7gTwnM3va+7QWbBbWulU8Inbfwhqxp+/hNHkM8nAH5tYlEi4+u1ZYCrMDMtGJjgetDUDVg9dyh1Ajev+ud6cw+gGgUOPWLFRpy7MGdDmXc9+Ch49mBPD1zDEJU7bnZcctzVU2/K2d35j3um+rQDSDq3cVf5vG9EX0+lPzeSMvOJYssG/zl5PyTO/NOtQKhAaSux7E8Pr0Rl0L/r4Kv8DDixDSEt5bXGkMEdfQ0A8EXvzvkLhRTh8uIesZBvViiZRmJ5/xi2++ahWmKd8SY5izspvj2Jr+fZsrefTfz8DwTL4N/9Tru4ygVMZhercMP1ATRWZUyq6M26+Kws5f3LhWPC4iUQmhHazibCyyhCq1wcB5g1+DxIN05a8M54fB1oOmNC/RMkcP6kogW48Be6ZMz/8r29UFFHlLDKf+bWcy1CjAo891UXWFO6z65UWh/tfKR6p6odJHFLufF1axQUqKblxWL740eHv3ihWUMac58Vpar1xrH5VzvkVgf8WxkytcY8rgnV72Z2SB0QKAfFUER045Kn3JJKMtI2s74O4rjE6B7tIt5cRG+gdnLS4tZhwCkYrjNlLBNq9sQN6KS6cdx2i5Th4YAOQWqmg6D9hNn7k/V4pYwZWb1Jj9TrkkA0hgJk5VkYPKWaQDi7EC1vyLweZ88FOrLyZVaLjGwW2105rNjQJ1EmQ90JKFx3goSUPU4BzN5rlWnehA6VbXhnp9zCMpXA== X-Forefront-Antispam-Report: CIP:20.160.56.82; 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)(136003)(376002)(396003)(39850400004)(346002)(451199021)(82310400008)(46966006)(40470700004)(36840700001)(86362001)(8676002)(8936002)(5660300002)(316002)(4326008)(54906003)(356005)(7596003)(7636003)(70206006)(70586007)(82740400003)(41300700001)(478600001)(2906002)(34070700002)(6666004)(36756003)(47076005)(36860700001)(44832011)(6512007)(6486002)(107886003)(6506007)(26005)(1076003)(83380400001)(336012)(186003)(2616005)(40480700001)(40460700003); DIR:OUT; SFP:1101; X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Jul 2023 22:33:48.9187 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 721eb31a-5688-4184-88fb-08db921635a4 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.82]; Helo=[inpost-eu.tmcas.trendmicro.com] X-MS-Exchange-CrossTenant-AuthSource: VI1EUR05FT047.eop-eur05.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR03MB9710 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 --- common/dlmalloc.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/common/dlmalloc.c b/common/dlmalloc.c index 0f9b7262d5..30c78ae976 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