linux-2.6-warnings.patch

   1 --- linux-2.6.20/include/asm-sparc64/spinlock.h~        2007-02-04 19:44:54.000000000 +0100
   2 +++ linux-2.6.20/include/asm-sparc64/spinlock.h 2007-04-10 01:05:35.426190250 +0200
   3 @@ -105,7 +105,7 @@
   4
   5  /* Multi-reader locks, these are much saner than the 32-bit Sparc ones... */
   6
   7 -static void inline __read_lock(raw_rwlock_t *lock)
   8 +static inline void __read_lock(raw_rwlock_t *lock)
   9  {
  10         unsigned long tmp1, tmp2;
  11
  12 @@ -130,7 +130,7 @@
  13         : "memory");
  14  }
  15
  16 -static int inline __read_trylock(raw_rwlock_t *lock)
  17 +static inline int __read_trylock(raw_rwlock_t *lock)
  18  {
  19         int tmp1, tmp2;
  20
  21 @@ -152,7 +152,7 @@
  22         return tmp1;
  23  }
  24
  25 -static void inline __read_unlock(raw_rwlock_t *lock)
  26 +static inline void __read_unlock(raw_rwlock_t *lock)
  27  {
  28         unsigned long tmp1, tmp2;
  29
  30 @@ -169,7 +169,7 @@
  31         : "memory");
  32  }
  33
  34 -static void inline __write_lock(raw_rwlock_t *lock)
  35 +static inline void __write_lock(raw_rwlock_t *lock)
  36  {
  37         unsigned long mask, tmp1, tmp2;
  38
  39 @@ -196,7 +196,7 @@
  40         : "memory");
  41  }
  42
  43 -static void inline __write_unlock(raw_rwlock_t *lock)
  44 +static inline void __write_unlock(raw_rwlock_t *lock)
  45  {
  46         __asm__ __volatile__(
  47  "      membar          #LoadStore | #StoreStore\n"
  48 @@ -206,7 +206,7 @@
  49         : "memory");
  50  }
  51
  52 -static int inline __write_trylock(raw_rwlock_t *lock)
  53 +static inline int __write_trylock(raw_rwlock_t *lock)
  54  {
  55         unsigned long mask, tmp1, tmp2, result;
  56
  57 --- linux-2.6.20/arch/powerpc/kernel/prom_init.c~       2007-02-04 19:44:54.000000000 +0100
  58 +++ linux-2.6.20/arch/powerpc/kernel/prom_init.c        2007-04-10 01:59:33.712570500 +0200
  59 @@ -429,14 +429,14 @@
  60         }
  61  }
  62
  63 -static int inline prom_getprop(phandle node, const char *pname,
  64 +static inline int prom_getprop(phandle node, const char *pname,
  65                                void *value, size_t valuelen)
  66  {
  67         return call_prom("getprop", 4, 1, node, ADDR(pname),
  68                          (u32)(unsigned long) value, (u32) valuelen);
  69  }
  70
  71 -static int inline prom_getproplen(phandle node, const char *pname)
  72 +static inline int prom_getproplen(phandle node, const char *pname)
  73  {
  74         return call_prom("getproplen", 2, 1, node, ADDR(pname));
  75  }
  76 --- linux-2.6.20/include/asm-powerpc/spinlock.h~        2007-02-04 19:44:54.000000000 +0100
  77 +++ linux-2.6.20/include/asm-powerpc/spinlock.h 2007-04-10 02:04:45.976085750 +0200
  78 @@ -72,7 +72,7 @@
  79         return tmp;
  80  }
  81
  82 -static int __inline__ __raw_spin_trylock(raw_spinlock_t *lock)
  83 +static __inline__ int __raw_spin_trylock(raw_spinlock_t *lock)
  84  {
  85         CLEAR_IO_SYNC;
  86         return __spin_trylock(lock) == 0;
  87 @@ -103,7 +103,7 @@
  88  #define SHARED_PROCESSOR       0
  89  #endif
  90
  91 -static void __inline__ __raw_spin_lock(raw_spinlock_t *lock)
  92 +static __inline__ void __raw_spin_lock(raw_spinlock_t *lock)
  93  {
  94         CLEAR_IO_SYNC;
  95         while (1) {
  96 @@ -118,7 +118,7 @@
  97         }
  98  }
  99
 100 -static void __inline__ __raw_spin_lock_flags(raw_spinlock_t *lock, unsigned long flags)
 101 +static __inline__ void __raw_spin_lock_flags(raw_spinlock_t *lock, unsigned long flags)
 102  {
 103         unsigned long flags_dis;
 104
 105 @@ -179,7 +179,7 @@
 106   * This returns the old value in the lock + 1,
 107   * so we got a read lock if the return value is > 0.
 108   */
 109 -static long __inline__ __read_trylock(raw_rwlock_t *rw)
 110 +static __inline__ long __read_trylock(raw_rwlock_t *rw)
 111  {
 112         long tmp;
 113
 114 @@ -223,7 +223,7 @@
 115         return tmp;
 116  }
 117
 118 -static void __inline__ __raw_read_lock(raw_rwlock_t *rw)
 119 +static __inline__ void __raw_read_lock(raw_rwlock_t *rw)
 120  {
 121         while (1) {
 122                 if (likely(__read_trylock(rw) > 0))
 123 @@ -237,7 +237,7 @@
 124         }
 125  }
 126
 127 -static void __inline__ __raw_write_lock(raw_rwlock_t *rw)
 128 +static __inline__ void __raw_write_lock(raw_rwlock_t *rw)
 129  {
 130         while (1) {
 131                 if (likely(__write_trylock(rw) == 0))
 132 @@ -251,17 +251,17 @@
 133         }
 134  }
 135
 136 -static int __inline__ __raw_read_trylock(raw_rwlock_t *rw)
 137 +static __inline__ int __raw_read_trylock(raw_rwlock_t *rw)
 138  {
 139         return __read_trylock(rw) > 0;
 140  }
 141
 142 -static int __inline__ __raw_write_trylock(raw_rwlock_t *rw)
 143 +static __inline__ int __raw_write_trylock(raw_rwlock_t *rw)
 144  {
 145         return __write_trylock(rw) == 0;
 146  }
 147
 148 -static void __inline__ __raw_read_unlock(raw_rwlock_t *rw)
 149 +static __inline__ void __raw_read_unlock(raw_rwlock_t *rw)
 150  {
 151         long tmp;
 152
 153 --- linux-2.6.20/include/linux/cpuset.h~        2007-02-04 19:44:54.000000000 +0100
 154 +++ linux-2.6.20/include/linux/cpuset.h 2007-04-10 02:06:13.121532000 +0200
 155 @@ -33,13 +33,13 @@
 156  extern int __cpuset_zone_allowed_softwall(struct zone *z, gfp_t gfp_mask);
 157  extern int __cpuset_zone_allowed_hardwall(struct zone *z, gfp_t gfp_mask);
 158
 159 -static int inline cpuset_zone_allowed_softwall(struct zone *z, gfp_t gfp_mask)
 160 +static inline int cpuset_zone_allowed_softwall(struct zone *z, gfp_t gfp_mask)
 161  {
 162         return number_of_cpusets <= 1 ||
 163                 __cpuset_zone_allowed_softwall(z, gfp_mask);
 164  }
 165
 166 -static int inline cpuset_zone_allowed_hardwall(struct zone *z, gfp_t gfp_mask)
 167 +static inline int cpuset_zone_allowed_hardwall(struct zone *z, gfp_t gfp_mask)
 168  {
 169         return number_of_cpusets <= 1 ||
 170                 __cpuset_zone_allowed_hardwall(z, gfp_mask);
 171 --- linux-2.6.20/fs/ocfs2/namei.c~      2007-04-10 01:58:15.000000000 +0200
 172 +++ linux-2.6.20/fs/ocfs2/namei.c       2007-04-10 02:10:03.999961000 +0200
 173 @@ -70,7 +70,7 @@
 174  #define NAMEI_RA_SIZE        (NAMEI_RA_CHUNKS * NAMEI_RA_BLOCKS)
 175  #define NAMEI_RA_INDEX(c,b)  (((c) * NAMEI_RA_BLOCKS) + (b))
 176
 177 -static int inline ocfs2_search_dirblock(struct buffer_head *bh,
 178 +static inline int ocfs2_search_dirblock(struct buffer_head *bh,
 179                                         struct inode *dir,
 180                                         const char *name, int namelen,
 181                                         unsigned long offset,
 182 @@ -1936,7 +1936,7 @@
 183  /*
 184   * Returns 0 if not found, -1 on failure, and 1 on success
 185   */
 186 -static int inline ocfs2_search_dirblock(struct buffer_head *bh,
 187 +static inline int ocfs2_search_dirblock(struct buffer_head *bh,
 188                                         struct inode *dir,
 189                                         const char *name, int namelen,
 190                                         unsigned long offset,
 191 --- linux-2.6.20/drivers/media/video/cx88/cx88.h~       2007-04-10 01:58:14.000000000 +0200
 192 +++ linux-2.6.20/drivers/media/video/cx88/cx88.h        2007-04-10 02:17:05.442299500 +0200
 193 @@ -89,13 +89,13 @@
 194  /* ----------------------------------------------------------- */
 195  /* tv norms                                                    */
 196
 197 -static unsigned int inline norm_maxw(v4l2_std_id norm)
 198 +static inline unsigned int norm_maxw(v4l2_std_id norm)
 199  {
 200         return (norm & (V4L2_STD_MN & ~V4L2_STD_PAL_Nc)) ? 720 : 768;
 201  }
 202
 203
 204 -static unsigned int inline norm_maxh(v4l2_std_id norm)
 205 +static inline unsigned int norm_maxh(v4l2_std_id norm)
 206  {
 207         return (norm & V4L2_STD_625_50) ? 576 : 480;
 208  }
 209 --- linux-2.6.20/drivers/isdn/hardware/eicon/platform.h~        2007-02-04 19:44:54.000000000 +0100
 210 +++ linux-2.6.20/drivers/isdn/hardware/eicon/platform.h 2007-04-10 02:20:13.490051750 +0200
 211 @@ -219,7 +219,7 @@
 212  /*
 213  **  I/O Port utilities
 214  */
 215 -int diva_os_register_io_port (void *adapter, int register, unsigned long port,
 216 +int diva_os_register_io_port (void *adapter, register int, unsigned long port,
 217                                 unsigned long length, const char* name, int id);
 218  /*
 219  **  I/O port access abstraction
 220 @@ -287,13 +287,13 @@
 221  **  atomic operation, fake because we use threads
 222  */
 223  typedef int diva_os_atomic_t;
 224 -static diva_os_atomic_t __inline__
 225 +static __inline__ diva_os_atomic_t
 226  diva_os_atomic_increment(diva_os_atomic_t* pv)
 227  {
 228    *pv += 1;
 229    return (*pv);
 230  }
 231 -static diva_os_atomic_t __inline__
 232 +static __inline__ diva_os_atomic_t
 233  diva_os_atomic_decrement(diva_os_atomic_t* pv)
 234  {
 235    *pv -= 1;