vserver 1.9.3

[linux-2.6.git] / arch / sparc64 / kernel / head.S

diff --git a/arch/sparc64/kernel/head.S b/arch/sparc64/kernel/head.S
index 910f768..4a286a8 100644 (file)
--- a/arch/sparc64/kernel/head.S
+++ b/arch/sparc64/kernel/head.S
@@ -50,7 +50,7 @@ bootup_user_stack:
  */
         .global root_flags, ram_flags, root_dev
         .global sparc_ramdisk_image, sparc_ramdisk_size
-       .globl  silo_args
+       .global sparc_ramdisk_image64
 
         .ascii  "HdrS"
         .word   LINUX_VERSION_CODE
@@ -61,7 +61,7 @@ bootup_user_stack:
         * 0x0202 : Supports kernel params string
         * 0x0201 : Supports reboot_command
         */
-       .half   0x0300          /* HdrS version */
+       .half   0x0301          /* HdrS version */
 
 root_flags:
         .half   1
@@ -75,6 +75,8 @@ sparc_ramdisk_size:
         .word   0
         .xword  reboot_command
        .xword  bootstr_info
+sparc_ramdisk_image64:
+       .xword  0
        .word   _end
 
        /* We must be careful, 32-bit OpenBOOT will get confused if it
@@ -523,8 +525,6 @@ cheetah_tlb_fixup:
        /* Patch copy/page operations to cheetah optimized versions. */
        call    cheetah_patch_copyops
         nop
-       call    cheetah_patch_pgcopyops
-        nop
        call    cheetah_patch_cachetlbops
         nop