2014-06-11 20:15:18

by Mark Salter

Subject: [PATCH] arm64: fix build error in sigcontext.h

I'm seeing this build failure for arm64:

CC [M] Documentation/filesystems/configfs/configfs_example_macros.o
In file included from /usr/include/bits/sigcontext.h:27:0,
from /usr/include/signal.h:340,
from /usr/include/sys/wait.h:30,
from Documentation/accounting/getdelays.c:24:
.../linux/usr/include/asm/sigcontext.h:61:2: error: unknown type name ‘u64’
u64 esr;
^
make[2]: *** [Documentation/accounting/getdelays] Error 1

This was introduced by commit 15af1942dd61ee23:

arm64: Expose ESR_EL1 information to user when SIGSEGV/SIGBUS

Using __u64 instead of u64 fixes the problem.

Signed-off-by: Mark Salter <[email protected]>
---
arch/arm64/include/uapi/asm/sigcontext.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/include/uapi/asm/sigcontext.h b/arch/arm64/include/uapi/asm/sigcontext.h
index b72cf40..ee469be 100644
--- a/arch/arm64/include/uapi/asm/sigcontext.h
+++ b/arch/arm64/include/uapi/asm/sigcontext.h
@@ -58,7 +58,7 @@ struct fpsimd_context {

struct esr_context {
struct _aarch64_ctx head;
- u64 esr;
+ __u64 esr;
};

#endif /* _UAPI__ASM_SIGCONTEXT_H */
--
1.9.0

2014-06-18 10:10:55

by Catalin Marinas

Subject: Re: [PATCH] arm64: fix build error in sigcontext.h

On Wed, Jun 11, 2014 at 09:14:42PM +0100, Mark Salter wrote:
> I'm seeing this build failure for arm64:
>
> CC [M] Documentation/filesystems/configfs/configfs_example_macros.o
> In file included from /usr/include/bits/sigcontext.h:27:0,
> from /usr/include/signal.h:340,
> from /usr/include/sys/wait.h:30,
> from Documentation/accounting/getdelays.c:24:
> .../linux/usr/include/asm/sigcontext.h:61:2: error: unknown type name ‘u64’
> u64 esr;
> ^
> make[2]: *** [Documentation/accounting/getdelays] Error 1
>
> This was introduced by commit 15af1942dd61ee23:
>
> arm64: Expose ESR_EL1 information to user when SIGSEGV/SIGBUS
>
> Using __u64 instead of u64 fixes the problem.
>
> Signed-off-by: Mark Salter <[email protected]>

Applied. Thanks.

--
Catalin