[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date: Mon, 6 Jun 2011 08:31:08 GMT
From: tip-bot for Andy Lutomirski <luto@....edu>
To: linux-tip-commits@...r.kernel.org
Cc: mingo@...hat.com, brgerst@...il.com, torvalds@...ux-foundation.org,
mikpe@...uu.se, richard.weinberger@...il.com, jj@...osbits.net,
JBeulich@...ell.com, tglx@...utronix.de, Louis.Rilling@...labs.com,
hpa@...or.com, linux-kernel@...r.kernel.org, luto@....edu,
andi@...stfloor.org, bp@...en8.de, arjan@...radead.org,
mingo@...e.hu
Subject: [tip:x86/vdso] x86-64: Fix alignment of jiffies variable
Commit-ID: 6879eb2deed7171a81b2f904c9ad14b9648689a7
Gitweb: http://git.kernel.org/tip/6879eb2deed7171a81b2f904c9ad14b9648689a7
Author: Andy Lutomirski <luto@....edu>
AuthorDate: Sun, 5 Jun 2011 13:50:17 -0400
Committer: Ingo Molnar <mingo@...e.hu>
CommitDate: Sun, 5 Jun 2011 21:30:31 +0200
x86-64: Fix alignment of jiffies variable
It's declared __attribute__((aligned(16)) but it's explicitly
not aligned. This is probably harmless but it's a bit
embarrassing.
Signed-off-by: Andy Lutomirski <luto@....edu>
Cc: Jesper Juhl <jj@...osbits.net>
Cc: Borislav Petkov <bp@...en8.de>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Arjan van de Ven <arjan@...radead.org>
Cc: Jan Beulich <JBeulich@...ell.com>
Cc: richard -rw- weinberger <richard.weinberger@...il.com>
Cc: Mikael Pettersson <mikpe@...uu.se>
Cc: Andi Kleen <andi@...stfloor.org>
Cc: Brian Gerst <brgerst@...il.com>
Cc: Louis Rilling <Louis.Rilling@...labs.com>
Cc: Valdis.Kletnieks@...edu
Cc: pageexec@...email.hu
Link: http://lkml.kernel.org/r/5f3bc5542e9aaa9382d53f153f54373165cdef89.1307292171.git.luto@mit.edu
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
arch/x86/include/asm/vvar.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/x86/include/asm/vvar.h b/arch/x86/include/asm/vvar.h
index 341b355..a4eaca4 100644
--- a/arch/x86/include/asm/vvar.h
+++ b/arch/x86/include/asm/vvar.h
@@ -45,7 +45,7 @@
/* DECLARE_VVAR(offset, type, name) */
DECLARE_VVAR(0, volatile unsigned long, jiffies)
-DECLARE_VVAR(8, int, vgetcpu_mode)
+DECLARE_VVAR(16, int, vgetcpu_mode)
DECLARE_VVAR(128, struct vsyscall_gtod_data, vsyscall_gtod_data)
#undef DECLARE_VVAR
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists