remove second, unneeded parameter of queue_lock_init()

Queue locks in LTMUS always must allow for NR_CPUS processes. Therefore,
it is redundant to specify that int queue_lock_init().

3 files changed, 3 insertions, 3 deletions

diff --git a/include/linux/queuelock.h b/include/linux/queuelock.h
index 0fa396a724..044422b856 100644
--- a/include/linux/queuelock.h
+++ b/include/linux/queuelock.h
@@ -24,7 +24,7 @@ typedef spinlock_t queuelock_t;
 */

 

 

-#define queue_lock_init(lock, dummy)    spin_lock_init(lock)

+#define queue_lock_init(lock)           spin_lock_init(lock)

 #define queue_lock_wipe(lock)           spin_lock_init(lock)

 #define queue_lock(lock)                spin_lock(lock)

 #define queue_unlock(lock)              spin_unlock(lock)

diff --git a/kernel/litmus.c b/kernel/litmus.c
index 04a28159e1..7dfafa88b5 100644
--- a/kernel/litmus.c
+++ b/kernel/litmus.c
@@ -411,7 +411,7 @@ static int boot_sched_setup(char *plugin_name)
          *      mode change lock is used to enforce single mode change 
          *      operation.
          */
-        queue_lock_init(&mode_change_lock, NR_CPUS);
+        queue_lock_init(&mode_change_lock);
 
         printk("Starting LITMUS kernel\n");
 
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)
         int error1 = 0, error2 = 0;
 
         printk("Initializing scheduler trace device\n");
-        queue_lock_init(&log_buffer_lock, NR_CPUS);
+        queue_lock_init(&log_buffer_lock);
         init_buffers();
 
         error1 = register_buffer_dev("schedtrace", &trace_fops,