[tip:core/percpu] bzip2/lzma: make flush_buffer() unconditional

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Commit-ID:  736f93236ce786d1bcf09ad4dcb38a360d35ea1b
Gitweb:     http://git.kernel.org/tip/736f93236ce786d1bcf09ad4dcb38a360d35ea1b
Author:     "Ingo Molnar" <mingo@xxxxxxx>
AuthorDate: Sat, 10 Jan 2009 12:06:19 +0100
Commit:     Ingo Molnar <mingo@xxxxxxx>
CommitDate: Sat, 10 Jan 2009 12:06:19 +0100

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@xxxxxxx>


---
 init/initramfs.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

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 */
 
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Stable Commits]     [Linux Stable Kernel]     [Linux Kernel]     [Linux USB Devel]     [Linux Video &Media]     [Linux Audio Users]     [Yosemite News]     [Linux SCSI]

  Powered by Linux