Re: [PATCH] MIPS: use current instead of task in syscall_get_arch
On 04/11/2014 03:43 AM, Richard Guy Briggs wrote: On 14/04/10, Eric Paris wrote: In commit 6e345746 Markos started using task to determine 64bit vs 32bit instead of it being completely CONFIG based. In commit 5e937a9a we dropped the 'task' argument to syscall_get_arch() across the entire system. This obviously results in a build failure when Linus's and the audit tree were merged. This patch should be applied as part of the merge conflict, as both sides of the merge are correct and the failure happens AT the merge. The fix is simple. The task is always current. Use current. Signed-off-by: Eric Paris epa...@redhat.com Cc: markos.chand...@imgtec.com Cc: Paul Burton paul.bur...@imgtec.com Cc: James Hogan james.ho...@imgtec.com Cc: linux-m...@linux-mips.org Signed-off-by: Richard Guy Briggs r...@redhat.com Looks good to me. Thanks for taking care of that. Reviewed-by: Markos Chandras markos.chand...@imgtec.com -- markos -- Linux-audit mailing list Linux-audit@redhat.com https://www.redhat.com/mailman/listinfo/linux-audit
[PATCH] MIPS: use current instead of task in syscall_get_arch
In commit 6e345746 Markos started using task to determine 64bit vs
32bit instead of it being completely CONFIG based.
In commit 5e937a9a we dropped the 'task' argument to syscall_get_arch()
across the entire system.
This obviously results in a build failure when Linus's and the audit
tree were merged. This patch should be applied as part of the merge
conflict, as both sides of the merge are correct and the failure happens
AT the merge.
The fix is simple. The task is always current. Use current.
Signed-off-by: Eric Paris epa...@redhat.com
Cc: markos.chand...@imgtec.com
Cc: Paul Burton paul.bur...@imgtec.com
Cc: James Hogan james.ho...@imgtec.com
Cc: linux-m...@linux-mips.org
---
arch/mips/include/asm/syscall.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/mips/include/asm/syscall.h b/arch/mips/include/asm/syscall.h
index d79cded..1258884 100644
--- a/arch/mips/include/asm/syscall.h
+++ b/arch/mips/include/asm/syscall.h
@@ -131,7 +131,7 @@ static inline int syscall_get_arch(void)
{
int arch = EM_MIPS;
#ifdef CONFIG_64BIT
- if (!test_tsk_thread_flag(task, TIF_32BIT_REGS))
+ if (!test_tsk_thread_flag(current, TIF_32BIT_REGS))
arch |= __AUDIT_ARCH_64BIT;
#endif
#if defined(__LITTLE_ENDIAN)
--
1.9.0
--
Linux-audit mailing list
Linux-audit@redhat.com
https://www.redhat.com/mailman/listinfo/linux-audit
Re: [PATCH] MIPS: use current instead of task in syscall_get_arch
On 14/04/10, Eric Paris wrote:
In commit 6e345746 Markos started using task to determine 64bit vs
32bit instead of it being completely CONFIG based.
In commit 5e937a9a we dropped the 'task' argument to syscall_get_arch()
across the entire system.
This obviously results in a build failure when Linus's and the audit
tree were merged. This patch should be applied as part of the merge
conflict, as both sides of the merge are correct and the failure happens
AT the merge.
The fix is simple. The task is always current. Use current.
Signed-off-by: Eric Paris epa...@redhat.com
Cc: markos.chand...@imgtec.com
Cc: Paul Burton paul.bur...@imgtec.com
Cc: James Hogan james.ho...@imgtec.com
Cc: linux-m...@linux-mips.org
Signed-off-by: Richard Guy Briggs r...@redhat.com
---
arch/mips/include/asm/syscall.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/mips/include/asm/syscall.h b/arch/mips/include/asm/syscall.h
index d79cded..1258884 100644
--- a/arch/mips/include/asm/syscall.h
+++ b/arch/mips/include/asm/syscall.h
@@ -131,7 +131,7 @@ static inline int syscall_get_arch(void)
{
int arch = EM_MIPS;
#ifdef CONFIG_64BIT
- if (!test_tsk_thread_flag(task, TIF_32BIT_REGS))
+ if (!test_tsk_thread_flag(current, TIF_32BIT_REGS))
arch |= __AUDIT_ARCH_64BIT;
#endif
#if defined(__LITTLE_ENDIAN)
--
1.9.0
- RGB
--
Richard Guy Briggs rbri...@redhat.com
Senior Software Engineer, Kernel Security, AMER ENG Base Operating Systems, Red
Hat
Remote, Ottawa, Canada
Voice: +1.647.777.2635, Internal: (81) 32635, Alt: +1.613.693.0684x3545
--
Linux-audit mailing list
Linux-audit@redhat.com
https://www.redhat.com/mailman/listinfo/linux-audit
