rpms/kernel/devel linux-2.6-warnings-inline.patch,1.4,1.5

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27600

Modified Files:
	linux-2.6-warnings-inline.patch 
Log Message:
warning fix

linux-2.6-warnings-inline.patch:
 b/arch/i386/oprofile/op_model_p4.c                               |    2 -
 b/arch/powerpc/kernel/prom_init.c                                |    4 +-
 b/drivers/acpi/tables/tbfadt.c                                   |    4 +-
 b/drivers/isdn/hardware/eicon/divasmain.c                        |   12 +++----
 b/drivers/isdn/hardware/eicon/platform.h                         |    4 +-
 b/drivers/media/common/ir-functions.c                            |    2 -
 b/drivers/media/video/cx88/cx88-core.c                           |   12 +++----
 b/drivers/media/video/cx88/cx88.h                                |    4 +-
 b/drivers/net/sky2.c                                             |    2 -
 b/drivers/net/wireless/ipw2200.c                                 |    2 -
 b/drivers/scsi/tmscsim.c                                         |   16 +++++-----
 b/drivers/usb/serial/safe_serial.c                               |    2 -
 b/drivers/video/intelfb/intelfbdrv.c                             |    2 -
 b/fs/ocfs2/namei.c                                               |    4 +-
 b/include/asm-powerpc/spinlock.h                                 |   10 +++---
 b/include/linux/cpuset.h                                         |    4 +-
 b/kernel/mutex.c                                                 |    2 -
 b/sound/drivers/opl4/opl4_lib.c                                  |    2 -
 b/sound/pci/au88x0/au88x0.h                                      |    4 +-
 b/sound/pci/au88x0/au88x0_core.c                                 |    4 +-
 linux-2.6.20.noarch/arch/ia64/kernel/mca.c                       |    2 -
 linux-2.6.20.noarch/arch/ia64/sn/pci/pcibr/pcibr_ate.c           |    2 -
 linux-2.6.20.noarch/arch/ia64/sn/pci/tioce_provider.c            |    4 +-
 linux-2.6.20.noarch/arch/s390/kernel/traps.c                     |    4 +-
 linux-2.6.20.noarch/drivers/char/mmtimer.c                       |   16 +++++-----
 linux-2.6.20.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c |   10 +++---
 linux-2.6.20.noarch/drivers/s390/net/ctcmain.c                   |    2 -
 linux-2.6.20.noarch/drivers/serial/ioc3_serial.c                 |    4 +-
 linux-2.6.20.noarch/drivers/serial/ioc4_serial.c                 |    4 +-
 linux-2.6.20.noarch/include/asm-powerpc/spinlock.h               |    8 ++---
 linux-2.6.20.noarch/net/mac80211/ieee80211.c                     |    6 +--
 31 files changed, 80 insertions(+), 80 deletions(-)

Index: linux-2.6-warnings-inline.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-warnings-inline.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-warnings-inline.patch	13 Apr 2007 20:44:51 -0000	1.4
+++ linux-2.6-warnings-inline.patch	16 Apr 2007 21:28:37 -0000	1.5
@@ -331,6 +331,15 @@
 index 28dd757..f8de8e7 100644
 --- a/fs/ocfs2/namei.c
 +++ b/fs/ocfs2/namei.c
+@@ -69,7 +69,7 @@
+ #define NAMEI_RA_SIZE        (NAMEI_RA_CHUNKS * NAMEI_RA_BLOCKS)
+ #define NAMEI_RA_INDEX(c,b)  (((c) * NAMEI_RA_BLOCKS) + (b))
+ 
+-static int inline ocfs2_search_dirblock(struct buffer_head *bh,
++static inline int ocfs2_search_dirblock(struct buffer_head *bh,
+ 					struct inode *dir,
+ 					const char *name, int namelen,
+ 					unsigned long offset,
 @@ -1926,7 +1926,7 @@ bail:
  /*
   * Returns 0 if not found, -1 on failure, and 1 on success