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
Pull asus into release branch
[pandora-kernel.git]
/
include
/
linux
/
lockdep.h
diff --git
a/include/linux/lockdep.h
b/include/linux/lockdep.h
index
498bfbd
..
14c937d
100644
(file)
--- a/
include/linux/lockdep.h
+++ b/
include/linux/lockdep.h
@@
-8,6
+8,8
@@
#ifndef __LINUX_LOCKDEP_H
#define __LINUX_LOCKDEP_H
#ifndef __LINUX_LOCKDEP_H
#define __LINUX_LOCKDEP_H
+struct task_struct;
+
#ifdef CONFIG_LOCKDEP
#include <linux/linkage.h>
#ifdef CONFIG_LOCKDEP
#include <linux/linkage.h>
@@
-132,6
+134,7
@@
struct lock_list {
struct list_head entry;
struct lock_class *class;
struct stack_trace trace;
struct list_head entry;
struct lock_class *class;
struct stack_trace trace;
+ int distance;
};
/*
};
/*
@@
-242,7
+245,7
@@
extern void lock_release(struct lockdep_map *lock, int nested,
# define INIT_LOCKDEP .lockdep_recursion = 0,
# define INIT_LOCKDEP .lockdep_recursion = 0,
-#define lockdep_depth(tsk) (
(tsk)->lockdep_depth
)
+#define lockdep_depth(tsk) (
debug_locks ? (tsk)->lockdep_depth : 0
)
#else /* !LOCKDEP */
#else /* !LOCKDEP */
@@
-281,15
+284,25
@@
struct lock_class_key { };
#if defined(CONFIG_TRACE_IRQFLAGS) && defined(CONFIG_GENERIC_HARDIRQS)
extern void early_init_irq_lock_class(void);
#else
#if defined(CONFIG_TRACE_IRQFLAGS) && defined(CONFIG_GENERIC_HARDIRQS)
extern void early_init_irq_lock_class(void);
#else
-# define early_init_irq_lock_class() do { } while (0)
+static inline void early_init_irq_lock_class(void)
+{
+}
#endif
#ifdef CONFIG_TRACE_IRQFLAGS
extern void early_boot_irqs_off(void);
extern void early_boot_irqs_on(void);
#endif
#ifdef CONFIG_TRACE_IRQFLAGS
extern void early_boot_irqs_off(void);
extern void early_boot_irqs_on(void);
+extern void print_irqtrace_events(struct task_struct *curr);
#else
#else
-# define early_boot_irqs_off() do { } while (0)
-# define early_boot_irqs_on() do { } while (0)
+static inline void early_boot_irqs_off(void)
+{
+}
+static inline void early_boot_irqs_on(void)
+{
+}
+static inline void print_irqtrace_events(struct task_struct *curr)
+{
+}
#endif
/*
#endif
/*