diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-28 18:07:55 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-28 18:07:55 -0400 |
| commit | cb28a1bbdb4790378e7366d6c9ee1d2340b84f92 (patch) | |
| tree | 316436f77dac75335fd2c3ef5f109e71606c50d3 /lib/plist.c | |
| parent | b6d4f7e3ef25beb8c658c97867d98883e69dc544 (diff) | |
| parent | f934fb19ef34730263e6afc01e8ec27a8a71470f (diff) | |
Merge branch 'linus' into core/generic-dma-coherent
Conflicts:
arch/x86/Kconfig
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'lib/plist.c')
| -rw-r--r-- | lib/plist.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lib/plist.c b/lib/plist.c index 3074a02272f3..d6c64a824e1d 100644 --- a/lib/plist.c +++ b/lib/plist.c | |||
| @@ -31,12 +31,13 @@ | |||
| 31 | static void plist_check_prev_next(struct list_head *t, struct list_head *p, | 31 | static void plist_check_prev_next(struct list_head *t, struct list_head *p, |
| 32 | struct list_head *n) | 32 | struct list_head *n) |
| 33 | { | 33 | { |
| 34 | if (n->prev != p || p->next != n) { | 34 | WARN(n->prev != p || p->next != n, |
| 35 | printk("top: %p, n: %p, p: %p\n", t, t->next, t->prev); | 35 | "top: %p, n: %p, p: %p\n" |
| 36 | printk("prev: %p, n: %p, p: %p\n", p, p->next, p->prev); | 36 | "prev: %p, n: %p, p: %p\n" |
| 37 | printk("next: %p, n: %p, p: %p\n", n, n->next, n->prev); | 37 | "next: %p, n: %p, p: %p\n", |
| 38 | WARN_ON(1); | 38 | t, t->next, t->prev, |
| 39 | } | 39 | p, p->next, p->prev, |
| 40 | n, n->next, n->prev); | ||
| 40 | } | 41 | } |
| 41 | 42 | ||
| 42 | static void plist_check_list(struct list_head *top) | 43 | static void plist_check_list(struct list_head *top) |