Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp4471215pxv; Tue, 20 Jul 2021 04:39:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzp+WLLJ4tScipb9voA++T125K23aLhZ0Y+rqrZHlceMQ4ho6DKskVm//qgF4Wh+xqFit+e X-Received: by 2002:a5d:8888:: with SMTP id d8mr22534775ioo.170.1626781140887; Tue, 20 Jul 2021 04:39:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626781140; cv=none; d=google.com; s=arc-20160816; b=N5Il+Sy2Rl1Ycqlx1RClvcvitBzEMmd4sScuDSBak2vevCQjzo0QAe/+ExMYYH4/6Y 3RxFPt1JPwActpF3DtRBmVTaniJAiJUMjsI/zeaBHyBOU/nqQ7q12P3iC65FyU4OxmPD kOYNYhtcWLI551wM/fPKFJbrSu2gaHVdYF3M91iaEfJWScKqEOZ71uQza0fuVzuudN4A F6tl9by6KdJuJjsg0V0Os/JvQjaHXt3oU2v/rr39VCpRf8fN8LlKxrOeoLObEKViQqL6 zTr8bzw9aveHpseqJpnTytJVbnHGzch2VApHK00oIrqeEtU0Nx/mQYt/WN6Cx0voEak7 D5bg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:cc:subject:to:reply-to:sender:from :dkim-signature:dkim-signature:date; bh=BzdAJmqWFDGPlX1pCwG3w6m/UxKMwlRCAmulfK4Lda0=; b=ZFDofdW9PKtOgeP1y7bSqyWug6jvMSaTvlpz1iWKS6fa76SWhAnCE9vGIOaCxwWGzE EgQHf01hkLa1VZXEy9xxby+sJLo9fLu9CQYXBx2Y7RD+7ssLW5g3KZMRxDYpc9yrd7bv +wirjAkRzZPxxm8Rk2VOONhN/iZ66tMX2j+HRuirgbbVExNq/0+ZKAWOMzkNJAvlJisk KfvOE9vZvzlL/eG+CwHL/MTj7fbUmToBu4iDOl5DCpspe6EGm+9Fo06pRQvnsxwvxonW hjKpIQcNH5UbddNBUOYdXUqzY7kkJEnlXaa+ywMFH91dMKt0BSVaW3QsCVQoX63FMhSc A1vA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=VfTaw4vC; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a24si13128502iol.81.2021.07.20.04.38.49; Tue, 20 Jul 2021 04:39:00 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=VfTaw4vC; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234685AbhGTK5D (ORCPT + 99 others); Tue, 20 Jul 2021 06:57:03 -0400 Received: from Galois.linutronix.de ([193.142.43.55]:40344 "EHLO galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236401AbhGTK4w (ORCPT ); Tue, 20 Jul 2021 06:56:52 -0400 Date: Tue, 20 Jul 2021 11:37:18 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1626781039; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BzdAJmqWFDGPlX1pCwG3w6m/UxKMwlRCAmulfK4Lda0=; b=VfTaw4vCRUogxm6IuOVS7RfACbHr1NrIAfLDujMp5pjJHjyacKQ8uVd2ojO2G+3XYgS/Up aG5OLLMwVhSWs7JDskDoHUunuRUVxCIKTX51zrSIJF+q7NyarOWQOz7aImnzmOWnHcBpGU VHdbXMTSPWkb3cLUb2Kyh+BHTKJDnGkJsyumh8U61GA0MjJ07zhteT+2d6nBflUqWGbFiJ bY8ldke/gdBKrbj/cmejzNXNeN5aoDt4ze93GgYTLDHseh46DTAzR3dRnO6kHQM7k8nNRQ yDTVKyz+H0ygLff/lPqsDuP+DT+UFQZ3QppXj0yfMJDSQMJTE/9tZAyZl2qV1A== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1626781039; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BzdAJmqWFDGPlX1pCwG3w6m/UxKMwlRCAmulfK4Lda0=; b=I3P0q0ADBRPiwveRpCpYtoU+hN9QH5mZRQeHvQMt8vUUFITrpk4toU8RX65/Sw19L0dQSL GMB6h2tuxNfA9BCg== From: "tip-bot2 for Atish Patra" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: efi/urgent] efi/libstub: Fix the efi_load_initrd function description Cc: Atish Patra , Ard Biesheuvel , x86@kernel.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Message-ID: <162678103854.395.2517207053400940703.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the efi/urgent branch of tip: Commit-ID: 947228cb9f1a2c69a5da5279c48f02bb4f49ce32 Gitweb: https://git.kernel.org/tip/947228cb9f1a2c69a5da5279c48f02bb4f49ce32 Author: Atish Patra AuthorDate: Fri, 02 Jul 2021 12:10:44 -07:00 Committer: Ard Biesheuvel CommitterDate: Fri, 16 Jul 2021 18:18:15 +02:00 efi/libstub: Fix the efi_load_initrd function description The soft_limit and hard_limit in the function efi_load_initrd describes the preferred and max address of initrd loading location respectively. However, the description wrongly describes it as the size of the allocated memory. Fix the function description. Signed-off-by: Atish Patra Signed-off-by: Ard Biesheuvel --- drivers/firmware/efi/libstub/efi-stub-helper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/firmware/efi/libstub/efi-stub-helper.c b/drivers/firmware/efi/libstub/efi-stub-helper.c index aa8da0a..ae87dde 100644 --- a/drivers/firmware/efi/libstub/efi-stub-helper.c +++ b/drivers/firmware/efi/libstub/efi-stub-helper.c @@ -630,8 +630,8 @@ efi_status_t efi_load_initrd_cmdline(efi_loaded_image_t *image, * @image: EFI loaded image protocol * @load_addr: pointer to loaded initrd * @load_size: size of loaded initrd - * @soft_limit: preferred size of allocated memory for loading the initrd - * @hard_limit: minimum size of allocated memory + * @soft_limit: preferred address for loading the initrd + * @hard_limit: upper limit address for loading the initrd * * Return: status code */