Changeset d7ff048 in mainline for kernel/arch/ia32/src/boot/boot.S

Timestamp:

2011-10-08T13:08:53Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

bf08ff0

Parents:

8367d1d (diff), 80099c19 (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.

Message:

Merge mainline changes

File:

• kernel/arch/ia32/src/boot/boot.S (modified) (3 diffs)

kernel/arch/ia32/src/boot/boot.S

@@ -2 +2 @@
  * Copyright (c) 2001 Jakub Jermar
  * Copyright (c) 2005 Martin Decky
+ * Copyright (c) 2011 Martin Sucha
  * All rights reserved.
  *
@@ -124 +125 @@
                 /* Map kernel and turn paging on */
                 pm_status $status_non_pse
-                call map_kernel
+                call map_kernel_non_pse
         
         stack_init:
@@ -195 +196 @@
  *
  */
-.global map_kernel
-map_kernel:
+map_kernel_non_pse:
         /* Paging features */
         movl %cr4, %ecx