aboutsummaryrefslogtreecommitdiffstats
path: root/lib/sort.c
diff options
context:
space:
mode:
authorJames Bottomley <jejb@titanic.(none)>2005-05-20 16:27:44 -0400
committerJames Bottomley <jejb@titanic.(none)>2005-05-20 16:27:44 -0400
commitad34ea2cc3845ef4dcd7d12fb0fa8484734bd672 (patch)
treead434400f5ecaa33b433c8f830e40792d8d6c05c /lib/sort.c
parent90356ac3194bf91a441a5f9c3067af386ef62462 (diff)
parent88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 (diff)
merge by hand - fix up rejections in Documentation/DocBook/Makefile
Diffstat (limited to 'lib/sort.c')
-rw-r--r--lib/sort.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sort.c b/lib/sort.c
index ea3caedeabdb..b73dbb0e7c83 100644
--- a/lib/sort.c
+++ b/lib/sort.c
@@ -90,7 +90,7 @@ int cmpint(const void *a, const void *b)
90 90
91static int sort_test(void) 91static int sort_test(void)
92{ 92{
93 int *a, i, r = 0; 93 int *a, i, r = 1;
94 94
95 a = kmalloc(1000 * sizeof(int), GFP_KERNEL); 95 a = kmalloc(1000 * sizeof(int), GFP_KERNEL);
96 BUG_ON(!a); 96 BUG_ON(!a);