From patchwork Tue Nov 20 10:46:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 151582 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp613844ljp; Tue, 20 Nov 2018 05:38:16 -0800 (PST) X-Google-Smtp-Source: AFSGD/Vvqch5xTVS/HqyHef4WLcYMFAWKrCXLlP0mce5Kx3H8JWfMtUrs5xE1S1EyyS3E1eAzJWr X-Received: by 2002:a25:9086:: with SMTP id t6-v6mr1827740ybl.67.1542721095951; Tue, 20 Nov 2018 05:38:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542721095; cv=none; d=google.com; s=arc-20160816; b=D45qbv2gJkKAxf4T0/4Wk+OkJYz7S7bYfHlXa+VBWj+W49ORqCPecaCAQdu6XzvM0l B+YNH1d02+Gw2MtyC4nuofjH0c1H71o6TyMztbitnXzNmTEEkfrsCraVIJ6AOBJS7UFn Y+tx56mVy0nGP5jGZDp3i5Kv0sm/mONZUNd1PrdX+LhWPoGD1JeNx0jZ6w5xJBeNs9D8 yLBFHfzi1X9cadBQ6Ac1gchVkwKC5ofIqpPANBlbWEnisYUJYgKzbRUCToYbLG3cJPz5 HUJh7Wq3m+AhiyNm1dlk86F8t7nFI1cGfbNnNoif2hWcZeey51y7gutrZ1EeVcvtYT9F jH/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:user-agent:in-reply-to:content-disposition :mime-version:references:message-id:subject:to:from:date :dkim-signature; bh=PlnQqeQF09/TcsHdCZxpTCS5nBFrrWCXfI4XYRfln8E=; b=xGf1utYZHHMMsMBUvadLb0g7RbTfQxb70CyUWpQoEbzGoxyPaNu/hj3VRTGv003ekO dtLEqg2C9IDJnk6YatrvQnpo0R6sfQ30oPuTsAlwJOtFlRGbPfic36pnCVmdz/XgB+e5 t+5/20T80/K6mJ+osqeEz38bRr8T1x6vEu2evZUEA2mSKW65RxVZOp4wYdNW4p/kZSQp IXtmJAFhMChpiQ0t0HP8Opzvh2FVcIKVMLeMnFdxQqkqGX6sP6ONoWAF0ti5dfr+3Aps eDn0vqRGw0KtxACSu0IvD0lvv5fbAy8VOdUcA0UpfQJiTyZGKkiaE4nNWFZBXC5L4kWC tX5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b="gL9D1AF/"; spf=pass (google.com: domain of grub-devel-bounces+patch=linaro.org@gnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="grub-devel-bounces+patch=linaro.org@gnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id u131si8882814ywb.382.2018.11.20.05.38.15 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 20 Nov 2018 05:38:15 -0800 (PST) Received-SPF: pass (google.com: domain of grub-devel-bounces+patch=linaro.org@gnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b="gL9D1AF/"; spf=pass (google.com: domain of grub-devel-bounces+patch=linaro.org@gnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="grub-devel-bounces+patch=linaro.org@gnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:33800 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gP6EJ-00078s-8J for patch@linaro.org; Tue, 20 Nov 2018 08:38:15 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44742) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gP3Yj-0003Sv-1T for grub-devel@gnu.org; Tue, 20 Nov 2018 05:47:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gP3Yc-0002La-8J for grub-devel@gnu.org; Tue, 20 Nov 2018 05:47:07 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:36259) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gP3Ya-0002IE-GM for grub-devel@gnu.org; Tue, 20 Nov 2018 05:47:01 -0500 Received: by mail-wm1-x331.google.com with SMTP id s11so1698116wmh.1 for ; Tue, 20 Nov 2018 02:47:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:content-transfer-encoding:in-reply-to :user-agent; bh=6CDrSXWEHMznZF6RdrHRd+LNPD4KHNke2WZJ7PIJ9kA=; b=gL9D1AF/j+p+DGKJipmiL8Oho7CIU2CFHR771m+FXlddne5CTWZx05ddJ9dA852SOc aTZFDXC9pK2NM2nrA58CYISTfoJ+KzwIEsVTf5R6E6GK6c2BoFl9iarIWVFUdGCL6ulU 1QOmLZcpxiHVplwRWfkVCYJICMtxVa4EliEgQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to:user-agent; bh=6CDrSXWEHMznZF6RdrHRd+LNPD4KHNke2WZJ7PIJ9kA=; b=NWn0lwUK2OzVIB+S6DpnZ0fLEH+HcBtgZGOgGm/yEOBrZdjYOyseT+AX89088SAZRX k+PpakP4EHo1Qz8DSuvXwy4JVODVmHhwDa9+fl1SfJwYVm7VVix9xQV1YIhjRdpUeoLC OkfA0+hGfgYTeNwntMuDFFElkbvHiM18QHZlWInkHy2iASo+rzlZu2H0suZa2dvbTf9O Pox/q26cVXntQSAP+TwB44ndUBvcezLfwWK5J3Sa/3OnkQNd4/Z4v+S/ioQqjACJEb4w p3lGtR1CrHIt45g4FSmnsdyBlzmAIkGVmzSv4qRIXZNKghfWo/v/Su37NtGo1dLQ2pis Aruw== X-Gm-Message-State: AA+aEWb1hCSYfmWiRI3+WQRf6e1Oaqv4GSMk7lgn/nU2WvFTGdAxAkPC KrLADIzH2QusIIXXOio+cP9Tbw== X-Received: by 2002:a1c:b7c1:: with SMTP id h184-v6mr1696130wmf.33.1542710819141; Tue, 20 Nov 2018 02:46:59 -0800 (PST) Received: from dell ([2.31.167.205]) by smtp.gmail.com with ESMTPSA id m65sm16327802wmb.4.2018.11.20.02.46.58 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 20 Nov 2018 02:46:58 -0800 (PST) Date: Tue, 20 Nov 2018 10:46:56 +0000 From: Lee Jones To: Daniel Kiper Subject: arm64/xen: Fix implicit =?utf-8?q?declaration_of_function_?= =?utf-8?b?4oCYZ3J1Yl9maWxlX2ZpbHRlcl9kaXNhYmxlX2NvbXByZXNzaW9u?= Message-ID: <20181120104656.GN3513@dell> References: <20181114192919.24655-1-leif.lindholm@linaro.org> <20181116140737.wuox7v63y6lt2ymt@tomti.i.net-space.pl> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20181116140737.wuox7v63y6lt2ymt@tomti.i.net-space.pl> User-Agent: Mutt/1.9.4 (2018-02-28) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::331 X-Mailman-Approved-At: Tue, 20 Nov 2018 08:36:40 -0500 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: The development of GNU GRUB Cc: The development of GNU GRUB , Julien Grall , Leif Lindholm , Fu Wei Fu Errors-To: grub-devel-bounces+patch=linaro.org@gnu.org Sender: "Grub-devel" From: Lee Jones arm64/xen: Fix implicit declaration of function ‘grub_file_filter_disable_compression Without this fix, building xen_boot.c omits: loader/arm64/xen_boot.c:433:5: error: implicit declaration of function ‘grub_file_filter_disable_compression’; did you mean ‘grub_file_filter_unregister’? [-Werror=implicit-function-declaration] grub_file_filter_disable_compression (); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ grub_file_filter_unregister loader/arm64/xen_boot.c:433:5: error: nested extern declaration of ‘grub_file_filter_disable_compression’ [-Werror=nested-externs] Signed-off-by: Lee Jones diff --git a/grub-core/loader/arm64/xen_boot.c b/grub-core/loader/arm64/xen_boot.c index 33a855df4..5820412e8 100644 --- a/grub-core/loader/arm64/xen_boot.c +++ b/grub-core/loader/arm64/xen_boot.c @@ -391,7 +391,6 @@ grub_cmd_xen_module (grub_command_t cmd __attribute__((unused)), struct xen_boot_binary *module = NULL; grub_file_t file = 0; - int nounzip = 0; if (!argc) { @@ -399,13 +398,6 @@ grub_cmd_xen_module (grub_command_t cmd __attribute__((unused)), goto fail; } - if (grub_strcmp (argv[0], "--nounzip") == 0) - { - argv++; - argc--; - nounzip = 1; - } - if (!argc) { grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected")); @@ -429,8 +421,6 @@ grub_cmd_xen_module (grub_command_t cmd __attribute__((unused)), grub_dprintf ("xen_loader", "Init module and node info\n"); - if (nounzip) - grub_file_filter_disable_compression (); file = grub_file_open (argv[0]); if (!file) goto fail; diff --git a/grub-core/osdep/generic/blocklist.c b/grub-core/osdep/generic/blocklist.c index 74024fd06..63e0aed35 100644 --- a/grub-core/osdep/generic/blocklist.c +++ b/grub-core/osdep/generic/blocklist.c @@ -59,7 +59,6 @@ grub_install_get_blocklist (grub_device_t root_dev, grub_disk_cache_invalidate_all (); - grub_file_filter_disable_compression (); file = grub_file_open (core_path_dev); if (file) { @@ -117,7 +116,6 @@ grub_install_get_blocklist (grub_device_t root_dev, grub_file_t file; /* Now read the core image to determine where the sectors are. */ - grub_file_filter_disable_compression (); file = grub_file_open (core_path_dev); if (! file) grub_util_error ("%s", grub_errmsg);