diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-14 06:19:59 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-14 06:19:59 -0400 |
| commit | 8d7ccaa545490cdffdfaff0842436a8dd85cf47b (patch) | |
| tree | 8129b5907161bc6ae26deb3645ce1e280c5e1f51 /lib/plist.c | |
| parent | b2139aa0eec330c711c5a279db361e5ef1178e78 (diff) | |
| parent | 30a2f3c60a84092c8084dfe788b710f8d0768cd4 (diff) | |
Merge commit 'v2.6.27-rc3' into x86/prototypes
Conflicts:
include/asm-x86/dma-mapping.h
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) |