diff --git a/[refs] b/[refs]
index 280f7dc07514..3fbbb489d031 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 410ab512e5c5716287a399145df0905c1dcddb04
+refs/heads/master: acffc84ad9c1c8a79b8c1d6b9f4f530f37cba9ab
diff --git a/trunk/arch/ia64/kernel/fsyscall_gtod_data.h b/trunk/arch/ia64/kernel/fsyscall_gtod_data.h
index 490dab55fba3..57d2ee6c83e1 100644
--- a/trunk/arch/ia64/kernel/fsyscall_gtod_data.h
+++ b/trunk/arch/ia64/kernel/fsyscall_gtod_data.h
@@ -14,10 +14,10 @@ struct fsyscall_gtod_data_t {
 	u32		clk_shift;
 	void		*clk_fsys_mmio;
 	cycle_t		clk_cycle_last;
-} __attribute__ ((aligned (L1_CACHE_BYTES)));
+} ____cacheline_aligned;
 
 struct itc_jitter_data_t {
 	int		itc_jitter;
 	cycle_t		itc_lastcycle;
-} __attribute__ ((aligned (L1_CACHE_BYTES)));
+} ____cacheline_aligned;