Commit-ID: 6879eb2deed7171a81b2f904c9ad14b9648689a7 Gitweb: http://git.kernel.org/tip/6879eb2deed7171a81b2f904c9ad14b9648689a7 Author: Andy Lutomirski <luto@xxxxxxx> AuthorDate: Sun, 5 Jun 2011 13:50:17 -0400 Committer: Ingo Molnar <mingo@xxxxxxx> 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@xxxxxxx> Cc: Jesper Juhl <jj@xxxxxxxxxxxxx> Cc: Borislav Petkov <bp@xxxxxxxxx> Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> Cc: Arjan van de Ven <arjan@xxxxxxxxxxxxx> Cc: Jan Beulich <JBeulich@xxxxxxxxxx> Cc: richard -rw- weinberger <richard.weinberger@xxxxxxxxx> Cc: Mikael Pettersson <mikpe@xxxxxxxx> Cc: Andi Kleen <andi@xxxxxxxxxxxxxx> Cc: Brian Gerst <brgerst@xxxxxxxxx> Cc: Louis Rilling <Louis.Rilling@xxxxxxxxxxx> Cc: Valdis.Kletnieks@xxxxxx Cc: pageexec@xxxxxxxxxxx Link: http://lkml.kernel.org/r/5f3bc5542e9aaa9382d53f153f54373165cdef89.1307292171.git.luto@xxxxxxx Signed-off-by: Ingo Molnar <mingo@xxxxxxx> --- 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-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html