From: Ingo Molnar <mingo@elte.hu>
Date: Sat, 10 Jan 2009 11:06:19 +0000 (+0100)
Subject: bzip2/lzma: make flush_buffer() unconditional
X-Git-Tag: v2.6.30-rc1~625^2~12
X-Git-Url: http://ftp.safe.ca/?p=safe%2Fjmp%2Flinux-2.6;a=commitdiff_plain;h=736f93236ce786d1bcf09ad4dcb38a360d35ea1b

bzip2/lzma: make flush_buffer() unconditional

Impact: build fix

flush_buffer() is used unconditionally:

  init/initramfs.c:456: error: 'flush_buffer' undeclared (first use in this function)
  init/initramfs.c:456: error: (Each undeclared identifier is reported only once
  init/initramfs.c:456: error: for each function it appears in.)

So remove the decompressor #ifdefs from around it.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/init/initramfs.c b/init/initramfs.c
index f8241e8..76f4a01 100644
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -390,7 +390,6 @@ static int __init write_buffer(char *buf, unsigned len)
 	return len - count;
 }
 
-#if defined CONFIG_RD_GZIP || defined CONFIG_RD_BZIP2 || defined CONFIG_RD_LZMA
 static int __init flush_buffer(void *bufv, unsigned len)
 {
 	char *buf = (char *) bufv;
@@ -413,7 +412,6 @@ static int __init flush_buffer(void *bufv, unsigned len)
 	}
 	return origLen;
 }
-#endif
 
 static unsigned my_inptr;   /* index of next byte to be processed in inbuf */