linux-kernel - linux-next: manual merge of the rr tree with the arm tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:	Wed, 25 Nov 2009 16:21:43 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Rusty Russell <rusty@...tcorp.com.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Alan Jenkins <alan-jenkins@...fmail.co.uk>,
	Nelson Elhage <nelhage@...lice.com>,
	Tim Abbott <tabbott@...lice.com>,
	Russell King <rmk@....linux.org.uk>
Subject: linux-next: manual merge of the rr tree with the arm tree

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@...b.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
  }
  
  /*
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/