sparc: Don't leak context bits into thread->fault_address

[deliverable/linux.git] / arch / sparc / kernel / ktlb.S

diff --git a/arch/sparc/kernel/ktlb.S b/arch/sparc/kernel/ktlb.S
index ef0d8e9e1210e6dffbc184a8ce426c708a968062..f22bec0db64549ace3b68d645b8d23db87ec1b5b 100644 (file)
--- a/arch/sparc/kernel/ktlb.S
+++ b/arch/sparc/kernel/ktlb.S
@@ -20,6 +20,10 @@ kvmap_itlb:
        mov             TLB_TAG_ACCESS, %g4
        ldxa            [%g4] ASI_IMMU, %g4
 
+       /* The kernel executes in context zero, therefore we do not
+        * need to clear the context ID bits out of %g4 here.
+        */
+
        /* sun4v_itlb_miss branches here with the missing virtual
         * address already loaded into %g4
         */
@@ -128,6 +132,10 @@ kvmap_dtlb:
        mov             TLB_TAG_ACCESS, %g4
        ldxa            [%g4] ASI_DMMU, %g4
 
+       /* The kernel executes in context zero, therefore we do not
+        * need to clear the context ID bits out of %g4 here.
+        */
+
        /* sun4v_dtlb_miss branches here with the missing virtual
         * address already loaded into %g4
         */
@@ -251,6 +259,10 @@ kvmap_dtlb_longpath:
        nop
        .previous
 
+       /* The kernel executes in context zero, therefore we do not
+        * need to clear the context ID bits out of %g5 here.
+        */
+
        be,pt   %xcc, sparc64_realfault_common
         mov    FAULT_CODE_DTLB, %g4
        ba,pt   %xcc, winfix_trampoline