diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-30 15:38:18 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-30 15:38:18 -0500 |
| commit | d1127e40e8d75cd3855e35424937c73d0bcec558 (patch) | |
| tree | 093f020e971827c63d3eed1d646022c581ded2ea /arch/ia64/kernel/gate.lds.S | |
| parent | 5abc97aa25b2c41413b3a520faee83f2282d9f18 (diff) | |
| parent | c1c57d767100417f63c18da52d7e96f82b2b9e1a (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] ioremap() should prefer WB over UC
[IA64] Add __mca_table to the DISCARD list in gate.lds
[IA64] Move __mca_table out of the __init section
[IA64] simplify some condition checks in iosapic_check_gsi_range
[IA64] correct some messages and fixes some minor things
[IA64-SGI] fix for-loop in sn_hwperf_geoid_to_cnode()
[IA64-SGI] sn_hwperf use of num_online_cpus()
[IA64] optimize flush_tlb_range on large numa box
[IA64] lazy_mmu_prot_update needs to be aware of huge pages
Diffstat (limited to 'arch/ia64/kernel/gate.lds.S')
| -rw-r--r-- | arch/ia64/kernel/gate.lds.S | 1 |
1 files changed, 1 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 | |||
| 59 | *(.dynbss) | 59 | *(.dynbss) |
| 60 | *(.bss .bss.* .gnu.linkonce.b.*) | 60 | *(.bss .bss.* .gnu.linkonce.b.*) |
| 61 | *(__ex_table) | 61 | *(__ex_table) |
| 62 | *(__mca_table) | ||
| 62 | } | 63 | } |
| 63 | } | 64 | } |
| 64 | 65 | ||