From d6bf6aabed9044b43ae22d44d889dc4060eb3075 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@oracle.com>
Date: Fri, 27 Jan 2006 14:02:47 -0800
Subject: [PATCH] --- yaml --- r: 23699 b: refs/heads/master c:
 379b5441aeb895fe55b877a8a9c187e8728f774c h: refs/heads/master i:   23697:
 430d63f0c0d64ed1e64f69b5b025b4f77cb79e21   23695:
 2216a81dea964069abee32158fc3be147179182a v: v3

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

diff --git a/[refs] b/[refs]
index dbecb45b9b22..641901ddc192 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e70c45887a6bbe40393342ea5b426b0dd836dff
+refs/heads/master: 379b5441aeb895fe55b877a8a9c187e8728f774c
diff --git a/trunk/arch/i386/kernel/vmlinux.lds.S b/trunk/arch/i386/kernel/vmlinux.lds.S
index 4710195b6b74..18f99cce5895 100644
--- a/trunk/arch/i386/kernel/vmlinux.lds.S
+++ b/trunk/arch/i386/kernel/vmlinux.lds.S
@@ -7,6 +7,7 @@
 #include <asm-generic/vmlinux.lds.h>
 #include <asm/thread_info.h>
 #include <asm/page.h>
+#include <asm/cache.h>
 
 OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386")
 OUTPUT_ARCH(i386)
@@ -115,7 +116,7 @@ SECTIONS
   __initramfs_start = .;
   .init.ramfs : AT(ADDR(.init.ramfs) - LOAD_OFFSET) { *(.init.ramfs) }
   __initramfs_end = .;
-  . = ALIGN(32);
+  . = ALIGN(L1_CACHE_BYTES);
   __per_cpu_start = .;
   .data.percpu  : AT(ADDR(.data.percpu) - LOAD_OFFSET) { *(.data.percpu) }
   __per_cpu_end = .;