Changeset ab936440 in mainline for kernel/arch/sparc64/src/sun4v/start.S

Timestamp:

2019-02-12T20:42:42Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f31ca47

Parents:

7f7817a9 (diff), 4805495 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:26:18)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:42:42)

Message:

Merge branch 'master' into bdsh_alias

Conflicts:

uspace/app/bdsh/Makefile
uspace/app/bdsh/cmds/modules/modules.h

Ccheck correction and removing header which includes itself

File:

• kernel/arch/sparc64/src/sun4v/start.S (modified) (2 diffs)

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

@@ -162 +162 @@
 
         ! map kernel in context 1
-        set kernel_image_start, %o0                             ! virt. address
+        set kernel_load_address, %o0                            ! virt. address
         set 1, %o1                                              ! context
-        TTE_DATA(kernel_image_start, %l5, %g2, %g3, %o2)        ! TTE data
+        TTE_DATA(kernel_load_address, %l5, %g2, %g3, %o2)       ! TTE data
         set MMU_FLAG_DTLB | MMU_FLAG_ITLB, %o3                  ! MMU flags
         __HYPERCALL_HYPERFAST(MMU_MAP_ADDR)
@@ -181 +181 @@
 
         ! install permanent mapping for kernel in context 0
-        set kernel_image_start, %o0                             ! virtual address
+        set kernel_load_address, %o0                            ! virtual address
         set 0, %o1                                              ! context
-        TTE_DATA(kernel_image_start, %l5, %g2, %g3, %o2)        ! TTE data
+        TTE_DATA(kernel_load_address, %l5, %g2, %g3, %o2)       ! TTE data
         set MMU_FLAG_DTLB | MMU_FLAG_ITLB, %o3                  ! MMU flags
         __HYPERCALL_FAST(MMU_MAP_PERM_ADDR)