[PATCH] Unlinline a bunch of other functions

Remove the "inline" keyword from a bunch of big functions in the kernel with
the goal of shrinking it by 30kb to 40kb

Signed-off-by: Arjan van de Ven <arjan@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Acked-by: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Arjan van de Ven
2006-01-14 13:20:43 -08:00
committed by Linus Torvalds
parent b0a9499c3d
commit 858119e159
74 changed files with 226 additions and 227 deletions
+1 -1
View File
@@ -153,7 +153,7 @@ static int acpi_ec_polling_mode = EC_POLLING;
Transaction Management Transaction Management
-------------------------------------------------------------------------- */ -------------------------------------------------------------------------- */
static inline u32 acpi_ec_read_status(union acpi_ec *ec) static u32 acpi_ec_read_status(union acpi_ec *ec)
{ {
u32 status = 0; u32 status = 0;
+1 -1
View File
@@ -48,7 +48,7 @@ struct firmware_priv {
struct timer_list timeout; struct timer_list timeout;
}; };
static inline void static void
fw_load_abort(struct firmware_priv *fw_priv) fw_load_abort(struct firmware_priv *fw_priv)
{ {
set_bit(FW_STATUS_ABORT, &fw_priv->status); set_bit(FW_STATUS_ABORT, &fw_priv->status);
+1 -1
View File
@@ -294,7 +294,7 @@ fail:
* This helper just factors out common code between do_lo_send_direct_write() * This helper just factors out common code between do_lo_send_direct_write()
* and do_lo_send_write(). * and do_lo_send_write().
*/ */
static inline int __do_lo_send_write(struct file *file, static int __do_lo_send_write(struct file *file,
u8 __user *buf, const int len, loff_t pos) u8 __user *buf, const int len, loff_t pos)
{ {
ssize_t bw; ssize_t bw;
+1 -1
View File
@@ -494,7 +494,7 @@ static inline void bcsp_unslip_one_byte(struct bcsp_struct *bcsp, unsigned char
} }
} }
static inline void bcsp_complete_rx_pkt(struct hci_uart *hu) static void bcsp_complete_rx_pkt(struct hci_uart *hu)
{ {
struct bcsp_struct *bcsp = hu->priv; struct bcsp_struct *bcsp = hu->priv;
int pass_up; int pass_up;
+1 -1
View File
@@ -220,7 +220,7 @@ static __inline__ void r128_emit_tex1(drm_r128_private_t * dev_priv)
ADVANCE_RING(); ADVANCE_RING();
} }
static __inline__ void r128_emit_state(drm_r128_private_t * dev_priv) static void r128_emit_state(drm_r128_private_t * dev_priv)
{ {
drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv; drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv;
unsigned int dirty = sarea_priv->dirty; unsigned int dirty = sarea_priv->dirty;
+3 -4
View File
@@ -41,7 +41,6 @@ static DEFINE_SPINLOCK(cpufreq_driver_lock);
/* internal prototypes */ /* internal prototypes */
static int __cpufreq_governor(struct cpufreq_policy *policy, unsigned int event); static int __cpufreq_governor(struct cpufreq_policy *policy, unsigned int event);
static void handle_update(void *data); static void handle_update(void *data);
static inline void adjust_jiffies(unsigned long val, struct cpufreq_freqs *ci);
/** /**
* Two notifier lists: the "policy" list is involved in the * Two notifier lists: the "policy" list is involved in the
@@ -127,7 +126,7 @@ static unsigned int debug_ratelimit = 1;
static unsigned int disable_ratelimit = 1; static unsigned int disable_ratelimit = 1;
static DEFINE_SPINLOCK(disable_ratelimit_lock); static DEFINE_SPINLOCK(disable_ratelimit_lock);
static inline void cpufreq_debug_enable_ratelimit(void) static void cpufreq_debug_enable_ratelimit(void)
{ {
unsigned long flags; unsigned long flags;
@@ -137,7 +136,7 @@ static inline void cpufreq_debug_enable_ratelimit(void)
spin_unlock_irqrestore(&disable_ratelimit_lock, flags); spin_unlock_irqrestore(&disable_ratelimit_lock, flags);
} }
static inline void cpufreq_debug_disable_ratelimit(void) static void cpufreq_debug_disable_ratelimit(void)
{ {
unsigned long flags; unsigned long flags;
@@ -206,7 +205,7 @@ static inline void cpufreq_debug_disable_ratelimit(void) { return; }
static unsigned long l_p_j_ref; static unsigned long l_p_j_ref;
static unsigned int l_p_j_ref_freq; static unsigned int l_p_j_ref_freq;
static inline void adjust_jiffies(unsigned long val, struct cpufreq_freqs *ci) static void adjust_jiffies(unsigned long val, struct cpufreq_freqs *ci)
{ {
if (ci->flags & CPUFREQ_CONST_LOOPS) if (ci->flags & CPUFREQ_CONST_LOOPS)
return; return;
+2 -2
View File
@@ -980,7 +980,7 @@ static void cdrom_buffer_sectors (ide_drive_t *drive, unsigned long sector,
* and attempt to recover if there are problems. Returns 0 if everything's * and attempt to recover if there are problems. Returns 0 if everything's
* ok; nonzero if the request has been terminated. * ok; nonzero if the request has been terminated.
*/ */
static inline static
int cdrom_read_check_ireason (ide_drive_t *drive, int len, int ireason) int cdrom_read_check_ireason (ide_drive_t *drive, int len, int ireason)
{ {
if (ireason == 2) if (ireason == 2)
@@ -1539,7 +1539,7 @@ int cdrom_queue_packet_command(ide_drive_t *drive, struct request *rq)
/* /*
* Write handling * Write handling
*/ */
static inline int cdrom_write_check_ireason(ide_drive_t *drive, int len, int ireason) static int cdrom_write_check_ireason(ide_drive_t *drive, int len, int ireason)
{ {
/* Two notes about IDE interrupt reason here - 0 means that /* Two notes about IDE interrupt reason here - 0 means that
* the drive wants to receive data from us, 2 means that * the drive wants to receive data from us, 2 means that
+1 -1
View File
@@ -477,7 +477,7 @@ static inline int idedisk_supports_lba48(const struct hd_driveid *id)
&& id->lba_capacity_2; && id->lba_capacity_2;
} }
static inline void idedisk_check_hpa(ide_drive_t *drive) static void idedisk_check_hpa(ide_drive_t *drive)
{ {
unsigned long long capacity, set_max; unsigned long long capacity, set_max;
int lba48 = idedisk_supports_lba48(drive->id); int lba48 = idedisk_supports_lba48(drive->id);
+1 -1
View File
@@ -308,7 +308,7 @@ static void ide_pio_multi(ide_drive_t *drive, unsigned int write)
ide_pio_sector(drive, write); ide_pio_sector(drive, write);
} }
static inline void ide_pio_datablock(ide_drive_t *drive, struct request *rq, static void ide_pio_datablock(ide_drive_t *drive, struct request *rq,
unsigned int write) unsigned int write)
{ {
if (rq->bio) /* fs request */ if (rq->bio) /* fs request */
+2 -2
View File
@@ -856,7 +856,7 @@ static void cm_format_req(struct cm_req_msg *req_msg,
param->private_data_len); param->private_data_len);
} }
static inline int cm_validate_req_param(struct ib_cm_req_param *param) static int cm_validate_req_param(struct ib_cm_req_param *param)
{ {
/* peer-to-peer not supported */ /* peer-to-peer not supported */
if (param->peer_to_peer) if (param->peer_to_peer)
@@ -1005,7 +1005,7 @@ static inline int cm_is_active_peer(__be64 local_ca_guid, __be64 remote_ca_guid,
(be32_to_cpu(local_qpn) > be32_to_cpu(remote_qpn)))); (be32_to_cpu(local_qpn) > be32_to_cpu(remote_qpn))));
} }
static inline void cm_format_paths_from_req(struct cm_req_msg *req_msg, static void cm_format_paths_from_req(struct cm_req_msg *req_msg,
struct ib_sa_path_rec *primary_path, struct ib_sa_path_rec *primary_path,
struct ib_sa_path_rec *alt_path) struct ib_sa_path_rec *alt_path)
{ {
+1 -1
View File
@@ -358,7 +358,7 @@ hdlc_fill_fifo(struct BCState *bcs)
} }
} }
static inline void static void
HDLC_irq(struct BCState *bcs, u_int stat) { HDLC_irq(struct BCState *bcs, u_int stat) {
int len; int len;
struct sk_buff *skb; struct sk_buff *skb;
+1 -1
View File
@@ -476,7 +476,7 @@ Memhscx_fill_fifo(struct BCState *bcs)
} }
} }
static inline void static void
Memhscx_interrupt(struct IsdnCardState *cs, u_char val, u_char hscx) Memhscx_interrupt(struct IsdnCardState *cs, u_char val, u_char hscx)
{ {
u_char r; u_char r;
+2 -2
View File
@@ -119,7 +119,7 @@ hscx_fill_fifo(struct BCState *bcs)
} }
} }
static inline void static void
hscx_interrupt(struct IsdnCardState *cs, u_char val, u_char hscx) hscx_interrupt(struct IsdnCardState *cs, u_char val, u_char hscx)
{ {
u_char r; u_char r;
@@ -221,7 +221,7 @@ hscx_interrupt(struct IsdnCardState *cs, u_char val, u_char hscx)
} }
} }
static inline void static void
hscx_int_main(struct IsdnCardState *cs, u_char val) hscx_int_main(struct IsdnCardState *cs, u_char val)
{ {
+1 -1
View File
@@ -110,7 +110,7 @@ jade_fill_fifo(struct BCState *bcs)
} }
static inline void static void
jade_interrupt(struct IsdnCardState *cs, u_char val, u_char jade) jade_interrupt(struct IsdnCardState *cs, u_char val, u_char jade)
{ {
u_char r; u_char r;
+1 -1
View File
@@ -200,7 +200,7 @@ out:
/* if page is completely empty, put it back on the free list, or dealloc it */ /* if page is completely empty, put it back on the free list, or dealloc it */
/* if page was hijacked, unmark the flag so it might get alloced next time */ /* if page was hijacked, unmark the flag so it might get alloced next time */
/* Note: lock should be held when calling this */ /* Note: lock should be held when calling this */
static inline void bitmap_checkfree(struct bitmap *bitmap, unsigned long page) static void bitmap_checkfree(struct bitmap *bitmap, unsigned long page)
{ {
char *ptr; char *ptr;
+1 -1
View File
@@ -228,7 +228,7 @@ static struct crypt_iv_operations crypt_iv_essiv_ops = {
}; };
static inline int static int
crypt_convert_scatterlist(struct crypt_config *cc, struct scatterlist *out, crypt_convert_scatterlist(struct crypt_config *cc, struct scatterlist *out,
struct scatterlist *in, unsigned int length, struct scatterlist *in, unsigned int length,
int write, sector_t sector) int write, sector_t sector)
+2 -2
View File
@@ -598,7 +598,7 @@ static int dev_create(struct dm_ioctl *param, size_t param_size)
/* /*
* Always use UUID for lookups if it's present, otherwise use name or dev. * Always use UUID for lookups if it's present, otherwise use name or dev.
*/ */
static inline struct hash_cell *__find_device_hash_cell(struct dm_ioctl *param) static struct hash_cell *__find_device_hash_cell(struct dm_ioctl *param)
{ {
if (*param->uuid) if (*param->uuid)
return __get_uuid_cell(param->uuid); return __get_uuid_cell(param->uuid);
@@ -608,7 +608,7 @@ static inline struct hash_cell *__find_device_hash_cell(struct dm_ioctl *param)
return dm_get_mdptr(huge_decode_dev(param->dev)); return dm_get_mdptr(huge_decode_dev(param->dev));
} }
static inline struct mapped_device *find_device(struct dm_ioctl *param) static struct mapped_device *find_device(struct dm_ioctl *param)
{ {
struct hash_cell *hc; struct hash_cell *hc;
struct mapped_device *md = NULL; struct mapped_device *md = NULL;
+1 -1
View File
@@ -691,7 +691,7 @@ static void copy_callback(int read_err, unsigned int write_err, void *context)
/* /*
* Dispatches the copy operation to kcopyd. * Dispatches the copy operation to kcopyd.
*/ */
static inline void start_copy(struct pending_exception *pe) static void start_copy(struct pending_exception *pe)
{ {
struct dm_snapshot *s = pe->snap; struct dm_snapshot *s = pe->snap;
struct io_region src, dest; struct io_region src, dest;
+1 -1
View File
@@ -293,7 +293,7 @@ struct dm_table *dm_get_table(struct mapped_device *md)
* Decrements the number of outstanding ios that a bio has been * Decrements the number of outstanding ios that a bio has been
* cloned into, completing the original io if necc. * cloned into, completing the original io if necc.
*/ */
static inline void dec_pending(struct dm_io *io, int error) static void dec_pending(struct dm_io *io, int error)
{ {
if (error) if (error)
io->error = error; io->error = error;
+2 -2
View File
@@ -176,7 +176,7 @@ static void put_all_bios(conf_t *conf, r1bio_t *r1_bio)
} }
} }
static inline void free_r1bio(r1bio_t *r1_bio) static void free_r1bio(r1bio_t *r1_bio)
{ {
conf_t *conf = mddev_to_conf(r1_bio->mddev); conf_t *conf = mddev_to_conf(r1_bio->mddev);
@@ -190,7 +190,7 @@ static inline void free_r1bio(r1bio_t *r1_bio)
mempool_free(r1_bio, conf->r1bio_pool); mempool_free(r1_bio, conf->r1bio_pool);
} }
static inline void put_buf(r1bio_t *r1_bio) static void put_buf(r1bio_t *r1_bio)
{ {
conf_t *conf = mddev_to_conf(r1_bio->mddev); conf_t *conf = mddev_to_conf(r1_bio->mddev);
int i; int i;

Some files were not shown because too many files have changed in this diff Show More