m68k: Make thread_info.h usable from assembly.
Subsystems (2)
PATCH 1/2 m68k: Make thread_info.h usable from assembly.
Signed-off-by Tim Abbott <[email protected]>
--- arch/m68k/include/asm/thread_info_mm.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
arch/m68k/include/asm/thread_info_mm.h +2 -0
@@ -4,6 +4,7 @@#include <asm/types.h> #include <asm/page.h> +#ifndef __ASSEMBLY__ struct thread_info { struct task_struct *task; /* main task structure */ unsigned long flags;
@@ -12,6 +13,7 @@ struct thread_info {__u32 cpu;/* should always be 0 on m68k */ struct restart_block restart_block; }; +#endif /* __ASSEMBLY__ */ #define PREEMPT_ACTIVE 0x4000000
Signature · 1 line
1.6.3.3
PATCH 2/2 m68k: Cleanup linker scripts using new linker script macros.
Signed-off-by Tim Abbott <[email protected]>
Cc Geert Uytterhoeven <[email protected]>
Cc Roman Zippel <[email protected]>
Cc Sam Ravnborg <[email protected]>
--- arch/m68k/kernel/vmlinux-std.lds | 54 +++++++----------------------------- arch/m68k/kernel/vmlinux-sun3.lds | 53 +++++++----------------------------- 2 files changed, 21 insertions(+), 86 deletions(-)
arch/m68k/kernel/vmlinux-std.lds +11 -43
@@ -2,6 +2,7 @@ #include <asm-generic/vmlinux.lds.h> #include <asm/page.h> +#include <asm/thread_info.h> OUTPUT_FORMAT("elf32-m68k", "elf32-m68k", "elf32-m68k") OUTPUT_ARCH(m68k)
@@ -22,64 +23,38 @@ SECTIONS _etext = .; /* End of text section */ - . = ALIGN(16); /* Exception table */ - __start___ex_table = .; - __ex_table : { *(__ex_table) } - __stop___ex_table = .; + EXCEPTION_TABLE(16) RODATA - .data : { /* Data */ - DATA_DATA - CONSTRUCTORS - } - - . = ALIGN(16); - .data.cacheline_aligned : { *(.data.cacheline_aligned) } + RW_DATA_SECTION(16, PAGE_SIZE, THREAD_SIZE) - .bss : { *(.bss) } /* BSS */ + BSS_SECTION(0, 0, 0) _edata = .; /* End of data section */ /* will be freed after init */ . = ALIGN(PAGE_SIZE); /* Init code and data */ __init_begin = .; - .init.text : { - _sinittext = .; - INIT_TEXT - _einittext = .; - } :data + INIT_TEXT_SECTION(PAGE_SIZE) :data + INIT_DATA_SECTION(16) .init.data : { INIT_DATA } - . = ALIGN(16); - __setup_start = .; - .init.setup : { *(.init.setup) } - __setup_end = .; - __initcall_start = .; + .init.setup : { INIT_SETUP(16) } .initcall.init : { - INITCALLS + INIT_CALLS } - __initcall_end = .; - __con_initcall_start = .; - .con_initcall.init : { *(.con_initcall.init) } - __con_initcall_end = .; + .con_initcall.init : { CON_INITCALL } .m68k_fixup : { __start_fixup = .; *(.m68k_fixup) __stop_fixup = .; } SECURITY_INIT -#ifdef CONFIG_BLK_DEV_INITRD - . = ALIGN(8192); - __initramfs_start = .; - .init.ramfs : { *(.init.ramfs) } - __initramfs_end = .; -#endif + .init.ramfs : { INIT_RAM_FS } NOTES . = ALIGN(8192); __init_end = .; - .data.init_task : { *(.data.init_task) } /* The initial task and kernel stack */ - _end = . ; /* Sections to be discarded */
@@ -89,12 +64,5 @@ SECTIONS *(.exitcall.exit) } - /* Stabs debugging sections. */ - .stab 0 : { *(.stab) } - .stabstr 0 : { *(.stabstr) } - .stab.excl 0 : { *(.stab.excl) } - .stab.exclstr 0 : { *(.stab.exclstr) } - .stab.index 0 : { *(.stab.index) } - .stab.indexstr 0 : { *(.stab.indexstr) } - .comment 0 : { *(.comment) } + STABS_DEBUG }
arch/m68k/kernel/vmlinux-sun3.lds +10 -43
88 lines not on this page · raw message
Signature · 1 line
1.6.3.3