x86/mm: Use/Fix PCID to optimize user/kernel switches

[sfrench/cifs-2.6.git] / arch / x86 / entry / entry_64_compat.S

diff --git a/arch/x86/entry/entry_64_compat.S b/arch/x86/entry/entry_64_compat.S
index 05238b29895eea0eb0c4af182953d47369926695..40f17009ec20cd5e4eff6147aa0468232d47e096 100644 (file)
--- a/arch/x86/entry/entry_64_compat.S
+++ b/arch/x86/entry/entry_64_compat.S
@@ -275,9 +275,9 @@ sysret32_from_system_call:
         * switch until after after the last reference to the process
         * stack.
         *
-        * %r8 is zeroed before the sysret, thus safe to clobber.
+        * %r8/%r9 are zeroed before the sysret, thus safe to clobber.
         */
-       SWITCH_TO_USER_CR3 scratch_reg=%r8
+       SWITCH_TO_USER_CR3_NOSTACK scratch_reg=%r8 scratch_reg2=%r9
 
        xorq    %r8, %r8
        xorq    %r9, %r9