summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRasmus Villemoes <linux@rasmusvillemoes.dk>2015-02-12 15:03:10 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2015-02-12 18:54:16 -0800
commit2ddae683bf36d50b960402a94a55047ab0c73e2c (patch)
tree60f4e5c60f8a7b9ba5c589601c3f62ac7d417a42
parentb8b6db1793551fac131834d413199197f86b6b5f (diff)
downloadop-kernel-dev-2ddae683bf36d50b960402a94a55047ab0c73e2c.zip
op-kernel-dev-2ddae683bf36d50b960402a94a55047ab0c73e2c.tar.gz
lib/sort.c: move include inside #if 0
The sort function and its helpers don't do memory allocation, so the slab.h include is redundant. Move it inside the #if 0 protecting the self-test, similar to how it is done in lib/list_sort.c. This removes over 450 lines from the generated dependency file. Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--lib/sort.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sort.c b/lib/sort.c
index 14fc1df..43c9fe7 100644
--- a/lib/sort.c
+++ b/lib/sort.c
@@ -7,7 +7,6 @@
#include <linux/types.h>
#include <linux/export.h>
#include <linux/sort.h>
-#include <linux/slab.h>
static void u32_swap(void *a, void *b, int size)
{
@@ -85,6 +84,7 @@ void sort(void *base, size_t num, size_t size,
EXPORT_SYMBOL(sort);
#if 0
+#include <linux/slab.h>
/* a simple boot-time regression test */
int cmpint(const void *a, const void *b)
OpenPOWER on IntegriCloud