diff --git a/[refs] b/[refs]
index b5e1b435b6b1..9066483f4d69 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f6f3a39d258adf51f0fb1fe0dab52272a1c61a4
+refs/heads/master: 42fdfa238a23643226910acf922ea930b3286032
diff --git a/trunk/include/linux/kernel.h b/trunk/include/linux/kernel.h
index 792bf0aa779b..f2a668c195bf 100644
--- a/trunk/include/linux/kernel.h
+++ b/trunk/include/linux/kernel.h
@@ -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; }
diff --git a/trunk/kernel/printk.c b/trunk/kernel/printk.c
index b620e3d96136..55d16e57499a 100644
--- a/trunk/kernel/printk.c
+++ b/trunk/kernel/printk.c
@@ -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:
  *