lib/nodemask: inline next_node_in() and node_random()

[linux-2.6-microblaze.git] / include / linux / lockdep.h

diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
index 467b942..b6829b9 100644 (file)
--- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h
@@ -16,10 +16,6 @@
 
 struct task_struct;
 
-/* for sysctl */
-extern int prove_locking;
-extern int lock_stat;
-
 #ifdef CONFIG_LOCKDEP
 
 #include <linux/linkage.h>
@@ -290,6 +286,9 @@ extern void lock_set_class(struct lockdep_map *lock, const char *name,
                           struct lock_class_key *key, unsigned int subclass,
                           unsigned long ip);
 
+#define lock_set_novalidate_class(l, n, i) \
+       lock_set_class(l, n, &__lockdep_no_validate__, 0, i)
+
 static inline void lock_set_subclass(struct lockdep_map *lock,
                unsigned int subclass, unsigned long ip)
 {
@@ -357,7 +356,8 @@ static inline void lockdep_set_selftest_task(struct task_struct *task)
 # define lock_acquire(l, s, t, r, c, n, i)     do { } while (0)
 # define lock_release(l, i)                    do { } while (0)
 # define lock_downgrade(l, i)                  do { } while (0)
-# define lock_set_class(l, n, k, s, i)         do { } while (0)
+# define lock_set_class(l, n, key, s, i)       do { (void)(key); } while (0)
+# define lock_set_novalidate_class(l, n, i)    do { } while (0)
 # define lock_set_subclass(l, s, i)            do { } while (0)
 # define lockdep_init()                                do { } while (0)
 # define lockdep_init_map_type(lock, name, key, sub, inner, outer, type) \