diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-21 12:46:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-21 12:46:48 -0700 |
| commit | cd975ae0ce13e4cbb21f13ae1222bdb6a8996ba0 (patch) | |
| tree | eb3346e529b1fc120d4bb6dd3305e0a9c8698a67 /arch/c6x/include/asm/mmu.h | |
| parent | 881bcabbde8bc13854a2cb30847abe181d31c5fd (diff) | |
| parent | 8ff98b9c993d59d6b396a42266c6d323c8f28cec (diff) | |
Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming
Pull c6x updates from Mark Salter:
"Clean up some c6x Kconfig items and add support for Elf FDPIC loader."
* tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming:
C6X: remove unused config items
C6X: add support to build with BINFMT_ELF_FDPIC
C6X: change main arch kbuild symbol
Diffstat (limited to 'arch/c6x/include/asm/mmu.h')
| -rw-r--r-- | arch/c6x/include/asm/mmu.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/c6x/include/asm/mmu.h b/arch/c6x/include/asm/mmu.h index 41592bf1606..4467e770a1c 100644 --- a/arch/c6x/include/asm/mmu.h +++ b/arch/c6x/include/asm/mmu.h @@ -13,6 +13,10 @@ typedef struct { unsigned long end_brk; +#ifdef CONFIG_BINFMT_ELF_FDPIC + unsigned long exec_fdpic_loadmap; + unsigned long interp_fdpic_loadmap; +#endif } mm_context_t; #endif /* _ASM_C6X_MMU_H */ |