diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2016-05-17 08:17:59 +0200 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-05-17 08:17:59 +0200 |
| commit | 0e0162bb8c008fa7742f69d4d4982c8a37b88f95 (patch) | |
| tree | 4b230ab63b5698a44d2948e70a6cc22405c351e9 /arch/s390/include/asm/mmu.h | |
| parent | ext4: switch to ->iterate_shared() (diff) | |
| parent | ovl: ignore permissions on underlying lookup (diff) | |
| download | linux-0e0162bb8c008fa7742f69d4d4982c8a37b88f95.tar.xz linux-0e0162bb8c008fa7742f69d4d4982c8a37b88f95.zip | |
Merge branch 'ovl-fixes' into for-linus
Backmerge to resolve a conflict in ovl_lookup_real();
"ovl_lookup_real(): use lookup_one_len_unlocked()" instead,
but it was too late in the cycle to rebase.
Diffstat (limited to 'arch/s390/include/asm/mmu.h')
| -rw-r--r-- | arch/s390/include/asm/mmu.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/include/asm/mmu.h b/arch/s390/include/asm/mmu.h index d29ad9545b41..081b2ad99d73 100644 --- a/arch/s390/include/asm/mmu.h +++ b/arch/s390/include/asm/mmu.h @@ -11,7 +11,7 @@ typedef struct { spinlock_t list_lock; struct list_head pgtable_list; struct list_head gmap_list; - unsigned long asce_bits; + unsigned long asce; unsigned long asce_limit; unsigned long vdso_base; /* The mmu context allocates 4K page tables. */ |