diff options
| author | Bjoern B. Brandenburg <bbb@cs.unc.edu> | 2007-02-22 10:02:27 -0500 |
|---|---|---|
| committer | Bjoern B. Brandenburg <bbb@cs.unc.edu> | 2007-02-22 10:02:27 -0500 |
| commit | 70468d2d1e67c9e69ab5f9b0339bc26d92ee901f (patch) | |
| tree | 40f9bdd7d46057d47a4b5d4df7e2da68b9aef321 /kernel | |
| parent | f0d0e0687fb9fd065d6b9d22ca6ddfd2f384b58b (diff) | |
| parent | bf0d1c6734adf03b5f6631bdb431bed827767504 (diff) | |
Merge with git+ssh://swan/playpen/bbb/litmus
Pulled in the queue lock implementation.
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/litmus.c | 2 | ||||
| -rw-r--r-- | kernel/sched_trace.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kernel/litmus.c b/kernel/litmus.c index 7e7c56e7ff..03b57fe0c3 100644 --- a/kernel/litmus.c +++ b/kernel/litmus.c | |||
| @@ -407,7 +407,7 @@ static int boot_sched_setup(char *plugin_name) | |||
| 407 | * mode change lock is used to enforce single mode change | 407 | * mode change lock is used to enforce single mode change |
| 408 | * operation. | 408 | * operation. |
| 409 | */ | 409 | */ |
| 410 | queue_lock_init(&mode_change_lock, NR_CPUS); | 410 | queue_lock_init(&mode_change_lock); |
| 411 | 411 | ||
| 412 | printk("Starting LITMUS kernel\n"); | 412 | printk("Starting LITMUS kernel\n"); |
| 413 | 413 | ||
diff --git a/kernel/sched_trace.c b/kernel/sched_trace.c index 8ca7fbc5a4..fa7bad33a5 100644 --- a/kernel/sched_trace.c +++ b/kernel/sched_trace.c | |||
| @@ -465,7 +465,7 @@ static int __init init_sched_trace(void) | |||
| 465 | int error1 = 0, error2 = 0; | 465 | int error1 = 0, error2 = 0; |
| 466 | 466 | ||
| 467 | printk("Initializing scheduler trace device\n"); | 467 | printk("Initializing scheduler trace device\n"); |
| 468 | queue_lock_init(&log_buffer_lock, NR_CPUS); | 468 | queue_lock_init(&log_buffer_lock); |
| 469 | init_buffers(); | 469 | init_buffers(); |
| 470 | 470 | ||
| 471 | error1 = register_buffer_dev("schedtrace", &trace_fops, | 471 | error1 = register_buffer_dev("schedtrace", &trace_fops, |