binfmt_elf_fdpic: Update for cputime changes.

[linux-2.6-omap-h63xx.git] / fs / jffs2 / compr_rubin.c

diff --git a/fs/jffs2/compr_rubin.c b/fs/jffs2/compr_rubin.c
index 1f3a4410523bee934af25f95693c9ec93c7f8bcf..c73fa89b5f8a66507e59a30a0d3539673515dc8c 100644 (file)
--- a/fs/jffs2/compr_rubin.c
+++ b/fs/jffs2/compr_rubin.c
@@ -21,16 +21,6 @@
 #define LOWER_BITS_RUBIN   ((((long) 1)<<(RUBIN_REG_SIZE-1))-1)
 
 
-struct rubin_state {
-       unsigned long p;
-       unsigned long q;
-       unsigned long rec_q;
-       long bit_number;
-       struct pushpull pp;
-       int bit_divider;
-       int bits[8];
-};
-
 #define BIT_DIVIDER_MIPS 1043
 static int bits_mips[8] = { 277,249,290,267,229,341,212,241}; /* mips32 */
 
@@ -43,6 +33,15 @@ struct pushpull {
        unsigned int reserve;
 };
 
+struct rubin_state {
+       unsigned long p;
+       unsigned long q;
+       unsigned long rec_q;
+       long bit_number;
+       struct pushpull pp;
+       int bit_divider;
+       int bits[8];
+};
 
 static inline void init_pushpull(struct pushpull *pp, char *buf, unsigned buflen, unsigned ofs, unsigned reserve)
 {
@@ -385,7 +384,7 @@ static int jffs2_rubinmips_decompress(unsigned char *data_in,
                                      void *model)
 {
        rubin_do_decompress(BIT_DIVIDER_MIPS, bits_mips, data_in, cpage_out, sourcelen, dstlen);
-        return 0;
+       return 0;
 }
 
 static int jffs2_dynrubin_decompress(unsigned char *data_in,
@@ -400,7 +399,7 @@ static int jffs2_dynrubin_decompress(unsigned char *data_in,
                bits[c] = data_in[c];
 
        rubin_do_decompress(256, bits, data_in+8, cpage_out, sourcelen-8, dstlen);
-        return 0;
+       return 0;
 }
 
 static struct jffs2_compressor jffs2_rubinmips_comp = {