diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-03 01:51:31 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-03 01:51:31 (GMT) |
| commit | b8ef289daa313b3e5eb6564ed1c2758ddb6e3d6f (patch) | |
| tree | 6e1dd8490bcf311ad49f8a3901f2f112aa7d19c8 /arch/s390/include/asm/tlb.h | |
| parent | d54cdc8ca7aabc69e145a62155855db42b04ed0b (diff) | |
| parent | d9c11b1e8aade25d7d75fb8f344e68e1301822e4 (diff) | |
| download | linux-b8ef289daa313b3e5eb6564ed1c2758ddb6e3d6f.tar.xz | |
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
[S390] reset default for CONFIG_CHSC_SCH
[S390] qdio: prevent compile warning under CONFIG_32BIT
[S390] use asm-generic/cacheflush.h
[S390] tlb: fix build error caused by THP
[S390] missing sacf in uaccess
[S390] pgtable_list corruption
[S390] dasd: prevent panic with unresumed devices
Diffstat (limited to 'arch/s390/include/asm/tlb.h')
| -rw-r--r-- | arch/s390/include/asm/tlb.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/include/asm/tlb.h b/arch/s390/include/asm/tlb.h index f1f644f..9074a54 100644 --- a/arch/s390/include/asm/tlb.h +++ b/arch/s390/include/asm/tlb.h @@ -22,6 +22,7 @@ */ #include <linux/mm.h> +#include <linux/pagemap.h> #include <linux/swap.h> #include <asm/processor.h> #include <asm/pgalloc.h> |