lkml.org 
[lkml]   [2013]   [Dec]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 11/41] 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>

    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;


    \
     
     \ /
      Last update: 2013-12-04 03:21    [W:4.051 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site