git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'ost' into release
[pandora-kernel.git]
/
arch
/
x86
/
boot
/
compressed
/
vmlinux.lds.S
diff --git
a/arch/x86/boot/compressed/vmlinux.lds.S
b/arch/x86/boot/compressed/vmlinux.lds.S
index
f4193bb
..
a6f1a59
100644
(file)
--- a/
arch/x86/boot/compressed/vmlinux.lds.S
+++ b/
arch/x86/boot/compressed/vmlinux.lds.S
@@
-4,6
+4,7
@@
OUTPUT_FORMAT(CONFIG_OUTPUT_FORMAT, CONFIG_OUTPUT_FORMAT, CONFIG_OUTPUT_FORMAT)
#undef i386
+#include <asm/cache.h>
#include <asm/page_types.h>
#ifdef CONFIG_X86_64
@@
-46,7
+47,7
@@
SECTIONS
*(.data.*)
_edata = . ;
}
- . = ALIGN(
CONFIG_X86_
L1_CACHE_BYTES);
+ . = ALIGN(L1_CACHE_BYTES);
.bss : {
_bss = . ;
*(.bss)