diff options
| author | Christoph Lameter <cl@linux.com> | 2014-02-14 14:18:56 -0600 |
|---|---|---|
| committer | Helge Deller <deller@gmx.de> | 2014-04-03 20:50:33 +0200 |
| commit | 496252f787560df18a65fdc74dc3180f7cd2c723 (patch) | |
| tree | cb338e6f95c8a70cf39d3eb6b55266569c992d8e | |
| parent | 455c6fdbd219161bd09b1165f11699d6d73de11c (diff) | |
| download | linux-496252f787560df18a65fdc74dc3180f7cd2c723.tar.bz2 | |
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>
| -rw-r--r-- | arch/parisc/lib/memcpy.c | 2 | ||||
| -rw-r--r-- | arch/parisc/mm/fault.c | 2 |
2 files changed, 2 insertions, 2 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? */ diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c index 9d08c71a967e..747550762f3c 100644 --- a/arch/parisc/mm/fault.c +++ b/arch/parisc/mm/fault.c @@ -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; |