diff options
| author | Erich Eckner <git@eckner.net> | 2019-01-21 09:45:00 +0100 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2019-01-21 09:45:00 +0100 |
| commit | ed46bae36bb918cba935fd474ae28a913fed0618 (patch) | |
| tree | 46af84702f90eaa03c992a7246c4a4ac180540f2 | |
| parent | 9ebc8507d3145fbb01da4976e8a7c4fbaea195ee (diff) | |
| parent | 309945401798d5615fd1afe119737c2682bef9a9 (diff) | |
| download | packages-ed46bae36bb918cba935fd474ae28a913fed0618.tar.xz | |
Merge branch 'master' into i486
| -rw-r--r-- | extra/linux-pae/PKGBUILD | 6 | ||||
| -rw-r--r-- | extra/linux-pae/config | 3 | ||||
| -rw-r--r-- | extra/xf86-video-intel/PKGBUILD | 9 | ||||
| -rw-r--r-- | extra/xf86-video-intel/xf86-video-intel-no-forced-inlining.patch | 12 |
4 files changed, 25 insertions, 5 deletions
diff --git a/extra/linux-pae/PKGBUILD b/extra/linux-pae/PKGBUILD index 62c65f1f..31384646 100644 --- a/extra/linux-pae/PKGBUILD +++ b/extra/linux-pae/PKGBUILD @@ -4,7 +4,7 @@ # Maintainer: Thomas Baechler <thomas@archlinux.org> pkgbase=linux-pae # Build stock -ARCH kernel -pkgver='4.18.7' +pkgver='4.18.8' _srcname=linux-${pkgver} pkgrel='1' arch=('i686') @@ -24,9 +24,9 @@ validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman ) -sha256sums=('f03b425e262a71e5079736706233a4e9afaf77c8462b552b4d6db2d33f5af731' +sha256sums=('f1551bad69ab617708fa8cf3f94545ae03dd350bdeb3065fbcf39c1a7df85494' 'SKIP' - '2675d556a3ab58a9ab24e220d6b495b14717ebd9070aea250278548cb1427e2b' + 'c7209b311fab2453554037977975396d5ef6a2a3b00ea9dccb46a16dfca351bf' 'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21' '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919' 'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65' diff --git a/extra/linux-pae/config b/extra/linux-pae/config index ad3ba813..069b32a7 100644 --- a/extra/linux-pae/config +++ b/extra/linux-pae/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.18.7-1 Kernel Configuration +# Linux/x86 4.18.8-1 Kernel Configuration # # @@ -608,7 +608,6 @@ CONFIG_ZSMALLOC=y # CONFIG_PGTABLE_MAPPING is not set # CONFIG_ZSMALLOC_STAT is not set CONFIG_GENERIC_EARLY_IOREMAP=y -# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set # CONFIG_IDLE_PAGE_TRACKING is not set CONFIG_FRAME_VECTOR=y # CONFIG_PERCPU_STATS is not set diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD new file mode 100644 index 00000000..5db015dd --- /dev/null +++ b/extra/xf86-video-intel/PKGBUILD @@ -0,0 +1,9 @@ +source+=('xf86-video-intel-no-forced-inlining.patch') +sha256sums+=('9f3bafc54f22799c9c653321cb7d16b42f938b0085567b000c6271c8ebeac3e7') + +eval "$( + declare -f prepare | \ + sed ' + /patch/a patch -Np1 -i ../xf86-video-intel-no-forced-inlining.patch + ' +)" diff --git a/extra/xf86-video-intel/xf86-video-intel-no-forced-inlining.patch b/extra/xf86-video-intel/xf86-video-intel-no-forced-inlining.patch new file mode 100644 index 00000000..66bbceea --- /dev/null +++ b/extra/xf86-video-intel/xf86-video-intel-no-forced-inlining.patch @@ -0,0 +1,12 @@ +diff -rauN xf86-video-intel/src/sna/compiler.h xf86-video-intel-no-forced-inlining-patch/src/sna/compiler.h +--- xf86-video-intel/src/sna/compiler.h 2018-09-15 11:20:05.083333262 +0200 ++++ xf86-video-intel-no-forced-inlining-patch/src/sna/compiler.h 2018-09-15 11:21:26.483333263 +0200 +@@ -32,7 +32,7 @@ + #define likely(expr) (__builtin_expect (!!(expr), 1)) + #define unlikely(expr) (__builtin_expect (!!(expr), 0)) + #define noinline __attribute__((noinline)) +-#define force_inline inline __attribute__((always_inline)) ++#define force_inline inline + #define fastcall __attribute__((regparm(3))) + #define must_check __attribute__((warn_unused_result)) + #define constant __attribute__((const)) |