Merge branches 'topic/fix/hda' and 'topic/fix/sound-core' into for-linus

[linux-2.6-omap-h63xx.git] / arch / mips / kernel / vmlinux.lds.S

diff --git a/arch/mips/kernel/vmlinux.lds.S b/arch/mips/kernel/vmlinux.lds.S
index afb119f35682680c2eb5eeddb20137aab7e64aa9..58738c8d754feb09bf525fe6862c62e1f6bda39a 100644 (file)
--- a/arch/mips/kernel/vmlinux.lds.S
+++ b/arch/mips/kernel/vmlinux.lds.S
@@ -104,7 +104,7 @@ SECTIONS
        . = ALIGN(_PAGE_SIZE);
        __nosave_end = .;
 
-       . = ALIGN(32);
+       . = ALIGN(1 << CONFIG_MIPS_L1_CACHE_SHIFT);
        .data.cacheline_aligned : {
                *(.data.cacheline_aligned)
        }