diff options
| author | Peter Robinson <pbrobinson@gmail.com> | 2014-06-13 20:34:23 +0100 |
|---|---|---|
| committer | Peter Robinson <pbrobinson@gmail.com> | 2014-06-13 20:34:23 +0100 |
| commit | 9e4abbff7ce0fca61ce5980d4894879741080881 (patch) | |
| tree | 70c479b31ad8cc54764e000fbaefa0391895a09d | |
| parent | 3bd5ee3cc1ae192de7796f918b7419af992ce82d (diff) | |
| download | kernel-9e4abbff7ce0fca61ce5980d4894879741080881.tar.gz kernel-9e4abbff7ce0fca61ce5980d4894879741080881.tar.xz kernel-9e4abbff7ce0fca61ce5980d4894879741080881.zip | |
Add patch to fix build failure on aarch64
| -rw-r--r-- | aarch64-xgene-reset.patch | 19 | ||||
| -rw-r--r-- | kernel.spec | 6 |
2 files changed, 25 insertions, 0 deletions
diff --git a/aarch64-xgene-reset.patch b/aarch64-xgene-reset.patch new file mode 100644 index 00000000..ca24401c --- /dev/null +++ b/aarch64-xgene-reset.patch @@ -0,0 +1,19 @@ +# Fix build failure on aarch64 secondary kernel. +# Should make it into 3.16 shortly +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 + + diff --git a/kernel.spec b/kernel.spec index 7c724ee7..1321581d 100644 --- a/kernel.spec +++ b/kernel.spec @@ -591,6 +591,8 @@ Patch14010: lis3-improve-handling-of-null-rate.patch Patch15000: nowatchdog-on-virt.patch # ARM64 +# https://lkml.org/lkml/2014/6/11/534 +Patch21000: aarch64-xgene-reset.patch # ARM @@ -1223,6 +1225,7 @@ ApplyOptionalPatch upstream-reverts.patch -R ApplyPatch 0001-lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch # ARM64 +ApplyPatch aarch64-xgene-reset.patch # # ARM @@ -2221,6 +2224,9 @@ fi # ||----w | # || || %changelog +* Fri Jun 13 2014 Peter Robinson <pbrobinson@fedoraproject.org> +- Add patch to fix build failure on aarch64 + * Fri Jun 13 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.16.0-0.rc0.git10.1 - Linux v3.15-9837-g682b7c1c8ea8 |