Merge commit 'v2.6.30-rc5' into core/iommu

[mv-sheeva.git] / arch / sparc / kernel / head_64.S

diff --git a/arch/sparc/kernel/head_64.S b/arch/sparc/kernel/head_64.S
index a46c3a21e26ded67dc59b816e9c8b8f5f7eade1f..91bf4c7f79b9c6c6acc90fe0ecbb90f503e6a1d5 100644 (file)
--- a/arch/sparc/kernel/head_64.S
+++ b/arch/sparc/kernel/head_64.S
@@ -467,7 +467,7 @@ jump_to_sun4u_init:
        jmpl    %g2 + %g0, %g0
         nop
 
-       .section        .text.init.refok
+       __REF
 sun4u_init:
        BRANCH_IF_SUN4V(g1, sun4v_init)
 
@@ -686,7 +686,7 @@ tlb_fixup_done:
         * point.
         *
         * There used to be enormous complexity wrt. transferring
-        * over from the firwmare's trap table to the Linux kernel's.
+        * over from the firmware's trap table to the Linux kernel's.
         * For example, there was a chicken & egg problem wrt. building
         * the OBP page tables, yet needing to be on the Linux kernel
         * trap table (to translate PAGE_OFFSET addresses) in order to