diff options
| author | Adrian Bunk <bunk@stusta.de> | 2006-03-23 06:00:56 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-23 10:38:16 -0500 |
| commit | 41c28ff1635e71af072c4711ff5fadd5855d48e7 (patch) | |
| tree | 821a819a43b55d610d862e31b7312b6260311239 /include/linux | |
| parent | 772a0dc5d2103baff2f15c2668930bcd37add777 (diff) | |
[PATCH] kill _INLINE_
This patch removes all occurances of _INLINE_ in the kernel.
With the exception of tty_flip.h, I've simply removed the inline's since
gcc should know best which functions to be inlined.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/tty_flip.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/include/linux/tty_flip.h b/include/linux/tty_flip.h index 222faf97d5f9..0c6169fff366 100644 --- a/include/linux/tty_flip.h +++ b/include/linux/tty_flip.h | |||
| @@ -7,14 +7,8 @@ extern int tty_insert_flip_string_flags(struct tty_struct *tty, unsigned char *c | |||
| 7 | extern int tty_prepare_flip_string(struct tty_struct *tty, unsigned char **chars, size_t size); | 7 | extern int tty_prepare_flip_string(struct tty_struct *tty, unsigned char **chars, size_t size); |
| 8 | extern int tty_prepare_flip_string_flags(struct tty_struct *tty, unsigned char **chars, char **flags, size_t size); | 8 | extern int tty_prepare_flip_string_flags(struct tty_struct *tty, unsigned char **chars, char **flags, size_t size); |
| 9 | 9 | ||
| 10 | #ifdef INCLUDE_INLINE_FUNCS | 10 | static inline int tty_insert_flip_char(struct tty_struct *tty, |
| 11 | #define _INLINE_ extern | 11 | unsigned char ch, char flag) |
| 12 | #else | ||
| 13 | #define _INLINE_ static __inline__ | ||
| 14 | #endif | ||
| 15 | |||
| 16 | _INLINE_ int tty_insert_flip_char(struct tty_struct *tty, | ||
| 17 | unsigned char ch, char flag) | ||
| 18 | { | 12 | { |
| 19 | struct tty_buffer *tb = tty->buf.tail; | 13 | struct tty_buffer *tb = tty->buf.tail; |
| 20 | if (tb && tb->active && tb->used < tb->size) { | 14 | if (tb && tb->active && tb->used < tb->size) { |
| @@ -25,7 +19,7 @@ _INLINE_ int tty_insert_flip_char(struct tty_struct *tty, | |||
| 25 | return tty_insert_flip_string_flags(tty, &ch, &flag, 1); | 19 | return tty_insert_flip_string_flags(tty, &ch, &flag, 1); |
| 26 | } | 20 | } |
| 27 | 21 | ||
| 28 | _INLINE_ void tty_schedule_flip(struct tty_struct *tty) | 22 | static inline void tty_schedule_flip(struct tty_struct *tty) |
| 29 | { | 23 | { |
| 30 | unsigned long flags; | 24 | unsigned long flags; |
| 31 | spin_lock_irqsave(&tty->buf.lock, flags); | 25 | spin_lock_irqsave(&tty->buf.lock, flags); |
