1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/acct.c b/kernel/acct.c
index 91e1cfd734d2..ee3e605190f9 100644
--- a/kernel/acct.c
+++ b/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)};
 /*

diff --git a/kernel/acct.c b/kernel/acct.c index 91e1cfd734d2..ee3e605190f9 100644 --- a/kernel/acct.c +++ b/kernel/acct.c
@@ -82,7 +82,7 @@ static void do_acct_process(struct pid_namespace ns, struct file );
82	* can be placed in the same cache line as the lock. This primes	82	* can be placed in the same cache line as the lock. This primes
83	* the cache line to have the data after getting the lock.	83	* the cache line to have the data after getting the lock.
84	*/	84	*/
85	struct acct_glbs {	85	struct bsd_acct_struct {
86	spinlock_t lock;	86	spinlock_t lock;
87	volatile int active;	87	volatile int active;
88	volatile int needcheck;	88	volatile int needcheck;
@@ -91,7 +91,7 @@ struct acct_glbs {
91	struct timer_list timer;	91	struct timer_list timer;
92	};	92	};
93		93
94	static struct acct_glbs acct_globals __cacheline_aligned =	94	static struct bsd_acct_struct acct_globals __cacheline_aligned =
95	{__SPIN_LOCK_UNLOCKED(acct_globals.lock)};	95	{__SPIN_LOCK_UNLOCKED(acct_globals.lock)};
96		96
97	/*	97	/*