2 files changed, 2 insertions, 2 deletions

diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c
index 75bb1300dd7a..26760cad8b69 100644
--- a/arch/mips/kernel/proc.c
+++ b/arch/mips/kernel/proc.c
@@ -39,7 +39,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
         seq_printf(m, "processor\t\t: %ld\n", n);
         sprintf(fmt, "cpu model\t\t: %%s V%%d.%%d%s\n",
                 cpu_data[n].options & MIPS_CPU_FPU ? "  FPU V%d.%d" : "");
-        seq_printf(m, fmt, __cpu_name[smp_processor_id()],
+        seq_printf(m, fmt, __cpu_name[n],
                                    (version >> 4) & 0x0f, version & 0x0f,
                                    (fp_vers >> 4) & 0x0f, fp_vers & 0x0f);
         seq_printf(m, "BogoMIPS\t\t: %lu.%02lu\n",
diff --git a/arch/mips/kernel/vmlinux.lds.S b/arch/mips/kernel/vmlinux.lds.S
index afb119f35682..58738c8d754f 100644
--- 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)
         }