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] Nail two more simple section mismatch errors
  [IA64] fix section mismatch warnings
  [IA64] rename partial_page
  [IA64] Ensure that machvec is set up takes place before serial console
  [IA64] vector-domain - fix vector_table
  [IA64] vector-domain - handle assign_irq_vector(AUTO_ASSIGN)

1 files changed, 3 insertions, 1 deletions

diff --git a/arch/ia64/kernel/head.S b/arch/ia64/kernel/head.S
index 44d540efa6d1..4e5e27540e27 100644
--- a/arch/ia64/kernel/head.S
+++ b/arch/ia64/kernel/head.S
@@ -178,7 +178,7 @@ swapper_pg_dir:
 halt_msg:
         stringz "Halting kernel\n"
 
-        .text
+        .section .text.head,"ax"
 
         .global start_ap
 
@@ -392,6 +392,8 @@ self:	hint @pause
         br.sptk.many self               // endless loop
 END(_start)
 
+        .text
+
 GLOBAL_ENTRY(ia64_save_debug_regs)
         alloc r16=ar.pfs,1,0,0,0
         mov r20=ar.lc                   // preserve ar.lc