diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-11 09:22:27 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-11 09:22:27 -0800 |
| commit | 9b80b11c3faa460cf42904a1e368bf2cd075aff6 (patch) | |
| tree | ecc349bbb90856c97be1b93cc9595ceea82fe2c5 /include/asm-powerpc/elf.h | |
| parent | b0b7b8eac33dc0f58ce9e7b7a61cf6529ee0b38c (diff) | |
| parent | 271c3f35bd36613513e2c2cc90dc914a84df116e (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'include/asm-powerpc/elf.h')
| -rw-r--r-- | include/asm-powerpc/elf.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/include/asm-powerpc/elf.h b/include/asm-powerpc/elf.h index feac3458d71..3dcd65edf97 100644 --- a/include/asm-powerpc/elf.h +++ b/include/asm-powerpc/elf.h @@ -269,14 +269,12 @@ extern int dcache_bsize; extern int icache_bsize; extern int ucache_bsize; -#ifdef __powerpc64__ +/* vDSO has arch_setup_additional_pages */ +#define ARCH_HAS_SETUP_ADDITIONAL_PAGES struct linux_binprm; -#define ARCH_HAS_SETUP_ADDITIONAL_PAGES /* vDSO has arch_setup_additional_pages */ -extern int arch_setup_additional_pages(struct linux_binprm *bprm, int executable_stack); +extern int arch_setup_additional_pages(struct linux_binprm *bprm, + int executable_stack); #define VDSO_AUX_ENT(a,b) NEW_AUX_ENT(a,b); -#else -#define VDSO_AUX_ENT(a,b) -#endif /* __powerpc64__ */ /* * The requirements here are: |