Merge with temp tree to get David's gdb inferior calls patch

4 files changed, 7 insertions, 7 deletions

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 426a0cf7b11c..ac23847ce0e3 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -108,6 +108,7 @@ config DEBUG_HIGHMEM
 
 config DEBUG_BUGVERBOSE
         bool "Verbose BUG() reporting (adds 70K)" if DEBUG_KERNEL && EMBEDDED
+        depends on BUG
         depends on ARM || ARM26 || M32R || M68K || SPARC32 || SPARC64 || (X86 && !X86_64) || FRV
         default !EMBEDDED
         help
diff --git a/lib/kobject.c b/lib/kobject.c
index 5df8441c44e7..94048826624c 100644
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -216,13 +216,12 @@ int kobject_register(struct kobject * kobj)
 /**
  *      kobject_set_name - Set the name of an object
  *      @kobj:  object.
- *      @name:  name. 
+ *      @fmt:   format string used to build the name
  *
  *      If strlen(name) >= KOBJ_NAME_LEN, then use a dynamically allocated
  *      string that @kobj->k_name points to. Otherwise, use the static 
  *      @kobj->name array.
  */
-
 int kobject_set_name(struct kobject * kobj, const char * fmt, ...)
 {
         int error = 0;
diff --git a/lib/rwsem-spinlock.c b/lib/rwsem-spinlock.c
index 21f0db2c9711..40ffde940a86 100644
--- a/lib/rwsem-spinlock.c
+++ b/lib/rwsem-spinlock.c
@@ -76,7 +76,7 @@ __rwsem_do_wake(struct rw_semaphore *sem, int wakewrite)
                 list_del(&waiter->list);
                 tsk = waiter->task;
                 /* Don't touch waiter after ->task has been NULLed */
-                mb();
+                smp_mb();
                 waiter->task = NULL;
                 wake_up_process(tsk);
                 put_task_struct(tsk);
@@ -91,7 +91,7 @@ __rwsem_do_wake(struct rw_semaphore *sem, int wakewrite)
 
                 list_del(&waiter->list);
                 tsk = waiter->task;
-                mb();
+                smp_mb();
                 waiter->task = NULL;
                 wake_up_process(tsk);
                 put_task_struct(tsk);
@@ -123,7 +123,7 @@ __rwsem_wake_one_writer(struct rw_semaphore *sem)
         list_del(&waiter->list);
 
         tsk = waiter->task;
-        mb();
+        smp_mb();
         waiter->task = NULL;
         wake_up_process(tsk);
         put_task_struct(tsk);
diff --git a/lib/rwsem.c b/lib/rwsem.c
index 7644089ec8fa..62fa4eba9ffe 100644
--- a/lib/rwsem.c
+++ b/lib/rwsem.c
@@ -74,7 +74,7 @@ __rwsem_do_wake(struct rw_semaphore *sem, int downgrading)
          */
         list_del(&waiter->list);
         tsk = waiter->task;
-        mb();
+        smp_mb();
         waiter->task = NULL;
         wake_up_process(tsk);
         put_task_struct(tsk);
@@ -117,7 +117,7 @@ __rwsem_do_wake(struct rw_semaphore *sem, int downgrading)
                 waiter = list_entry(next, struct rwsem_waiter, list);
                 next = waiter->list.next;
                 tsk = waiter->task;
-                mb();
+                smp_mb();
                 waiter->task = NULL;
                 wake_up_process(tsk);
                 put_task_struct(tsk);