lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
* 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.
This commit is contained in:
Linus Torvalds
2009-06-01 08:02:31 -07:00
parent 6e42910184 6373fffc5d
commit 65039a31f4
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/sparc/include/asm/elf_64.h
View File

@@ -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) */

2
arch/sparc/lib/csum_copy_from_user.S
View File

@@ -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; \

2
arch/sparc/lib/csum_copy_to_user.S
View File

@@ -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; \