3 files changed, 17 insertions, 7 deletions

diff --git a/lib/bug.c b/lib/bug.c
index f13daf435211..7cdfad88128f 100644
--- a/lib/bug.c
+++ b/lib/bug.c
@@ -136,8 +136,6 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
 
         bug = find_bug(bugaddr);
 
-        printk(KERN_EMERG "------------[ cut here ]------------\n");
-
         file = NULL;
         line = 0;
         warning = 0;
@@ -156,19 +154,25 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
 
         if (warning) {
                 /* this is a WARN_ON rather than BUG/BUG_ON */
+                printk(KERN_WARNING "------------[ cut here ]------------\n");
+
                 if (file)
-                        printk(KERN_ERR "Badness at %s:%u\n",
+                        printk(KERN_WARNING "WARNING: at %s:%u\n",
                                file, line);
                 else
-                        printk(KERN_ERR "Badness at %p "
+                        printk(KERN_WARNING "WARNING: at %p "
                                "[verbose debug info unavailable]\n",
                                (void *)bugaddr);
 
+                print_modules();
                 show_regs(regs);
+                print_oops_end_marker();
                 add_taint(BUG_GET_TAINT(bug));
                 return BUG_TRAP_TYPE_WARN;
         }
 
+        printk(KERN_EMERG "------------[ cut here ]------------\n");
+
         if (file)
                 printk(KERN_CRIT "kernel BUG at %s:%u!\n",
                        file, line);
diff --git a/lib/decompress_bunzip2.c b/lib/decompress_bunzip2.c
index a4e971dee102..81c8bb1cc6aa 100644
--- a/lib/decompress_bunzip2.c
+++ b/lib/decompress_bunzip2.c
@@ -107,6 +107,8 @@ struct bunzip_data {
         unsigned char selectors[32768];         /* nSelectors = 15 bits */
         struct group_data groups[MAX_GROUPS];   /* Huffman coding tables */
         int io_error;                   /* non-zero if we have IO error */
+        int byteCount[256];
+        unsigned char symToByte[256], mtfSymbol[256];
 };
 
 
@@ -158,14 +160,16 @@ static int INIT get_next_block(struct bunzip_data *bd)
         int *base = NULL;
         int *limit = NULL;
         int dbufCount, nextSym, dbufSize, groupCount, selector,
-                i, j, k, t, runPos, symCount, symTotal, nSelectors,
-                byteCount[256];
-        unsigned char uc, symToByte[256], mtfSymbol[256], *selectors;
+                i, j, k, t, runPos, symCount, symTotal, nSelectors, *byteCount;
+        unsigned char uc, *symToByte, *mtfSymbol, *selectors;
         unsigned int *dbuf, origPtr;
 
         dbuf = bd->dbuf;
         dbufSize = bd->dbufSize;
         selectors = bd->selectors;
+        byteCount = bd->byteCount;
+        symToByte = bd->symToByte;
+        mtfSymbol = bd->mtfSymbol;
 
         /* Read in header signature and CRC, then validate signature.
            (last block signature means CRC is for whole file, return now) */
diff --git a/lib/inflate.c b/lib/inflate.c
index 677b738c2204..013a76193481 100644
--- a/lib/inflate.c
+++ b/lib/inflate.c
@@ -103,7 +103,9 @@
       the two sets of lengths.
  */
 #include <linux/compiler.h>
+#ifdef NO_INFLATE_MALLOC
 #include <linux/slab.h>
+#endif
 
 #ifdef RCSID
 static char rcsid[] = "#Id: inflate.c,v 0.14 1993/06/10 13:27:04 jloup Exp #";