diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-18 10:36:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-18 10:36:37 -0700 |
| commit | 3c6a279ffccd0c414ecd1d5eb4670ed70072c526 (patch) | |
| tree | 261e352318b779d7643cdcf79bb95a909389531e /arch/mips/kernel/crash_dump.c | |
| parent | 8f05bde9bd6da80365495369738ab869c1f8bcac (diff) | |
| parent | 2792d42fe69e098a6e08ed814f49953b52874805 (diff) | |
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS fixes from Ralf Baechle:
"Patching up across the field. The reversion of the two ASID patches
is particularly important as it was breaking many platforms."
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
MIPS: ralink: use the dwc2 driver for the rt305x USB controller
MIPS: Extract schedule_mfi info from __schedule
MIPS: Fix sibling call handling in get_frame_info
MIPS: MSP71xx: remove inline marking of EXPORT_SYMBOL functions
MIPS: Make virt_to_phys() work for all unmapped addresses.
MIPS: Fix build error for crash_dump.c in 3.10-rc1
MIPS: Xway: Fix clk leak
Revert "MIPS: Allow ASID size to be determined at boot time."
Revert "MIPS: microMIPS: Support dynamic ASID sizing."
Diffstat (limited to 'arch/mips/kernel/crash_dump.c')
| -rw-r--r-- | arch/mips/kernel/crash_dump.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/kernel/crash_dump.c b/arch/mips/kernel/crash_dump.c index 35bed0d2342..3be9e7bb30f 100644 --- a/arch/mips/kernel/crash_dump.c +++ b/arch/mips/kernel/crash_dump.c @@ -2,6 +2,7 @@ #include <linux/bootmem.h> #include <linux/crash_dump.h> #include <asm/uaccess.h> +#include <linux/slab.h> static int __init parse_savemaxmem(char *p) { |