diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-15 15:42:11 +0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-15 15:42:11 +0700 |
| commit | 2e67c56248b776c0a546925c796cdb167ee4d7a0 (patch) | |
| tree | 1532ff3d2a452ed52b732fba9878846494e863e1 /include | |
| parent | Merge tag 'md/3.13-fixes' of git://neil.brown.name/md (diff) | |
| parent | lib/percpu_counter.c: fix __percpu_counter_add() (diff) | |
| download | linux-dev-2e67c56248b776c0a546925c796cdb167ee4d7a0.tar.xz linux-dev-2e67c56248b776c0a546925c796cdb167ee4d7a0.zip | |
Merge branch 'akpm' (incoming from Andrew)
Merge patches from Andrew Morton:
"Six fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
lib/percpu_counter.c: fix __percpu_counter_add()
crash_dump: fix compilation error (on MIPS at least)
mm: fix crash when using XFS on loopback
MIPS: fix blast_icache32 on loongson2
MIPS: fix case mismatch in local_r4k_flush_icache_range()
nilfs2: fix segctor bug that causes file system corruption
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/crash_dump.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/crash_dump.h b/include/linux/crash_dump.h index fe68a5a98583..7032518f8542 100644 --- a/include/linux/crash_dump.h +++ b/include/linux/crash_dump.h @@ -6,6 +6,8 @@ #include <linux/proc_fs.h> #include <linux/elf.h> +#include <asm/pgtable.h> /* for pgprot_t */ + #define ELFCORE_ADDR_MAX (-1ULL) #define ELFCORE_ADDR_ERR (-2ULL) |