From 976fd4417d31bcd6df3e0307d7bc8a99ea06032b Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Sun, 23 Jan 2011 15:24:55 +0100 Subject: [PATCH] --- yaml --- r: 234319 b: refs/heads/master c: 92578c0b8078f6919f9b47e7e16a1cf770bd127b h: refs/heads/master i: 234317: 938b715d9f7edc76bfa98c9e9221aae33e58d13a 234315: 6729204c1917db7f8698c150f93c933fe4ce8f51 234311: d509148061dc9f01755c5b53eaaff47961508d9f 234303: 04a31174d48859aad9b3a8fa748fc35c80831c48 v: v3 --- [refs] | 2 +- trunk/include/linux/kthread.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index aa68ef0f759b..2abaf0004f99 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 235454c99851ba21038061b9acf38d1a636068c5 +refs/heads/master: 92578c0b8078f6919f9b47e7e16a1cf770bd127b diff --git a/trunk/include/linux/kthread.h b/trunk/include/linux/kthread.h index ce0775aa64c3..7ff16f7d3ed4 100644 --- a/trunk/include/linux/kthread.h +++ b/trunk/include/linux/kthread.h @@ -64,7 +64,7 @@ struct kthread_work { }; #define KTHREAD_WORKER_INIT(worker) { \ - .lock = SPIN_LOCK_UNLOCKED, \ + .lock = __SPIN_LOCK_UNLOCKED((worker).lock), \ .work_list = LIST_HEAD_INIT((worker).work_list), \ }