Skip to contentSkip to conversation

alpha: vmlinux.lds cleanup - use THREAD_SIZE macro

RFC In review Cyrill Gorcunov 2 participants 3 messages Feb 27, 2008 Alpha port

lore
Share & tools
lore
#0 lore raw

RFC 1/1 alpha: vmlinux.lds cleanup - use THREAD_SIZE macro

This patch modifies thread_info.h header to be able to include it into linker script and then we're able to use THREAD_SIZE in vmlinux.lds

---

COMPLETELY UNTESTED
Any comments are welcome!

arch/alpha/kernel/vmlinux.lds.S +2 -1
Index: linux-2.6.git/arch/alpha/kernel/vmlinux.lds.S
===================================================================
@@ -1,5 +1,6 @@
 #include <asm-generic/vmlinux.lds.h>
 #include <asm/page.h>
+#include <asm/thread_info.h>
 
 OUTPUT_FORMAT("elf64-alpha")
 OUTPUT_ARCH(alpha)
@@ -88,7 +89,7 @@ SECTIONS
 
 	PERCPU(PAGE_SIZE)
 
-	. = ALIGN(2 * PAGE_SIZE);
+	. = ALIGN(THREAD_SIZE);
 	__init_end = .;
 	/* Freed after init ends here */
 
include/asm-alpha/thread_info.h +6 -3
Index: linux-2.6.git/include/asm-alpha/thread_info.h
===================================================================
@@ -7,9 +7,7 @@
 #include <asm/processor.h>
 #include <asm/types.h>
 #include <asm/hwrpb.h>
-#endif
 
-#ifndef __ASSEMBLY__
 struct thread_info {
 	struct pcb_struct	pcb;		/* palcode state */
 
@@ -50,13 +48,14 @@ register struct thread_info *__current_t
 #define current_thread_info()  __current_thread_info
 
 /* Thread information allocation.  */
-#define THREAD_SIZE (2*PAGE_SIZE)
 #define alloc_thread_info(tsk) \
   ((struct thread_info *) __get_free_pages(GFP_KERNEL,1))
 #define free_thread_info(ti) free_pages((unsigned long) (ti), 1)
 
 #endif /* __ASSEMBLY__ */
 
+#define THREAD_SIZE (2 * PAGE_SIZE)
+
 #define PREEMPT_ACTIVE		0x40000000
 
 /*
@@ -94,6 +93,8 @@ register struct thread_info *__current_t
 #define ALPHA_UAC_MASK		(1 << TIF_UAC_NOPRINT | 1 << TIF_UAC_NOFIX | \
 				 1 << TIF_UAC_SIGBUS)
 
+#ifndef __ASSEMBLY__
+
 #define SET_UNALIGN_CTL(task,value)	({				     \
 	task_thread_info(task)->flags = ((task_thread_info(task)->flags &    \
 		~ALPHA_UAC_MASK)					     \
@@ -112,5 +113,7 @@ register struct thread_info *__current_t
 		 (int __user *)(value));				\
 	})
 
+#endif /* __ASSEMBLY__ */
+
 #endif /* __KERNEL__ */
 #endif /* _ALPHA_THREAD_INFO_H */
#2 lore raw

[Sam Ravnborg - Wed, Feb 27, 2008 at 07:57:56PM +0100]

| On Tue, Feb 26, 2008 at 10:51:59PM +0300, Cyrill Gorcunov wrote:
| > This patch modifies thread_info.h header to be able to include it
| > into linker script and then we're able to use THREAD_SIZE in
| > vmlinux.lds
| > 
| > Signed-off-by: Cyrill Gorcunov <[email protected]>
| Reviewed-by: Sam Ravnborg <[email protected]>
| 
| And I also build tested the patch and checked the
| resulting .lds files.
| And they were semantically equal.
| 
| 	Sam
| 

Thanks Sam, I'm almost complete with series on other archs. Will send them soon (but maybe not today ;)

- Cyrill -