Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 258207
b: refs/heads/master
c: 39df888
h: refs/heads/master
i:
  258205: 2ae8acc
  258203: 5a19a59
  258199: e0550d3
  258191: 7de0b34
  258175: b298378
v: v3
  • Loading branch information
Russell King committed Jul 7, 2011
1 parent 03a47ff commit 5dcf7cf
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 26 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3002b41bc6e5d66f7c1b5fd604f8f413e9bb37a5
refs/heads/master: 39df88872f64b8a7c438861460063eadf2ba9011
47 changes: 22 additions & 25 deletions trunk/arch/arm/kernel/vmlinux.lds.S
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,28 @@ jiffies = jiffies_64 + 4;

SECTIONS
{
/*
* unwind exit sections must be discarded before the rest of the
* unwind sections get included.
*/
/DISCARD/ : {
*(.ARM.exidx.exit.text)
*(.ARM.extab.exit.text)
ARM_CPU_DISCARD(*(.ARM.exidx.cpuexit.text))
ARM_CPU_DISCARD(*(.ARM.extab.cpuexit.text))
#ifndef CONFIG_HOTPLUG
*(.ARM.exidx.devexit.text)
*(.ARM.extab.devexit.text)
#endif
#ifndef CONFIG_MMU
*(.fixup)
*(__ex_table)
#endif
#ifndef CONFIG_SMP_ON_UP
*(.alt.smp.init)
#endif
}

#ifdef CONFIG_XIP_KERNEL
. = XIP_VIRT_ADDR(CONFIG_XIP_PHYS_ADDR);
#else
Expand Down Expand Up @@ -89,25 +111,6 @@ SECTIONS
__init_end = .;
#endif

/*
* unwind exit sections must be discarded before the rest of the
* unwind sections get included.
*/
/DISCARD/ : {
*(.ARM.exidx.exit.text)
*(.ARM.extab.exit.text)
ARM_CPU_DISCARD(*(.ARM.exidx.cpuexit.text))
ARM_CPU_DISCARD(*(.ARM.extab.cpuexit.text))
#ifndef CONFIG_HOTPLUG
*(.ARM.exidx.devexit.text)
*(.ARM.extab.devexit.text)
#endif
#ifndef CONFIG_MMU
*(.fixup)
*(__ex_table)
#endif
}

.text : { /* Real text segment */
_text = .; /* Text and read-only data */
__exception_text_start = .;
Expand Down Expand Up @@ -270,12 +273,6 @@ SECTIONS

/* Default discards */
DISCARDS

#ifndef CONFIG_SMP_ON_UP
/DISCARD/ : {
*(.alt.smp.init)
}
#endif
}

/*
Expand Down

0 comments on commit 5dcf7cf

Please sign in to comment.