From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ot1-f67.google.com (mail-ot1-f67.google.com [209.85.210.67]) by mx.groups.io with SMTP id smtpd.web12.15674.1583345578405159375 for ; Wed, 04 Mar 2020 10:12:58 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=CggKkrGm; spf=pass (domain: linaro.org, ip: 209.85.210.67, mailfrom: ard.biesheuvel@linaro.org) Received: by mail-ot1-f67.google.com with SMTP id v19so2961795ote.8 for ; Wed, 04 Mar 2020 10:12:58 -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=CggKkrGmmrF2EG+kmAtkGj68Jk54WQ8TsQC+0LFYAtL2X0wn08g2AXDcAN1bTJyWgc 7euN603OTe6t2ohWTPM9A0461WqvgVpq/VCnCVGqmSBhOGw7jHCjf17k1e4XJy+vtjhM 1ylpkkz7gMTAmMp8gJJ0b1XcF8PsqSlVk2mAjwB/X8UFqcQUZ1QQ12aQUC+6vP+2y3O+ m6LvbJKGEoR6xjS0YGQhf8j41kzRf5rGbQYEVtjeOmimok4pIjtxIXm6y2VLlexx/u6J 0+nTkuOLXdhwUtvCDSENRYJtvyIAHMZmYpPbutlmckp7mGc2Pd3b1WHKH7WA2v/232Dq gHOw== 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=QkO+aS/P25k/R4yzu+kdLr0n2phd1JbA/zGLdIyAo2Y6j8bmxuSYRpIwNJfSuenErR PO88qtsnFKXqNaroVj8UjUGYkdKTKxkSCmpvwCKOtfArBeviAwUIy79pTGsRvkC0X7o0 PY1/aZ0lYwdbDjPK2I5zOUSoBzJXyjtQPlWvzodsKvSx97PNYrgdiHoCHHVbyhGk4zd7 XuC6N8xNz1Qe9Npdn4ih9tJ+Wp+XYr4DRoth5ZJkFxrSCqBmqIXMKuqVqQUWl05hdPiD belBNazsumpIDl4TWinFpqPu+ZlnFeVv8b9gXm2KR9NkO+Lc1ON8JMOtX3k0Ww3Mnh7W /XQA== X-Gm-Message-State: ANhLgQ00sQ4jDVVBE5U0pmMhnZiogm2KVCeZbNHwP770N6ORXwbZn+fP g6bxMcqqOeczvkY9dzxvwahZArDKVpwkig== X-Google-Smtp-Source: ADFU+vtv141AXlwCZYDnFznzaCEf8TMlUbLh4IJboA8oDVO79kHreiI/sxDnyse/ZXv8FH33M7cWsg== X-Received: by 2002:a05:6830:186:: with SMTP id q6mr3286138ota.10.1583345577150; Wed, 04 Mar 2020 10:12:57 -0800 (PST) Return-Path: Received: from cam-smtp0.cambridge.arm.com ([2a01:cb1d:112:6f00:816e:ff0d:fb69:f613]) by smtp.gmail.com with ESMTPSA id p65sm9083971oif.47.2020.03.04.10.12.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Mar 2020 10:12:56 -0800 (PST) From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: leif@nuviainc.com, Ard Biesheuvel Subject: [PATCH v2 2/9] ArmPkg/ArmMmuLib ARM: remove dummy constructor Date: Wed, 4 Mar 2020 19:12:39 +0100 Message-Id: <20200304181246.23513-3-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200304181246.23513-1-ard.biesheuvel@linaro.org> References: <20200304181246.23513-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