diff --git a/[refs] b/[refs] index 4ccbc1c862cd..39d943a3d8c7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cad359c68455d6870d053184bbb0ae208e207eef +refs/heads/master: d28c2bc8d192f606a4eb831978722107b20a9405 diff --git a/trunk/lib/sort.c b/trunk/lib/sort.c index ea3caedeabdb..b73dbb0e7c83 100644 --- a/trunk/lib/sort.c +++ b/trunk/lib/sort.c @@ -90,7 +90,7 @@ int cmpint(const void *a, const void *b) static int sort_test(void) { - int *a, i, r = 0; + int *a, i, r = 1; a = kmalloc(1000 * sizeof(int), GFP_KERNEL); BUG_ON(!a);