From: "Siddha, Suresh B" <suresh.b.siddha@intel.com>
To: linux-ia64@vger.kernel.org
Subject: RE: [Linux-ia64] [Patch] Fix in process.c
Date: Tue, 21 Jan 2003 02:41:56 +0000 [thread overview]
Message-ID: <marc-linux-ia64-105590709805733@msgid-missing> (raw)
In-Reply-To: <marc-linux-ia64-105590709805720@msgid-missing>
[-- Attachment #1: Type: text/plain, Size: 2161 bytes --]
> >
> > I understand that. What I'm saying is that GCC does the sane thing.
> > There's got to be a way to get the address of a label without having
> > to materialize a function pointer.
> >
> > --david
> >
>
> We can do that through the linker script vmlinux.lds.S.
>
hi David,
Here is the patch which does this. Please apply.
thanks,
suresh
diff -Nru linux-2.5.52/arch/ia64/kernel/process.c linux/arch/ia64/kernel/process.c
--- linux-2.5.52/arch/ia64/kernel/process.c Mon Jan 20 13:12:08 2003
+++ linux/arch/ia64/kernel/process.c Mon Jan 20 09:45:21 2003
@@ -281,7 +281,10 @@
{
unsigned long rbs, child_rbs, rbs_size, stack_offset, stack_top, stack_used;
struct switch_stack *child_stack, *stack;
- extern char ia64_ret_from_clone, ia32_ret_from_clone;
+ extern int __ia64_ret_from_clone;
+#ifdef CONFIG_IA32_SUPPORT
+ extern int __ia32_ret_from_clone;
+#endif
struct pt_regs *child_ptregs;
int retval = 0;
@@ -332,10 +335,12 @@
child_ptregs->r12 = (unsigned long) (child_ptregs + 1); /* kernel sp */
child_ptregs->r13 = (unsigned long) p; /* set `current' pointer */
}
+#ifdef CONFIG_IA32_SUPPORT
if (IS_IA32_PROCESS(regs))
- child_stack->b0 = (unsigned long) &ia32_ret_from_clone;
+ child_stack->b0 = (unsigned long) &__ia32_ret_from_clone;
else
- child_stack->b0 = (unsigned long) &ia64_ret_from_clone;
+#endif
+ child_stack->b0 = (unsigned long) &__ia64_ret_from_clone;
child_stack->ar_bspstore = child_rbs + rbs_size;
/* copy parts of thread_struct: */
diff -Nru linux-2.5.52/arch/ia64/vmlinux.lds.S linux/arch/ia64/vmlinux.lds.S
--- linux-2.5.52/arch/ia64/vmlinux.lds.S Mon Jan 20 13:12:09 2003
+++ linux/arch/ia64/vmlinux.lds.S Mon Jan 20 18:31:14 2003
@@ -39,6 +39,14 @@
#endif
_etext = .;
+ /* We want to get the address of a label without having
+ to materialize a function pointer. "+0" is for changing
+ the symbol type */
+ __ia64_ret_from_clone = ia64_ret_from_clone + 0;
+#ifdef CONFIG_IA32_SUPPORT
+ __ia32_ret_from_clone = ia32_ret_from_clone + 0;
+#endif
+
/* Read-only data */
/* Global data */
[-- Attachment #2: process.diff --]
[-- Type: application/octet-stream, Size: 1786 bytes --]
diff -Nru linux-2.5.52/arch/ia64/kernel/process.c linux/arch/ia64/kernel/process.c
--- linux-2.5.52/arch/ia64/kernel/process.c Mon Jan 20 13:12:08 2003
+++ linux/arch/ia64/kernel/process.c Mon Jan 20 09:45:21 2003
@@ -281,7 +281,10 @@
{
unsigned long rbs, child_rbs, rbs_size, stack_offset, stack_top, stack_used;
struct switch_stack *child_stack, *stack;
- extern char ia64_ret_from_clone, ia32_ret_from_clone;
+ extern int __ia64_ret_from_clone;
+#ifdef CONFIG_IA32_SUPPORT
+ extern int __ia32_ret_from_clone;
+#endif
struct pt_regs *child_ptregs;
int retval = 0;
@@ -332,10 +335,12 @@
child_ptregs->r12 = (unsigned long) (child_ptregs + 1); /* kernel sp */
child_ptregs->r13 = (unsigned long) p; /* set `current' pointer */
}
+#ifdef CONFIG_IA32_SUPPORT
if (IS_IA32_PROCESS(regs))
- child_stack->b0 = (unsigned long) &ia32_ret_from_clone;
+ child_stack->b0 = (unsigned long) &__ia32_ret_from_clone;
else
- child_stack->b0 = (unsigned long) &ia64_ret_from_clone;
+#endif
+ child_stack->b0 = (unsigned long) &__ia64_ret_from_clone;
child_stack->ar_bspstore = child_rbs + rbs_size;
/* copy parts of thread_struct: */
diff -Nru linux-2.5.52/arch/ia64/vmlinux.lds.S linux/arch/ia64/vmlinux.lds.S
--- linux-2.5.52/arch/ia64/vmlinux.lds.S Mon Jan 20 13:12:09 2003
+++ linux/arch/ia64/vmlinux.lds.S Mon Jan 20 18:31:14 2003
@@ -39,6 +39,14 @@
#endif
_etext = .;
+ /* We want to get the address of a label without having
+ to materialize a function pointer. "+0" is for changing
+ the symbol type */
+ __ia64_ret_from_clone = ia64_ret_from_clone + 0;
+#ifdef CONFIG_IA32_SUPPORT
+ __ia32_ret_from_clone = ia32_ret_from_clone + 0;
+#endif
+
/* Read-only data */
/* Global data */
prev parent reply other threads:[~2003-01-21 2:41 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-01-18 1:43 [Linux-ia64] [Patch] Fix in process.c Siddha, Suresh B
2003-01-18 1:53 ` David Mosberger
2003-01-18 3:04 ` Siddha, Suresh B
2003-01-18 3:11 ` David Mosberger
2003-01-18 3:39 ` Siddha, Suresh B
2003-01-21 2:41 ` Siddha, Suresh B [this message]
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=marc-linux-ia64-105590709805733@msgid-missing \
--to=suresh.b.siddha@intel.com \
--cc=linux-ia64@vger.kernel.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