summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2010-08-13 11:25:12 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-13 16:55:25 -0700
commitfe622e76fddd986e56f22842a6ce292504727ef1 (patch)
tree7e901e8d5f42a76c0e9e8e33d75b6ff791a7b759
parentc7887325230aec47d47a32562a6e26014a0fafca (diff)
downloadop-kernel-dev-fe622e76fddd986e56f22842a6ce292504727ef1.zip
op-kernel-dev-fe622e76fddd986e56f22842a6ce292504727ef1.tar.gz
NOMMU: Remove an extraneous no_printk()
Remove an extraneous no_printk() in mm/nommu.c that got missed when the function got generalised from several things that used it in commit 12fdff3fc248 ("Add a dummy printk function for the maintenance of unused printks"). Without this, the following error is observed: mm/nommu.c:41: error: conflicting types for 'no_printk' include/linux/kernel.h:314: error: previous definition of 'no_printk' was here Reported-by: Michal Simek <monstr@monstr.eu> Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--mm/nommu.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/mm/nommu.c b/mm/nommu.c
index b76f3ee..efa9a38 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -36,11 +36,6 @@
#include <asm/mmu_context.h>
#include "internal.h"
-static inline __attribute__((format(printf, 1, 2)))
-void no_printk(const char *fmt, ...)
-{
-}
-
#if 0
#define kenter(FMT, ...) \
printk(KERN_DEBUG "==> %s("FMT")\n", __func__, ##__VA_ARGS__)
OpenPOWER on IntegriCloud