diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-24 20:25:09 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-24 20:25:09 -0400 |
| commit | 851b147e4411df6a1e7e90e2a609773c277eefd2 (patch) | |
| tree | 3d3dd17a4e3ff0a6fd0c571d449085d411f7dc17 /arch/m32r/kernel/entry.S | |
| parent | 8e44e4347735229b518cc02938c351428bcd7492 (diff) | |
| parent | 85233c43f7fece10a3ea8ed34f0d546b8dd3a435 (diff) | |
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.
Diffstat (limited to 'arch/m32r/kernel/entry.S')
| -rw-r--r-- | arch/m32r/kernel/entry.S | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/m32r/kernel/entry.S b/arch/m32r/kernel/entry.S index 612d35b082a6..403869833b98 100644 --- a/arch/m32r/kernel/entry.S +++ b/arch/m32r/kernel/entry.S | |||
| @@ -118,6 +118,13 @@ | |||
| 118 | #define resume_kernel restore_all | 118 | #define resume_kernel restore_all |
| 119 | #endif | 119 | #endif |
| 120 | 120 | ||
| 121 | /* how to get the thread information struct from ASM */ | ||
| 122 | #define GET_THREAD_INFO(reg) GET_THREAD_INFO reg | ||
| 123 | .macro GET_THREAD_INFO reg | ||
| 124 | ldi \reg, #-THREAD_SIZE | ||
| 125 | and \reg, sp | ||
| 126 | .endm | ||
| 127 | |||
| 121 | ENTRY(ret_from_fork) | 128 | ENTRY(ret_from_fork) |
| 122 | pop r0 | 129 | pop r0 |
| 123 | bl schedule_tail | 130 | bl schedule_tail |