diff options
| author | Chris Mason <clm@fb.com> | 2016-05-17 23:43:19 +0200 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2016-05-17 23:43:19 +0200 |
| commit | c315ef8d9db7f1a0ebd023a395ebdfde1c68057e (patch) | |
| tree | 501e1fc558de9e56b78e457aa928fa255e660486 /arch/s390/include/asm/mmu.h | |
| parent | Merge branch 'for-chris-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | Btrfs: add semaphore to synchronize direct IO writes with fsync (diff) | |
| download | linux-c315ef8d9db7f1a0ebd023a395ebdfde1c68057e.tar.xz linux-c315ef8d9db7f1a0ebd023a395ebdfde1c68057e.zip | |
Merge branch 'for-chris-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/fdmanana/linux into for-linus-4.7
Signed-off-by: Chris Mason <clm@fb.com>
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. */ |