aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2006-12-22 04:11:30 -0500
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-22 11:55:51 -0500
commit192636ad9097b13d58310a6358fd512d3084c09a (patch)
treec44415442031dbddfb1d9eb3e1309b2f74530904 /kernel
parent8701ea957dd2a7c309e17c8dcde3a64b92d8aec0 (diff)
[PATCH] relay: remove inlining
text data bss dec hex filename before: 4036 44 0 4080 ff0 kernel/relay.o after: 3727 44 0 3771 ebb kernel/relay.o Cc: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca> Cc: Tom Zanussi <zanussi@us.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/relay.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/kernel/relay.c b/kernel/relay.c
index 3e076f2acd31..284e2e8b4eed 100644
--- a/kernel/relay.c
+++ b/kernel/relay.c
@@ -322,7 +322,7 @@ static void wakeup_readers(struct work_struct *work)
322 * 322 *
323 * See relay_reset for description of effect. 323 * See relay_reset for description of effect.
324 */ 324 */
325static inline void __relay_reset(struct rchan_buf *buf, unsigned int init) 325static void __relay_reset(struct rchan_buf *buf, unsigned int init)
326{ 326{
327 size_t i; 327 size_t i;
328 328
@@ -418,7 +418,7 @@ static struct rchan_buf *relay_open_buf(struct rchan *chan,
418 * The channel buffer and channel buffer data structure are then freed 418 * The channel buffer and channel buffer data structure are then freed
419 * automatically when the last reference is given up. 419 * automatically when the last reference is given up.
420 */ 420 */
421static inline void relay_close_buf(struct rchan_buf *buf) 421static void relay_close_buf(struct rchan_buf *buf)
422{ 422{
423 buf->finalized = 1; 423 buf->finalized = 1;
424 cancel_delayed_work(&buf->wake_readers); 424 cancel_delayed_work(&buf->wake_readers);
@@ -426,7 +426,7 @@ static inline void relay_close_buf(struct rchan_buf *buf)
426 kref_put(&buf->kref, relay_remove_buf); 426 kref_put(&buf->kref, relay_remove_buf);
427} 427}
428 428
429static inline void setup_callbacks(struct rchan *chan, 429static void setup_callbacks(struct rchan *chan,
430 struct rchan_callbacks *cb) 430 struct rchan_callbacks *cb)
431{ 431{
432 if (!cb) { 432 if (!cb) {
@@ -946,11 +946,10 @@ typedef int (*subbuf_actor_t) (size_t read_start,
946/* 946/*
947 * relay_file_read_subbufs - read count bytes, bridging subbuf boundaries 947 * relay_file_read_subbufs - read count bytes, bridging subbuf boundaries
948 */ 948 */
949static inline ssize_t relay_file_read_subbufs(struct file *filp, 949static ssize_t relay_file_read_subbufs(struct file *filp, loff_t *ppos,
950 loff_t *ppos, 950 subbuf_actor_t subbuf_actor,
951 subbuf_actor_t subbuf_actor, 951 read_actor_t actor,
952 read_actor_t actor, 952 read_descriptor_t *desc)
953 read_descriptor_t *desc)
954{ 953{
955 struct rchan_buf *buf = filp->private_data; 954 struct rchan_buf *buf = filp->private_data;
956 size_t read_start, avail; 955 size_t read_start, avail;