From patchwork Sun Apr 12 02:58:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 460453 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id B570E14018C for ; Sun, 12 Apr 2015 12:58:51 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=roeck-us.net header.i=@roeck-us.net header.b=kmCc94ed; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751794AbbDLC6f (ORCPT ); Sat, 11 Apr 2015 22:58:35 -0400 Received: from bh-25.webhostbox.net ([208.91.199.152]:34329 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752044AbbDLC6e (ORCPT ); Sat, 11 Apr 2015 22:58:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=roeck-us.net; s=default; h=Message-Id:Date:Subject:Cc:To:From; bh=+JI/r0wU8bEnD7mau8JV6PaWorVMT3ewcAMVI65q/YE=; b=kmCc94edGyNsOOfqDgqgZt9DmUMMh7OVJ/AMRlVPGBeAwO6cmshLYNaDIf8n1fkg+SQtjAXYkvrsvKj/6ZTufDeMDzqXru48Z13iGDxtk8TfAEPoUl0bogM6YXTBWQSEfiv/8ktVqsFbvcCuizULa9D/CHqoVXq1AFwPKIw+p58=; Received: from mailnull by bh-25.webhostbox.net with sa-checked (Exim 4.82) (envelope-from ) id 1Yh86U-0026Q3-3i for sparclinux@vger.kernel.org; Sun, 12 Apr 2015 02:58:34 +0000 Received: from 108-223-40-66.lightspeed.sntcca.sbcglobal.net ([108.223.40.66]:60287 helo=localhost) by bh-25.webhostbox.net with esmtpa (Exim 4.82) (envelope-from ) id 1Yh86O-0026Mt-Q1; Sun, 12 Apr 2015 02:58:29 +0000 From: Guenter Roeck To: Richard Weinberger Cc: "David S. Miller" , sparclinux@vger.kernel.org, linux-kernel@vger.kernel.org, Guenter Roeck Subject: [PATCH] sparc: Fix execution domain removal Date: Sat, 11 Apr 2015 19:58:25 -0700 Message-Id: <1428807505-7658-1-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 2.1.0 X-Authenticated_sender: guenter@roeck-us.net X-OutGoing-Spam-Status: No, score=-1.0 X-Spam-Checker-Version: spamc_ctasd client on localost X-Spam-Level: X-Spam-Status: No, score=0.0 required=50.0 tests=SpamClass_Unknown, VirusClass_Unknown autolearn=disabled version=1.0.0 X-CTCH-PVer: 0000001 X-CTCH-Spam: Unknown X-CTCH-VOD: Unknown X-CTCH-Flags: 0 X-CTCH-RefID: str=0001.0A020203.5529DF5A.0057, ss=1, re=0.001, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0 X-CTCH-Score: 0.001 X-CTCH-ScoreCust: 0.000 X-CTCH-Rules: C_4847, X-CTCH-SenderID: linux@roeck-us.net X-CTCH-SenderID-Flags: 0 X-CTCH-SenderID-TotalMessages: 3 X-CTCH-SenderID-TotalSpam: 0 X-CTCH-SenderID-TotalSuspected: 0 X-CTCH-SenderID-TotalConfirmed: 0 X-CTCH-SenderID-TotalBulk: 0 X-CTCH-SenderID-TotalVirus: 0 X-CTCH-SenderID-TotalRecipients: 0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - bh-25.webhostbox.net X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - roeck-us.net X-Get-Message-Sender-Via: bh-25.webhostbox.net: mailgid no entry from get_relayhosts_entry X-Source: X-Source-Args: X-Source-Dir: Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org ksp must be 8-byte aligned. Cc: Richard Weinberger Signed-off-by: Guenter Roeck Acked-by: David S. Miller --- Applies on top of Richard's execution domain removal code. Tested with qemu. arch/sparc/include/asm/thread_info_32.h | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/arch/sparc/include/asm/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h index a7a18142099e..229475f0d7ce 100644 --- a/arch/sparc/include/asm/thread_info_32.h +++ b/arch/sparc/include/asm/thread_info_32.h @@ -34,6 +34,8 @@ struct thread_info { int softirq_count; int hardirq_count; + u32 __unused; + /* Context switch saved kernel state. */ unsigned long ksp; /* ... ksp __attribute__ ((aligned (8))); */ unsigned long kpc; @@ -88,13 +90,13 @@ register struct thread_info *current_thread_info_reg asm("g6"); #define TI_PREEMPT 0x10 /* preempt_count */ #define TI_SOFTIRQ 0x14 /* softirq_count */ #define TI_HARDIRQ 0x18 /* hardirq_count */ -#define TI_KSP 0x1c /* ksp */ -#define TI_KPC 0x20 /* kpc (ldd'ed with kpc) */ -#define TI_KPSR 0x24 /* kpsr */ -#define TI_KWIM 0x28 /* kwim (ldd'ed with kpsr) */ -#define TI_REG_WINDOW 0x2c -#define TI_RWIN_SPTRS 0x22c -#define TI_W_SAVED 0x24c +#define TI_KSP 0x20 /* ksp */ +#define TI_KPC 0x24 /* kpc (ldd'ed with kpc) */ +#define TI_KPSR 0x28 /* kpsr */ +#define TI_KWIM 0x2c /* kwim (ldd'ed with kpsr) */ +#define TI_REG_WINDOW 0x30 +#define TI_RWIN_SPTRS 0x230 +#define TI_W_SAVED 0x250 /* * thread information flag bit numbers