From patchwork Wed Sep 20 22:23:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 816535 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="lrI1EFBN"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xyDmf0Yg2z9sBZ for ; Thu, 21 Sep 2017 08:24:00 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 1987FC21E85; Wed, 20 Sep 2017 22:23:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 30F9AC21D55; Wed, 20 Sep 2017 22:23:53 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 286D4C21D55; Wed, 20 Sep 2017 22:23:52 +0000 (UTC) Received: from mail-pf0-f194.google.com (mail-pf0-f194.google.com [209.85.192.194]) by lists.denx.de (Postfix) with ESMTPS id C1987C21C5D for ; Wed, 20 Sep 2017 22:23:50 +0000 (UTC) Received: by mail-pf0-f194.google.com with SMTP id e69so1697872pfg.4 for ; Wed, 20 Sep 2017 15:23:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=N30UhFmTpXub7052akK0VTAIYKM9DMA6SfsjtmVdwX4=; b=lrI1EFBNTI/5dNKSV/ry73OvdU7WBf0UdEU+qe+IcDfn6YG9DBl7lLHqjbcmjh7WcS YUdU+S8NBVGvfxdYV7mVaNRNVYKHwsXkRivSkTU0/haoI6gIsxhUtHsxIyhhR2ZC/qIm NAvCa3sOJhp6mVlHepDjv6BFUmzyHY9UGgvgI83AgqFGMGyQpAX461xBepNOpdZF8STo KKxsZI7amAVp2ET2SPUanKFbt9Y+noNv7N+IvwtGoMs8724M92hUpk1Edd20wGehIFDy XXiKmQ9mwen7ylrkr40qNC/0a3s9YfQTTpHlAQa4XqgPRCdgEZnemvoYZXFjGHvB/pbN sbCA== 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=N30UhFmTpXub7052akK0VTAIYKM9DMA6SfsjtmVdwX4=; b=p7eAWKAXo3G/IUacuJuhhes8ooUMP4AhU9/6xzTuY5zgG0JzAfNNGgopWQaR833dTg Dp4D4wdLiCTENIiGn/Co1WCyyba1uDx9QhxU/Vj75LRpMOq30RafUXT7oEOhD8X+fJRB /EF0jdAe01cXaCrxizNPaOtzupyguaNN2kdQlTwGLHsMF1wrm2D5W4rLWO6RxYM5LRmn YvW8oeJQawizUX0R8cpZajDfUMhBT3naH2kJtxJaS/YEalkQzeU20GLNzxXWpqTkzdng HSPbjmY/rcC8GhcLJnataLquMYdUtBemCPwaRIyEY0ZkSYdziEqFqM86AJYMHqXT2Lt0 JEPA== X-Gm-Message-State: AHPjjUjMy+Ks8yMccwkE4+6Gb5xblYWWYG3SApOORAhnCLZCBVrnhIGU zZJ21x3N8KrLuQFqqQdP/lyHMcsY X-Google-Smtp-Source: AOwi7QB2cpm26V29cCYPuiO01lwORR/7gK933hMebr2cUvLmdVTrzJ/EtvPmhF4YHPV51d9be9Za7w== X-Received: by 10.99.122.22 with SMTP id v22mr3546643pgc.394.1505946228698; Wed, 20 Sep 2017 15:23:48 -0700 (PDT) Received: from localhost ([2620:0:1000:fd28:68c1:b9e6:61ad:d45]) by smtp.gmail.com with ESMTPSA id 20sm9581973pft.109.2017.09.20.15.23.47 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 20 Sep 2017 15:23:47 -0700 (PDT) From: Rob Clark To: U-Boot Mailing List Date: Wed, 20 Sep 2017 18:23:42 -0400 Message-Id: <20170920222345.13211-1-robdclark@gmail.com> X-Mailer: git-send-email 2.13.5 Subject: [U-Boot] [PATCH] efi_loader: fix efi_exit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" efi_exit() already restores gd, so we shouldn't EFI_EXIT() on the otherside of the longjmp(). Signed-off-by: Rob Clark --- cmd/bootefi.c | 1 - 1 file changed, 1 deletion(-) diff --git a/cmd/bootefi.c b/cmd/bootefi.c index fdfed1be05..a049e5f64d 100644 --- a/cmd/bootefi.c +++ b/cmd/bootefi.c @@ -191,7 +191,6 @@ static unsigned long do_bootefi_exec(void *efi, void *fdt, if (setjmp(&loaded_image_info.exit_jmp)) { ret = loaded_image_info.exit_status; - EFI_EXIT(ret); goto exit; }