sravan/linux-tkg
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linux516: Fix Project C compilation (#495)

Browse Source 
Fix build fail due to multiple definition of node_reclaim_distance.
part of: 30be4c4bc5
This commit is contained in:
Dmitry Skvortsov
2022-04-09 19:22:53 +03:00
committed by GitHub
parent 3744aa34ab
commit 18dacf66de
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PKGBUILD
View File

@@ -681,7 +681,7 @@ case $_basever in
'44a46815d26170e43dd5f21e352081c8e5a4816512abb86353a1d90311fffcde' '44a46815d26170e43dd5f21e352081c8e5a4816512abb86353a1d90311fffcde'
'9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177' '9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177'
'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911' 'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911'
'74347a44ca8dba425fb5ba8aa02b6c269a551488320f93a2c357a7f15c2f3e5a' '2a7877d24f21d3cdd8452b78160caf574d6cb8ae8c3b74e9f83e3d77907d1455'
#'decd4a55c0d47b1eb808733490cdfea1207a2022d46f06d04a3cc60fdcb3f32c' #'decd4a55c0d47b1eb808733490cdfea1207a2022d46f06d04a3cc60fdcb3f32c'
'1aa0a172e1e27fb8171053f3047dcf4a61bd2eda5ea18f02b2bb391741a69887' '1aa0a172e1e27fb8171053f3047dcf4a61bd2eda5ea18f02b2bb391741a69887'
'1b656ad96004f27e9dc63d7f430b50d5c48510d6d4cd595a81c24b21adb70313' '1b656ad96004f27e9dc63d7f430b50d5c48510d6d4cd595a81c24b21adb70313'

13
linux-tkg-patches/5.16/0009-prjc_v5.16-r1.patch
View File

@@ -9850,6 +9850,19 @@ index abcadbe933bb..d4c778b0ab0e 100644
}; };
struct wakeup_test_data *x = data; struct wakeup_test_data *x = data;
diff --git a/kernel/sched/topology.c b/kernel/sched/topology.c
index e5a7a638f3fbe0f40f9b0be709ccbd02039d6d3b..163cec668095133a3f1d34df462cc7b8260504be 100644
--- a/kernel/sched/topology.c
+++ b/kernel/sched/topology.c
@@ -2542,8 +2542,6 @@ void partition_sched_domains(int ndoms_new, cpumask_var_t doms_new[],
{}
#ifdef CONFIG_NUMA
-int __read_mostly node_reclaim_distance = RECLAIM_DISTANCE;
-
int sched_numa_find_closest(const struct cpumask *cpus, int cpu)
{
return best_mask_cpu(cpu, cpus);
diff --git a/kernel/sched/alt_sched.h b/kernel/sched/alt_sched.h diff --git a/kernel/sched/alt_sched.h b/kernel/sched/alt_sched.h
index f2b9e686d6a69c07f54c2cae36f7ce0ab70f9cb2..55c2a4c0cb845580c97e4adf07a34646f3929272 100644 index f2b9e686d6a69c07f54c2cae36f7ce0ab70f9cb2..55c2a4c0cb845580c97e4adf07a34646f3929272 100644
--- a/kernel/sched/alt_sched.h --- a/kernel/sched/alt_sched.h