Changeset 0773396 in mainline for kernel/arch/sparc64/include/arch/trap/sun4v/mmu.h

Timestamp:

2013-12-25T13:05:25Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

bc54126c

Parents:

f4a47e52 (diff), 6946f23 (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/sparc64/include/arch/trap/sun4v/mmu.h (modified) (1 diff)

kernel/arch/sparc64/include/arch/trap/sun4v/mmu.h

@@ -102 +102 @@
         nop
 
+        /* exclude pages beyond the end of memory from the identity mapping */
+        sethi %hi(end_of_identity), %g4
+        ldx [%g4 + %lo(end_of_identity)], %g4
+        cmp %g1, %g4
+        bgeu %xcc, 0f
+        nop
+
         /*
          * Installing the identity does not fit into 32 instructions, call