Changes in kernel/arch/sparc64/src/sun4u/start.S [36df4109:9d58539] in mainline

File:

• kernel/arch/sparc64/src/sun4u/start.S (modified) (9 diffs)

kernel/arch/sparc64/src/sun4u/start.S

@@ -27 +27 @@
 #
 
-#include <abi/asmtool.h>
-
 #include <arch/arch.h>
 #include <arch/cpu.h>
@@ -41 +39 @@
 
 #ifdef CONFIG_SMP
-#include <arch/context_struct.h>
+#include <arch/context_offset.h>
 #endif
 
@@ -78 +76 @@
  */
 
-SYMBOL(kernel_image_start)
+.global kernel_image_start
+kernel_image_start:
         mov BSP_FLAG, %l0
         and %o0, %l0, %l7                       ! l7 <= bootstrap processor?
@@ -292 +291 @@
         
         /*
-         * Call sparc64_pre_main(bootinfo)
-         */
-        call sparc64_pre_main
+         * Call arch_pre_main(bootinfo)
+         */
+        call arch_pre_main
         mov %o1, %o0
         
@@ -357 +356 @@
          */
         set ctx, %g1
-        add %g1, CONTEXT_OFFSET_SP, %g1
+        add %g1, OFFSET_SP, %g1
         ldx [%g1], %o6
 
@@ -397 +396 @@
 
 .align 8
-SYMBOL(physmem_base)    ! copy of the physical memory base address
+.global physmem_base            ! copy of the physical memory base address
+physmem_base:
         .quad 0
 
 /*
- * The fast_data_access_mmu_miss_data_hi label, the end_of_identity,
- * kernel_8k_tlb_data_template and tlb_tag_access_context_mask variables
- * are meant to stay together, aligned on a 32B boundary.
- */
-
-.align 32 
+ * The fast_data_access_mmu_miss_data_hi label and the end_of_identity and
+ * kernel_8k_tlb_data_template variables are meant to stay together,
+ * aligned on 16B boundary.
+ */
+.global fast_data_access_mmu_miss_data_hi
+.global end_of_identity 
+.global kernel_8k_tlb_data_template
+
+.align 16
 /*
  * This label is used by the fast_data_access_MMU_miss trap handler.
  */
-SYMBOL(fast_data_access_mmu_miss_data_hi)
+fast_data_access_mmu_miss_data_hi:
 /*
  * This variable is used by the fast_data_access_MMU_miss trap handler.
@@ -416 +419 @@
  * memory.
  */
-SYMBOL(end_of_identity)
+end_of_identity:
         .quad -1 
 /*
@@ -423 +426 @@
  * physical memory.
  */
-SYMBOL(kernel_8k_tlb_data_template)
+kernel_8k_tlb_data_template:
 #ifdef CONFIG_VIRT_IDX_DCACHE
         .quad ((1 << TTE_V_SHIFT) | (PAGESIZE_8K << TTE_SIZE_SHIFT) | TTE_CP | \
@@ -432 +435 @@
 #endif /* CONFIG_VIRT_IDX_DCACHE */
 
-/*
- * This variable is used by the fast_data_access_MMU_miss trap handler.
- * It allows us to save one precious instruction slot of this handler.
- */
-SYMBOL(tlb_tag_access_context_mask)
-        .quad TLB_TAG_ACCESS_CONTEXT_MASK
-