Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 (5ae1d955) · Commits · 戴 / test

arch/ia64/include/asm/elf.h

+3 −1

Original line number	Diff line number	Diff line
		@@ -201,7 +201,9 @@ extern void ia64_elf_core_copy_regs (struct pt_regs *src, elf_gregset_t dst);
		relevant until we have real hardware to play with... */
		#define ELF_PLATFORM NULL

		#define SET_PERSONALITY(ex) set_personality(PER_LINUX)
		#define SET_PERSONALITY(ex) \
		set_personality((current->personality & ~PER_MASK) \| PER_LINUX)

		#define elf_read_implies_exec(ex, executable_stack) \
		((executable_stack!=EXSTACK_DISABLE_X) && ((ex).e_flags & EF_IA_64_LINUX_EXECUTABLE_STACK) != 0)