summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--aarch64-xgene-reset.patch19
-rw-r--r--kernel.spec6
2 files changed, 25 insertions, 0 deletions
diff --git a/aarch64-xgene-reset.patch b/aarch64-xgene-reset.patch
new file mode 100644
index 000000000..ca24401c9
--- /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 7c724ee70..1321581d6 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