Changeset b077886e in mainline for kernel/arch/ia64/include/asm.h

Timestamp:

2009-09-13T23:41:37Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

99e5526, c35aabe

Parents:

3052ff4 (diff), 2ac62cf (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/ia64/include/asm.h (modified) (1 diff)

kernel/arch/ia64/include/asm.h

@@ -422 +422 @@
         asm volatile (
                 "rsm %[mask]\n"
+                ";;\n"
+                "srlz.d\n"
                 :: [mask] "i" (PSR_PK_MASK)
         );