summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorgraysky2017-08-25 14:15:20 -0400
committergraysky2017-08-25 14:15:20 -0400
commiteda4c488626f3e315bbb97e5ab8fc0afdcf7ef8f (patch)
tree608b50e2c10648613846bb9b176fcc3aa2ceaa63
parentc4a65be8af0eea00db0b90c87f559c8fa7dca2e8 (diff)
downloadaur-eda4c488626f3e315bbb97e5ab8fc0afdcf7ef8f.tar.gz
Update to 4.12.9-2
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD8
-rw-r--r--mm-Revert-x86_64-and-arm64-ELF_ET_DYN_BASE-base.patch35
3 files changed, 2 insertions, 45 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e4b1c33a543..23a3749d0f4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Fri Aug 25 18:09:54 UTC 2017
+# Fri Aug 25 18:15:20 UTC 2017
pkgbase = linux-ck
pkgver = 4.12.9
pkgrel = 2
@@ -24,7 +24,6 @@ pkgbase = linux-ck
source = linux.preset
source = bonding-require-speed-duplex-only-for-802.3ad-alb-an.patch
source = bonding-ratelimit-failed-speed-duplex-update-warning.patch
- source = mm-Revert-x86_64-and-arm64-ELF_ET_DYN_BASE-base.patch
sha256sums = a45c3becd4d08ce411c14628a949d08e2433d8cdeca92036c7013980e93858ab
sha256sums = SKIP
sha256sums = 32c5df9c032d039d17cee0397b74583000053089e1c2fdfdc77acc2edc2d2e76
@@ -37,7 +36,6 @@ pkgbase = linux-ck
sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65
sha256sums = 48e0505438bb4ccc7a0e050a896122b490e8f1b1446aa3833841a9d4d7853d68
sha256sums = fc606711a922638d5cc4358f47f69f554d9e6eab1cec91f0b49f00911f399722
- sha256sums = b830ce777543c0edd20a77d70f204c095f2429bb37151cd4a8c9dfae2af8d51a
pkgname = linux-ck
pkgdesc = The Linux-ck kernel and modules with the ck2 patchset featuring MuQSS CPU scheduler v0.160
diff --git a/PKGBUILD b/PKGBUILD
index 844b93fa9cd..7ecba3cff62 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -62,7 +62,6 @@ source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
'linux.preset'
'bonding-require-speed-duplex-only-for-802.3ad-alb-an.patch'
'bonding-ratelimit-failed-speed-duplex-update-warning.patch'
- 'mm-Revert-x86_64-and-arm64-ELF_ET_DYN_BASE-base.patch'
)
sha256sums=('a45c3becd4d08ce411c14628a949d08e2433d8cdeca92036c7013980e93858ab'
'SKIP'
@@ -75,8 +74,7 @@ sha256sums=('a45c3becd4d08ce411c14628a949d08e2433d8cdeca92036c7013980e93858ab'
'834bd254b56ab71d73f59b3221f056c72f559553c04718e350ab2a3e2991afe0'
'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
'48e0505438bb4ccc7a0e050a896122b490e8f1b1446aa3833841a9d4d7853d68'
- 'fc606711a922638d5cc4358f47f69f554d9e6eab1cec91f0b49f00911f399722'
- 'b830ce777543c0edd20a77d70f204c095f2429bb37151cd4a8c9dfae2af8d51a')
+ 'fc606711a922638d5cc4358f47f69f554d9e6eab1cec91f0b49f00911f399722')
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
'647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
@@ -94,10 +92,6 @@ prepare() {
patch -Np1 -i ../bonding-ratelimit-failed-speed-duplex-update-warning.patch
patch -Np1 -i ../bonding-require-speed-duplex-only-for-802.3ad-alb-an.patch
- # https://github.com/google/sanitizers/issues/837
- # https://patchwork.kernel.org/patch/9886105/
- patch -Np1 -i ../mm-Revert-x86_64-and-arm64-ELF_ET_DYN_BASE-base.patch
-
# fix naming schema in EXTRAVERSION of ck patch set
sed -i -re "s/^(.EXTRAVERSION).*$/\1 = /" "${srcdir}/${_ckpatchname}"
diff --git a/mm-Revert-x86_64-and-arm64-ELF_ET_DYN_BASE-base.patch b/mm-Revert-x86_64-and-arm64-ELF_ET_DYN_BASE-base.patch
deleted file mode 100644
index bf089e08adc..00000000000
--- a/mm-Revert-x86_64-and-arm64-ELF_ET_DYN_BASE-base.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h
-index acae781f7359..3288c2b36731 100644
---- a/arch/arm64/include/asm/elf.h
-+++ b/arch/arm64/include/asm/elf.h
-@@ -114,10 +114,10 @@
-
- /*
- * This is the base location for PIE (ET_DYN with INTERP) loads. On
-- * 64-bit, this is raised to 4GB to leave the entire 32-bit address
-+ * 64-bit, this is above 4GB to leave the entire 32-bit address
- * space open for things that want to use the area for 32-bit pointers.
- */
--#define ELF_ET_DYN_BASE 0x100000000UL
-+#define ELF_ET_DYN_BASE (2 * TASK_SIZE_64 / 3)
-
- #ifndef __ASSEMBLY__
-
-diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h
-index 1c18d83d3f09..9aeb91935ce0 100644
---- a/arch/x86/include/asm/elf.h
-+++ b/arch/x86/include/asm/elf.h
-@@ -247,11 +247,11 @@ extern int force_personality32;
-
- /*
- * This is the base location for PIE (ET_DYN with INTERP) loads. On
-- * 64-bit, this is raised to 4GB to leave the entire 32-bit address
-+ * 64-bit, this is above 4GB to leave the entire 32-bit address
- * space open for things that want to use the area for 32-bit pointers.
- */
- #define ELF_ET_DYN_BASE (mmap_is_ia32() ? 0x000400000UL : \
-- 0x100000000UL)
-+ (TASK_SIZE / 3 * 2))
-
- /* This yields a mask that user programs can use to figure out what
- instruction set this CPU supports. This could be done in user space,