2009-11-04 07:18:19

by Hiroshi Shimamoto

[permalink] [raw]
Subject: [PATCH 1/3] sched: remove __schedule() declaration

From: Hiroshi Shimamoto <[email protected]>

__schedule() had been removed.

Signed-off-by: Hiroshi Shimamoto <[email protected]>
---
include/linux/sched.h | 1 -
kernel/kgdb.c | 2 +-
2 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 75e6e60..f18102c 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -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);

diff --git a/kernel/kgdb.c b/kernel/kgdb.c
index 9147a31..7d70146 100644
--- a/kernel/kgdb.c
+++ b/kernel/kgdb.c
@@ -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) {
--
1.6.3.3


2009-11-04 07:18:21

by Hiroshi Shimamoto

[permalink] [raw]
Subject: [PATCH 2/3] sched: remove time_sync_thresh declaration

From: Hiroshi Shimamoto <[email protected]>

time_sync_thresh had been removed.

Signed-off-by: Hiroshi Shimamoto <[email protected]>
---
include/linux/sched.h | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/include/linux/sched.h b/include/linux/sched.h
index f18102c..754b3de 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -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().
--
1.6.3.3

2009-11-04 07:18:39

by Hiroshi Shimamoto

[permalink] [raw]
Subject: [PATCH 3/3] sched: remove cpu_nr_migrations()

From: Hiroshi Shimamoto <[email protected]>

cpu_nr_migrations() is not used, remove it.

Signed-off-by: Hiroshi Shimamoto <[email protected]>
---
include/linux/sched.h | 1 -
kernel/sched.c | 11 -----------
2 files changed, 0 insertions(+), 12 deletions(-)

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 754b3de..dfc21fb 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -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);

diff --git a/kernel/sched.c b/kernel/sched.c
index 92cf9cb..21f9ab0 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -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).
*/
--
1.6.3.3

2009-11-04 11:10:38

by Hiroshi Shimamoto

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

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.

Signed-off-by: Hiroshi Shimamoto <[email protected]>
Cc: Peter Zijlstra <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>
---
include/linux/sched.h | 1 -
kernel/kgdb.c | 2 +-
2 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 75e6e60..f18102c 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -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);

diff --git a/kernel/kgdb.c b/kernel/kgdb.c
index 9147a31..7d70146 100644
--- a/kernel/kgdb.c
+++ b/kernel/kgdb.c
@@ -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) {

2009-11-04 11:10:57

by Hiroshi Shimamoto

[permalink] [raw]
Subject: [tip:sched/core] sched: Remove unused time_sync_thresh declaration

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.

Signed-off-by: Hiroshi Shimamoto <[email protected]>
Cc: Peter Zijlstra <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>
---
include/linux/sched.h | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/include/linux/sched.h b/include/linux/sched.h
index f18102c..754b3de 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -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().

2009-11-04 11:11:10

by Hiroshi Shimamoto

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

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.

Signed-off-by: Hiroshi Shimamoto <[email protected]>
Cc: Peter Zijlstra <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>
---
include/linux/sched.h | 1 -
kernel/sched.c | 11 -----------
2 files changed, 0 insertions(+), 12 deletions(-)

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 754b3de..dfc21fb 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -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);

diff --git a/kernel/sched.c b/kernel/sched.c
index 67be4d0..30fd0ba 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -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).
*/