Skip to contentSkip to conversation

sched: remove __schedule() declaration

PATCH In review Hiroshi Shimamoto 1 participant 6 messages Nov 4, 2009 Scheduler

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 sched: remove __schedule() declaration

From: Hiroshi Shimamoto <[email protected]>

__schedule() had been removed.

---
 include/linux/sched.h |    1 -
 kernel/kgdb.c         |    2 +-
 2 files changed, 1 insertions(+), 2 deletions(-)
include/linux/sched.h +0 -1
index 75e6e60..f18102c 100644
@@ -349,7 +349,6 @@ extern signed long schedule_timeout(signed long timeout);
 extern signed long schedule_timeout_interruptible(signed long timeout);
 extern signed long schedule_timeout_killable(signed long timeout);
 extern signed long schedule_timeout_uninterruptible(signed long timeout);
-asmlinkage void __schedule(void);
 asmlinkage void schedule(void);
 extern int mutex_spin_on_owner(struct mutex *lock, struct thread_info *owner);
 
kernel/kgdb.c +1 -1
index 9147a31..7d70146 100644
@@ -870,7 +870,7 @@ static void gdb_cmd_getregs(struct kgdb_state *ks)
 
 	/*
 	 * All threads that don't have debuggerinfo should be
-	 * in __schedule() sleeping, since all other CPUs
+	 * in schedule() sleeping, since all other CPUs
 	 * are in kgdb_wait, and thus have debuggerinfo.
 	 */
 	if (local_debuggerinfo) {
Signature · 1 line
1.6.3.3
#1 lore raw

PATCH 2/3 sched: remove time_sync_thresh declaration

From: Hiroshi Shimamoto <[email protected]>

time_sync_thresh had been removed.

---
 include/linux/sched.h |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
include/linux/sched.h +0 -2
index f18102c..754b3de 100644
@@ -171,8 +171,6 @@ print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq *cfs_rq)
 }
 #endif
 
-extern unsigned long long time_sync_thresh;
-
 /*
  * Task state bitmask. NOTE! These bits are also
  * encoded in fs/proc/array.c: get_task_state().
Signature · 1 line
1.6.3.3
#3 lore raw

PATCH 3/3 sched: remove cpu_nr_migrations()

In reply to Hiroshi Shimamoto

From: Hiroshi Shimamoto <[email protected]>

cpu_nr_migrations() is not used, remove it.

---
 include/linux/sched.h |    1 -
 kernel/sched.c        |   11 -----------
 2 files changed, 0 insertions(+), 12 deletions(-)
include/linux/sched.h +0 -1
index 754b3de..dfc21fb 100644
@@ -145,7 +145,6 @@ extern unsigned long this_cpu_load(void);
 
 
 extern void calc_global_load(void);
-extern u64 cpu_nr_migrations(int cpu);
 
 extern unsigned long get_parent_ip(unsigned long addr);
 
kernel/sched.c +0 -11
index 92cf9cb..21f9ab0 100644
@@ -541,7 +541,6 @@ struct rq {
 	struct load_weight load;
 	unsigned long nr_load_updates;
 	u64 nr_switches;
-	u64 nr_migrations_in;
 
 	struct cfs_rq cfs;
 	struct rt_rq rt;
@@ -2077,7 +2076,6 @@ void set_task_cpu(struct task_struct *p, unsigned int new_cpu)
 #endif
 	if (old_cpu != new_cpu) {
 		p->se.nr_migrations++;
-		new_rq->nr_migrations_in++;
 #ifdef CONFIG_SCHEDSTATS
 		if (task_hot(p, old_rq->clock, NULL))
 			schedstat_inc(p, se.nr_forced2_migrations);
@@ -3017,15 +3015,6 @@ static void calc_load_account_active(struct rq *this_rq)
 }
 
 /*
- * Externally visible per-cpu scheduler statistics:
- * cpu_nr_migrations(cpu) - number of migrations into that cpu
- */
-u64 cpu_nr_migrations(int cpu)
-{
-	return cpu_rq(cpu)->nr_migrations_in;
-}
-
-/*
  * Update rq->cpu_load[] statistics. This function is usually called every
  * scheduler tick (TICK_NSEC).
  */
Signature · 1 line
1.6.3.3
#5 lore raw

[tip:sched/core] sched: Remove unused __schedule() declaration

In reply to Hiroshi Shimamoto
Commit-ID:  1477b6a7edd9ffa7bba4f9779ce9a76ce92761ed
Gitweb:     http://git.kernel.org/tip/1477b6a7edd9ffa7bba4f9779ce9a76ce92761ed
Author:     Hiroshi Shimamoto <[email protected]>
AuthorDate: Wed, 4 Nov 2009 16:14:16 +0900
Committer:  Ingo Molnar <[email protected]>
CommitDate: Wed, 4 Nov 2009 11:43:42 +0100

sched: Remove unused __schedule() declaration

__schedule() had been removed.

LKML-Reference: <[email protected]>

---
 include/linux/sched.h |    1 -
 kernel/kgdb.c         |    2 +-
 2 files changed, 1 insertions(+), 2 deletions(-)
include/linux/sched.h +0 -1
index 75e6e60..f18102c 100644
@@ -349,7 +349,6 @@ extern signed long schedule_timeout(signed long timeout);
 extern signed long schedule_timeout_interruptible(signed long timeout);
 extern signed long schedule_timeout_killable(signed long timeout);
 extern signed long schedule_timeout_uninterruptible(signed long timeout);
-asmlinkage void __schedule(void);
 asmlinkage void schedule(void);
 extern int mutex_spin_on_owner(struct mutex *lock, struct thread_info *owner);
 
kernel/kgdb.c +1 -1
index 9147a31..7d70146 100644
@@ -870,7 +870,7 @@ static void gdb_cmd_getregs(struct kgdb_state *ks)
 
 	/*
 	 * All threads that don't have debuggerinfo should be
-	 * in __schedule() sleeping, since all other CPUs
+	 * in schedule() sleeping, since all other CPUs
 	 * are in kgdb_wait, and thus have debuggerinfo.
 	 */
 	if (local_debuggerinfo) {
#2 lore raw

[tip:sched/core] sched: Remove unused time_sync_thresh declaration

In reply to Hiroshi Shimamoto
Commit-ID:  2a2bb3142d326bb28b03875cabfc49baaac9a14a
Gitweb:     http://git.kernel.org/tip/2a2bb3142d326bb28b03875cabfc49baaac9a14a
Author:     Hiroshi Shimamoto <[email protected]>
AuthorDate: Wed, 4 Nov 2009 16:16:10 +0900
Committer:  Ingo Molnar <[email protected]>
CommitDate: Wed, 4 Nov 2009 11:43:42 +0100

sched: Remove unused time_sync_thresh declaration

time_sync_thresh had been removed.

LKML-Reference: <[email protected]>

---
 include/linux/sched.h |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
include/linux/sched.h +0 -2
index f18102c..754b3de 100644
@@ -171,8 +171,6 @@ print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq *cfs_rq)
 }
 #endif
 
-extern unsigned long long time_sync_thresh;
-
 /*
  * Task state bitmask. NOTE! These bits are also
  * encoded in fs/proc/array.c: get_task_state().
#4 lore raw

[tip:sched/core] sched: Remove unused cpu_nr_migrations()

In reply to Hiroshi Shimamoto
Commit-ID:  9824a2b728b63e7ff586b9fd9293c819be79f0f3
Gitweb:     http://git.kernel.org/tip/9824a2b728b63e7ff586b9fd9293c819be79f0f3
Author:     Hiroshi Shimamoto <[email protected]>
AuthorDate: Wed, 4 Nov 2009 16:16:54 +0900
Committer:  Ingo Molnar <[email protected]>
CommitDate: Wed, 4 Nov 2009 11:43:43 +0100

sched: Remove unused cpu_nr_migrations()

cpu_nr_migrations() is not used, remove it.

LKML-Reference: <[email protected]>

---
 include/linux/sched.h |    1 -
 kernel/sched.c        |   11 -----------
 2 files changed, 0 insertions(+), 12 deletions(-)
include/linux/sched.h +0 -1
index 754b3de..dfc21fb 100644
@@ -145,7 +145,6 @@ extern unsigned long this_cpu_load(void);
 
 
 extern void calc_global_load(void);
-extern u64 cpu_nr_migrations(int cpu);
 
 extern unsigned long get_parent_ip(unsigned long addr);
 
kernel/sched.c +0 -11
index 67be4d0..30fd0ba 100644
@@ -541,7 +541,6 @@ struct rq {
 	struct load_weight load;
 	unsigned long nr_load_updates;
 	u64 nr_switches;
-	u64 nr_migrations_in;
 
 	struct cfs_rq cfs;
 	struct rt_rq rt;
@@ -2049,7 +2048,6 @@ void set_task_cpu(struct task_struct *p, unsigned int new_cpu)
 #endif
 	if (old_cpu != new_cpu) {
 		p->se.nr_migrations++;
-		new_rq->nr_migrations_in++;
 #ifdef CONFIG_SCHEDSTATS
 		if (task_hot(p, old_rq->clock, NULL))
 			schedstat_inc(p, se.nr_forced2_migrations);
@@ -2989,15 +2987,6 @@ static void calc_load_account_active(struct rq *this_rq)
 }
 
 /*
- * Externally visible per-cpu scheduler statistics:
- * cpu_nr_migrations(cpu) - number of migrations into that cpu
- */
-u64 cpu_nr_migrations(int cpu)
-{
-	return cpu_rq(cpu)->nr_migrations_in;
-}
-
-/*
  * Update rq->cpu_load[] statistics. This function is usually called every
  * scheduler tick (TICK_NSEC).
  */