From 09972fb8f643ba4fe274019e36073470d31c6523 Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Fri, 25 Jul 2008 01:48:42 -0700 Subject: [PATCH] --- yaml --- r: 106016 b: refs/heads/master c: 081e4c8a75692c21f3a119a81ca3270081879d0e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/acct.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3e329ca77857..7d26d98bdbee 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 49b5cf34727a6c1be1568ab28e89a2d9a6bf51e0 +refs/heads/master: 081e4c8a75692c21f3a119a81ca3270081879d0e diff --git a/trunk/kernel/acct.c b/trunk/kernel/acct.c index 91e1cfd734d2..ee3e605190f9 100644 --- a/trunk/kernel/acct.c +++ b/trunk/kernel/acct.c @@ -82,7 +82,7 @@ static void do_acct_process(struct pid_namespace *ns, struct file *); * can be placed in the same cache line as the lock. This primes * the cache line to have the data after getting the lock. */ -struct acct_glbs { +struct bsd_acct_struct { spinlock_t lock; volatile int active; volatile int needcheck; @@ -91,7 +91,7 @@ struct acct_glbs { struct timer_list timer; }; -static struct acct_glbs acct_globals __cacheline_aligned = +static struct bsd_acct_struct acct_globals __cacheline_aligned = {__SPIN_LOCK_UNLOCKED(acct_globals.lock)}; /*