Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b1c0d26 authored by David Daney's avatar David Daney Committed by Ralf Baechle
Browse files

MIPS: Properly align the .data..init_task section. 



Improper alignment can lead to unbootable systems and/or random
crashes.

[ralf@linux-mips.org: This is a lond standing bug since
6eb10bc9 (kernel.org) rsp.
c422a10917f75fd19fa7fe070aaaa23e384dae6f (lmo) [MIPS: Clean up linker script
using new linker script macros.] so dates back to 2.6.32.]

Signed-off-by: default avatarDavid Daney <david.daney@cavium.com>
Cc: linux-mips@linux-mips.org
Cc: <stable@vger.kernel.org>
Patchwork: https://patchwork.linux-mips.org/patch/3881/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent c5de50da

arch/mips/include/asm/thread_info.h

+2 −2
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ struct thread_info { 
register struct thread_info *__current_thread_info __asm__("$28");

#define current_thread_info()  __current_thread_info



#endif /* !__ASSEMBLY__ */



/* thread information allocation */

#if defined(CONFIG_PAGE_SIZE_4KB) && defined(CONFIG_32BIT)

#define THREAD_SIZE_ORDER (1)
@@ -85,8 +87,6 @@ register struct thread_info *__current_thread_info __asm__("$28"); 


#define STACK_WARN	(THREAD_SIZE / 8)



#endif /* !__ASSEMBLY__ */



#define PREEMPT_ACTIVE		0x10000000



/*

arch/mips/kernel/vmlinux.lds.S

+2 −1
Original line number Diff line number Diff line 
#include <asm/asm-offsets.h>

#include <asm/page.h>

#include <asm/thread_info.h>

#include <asm-generic/vmlinux.lds.h>



#undef mips
@@ -72,7 +73,7 @@ SECTIONS 
	.data : {	/* Data */

		. = . + DATAOFFSET;		/* for CONFIG_MAPPED_KERNEL */



		INIT_TASK_DATA(PAGE_SIZE)

		INIT_TASK_DATA(THREAD_SIZE)

		NOSAVE_DATA

		CACHELINE_ALIGNED_DATA(1 << CONFIG_MIPS_L1_CACHE_SHIFT)

		READ_MOSTLY_DATA(1 << CONFIG_MIPS_L1_CACHE_SHIFT)