]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
NOMMU: Remove an extraneous no_printk()
authorDavid Howells <dhowells@redhat.com>
Fri, 13 Aug 2010 10:25:12 +0000 (11:25 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 Aug 2010 23:55:25 +0000 (16:55 -0700)
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>
mm/nommu.c

index b76f3ee0abe015a85f36ff4b2599cff21d3c3efd..efa9a380335eed137c30d5c762c5a5cdae469b9c 100644 (file)
 #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__)