aboutsummaryrefslogtreecommitdiffstats
path: root/arch/parisc/lib/memcpy.c
diff options
context:
space:
mode:
authorChristoph Lameter <cl@linux.com>2014-02-14 14:18:56 -0600
committerHelge Deller <deller@gmx.de>2014-04-03 20:50:33 +0200
commit496252f787560df18a65fdc74dc3180f7cd2c723 (patch)
treecb338e6f95c8a70cf39d3eb6b55266569c992d8e /arch/parisc/lib/memcpy.c
parentLinux 3.14 (diff)
downloadlinux-dev-496252f787560df18a65fdc74dc3180f7cd2c723.tar.xz
linux-dev-496252f787560df18a65fdc74dc3180f7cd2c723.zip
parisc: Replace __get_cpu_var uses for address calculation
Convert to the use of this_cpu_ptr(). Cc: "James E.J. Bottomley" <jejb@parisc-linux.org> Cc: Helge Deller <deller@gmx.de> Cc: linux-parisc@vger.kernel.org Signed-off-by: Christoph Lameter <cl@linux.com> Signed-off-by: Helge Deller <deller@gmx.de>
Diffstat (limited to '')
-rw-r--r--arch/parisc/lib/memcpy.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/lib/memcpy.c b/arch/parisc/lib/memcpy.c
index 413dc1769299..b2b441b32341 100644
--- a/arch/parisc/lib/memcpy.c
+++ b/arch/parisc/lib/memcpy.c
@@ -470,7 +470,7 @@ static unsigned long pa_memcpy(void *dstp, const void *srcp, unsigned long len)
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? */