From patchwork Sun May 21 13:15:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 765101 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wW2kg3pmWz9s5L for ; Sun, 21 May 2017 23:31:39 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Dvytkhoe"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3wW2kg2cykzDqQJ for ; Sun, 21 May 2017 23:31:39 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Dvytkhoe"; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mail-pg0-x243.google.com (mail-pg0-x243.google.com [IPv6:2607:f8b0:400e:c05::243]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3wW2PK6D71zDqLj for ; Sun, 21 May 2017 23:16:37 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Dvytkhoe"; dkim-atps=neutral Received: by mail-pg0-x243.google.com with SMTP id u187so14694452pgb.1 for ; Sun, 21 May 2017 06:16:37 -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:in-reply-to:references; bh=EbEz+jPP4qhChThKnfHV9p4ERkfD7c1sI5KmH7V4PvI=; b=DvytkhoeRdzE3+d+QtBjiyPZL3S3rlSS1wKLguPk9MsBWJ3wCuHrP5pHofDhtVf/tk coENr2Lej8jZvPsPPozn2zQz/fp93ys/nrkcKFOxdZwaawlvKWofW//+nGgC3nG3k36g tJ/+7ezwTwZyZjNtn08qY/xkSe4eaS6iapoWGtCxQ2K4+9UBlQTgyfLv5AzxCaORJ+Uw g7boHIsXQgCSqfnOx/zeJAjxct/hJkGhpxkI49eEZzF+MjJAgRFCeaBkj/xZYQeg9wqe S+cjfv9L8qrLkFk5n5nSjAWlwKGnzZAZfHGb70Fte2co08J4DVrhEKlPHUVjKH2Z2BJA kJHw== 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:in-reply-to :references; bh=EbEz+jPP4qhChThKnfHV9p4ERkfD7c1sI5KmH7V4PvI=; b=dEZAdg1MAFhXhSLBJ39wcrUfGeZ+z3rumNW34vqehhZwwTi5U09hDGZylEYweJtCvG nmc3tTE8VdXeT7artqdzbNdH60gOJA9EB2v5XLaJKkABHKilo/4RCC2NEMNaxuU6fkeQ X2eHtXCATH5d/r5BrjZGCKWNnK2SxslNeHAGD9y0PMmoPq8RYXC68zhMMdCDAu7R85aq nqYZMeMF8tlVZTu2FzoVSv2VGi2vCtgg3ICLKjQR+LYy/1WNslVOcSTmpXHfJ54nVMSx f+3oEtsvk/70Kz6HQetOZs14oTOywlxzd4CZ42b/e7Z533P6vyYP5R8G2NJQSN2JDrQz hg2g== X-Gm-Message-State: AODbwcDPt2lcCixgVknLwbrgNN3jiXTXMVkxaBoyHVHXjW+Oq73fTUMP HDEAJsWOhZpRRw== X-Received: by 10.98.58.195 with SMTP id v64mr19858675pfj.237.1495372596219; Sun, 21 May 2017 06:16:36 -0700 (PDT) Received: from roar.ozlabs.ibm.com (149.45.218.139.dynamic.dsl.dv.iprimus.net.au. [139.218.45.149]) by smtp.gmail.com with ESMTPSA id x80sm26285428pff.105.2017.05.21.06.16.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 21 May 2017 06:16:35 -0700 (PDT) From: Nicholas Piggin To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH 9/9] powerpc/64s: paca EX_CTR is not used with !RELOCATABLE, remove it Date: Sun, 21 May 2017 23:15:50 +1000 Message-Id: <20170521131550.25813-10-npiggin@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170521131550.25813-1-npiggin@gmail.com> References: <20170521131550.25813-1-npiggin@gmail.com> X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Nicholas Piggin Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Signed-off-by: Nicholas Piggin --- arch/powerpc/include/asm/exception-64s.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/powerpc/include/asm/exception-64s.h b/arch/powerpc/include/asm/exception-64s.h index aaee57f0e5ad..3b768cb668e7 100644 --- a/arch/powerpc/include/asm/exception-64s.h +++ b/arch/powerpc/include/asm/exception-64s.h @@ -36,9 +36,12 @@ #define EX_CCR 52 #define EX_CFAR 56 #define EX_PPR 64 +#if defined(CONFIG_RELOCATABLE) #define EX_CTR 72 - #define EX_SIZE 10 /* size in u64 units */ +#else +#define EX_SIZE 9 /* size in u64 units */ +#endif /* * EX_LR is only used in EXSLB and where it does not overlap with EX_DAR