From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753167AbaAQPY3 (ORCPT ); Fri, 17 Jan 2014 10:24:29 -0500 Received: from qmta06.emeryville.ca.mail.comcast.net ([76.96.30.56]:36179 "EHLO qmta06.emeryville.ca.mail.comcast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752639AbaAQPSn (ORCPT ); Fri, 17 Jan 2014 10:18:43 -0500 Message-Id: <20140117151836.570968999@linux.com> Date: Fri, 17 Jan 2014 09:18:33 -0600 From: Christoph Lameter To: Tejun Heo Cc: akpm@linuxfoundation.org, rostedt@goodmis.org, linux-kernel@vger.kernel.org, Ingo Molnar , Peter Zijlstra , Thomas Gleixner , Jens Axboe Subject: [PATCH 21/41] block: Replace __this_cpu_ptr with raw_cpu_ptr References: <20140117151812.770437629@linux.com> Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline; filename=this_block Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [Patch depends on another patch in this series that introduces raw_cpu_ops] __this_cpu_ptr is being phased out. Cc: Jens Axboe Signed-off-by: Christoph Lameter 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();