mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Rusty Russell <rusty@rustcorp.com.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Alan Jenkins <alan-jenkins@tuffmail.co.uk>,
	Nelson Elhage <nelhage@ksplice.com>,
	Tim Abbott <tabbott@ksplice.com>,
	Russell King <rmk@arm.linux.org.uk>
Subject: linux-next: manual merge of the rr tree with the arm tree
Date: Wed, 25 Nov 2009 16:21:43 +1100	[thread overview]
Message-ID: <20091125162143.f3ecd684.sfr@canb.auug.org.au> (raw)

Hi Rusty,

Today's linux-next merge of the rr tree got a conflict in
arch/arm/kernel/vmlinux.lds.S between commit
78d7530ac338e458fa513527ee7bb4278d0d8017 ("ARM: Clean up linker script
using new linker script macros") from the arm tree and commit
0a5e2c8918d0945f6384e104050c5234057455df ("ARM: use unified discard
definition in linker script") from the rr tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/kernel/vmlinux.lds.S
index 71151bd,ec511d4..0000000
--- a/arch/arm/kernel/vmlinux.lds.S
+++ b/arch/arm/kernel/vmlinux.lds.S
@@@ -58,18 -77,13 +58,18 @@@ SECTION
  #endif
  	}
  
 +	PERCPU(PAGE_SIZE)
 +
 +#ifndef CONFIG_XIP_KERNEL
 +	. = ALIGN(PAGE_SIZE);
 +	__init_end = .;
 +#endif
 +
- 	/DISCARD/ : {			/* Exit code and data		*/
- 		EXIT_TEXT
- 		EXIT_DATA
- 		*(.exitcall.exit)
- 		*(.discard)
+ 	/*
+ 	 * unwind exit sections must be discarded before the rest of the
+ 	 * unwind sections get included.
+ 	 */
+ 	/DISCARD/ : {
  		*(.ARM.exidx.exit.text)
  		*(.ARM.extab.exit.text)
  #ifndef CONFIG_HOTPLUG_CPU
@@@ -233,11 -256,24 +233,14 @@@
  	}
  #endif
  
 -	.bss : {
 -		__bss_start = .;	/* BSS				*/
 -		*(.bss)
 -		*(COMMON)
 -		__bss_stop = .;
 -		_end = .;
 -	}
 -					/* Stabs debugging sections.	*/
 -	.stab 0 : { *(.stab) }
 -	.stabstr 0 : { *(.stabstr) }
 -	.stab.excl 0 : { *(.stab.excl) }
 -	.stab.exclstr 0 : { *(.stab.exclstr) }
 -	.stab.index 0 : { *(.stab.index) }
 -	.stab.indexstr 0 : { *(.stab.indexstr) }
 +	BSS_SECTION(0, 0, 0)
 +	_end = .;
 +
 +	STABS_DEBUG
  	.comment 0 : { *(.comment) }
+ 
+ 	/* Default discards */
+ 	DISCARDS
  }
  
  /*

             reply	other threads:[~2009-11-25  5:21 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-11-25  5:21 Stephen Rothwell [this message]
2012-02-29  2:29 Stephen Rothwell
2012-07-26  1:59 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=20091125162143.f3ecd684.sfr@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=alan-jenkins@tuffmail.co.uk \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=nelhage@ksplice.com \
    --cc=rmk@arm.linux.org.uk \
    --cc=rusty@rustcorp.com.au \
    --cc=tabbott@ksplice.com \
    /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®