Created
March 3, 2014 19:35
-
-
Save pfactum/9332896 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
From 803d997f52253f5a50f71ef4fc00d3d87a55e5d4 Mon Sep 17 00:00:00 2001 | |
From: Oleksandr Natalenko <oleksandr@natalenko.name> | |
Date: Thu, 12 Dec 2013 16:58:39 +0200 | |
Subject: [PATCH 1/2] ck-3.12: fix BFS compiling with CONFIG_SMP=n | |
--- | |
kernel/sched/bfs.c | 5 ----- | |
kernel/sched/bfs_sched.h | 8 ++++++++ | |
2 files changed, 8 insertions(+), 5 deletions(-) | |
diff --git a/kernel/sched/bfs.c b/kernel/sched/bfs.c | |
index b61e8ab..cc44c33 100644 | |
--- a/kernel/sched/bfs.c | |
+++ b/kernel/sched/bfs.c | |
@@ -316,11 +316,6 @@ static inline void update_clocks(struct rq *rq) | |
rq->last_niffy = grq.niffies; | |
} | |
#else /* CONFIG_SMP */ | |
-static struct rq *uprq; | |
-#define cpu_rq(cpu) (uprq) | |
-#define this_rq() (uprq) | |
-#define task_rq(p) (uprq) | |
-#define cpu_curr(cpu) ((uprq)->curr) | |
static inline int cpu_of(struct rq *rq) | |
{ | |
return 0; | |
diff --git a/kernel/sched/bfs_sched.h b/kernel/sched/bfs_sched.h | |
index 92847a3..b185376 100644 | |
--- a/kernel/sched/bfs_sched.h | |
+++ b/kernel/sched/bfs_sched.h | |
@@ -89,6 +89,14 @@ struct rq { | |
struct rq *cpu_rq(int cpu); | |
#endif | |
+#ifndef CONFIG_SMP | |
+static struct rq *uprq; | |
+#define cpu_rq(cpu) (uprq) | |
+#define this_rq() (uprq) | |
+#define task_rq(p) (uprq) | |
+#define cpu_curr(cpu) ((uprq)->curr) | |
+#endif /* CONFIG_SMP */ | |
+ | |
static inline u64 rq_clock(struct rq *rq) | |
{ | |
return rq->clock; | |
-- | |
1.9.0 | |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
From 42d66a4007ff409922578eed69627e6c809e2113 Mon Sep 17 00:00:00 2001 | |
From: Oleksandr Natalenko <oleksandr@natalenko.name> | |
Date: Sun, 24 Nov 2013 11:31:46 +0200 | |
Subject: [PATCH 2/2] ck-3.12: force disabling BOOTPARAM_HOTPLUG_CPU0 with BFS | |
enabled | |
--- | |
arch/x86/Kconfig | 2 +- | |
1 file changed, 1 insertion(+), 1 deletion(-) | |
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig | |
index 75d14ed7..62e49cc 100644 | |
--- a/arch/x86/Kconfig | |
+++ b/arch/x86/Kconfig | |
@@ -1775,7 +1775,7 @@ config HOTPLUG_CPU | |
config BOOTPARAM_HOTPLUG_CPU0 | |
bool "Set default setting of cpu0_hotpluggable" | |
default n | |
- depends on HOTPLUG_CPU | |
+ depends on HOTPLUG_CPU && !SCHED_BFS | |
---help--- | |
Set whether default state of cpu0_hotpluggable is on or off. | |
-- | |
1.9.0 | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment