diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2013-05-09 17:56:40 +0200 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2013-05-09 17:56:40 +0200 |
| commit | 5e0e61dd2c89c673f89fb57dcd3cc746dc0c1706 (patch) | |
| tree | 5ebe6156cbc8620625b736a5c9f4d3f47e6d9ebc /arch/mips/kernel/binfmt_elfo32.c | |
| parent | 9b3539e0e545e4c2f338acfc1ce52033a6f5e7f7 (diff) | |
| parent | 50c8308538dc9671490d6cb65259ef0ed79f5d13 (diff) | |
Merge branch 'next/kvm' into mips-for-linux-next
Diffstat (limited to 'arch/mips/kernel/binfmt_elfo32.c')
| -rw-r--r-- | arch/mips/kernel/binfmt_elfo32.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/mips/kernel/binfmt_elfo32.c b/arch/mips/kernel/binfmt_elfo32.c index 556a4357d7f..97c5a1668e5 100644 --- a/arch/mips/kernel/binfmt_elfo32.c +++ b/arch/mips/kernel/binfmt_elfo32.c @@ -48,7 +48,11 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG]; __res; \ }) +#ifdef CONFIG_KVM_GUEST +#define TASK32_SIZE 0x3fff8000UL +#else #define TASK32_SIZE 0x7fff8000UL +#endif #undef ELF_ET_DYN_BASE #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2) |