--- x/Makefile.~1~	2003-01-29 06:13:15.000000000 +0100
+++ x/Makefile	2003-02-14 06:59:19.000000000 +0100
@@ -89,7 +89,7 @@ export MODLIB
 CPPFLAGS := -D__KERNEL__ -I$(HPATH)
 
 CFLAGS := $(CPPFLAGS) -Wall -Wstrict-prototypes -Wno-trigraphs -O2 \
-	  -fno-strict-aliasing -fno-common
+	  -fno-strict-aliasing -fno-common -finline-limit=2000
 ifndef CONFIG_FRAME_POINTER
 CFLAGS += -fomit-frame-pointer
 endif
--- x/fs/reiserfs/super.c.~1~	2002-11-29 02:23:16.000000000 +0100
+++ x/fs/reiserfs/super.c	2003-02-14 07:12:21.000000000 +0100
@@ -941,8 +941,8 @@ static int reread_meta_blocks(struct sup
     ll_rw_block(READ, 1, &(SB_AP_BITMAP(s)[i].bh)) ;
     wait_on_buffer(SB_AP_BITMAP(s)[i].bh) ;
     if (!buffer_uptodate(SB_AP_BITMAP(s)[i].bh)) {
-      printk("reread_meta_blocks, error reading bitmap block number %d at
-      %ld\n", i, SB_AP_BITMAP(s)[i].bh->b_blocknr) ;
+      printk("reread_meta_blocks, error reading bitmap block number %d at "
+      "%ld\n", i, SB_AP_BITMAP(s)[i].bh->b_blocknr) ;
       return 1 ;
     }
   }
--- x/fs/ocfs/Support/divdi3.c.~1~	2003-02-14 07:21:51.000000000 +0100
+++ x/fs/ocfs/Support/divdi3.c	2003-02-14 07:42:49.000000000 +0100
@@ -86,8 +86,7 @@ typedef union
 
 #ifdef __i386__
 #define sub_ddmmss(sh, sl, ah, al, bh, bl) \
-  __asm__ ("subl %5,%1
-	sbbl %3,%0"							\
+  __asm__ ("subl %5,%1\nsbbl %3,%0"					\
 	   : "=r" ((USItype) (sh)),					\
 	     "=&r" ((USItype) (sl))					\
 	   : "0" ((USItype) (ah)),					\