git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sched: fix buddie group latency
[pandora-kernel.git]
/
kernel
/
lockdep.c
diff --git
a/kernel/lockdep.c
b/kernel/lockdep.c
index
e4bdda8
..
06b0c35
100644
(file)
--- a/
kernel/lockdep.c
+++ b/
kernel/lockdep.c
@@
-25,6
+25,7
@@
* Thanks to Arjan van de Ven for coming up with the initial idea of
* mapping lock dependencies runtime.
*/
* Thanks to Arjan van de Ven for coming up with the initial idea of
* mapping lock dependencies runtime.
*/
+#define DISABLE_BRANCH_PROFILING
#include <linux/mutex.h>
#include <linux/sched.h>
#include <linux/delay.h>
#include <linux/mutex.h>
#include <linux/sched.h>
#include <linux/delay.h>
@@
-291,14
+292,12
@@
void lockdep_off(void)
{
current->lockdep_recursion++;
}
{
current->lockdep_recursion++;
}
-
EXPORT_SYMBOL(lockdep_off);
void lockdep_on(void)
{
current->lockdep_recursion--;
}
EXPORT_SYMBOL(lockdep_off);
void lockdep_on(void)
{
current->lockdep_recursion--;
}
-
EXPORT_SYMBOL(lockdep_on);
/*
EXPORT_SYMBOL(lockdep_on);
/*
@@
-580,7
+579,8
@@
static void print_lock_class_header(struct lock_class *class, int depth)
/*
* printk all lock dependencies starting at <entry>:
*/
/*
* printk all lock dependencies starting at <entry>:
*/
-static void print_lock_dependencies(struct lock_class *class, int depth)
+static void __used
+print_lock_dependencies(struct lock_class *class, int depth)
{
struct lock_list *entry;
{
struct lock_list *entry;
@@
-2512,7
+2512,6
@@
void lockdep_init_map(struct lockdep_map *lock, const char *name,
if (subclass)
register_lock_class(lock, subclass, 1);
}
if (subclass)
register_lock_class(lock, subclass, 1);
}
-
EXPORT_SYMBOL_GPL(lockdep_init_map);
/*
EXPORT_SYMBOL_GPL(lockdep_init_map);
/*
@@
-2693,8
+2692,9
@@
static int check_unlock(struct task_struct *curr, struct lockdep_map *lock,
}
static int
}
static int
-__lock_set_subclass(struct lockdep_map *lock,
- unsigned int subclass, unsigned long ip)
+__lock_set_class(struct lockdep_map *lock, const char *name,
+ struct lock_class_key *key, unsigned int subclass,
+ unsigned long ip)
{
struct task_struct *curr = current;
struct held_lock *hlock, *prev_hlock;
{
struct task_struct *curr = current;
struct held_lock *hlock, *prev_hlock;
@@
-2721,6
+2721,7
@@
__lock_set_subclass(struct lockdep_map *lock,
return print_unlock_inbalance_bug(curr, lock, ip);
found_it:
return print_unlock_inbalance_bug(curr, lock, ip);
found_it:
+ lockdep_init_map(lock, name, key, 0);
class = register_lock_class(lock, subclass, 0);
hlock->class_idx = class - lock_classes + 1;
class = register_lock_class(lock, subclass, 0);
hlock->class_idx = class - lock_classes + 1;
@@
-2905,9
+2906,9
@@
static void check_flags(unsigned long flags)
#endif
}
#endif
}
-void
-
lock_set_subclass(struct lockdep_map *lock
,
-
unsigned int subclass,
unsigned long ip)
+void
lock_set_class(struct lockdep_map *lock, const char *name,
+
struct lock_class_key *key, unsigned int subclass
,
+
unsigned long ip)
{
unsigned long flags;
{
unsigned long flags;
@@
-2917,13
+2918,12
@@
lock_set_subclass(struct lockdep_map *lock,
raw_local_irq_save(flags);
current->lockdep_recursion = 1;
check_flags(flags);
raw_local_irq_save(flags);
current->lockdep_recursion = 1;
check_flags(flags);
- if (__lock_set_
subclass(lock
, subclass, ip))
+ if (__lock_set_
class(lock, name, key
, subclass, ip))
check_chain_key(current);
current->lockdep_recursion = 0;
raw_local_irq_restore(flags);
}
check_chain_key(current);
current->lockdep_recursion = 0;
raw_local_irq_restore(flags);
}
-
-EXPORT_SYMBOL_GPL(lock_set_subclass);
+EXPORT_SYMBOL_GPL(lock_set_class);
/*
* We are not always called with irqs disabled - do that here,
/*
* We are not always called with irqs disabled - do that here,
@@
-2947,7
+2947,6
@@
void lock_acquire(struct lockdep_map *lock, unsigned int subclass,
current->lockdep_recursion = 0;
raw_local_irq_restore(flags);
}
current->lockdep_recursion = 0;
raw_local_irq_restore(flags);
}
-
EXPORT_SYMBOL_GPL(lock_acquire);
void lock_release(struct lockdep_map *lock, int nested,
EXPORT_SYMBOL_GPL(lock_acquire);
void lock_release(struct lockdep_map *lock, int nested,
@@
-2965,7
+2964,6
@@
void lock_release(struct lockdep_map *lock, int nested,
current->lockdep_recursion = 0;
raw_local_irq_restore(flags);
}
current->lockdep_recursion = 0;
raw_local_irq_restore(flags);
}
-
EXPORT_SYMBOL_GPL(lock_release);
#ifdef CONFIG_LOCK_STAT
EXPORT_SYMBOL_GPL(lock_release);
#ifdef CONFIG_LOCK_STAT
@@
-3450,7
+3448,6
@@
retry:
if (unlock)
read_unlock(&tasklist_lock);
}
if (unlock)
read_unlock(&tasklist_lock);
}
-
EXPORT_SYMBOL_GPL(debug_show_all_locks);
/*
EXPORT_SYMBOL_GPL(debug_show_all_locks);
/*
@@
-3471,7
+3468,6
@@
void debug_show_held_locks(struct task_struct *task)
{
__debug_show_held_locks(task);
}
{
__debug_show_held_locks(task);
}
-
EXPORT_SYMBOL_GPL(debug_show_held_locks);
void lockdep_sys_exit(void)
EXPORT_SYMBOL_GPL(debug_show_held_locks);
void lockdep_sys_exit(void)