From 4f8c1ec61323e4c501e6f8c5feefa0a3c1ad0eea Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@oracle.com>
Date: Fri, 3 Feb 2006 21:51:35 +0100
Subject: [PATCH] --- yaml --- r: 19779 b: refs/heads/master c:
 16acc0cd8f1aac63ddf5228c5bc29cf7d31627f4 h: refs/heads/master i:   19777:
 87065c56b85f12d029372872f5dac2f85c7b09a7   19775:
 447814d5a30bac67358436eda0f30a1121b6c2ee v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/x86_64/kernel/vmlinux.lds.S | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6ee042aae470..f37432bbb8ea 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a1002a48e1af5ff8d02bfe79536e6fce3a0ec369
+refs/heads/master: 16acc0cd8f1aac63ddf5228c5bc29cf7d31627f4
diff --git a/trunk/arch/x86_64/kernel/vmlinux.lds.S b/trunk/arch/x86_64/kernel/vmlinux.lds.S
index b0eed1faf740..59316d1c1d84 100644
--- a/trunk/arch/x86_64/kernel/vmlinux.lds.S
+++ b/trunk/arch/x86_64/kernel/vmlinux.lds.S
@@ -173,7 +173,7 @@ SECTIONS
   __initramfs_start = .;
   .init.ramfs : AT(ADDR(.init.ramfs) - LOAD_OFFSET) { *(.init.ramfs) }
   __initramfs_end = .;	
-  . = ALIGN(32);
+  . = ALIGN(CONFIG_X86_L1_CACHE_BYTES);
   __per_cpu_start = .;
   .data.percpu  : AT(ADDR(.data.percpu) - LOAD_OFFSET) { *(.data.percpu) }
   __per_cpu_end = .;