From: Tim Abbott <tabbott@ksplice.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org, Sam Ravnborg <sam@ravnborg.org>,
Tim Abbott <tabbott@ksplice.com>,
Hirokazu Takata <takata@linux-m32r.org>
Subject: [PATCH 04/13] m32r: Move GET_THREAD_INFO definition out of asm/thread_info.h.
Date: Tue, 22 Sep 2009 10:22:18 -0400 [thread overview]
Message-ID: <1253629347-23119-5-git-send-email-tabbott@ksplice.com> (raw)
In-Reply-To: <1253629347-23119-1-git-send-email-tabbott@ksplice.com>
Previously, asm/thread_info.h was not usable from linker scripts
because it contains a piece of .macro code. Since that code was only
used in the m32r entry.S, the right fix is probably to move the macro
there.
Signed-off-by: Tim Abbott <tabbott@ksplice.com>
Cc: Hirokazu Takata <takata@linux-m32r.org>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
---
arch/m32r/include/asm/thread_info.h | 9 ---------
arch/m32r/kernel/entry.S | 7 +++++++
2 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/arch/m32r/include/asm/thread_info.h b/arch/m32r/include/asm/thread_info.h
index 4d66169..ed240b6 100644
--- a/arch/m32r/include/asm/thread_info.h
+++ b/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/arch/m32r/kernel/entry.S b/arch/m32r/kernel/entry.S
index 612d35b..4038698 100644
--- a/arch/m32r/kernel/entry.S
+++ b/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
--
1.6.3.3
next prev parent reply other threads:[~2009-09-22 14:26 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-22 14:22 [PATCH 00/13] Linker script cleanup patches for various architectures Tim Abbott
2009-09-22 14:22 ` [PATCH 01/13] Optimize the ordering of sections in RW_DATA_SECTION Tim Abbott
2009-09-23 18:26 ` Linus Torvalds
2009-09-23 18:36 ` Tim Abbott
2009-09-22 14:22 ` [PATCH 02/13] m32r: make PAGE_SIZE available to assembly Tim Abbott
2009-09-22 14:22 ` [PATCH 03/13] m32r: Define THREAD_SIZE only once Tim Abbott
2009-09-22 14:22 ` Tim Abbott [this message]
2009-09-22 14:22 ` [PATCH 05/13] m32r: Remove unused .altinstructions and .exit.* code from linker script Tim Abbott
2009-09-22 14:22 ` [PATCH 06/13] m32r: Move the spi_stack_top and spu_stack_top into .init.data section Tim Abbott
2009-09-22 14:22 ` [PATCH 07/13] m32r: Cleanup linker script using new linker script macros Tim Abbott
2009-09-22 14:22 ` [PATCH 08/13] parisc: Clean up " Tim Abbott
2009-09-22 14:22 ` [PATCH 09/13] parisc: Remove useless altinstructions code copied from x86 Tim Abbott
2009-09-23 19:55 ` Kyle McMartin
2009-09-22 14:22 ` [PATCH 10/13] xtensa: Cleanup linker script using new linker script macros Tim Abbott
2009-09-22 14:22 ` [PATCH 11/13] um: Clean up linker script using standard macros Tim Abbott
2009-09-22 14:22 ` [PATCH 12/13] h8300: Cleanup linker script using new linker script macros Tim Abbott
2009-09-22 14:22 ` [PATCH 13/13] mn10300: Clean up linker script using higher-level macros Tim Abbott
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1253629347-23119-5-git-send-email-tabbott@ksplice.com \
--to=tabbott@ksplice.com \
--cc=linux-kernel@vger.kernel.org \
--cc=sam@ravnborg.org \
--cc=takata@linux-m32r.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®