Merge remote-tracking branch 'tip/timers/core' into fordlezcano/3.13/sched-clock64...

[firefly-linux-kernel-4.4.55.git] / arch / tile / lib / strlen_32.c

diff --git a/arch/tile/lib/strlen_32.c b/arch/tile/lib/strlen_32.c
index 4974292a553498bc789dae5e4e938e95e311051c..f26f88e11e4a8d9885ba10eec773b4181a5739a8 100644 (file)
--- a/arch/tile/lib/strlen_32.c
+++ b/arch/tile/lib/strlen_32.c
@@ -16,8 +16,6 @@
 #include <linux/string.h>
 #include <linux/module.h>
 
-#undef strlen
-
 size_t strlen(const char *s)
 {
        /* Get an aligned pointer. */