From: Catalin Marinas <catalin.marinas@arm.com>
To: Ingo Molnar <mingo@elte.hu>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, Thomas Gleixner <tglx@linutronix.de>,
"H. Peter Anvin" <hpa@zytor.com>, Sam Ravnborg <sam@ravnborg.org>
Subject: Re: linux-next: manual merge of the kmemleak tree with the x86 tree
Date: Thu, 07 May 2009 11:37:51 +0100 [thread overview]
Message-ID: <1241692671.6648.12.camel@pc1117.cambridge.arm.com> (raw)
In-Reply-To: <20090507092310.GA27707@elte.hu>
On Thu, 2009-05-07 at 11:23 +0200, Ingo Molnar wrote:
> * Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
> > index 4c85b2e..0bbb2d1 100644
> > --- a/arch/x86/kernel/vmlinux.lds.S
> > +++ b/arch/x86/kernel/vmlinux.lds.S
> > @@ -107,6 +107,7 @@ SECTIONS
> >
> > /* Data */
> > . = ALIGN(PAGE_SIZE);
> > + _sdata = .; /* Start of data section */
> > .data : AT(ADDR(.data) - LOAD_OFFSET) {
> > DATA_DATA
> > CONSTRUCTORS
>
> At a quick glance, that line should be moved a line further down, to
> avoid a boot crash of linux-next with CONFIG_RELOCATABLE=y (which
> most distros ship with).
Fixed, see below (and changed Acked-by back to Cc).
> The kmemleak tree change should be submitted to the x86 tree as
> well, so we can merge it properly.
OK, once you are fine with its new form.
> (it's fine if the kmemleak tree
> has that commit too [it obviously needs it] - so there will still be
> a conflict - just the resolution will be a straightforward 'pick the
> x86 tree side' step.)
There may not be a conflict if the changes are identical (but it depends
on what else is in the x86 tree).
x86: Provide _sdata in the vmlinux_*.lds.S files
From: Catalin Marinas <catalin.marinas@arm.com>
_sdata is a common symbol defined by many architectures and made
available to the kernel via asm-generic/sections.h. Kmemleak uses this
symbol when scanning the data sections.
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Cc: Ingo Molnar <mingo@elte.hu>
---
arch/x86/kernel/vmlinux_32.lds.S | 1 +
arch/x86/kernel/vmlinux_64.lds.S | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/arch/x86/kernel/vmlinux_32.lds.S b/arch/x86/kernel/vmlinux_32.lds.S
index 62ad500..171a534 100644
--- a/arch/x86/kernel/vmlinux_32.lds.S
+++ b/arch/x86/kernel/vmlinux_32.lds.S
@@ -64,6 +64,7 @@ SECTIONS
/* writeable */
. = ALIGN(PAGE_SIZE);
.data : AT(ADDR(.data) - LOAD_OFFSET) { /* Data */
+ _sdata = .; /* Start of data section */
DATA_DATA
CONSTRUCTORS
} :data
diff --git a/arch/x86/kernel/vmlinux_64.lds.S b/arch/x86/kernel/vmlinux_64.lds.S
index c874250..121319f 100644
--- a/arch/x86/kernel/vmlinux_64.lds.S
+++ b/arch/x86/kernel/vmlinux_64.lds.S
@@ -59,6 +59,7 @@ SECTIONS
. = ALIGN(PAGE_SIZE); /* Align data segment to page size boundary */
/* Data */
.data : AT(ADDR(.data) - LOAD_OFFSET) {
+ _sdata = .; /* Start of data section */
DATA_DATA
CONSTRUCTORS
_edata = .; /* End of data section */
--
Catalin
next prev parent reply other threads:[~2009-05-07 10:39 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-07 5:54 linux-next: manual merge of the kmemleak tree with the x86 tree Stephen Rothwell
2009-05-07 6:24 ` Sam Ravnborg
2009-05-07 9:23 ` Ingo Molnar
2009-05-07 10:37 ` Catalin Marinas [this message]
2009-05-07 11:13 ` Ingo Molnar
2009-05-07 11:22 ` Stephen Rothwell
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=1241692671.6648.12.camel@pc1117.cambridge.arm.com \
--to=catalin.marinas@arm.com \
--cc=hpa@zytor.com \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=sam@ravnborg.org \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
/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;
as well as URLs for NNTP newsgroup(s).