Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42fdfa23 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

namespacecheck: more kernel/printk.c fixes 



[ Stephen Rothwell <sfr@canb.auug.org.au>: build fix ]

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 7f6f3a39

include/linux/kernel.h

+0 −6
Original line number Diff line number Diff line
@@ -184,9 +184,6 @@ asmlinkage int vprintk(const char *fmt, va_list args) 
	__attribute__ ((format (printf, 1, 0)));

asmlinkage int printk(const char * fmt, ...)

	__attribute__ ((format (printf, 1, 2))) __cold;

extern int log_buf_get_len(void);

extern int log_buf_read(int idx);

extern int log_buf_copy(char *dest, int idx, int len);



extern int printk_ratelimit_jiffies;

extern int printk_ratelimit_burst;
@@ -202,9 +199,6 @@ static inline int vprintk(const char *s, va_list args) { return 0; } 
static inline int printk(const char *s, ...)

	__attribute__ ((format (printf, 1, 2)));

static inline int __cold printk(const char *s, ...) { return 0; }

static inline int log_buf_get_len(void) { return 0; }

static inline int log_buf_read(int idx) { return 0; }

static inline int log_buf_copy(char *dest, int idx, int len) { return 0; }

static inline int printk_ratelimit(void) { return 0; }

static inline int __printk_ratelimit(int ratelimit_jiffies, \

				     int ratelimit_burst) { return 0; }

kernel/printk.c

+0 −13
Original line number Diff line number Diff line
@@ -267,19 +267,6 @@ int log_buf_copy(char *dest, int idx, int len) 
	return ret;

}



/*

 * Extract a single character from the log buffer.

 */

static int log_buf_read(int idx)

{

	char ret;



	if (log_buf_copy(&ret, idx, 1) == 1)

		return ret;

	else

		return -1;

}



/*

 * Commands to do_syslog:

 *