Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 217573
b: refs/heads/master
c: bb2ab10
h: refs/heads/master
i:
  217571: 0418499
v: v3
  • Loading branch information
Artem Bityutskiy authored and Linus Torvalds committed Oct 26, 2010
1 parent eb3a002 commit b1b752b
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6d411e6c01608cefb7b9ea6712110538a1432f9f
refs/heads/master: bb2ab10fa693110cffa7087ffe2749d6e9a27d5f
16 changes: 8 additions & 8 deletions trunk/lib/list_sort.c
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ static int __init list_sort_test(void)
struct list_head *head = kmalloc(sizeof(*head), GFP_KERNEL);
struct list_head *cur;

printk(KERN_WARNING "testing list_sort()\n");
printk(KERN_DEBUG "testing list_sort()\n");

cur = head;
for (i = 0; i < LIST_SORT_TEST_LENGTH; i++) {
Expand All @@ -189,26 +189,26 @@ static int __init list_sort_test(void)
struct debug_el *el = container_of(cur, struct debug_el, l_h);
int cmp_result = cmp(NULL, cur, cur->next);
if (cur->next->prev != cur) {
printk(KERN_EMERG "list_sort() returned "
"a corrupted list!\n");
printk(KERN_ERR "list_sort() returned "
"a corrupted list!\n");
return 1;
} else if (cmp_result > 0) {
printk(KERN_EMERG "list_sort() failed to sort!\n");
printk(KERN_ERR "list_sort() failed to sort!\n");
return 1;
} else if (cmp_result == 0 &&
el->serial >= container_of(cur->next,
struct debug_el, l_h)->serial) {
printk(KERN_EMERG "list_sort() failed to preserve order"
" of equivalent elements!\n");
printk(KERN_ERR "list_sort() failed to preserve order "
"of equivalent elements!\n");
return 1;
}
kfree(cur->prev);
count++;
}
kfree(cur);
if (count != LIST_SORT_TEST_LENGTH) {
printk(KERN_EMERG "list_sort() returned list of"
"different length!\n");
printk(KERN_ERR "list_sort() returned list of "
"different length!\n");
return 1;
}
return 0;
Expand Down

0 comments on commit b1b752b

Please sign in to comment.