Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65039a31 authored Jun 01, 2009 by Linus Torvalds

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc64: Fix section attribute warnings.
  sparc64: Fix SET_PERSONALITY to not clip bits outside of PER_MASK.

parents 6e429101 6373fffc

arch/sparc/include/asm/elf_64.h

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -208,8 +208,9 @@ do { unsigned long new_flags = current_thread_info()->flags; \
	else \		else \
	clear_thread_flag(TIF_ABI_PENDING); \		clear_thread_flag(TIF_ABI_PENDING); \
	/* flush_thread will update pgd cache */ \		/* flush_thread will update pgd cache */ \
	if (current->personality != PER_LINUX32) \		if (personality(current->personality) != PER_LINUX32) \
	set_personality(PER_LINUX); \		set_personality(PER_LINUX \| \
			(current->personality & (~PER_MASK))); \
	} while (0)		} while (0)

	#endif /* !(__ASM_SPARC64_ELF_H) */		#endif /* !(__ASM_SPARC64_ELF_H) */

arch/sparc/lib/csum_copy_from_user.S

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -5,7 +5,7 @@

	#define EX_LD(x) \		#define EX_LD(x) \
	98: x; \		98: x; \
	.section .fixup; \		.section .fixup, "ax"; \
	.align 4; \		.align 4; \
	99: retl; \		99: retl; \
	mov -1, %o0; \		mov -1, %o0; \

arch/sparc/lib/csum_copy_to_user.S

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -5,7 +5,7 @@

	#define EX_ST(x) \		#define EX_ST(x) \
	98: x; \		98: x; \
	.section .fixup; \		.section .fixup,"ax"; \
	.align 4; \		.align 4; \
	99: retl; \		99: retl; \
	mov -1, %o0; \		mov -1, %o0; \