summaryrefslogtreecommitdiff
path: root/kernels
diff options
context:
space:
mode:
Diffstat (limited to 'kernels')
-rw-r--r--kernels/linux-libre-grsec-xen/0003-grsecurity+Xen-fix-incompatible-pointer-type-warning.patch17
-rw-r--r--kernels/linux-libre-grsec-xen/PKGBUILD15
2 files changed, 28 insertions, 4 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
new file mode 100644
index 000000000..b558531f5
--- /dev/null
+++ b/kernels/linux-libre-grsec-xen/0003-grsecurity+Xen-fix-incompatible-pointer-type-warning.patch
@@ -0,0 +1,17 @@
+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
++++ b/arch/x86/xen/xen-ops.h
+@@ -131,9 +131,9 @@ static inline void __init xen_efi_init(void)
+ extern char name##_end[] __visible; \
+ extern char name##_reloc[] __visible
+
+-DECL_ASM(void, xen_irq_enable_direct, void);
+-DECL_ASM(void, xen_irq_disable_direct, void);
+-DECL_ASM(unsigned long, xen_save_fl_direct, void);
++DECL_ASM(asmlinkage void, xen_irq_enable_direct, void);
++DECL_ASM(asmlinkage void, xen_irq_disable_direct, void);
++DECL_ASM(asmlinkage unsigned long, xen_save_fl_direct, void);
+ DECL_ASM(void, xen_restore_fl_direct, unsigned long);
+
+ /* These are not functions, and cannot be called normally */
diff --git a/kernels/linux-libre-grsec-xen/PKGBUILD b/kernels/linux-libre-grsec-xen/PKGBUILD
index 011b5b7da..880d29386 100644
--- a/kernels/linux-libre-grsec-xen/PKGBUILD
+++ b/kernels/linux-libre-grsec-xen/PKGBUILD
@@ -10,9 +10,9 @@
pkgbase=linux-libre-grsec-xen
_pkgbasever=4.9-gnu
-_pkgver=4.9.10-gnu
+_pkgver=4.9.11-gnu
_grsecver=3.1
-_timestamp=201702162016
+_timestamp=201702181444
_replacesarchkernel=('linux%') # '%' gets replaced with _kernelname
_replacesoldkernels=() # '%' gets replaced with _kernelname
@@ -51,6 +51,7 @@ source=("https://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/l
'change-default-console-loglevel.patch'
'0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch'
'0002-fix-Atmel-maXTouch-touchscreen-support.patch'
+ '0003-grsecurity+Xen-fix-incompatible-pointer-type-warning.patch'
# armv7h patches
"https://repo.parabola.nu/other/rcn-libre-grsec/patches/${_pkgver%-*}/rcn-libre-grsec-${_pkgver%-*}-${rcnrel}.patch"
"https://repo.parabola.nu/other/rcn-libre-grsec/patches/${_pkgver%-*}/rcn-libre-grsec-${_pkgver%-*}-${rcnrel}.patch.sig"
@@ -66,9 +67,9 @@ source=("https://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/l
'0008-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch')
sha512sums=('885eb0a7fab45dc749acb4329b4330a43b704df2d5f2f5aac1811503c132ca53ca49452f9b1cc80b0826c7a4962dbe4937aecb697aa823b2543ba2cabc704816'
'SKIP'
- '6f01e1564a3070ec6725efbc54bdb9b0e3ae2f26418cb170cd948862cbb8ad6c1eac5ff50d980c39773cfce62ba4ef8c9d3c90a53c3f4c232f69521366b7e0fd'
+ 'b2fe1d938a1d1e80bba980d5aec3b38e7d508851d4abcc7b33716bbf9c41acb9bb572e4456dcd88257cf9b616db0b9ddaaeb571a14a9863555ff575f21d2a24a'
'SKIP'
- 'e7429c409353de41e99481932eb100af3adff70c088feab8fe2e49a78d8c008b7ecd7406b2ef49d9171a10c9e8f4473712fd13a829194f0648087672c7b2eadc'
+ '7ad6389d316e8fe75fdceb1dea88749d187ce37cd6d578e9ca568c19a5dcde97c82cf86e467b970b48d71c594ae84d4b37e74e975537f0a8da6418188d206b33'
'SKIP'
'13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3'
'SKIP'
@@ -84,6 +85,7 @@ sha512sums=('885eb0a7fab45dc749acb4329b4330a43b704df2d5f2f5aac1811503c132ca53ca4
'd9d28e02e964704ea96645a5107f8b65cae5f4fb4f537e224e5e3d087fd296cb770c29ac76e0ce95d173bc420ea87fb8f187d616672a60a0cae618b0ef15b8c8'
'02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af'
'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168'
+ '2c9ece9e89203d9d7e1395ee7fcaf00ae6f11219a0b63eaed540ae79bcd982ade065872f35b3f93cfa4fec7de88a51decd316810e952d112c21e178243de1a3d'
'ac7b3bdf2e2b0e534a40cb6b8357b17fdc072b9cf80abb86e8be153da4e42377aac4ac9baff80d286b824a03b27019e5c7d61940e25c16389468aa67ad5e63ca'
'SKIP'
'e04da62f138b24a489daf6ea12759ecb545b77be4dd585983d3abb764f4ac3aa4a9bf4179adddc73032b81e4fa54cbf5dbf173b25dfb1723e7379583b57aa426'
@@ -170,6 +172,11 @@ prepare() {
# http://www.fsfla.org/pipermail/linux-libre/2015-November/003202.html
patch -p1 -i "${srcdir}/0002-fix-Atmel-maXTouch-touchscreen-support.patch"
+ if [ "${CARCH}" = "i686" ]; then
+ # https://forums.grsecurity.net/viewtopic.php?f=3&t=4677&sid=e5d9701a43b2571dd89d00e0d99b71ec
+ patch -p1 -i "${srcdir}/0003-grsecurity+Xen-fix-incompatible-pointer-type-warning.patch"
+ fi
+
cat "${srcdir}/config.${CARCH}" > ./.config
# append pkgrel to extraversion