summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2017-02-20 23:51:45 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2017-02-20 23:54:47 -0300
commit531380570437cffdc1f2c9e8e7683f6f5d41ee37 (patch)
tree99b043212a829970177744481d3b7b4358bd7166
parent9360137e5a5e55b957cfe6677bb5c396e4595b22 (diff)
downloadabslibre-531380570437cffdc1f2c9e8e7683f6f5d41ee37.tar.gz
abslibre-531380570437cffdc1f2c9e8e7683f6f5d41ee37.tar.bz2
abslibre-531380570437cffdc1f2c9e8e7683f6f5d41ee37.zip
linux-libre-grsec-xen: minor fix -> https://forums.grsecurity.net/viewtopic.php?f=3&t=4677&p=16956#p16957
-rw-r--r--kernels/linux-libre-grsec-xen/0003-grsecurity+Xen-fix-incompatible-pointer-type-warning.patch12
-rw-r--r--kernels/linux-libre-grsec-xen/PKGBUILD2
2 files changed, 13 insertions, 1 deletions
diff --git a/kernels/linux-libre-grsec-xen/0003-grsecurity+Xen-fix-incompatible-pointer-type-warning.patch b/kernels/linux-libre-grsec-xen/0003-grsecurity+Xen-fix-incompatible-pointer-type-warning.patch
index b558531f5..36f7152e0 100644
--- a/kernels/linux-libre-grsec-xen/0003-grsecurity+Xen-fix-incompatible-pointer-type-warning.patch
+++ b/kernels/linux-libre-grsec-xen/0003-grsecurity+Xen-fix-incompatible-pointer-type-warning.patch
@@ -1,3 +1,15 @@
+diff --git a/arch/x86/xen/xen-asm_32.S b/arch/x86/xen/xen-asm_32.S
+index c8fd8e7b4..4292c1918 100644
+--- a/arch/x86/xen/xen-asm_32.S
++++ b/arch/x86/xen/xen-asm_32.S
+@@ -15,6 +15,7 @@
+ #include <asm/processor-flags.h>
+ #include <asm/segment.h>
+ #include <asm/asm.h>
++#include <asm/alternative-asm.h>
+
+ #include <xen/interface/xen.h>
+
diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h
index f1221bcab..c58120be8 100644
--- a/arch/x86/xen/xen-ops.h
diff --git a/kernels/linux-libre-grsec-xen/PKGBUILD b/kernels/linux-libre-grsec-xen/PKGBUILD
index 880d29386..1b0cfaaf0 100644
--- a/kernels/linux-libre-grsec-xen/PKGBUILD
+++ b/kernels/linux-libre-grsec-xen/PKGBUILD
@@ -85,7 +85,7 @@ sha512sums=('885eb0a7fab45dc749acb4329b4330a43b704df2d5f2f5aac1811503c132ca53ca4
'd9d28e02e964704ea96645a5107f8b65cae5f4fb4f537e224e5e3d087fd296cb770c29ac76e0ce95d173bc420ea87fb8f187d616672a60a0cae618b0ef15b8c8'
'02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af'
'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168'
- '2c9ece9e89203d9d7e1395ee7fcaf00ae6f11219a0b63eaed540ae79bcd982ade065872f35b3f93cfa4fec7de88a51decd316810e952d112c21e178243de1a3d'
+ 'd019d1d2913c6c37f7c23d4928cb343317380651ed81d2cde8200fc99d6d6330e3659e3483a06b1b2ac612a1887a4d2f4e2897d8d37342b9d68f5da129759d47'
'ac7b3bdf2e2b0e534a40cb6b8357b17fdc072b9cf80abb86e8be153da4e42377aac4ac9baff80d286b824a03b27019e5c7d61940e25c16389468aa67ad5e63ca'
'SKIP'
'e04da62f138b24a489daf6ea12759ecb545b77be4dd585983d3abb764f4ac3aa4a9bf4179adddc73032b81e4fa54cbf5dbf173b25dfb1723e7379583b57aa426'