From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by mx.groups.io with SMTP id smtpd.web10.6068.1582711443863747283 for ; Wed, 26 Feb 2020 02:04:04 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=iZe5HKgb; spf=pass (domain: linaro.org, ip: 209.85.128.66, mailfrom: ard.biesheuvel@linaro.org) Received: by mail-wm1-f66.google.com with SMTP id i10so3066150wmd.1 for ; Wed, 26 Feb 2020 02:04:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=gZw17P9tweKy/4i9L9arsOL8cZzRHTAG5CKYWlTJhI0=; b=iZe5HKgbgCrxTrfbW4NLthI5fn2QjX5lTxleh/EWRyYnR0blKD2YSICkjI787mTM/W 5E0i7BJyXcRFg48hbR6w0LnqcrsDiyBs0BAyezhb+ed7eGFsH4DweyUPQ4/mpIAonAMt bWMzq/DPrRZYOPjRocDAzE3yEPzVbg2c0ujhYkVWHc6RYosAXkK+1w53Y8/eaCCCHKr1 kxB4BA0TlsDKZbdtt4K8as2q3nDNb99BfxONMAwDOVJuxqwigCmN8FDpcCT2a61ye+fw hPKuvv5oZza1vSjWiybEiis2Zf1ja1J5tEu5dimhDu5STUlnSdrI//sIHgyBTP2VWtEa MyPw== 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; bh=gZw17P9tweKy/4i9L9arsOL8cZzRHTAG5CKYWlTJhI0=; b=qrvvqvIZ0z+ozQ3tMdpz2uUc72Y+WatbtOZikZDdjX/1B7NSNYwSWA6rWa+2K/BI86 E5QKnV9C2qi8xy8TOn5OICod3t5z3j7JF93A9hd3Q/d5W77X8leSOEwz1jTV0V1lCxE6 aTYyBS4FEtRB/PL0Cp4lwNgdVIXlOjcFdSv48wNUnW3xYiMixBluDbMOvD4jf5/OqsBK hTs3VDr8S/s0SLYxBAZhAeA8o9IvnZOAmLrX2/MKpnaN4v1SWTmyESDOvD/UwmDfgzWN i2biyQ7oqdwhPisKrU9nOBLBCnamHtqr1DVzkkzdm3aPr8Vlfmaqwt/B5QIoOgCLBmi7 4z+Q== X-Gm-Message-State: APjAAAVIbMMRrCF1m9I7TByLgAluxlbDBj3jpvrFEvCqIh1f/WY4it6N KZXOf4lCCzVDYDmM/DnJzBkVnEnZ+iEOaQ== X-Google-Smtp-Source: APXvYqybYWNcdr7ETfkWi7U+8ZiskilAQGfCe8BmDWUeNeAcAeVkJTicUEucZPL8gX19C/Mt7kkSZg== X-Received: by 2002:a1c:3b07:: with SMTP id i7mr4436594wma.57.1582711442149; Wed, 26 Feb 2020 02:04:02 -0800 (PST) Return-Path: Received: from e123331-lin.home ([2a01:cb1d:112:6f00:816e:ff0d:fb69:f613]) by smtp.gmail.com with ESMTPSA id b10sm2559159wrw.61.2020.02.26.02.04.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2020 02:04:01 -0800 (PST) From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: leif@nuviainc.com, lersek@redhat.com, sami.mujawar@arm.com, Ard Biesheuvel Subject: [PATCH 1/6] ArmPkg/ArmMmuLib ARM: remove dummy constructor Date: Wed, 26 Feb 2020 11:03:48 +0100 Message-Id: <20200226100353.31962-2-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200226100353.31962-1-ard.biesheuvel@linaro.org> References: <20200226100353.31962-1-ard.biesheuvel@linaro.org> Make the CONSTRUCTOR define in the .INF AARCH64 only, so we can drop the empty stub that exists for ARM. Signed-off-by: Ard Biesheuvel --- ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibCore.c | 9 --------- ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf | 2 ++ 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibCore.c b/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibCore.c index 74ac31de98cc..a6601258bee0 100644 --- a/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibCore.c +++ b/ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibCore.c @@ -830,12 +830,3 @@ ArmClearMemoryRegionReadOnly ( { return ArmSetMemoryAttributes (BaseAddress, Length, __EFI_MEMORY_RWX); } - -RETURN_STATUS -EFIAPI -ArmMmuBaseLibConstructor ( - VOID - ) -{ - return RETURN_SUCCESS; -} diff --git a/ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf b/ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf index 5028a955afac..3dfe68ba48a6 100644 --- a/ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf +++ b/ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf @@ -14,6 +14,8 @@ [Defines] MODULE_TYPE = BASE VERSION_STRING = 1.0 LIBRARY_CLASS = ArmMmuLib + +[Defines.AARCH64] CONSTRUCTOR = ArmMmuBaseLibConstructor [Sources.AARCH64] -- 2.17.1