Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7fd5b632 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze 

* 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze:
  microblaze: Add missing symbols for CONSTRUCTORS support
  microblaze: remove init_mm
parents ad5cf46b 05bf7d46

arch/microblaze/kernel/init_task.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -18,8 +18,6 @@ 




static struct signal_struct init_signals = INIT_SIGNALS(init_signals);

static struct signal_struct init_signals = INIT_SIGNALS(init_signals);

static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);

static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);

struct mm_struct init_mm = INIT_MM(init_mm);

EXPORT_SYMBOL(init_mm);





union thread_union init_thread_union

union thread_union init_thread_union

	__attribute__((__section__(".data.init_task"))) =

	__attribute__((__section__(".data.init_task"))) =

arch/microblaze/kernel/vmlinux.lds.S

+6 −5
Original line number Original line Diff line number Diff line
@@ -62,7 +62,8 @@ SECTIONS { 




	_sdata = . ;

	_sdata = . ;

	.data ALIGN (4096) : { /* page aligned when MMU used - origin 0x4 */

	.data ALIGN (4096) : { /* page aligned when MMU used - origin 0x4 */

		*(.data)

		DATA_DATA

		CONSTRUCTORS

	}

	}

	. = ALIGN(32);

	. = ALIGN(32);

	.data.cacheline_aligned : { *(.data.cacheline_aligned) }

	.data.cacheline_aligned : { *(.data.cacheline_aligned) }
@@ -98,13 +99,13 @@ SECTIONS { 
	. = ALIGN(4096);

	. = ALIGN(4096);

	.init.text : {

	.init.text : {

		_sinittext = . ;

		_sinittext = . ;

		*(.init.text)

		INIT_TEXT

		*(.exit.text)

		*(.exit.data)

		_einittext = .;

		_einittext = .;

	}

	}





	.init.data : { *(.init.data) }

	.init.data : {

		INIT_DATA

	}





	. = ALIGN(4);

	. = ALIGN(4);

	.init.ivt : {

	.init.ivt : {