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

Commit 7066d746 authored by David Howells's avatar David Howells
Browse files

cris: Make THREAD_SIZE available to vmlinux.lds 



Make THREAD_SIZE available to vmlinux.lds on cris by moving it to
asm/thread_info.h and including that from the linker script.

This allows init_stack to be allocated in the linker script in a subsequent
patch.

Reported-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Tested-by: default avatarGuenter Roeck <linux@roeck-us.net>
cc: Mikael Starvik <starvik@axis.com>
cc: Jesper Nilsson <jesper.nilsson@axis.com>
cc: linux-cris-kernel@axis.com
parent 30a7acd5

arch/cris/include/asm/processor.h

+0 −7
Original line number Diff line number Diff line
@@ -26,13 +26,6 @@ struct task_struct; 
 */

#define TASK_UNMAPPED_BASE      (PAGE_ALIGN(TASK_SIZE / 3))



/* THREAD_SIZE is the size of the thread_info/kernel_stack combo.

 * normally, the stack is found by doing something like p + THREAD_SIZE

 * in CRIS, a page is 8192 bytes, which seems like a sane size

 */

#define THREAD_SIZE       PAGE_SIZE

#define THREAD_SIZE_ORDER (0)



/*

 * At user->kernel entry, the pt_regs struct is stacked on the top of the kernel-stack.

 * This macro allows us to find those regs for a task.

arch/cris/include/asm/thread_info.h

+7 −0
Original line number Diff line number Diff line
@@ -20,6 +20,13 @@ 
#endif





/* THREAD_SIZE is the size of the thread_info/kernel_stack combo.

 * normally, the stack is found by doing something like p + THREAD_SIZE

 * in CRIS, a page is 8192 bytes, which seems like a sane size

 */

#define THREAD_SIZE       PAGE_SIZE

#define THREAD_SIZE_ORDER (0)



/*

 * low level task data that entry.S needs immediate access to

 * - this struct should fit entirely inside of one cache line

arch/cris/kernel/vmlinux.lds.S

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 


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

#include <asm/page.h>

#include <asm/thread_info.h>



#ifdef CONFIG_ETRAX_VMEM_SIZE

#define __CONFIG_ETRAX_VMEM_SIZE CONFIG_ETRAX_VMEM_SIZE