From patchwork Fri Jan 17 15:18:23 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Christoph Lameter (Ampere)" X-Patchwork-Id: 3505611 Return-Path: X-Original-To: patchwork-linux-parisc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 3F1F5C02DC for ; Fri, 17 Jan 2014 15:24:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2BEEF20179 for ; Fri, 17 Jan 2014 15:24:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0E19A20172 for ; Fri, 17 Jan 2014 15:24:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752955AbaAQPYs (ORCPT ); Fri, 17 Jan 2014 10:24:48 -0500 Received: from qmta14.emeryville.ca.mail.comcast.net ([76.96.27.212]:49333 "EHLO qmta14.emeryville.ca.mail.comcast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752826AbaAQPYq (ORCPT ); Fri, 17 Jan 2014 10:24:46 -0500 X-Greylist: delayed 365 seconds by postgrey-1.27 at vger.kernel.org; Fri, 17 Jan 2014 10:24:46 EST Received: from omta24.emeryville.ca.mail.comcast.net ([76.96.30.92]) by qmta14.emeryville.ca.mail.comcast.net with comcast id F2Wm1n0071zF43QAE3JhfB; Fri, 17 Jan 2014 15:18:41 +0000 Received: from gentwo.org ([98.213.233.247]) by omta24.emeryville.ca.mail.comcast.net with comcast id F3Jf1n00M5Lw0ES8k3JgVA; Fri, 17 Jan 2014 15:18:41 +0000 Received: by gentwo.org (Postfix, from userid 1001) id 9243B2D425; Fri, 17 Jan 2014 09:18:35 -0600 (CST) Message-Id: <20140117151835.513814745@linux.com> Date: Fri, 17 Jan 2014 09:18:23 -0600 From: Christoph Lameter To: Tejun Heo Cc: akpm@linuxfoundation.org, rostedt@goodmis.org, linux-kernel@vger.kernel.org, Ingo Molnar , Peter Zijlstra , Thomas Gleixner , "James E.J. Bottomley" , Helge Deller , linux-parisc@vger.kernel.org Subject: [PATCH 11/41] parisc: Replace __get_cpu_var uses for address calculation References: <20140117151812.770437629@linux.com> Content-Disposition: inline; filename=this_parisc DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net; s=q20121106; t=1389971921; bh=FAGGV30AhtkEAxPZsDvtFuU5vFZiR1doA9bCbaY98Xo=; h=Received:Received:Received:Message-Id:Date:From:To:Subject: Content-Type; b=UfvwGdR18s38RmR1zIuf62j+JOwCz8yZ19ld7uIeRXyH5si9Zxs0f/haOYiyBWJso nuiLqGOCN0P3KICZbqFhLs1dFg8gzjIsFRZVd2GO8GOjgqPGemjp0c9dMROeZmkVl+ va7vKmOjpsEvHqDMoZ83Qido2gPSh8KYfQ+1o/PXQroWjxpRuymbHoGqTz0zQGyziu xXOMs/2iiuDIch90nK83gEetlfX9NfceqPoCCh8sGqDqs1GF1VnPov3pioBUhQZAeP SFFPx8vSY0whjntWSMV8bsiB/t+2d+euwfFAIDnQawgEnzH5R5O49WGRA50ibV42M4 3CZoAX9mi75QA== Sender: linux-parisc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-parisc@vger.kernel.org X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Convert to the use of this_cpu_ptr(). Cc: "James E.J. Bottomley" Cc: Helge Deller Cc: linux-parisc@vger.kernel.org Signed-off-by: Christoph Lameter --- To unsubscribe from this list: send the line "unsubscribe linux-parisc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: linux/arch/parisc/lib/memcpy.c =================================================================== --- linux.orig/arch/parisc/lib/memcpy.c 2013-12-02 16:07:49.844632157 -0600 +++ linux/arch/parisc/lib/memcpy.c 2013-12-02 16:07:49.844632157 -0600 @@ -470,7 +470,7 @@ static unsigned long pa_memcpy(void *dst return 0; /* if a load or store fault occured we can get the faulty addr */ - d = &__get_cpu_var(exception_data); + d = this_cpu_ptr(&exception_data); fault_addr = d->fault_addr; /* error in load or store? */ Index: linux/arch/parisc/mm/fault.c =================================================================== --- linux.orig/arch/parisc/mm/fault.c 2013-12-02 16:07:49.844632157 -0600 +++ linux/arch/parisc/mm/fault.c 2013-12-02 16:07:49.844632157 -0600 @@ -151,7 +151,7 @@ int fixup_exception(struct pt_regs *regs fix = search_exception_tables(regs->iaoq[0]); if (fix) { struct exception_data *d; - d = &__get_cpu_var(exception_data); + d = this_cpu_ptr(&exception_data); d->fault_ip = regs->iaoq[0]; d->fault_space = regs->isr; d->fault_addr = regs->ior;