1 --- linux-2.6.27/arch/sparc/include/asm/spinlock_64.h~ 2007-02-04 19:44:54.000000000 +0100
2 +++ linux-2.6.27/arch/sparc/include/asm/spinlock_64.h 2007-04-10 01:05:35.426190250 +0200
5 /* Multi-reader locks, these are much saner than the 32-bit Sparc ones... */
7 -static void inline __read_lock(raw_rwlock_t *lock)
8 +static inline void __read_lock(raw_rwlock_t *lock)
10 unsigned long tmp1, tmp2;
16 -static int inline __read_trylock(raw_rwlock_t *lock)
17 +static inline int __read_trylock(raw_rwlock_t *lock)
25 -static void inline __read_unlock(raw_rwlock_t *lock)
26 +static inline void __read_unlock(raw_rwlock_t *lock)
28 unsigned long tmp1, tmp2;
34 -static void inline __write_lock(raw_rwlock_t *lock)
35 +static inline void __write_lock(raw_rwlock_t *lock)
37 unsigned long mask, tmp1, tmp2;
43 -static void inline __write_unlock(raw_rwlock_t *lock)
44 +static inline void __write_unlock(raw_rwlock_t *lock)
47 " membar #LoadStore | #StoreStore\n"
52 -static int inline __write_trylock(raw_rwlock_t *lock)
53 +static inline int __write_trylock(raw_rwlock_t *lock)
55 unsigned long mask, tmp1, tmp2, result;
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
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)
67 return call_prom("getprop", 4, 1, node, ADDR(pname),
68 (u32)(unsigned long) value, (u32) valuelen);
71 -static int inline prom_getproplen(phandle node, const char *pname)
72 +static inline int prom_getproplen(phandle node, const char *pname)
74 return call_prom("getproplen", 2, 1, node, ADDR(pname));
76 --- linux-2.6.20/include/linux/cpuset.h~ 2007-02-04 19:44:54.000000000 +0100
77 +++ linux-2.6.20/include/linux/cpuset.h 2007-04-10 02:06:13.121532000 +0200
79 extern int __cpuset_zone_allowed_softwall(struct zone *z, gfp_t gfp_mask);
80 extern int __cpuset_zone_allowed_hardwall(struct zone *z, gfp_t gfp_mask);
82 -static int inline cpuset_zone_allowed_softwall(struct zone *z, gfp_t gfp_mask)
83 +static inline int cpuset_zone_allowed_softwall(struct zone *z, gfp_t gfp_mask)
85 return number_of_cpusets <= 1 ||
86 __cpuset_zone_allowed_softwall(z, gfp_mask);
89 -static int inline cpuset_zone_allowed_hardwall(struct zone *z, gfp_t gfp_mask)
90 +static inline int cpuset_zone_allowed_hardwall(struct zone *z, gfp_t gfp_mask)
92 return number_of_cpusets <= 1 ||
93 __cpuset_zone_allowed_hardwall(z, gfp_mask);
94 --- linux-2.6.24-rc8/fs/ocfs2/dir.c.org 2008-01-23 08:32:50.134566450 +0100
95 +++ linux-2.6.24-rc8/fs/ocfs2/dir.c 2008-01-23 08:32:57.441604337 +0100
98 * Returns 0 if not found, -1 on failure, and 1 on success
100 -static int inline ocfs2_search_dirblock(struct buffer_head *bh,
101 +static inline int ocfs2_search_dirblock(struct buffer_head *bh,
103 const char *name, int namelen,
104 unsigned long offset,
105 --- linux-2.6.20/drivers/media/video/cx88/cx88.h~ 2007-04-10 01:58:14.000000000 +0200
106 +++ linux-2.6.20/drivers/media/video/cx88/cx88.h 2007-04-10 02:17:05.442299500 +0200
108 /* ----------------------------------------------------------- */
111 -static unsigned int inline norm_maxw(v4l2_std_id norm)
112 +static inline unsigned int norm_maxw(v4l2_std_id norm)
114 return (norm & (V4L2_STD_MN & ~V4L2_STD_PAL_Nc)) ? 720 : 768;
118 -static unsigned int inline norm_maxh(v4l2_std_id norm)
119 +static inline unsigned int norm_maxh(v4l2_std_id norm)
121 return (norm & V4L2_STD_625_50) ? 576 : 480;
123 --- linux-2.6.20/drivers/isdn/hardware/eicon/platform.h~ 2007-02-04 19:44:54.000000000 +0100
124 +++ linux-2.6.20/drivers/isdn/hardware/eicon/platform.h 2007-04-10 02:20:13.490051750 +0200
127 ** I/O Port utilities
129 -int diva_os_register_io_port (void *adapter, int register, unsigned long port,
130 +int diva_os_register_io_port (void *adapter, register int, unsigned long port,
131 unsigned long length, const char* name, int id);
133 ** I/O port access abstraction
134 @@ -287,13 +287,13 @@
135 ** atomic operation, fake because we use threads
137 typedef int diva_os_atomic_t;
138 -static diva_os_atomic_t __inline__
139 +static __inline__ diva_os_atomic_t
140 diva_os_atomic_increment(diva_os_atomic_t* pv)
145 -static diva_os_atomic_t __inline__
146 +static __inline__ diva_os_atomic_t
147 diva_os_atomic_decrement(diva_os_atomic_t* pv)