diff options
| author | David S. Miller <davem@davemloft.net> | 2008-05-15 03:34:44 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-15 03:34:44 -0400 |
| commit | 63fe46da9c380b3f2bbdf3765044649517cc717c (patch) | |
| tree | 9478c1aca1d692b408955aea20c9cd9a37e589c0 /kernel/sched_debug.c | |
| parent | 99dd1a2b8347ac2ae802300b7862f6f7bcf17139 (diff) | |
| parent | 066b2118976e6e7cc50eed39e2747c75343a23c4 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-4965-rs.c
drivers/net/wireless/rt2x00/rt61pci.c
Diffstat (limited to 'kernel/sched_debug.c')
| -rw-r--r-- | kernel/sched_debug.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/kernel/sched_debug.c b/kernel/sched_debug.c index 6b4a12558e88..5f06118fbc31 100644 --- a/kernel/sched_debug.c +++ b/kernel/sched_debug.c | |||
| @@ -204,13 +204,6 @@ static void print_cpu(struct seq_file *m, int cpu) | |||
| 204 | PN(next_balance); | 204 | PN(next_balance); |
| 205 | P(curr->pid); | 205 | P(curr->pid); |
| 206 | PN(clock); | 206 | PN(clock); |
| 207 | PN(idle_clock); | ||
| 208 | PN(prev_clock_raw); | ||
| 209 | P(clock_warps); | ||
| 210 | P(clock_overflows); | ||
| 211 | P(clock_underflows); | ||
| 212 | P(clock_deep_idle_events); | ||
| 213 | PN(clock_max_delta); | ||
| 214 | P(cpu_load[0]); | 207 | P(cpu_load[0]); |
| 215 | P(cpu_load[1]); | 208 | P(cpu_load[1]); |
| 216 | P(cpu_load[2]); | 209 | P(cpu_load[2]); |