Commit fe622e76 authored Aug 13, 2010 by David Howells Committed by Linus Torvalds Aug 13, 2010

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
12fdff3f ("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>

parent c7887325

mm/nommu.c

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -36,11 +36,6 @@
	#include <asm/mmu_context.h>		#include <asm/mmu_context.h>
	#include "internal.h"		#include "internal.h"

	static inline __attribute__((format(printf, 1, 2)))
	void no_printk(const char *fmt, ...)
	{
	}

	#if 0		#if 0
	#define kenter(FMT, ...) \		#define kenter(FMT, ...) \
	printk(KERN_DEBUG "==> %s("FMT")\n", __func__, ##__VA_ARGS__)		printk(KERN_DEBUG "==> %s("FMT")\n", __func__, ##__VA_ARGS__)