summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorHouge Langley2021-03-05 17:41:38 +0800
committerHouge Langley2021-03-05 17:41:38 +0800
commitc451e1c98fbb447db8c99905d2a368ef316ab49b (patch)
tree2beed77a714d4cb1ad535a438a514477f272db72
parentaf6a860d5ccf99b53c583587ca4ba8220ddaf0d5 (diff)
downloadaur-c451e1c98fbb447db8c99905d2a368ef316ab49b.tar.gz
Update To v5.11.3
-rw-r--r--.SRCINFO12
-rw-r--r--0002-UKSM.patch25
-rw-r--r--PKGBUILD12
3 files changed, 24 insertions, 25 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 19ed4c0f531..c343cdca846 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = linux-manjaro-xanmod-cacule-uksm
pkgdesc = Linux Xanmod Cacule UKSM
- pkgver = 5.11.1
+ pkgver = 5.11.3
pkgrel = 1
url = http://www.xanmod.org/
arch = x86_64
@@ -38,18 +38,18 @@ pkgbase = linux-manjaro-xanmod-cacule-uksm
options = !strip
source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz
source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.sign
- source = https://github.com/xanmod/linux/releases/download/5.11.1-xanmod2-cacule/patch-5.11.1-xanmod2-cacule.xz
+ source = https://github.com/xanmod/linux/releases/download/5.11.3-xanmod1-cacule/patch-5.11.3-xanmod1-cacule.xz
source = choose-gcc-optimization.sh
- source = https://gitlab.manjaro.org/packages/core/linux511/-/archive/2baf9050c4d9887fcde0d015811f81059c215959/linux511-2baf9050c4d9887fcde0d015811f81059c215959.tar.gz
+ source = https://gitlab.manjaro.org/packages/core/linux511/-/archive/486a2392d4ffd9b93bc3127629e3da2c9e3b6f1b/linux511-486a2392d4ffd9b93bc3127629e3da2c9e3b6f1b.tar.gz
source = 0002-UKSM.patch
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
sha256sums = 04f07b54f0d40adfab02ee6cbd2a942c96728d87c1ef9e120d0cb9ba3fe067b4
sha256sums = b8bc4f6312bdc086c0fecd1cce1ab1ee12b7b4eff63f88239a65461d9ec5e91b
- sha256sums = ef0f0d9bc504a77c7e11c07899b12193854bafaa8c8354ab08e6005bf3b68e7f
+ sha256sums = 41635dd87f8b77c370339f148e4a6888714c016624abe6189c5020f2da4487e6
sha256sums = e840e41f0f91108f63fd6e085c93b02daa78729268bc31be7be7fb355203e38a
- sha256sums = 272a4ea69af64f5978015483d8c2d47e58572dd0aa87d8dd1a90cc4284e6b2f4
- sha256sums = 6ae9b0f994c8cea6ddbaaa570a2570d8489643b33b61c68090670c241a0cd3cc
+ sha256sums = 8e48c5d019a8dafcc1d68b225a09251e811a8e4c0bef073f3cb60a8032f32001
+ sha256sums = f00a84fd382d63cd0d47d6fd8ef6c8608b1c83ff9d6dbdd32cb985898afbbf58
pkgname = linux-manjaro-xanmod-cacule-uksm
pkgdesc = The Linux kernel and modules with Xanmod and Manjaro patches (Bootsplash support). Ashmem and binder are enabled
diff --git a/0002-UKSM.patch b/0002-UKSM.patch
index 9a8be4e2839..bbd3972d714 100644
--- a/0002-UKSM.patch
+++ b/0002-UKSM.patch
@@ -1,13 +1,13 @@
-From 54c4e5ae42627a450d15d126302ecc5509ba1e26 Mon Sep 17 00:00:00 2001
+From f785a5c37288394e6e74308bf35c38dcfa665201 Mon Sep 17 00:00:00 2001
From: Piotr Gorski <lucjan.lucjanov@gmail.com>
-Date: Wed, 16 Dec 2020 01:40:01 +0100
+Date: Mon, 22 Feb 2021 18:08:28 +0100
Subject: [PATCH] UKSM for 5.11
Signed-off-by: Piotr Gorski <lucjan.lucjanov@gmail.com>
---
Documentation/vm/uksm.txt | 61 +
fs/exec.c | 1 +
- fs/proc/meminfo.c | 5 +-
+ fs/proc/meminfo.c | 4 +
include/linux/ksm.h | 43 +-
include/linux/mm_types.h | 3 +
include/linux/mmzone.h | 3 +
@@ -24,7 +24,7 @@ Signed-off-by: Piotr Gorski <lucjan.lucjanov@gmail.com>
mm/mmap.c | 37 +
mm/uksm.c | 5614 +++++++++++++++++++++++++++++++++++
mm/vmstat.c | 3 +
- 19 files changed, 6539 insertions(+), 27 deletions(-)
+ 19 files changed, 6539 insertions(+), 26 deletions(-)
create mode 100644 Documentation/vm/uksm.txt
create mode 100644 include/linux/sradix-tree.h
create mode 100644 include/linux/uksm.h
@@ -111,21 +111,20 @@ index 5d4d52039..86f9f6526 100644
#include <linux/uaccess.h>
#include <asm/mmu_context.h>
diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
-index d6fc74619..7b929bbd2 100644
+index d6fc74619..e173b259f 100644
--- a/fs/proc/meminfo.c
+++ b/fs/proc/meminfo.c
-@@ -108,7 +108,10 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
+@@ -108,6 +108,10 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
#endif
show_val_kb(m, "PageTables: ",
global_node_page_state(NR_PAGETABLE));
--
+#ifdef CONFIG_UKSM
+ show_val_kb(m, "KsmZeroPages: ",
+ global_zone_page_state(NR_UKSM_ZERO_PAGES));
+#endif
+
show_val_kb(m, "NFS_Unstable: ", 0);
show_val_kb(m, "Bounce: ",
- global_zone_page_state(NR_BOUNCE));
diff --git a/include/linux/ksm.h b/include/linux/ksm.h
index 161e8164a..f0dbdf3c9 100644
--- a/include/linux/ksm.h
@@ -504,7 +503,7 @@ index 000000000..bb8651f53
+#endif /* !CONFIG_UKSM */
+#endif /* __LINUX_UKSM_H */
diff --git a/kernel/fork.c b/kernel/fork.c
-index e39846a73..aaab0f873 100644
+index d66cd1014..5e0081886 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -588,7 +588,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
@@ -1012,10 +1011,10 @@ index 000000000..ab21e6309
+ return 0;
+}
diff --git a/mm/Kconfig b/mm/Kconfig
-index 5f4846c7d..40bf1a135 100644
+index f730605b8..89d11e029 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
-@@ -352,6 +352,32 @@ config KSM
+@@ -317,6 +317,32 @@ config KSM
See Documentation/vm/ksm.rst for more information: KSM is inactive
until a program has madvised that an area is MADV_MERGEABLE, and
root has set /sys/kernel/mm/ksm/run to 1 (if CONFIG_SYSFS is set).
@@ -1063,7 +1062,7 @@ index b6cd2fffa..abe1ab4d4 100644
obj-$(CONFIG_SLAB) += slab.o
obj-$(CONFIG_SLUB) += slub.o
diff --git a/mm/ksm.c b/mm/ksm.c
-index 50d1d6dd1..a10d21de2 100644
+index 9694ee2c7..63af6a528 100644
--- a/mm/ksm.c
+++ b/mm/ksm.c
@@ -858,17 +858,6 @@ static int unmerge_ksm_pages(struct vm_area_struct *vma,
@@ -6953,7 +6952,7 @@ index 000000000..e4732c00b
+#endif
+
diff --git a/mm/vmstat.c b/mm/vmstat.c
-index 6b9369fd9..24cb8a8ff 100644
+index f8942160f..95d6d9267 100644
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -1216,6 +1216,9 @@ const char * const vmstat_text[] = {
diff --git a/PKGBUILD b/PKGBUILD
index 378c5c760d3..c956a140db9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -84,16 +84,16 @@ _makenconfig=y
pkgbase=linux-manjaro-xanmod-cacule-uksm
pkgname=("${pkgbase}" "${pkgbase}-headers")
-pkgver=5.11.1
+pkgver=5.11.3
_major=5.11
_branch=5.x
-xanmod=2
+xanmod=1
pkgrel=1
pkgdesc='Linux Xanmod Cacule UKSM'
url="http://www.xanmod.org/"
arch=(x86_64)
-__commit="2baf9050c4d9887fcde0d015811f81059c215959" # 5.11.1-1
+__commit="486a2392d4ffd9b93bc3127629e3da2c9e3b6f1b" # 5.11.3-1
license=(GPL2)
makedepends=(
@@ -112,10 +112,10 @@ source=("https://cdn.kernel.org/pub/linux/kernel/v${_branch}/linux-${_major}.tar
sha256sums=('04f07b54f0d40adfab02ee6cbd2a942c96728d87c1ef9e120d0cb9ba3fe067b4'
'b8bc4f6312bdc086c0fecd1cce1ab1ee12b7b4eff63f88239a65461d9ec5e91b'
- 'ef0f0d9bc504a77c7e11c07899b12193854bafaa8c8354ab08e6005bf3b68e7f'
+ '41635dd87f8b77c370339f148e4a6888714c016624abe6189c5020f2da4487e6'
'e840e41f0f91108f63fd6e085c93b02daa78729268bc31be7be7fb355203e38a'
- '272a4ea69af64f5978015483d8c2d47e58572dd0aa87d8dd1a90cc4284e6b2f4'
- '6ae9b0f994c8cea6ddbaaa570a2570d8489643b33b61c68090670c241a0cd3cc')
+ '8e48c5d019a8dafcc1d68b225a09251e811a8e4c0bef073f3cb60a8032f32001'
+ 'f00a84fd382d63cd0d47d6fd8ef6c8608b1c83ff9d6dbdd32cb985898afbbf58')
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linux Torvalds
'647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman