diff options
Diffstat (limited to 'openvz-sources/022.072/5502_diff-ms-gcc4-scsi-ips-20051103.patch')
| -rw-r--r-- | openvz-sources/022.072/5502_diff-ms-gcc4-scsi-ips-20051103.patch | 280 |
1 files changed, 0 insertions, 280 deletions
diff --git a/openvz-sources/022.072/5502_diff-ms-gcc4-scsi-ips-20051103.patch b/openvz-sources/022.072/5502_diff-ms-gcc4-scsi-ips-20051103.patch deleted file mode 100644 index 86bd3ef..0000000 --- a/openvz-sources/022.072/5502_diff-ms-gcc4-scsi-ips-20051103.patch +++ /dev/null @@ -1,280 +0,0 @@ -diff -Naru a/drivers/scsi/ips.c b/drivers/scsi/ips.c ---- a/drivers/scsi/ips.c 2005-11-03 02:32:42 -08:00 -+++ b/drivers/scsi/ips.c 2005-11-03 02:32:42 -08:00 -@@ -474,21 +474,17 @@ - static uint32_t ips_statupd_copperhead_memio(ips_ha_t *); - static uint32_t ips_statupd_morpheus(ips_ha_t *); - static ips_scb_t *ips_getscb(ips_ha_t *); --static inline void ips_putq_scb_head(ips_scb_queue_t *, ips_scb_t *); --static inline void ips_putq_scb_tail(ips_scb_queue_t *, ips_scb_t *); --static inline void ips_putq_wait_head(ips_wait_queue_t *, Scsi_Cmnd *); --static inline void ips_putq_wait_tail(ips_wait_queue_t *, Scsi_Cmnd *); --static inline void ips_putq_copp_head(ips_copp_queue_t *, -+static void ips_putq_scb_head(ips_scb_queue_t *, ips_scb_t *); -+static void ips_putq_wait_tail(ips_wait_queue_t *, Scsi_Cmnd *); -+static void ips_putq_copp_tail(ips_copp_queue_t *, - ips_copp_wait_item_t *); --static inline void ips_putq_copp_tail(ips_copp_queue_t *, -- ips_copp_wait_item_t *); --static inline ips_scb_t *ips_removeq_scb_head(ips_scb_queue_t *); --static inline ips_scb_t *ips_removeq_scb(ips_scb_queue_t *, ips_scb_t *); --static inline Scsi_Cmnd *ips_removeq_wait_head(ips_wait_queue_t *); --static inline Scsi_Cmnd *ips_removeq_wait(ips_wait_queue_t *, Scsi_Cmnd *); --static inline ips_copp_wait_item_t *ips_removeq_copp(ips_copp_queue_t *, -+static ips_scb_t *ips_removeq_scb_head(ips_scb_queue_t *); -+static ips_scb_t *ips_removeq_scb(ips_scb_queue_t *, ips_scb_t *); -+static Scsi_Cmnd *ips_removeq_wait_head(ips_wait_queue_t *); -+static Scsi_Cmnd *ips_removeq_wait(ips_wait_queue_t *, Scsi_Cmnd *); -+static ips_copp_wait_item_t *ips_removeq_copp(ips_copp_queue_t *, - ips_copp_wait_item_t *); --static inline ips_copp_wait_item_t *ips_removeq_copp_head(ips_copp_queue_t *); -+static ips_copp_wait_item_t *ips_removeq_copp_head(ips_copp_queue_t *); - - static int ips_is_passthru(Scsi_Cmnd *); - static int ips_make_passthru(ips_ha_t *, Scsi_Cmnd *, ips_scb_t *, int); -@@ -1885,7 +1881,7 @@ - /* Fill in a single scb sg_list element from an address */ - /* return a -1 if a breakup occurred */ - /****************************************************************************/ --static inline int -+static int - ips_fill_scb_sg_single(ips_ha_t * ha, dma_addr_t busaddr, - ips_scb_t * scb, int indx, unsigned int e_len) - { -@@ -2950,7 +2946,7 @@ - /* ASSUMED to be called from within the HA lock */ - /* */ - /****************************************************************************/ --static inline void -+static void - ips_putq_scb_head(ips_scb_queue_t * queue, ips_scb_t * item) - { - METHOD_TRACE("ips_putq_scb_head", 1); -@@ -2969,38 +2965,6 @@ - - /****************************************************************************/ - /* */ --/* Routine Name: ips_putq_scb_tail */ --/* */ --/* Routine Description: */ --/* */ --/* Add an item to the tail of the queue */ --/* */ --/* ASSUMED to be called from within the HA lock */ --/* */ --/****************************************************************************/ --static inline void --ips_putq_scb_tail(ips_scb_queue_t * queue, ips_scb_t * item) --{ -- METHOD_TRACE("ips_putq_scb_tail", 1); -- -- if (!item) -- return; -- -- item->q_next = NULL; -- -- if (queue->tail) -- queue->tail->q_next = item; -- -- queue->tail = item; -- -- if (!queue->head) -- queue->head = item; -- -- queue->count++; --} -- --/****************************************************************************/ --/* */ - /* Routine Name: ips_removeq_scb_head */ - /* */ - /* Routine Description: */ -@@ -3010,7 +2974,7 @@ - /* ASSUMED to be called from within the HA lock */ - /* */ - /****************************************************************************/ --static inline ips_scb_t * -+static ips_scb_t * - ips_removeq_scb_head(ips_scb_queue_t * queue) - { - ips_scb_t *item; -@@ -3045,7 +3009,7 @@ - /* ASSUMED to be called from within the HA lock */ - /* */ - /****************************************************************************/ --static inline ips_scb_t * -+static ips_scb_t * - ips_removeq_scb(ips_scb_queue_t * queue, ips_scb_t * item) - { - ips_scb_t *p; -@@ -3082,34 +3046,6 @@ - - /****************************************************************************/ - /* */ --/* Routine Name: ips_putq_wait_head */ --/* */ --/* Routine Description: */ --/* */ --/* Add an item to the head of the queue */ --/* */ --/* ASSUMED to be called from within the HA lock */ --/* */ --/****************************************************************************/ --static inline void --ips_putq_wait_head(ips_wait_queue_t * queue, Scsi_Cmnd * item) --{ -- METHOD_TRACE("ips_putq_wait_head", 1); -- -- if (!item) -- return; -- -- item->host_scribble = (char *) queue->head; -- queue->head = item; -- -- if (!queue->tail) -- queue->tail = item; -- -- queue->count++; --} -- --/****************************************************************************/ --/* */ - /* Routine Name: ips_putq_wait_tail */ - /* */ - /* Routine Description: */ -@@ -3119,7 +3055,7 @@ - /* ASSUMED to be called from within the HA lock */ - /* */ - /****************************************************************************/ --static inline void -+static void - ips_putq_wait_tail(ips_wait_queue_t * queue, Scsi_Cmnd * item) - { - METHOD_TRACE("ips_putq_wait_tail", 1); -@@ -3151,7 +3087,7 @@ - /* ASSUMED to be called from within the HA lock */ - /* */ - /****************************************************************************/ --static inline Scsi_Cmnd * -+static Scsi_Cmnd * - ips_removeq_wait_head(ips_wait_queue_t * queue) - { - Scsi_Cmnd *item; -@@ -3186,7 +3122,7 @@ - /* ASSUMED to be called from within the HA lock */ - /* */ - /****************************************************************************/ --static inline Scsi_Cmnd * -+static Scsi_Cmnd * - ips_removeq_wait(ips_wait_queue_t * queue, Scsi_Cmnd * item) - { - Scsi_Cmnd *p; -@@ -3223,34 +3159,6 @@ - - /****************************************************************************/ - /* */ --/* Routine Name: ips_putq_copp_head */ --/* */ --/* Routine Description: */ --/* */ --/* Add an item to the head of the queue */ --/* */ --/* ASSUMED to be called from within the HA lock */ --/* */ --/****************************************************************************/ --static inline void --ips_putq_copp_head(ips_copp_queue_t * queue, ips_copp_wait_item_t * item) --{ -- METHOD_TRACE("ips_putq_copp_head", 1); -- -- if (!item) -- return; -- -- item->next = queue->head; -- queue->head = item; -- -- if (!queue->tail) -- queue->tail = item; -- -- queue->count++; --} -- --/****************************************************************************/ --/* */ - /* Routine Name: ips_putq_copp_tail */ - /* */ - /* Routine Description: */ -@@ -3260,7 +3168,7 @@ - /* ASSUMED to be called from within the HA lock */ - /* */ - /****************************************************************************/ --static inline void -+static void - ips_putq_copp_tail(ips_copp_queue_t * queue, ips_copp_wait_item_t * item) - { - METHOD_TRACE("ips_putq_copp_tail", 1); -@@ -3292,7 +3200,7 @@ - /* ASSUMED to be called from within the HA lock */ - /* */ - /****************************************************************************/ --static inline ips_copp_wait_item_t * -+static ips_copp_wait_item_t * - ips_removeq_copp_head(ips_copp_queue_t * queue) - { - ips_copp_wait_item_t *item; -@@ -3327,7 +3235,7 @@ - /* ASSUMED to be called from within the HA lock */ - /* */ - /****************************************************************************/ --static inline ips_copp_wait_item_t * -+static ips_copp_wait_item_t * - ips_removeq_copp(ips_copp_queue_t * queue, ips_copp_wait_item_t * item) - { - ips_copp_wait_item_t *p; -# This is a BitKeeper generated diff -Nru style patch. -# -# ChangeSet -# 2004/07/12 10:38:01-05:00 bunk@fs.tum.de -# [PATCH] SCSI ips: remove inlines -# -# Trying to compile drivers/scsi/ips.c with gcc 3.4 and -# # define inline __inline__ __attribute__((always_inline)) -# results in the following error: -# -# <-- snip --> -# -# ... -# CC drivers/scsi/ips.o -# drivers/scsi/ips.c: In function `ips_eh_abort': -# drivers/scsi/ips.c:490: sorry, unimplemented: inlining failed in call to -# 'ips_removeq_copp': function body not available -# drivers/scsi/ips.c:843: sorry, unimplemented: called from here -# drivers/scsi/ips.c:488: sorry, unimplemented: inlining failed in call to -# 'ips_removeq_wait': function body not available -# drivers/scsi/ips.c:847: sorry, unimplemented: called from here -# make[2]: *** [drivers/scsi/ips.o] Error 1 -# -# <-- snip --> -# -# -# The patch below removes all inlines from ips.c. As a side effect, this -# showed that 3 formerly inlined functions are completely unused which are -# also removed in the patch. -# -# An alternative approach to removing the inlines would be to keep all -# inlines that are _really_ required and reorder the functions in the file -# accordingly. -# -# -# diffstat output: -# drivers/scsi/ips.c | 130 ++++++--------------------------------------- -# 1 files changed, 19 insertions(+), 111 deletions(-) -# -# -# Signed-off-by: Adrian Bunk <bunk@fs.tum.de> -# Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> -# -# drivers/scsi/ips.c -# 2004/07/08 18:24:02-05:00 bunk@fs.tum.de +19 -111 -# SCSI ips: remove inlines -# |