Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 496252f7 authored by Christoph Lameter's avatar Christoph Lameter Committed by Helge Deller
Browse files

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: default avatarChristoph Lameter <cl@linux.com>
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
parent 455c6fdb

arch/parisc/lib/memcpy.c

+1 −1
Original line number Diff line number Diff line
@@ -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? */

arch/parisc/mm/fault.c

+1 −1
Original line number Diff line number Diff line
@@ -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;