diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-03-30 11:22:39 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-03-30 11:22:39 +1100 |
| commit | 4aae044607bf32d954567e11de3be8e395433421 (patch) | |
| tree | c5e6f65ac5a71affaa927a938ddbe42cd22529bd /arch/sh/include/asm/elf.h | |
| parent | 11cdf2c64bf4658b637b7526c089255fabdc139c (diff) | |
| parent | 6ae6650232ddcf2f50e8817acd63cde37cf1d093 (diff) | |
Merge remote branch 'sh/master'
Diffstat (limited to 'arch/sh/include/asm/elf.h')
| -rw-r--r-- | arch/sh/include/asm/elf.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/sh/include/asm/elf.h b/arch/sh/include/asm/elf.h index ac04255022b6..ce830faeebbf 100644 --- a/arch/sh/include/asm/elf.h +++ b/arch/sh/include/asm/elf.h @@ -211,7 +211,9 @@ extern void __kernel_vsyscall; #define VSYSCALL_AUX_ENT \ if (vdso_enabled) \ - NEW_AUX_ENT(AT_SYSINFO_EHDR, VDSO_BASE); + NEW_AUX_ENT(AT_SYSINFO_EHDR, VDSO_BASE); \ + else \ + NEW_AUX_ENT(AT_IGNORE, 0); #else #define VSYSCALL_AUX_ENT #endif /* CONFIG_VSYSCALL */ @@ -219,7 +221,7 @@ extern void __kernel_vsyscall; #ifdef CONFIG_SH_FPU #define FPU_AUX_ENT NEW_AUX_ENT(AT_FPUCW, FPSCR_INIT) #else -#define FPU_AUX_ENT +#define FPU_AUX_ENT NEW_AUX_ENT(AT_IGNORE, 0) #endif extern int l1i_cache_shape, l1d_cache_shape, l2_cache_shape; |