aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-01-10 12:06:19 +0100
committerIngo Molnar <mingo@elte.hu>2009-01-10 12:06:19 +0100
commit736f93236ce786d1bcf09ad4dcb38a360d35ea1b (patch)
tree9d400ee537c86df5b8fbd890d0942e550305bf03
parentb17304245f0db0ac69b795c411407808f3f2796d (diff)
downloadmrst-s0i3-test-736f93236ce786d1bcf09ad4dcb38a360d35ea1b.tar.gz
mrst-s0i3-test-736f93236ce786d1bcf09ad4dcb38a360d35ea1b.tar.xz
mrst-s0i3-test-736f93236ce786d1bcf09ad4dcb38a360d35ea1b.zip
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>
-rw-r--r--init/initramfs.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/init/initramfs.c b/init/initramfs.c
index f8241e832aa..76f4a012533 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 */