On Tue, Dec 03 2013, Christoph Lameter wrote: > __this_cpu_ptr is being phased out. > > Cc: Jens Axboe <ax...@kernel.dk> > Signed-off-by: Christoph Lameter <c...@linux.com> > > Index: linux/fs/ext4/mballoc.c > =================================================================== > --- linux.orig/fs/ext4/mballoc.c 2013-12-02 16:07:53.574528512 -0600 > +++ linux/fs/ext4/mballoc.c 2013-12-02 16:07:53.574528512 -0600 > @@ -4085,7 +4085,7 @@ static void ext4_mb_group_or_file(struct > * per cpu locality group is to reduce the contention between block > * request from multiple CPUs. > */ > - ac->ac_lg = __this_cpu_ptr(sbi->s_locality_groups); > + ac->ac_lg = raw_cpu_ptr(sbi->s_locality_groups); > > /* we're going to use group allocation */ > ac->ac_flags |= EXT4_MB_HINT_GROUP_ALLOC; > Index: linux/fs/buffer.c > =================================================================== > --- linux.orig/fs/buffer.c 2013-12-02 16:07:53.574528512 -0600 > +++ linux/fs/buffer.c 2013-12-02 16:07:53.574528512 -0600 > @@ -1312,7 +1312,7 @@ static void bh_lru_install(struct buffer > } > while (out < BH_LRU_SIZE) > bhs[out++] = NULL; > - memcpy(__this_cpu_ptr(&bh_lrus.bhs), bhs, sizeof(bhs)); > + memcpy(this_cpu_ptr(&bh_lrus.bhs), bhs, sizeof(bhs)); > } > bh_lru_unlock();
Christoph, I applied the fs/buffer.c bit, the ext4 one should probably go through Ted. -- Jens Axboe -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
