From 42d76d08161ee450f86810d9d6f6f7e3be3d4d0d Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Fri, 18 Sep 2009 16:32:46 -0400 Subject: [PATCH] --- yaml --- r: 166214 b: refs/heads/master c: 00b01b246bc2e28763cbd85f0dc949d6c0d38c13 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/m32r/include/asm/thread_info.h | 9 --------- trunk/arch/m32r/kernel/entry.S | 7 +++++++ 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index c5dee243fffa..0a6e7ba9772e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a7efb879ab5b07726873ace8305373bdf68be8a8 +refs/heads/master: 00b01b246bc2e28763cbd85f0dc949d6c0d38c13 diff --git a/trunk/arch/m32r/include/asm/thread_info.h b/trunk/arch/m32r/include/asm/thread_info.h index 4d6616936c36..ed240b6e8e77 100644 --- a/trunk/arch/m32r/include/asm/thread_info.h +++ b/trunk/arch/m32r/include/asm/thread_info.h @@ -125,15 +125,6 @@ static inline unsigned int get_thread_fault_code(void) return ti->flags >> TI_FLAG_FAULT_CODE_SHIFT; } -#else /* !__ASSEMBLY__ */ - -/* 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 /* diff --git a/trunk/arch/m32r/kernel/entry.S b/trunk/arch/m32r/kernel/entry.S index 612d35b082a6..403869833b98 100644 --- a/trunk/arch/m32r/kernel/entry.S +++ b/trunk/arch/m32r/kernel/entry.S @@ -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