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

Commit 01ed102c authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Eric Paris
Browse files

sparc: properly conditionalize use of TIF_32BIT 



After merging the audit tree, today's linux-next build (sparc defconfig)
failed like this:

In file included from include/linux/audit.h:29:0,
                 from mm/mmap.c:33:
arch/sparc/include/asm/syscall.h: In function 'syscall_get_arch':
arch/sparc/include/asm/syscall.h:131:9: error: 'TIF_32BIT' undeclared (first use in this function)
arch/sparc/include/asm/syscall.h:131:9: note: each undeclared identifier is reported only once for each function it appears in

And many more ...

Caused by commit 374c0c054122 ("ARCH: AUDIT: implement syscall_get_arch
for all arches").

This patch wraps the usage of TIF_32BIT in:
   if defined(__sparc__) && defined(__arch64__)
Which solves the build problem.

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Acked-by: default avatarRichard Guy Briggs <rgb@redhat.com>
Signed-off-by: default avatarEric Paris <eparis@redhat.com>
parent 75dddcbd

arch/sparc/include/asm/syscall.h

+4 −0
Original line number Original line Diff line number Diff line
@@ -128,8 +128,12 @@ static inline void syscall_set_arguments(struct task_struct *task, 




static inline int syscall_get_arch(void)

static inline int syscall_get_arch(void)

{

{

#if defined(__sparc__) && defined(__arch64__)

	return test_thread_flag(TIF_32BIT) ? AUDIT_ARCH_SPARC

	return test_thread_flag(TIF_32BIT) ? AUDIT_ARCH_SPARC

					   : AUDIT_ARCH_SPARC64;

					   : AUDIT_ARCH_SPARC64;

#else

	return AUDIT_ARCH_SPARC;

#endif

}

}





#endif /* __ASM_SPARC_SYSCALL_H */
 
#endif /* __ASM_SPARC_SYSCALL_H */