mirror of
https://github.com/adulau/aha.git
synced 2024-12-28 03:36:19 +00:00
Merge branch 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev
* 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev: m32r: Cleanup linker script using new linker script macros. m32r: Move the spi_stack_top and spu_stack_top into .init.data section. m32r: Remove unused .altinstructions and .exit.* code from linker script. m32r: Move GET_THREAD_INFO definition out of asm/thread_info.h. m32r: Define THREAD_SIZE only once. m32r: make PAGE_SIZE available to assembly.
This commit is contained in:
Linus Torvalds
commit
851b147e44
6 changed files with 23 additions and 87 deletions
|
|
@ -1,9 +1,11 @@
|
|||
#ifndef _ASM_M32R_PAGE_H
|
||||
#define _ASM_M32R_PAGE_H
|
||||
|
||||
#include <linux/const.h>
|
||||
|
||||
/* PAGE_SHIFT determines the page size */
|
||||
#define PAGE_SHIFT 12
|
||||
#define PAGE_SIZE (1UL << PAGE_SHIFT)
|
||||
#define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
|
||||
#define PAGE_MASK (~(PAGE_SIZE-1))
|
||||
|
||||
#ifndef __ASSEMBLY__
|
||||
|
|
|
|||
|
|
@ -140,8 +140,6 @@ unsigned long get_wchan(struct task_struct *p);
|
|||
#define KSTK_EIP(tsk) ((tsk)->thread.lr)
|
||||
#define KSTK_ESP(tsk) ((tsk)->thread.sp)
|
||||
|
||||
#define THREAD_SIZE (2*PAGE_SIZE)
|
||||
|
||||
#define cpu_relax() barrier()
|
||||
|
||||
#endif /* _ASM_M32R_PROCESSOR_H */
|
||||
|
|
|
|||
|
|
@ -55,6 +55,8 @@ struct thread_info {
|
|||
|
||||
#define PREEMPT_ACTIVE 0x10000000
|
||||
|
||||
#define THREAD_SIZE (PAGE_SIZE << 1)
|
||||
|
||||
/*
|
||||
* macros/functions for gaining access to the thread information structure
|
||||
*/
|
||||
|
|
@ -76,8 +78,6 @@ struct thread_info {
|
|||
#define init_thread_info (init_thread_union.thread_info)
|
||||
#define init_stack (init_thread_union.stack)
|
||||
|
||||
#define THREAD_SIZE (2*PAGE_SIZE)
|
||||
|
||||
/* how to get the thread information struct from C */
|
||||
static inline struct thread_info *current_thread_info(void)
|
||||
{
|
||||
|
|
@ -125,17 +125,6 @@ static inline unsigned int get_thread_fault_code(void)
|
|||
return ti->flags >> TI_FLAG_FAULT_CODE_SHIFT;
|
||||
}
|
||||
|
||||
#else /* !__ASSEMBLY__ */
|
||||
|
||||
#define THREAD_SIZE 8192
|
||||
|
||||
/* how to get the thread information struct from ASM */
|
||||
#define GET_THREAD_INFO(reg) GET_THREAD_INFO reg
|
||||
.macro GET_THREAD_INFO reg
|
||||
ldi \reg, #-THREAD_SIZE
|
||||
and \reg, sp
|
||||
.endm
|
||||
|
||||
#endif
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -118,6 +118,13 @@
|
|||
#define resume_kernel restore_all
|
||||
#endif
|
||||
|
||||
/* how to get the thread information struct from ASM */
|
||||
#define GET_THREAD_INFO(reg) GET_THREAD_INFO reg
|
||||
.macro GET_THREAD_INFO reg
|
||||
ldi \reg, #-THREAD_SIZE
|
||||
and \reg, sp
|
||||
.endm
|
||||
|
||||
ENTRY(ret_from_fork)
|
||||
pop r0
|
||||
bl schedule_tail
|
||||
|
|
|
|||
|
|
@ -268,13 +268,13 @@ ENTRY(empty_zero_page)
|
|||
/*------------------------------------------------------------------------
|
||||
* Stack area
|
||||
*/
|
||||
.section .spi
|
||||
.section .init.data, "aw"
|
||||
ALIGN
|
||||
.global spi_stack_top
|
||||
.zero 1024
|
||||
spi_stack_top:
|
||||
|
||||
.section .spu
|
||||
.section .init.data, "aw"
|
||||
ALIGN
|
||||
.global spu_stack_top
|
||||
.zero 1024
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
#include <asm-generic/vmlinux.lds.h>
|
||||
#include <asm/addrspace.h>
|
||||
#include <asm/page.h>
|
||||
#include <asm/thread_info.h>
|
||||
|
||||
OUTPUT_ARCH(m32r)
|
||||
#if defined(__LITTLE_ENDIAN__)
|
||||
|
|
@ -40,83 +41,22 @@ SECTIONS
|
|||
#endif
|
||||
_etext = .; /* End of text section */
|
||||
|
||||
. = ALIGN(16); /* Exception table */
|
||||
__start___ex_table = .;
|
||||
__ex_table : { *(__ex_table) }
|
||||
__stop___ex_table = .;
|
||||
|
||||
EXCEPTION_TABLE(16)
|
||||
RODATA
|
||||
|
||||
/* writeable */
|
||||
.data : { /* Data */
|
||||
*(.spu)
|
||||
*(.spi)
|
||||
DATA_DATA
|
||||
CONSTRUCTORS
|
||||
}
|
||||
|
||||
. = ALIGN(4096);
|
||||
__nosave_begin = .;
|
||||
.data_nosave : { *(.data.nosave) }
|
||||
. = ALIGN(4096);
|
||||
__nosave_end = .;
|
||||
|
||||
. = ALIGN(32);
|
||||
.data.cacheline_aligned : { *(.data.cacheline_aligned) }
|
||||
|
||||
RW_DATA_SECTION(32, PAGE_SIZE, THREAD_SIZE)
|
||||
_edata = .; /* End of data section */
|
||||
|
||||
. = ALIGN(8192); /* init_task */
|
||||
.data.init_task : { *(.data.init_task) }
|
||||
|
||||
/* will be freed after init */
|
||||
. = ALIGN(4096); /* Init code and data */
|
||||
. = ALIGN(PAGE_SIZE); /* Init code and data */
|
||||
__init_begin = .;
|
||||
.init.text : {
|
||||
_sinittext = .;
|
||||
INIT_TEXT
|
||||
_einittext = .;
|
||||
}
|
||||
.init.data : { INIT_DATA }
|
||||
. = ALIGN(16);
|
||||
__setup_start = .;
|
||||
.init.setup : { *(.init.setup) }
|
||||
__setup_end = .;
|
||||
__initcall_start = .;
|
||||
.initcall.init : {
|
||||
INITCALLS
|
||||
}
|
||||
__initcall_end = .;
|
||||
__con_initcall_start = .;
|
||||
.con_initcall.init : { *(.con_initcall.init) }
|
||||
__con_initcall_end = .;
|
||||
SECURITY_INIT
|
||||
. = ALIGN(4);
|
||||
__alt_instructions = .;
|
||||
.altinstructions : { *(.altinstructions) }
|
||||
__alt_instructions_end = .;
|
||||
.altinstr_replacement : { *(.altinstr_replacement) }
|
||||
/* .exit.text is discard at runtime, not link time, to deal with references
|
||||
from .altinstructions and .eh_frame */
|
||||
.exit.text : { EXIT_TEXT }
|
||||
.exit.data : { EXIT_DATA }
|
||||
|
||||
#ifdef CONFIG_BLK_DEV_INITRD
|
||||
. = ALIGN(4096);
|
||||
__initramfs_start = .;
|
||||
.init.ramfs : { *(.init.ramfs) }
|
||||
__initramfs_end = .;
|
||||
#endif
|
||||
|
||||
PERCPU(4096)
|
||||
. = ALIGN(4096);
|
||||
INIT_TEXT_SECTION(PAGE_SIZE)
|
||||
INIT_DATA_SECTION(16)
|
||||
PERCPU(PAGE_SIZE)
|
||||
. = ALIGN(PAGE_SIZE);
|
||||
__init_end = .;
|
||||
/* freed after init ends here */
|
||||
|
||||
__bss_start = .; /* BSS */
|
||||
.bss : { *(.bss) }
|
||||
. = ALIGN(4);
|
||||
__bss_stop = .;
|
||||
BSS_SECTION(0, 0, 4)
|
||||
|
||||
_end = . ;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue