diff --git a/[refs] b/[refs] index 3fd7fdbca02f..6db3274861ea 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2c31c341a827b99eef743753aa9adb917b9ea6db +refs/heads/master: a7df554ea095da4f60ff7f7b90a94c2df91942e4 diff --git a/trunk/arch/parisc/include/asm/system.h b/trunk/arch/parisc/include/asm/system.h index d91357bca5b4..4bbb67355ace 100644 --- a/trunk/arch/parisc/include/asm/system.h +++ b/trunk/arch/parisc/include/asm/system.h @@ -174,7 +174,7 @@ static inline void set_eiem(unsigned long val) }) #ifdef CONFIG_SMP -# define __lock_aligned __attribute__((__section__(".data.lock_aligned"))) +# define __lock_aligned __attribute__((__section__(".data..lock_aligned"))) #endif #define arch_align_stack(x) (x) diff --git a/trunk/arch/parisc/kernel/vmlinux.lds.S b/trunk/arch/parisc/kernel/vmlinux.lds.S index 33ec31ddb06d..d64a6bbec2aa 100644 --- a/trunk/arch/parisc/kernel/vmlinux.lds.S +++ b/trunk/arch/parisc/kernel/vmlinux.lds.S @@ -94,8 +94,8 @@ SECTIONS /* PA-RISC locks requires 16-byte alignment */ . = ALIGN(16); - .data.lock_aligned : { - *(.data.lock_aligned) + .data..lock_aligned : { + *(.data..lock_aligned) } /* End of data section */