From patchwork Mon Jun 18 18:16:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 139042 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp4256999lji; Mon, 18 Jun 2018 11:16:09 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLfR0DFqSrW6QiQgq4u6QdXEo7pdB5CMrQa3vMdTU8gBnd3k2/scNTyQ5CZ9wSfZUxpUT6T X-Received: by 2002:a17:902:5991:: with SMTP id p17-v6mr14965570pli.191.1529345769481; Mon, 18 Jun 2018 11:16:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529345769; cv=none; d=google.com; s=arc-20160816; b=AUz58bubf0EbmIsR4KrESSf1sxSm6bGZdqiAsSKrHFlVXW+Nat51s2ZDSGhqWSuTkU 6psCkRuTmMwJmf1UeQd4ibCxWlQEVFEuM3HFitzdrGoM4cZ4f/IQzphva7YTSNXX+VHm sPa6ip8eg5gcHFeeGE6Kj1SbebHRodBY37iUlW98XKBBJQIvsl/Z0A9Z9oc8WLs6/jn+ p2kO8z1vrHLTnE0w5AzbkUVgfezh2pomv9tjteuC85nkRDJaDN34/jxqX4Xf2BCldG5O Fv8RexI76cgL63/B7Xx2/G0rLuslpBaR6h2P9sZ5rr6+CO+1ZpDFSz4QlnqdKIrpygGo X3+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=dW9irN7nCLHiMHO6C0WwJ4tolw1Z7Q8aAhtMJID78aE=; b=EfBZMbbRiGgXITH4mwaXqdXo47XPNTPvu+XwGEcOhxwR8zIGKlPM27MlCbIQnTxhIo MAdkdWHBa6NhcsBnLLd6hbNzmEBSV5OmevdHu4m9keIw19KCLWjBDW3L28MRTxPYp9dy bRoy5ClRguW9UjNWBo68S/8lDsRXVy9L3t03d4ocAIV9L7GTNHzkEb/+O4pi/uIU1FHk 2NbYmE9Dvola2IOMyJneOI5eS5RwKZN5qj7VgqnxU2dJRKjauPIbEs6ONyqoM2tF4yIq XdGzWKsH0q2rFQqAz90SibM6XeZNpQuxHUvMgLaFguXeco5evpEgvzSF6RstAX9YtFvb vrOQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=eL16qdZt; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id t6-v6si12903657pgq.241.2018.06.18.11.16.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Jun 2018 11:16:09 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=eL16qdZt; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id C9C36210F52B6; Mon, 18 Jun 2018 11:16:08 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c0c::244; helo=mail-wr0-x244.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr0-x244.google.com (mail-wr0-x244.google.com [IPv6:2a00:1450:400c:c0c::244]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id B7ECB210F48E0 for ; Mon, 18 Jun 2018 11:16:07 -0700 (PDT) Received: by mail-wr0-x244.google.com with SMTP id o12-v6so17807595wrm.12 for ; Mon, 18 Jun 2018 11:16:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=Ds68lcq1Xcr2UKEeMuEZK1t3zdfR5jg83ova2jRB+pY=; b=eL16qdZtLGiysoOT7+J/7QuPUR4DdPLQYyuY8BgmHCSJVHsTyZvX1YHh7Z0p+U+sjr Xu/pi1x4pw/23mpyCobH+GIjyvWJgTCBmP9VyGZJwdxF7uLL81O7Wvhjwq2g7Arqk95A FvfxUHixangNaAKFAa252wvDqb4UOjxO3kDXs= 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; bh=Ds68lcq1Xcr2UKEeMuEZK1t3zdfR5jg83ova2jRB+pY=; b=t0Acksw97SyzkTqpRs1l/utrXDzGhm8MInhege1zII0V1srzKgYb0RL/cyUCd0KrnN pXdPsjdBKWQP7+4vH/VHi4I7wRedxvucZS7/OSbyIhw2Br2mab1LeEryWHylgBkqzbrB Qo8x07BKFK0TIjxLG7TLmYWsi8kK9JspFuOjwvHULFlSmGhEixYAa8sBG9aoKKNnLp+z yeCB/TMDHt4cuDP/Qm0nzhRZGKEQZaBcA4YWfuAXbtoU6BODggrFqRXHojG/QYRxrUEC h6Z1hJpYLg0haPKj723IzvFhQamQdr/M5X8GlnjsiPGnPvspmUHVhHXSagiFDw7btjjb /c/w== X-Gm-Message-State: APt69E06sXecIgL9BZcNdgaVjclJsDMWVvaZmvV59Wj449IYitpGCNDs BO2fI4J7Y/Uly8vpMCp9iwMmr6fC6C4= X-Received: by 2002:a5d:48cd:: with SMTP id p13-v6mr12099113wrs.0.1529345765876; Mon, 18 Jun 2018 11:16:05 -0700 (PDT) Received: from dogfood.home ([2a01:cb1d:112:6f00:50d8:cb10:b6d:abf0]) by smtp.gmail.com with ESMTPSA id w67-v6sm8769736wmw.0.2018.06.18.11.16.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Jun 2018 11:16:04 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Mon, 18 Jun 2018 20:16:03 +0200 Message-Id: <20180618181603.26242-1-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 Subject: [edk2] [PATCH] ArmPkg/ArmMtlLib: fix prototype inconsistency in MtlWaitUntilChannelFree X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: leif.lindholm@linaro.org, Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Align the prototype of ArmMtlLib's MtlWaitUntilChannelFree () with the one in the ArmMtlNullLib implementation (rather than the other way around, since edk2-platforms has a conflicting implementation as well) Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- ArmPkg/Include/Library/ArmMtlLib.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Leif Lindholm diff --git a/ArmPkg/Include/Library/ArmMtlLib.h b/ArmPkg/Include/Library/ArmMtlLib.h index 4218a741e5eb..48641258ba68 100644 --- a/ArmPkg/Include/Library/ArmMtlLib.h +++ b/ArmPkg/Include/Library/ArmMtlLib.h @@ -68,7 +68,7 @@ typedef struct { EFI_STATUS MtlWaitUntilChannelFree ( IN MTL_CHANNEL *Channel, - IN UINT64 TimeOutInMicroSeconds + IN UINTN TimeOutInMicroSeconds ); /** Return the address of the message payload.