From patchwork Thu Jun 2 04:29:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rashmica Gupta X-Patchwork-Id: 628956 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rKvXV5B93z9sBm for ; Thu, 2 Jun 2016 14:35:06 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=IqiXKxqM; dkim-atps=neutral Received: from ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3rKvXV45trzDqkQ for ; Thu, 2 Jun 2016 14:35:06 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=IqiXKxqM; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mail-pa0-x244.google.com (mail-pa0-x244.google.com [IPv6:2607:f8b0:400e:c03::244]) (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 3rKvQw13YvzDqcY for ; Thu, 2 Jun 2016 14:30:16 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=IqiXKxqM; dkim-atps=neutral Received: by mail-pa0-x244.google.com with SMTP id di3so2180766pab.0 for ; Wed, 01 Jun 2016 21:30:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=3MCwp7ONeqgpHrOGPKOIh20tdhwWBDszx1g5mKEtE2I=; b=IqiXKxqMC9BmsMmFAdanj7ToxzfDBE+Ivcxybri4OKUd1IopqXJ19db3zfCiGhAb3Q NECchpsakfWpwAovAhsY49KzqCj3v0evyHoJ5HFDrAK4+0fB2qgiSk7rR87S7uTnXL7j nPT1y1Vej8tDzkNdR4Fr+SS8l8RSzV+wW5e/EJX7KVkWRphpMhNB38vqnRfu5iIeBxn2 KNqI1WmZY7iS4jlQ1BoQiH4KJ5XneYBJDheMpP37Ajzx5ikFa90IbhHa2u19DotgVNJi 4BH5nHCbJszxhO9NkGcY9bdu7cUOur/Ztk6E9bAx/89NJ6LppziAfInCcfpXghbPtHLI nSaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=3MCwp7ONeqgpHrOGPKOIh20tdhwWBDszx1g5mKEtE2I=; b=CQN9txu8nUAEdRPV9sQLVaP1J8S7tenOLqrLKCX6ngN1YryQSVQsL9vYhe7FTi0SfG GbmIx9LzNAWDMHb1l/vz/sQjDXBQ2bi0caAZ08vQd0hGPLwOYtBX+jJZgjDuLgdbUFRL AwmURkboA0dzb9lRojepTbhYhaRQi7Db4Vx1TiKMs3d8Jym6RGeAuru06ATNzn9EX0XU P/h1oRHq9GB3fEgCpvTKFKb20nm9a6Rg3VnsEPousNw7HpyRU+XMgQnc9Zzhqck2JY63 nJmGyYvFT8C4+/C89cPIzDBmwOlhk8HqNbK0k0jtao9KRU4ZdZK4ZjCdCpxOVfQ/QUP7 SLcQ== X-Gm-Message-State: ALyK8tK+2IYbnHxKwcsjIYzwJ0U0SR2uN+mgpKxZjM3Ue6lgD9e5fLESg8skDmkCIfNTDg== X-Received: by 10.66.66.234 with SMTP id i10mr2777363pat.114.1464841814354; Wed, 01 Jun 2016 21:30:14 -0700 (PDT) Received: from circle.ozlabs.ibm.com ([122.99.82.10]) by smtp.gmail.com with ESMTPSA id j3sm32065268pfk.94.2016.06.01.21.30.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Jun 2016 21:30:13 -0700 (PDT) From: Rashmica Gupta To: mpe@ellerman.id.au, benh@kernel.crashing.org, linuxppc-dev@lists.ozlabs.org Subject: [PATCH 3/3] powerpc/asm: Add STACK_INT_OFFSET macro in asm-offsets.c Date: Thu, 2 Jun 2016 14:29:48 +1000 Message-Id: <1464841788-17465-3-git-send-email-rashmicy@gmail.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1464841788-17465-1-git-send-email-rashmicy@gmail.com> References: <1464841788-17465-1-git-send-email-rashmicy@gmail.com> X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" There are quite a few entries in asm-offests.c look like this: DEFINE(REG, STACK_INT_FRAME_SIZE+offsetof(struct exception_regs, reg)); So define a local MACRO to clean this up: STACK_INT_OFFSET(sym, val) DEFINE(sym, STACK_INT_FRAME_SIZE + \ offsetof(struct exception_regs, val)) Signed-off-by: Rashmica Gupta --- arch/powerpc/kernel/asm-offsets.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c index 3dbd3bd016ba..5efe5e297256 100644 --- a/arch/powerpc/kernel/asm-offsets.c +++ b/arch/powerpc/kernel/asm-offsets.c @@ -70,6 +70,8 @@ #define STACK_OFFSET(sym, val) DEFINE(sym, STACK_FRAME_OVERHEAD + \ offsetof(struct pt_regs, val)) +#define STACK_INT_OFFSET(sym, val) DEFINE(sym, \ + STACK_INT_FRAME_SIZE+offsetof(struct exception_regs, val)) int main(void) { @@ -308,21 +310,21 @@ int main(void) #if defined(CONFIG_PPC32) #if defined(CONFIG_BOOKE) || defined(CONFIG_40x) DEFINE(EXC_LVL_SIZE, STACK_EXC_LVL_FRAME_SIZE); - DEFINE(MAS0, STACK_INT_FRAME_SIZE+offsetof(struct exception_regs, mas0)); + STACK_INT_OFFSET(MAS0, mas0); /* we overload MMUCR for 44x on MAS0 since they are mutually exclusive */ - DEFINE(MMUCR, STACK_INT_FRAME_SIZE+offsetof(struct exception_regs, mas0)); - DEFINE(MAS1, STACK_INT_FRAME_SIZE+offsetof(struct exception_regs, mas1)); - DEFINE(MAS2, STACK_INT_FRAME_SIZE+offsetof(struct exception_regs, mas2)); - DEFINE(MAS3, STACK_INT_FRAME_SIZE+offsetof(struct exception_regs, mas3)); - DEFINE(MAS6, STACK_INT_FRAME_SIZE+offsetof(struct exception_regs, mas6)); - DEFINE(MAS7, STACK_INT_FRAME_SIZE+offsetof(struct exception_regs, mas7)); - DEFINE(_SRR0, STACK_INT_FRAME_SIZE+offsetof(struct exception_regs, srr0)); - DEFINE(_SRR1, STACK_INT_FRAME_SIZE+offsetof(struct exception_regs, srr1)); - DEFINE(_CSRR0, STACK_INT_FRAME_SIZE+offsetof(struct exception_regs, csrr0)); - DEFINE(_CSRR1, STACK_INT_FRAME_SIZE+offsetof(struct exception_regs, csrr1)); - DEFINE(_DSRR0, STACK_INT_FRAME_SIZE+offsetof(struct exception_regs, dsrr0)); - DEFINE(_DSRR1, STACK_INT_FRAME_SIZE+offsetof(struct exception_regs, dsrr1)); - DEFINE(SAVED_KSP_LIMIT, STACK_INT_FRAME_SIZE+offsetof(struct exception_regs, saved_ksp_limit)); + STACK_INT_OFFSET(MMUCR, mas0); + STACK_INT_OFFSET(MAS1, mas1); + STACK_INT_OFFSET(MAS2, mas2); + STACK_INT_OFFSET(MAS3, mas3); + STACK_INT_OFFSET(MAS6, mas6); + STACK_INT_OFFSET(MAS7, mas7); + STACK_INT_OFFSET(_SRR0, srr0); + STACK_INT_OFFSET(_SRR1, srr1); + STACK_INT_OFFSET(_CSRR0, csrr0); + STACK_INT_OFFSET(_CSRR1, csrr1); + STACK_INT_OFFSET(_DSRR0, dsrr0); + STACK_INT_OFFSET(_DSRR1, dsrr1); + STACK_INT_OFFSET(SAVED_KSP_LIMIT, saved_ksp_limit); #endif #endif