Merge branch 'akpm' (patches from Andrew)

[sfrench/cifs-2.6.git] / arch / s390 / mm / fault.c

diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c
index d7d6be283d9425779eec60c8561308de1252a720..ff16ce0d04ee019f73dfc4ebfd3d284727dd45f2 100644 (file)
--- a/arch/s390/mm/fault.c
+++ b/arch/s390/mm/fault.c
@@ -115,7 +115,7 @@ static void dump_pagetable(unsigned long asce, unsigned long address)
                pr_cont("R1:%016lx ", *table);
                if (*table & _REGION_ENTRY_INVALID)
                        goto out;
-               table = (unsigned long *)(*table & _REGION_ENTRY_ORIGIN);
+               table = __va(*table & _REGION_ENTRY_ORIGIN);
                fallthrough;
        case _ASCE_TYPE_REGION2:
                table += (address & _REGION2_INDEX) >> _REGION2_SHIFT;
@@ -124,7 +124,7 @@ static void dump_pagetable(unsigned long asce, unsigned long address)
                pr_cont("R2:%016lx ", *table);
                if (*table & _REGION_ENTRY_INVALID)
                        goto out;
-               table = (unsigned long *)(*table & _REGION_ENTRY_ORIGIN);
+               table = __va(*table & _REGION_ENTRY_ORIGIN);
                fallthrough;
        case _ASCE_TYPE_REGION3:
                table += (address & _REGION3_INDEX) >> _REGION3_SHIFT;
@@ -133,7 +133,7 @@ static void dump_pagetable(unsigned long asce, unsigned long address)
                pr_cont("R3:%016lx ", *table);
                if (*table & (_REGION_ENTRY_INVALID | _REGION3_ENTRY_LARGE))
                        goto out;
-               table = (unsigned long *)(*table & _REGION_ENTRY_ORIGIN);
+               table = __va(*table & _REGION_ENTRY_ORIGIN);
                fallthrough;
        case _ASCE_TYPE_SEGMENT:
                table += (address & _SEGMENT_INDEX) >> _SEGMENT_SHIFT;
@@ -142,7 +142,7 @@ static void dump_pagetable(unsigned long asce, unsigned long address)
                pr_cont("S:%016lx ", *table);
                if (*table & (_SEGMENT_ENTRY_INVALID | _SEGMENT_ENTRY_LARGE))
                        goto out;
-               table = (unsigned long *)(*table & _SEGMENT_ENTRY_ORIGIN);
+               table = __va(*table & _SEGMENT_ENTRY_ORIGIN);
        }
        table += (address & _PAGE_INDEX) >> _PAGE_SHIFT;
        if (bad_address(table))