From patchwork Mon Jul 9 18:49:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 141483 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp2989984ljj; Mon, 9 Jul 2018 11:50:34 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdgJ5DQCSiYHlrhzm4OJhReP0PRIpNi8CednHHD23/mghBc3AMjH/VrnOz309qQpQ56H/u2 X-Received: by 2002:a37:a58c:: with SMTP id o134-v6mr18602582qke.305.1531162234302; Mon, 09 Jul 2018 11:50:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531162234; cv=none; d=google.com; s=arc-20160816; b=staPXiqF9erc3wl2+qWnhP4fJ+Vm1eeA1Xs3SqIj0NlwPnOBPVYRffcUsvtFtnP+e2 6Fx0e2XTYOhG3vzUsT+54y8UWf2KIAphAQeD0JUXNz29sdxcEkPVvxM5hI5PzqGuTLgP gOMzKOtktBnSnkuylFsaqYy/N5ggEeUE5RicNCFDoudSKfpMR9fGpDjSy7snuoLj2Bxo Ubuv+6lSWdgclUwVqs/nrQTU7YJiepXp+wydaFuWACKxbPORfNKx4lKjWVhtnMo+TYZ3 CjyoIi/4G1InXAemhPnirYEC1aEbvTYOtYUN4mxHpc58BPQx7e9/OHwnHYmr8L4HIcua bldQ== 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:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:message-id:date:subject:to:from:dkim-signature :arc-authentication-results; bh=6bVhhwQq7El8xSFRDaHYmnF21UwXeDkl2rdlMgkP1us=; b=ddUT0BXMX3koN3cGLb4Ox7IJpfBCTijkbHiI1s4gNjrSZEcdvunXGZNq9KOx7rtPD7 2fVx7V3ospH6FIZNQzQN9axaaVKinrUdEVCkA9KJkp+LbDn0KBj2b2FMupE07qq/7EXW pLgrKuyvrE+xrH0gQiMSLe2vTe2xoDpKwZTXkPMEiNRYVxUS2ME2yT2LPg2lrOQyesjg /+kNEKjlIJofwyz06ImlWhaif8vpMIayDgziwy19cPI5gRcky8+kxjwNAf2Q/T1jkuOO wLII0pAiSBbHGK7LN6rxT+9lkZVCh5kfhdoeezF3Om42FRYmblXnvPNar9fz5WyLh+RP 6TeQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=SsER4Lbg; 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 n15-v6si4867952qvm.178.2018.07.09.11.50.34 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 09 Jul 2018 11:50:34 -0700 (PDT) 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=SsER4Lbg; 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]:43915 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fcbF3-0005Pp-Sn for patch@linaro.org; Mon, 09 Jul 2018 14:50:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58226) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fcbDl-0004uQ-KX for grub-devel@gnu.org; Mon, 09 Jul 2018 14:49:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fcbDi-0007Xy-58 for grub-devel@gnu.org; Mon, 09 Jul 2018 14:49:13 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:33635) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fcbDh-0007W0-Ud for grub-devel@gnu.org; Mon, 09 Jul 2018 14:49:10 -0400 Received: by mail-wr1-x441.google.com with SMTP id g6-v6so3117587wrp.0 for ; Mon, 09 Jul 2018 11:49:09 -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=7O9RsWkBr/MWc4coiM2Lcfk3ZQudUt942Ba+vhkEVPE=; b=SsER4LbgaReQGTdu/RZUfkS7kdt85BBcaXYDtFQLJDyFE37R+Fu701u6fRI1w2seNS 0bd5Yu4nEGQZcQGVVZz771/FqIpA5K+YBxYbQ3FFnFo042XCK0z+8C+aLzqn+1gksqUF wITtwIxW1K3DDk47fHwbdijHzIgs2A6g8YfXE= 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=7O9RsWkBr/MWc4coiM2Lcfk3ZQudUt942Ba+vhkEVPE=; b=oyX/RIjDUGgBsrz4ABs337pkp9CQIKykvTZI4qblFRU4VfUcuFIvpD70wjq8tSLbwU 95FJNKAVMF/vWDud8CuDPPL5T1FYx9iC0b2HtKNW4hDXvbU+m8fR+D4y8E8ou+vLRApX HeLAbq4Jfk8uVZxKlNV4fqRZQsbSK9u7XqB3Z1FsOFvGGbx8T2y85BolrNQ8W27hbaP0 T7JiMqRPNW1zkis62BA9M5W8iTgz6zJo5OuSWCBSIBu9s8A08dbZvdA3N4Sd3WNZUWpy WBRe+gRZSAqaPOXdSrnEfwKVOMVgfmCTTneIAd8ZukDIeqCc9kIjY1gWiLOoXKDRfR/I jiOw== X-Gm-Message-State: APt69E2yxLmYsHpJdgI6KdBnlSrha/yOhTBJ/LixBRipwLiZTsm0q4T0 dDtM9F6TtDofOvHN3lRSX/gCQbjGh94= X-Received: by 2002:adf:f5c3:: with SMTP id k3-v6mr14890928wrp.219.1531162148545; Mon, 09 Jul 2018 11:49:08 -0700 (PDT) Received: from vanye.hemma.eciton.net (cpc92302-cmbg19-2-0-cust304.5-4.cable.virginm.net. [82.1.209.49]) by smtp.gmail.com with ESMTPSA id q70-v6sm27562461wmd.45.2018.07.09.11.49.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 Jul 2018 11:49:07 -0700 (PDT) From: Leif Lindholm To: grub-devel@gnu.org Subject: [RFC PATCH] i386: don't include lib/i386/reset.c in EFI builds Date: Mon, 9 Jul 2018 19:49:06 +0100 Message-Id: <20180709184906.27831-1-leif.lindholm@linaro.org> X-Mailer: git-send-email 2.11.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::441 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: Daniel Kiper , Alexander Graf MIME-Version: 1.0 Errors-To: grub-devel-bounces+patch=linaro.org@gnu.org Sender: "Grub-devel" Commit 0ba90a7f0178 ("efi: Move grub_reboot() into kernel") broke the build on i386-efi - genmoddep.awk bails out with message grub_reboot in reboot is duplicated in kernel This is because both lib/i386/reset.c and kern/efi/efi.c now provide this function. Rather than explicitly list each i386 platform variant in Makefile.core.def, include the contents of lib/i386/reset.c only when GRUB_MACHINE_EFI is not set. Signed-off-by: Leif Lindholm --- grub-core/lib/i386/reboot.c | 4 ++++ 1 file changed, 4 insertions(+) -- 2.11.0 _______________________________________________ Grub-devel mailing list Grub-devel@gnu.org https://lists.gnu.org/mailman/listinfo/grub-devel Reviewed-by: Daniel Kiper diff --git a/grub-core/lib/i386/reboot.c b/grub-core/lib/i386/reboot.c index a234244dc..9dd00d421 100644 --- a/grub-core/lib/i386/reboot.c +++ b/grub-core/lib/i386/reboot.c @@ -16,6 +16,8 @@ * along with GRUB. If not, see . */ +#ifndef GRUB_MACHINE_EFI + #include #include #include @@ -58,3 +60,5 @@ grub_reboot (void) while (1); } + +#endif /* ndef GRUB_MACHINE_EFI */