From patchwork Tue Nov 20 11:38:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 151583 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp613908ljp; Tue, 20 Nov 2018 05:38:20 -0800 (PST) X-Google-Smtp-Source: AFSGD/Ug0iYwRM2ofhxrADbA1mmGFHl6gQ8ClcOfj+2sBTvJCnTtAjN1WrAH0vYTJ205naaYntUT X-Received: by 2002:a25:4fd4:: with SMTP id d203-v6mr1806110ybb.39.1542721099990; Tue, 20 Nov 2018 05:38:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542721099; cv=none; d=google.com; s=arc-20160816; b=Vd4nVS9ztgYR6rwq1np3ujyg6mGPU9zdF+PSFaA7U9SHbbvq06gA7qYFlIxG8O4HyC b31whSKqYenuCPBGHtlkFPvuzQ7FlKJj4Omae7qnkh2GAaw7bfZ8HRtuAXQlXwDKJt0O LRQVj/vvZfy2XVeDh+YptLQHwk7t2EPDDcZKYu6SpGtfeAFqFlAZtD3C4EIN4QnnApUo zOSGcXVhzRuq8pdBV/KF6SZoc9/vjxK7Hqd1H16qsRskwKRJ0d/hudpHS+WmnBXFStcT FYZEEPvUucZebzUNIRJSE3mmkJ0pFidsmto2nE0F9vyoPWXVnA0ORAhp0kcOZU/n2h3j 74hw== 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=BQBmPU/dwq/uPdSBFzSdT8eDM4zQugt4sCh/x8qNAGM=; b=UFGTixzN547vKoyfAyZgKFJLYPNawBdAQalDpuPh5vDC6f0tycV1e1U5MNGoUQzKq/ IcmFvT3xD2O4bzK0kuddAotVMc3Z8CF+Vcl/PW0bliVyUDaulkGKlRFXbZFCW/OtcXxW Npx1LuVvi8M9u+uQwoSNB0aoOWJW8UqXOhqSLSIIHlOFS4jQHYUXYLyVaZNbb6GJBzS2 KbYpCP8O2HBjNn8DB3ZAl7kziNQ4IBaKwtRSMEte1/vzDVs39UHT4eE0UNSKS8OVP/EG dlPQ/F3vlV9vAUjbLW+N2Oc+Eqyu+OnifT/eoIMRjnc3RarrHhqnjeXT75KjQ2+JZI3+ ZOwQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b="Ixdk5ty/"; 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 v194-v6si7654984ybb.434.2018.11.20.05.38.19 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 20 Nov 2018 05:38:19 -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="Ixdk5ty/"; 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]:33802 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gP6EN-00079f-7i for patch@linaro.org; Tue, 20 Nov 2018 08:38:19 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32903) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gP4MN-00066q-FY for grub-devel@gnu.org; Tue, 20 Nov 2018 06:38:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gP4MI-0006LV-Om for grub-devel@gnu.org; Tue, 20 Nov 2018 06:38:27 -0500 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:36494) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gP4MI-0006L6-If for grub-devel@gnu.org; Tue, 20 Nov 2018 06:38:22 -0500 Received: by mail-wm1-x341.google.com with SMTP id s11so1881684wmh.1 for ; Tue, 20 Nov 2018 03:38:22 -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=BJSy5MrWtbeK3+2xbAzIuZumWvl1fun3O5P/OWzS9us=; b=Ixdk5ty/PeaWrr/y+nv4XFdx1zPwOh7xgNDdsImgvFD+4NUxfiUcoK/XDwI0PU84wj FoKXxmCv7GR3N9mLKKjNIAesSwIchx0NYtPUSPyRfyck1yjQTu8GH0oRbtLe+WrTs46t Wd4sF8V0SoBrJCH+CQti05XDcTsXVFK9WkQq8= 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=BJSy5MrWtbeK3+2xbAzIuZumWvl1fun3O5P/OWzS9us=; b=NMeWaeARtGESGa1FrWMSRysIgg+kKoF4iLwfZyNmyX8VIu3wV1MlPaZgpQD5GU4SjC Ty2n19POvopW47Vs9bnV9BAKkLFNRJCb9n9O4i7i0td71qozzdy5egT5twfGz6O2hF9f kx8KkK61hdGJKEochNzIO9mOT1VfHEC5SRcd4ye93kNXC3pJkksyALHZffcnBzi25ZgO 9hyvAwoeFV+GwEgvhpL/E/NR/NBCs2fudk/8T82eLXfvZ/OsEs0X108UsvDZ7xgYY3YR HlJSvNOK+6KhOGei13aiy++fKNDuTpMq3AFwwUBFb99Zt8xpifOs8yLFq7wT8Yu1BrKE Om5Q== X-Gm-Message-State: AGRZ1gIZI1R0sR5OKoBaEGTPvbKxKnXkdZO2TxFhAr8/NZ/h4o7nTTUe mnJ9fGjsIiRCAHG5+G2ds//qcQ== X-Received: by 2002:a1c:7ec9:: with SMTP id z192-v6mr1803173wmc.43.1542713901403; Tue, 20 Nov 2018 03:38:21 -0800 (PST) Received: from dell ([2.31.167.205]) by smtp.gmail.com with ESMTPSA id y34sm25978047wrd.68.2018.11.20.03.38.20 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 20 Nov 2018 03:38:20 -0800 (PST) Date: Tue, 20 Nov 2018 11:38:19 +0000 From: Lee Jones To: Daniel Kiper Subject: [PATCH v2] arm64/xen: Fix =?utf-8?q?implicit_declaration_of_funct?= =?utf-8?q?ion_=E2=80=98grub=5Ffile=5Ffilter=5Fdisable=5Fcompressio?= =?utf-8?q?n?= Message-ID: <20181120113819.GS3513@dell> References: <20181114192919.24655-1-leif.lindholm@linaro.org> <20181116140737.wuox7v63y6lt2ymt@tomti.i.net-space.pl> <20181120104656.GN3513@dell> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20181120104656.GN3513@dell> 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::341 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..117293fb9 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) { @@ -403,7 +402,6 @@ grub_cmd_xen_module (grub_command_t cmd __attribute__((unused)), { argv++; argc--; - nounzip = 1; } if (!argc) @@ -429,8 +427,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);