VisionFive2 Linux kernel

author: Linus Torvalds <torvalds@linux-foundation.org> 2013-11-14 12:08:14 +0900 committer: Linus Torvalds <torvalds@linux-foundation.org> 2013-11-14 12:08:14 +0900 commit: 0910c0bdf7c291a41bc21e40a97389c9d4c1960d parent: 2821fe6b00a1e902fd399bb4b7e40bc3041f4d44

Commit Summary:

Merge branch 'for-3.13/core' of git://git.kernel.dk/linux-block

Diffstat:

1 file changed, 1 insertion, 1 deletion

diff --git a/fs/fscache/object.c b/fs/fscache/object.c
index dcb821617774..53d35c504240 100644
--- a/fs/fscache/object.c
+++ b/fs/fscache/object.c
@@ -799,7 +799,7 @@ void fscache_enqueue_object(struct fscache_object *object)
  */
 bool fscache_object_sleep_till_congested(signed long *timeoutp)
 {
-	wait_queue_head_t *cong_wq = &__get_cpu_var(fscache_object_cong_wait);
+	wait_queue_head_t *cong_wq = this_cpu_ptr(&fscache_object_cong_wait);
 	DEFINE_WAIT(wait);
 
 	if (fscache_object_congested())