diff options
| author | Jes Sorensen <jes@sgi.com> | 2006-03-30 10:13:22 -0500 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2006-03-30 09:04:19 -0800 |
| commit | 3283a67d8618c9a292eced23e8753ab64adc6dba (patch) | |
| tree | b46c784c8b6cca63b8878f8838fa3bbf1604280f | |
| parent | d89cfe7f1e82d758a7983584c1593795d4e2c098 (diff) | |
| download | linux-3283a67d8618c9a292eced23e8753ab64adc6dba.tar.bz2 | |
[IA64] Add __mca_table to the DISCARD list in gate.lds
Add __mca_table to the DISCARD list for the gate.lds linker script to
avoid broken linker references when linking the final vmlinux file.
Also add comment to include/asm-ia64/asmmacros.h to avoid anyone else
hitting this problem in the future.
Credits to James Bottomley <James.Bottomley@SteelEye.com> for spotting
the DISCARD list in gate.lds.S
Signed-off-by: Jes Sorensen <jes@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
| -rw-r--r-- | arch/ia64/kernel/gate.lds.S | 1 | ||||
| -rw-r--r-- | include/asm-ia64/asmmacro.h | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/arch/ia64/kernel/gate.lds.S b/arch/ia64/kernel/gate.lds.S index e1e4aba9ecd0..7c99e6ec3daf 100644 --- a/arch/ia64/kernel/gate.lds.S +++ b/arch/ia64/kernel/gate.lds.S @@ -59,6 +59,7 @@ SECTIONS *(.dynbss) *(.bss .bss.* .gnu.linkonce.b.*) *(__ex_table) + *(__mca_table) } } diff --git a/include/asm-ia64/asmmacro.h b/include/asm-ia64/asmmacro.h index d4cec32083d8..edf2cebb2969 100644 --- a/include/asm-ia64/asmmacro.h +++ b/include/asm-ia64/asmmacro.h @@ -38,6 +38,10 @@ name: /* * Helper macros for accessing user memory. + * + * When adding any new .section/.previous entries here, make sure to + * also add it to the DISCARD section in arch/ia64/kernel/gate.lds.S or + * unpleasant things will happen. */ .section "__ex_table", "a" // declare section & section attributes |