From a5ef9a12212b146768a47b43e0fdd5ae20b16082 Mon Sep 17 00:00:00 2001 From: alex Date: Mon, 12 Jan 2004 09:18:33 +0000 Subject: [PATCH] - 2.6.0-mm2.patch was committed corrupted. don't understand why :( --- lustre/kernel_patches/patches/2.6.0-mm2.patch | 1505 ++++--------------------- 1 file changed, 245 insertions(+), 1260 deletions(-) diff --git a/lustre/kernel_patches/patches/2.6.0-mm2.patch b/lustre/kernel_patches/patches/2.6.0-mm2.patch index d3119b9..017d057 100644 --- a/lustre/kernel_patches/patches/2.6.0-mm2.patch +++ b/lustre/kernel_patches/patches/2.6.0-mm2.patch @@ -55216,42 +55216,7 @@ * * Copyright (C) 2001 NxtWave Communications, Inc. * -- * $Log: 2.6.0-mm2.patch,v $ -- * Revision 1.1.2.1 2004/01/09 22:31:09 alex -- * - 2.6 fixes: -- * - mds_lock_new_child() uses specific namespace to avoid deadlock -- * if i_generations == 0 -- * - portals_debug_copy_to_user() uses kmap_atomic() instead of -- * kmap() because it's called beinged locked with disabled interrupts -- * - ugly hacks which prevent userspace tools to try to load modules -- * - corrections in Makefiles -- * - minor compatibility defines and tweaks -- * - inode->c_index is used as orphans counter -- * - ll_lookup_finish_locks() doesn't release intent -- * because on 2.6 it may be needed several times -- * - check that nd isn't NULL before using -- * - ll_update_inode() decoded dev number wrong way -- * - PDE define is used to retrieve procfs-related data -- * - rw26.c is almost copy of rw24.c -- * - super25.c registers lustre and lustre_lite -- * -- * - 2.6 kernel patches: -- * - 2.6.0-mm2 -- * - dev_read_only_2.6.0.patch stores dev number, not struct block_device * -- * - ext3-init-generation-2.6.0.patch - lustre dislikes when ext3 resets -- * s_next_generation to 0 upon mount -- * - ext3-map_inode_page-2.6.0.patch - added fix to unmap underlaying metadata -- * - ext3-start_this_handle-must-return-error.patch - jbd returned 0 always: -- * posssible oops -- * - vfs_nointent_2.6.0-test6.patch - small contexts changes -- * - invalidate_show-2.6.0.patch - port onto 2.6 -- * - iopen-2.6.0-test6.patch - several fixes -- * - vfs_intent_2.6.0.patch - port onto 2.5.0 -- * - kernel_text_address-2.6.0.patch -- * - export_symbols-2.6.0.patch -- * -- * - kgdb_2.6.0 series -- * +- * $Log: nxt6000.h,v $ - * Revision 1.2 2003/01/27 12:32:42 fschirmer - * Lots of bugfixes and new features - * @@ -136887,52 +136852,17 @@ * * Name: skcsum.h * Project: GEnesis - SysKonnect SK-NET Gigabit Ethernet (SK-98xx) -- * Version: $Revision: 1.1.2.1 $ -- * Date: $Date: 2004/01/09 22:31:09 $ -+ * Version: $Revision: 1.1.2.1 $ -+ * Date: $Date: 2004/01/09 22:31:09 $ +- * Version: $Revision: 1.9 $ +- * Date: $Date: 2001/02/06 11:21:39 $ ++ * Version: $Revision: 1.10 $ ++ * Date: $Date: 2003/08/20 13:59:57 $ * Purpose: Store/verify Internet checksum in send/receive packets. * ******************************************************************************/ @@ -26,6 +26,10 @@ * History: * - * $Log: 2.6.0-mm2.patch,v $ - * Revision 1.1.2.1 2004/01/09 22:31:09 alex - * - 2.6 fixes: - * - mds_lock_new_child() uses specific namespace to avoid deadlock - * if i_generations == 0 - * - portals_debug_copy_to_user() uses kmap_atomic() instead of - * kmap() because it's called beinged locked with disabled interrupts - * - ugly hacks which prevent userspace tools to try to load modules - * - corrections in Makefiles - * - minor compatibility defines and tweaks - * - inode->c_index is used as orphans counter - * - ll_lookup_finish_locks() doesn't release intent - * because on 2.6 it may be needed several times - * - check that nd isn't NULL before using - * - ll_update_inode() decoded dev number wrong way - * - PDE define is used to retrieve procfs-related data - * - rw26.c is almost copy of rw24.c - * - super25.c registers lustre and lustre_lite - * - * - 2.6 kernel patches: - * - 2.6.0-mm2 - * - dev_read_only_2.6.0.patch stores dev number, not struct block_device * - * - ext3-init-generation-2.6.0.patch - lustre dislikes when ext3 resets - * s_next_generation to 0 upon mount - * - ext3-map_inode_page-2.6.0.patch - added fix to unmap underlaying metadata - * - ext3-start_this_handle-must-return-error.patch - jbd returned 0 always: - * posssible oops - * - vfs_nointent_2.6.0-test6.patch - small contexts changes - * - invalidate_show-2.6.0.patch - port onto 2.6 - * - iopen-2.6.0-test6.patch - several fixes - * - vfs_intent_2.6.0.patch - port onto 2.5.0 - * - kernel_text_address-2.6.0.patch - * - export_symbols-2.6.0.patch - * - * - kgdb_2.6.0 series - * + * $Log: skcsum.h,v $ + * Revision 1.10 2003/08/20 13:59:57 mschmid + * Changed notation of #ifndef SkCsCalculateChecksum to + * #ifndef SK_CS_CALCULATE_CHECKSUM @@ -136960,10 +136890,10 @@ * * Name: skdrv1st.h * Project: GEnesis, PCI Gigabit Ethernet Adapter -- * Version: $Revision: 1.1.2.1 $ -- * Date: $Date: 2004/01/09 22:31:09 $ -+ * Version: $Revision: 1.1.2.1 $ -+ * Date: $Date: 2004/01/09 22:31:09 $ +- * Version: $Revision: 1.1 $ +- * Date: $Date: 2003/07/21 07:22:43 $ ++ * Version: $Revision: 1.4 $ ++ * Date: $Date: 2003/11/12 14:28:14 $ * Purpose: First header file for driver and all other modules * ******************************************************************************/ @@ -136979,42 +136909,7 @@ @@ -26,6 +27,15 @@ * History: * - * $Log: 2.6.0-mm2.patch,v $ - * Revision 1.1.2.1 2004/01/09 22:31:09 alex - * - 2.6 fixes: - * - mds_lock_new_child() uses specific namespace to avoid deadlock - * if i_generations == 0 - * - portals_debug_copy_to_user() uses kmap_atomic() instead of - * kmap() because it's called beinged locked with disabled interrupts - * - ugly hacks which prevent userspace tools to try to load modules - * - corrections in Makefiles - * - minor compatibility defines and tweaks - * - inode->c_index is used as orphans counter - * - ll_lookup_finish_locks() doesn't release intent - * because on 2.6 it may be needed several times - * - check that nd isn't NULL before using - * - ll_update_inode() decoded dev number wrong way - * - PDE define is used to retrieve procfs-related data - * - rw26.c is almost copy of rw24.c - * - super25.c registers lustre and lustre_lite - * - * - 2.6 kernel patches: - * - 2.6.0-mm2 - * - dev_read_only_2.6.0.patch stores dev number, not struct block_device * - * - ext3-init-generation-2.6.0.patch - lustre dislikes when ext3 resets - * s_next_generation to 0 upon mount - * - ext3-map_inode_page-2.6.0.patch - added fix to unmap underlaying metadata - * - ext3-start_this_handle-must-return-error.patch - jbd returned 0 always: - * posssible oops - * - vfs_nointent_2.6.0-test6.patch - small contexts changes - * - invalidate_show-2.6.0.patch - port onto 2.6 - * - iopen-2.6.0-test6.patch - several fixes - * - vfs_intent_2.6.0.patch - port onto 2.5.0 - * - kernel_text_address-2.6.0.patch - * - export_symbols-2.6.0.patch - * - * - kgdb_2.6.0 series - * + * $Log: skdrv1st.h,v $ + * Revision 1.4 2003/11/12 14:28:14 rroesler + * Fix: use dedicated ip_fast_csum() on X86_64 systems + * @@ -137076,10 +136971,10 @@ * * Name: skdrv2nd.h * Project: GEnesis, PCI Gigabit Ethernet Adapter -- * Version: $Revision: 1.1.2.1 $ -- * Date: $Date: 2004/01/09 22:31:09 $ -+ * Version: $Revision: 1.1.2.1 $ -+ * Date: $Date: 2004/01/09 22:31:09 $ +- * Version: $Revision: 1.3 $ +- * Date: $Date: 2003/08/12 16:51:18 $ ++ * Version: $Revision: 1.10 $ ++ * Date: $Date: 2003/12/11 16:04:45 $ * Purpose: Second header file for driver and all other modules * ******************************************************************************/ @@ -137095,42 +136990,7 @@ @@ -26,6 +27,27 @@ * History: * - * $Log: 2.6.0-mm2.patch,v $ - * Revision 1.1.2.1 2004/01/09 22:31:09 alex - * - 2.6 fixes: - * - mds_lock_new_child() uses specific namespace to avoid deadlock - * if i_generations == 0 - * - portals_debug_copy_to_user() uses kmap_atomic() instead of - * kmap() because it's called beinged locked with disabled interrupts - * - ugly hacks which prevent userspace tools to try to load modules - * - corrections in Makefiles - * - minor compatibility defines and tweaks - * - inode->c_index is used as orphans counter - * - ll_lookup_finish_locks() doesn't release intent - * because on 2.6 it may be needed several times - * - check that nd isn't NULL before using - * - ll_update_inode() decoded dev number wrong way - * - PDE define is used to retrieve procfs-related data - * - rw26.c is almost copy of rw24.c - * - super25.c registers lustre and lustre_lite - * - * - 2.6 kernel patches: - * - 2.6.0-mm2 - * - dev_read_only_2.6.0.patch stores dev number, not struct block_device * - * - ext3-init-generation-2.6.0.patch - lustre dislikes when ext3 resets - * s_next_generation to 0 upon mount - * - ext3-map_inode_page-2.6.0.patch - added fix to unmap underlaying metadata - * - ext3-start_this_handle-must-return-error.patch - jbd returned 0 always: - * posssible oops - * - vfs_nointent_2.6.0-test6.patch - small contexts changes - * - invalidate_show-2.6.0.patch - port onto 2.6 - * - iopen-2.6.0-test6.patch - several fixes - * - vfs_intent_2.6.0.patch - port onto 2.5.0 - * - kernel_text_address-2.6.0.patch - * - export_symbols-2.6.0.patch - * - * - kgdb_2.6.0 series - * + * $Log: skdrv2nd.h,v $ + * Revision 1.10 2003/12/11 16:04:45 mlindner + * Add: New pnmi data backup structure + * @@ -137225,52 +137085,17 @@ * * Name: skgehw.h * Project: Gigabit Ethernet Adapters, Common Modules -- * Version: $Revision: 1.1.2.1 $ -- * Date: $Date: 2004/01/09 22:31:09 $ -+ * Version: $Revision: 1.1.2.1 $ -+ * Date: $Date: 2004/01/09 22:31:09 $ +- * Version: $Revision: 1.53 $ +- * Date: $Date: 2003/07/04 12:39:01 $ ++ * Version: $Revision: 1.56 $ ++ * Date: $Date: 2003/09/23 09:01:00 $ * Purpose: Defines and Macros for the Gigabit Ethernet Adapter Product Family * ******************************************************************************/ @@ -26,6 +26,17 @@ * * History: - * $Log: 2.6.0-mm2.patch,v $ - * Revision 1.1.2.1 2004/01/09 22:31:09 alex - * - 2.6 fixes: - * - mds_lock_new_child() uses specific namespace to avoid deadlock - * if i_generations == 0 - * - portals_debug_copy_to_user() uses kmap_atomic() instead of - * kmap() because it's called beinged locked with disabled interrupts - * - ugly hacks which prevent userspace tools to try to load modules - * - corrections in Makefiles - * - minor compatibility defines and tweaks - * - inode->c_index is used as orphans counter - * - ll_lookup_finish_locks() doesn't release intent - * because on 2.6 it may be needed several times - * - check that nd isn't NULL before using - * - ll_update_inode() decoded dev number wrong way - * - PDE define is used to retrieve procfs-related data - * - rw26.c is almost copy of rw24.c - * - super25.c registers lustre and lustre_lite - * - * - 2.6 kernel patches: - * - 2.6.0-mm2 - * - dev_read_only_2.6.0.patch stores dev number, not struct block_device * - * - ext3-init-generation-2.6.0.patch - lustre dislikes when ext3 resets - * s_next_generation to 0 upon mount - * - ext3-map_inode_page-2.6.0.patch - added fix to unmap underlaying metadata - * - ext3-start_this_handle-must-return-error.patch - jbd returned 0 always: - * posssible oops - * - vfs_nointent_2.6.0-test6.patch - small contexts changes - * - invalidate_show-2.6.0.patch - port onto 2.6 - * - iopen-2.6.0-test6.patch - several fixes - * - vfs_intent_2.6.0.patch - port onto 2.5.0 - * - kernel_text_address-2.6.0.patch - * - export_symbols-2.6.0.patch - * - * - kgdb_2.6.0 series - * + * $Log: skgehw.h,v $ + * Revision 1.56 2003/09/23 09:01:00 malthoff + * Minor change: Define I2C device size constants as long. + * @@ -137736,53 +137561,18 @@ * * Name: skhwt.h - * Project: Gigabit Ethernet Adapters, Schedule-Modul -- * Version: $Revision: 1.1.2.1 $ -- * Date: $Date: 2004/01/09 22:31:09 $ +- * Version: $Revision: 1.6 $ +- * Date: $Date: 2003/05/13 17:57:48 $ + * Project: Gigabit Ethernet Adapters, Event Scheduler Module -+ * Version: $Revision: 1.1.2.1 $ -+ * Date: $Date: 2004/01/09 22:31:09 $ ++ * Version: $Revision: 1.7 $ ++ * Date: $Date: 2003/09/16 12:55:08 $ * Purpose: Defines for the hardware timer functions * ******************************************************************************/ @@ -27,6 +27,9 @@ * History: * - * $Log: 2.6.0-mm2.patch,v $ - * Revision 1.1.2.1 2004/01/09 22:31:09 alex - * - 2.6 fixes: - * - mds_lock_new_child() uses specific namespace to avoid deadlock - * if i_generations == 0 - * - portals_debug_copy_to_user() uses kmap_atomic() instead of - * kmap() because it's called beinged locked with disabled interrupts - * - ugly hacks which prevent userspace tools to try to load modules - * - corrections in Makefiles - * - minor compatibility defines and tweaks - * - inode->c_index is used as orphans counter - * - ll_lookup_finish_locks() doesn't release intent - * because on 2.6 it may be needed several times - * - check that nd isn't NULL before using - * - ll_update_inode() decoded dev number wrong way - * - PDE define is used to retrieve procfs-related data - * - rw26.c is almost copy of rw24.c - * - super25.c registers lustre and lustre_lite - * - * - 2.6 kernel patches: - * - 2.6.0-mm2 - * - dev_read_only_2.6.0.patch stores dev number, not struct block_device * - * - ext3-init-generation-2.6.0.patch - lustre dislikes when ext3 resets - * s_next_generation to 0 upon mount - * - ext3-map_inode_page-2.6.0.patch - added fix to unmap underlaying metadata - * - ext3-start_this_handle-must-return-error.patch - jbd returned 0 always: - * posssible oops - * - vfs_nointent_2.6.0-test6.patch - small contexts changes - * - invalidate_show-2.6.0.patch - port onto 2.6 - * - iopen-2.6.0-test6.patch - several fixes - * - vfs_intent_2.6.0.patch - port onto 2.5.0 - * - kernel_text_address-2.6.0.patch - * - export_symbols-2.6.0.patch - * - * - kgdb_2.6.0 series - * + * $Log: skgehwt.h,v $ + * Revision 1.7 2003/09/16 12:55:08 rschmidt + * Editorial changes + * @@ -137835,12 +137625,12 @@ * * Name: skgei2c.h - * Project: GEnesis, PCI Gigabit Ethernet Adapter -- * Version: $Revision: 1.1.2.1 $ -- * Date: $Date: 2004/01/09 22:31:09 $ +- * Version: $Revision: 1.23 $ +- * Date: $Date: 2002/12/19 14:34:27 $ - * Purpose: Special GEnesis defines for TWSI + * Project: Gigabit Ethernet Adapters, TWSI-Module -+ * Version: $Revision: 1.1.2.1 $ -+ * Date: $Date: 2004/01/09 22:31:09 $ ++ * Version: $Revision: 1.25 $ ++ * Date: $Date: 2003/10/20 09:06:05 $ + * Purpose: Special defines for TWSI * ******************************************************************************/ @@ -137856,42 +137646,7 @@ @@ -26,6 +27,12 @@ * History: * - * $Log: 2.6.0-mm2.patch,v $ - * Revision 1.1.2.1 2004/01/09 22:31:09 alex - * - 2.6 fixes: - * - mds_lock_new_child() uses specific namespace to avoid deadlock - * if i_generations == 0 - * - portals_debug_copy_to_user() uses kmap_atomic() instead of - * kmap() because it's called beinged locked with disabled interrupts - * - ugly hacks which prevent userspace tools to try to load modules - * - corrections in Makefiles - * - minor compatibility defines and tweaks - * - inode->c_index is used as orphans counter - * - ll_lookup_finish_locks() doesn't release intent - * because on 2.6 it may be needed several times - * - check that nd isn't NULL before using - * - ll_update_inode() decoded dev number wrong way - * - PDE define is used to retrieve procfs-related data - * - rw26.c is almost copy of rw24.c - * - super25.c registers lustre and lustre_lite - * - * - 2.6 kernel patches: - * - 2.6.0-mm2 - * - dev_read_only_2.6.0.patch stores dev number, not struct block_device * - * - ext3-init-generation-2.6.0.patch - lustre dislikes when ext3 resets - * s_next_generation to 0 upon mount - * - ext3-map_inode_page-2.6.0.patch - added fix to unmap underlaying metadata - * - ext3-start_this_handle-must-return-error.patch - jbd returned 0 always: - * posssible oops - * - vfs_nointent_2.6.0-test6.patch - small contexts changes - * - invalidate_show-2.6.0.patch - port onto 2.6 - * - iopen-2.6.0-test6.patch - several fixes - * - vfs_intent_2.6.0.patch - port onto 2.5.0 - * - kernel_text_address-2.6.0.patch - * - export_symbols-2.6.0.patch - * - * - kgdb_2.6.0 series - * + * $Log: skgei2c.h,v $ + * Revision 1.25 2003/10/20 09:06:05 rschmidt + * Editorial changes. + * @@ -138047,52 +137802,17 @@ * * Name: skgeinit.h * Project: Gigabit Ethernet Adapters, Common Modules -- * Version: $Revision: 1.1.2.1 $ -- * Date: $Date: 2004/01/09 22:31:09 $ -+ * Version: $Revision: 1.1.2.1 $ -+ * Date: $Date: 2004/01/09 22:31:09 $ +- * Version: $Revision: 1.81 $ +- * Date: $Date: 2003/07/04 12:30:38 $ ++ * Version: $Revision: 1.83 $ ++ * Date: $Date: 2003/09/16 14:07:37 $ * Purpose: Structures and prototypes for the GE Init Module * ******************************************************************************/ @@ -27,6 +27,23 @@ * History: * - * $Log: 2.6.0-mm2.patch,v $ - * Revision 1.1.2.1 2004/01/09 22:31:09 alex - * - 2.6 fixes: - * - mds_lock_new_child() uses specific namespace to avoid deadlock - * if i_generations == 0 - * - portals_debug_copy_to_user() uses kmap_atomic() instead of - * kmap() because it's called beinged locked with disabled interrupts - * - ugly hacks which prevent userspace tools to try to load modules - * - corrections in Makefiles - * - minor compatibility defines and tweaks - * - inode->c_index is used as orphans counter - * - ll_lookup_finish_locks() doesn't release intent - * because on 2.6 it may be needed several times - * - check that nd isn't NULL before using - * - ll_update_inode() decoded dev number wrong way - * - PDE define is used to retrieve procfs-related data - * - rw26.c is almost copy of rw24.c - * - super25.c registers lustre and lustre_lite - * - * - 2.6 kernel patches: - * - 2.6.0-mm2 - * - dev_read_only_2.6.0.patch stores dev number, not struct block_device * - * - ext3-init-generation-2.6.0.patch - lustre dislikes when ext3 resets - * s_next_generation to 0 upon mount - * - ext3-map_inode_page-2.6.0.patch - added fix to unmap underlaying metadata - * - ext3-start_this_handle-must-return-error.patch - jbd returned 0 always: - * posssible oops - * - vfs_nointent_2.6.0-test6.patch - small contexts changes - * - invalidate_show-2.6.0.patch - port onto 2.6 - * - iopen-2.6.0-test6.patch - several fixes - * - vfs_intent_2.6.0.patch - port onto 2.5.0 - * - kernel_text_address-2.6.0.patch - * - export_symbols-2.6.0.patch - * - * - kgdb_2.6.0 series - * + * $Log: skgeinit.h,v $ + * Revision 1.83 2003/09/16 14:07:37 rschmidt + * Moved defines for PHY power down modes from skgehw.h + * Added prototypes for SkMacClearRst() @@ -138194,52 +137914,17 @@ * * Name: skgepnmi.h * Project: GEnesis, PCI Gigabit Ethernet Adapter -- * Version: $Revision: 1.1.2.1 $ -- * Date: $Date: 2004/01/09 22:31:09 $ -+ * Version: $Revision: 1.1.2.1 $ -+ * Date: $Date: 2004/01/09 22:31:09 $ +- * Version: $Revision: 1.61 $ +- * Date: $Date: 2003/05/23 12:53:52 $ ++ * Version: $Revision: 1.62 $ ++ * Date: $Date: 2003/08/15 12:31:52 $ * Purpose: Defines for Private Network Management Interface * ****************************************************************************/ @@ -27,6 +27,18 @@ * History: * - * $Log: 2.6.0-mm2.patch,v $ - * Revision 1.1.2.1 2004/01/09 22:31:09 alex - * - 2.6 fixes: - * - mds_lock_new_child() uses specific namespace to avoid deadlock - * if i_generations == 0 - * - portals_debug_copy_to_user() uses kmap_atomic() instead of - * kmap() because it's called beinged locked with disabled interrupts - * - ugly hacks which prevent userspace tools to try to load modules - * - corrections in Makefiles - * - minor compatibility defines and tweaks - * - inode->c_index is used as orphans counter - * - ll_lookup_finish_locks() doesn't release intent - * because on 2.6 it may be needed several times - * - check that nd isn't NULL before using - * - ll_update_inode() decoded dev number wrong way - * - PDE define is used to retrieve procfs-related data - * - rw26.c is almost copy of rw24.c - * - super25.c registers lustre and lustre_lite - * - * - 2.6 kernel patches: - * - 2.6.0-mm2 - * - dev_read_only_2.6.0.patch stores dev number, not struct block_device * - * - ext3-init-generation-2.6.0.patch - lustre dislikes when ext3 resets - * s_next_generation to 0 upon mount - * - ext3-map_inode_page-2.6.0.patch - added fix to unmap underlaying metadata - * - ext3-start_this_handle-must-return-error.patch - jbd returned 0 always: - * posssible oops - * - vfs_nointent_2.6.0-test6.patch - small contexts changes - * - invalidate_show-2.6.0.patch - port onto 2.6 - * - iopen-2.6.0-test6.patch - several fixes - * - vfs_intent_2.6.0.patch - port onto 2.5.0 - * - kernel_text_address-2.6.0.patch - * - export_symbols-2.6.0.patch - * - * - kgdb_2.6.0 series - * + * $Log: skgepnmi.h,v $ + * Revision 1.62 2003/08/15 12:31:52 tschilli + * Added new OIDs: + * OID_SKGE_DRIVER_RELDATE @@ -138373,11 +138058,11 @@ * * Name: ski2c.h - * Project: GEnesis, PCI Gigabit Ethernet Adapter -- * Version: $Revision: 1.1.2.1 $ -- * Date: $Date: 2004/01/09 22:31:09 $ +- * Version: $Revision: 1.34 $ +- * Date: $Date: 2003/01/28 09:11:21 $ + * Project: Gigabit Ethernet Adapters, TWSI-Module -+ * Version: $Revision: 1.1.2.1 $ -+ * Date: $Date: 2004/01/09 22:31:09 $ ++ * Version: $Revision: 1.35 $ ++ * Date: $Date: 2003/10/20 09:06:30 $ * Purpose: Defines to access Voltage and Temperature Sensor * ******************************************************************************/ @@ -138393,42 +138078,7 @@ @@ -26,6 +27,10 @@ * History: * - * $Log: 2.6.0-mm2.patch,v $ - * Revision 1.1.2.1 2004/01/09 22:31:09 alex - * - 2.6 fixes: - * - mds_lock_new_child() uses specific namespace to avoid deadlock - * if i_generations == 0 - * - portals_debug_copy_to_user() uses kmap_atomic() instead of - * kmap() because it's called beinged locked with disabled interrupts - * - ugly hacks which prevent userspace tools to try to load modules - * - corrections in Makefiles - * - minor compatibility defines and tweaks - * - inode->c_index is used as orphans counter - * - ll_lookup_finish_locks() doesn't release intent - * because on 2.6 it may be needed several times - * - check that nd isn't NULL before using - * - ll_update_inode() decoded dev number wrong way - * - PDE define is used to retrieve procfs-related data - * - rw26.c is almost copy of rw24.c - * - super25.c registers lustre and lustre_lite - * - * - 2.6 kernel patches: - * - 2.6.0-mm2 - * - dev_read_only_2.6.0.patch stores dev number, not struct block_device * - * - ext3-init-generation-2.6.0.patch - lustre dislikes when ext3 resets - * s_next_generation to 0 upon mount - * - ext3-map_inode_page-2.6.0.patch - added fix to unmap underlaying metadata - * - ext3-start_this_handle-must-return-error.patch - jbd returned 0 always: - * posssible oops - * - vfs_nointent_2.6.0-test6.patch - small contexts changes - * - invalidate_show-2.6.0.patch - port onto 2.6 - * - iopen-2.6.0-test6.patch - several fixes - * - vfs_intent_2.6.0.patch - port onto 2.5.0 - * - kernel_text_address-2.6.0.patch - * - export_symbols-2.6.0.patch - * - * - kgdb_2.6.0 series - * + * $Log: ski2c.h,v $ + * Revision 1.35 2003/10/20 09:06:30 rschmidt + * Added prototypes for SkI2cRead() and SkI2cWrite(). + * Editorial changes. @@ -138482,53 +138132,18 @@ * * Name: skqueue.h - * Project: Gigabit Ethernet Adapters, Schedule-Modul -- * Version: $Revision: 1.1.2.1 $ -- * Date: $Date: 2004/01/09 22:31:09 $ +- * Version: $Revision: 1.15 $ +- * Date: $Date: 2003/05/13 17:54:57 $ + * Project: Gigabit Ethernet Adapters, Event Scheduler Module -+ * Version: $Revision: 1.1.2.1 $ -+ * Date: $Date: 2004/01/09 22:31:09 $ ++ * Version: $Revision: 1.16 $ ++ * Date: $Date: 2003/09/16 12:50:32 $ * Purpose: Defines for the Event queue * ******************************************************************************/ @@ -27,6 +27,9 @@ * History: * - * $Log: 2.6.0-mm2.patch,v $ - * Revision 1.1.2.1 2004/01/09 22:31:09 alex - * - 2.6 fixes: - * - mds_lock_new_child() uses specific namespace to avoid deadlock - * if i_generations == 0 - * - portals_debug_copy_to_user() uses kmap_atomic() instead of - * kmap() because it's called beinged locked with disabled interrupts - * - ugly hacks which prevent userspace tools to try to load modules - * - corrections in Makefiles - * - minor compatibility defines and tweaks - * - inode->c_index is used as orphans counter - * - ll_lookup_finish_locks() doesn't release intent - * because on 2.6 it may be needed several times - * - check that nd isn't NULL before using - * - ll_update_inode() decoded dev number wrong way - * - PDE define is used to retrieve procfs-related data - * - rw26.c is almost copy of rw24.c - * - super25.c registers lustre and lustre_lite - * - * - 2.6 kernel patches: - * - 2.6.0-mm2 - * - dev_read_only_2.6.0.patch stores dev number, not struct block_device * - * - ext3-init-generation-2.6.0.patch - lustre dislikes when ext3 resets - * s_next_generation to 0 upon mount - * - ext3-map_inode_page-2.6.0.patch - added fix to unmap underlaying metadata - * - ext3-start_this_handle-must-return-error.patch - jbd returned 0 always: - * posssible oops - * - vfs_nointent_2.6.0-test6.patch - small contexts changes - * - invalidate_show-2.6.0.patch - port onto 2.6 - * - iopen-2.6.0-test6.patch - several fixes - * - vfs_intent_2.6.0.patch - port onto 2.5.0 - * - kernel_text_address-2.6.0.patch - * - export_symbols-2.6.0.patch - * - * - kgdb_2.6.0 series - * + * $Log: skqueue.h,v $ + * Revision 1.16 2003/09/16 12:50:32 rschmidt + * Editorial changes + * @@ -138602,53 +138217,18 @@ * * Name: sktimer.h - * Project: Gigabit Ethernet Adapters, Schedule-Modul -- * Version: $Revision: 1.1.2.1 $ -- * Date: $Date: 2004/01/09 22:31:09 $ +- * Version: $Revision: 1.10 $ +- * Date: $Date: 2003/05/13 17:56:44 $ + * Project: Gigabit Ethernet Adapters, Event Scheduler Module -+ * Version: $Revision: 1.1.2.1 $ -+ * Date: $Date: 2004/01/09 22:31:09 $ ++ * Version: $Revision: 1.11 $ ++ * Date: $Date: 2003/09/16 12:58:18 $ * Purpose: Defines for the timer functions * ******************************************************************************/ @@ -27,6 +27,9 @@ * History: * - * $Log: 2.6.0-mm2.patch,v $ - * Revision 1.1.2.1 2004/01/09 22:31:09 alex - * - 2.6 fixes: - * - mds_lock_new_child() uses specific namespace to avoid deadlock - * if i_generations == 0 - * - portals_debug_copy_to_user() uses kmap_atomic() instead of - * kmap() because it's called beinged locked with disabled interrupts - * - ugly hacks which prevent userspace tools to try to load modules - * - corrections in Makefiles - * - minor compatibility defines and tweaks - * - inode->c_index is used as orphans counter - * - ll_lookup_finish_locks() doesn't release intent - * because on 2.6 it may be needed several times - * - check that nd isn't NULL before using - * - ll_update_inode() decoded dev number wrong way - * - PDE define is used to retrieve procfs-related data - * - rw26.c is almost copy of rw24.c - * - super25.c registers lustre and lustre_lite - * - * - 2.6 kernel patches: - * - 2.6.0-mm2 - * - dev_read_only_2.6.0.patch stores dev number, not struct block_device * - * - ext3-init-generation-2.6.0.patch - lustre dislikes when ext3 resets - * s_next_generation to 0 upon mount - * - ext3-map_inode_page-2.6.0.patch - added fix to unmap underlaying metadata - * - ext3-start_this_handle-must-return-error.patch - jbd returned 0 always: - * posssible oops - * - vfs_nointent_2.6.0-test6.patch - small contexts changes - * - invalidate_show-2.6.0.patch - port onto 2.6 - * - iopen-2.6.0-test6.patch - several fixes - * - vfs_intent_2.6.0.patch - port onto 2.5.0 - * - kernel_text_address-2.6.0.patch - * - export_symbols-2.6.0.patch - * - * - kgdb_2.6.0 series - * + * $Log: sktimer.h,v $ + * Revision 1.11 2003/09/16 12:58:18 rschmidt + * Editorial changes + * @@ -138710,10 +138290,10 @@ * * Name: sktypes.h * Project: GEnesis, PCI Gigabit Ethernet Adapter -- * Version: $Revision: 1.1.2.1 $ -- * Date: $Date: 2004/01/09 22:31:09 $ -+ * Version: $Revision: 1.1.2.1 $ -+ * Date: $Date: 2004/01/09 22:31:09 $ +- * Version: $Revision: 1.1 $ +- * Date: $Date: 2003/07/21 07:26:01 $ ++ * Version: $Revision: 1.2 $ ++ * Date: $Date: 2003/10/07 08:16:51 $ * Purpose: Define data types for Linux * ******************************************************************************/ @@ -138729,42 +138309,7 @@ @@ -26,6 +27,9 @@ * History: * - * $Log: 2.6.0-mm2.patch,v $ - * Revision 1.1.2.1 2004/01/09 22:31:09 alex - * - 2.6 fixes: - * - mds_lock_new_child() uses specific namespace to avoid deadlock - * if i_generations == 0 - * - portals_debug_copy_to_user() uses kmap_atomic() instead of - * kmap() because it's called beinged locked with disabled interrupts - * - ugly hacks which prevent userspace tools to try to load modules - * - corrections in Makefiles - * - minor compatibility defines and tweaks - * - inode->c_index is used as orphans counter - * - ll_lookup_finish_locks() doesn't release intent - * because on 2.6 it may be needed several times - * - check that nd isn't NULL before using - * - ll_update_inode() decoded dev number wrong way - * - PDE define is used to retrieve procfs-related data - * - rw26.c is almost copy of rw24.c - * - super25.c registers lustre and lustre_lite - * - * - 2.6 kernel patches: - * - 2.6.0-mm2 - * - dev_read_only_2.6.0.patch stores dev number, not struct block_device * - * - ext3-init-generation-2.6.0.patch - lustre dislikes when ext3 resets - * s_next_generation to 0 upon mount - * - ext3-map_inode_page-2.6.0.patch - added fix to unmap underlaying metadata - * - ext3-start_this_handle-must-return-error.patch - jbd returned 0 always: - * posssible oops - * - vfs_nointent_2.6.0-test6.patch - small contexts changes - * - invalidate_show-2.6.0.patch - port onto 2.6 - * - iopen-2.6.0-test6.patch - several fixes - * - vfs_intent_2.6.0.patch - port onto 2.5.0 - * - kernel_text_address-2.6.0.patch - * - export_symbols-2.6.0.patch - * - * - kgdb_2.6.0 series - * + * $Log: sktypes.h,v $ + * Revision 1.2 2003/10/07 08:16:51 mlindner + * Fix: Copyright changes + * @@ -138777,10 +138322,10 @@ * * Name: version.h * Project: GEnesis, PCI Gigabit Ethernet Adapter -- * Version: $Revision: 1.1.2.1 $ -- * Date: $Date: 2004/01/09 22:31:09 $ -+ * Version: $Revision: 1.1.2.1 $ -+ * Date: $Date: 2004/01/09 22:31:09 $ +- * Version: $Revision: 1.3 $ +- * Date: $Date: 2003/08/25 13:34:48 $ ++ * Version: $Revision: 1.5 $ ++ * Date: $Date: 2003/10/07 08:16:51 $ * Purpose: SK specific Error log support * ******************************************************************************/ @@ -138796,42 +138341,7 @@ @@ -25,6 +26,12 @@ * * History: - * $Log: 2.6.0-mm2.patch,v $ - * Revision 1.1.2.1 2004/01/09 22:31:09 alex - * - 2.6 fixes: - * - mds_lock_new_child() uses specific namespace to avoid deadlock - * if i_generations == 0 - * - portals_debug_copy_to_user() uses kmap_atomic() instead of - * kmap() because it's called beinged locked with disabled interrupts - * - ugly hacks which prevent userspace tools to try to load modules - * - corrections in Makefiles - * - minor compatibility defines and tweaks - * - inode->c_index is used as orphans counter - * - ll_lookup_finish_locks() doesn't release intent - * because on 2.6 it may be needed several times - * - check that nd isn't NULL before using - * - ll_update_inode() decoded dev number wrong way - * - PDE define is used to retrieve procfs-related data - * - rw26.c is almost copy of rw24.c - * - super25.c registers lustre and lustre_lite - * - * - 2.6 kernel patches: - * - 2.6.0-mm2 - * - dev_read_only_2.6.0.patch stores dev number, not struct block_device * - * - ext3-init-generation-2.6.0.patch - lustre dislikes when ext3 resets - * s_next_generation to 0 upon mount - * - ext3-map_inode_page-2.6.0.patch - added fix to unmap underlaying metadata - * - ext3-start_this_handle-must-return-error.patch - jbd returned 0 always: - * posssible oops - * - vfs_nointent_2.6.0-test6.patch - small contexts changes - * - invalidate_show-2.6.0.patch - port onto 2.6 - * - iopen-2.6.0-test6.patch - several fixes - * - vfs_intent_2.6.0.patch - port onto 2.5.0 - * - kernel_text_address-2.6.0.patch - * - export_symbols-2.6.0.patch - * - * - kgdb_2.6.0 series - * + * $Log: skversion.h,v $ + * Revision 1.5 2003/10/07 08:16:51 mlindner + * Fix: Copyright changes + * @@ -138865,52 +138375,17 @@ * * Name: xmac_ii.h * Project: Gigabit Ethernet Adapters, Common Modules -- * Version: $Revision: 1.1.2.1 $ -- * Date: $Date: 2004/01/09 22:31:09 $ -+ * Version: $Revision: 1.1.2.1 $ -+ * Date: $Date: 2004/01/09 22:31:09 $ +- * Version: $Revision: 1.48 $ +- * Date: $Date: 2003/05/13 17:17:55 $ ++ * Version: $Revision: 1.52 $ ++ * Date: $Date: 2003/10/02 16:35:50 $ * Purpose: Defines and Macros for Gigabit Ethernet Controller * ******************************************************************************/ @@ -27,6 +27,22 @@ * History: * - * $Log: 2.6.0-mm2.patch,v $ - * Revision 1.1.2.1 2004/01/09 22:31:09 alex - * - 2.6 fixes: - * - mds_lock_new_child() uses specific namespace to avoid deadlock - * if i_generations == 0 - * - portals_debug_copy_to_user() uses kmap_atomic() instead of - * kmap() because it's called beinged locked with disabled interrupts - * - ugly hacks which prevent userspace tools to try to load modules - * - corrections in Makefiles - * - minor compatibility defines and tweaks - * - inode->c_index is used as orphans counter - * - ll_lookup_finish_locks() doesn't release intent - * because on 2.6 it may be needed several times - * - check that nd isn't NULL before using - * - ll_update_inode() decoded dev number wrong way - * - PDE define is used to retrieve procfs-related data - * - rw26.c is almost copy of rw24.c - * - super25.c registers lustre and lustre_lite - * - * - 2.6 kernel patches: - * - 2.6.0-mm2 - * - dev_read_only_2.6.0.patch stores dev number, not struct block_device * - * - ext3-init-generation-2.6.0.patch - lustre dislikes when ext3 resets - * s_next_generation to 0 upon mount - * - ext3-map_inode_page-2.6.0.patch - added fix to unmap underlaying metadata - * - ext3-start_this_handle-must-return-error.patch - jbd returned 0 always: - * posssible oops - * - vfs_nointent_2.6.0-test6.patch - small contexts changes - * - invalidate_show-2.6.0.patch - port onto 2.6 - * - iopen-2.6.0-test6.patch - several fixes - * - vfs_intent_2.6.0.patch - port onto 2.5.0 - * - kernel_text_address-2.6.0.patch - * - export_symbols-2.6.0.patch - * - * - kgdb_2.6.0 series - * + * $Log: xmac_ii.h,v $ + * Revision 1.52 2003/10/02 16:35:50 rschmidt + * Added defines for default values of GMAC parameters + * Changed defines for setting GMAC parameters @@ -139196,52 +138671,17 @@ * * Name: skcsum.c * Project: GEnesis, PCI Gigabit Ethernet Adapter -- * Version: $Revision: 1.1.2.1 $ -- * Date: $Date: 2004/01/09 22:31:09 $ -+ * Version: $Revision: 1.1.2.1 $ -+ * Date: $Date: 2004/01/09 22:31:09 $ +- * Version: $Revision: 1.11 $ +- * Date: $Date: 2003/03/11 14:05:55 $ ++ * Version: $Revision: 1.12 $ ++ * Date: $Date: 2003/08/20 13:55:53 $ * Purpose: Store/verify Internet checksum in send/receive packets. * ******************************************************************************/ @@ -26,6 +26,10 @@ * History: * - * $Log: 2.6.0-mm2.patch,v $ - * Revision 1.1.2.1 2004/01/09 22:31:09 alex - * - 2.6 fixes: - * - mds_lock_new_child() uses specific namespace to avoid deadlock - * if i_generations == 0 - * - portals_debug_copy_to_user() uses kmap_atomic() instead of - * kmap() because it's called beinged locked with disabled interrupts - * - ugly hacks which prevent userspace tools to try to load modules - * - corrections in Makefiles - * - minor compatibility defines and tweaks - * - inode->c_index is used as orphans counter - * - ll_lookup_finish_locks() doesn't release intent - * because on 2.6 it may be needed several times - * - check that nd isn't NULL before using - * - ll_update_inode() decoded dev number wrong way - * - PDE define is used to retrieve procfs-related data - * - rw26.c is almost copy of rw24.c - * - super25.c registers lustre and lustre_lite - * - * - 2.6 kernel patches: - * - 2.6.0-mm2 - * - dev_read_only_2.6.0.patch stores dev number, not struct block_device * - * - ext3-init-generation-2.6.0.patch - lustre dislikes when ext3 resets - * s_next_generation to 0 upon mount - * - ext3-map_inode_page-2.6.0.patch - added fix to unmap underlaying metadata - * - ext3-start_this_handle-must-return-error.patch - jbd returned 0 always: - * posssible oops - * - vfs_nointent_2.6.0-test6.patch - small contexts changes - * - invalidate_show-2.6.0.patch - port onto 2.6 - * - iopen-2.6.0-test6.patch - several fixes - * - vfs_intent_2.6.0.patch - port onto 2.5.0 - * - kernel_text_address-2.6.0.patch - * - export_symbols-2.6.0.patch - * - * - kgdb_2.6.0 series - * + * $Log: skcsum.c,v $ + * Revision 1.12 2003/08/20 13:55:53 mschmid + * Changed notation of #ifndef SkCsCalculateChecksum to + * #ifndef SK_CS_CALCULATE_CHECKSUM @@ -139253,8 +138693,8 @@ #ifndef lint static const char SysKonnectFileId[] = -- "@(#) $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ (C) SysKonnect."; -+ "@(#) $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ (C) SysKonnect."; +- "@(#) $Id: skcsum.c,v 1.11 2003/03/11 14:05:55 rschmidt Exp $ (C) SysKonnect."; ++ "@(#) $Id: skcsum.c,v 1.12 2003/08/20 13:55:53 mschmid Exp $ (C) SysKonnect."; #endif /* !lint */ /****************************************************************************** @@ -139282,10 +138722,10 @@ * * Name: skdim.c * Project: GEnesis, PCI Gigabit Ethernet Adapter -- * Version: $Revision: 1.1.2.1 $ -- * Date: $Date: 2004/01/09 22:31:09 $ -+ * Version: $Revision: 1.1.2.1 $ -+ * Date: $Date: 2004/01/09 22:31:09 $ +- * Version: $Revision: 1.2 $ +- * Date: $Date: 2003/08/21 12:35:05 $ ++ * Version: $Revision: 1.5 $ ++ * Date: $Date: 2003/11/28 12:55:40 $ * Purpose: All functions to maintain interrupt moderation * ******************************************************************************/ @@ -139300,42 +138740,7 @@ @@ -26,6 +27,15 @@ * History: * - * $Log: 2.6.0-mm2.patch,v $ - * Revision 1.1.2.1 2004/01/09 22:31:09 alex - * - 2.6 fixes: - * - mds_lock_new_child() uses specific namespace to avoid deadlock - * if i_generations == 0 - * - portals_debug_copy_to_user() uses kmap_atomic() instead of - * kmap() because it's called beinged locked with disabled interrupts - * - ugly hacks which prevent userspace tools to try to load modules - * - corrections in Makefiles - * - minor compatibility defines and tweaks - * - inode->c_index is used as orphans counter - * - ll_lookup_finish_locks() doesn't release intent - * because on 2.6 it may be needed several times - * - check that nd isn't NULL before using - * - ll_update_inode() decoded dev number wrong way - * - PDE define is used to retrieve procfs-related data - * - rw26.c is almost copy of rw24.c - * - super25.c registers lustre and lustre_lite - * - * - 2.6 kernel patches: - * - 2.6.0-mm2 - * - dev_read_only_2.6.0.patch stores dev number, not struct block_device * - * - ext3-init-generation-2.6.0.patch - lustre dislikes when ext3 resets - * s_next_generation to 0 upon mount - * - ext3-map_inode_page-2.6.0.patch - added fix to unmap underlaying metadata - * - ext3-start_this_handle-must-return-error.patch - jbd returned 0 always: - * posssible oops - * - vfs_nointent_2.6.0-test6.patch - small contexts changes - * - invalidate_show-2.6.0.patch - port onto 2.6 - * - iopen-2.6.0-test6.patch - several fixes - * - vfs_intent_2.6.0.patch - port onto 2.5.0 - * - kernel_text_address-2.6.0.patch - * - export_symbols-2.6.0.patch - * - * - kgdb_2.6.0 series - * + * $Log: skdim.c,v $ + * Revision 1.5 2003/11/28 12:55:40 rroesler + * Fix: support for new process timing interface added + * @@ -139352,8 +138757,8 @@ #ifndef lint static const char SysKonnectFileId[] = -- "@(#) $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ (C) SysKonnect."; -+ "@(#) $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ (C) SysKonnect."; +- "@(#) $Id: skdim.c,v 1.2 2003/08/21 12:35:05 mlindner Exp $ (C) SysKonnect."; ++ "@(#) $Id: skdim.c,v 1.5 2003/11/28 12:55:40 rroesler Exp $ (C) SysKonnect."; #endif #define __SKADDR_C @@ -139376,10 +138781,10 @@ - * Name: skge.c + * Name: skge.c * Project: GEnesis, PCI Gigabit Ethernet Adapter -- * Version: $Revision: 1.1.2.1 $ -- * Date: $Date: 2004/01/09 22:31:09 $ -+ * Version: $Revision: 1.1.2.1 $ -+ * Date: $Date: 2004/01/09 22:31:09 $ +- * Version: $Revision: 1.11 $ +- * Date: $Date: 2003/08/26 16:05:19 $ ++ * Version: $Revision: 1.42 $ ++ * Date: $Date: 2003/12/12 10:05:43 $ * Purpose: The main driver source module * ******************************************************************************/ @@ -139416,42 +138821,7 @@ @@ -56,6 +41,87 @@ * History: * - * $Log: 2.6.0-mm2.patch,v $ - * Revision 1.1.2.1 2004/01/09 22:31:09 alex - * - 2.6 fixes: - * - mds_lock_new_child() uses specific namespace to avoid deadlock - * if i_generations == 0 - * - portals_debug_copy_to_user() uses kmap_atomic() instead of - * kmap() because it's called beinged locked with disabled interrupts - * - ugly hacks which prevent userspace tools to try to load modules - * - corrections in Makefiles - * - minor compatibility defines and tweaks - * - inode->c_index is used as orphans counter - * - ll_lookup_finish_locks() doesn't release intent - * because on 2.6 it may be needed several times - * - check that nd isn't NULL before using - * - ll_update_inode() decoded dev number wrong way - * - PDE define is used to retrieve procfs-related data - * - rw26.c is almost copy of rw24.c - * - super25.c registers lustre and lustre_lite - * - * - 2.6 kernel patches: - * - 2.6.0-mm2 - * - dev_read_only_2.6.0.patch stores dev number, not struct block_device * - * - ext3-init-generation-2.6.0.patch - lustre dislikes when ext3 resets - * s_next_generation to 0 upon mount - * - ext3-map_inode_page-2.6.0.patch - added fix to unmap underlaying metadata - * - ext3-start_this_handle-must-return-error.patch - jbd returned 0 always: - * posssible oops - * - vfs_nointent_2.6.0-test6.patch - small contexts changes - * - invalidate_show-2.6.0.patch - port onto 2.6 - * - iopen-2.6.0-test6.patch - several fixes - * - vfs_intent_2.6.0.patch - port onto 2.5.0 - * - kernel_text_address-2.6.0.patch - * - export_symbols-2.6.0.patch - * - * - kgdb_2.6.0 series - * + * $Log: skge.c,v $ + * Revision 1.42 2003/12/12 10:05:43 mlindner + * Fix: Format of error message corrected + * @@ -140919,12 +140289,12 @@ * * Name: skgehwt.c - * Project: Gigabit Ethernet Adapters, Common Modules -- * Version: $Revision: 1.1.2.1 $ -- * Date: $Date: 2004/01/09 22:31:09 $ +- * Version: $Revision: 1.14 $ +- * Date: $Date: 2003/05/13 18:01:58 $ - * Purpose: Hardware Timer. + * Project: Gigabit Ethernet Adapters, Event Scheduler Module -+ * Version: $Revision: 1.1.2.1 $ -+ * Date: $Date: 2004/01/09 22:31:09 $ ++ * Version: $Revision: 1.15 $ ++ * Date: $Date: 2003/09/16 13:41:23 $ + * Purpose: Hardware Timer * ******************************************************************************/ @@ -140932,42 +140302,7 @@ @@ -27,6 +27,10 @@ * History: * - * $Log: 2.6.0-mm2.patch,v $ - * Revision 1.1.2.1 2004/01/09 22:31:09 alex - * - 2.6 fixes: - * - mds_lock_new_child() uses specific namespace to avoid deadlock - * if i_generations == 0 - * - portals_debug_copy_to_user() uses kmap_atomic() instead of - * kmap() because it's called beinged locked with disabled interrupts - * - ugly hacks which prevent userspace tools to try to load modules - * - corrections in Makefiles - * - minor compatibility defines and tweaks - * - inode->c_index is used as orphans counter - * - ll_lookup_finish_locks() doesn't release intent - * because on 2.6 it may be needed several times - * - check that nd isn't NULL before using - * - ll_update_inode() decoded dev number wrong way - * - PDE define is used to retrieve procfs-related data - * - rw26.c is almost copy of rw24.c - * - super25.c registers lustre and lustre_lite - * - * - 2.6 kernel patches: - * - 2.6.0-mm2 - * - dev_read_only_2.6.0.patch stores dev number, not struct block_device * - * - ext3-init-generation-2.6.0.patch - lustre dislikes when ext3 resets - * s_next_generation to 0 upon mount - * - ext3-map_inode_page-2.6.0.patch - added fix to unmap underlaying metadata - * - ext3-start_this_handle-must-return-error.patch - jbd returned 0 always: - * posssible oops - * - vfs_nointent_2.6.0-test6.patch - small contexts changes - * - invalidate_show-2.6.0.patch - port onto 2.6 - * - iopen-2.6.0-test6.patch - several fixes - * - vfs_intent_2.6.0.patch - port onto 2.5.0 - * - kernel_text_address-2.6.0.patch - * - export_symbols-2.6.0.patch - * - * - kgdb_2.6.0 series - * + * $Log: skgehwt.c,v $ + * Revision 1.15 2003/09/16 13:41:23 rschmidt + * Added (C) Marvell to SysKonnectFileId + * Editorial changes @@ -140993,8 +140328,8 @@ + */ #if (defined(DEBUG) || ((!defined(LINT)) && (!defined(SK_SLIM)))) static const char SysKonnectFileId[] = -- "$Header: /cvsroot/cfs/lustre/kernel_patches/patches/Attic/2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $" ; -+ "@(#) $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ (C) Marvell."; +- "$Header: /usr56/projects/ge/schedule/skgehwt.c,v 1.14 2003/05/13 18:01:58 mkarl Exp $" ; ++ "@(#) $Id: skgehwt.c,v 1.15 2003/09/16 13:41:23 rschmidt Exp $ (C) Marvell."; #endif #include "h/skdrv1st.h" /* Driver Specific Definitions */ @@ -141137,52 +140472,17 @@ * * Name: skgeinit.c * Project: Gigabit Ethernet Adapters, Common Modules -- * Version: $Revision: 1.1.2.1 $ -- * Date: $Date: 2004/01/09 22:31:09 $ -+ * Version: $Revision: 1.1.2.1 $ -+ * Date: $Date: 2004/01/09 22:31:09 $ +- * Version: $Revision: 1.93 $ +- * Date: $Date: 2003/05/28 15:44:43 $ ++ * Version: $Revision: 1.97 $ ++ * Date: $Date: 2003/10/02 16:45:31 $ * Purpose: Contains functions to initialize the adapter * ******************************************************************************/ @@ -27,6 +27,32 @@ * History: * - * $Log: 2.6.0-mm2.patch,v $ - * Revision 1.1.2.1 2004/01/09 22:31:09 alex - * - 2.6 fixes: - * - mds_lock_new_child() uses specific namespace to avoid deadlock - * if i_generations == 0 - * - portals_debug_copy_to_user() uses kmap_atomic() instead of - * kmap() because it's called beinged locked with disabled interrupts - * - ugly hacks which prevent userspace tools to try to load modules - * - corrections in Makefiles - * - minor compatibility defines and tweaks - * - inode->c_index is used as orphans counter - * - ll_lookup_finish_locks() doesn't release intent - * because on 2.6 it may be needed several times - * - check that nd isn't NULL before using - * - ll_update_inode() decoded dev number wrong way - * - PDE define is used to retrieve procfs-related data - * - rw26.c is almost copy of rw24.c - * - super25.c registers lustre and lustre_lite - * - * - 2.6 kernel patches: - * - 2.6.0-mm2 - * - dev_read_only_2.6.0.patch stores dev number, not struct block_device * - * - ext3-init-generation-2.6.0.patch - lustre dislikes when ext3 resets - * s_next_generation to 0 upon mount - * - ext3-map_inode_page-2.6.0.patch - added fix to unmap underlaying metadata - * - ext3-start_this_handle-must-return-error.patch - jbd returned 0 always: - * posssible oops - * - vfs_nointent_2.6.0-test6.patch - small contexts changes - * - invalidate_show-2.6.0.patch - port onto 2.6 - * - iopen-2.6.0-test6.patch - several fixes - * - vfs_intent_2.6.0.patch - port onto 2.5.0 - * - kernel_text_address-2.6.0.patch - * - export_symbols-2.6.0.patch - * - * - kgdb_2.6.0 series - * + * $Log: skgeinit.c,v $ + * Revision 1.97 2003/10/02 16:45:31 rschmidt + * Replaced default values of GMAC parameters with defines. + * Removed hard reset of MACs in SkGeDeInit(). @@ -141216,8 +140516,8 @@ #if (defined(DEBUG) || ((!defined(LINT)) && (!defined(SK_SLIM)))) static const char SysKonnectFileId[] = -- "@(#) $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ (C) Marvell."; -+ "@(#) $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ (C) Marvell."; +- "@(#) $Id: skgeinit.c,v 1.93 2003/05/28 15:44:43 rschmidt Exp $ (C) Marvell."; ++ "@(#) $Id: skgeinit.c,v 1.97 2003/10/02 16:45:31 rschmidt Exp $ (C) Marvell."; #endif struct s_QOffTab { @@ -141330,52 +140630,17 @@ * * Name: skgemib.c * Project: GEnesis, PCI Gigabit Ethernet Adapter -- * Version: $Revision: 1.1.2.1 $ -- * Date: $Date: 2004/01/09 22:31:09 $ -+ * Version: $Revision: 1.1.2.1 $ -+ * Date: $Date: 2004/01/09 22:31:09 $ +- * Version: $Revision: 1.9 $ +- * Date: $Date: 2003/05/23 12:55:20 $ ++ * Version: $Revision: 1.11 $ ++ * Date: $Date: 2003/09/15 13:38:12 $ * Purpose: Private Network Management Interface Management Database * ****************************************************************************/ @@ -27,6 +27,19 @@ * History: * - * $Log: 2.6.0-mm2.patch,v $ - * Revision 1.1.2.1 2004/01/09 22:31:09 alex - * - 2.6 fixes: - * - mds_lock_new_child() uses specific namespace to avoid deadlock - * if i_generations == 0 - * - portals_debug_copy_to_user() uses kmap_atomic() instead of - * kmap() because it's called beinged locked with disabled interrupts - * - ugly hacks which prevent userspace tools to try to load modules - * - corrections in Makefiles - * - minor compatibility defines and tweaks - * - inode->c_index is used as orphans counter - * - ll_lookup_finish_locks() doesn't release intent - * because on 2.6 it may be needed several times - * - check that nd isn't NULL before using - * - ll_update_inode() decoded dev number wrong way - * - PDE define is used to retrieve procfs-related data - * - rw26.c is almost copy of rw24.c - * - super25.c registers lustre and lustre_lite - * - * - 2.6 kernel patches: - * - 2.6.0-mm2 - * - dev_read_only_2.6.0.patch stores dev number, not struct block_device * - * - ext3-init-generation-2.6.0.patch - lustre dislikes when ext3 resets - * s_next_generation to 0 upon mount - * - ext3-map_inode_page-2.6.0.patch - added fix to unmap underlaying metadata - * - ext3-start_this_handle-must-return-error.patch - jbd returned 0 always: - * posssible oops - * - vfs_nointent_2.6.0-test6.patch - small contexts changes - * - invalidate_show-2.6.0.patch - port onto 2.6 - * - iopen-2.6.0-test6.patch - several fixes - * - vfs_intent_2.6.0.patch - port onto 2.5.0 - * - kernel_text_address-2.6.0.patch - * - export_symbols-2.6.0.patch - * - * - kgdb_2.6.0 series - * + * $Log: skgemib.c,v $ + * Revision 1.11 2003/09/15 13:38:12 tschilli + * OID_SKGE_PHY_LP_MODE included only after using #define SK_PHY_LP_MODE. + * @@ -141456,52 +140721,17 @@ * * Name: skgepnmi.c * Project: GEnesis, PCI Gigabit Ethernet Adapter -- * Version: $Revision: 1.1.2.1 $ -- * Date: $Date: 2004/01/09 22:31:09 $ -+ * Version: $Revision: 1.1.2.1 $ -+ * Date: $Date: 2004/01/09 22:31:09 $ +- * Version: $Revision: 1.109 $ +- * Date: $Date: 2003/07/17 14:15:24 $ ++ * Version: $Revision: 1.111 $ ++ * Date: $Date: 2003/09/15 13:35:35 $ * Purpose: Private Network Management Interface * ****************************************************************************/ @@ -27,6 +27,22 @@ * History: * - * $Log: 2.6.0-mm2.patch,v $ - * Revision 1.1.2.1 2004/01/09 22:31:09 alex - * - 2.6 fixes: - * - mds_lock_new_child() uses specific namespace to avoid deadlock - * if i_generations == 0 - * - portals_debug_copy_to_user() uses kmap_atomic() instead of - * kmap() because it's called beinged locked with disabled interrupts - * - ugly hacks which prevent userspace tools to try to load modules - * - corrections in Makefiles - * - minor compatibility defines and tweaks - * - inode->c_index is used as orphans counter - * - ll_lookup_finish_locks() doesn't release intent - * because on 2.6 it may be needed several times - * - check that nd isn't NULL before using - * - ll_update_inode() decoded dev number wrong way - * - PDE define is used to retrieve procfs-related data - * - rw26.c is almost copy of rw24.c - * - super25.c registers lustre and lustre_lite - * - * - 2.6 kernel patches: - * - 2.6.0-mm2 - * - dev_read_only_2.6.0.patch stores dev number, not struct block_device * - * - ext3-init-generation-2.6.0.patch - lustre dislikes when ext3 resets - * s_next_generation to 0 upon mount - * - ext3-map_inode_page-2.6.0.patch - added fix to unmap underlaying metadata - * - ext3-start_this_handle-must-return-error.patch - jbd returned 0 always: - * posssible oops - * - vfs_nointent_2.6.0-test6.patch - small contexts changes - * - invalidate_show-2.6.0.patch - port onto 2.6 - * - iopen-2.6.0-test6.patch - several fixes - * - vfs_intent_2.6.0.patch - port onto 2.5.0 - * - kernel_text_address-2.6.0.patch - * - export_symbols-2.6.0.patch - * - * - kgdb_2.6.0 series - * + * $Log: skgepnmi.c,v $ + * Revision 1.111 2003/09/15 13:35:35 tschilli + * Code for OID_SKGE_PHY_LP_MODE completed (using #define SK_PHY_LP_MODE). + * SK_DIAG_ATTACHED handling for OID_SKGE_DIAG_MODE in DiagActions() changed. @@ -141525,8 +140755,8 @@ #ifndef _lint static const char SysKonnectFileId[] = -- "@(#) $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ (C) Marvell."; -+ "@(#) $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ (C) Marvell."; +- "@(#) $Id: skgepnmi.c,v 1.109 2003/07/17 14:15:24 tschilli Exp $ (C) Marvell."; ++ "@(#) $Id: skgepnmi.c,v 1.111 2003/09/15 13:35:35 tschilli Exp $ (C) Marvell."; #endif /* !_lint */ #include "h/skdrv1st.h" @@ -142007,52 +141237,17 @@ * * Name: skgesirq.c * Project: Gigabit Ethernet Adapters, Common Modules -- * Version: $Revision: 1.1.2.1 $ -- * Date: $Date: 2004/01/09 22:31:09 $ -+ * Version: $Revision: 1.1.2.1 $ -+ * Date: $Date: 2004/01/09 22:31:09 $ +- * Version: $Revision: 1.91 $ +- * Date: $Date: 2003/07/04 12:46:22 $ ++ * Version: $Revision: 1.92 $ ++ * Date: $Date: 2003/09/16 14:37:07 $ * Purpose: Special IRQ module * ******************************************************************************/ @@ -27,6 +27,12 @@ * History: * - * $Log: 2.6.0-mm2.patch,v $ - * Revision 1.1.2.1 2004/01/09 22:31:09 alex - * - 2.6 fixes: - * - mds_lock_new_child() uses specific namespace to avoid deadlock - * if i_generations == 0 - * - portals_debug_copy_to_user() uses kmap_atomic() instead of - * kmap() because it's called beinged locked with disabled interrupts - * - ugly hacks which prevent userspace tools to try to load modules - * - corrections in Makefiles - * - minor compatibility defines and tweaks - * - inode->c_index is used as orphans counter - * - ll_lookup_finish_locks() doesn't release intent - * because on 2.6 it may be needed several times - * - check that nd isn't NULL before using - * - ll_update_inode() decoded dev number wrong way - * - PDE define is used to retrieve procfs-related data - * - rw26.c is almost copy of rw24.c - * - super25.c registers lustre and lustre_lite - * - * - 2.6 kernel patches: - * - 2.6.0-mm2 - * - dev_read_only_2.6.0.patch stores dev number, not struct block_device * - * - ext3-init-generation-2.6.0.patch - lustre dislikes when ext3 resets - * s_next_generation to 0 upon mount - * - ext3-map_inode_page-2.6.0.patch - added fix to unmap underlaying metadata - * - ext3-start_this_handle-must-return-error.patch - jbd returned 0 always: - * posssible oops - * - vfs_nointent_2.6.0-test6.patch - small contexts changes - * - invalidate_show-2.6.0.patch - port onto 2.6 - * - iopen-2.6.0-test6.patch - several fixes - * - vfs_intent_2.6.0.patch - port onto 2.5.0 - * - kernel_text_address-2.6.0.patch - * - export_symbols-2.6.0.patch - * - * - kgdb_2.6.0 series - * + * $Log: skgesirq.c,v $ + * Revision 1.92 2003/09/16 14:37:07 rschmidt + * Added debug messages in some SkGePortCheckUp...() routines. + * Fixed compiler warnings for different types. @@ -142066,8 +141261,8 @@ #if (defined(DEBUG) || ((!defined(LINT)) && (!defined(SK_SLIM)))) static const char SysKonnectFileId[] = -- "@(#) $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ (C) Marvell."; -+ "@(#) $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ (C) Marvell."; +- "@(#) $Id: skgesirq.c,v 1.91 2003/07/04 12:46:22 rschmidt Exp $ (C) Marvell."; ++ "@(#) $Id: skgesirq.c,v 1.92 2003/09/16 14:37:07 rschmidt Exp $ (C) Marvell."; #endif #include "h/skdrv1st.h" /* Driver Specific Definitions */ @@ -142258,11 +141453,11 @@ * * Name: ski2c.c - * Project: GEnesis, PCI Gigabit Ethernet Adapter -- * Version: $Revision: 1.1.2.1 $ -- * Date: $Date: 2004/01/09 22:31:09 $ +- * Version: $Revision: 1.57 $ +- * Date: $Date: 2003/01/28 09:17:38 $ + * Project: Gigabit Ethernet Adapters, TWSI-Module -+ * Version: $Revision: 1.1.2.1 $ -+ * Date: $Date: 2004/01/09 22:31:09 $ ++ * Version: $Revision: 1.59 $ ++ * Date: $Date: 2003/10/20 09:07:25 $ * Purpose: Functions to access Voltage and Temperature Sensor * ******************************************************************************/ @@ -142278,42 +141473,7 @@ @@ -26,6 +27,14 @@ * History: * - * $Log: 2.6.0-mm2.patch,v $ - * Revision 1.1.2.1 2004/01/09 22:31:09 alex - * - 2.6 fixes: - * - mds_lock_new_child() uses specific namespace to avoid deadlock - * if i_generations == 0 - * - portals_debug_copy_to_user() uses kmap_atomic() instead of - * kmap() because it's called beinged locked with disabled interrupts - * - ugly hacks which prevent userspace tools to try to load modules - * - corrections in Makefiles - * - minor compatibility defines and tweaks - * - inode->c_index is used as orphans counter - * - ll_lookup_finish_locks() doesn't release intent - * because on 2.6 it may be needed several times - * - check that nd isn't NULL before using - * - ll_update_inode() decoded dev number wrong way - * - PDE define is used to retrieve procfs-related data - * - rw26.c is almost copy of rw24.c - * - super25.c registers lustre and lustre_lite - * - * - 2.6 kernel patches: - * - 2.6.0-mm2 - * - dev_read_only_2.6.0.patch stores dev number, not struct block_device * - * - ext3-init-generation-2.6.0.patch - lustre dislikes when ext3 resets - * s_next_generation to 0 upon mount - * - ext3-map_inode_page-2.6.0.patch - added fix to unmap underlaying metadata - * - ext3-start_this_handle-must-return-error.patch - jbd returned 0 always: - * posssible oops - * - vfs_nointent_2.6.0-test6.patch - small contexts changes - * - invalidate_show-2.6.0.patch - port onto 2.6 - * - iopen-2.6.0-test6.patch - several fixes - * - vfs_intent_2.6.0.patch - port onto 2.5.0 - * - kernel_text_address-2.6.0.patch - * - export_symbols-2.6.0.patch - * - * - kgdb_2.6.0 series - * + * $Log: ski2c.c,v $ + * Revision 1.59 2003/10/20 09:07:25 rschmidt + * Added cast SK_U32 in SkI2cWrite() to avoid compiler warning. + * Editorial changes. @@ -142338,8 +141498,8 @@ */ +#if (defined(DEBUG) || ((!defined(LINT)) && (!defined(SK_SLIM)))) static const char SysKonnectFileId[] = -- "$Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $"; -+ "@(#) $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ (C) Marvell. "; +- "$Id: ski2c.c,v 1.57 2003/01/28 09:17:38 rschmidt Exp $"; ++ "@(#) $Id: ski2c.c,v 1.59 2003/10/20 09:07:25 rschmidt Exp $ (C) Marvell. "; +#endif #include "h/skdrv1st.h" /* Driver Specific Definitions */ @@ -142650,12 +141810,12 @@ * * Name: sklm80.c - * Project: GEnesis, PCI Gigabit Ethernet Adapter -- * Version: $Revision: 1.1.2.1 $ -- * Date: $Date: 2004/01/09 22:31:09 $ +- * Version: $Revision: 1.20 $ +- * Date: $Date: 2002/08/13 09:16:27 $ - * Purpose: Funktions to access Voltage and Temperature Sensor (LM80) + * Project: Gigabit Ethernet Adapters, TWSI-Module -+ * Version: $Revision: 1.1.2.1 $ -+ * Date: $Date: 2004/01/09 22:31:09 $ ++ * Version: $Revision: 1.22 $ ++ * Date: $Date: 2003/10/20 09:08:21 $ + * Purpose: Functions to access Voltage and Temperature Sensor (LM80) * ******************************************************************************/ @@ -142671,42 +141831,7 @@ @@ -26,15 +27,21 @@ * History: * - * $Log: 2.6.0-mm2.patch,v $ - * Revision 1.1.2.1 2004/01/09 22:31:09 alex - * - 2.6 fixes: - * - mds_lock_new_child() uses specific namespace to avoid deadlock - * if i_generations == 0 - * - portals_debug_copy_to_user() uses kmap_atomic() instead of - * kmap() because it's called beinged locked with disabled interrupts - * - ugly hacks which prevent userspace tools to try to load modules - * - corrections in Makefiles - * - minor compatibility defines and tweaks - * - inode->c_index is used as orphans counter - * - ll_lookup_finish_locks() doesn't release intent - * because on 2.6 it may be needed several times - * - check that nd isn't NULL before using - * - ll_update_inode() decoded dev number wrong way - * - PDE define is used to retrieve procfs-related data - * - rw26.c is almost copy of rw24.c - * - super25.c registers lustre and lustre_lite - * - * - 2.6 kernel patches: - * - 2.6.0-mm2 - * - dev_read_only_2.6.0.patch stores dev number, not struct block_device * - * - ext3-init-generation-2.6.0.patch - lustre dislikes when ext3 resets - * s_next_generation to 0 upon mount - * - ext3-map_inode_page-2.6.0.patch - added fix to unmap underlaying metadata - * - ext3-start_this_handle-must-return-error.patch - jbd returned 0 always: - * posssible oops - * - vfs_nointent_2.6.0-test6.patch - small contexts changes - * - invalidate_show-2.6.0.patch - port onto 2.6 - * - iopen-2.6.0-test6.patch - several fixes - * - vfs_intent_2.6.0.patch - port onto 2.5.0 - * - kernel_text_address-2.6.0.patch - * - export_symbols-2.6.0.patch - * - * - kgdb_2.6.0 series - * + * $Log: sklm80.c,v $ + * Revision 1.22 2003/10/20 09:08:21 rschmidt + * Editorial changes. + * @@ -142742,8 +141867,8 @@ */ +#if (defined(DEBUG) || ((!defined(LINT)) && (!defined(SK_SLIM)))) static const char SysKonnectFileId[] = -- "$Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $" ; -+ "@(#) $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ (C) Marvell. "; +- "$Id: sklm80.c,v 1.20 2002/08/13 09:16:27 rschmidt Exp $" ; ++ "@(#) $Id: sklm80.c,v 1.22 2003/10/20 09:08:21 rschmidt Exp $ (C) Marvell. "; +#endif #include "h/skdrv1st.h" /* Driver Specific Definitions */ @@ -142779,10 +141904,10 @@ - * Name: skproc.c + * Name: skproc.c * Project: GEnesis, PCI Gigabit Ethernet Adapter -- * Version: $Revision: 1.1.2.1 $ -- * Date: $Date: 2004/01/09 22:31:09 $ -+ * Version: $Revision: 1.1.2.1 $ -+ * Date: $Date: 2004/01/09 22:31:09 $ +- * Version: $Revision: 1.2 $ +- * Date: $Date: 2003/08/12 16:45:29 $ ++ * Version: $Revision: 1.11 $ ++ * Date: $Date: 2003/12/11 16:03:57 $ * Purpose: Funktions to display statictic data * ******************************************************************************/ @@ -142798,42 +141923,7 @@ @@ -28,6 +29,33 @@ * History: * - * $Log: 2.6.0-mm2.patch,v $ - * Revision 1.1.2.1 2004/01/09 22:31:09 alex - * - 2.6 fixes: - * - mds_lock_new_child() uses specific namespace to avoid deadlock - * if i_generations == 0 - * - portals_debug_copy_to_user() uses kmap_atomic() instead of - * kmap() because it's called beinged locked with disabled interrupts - * - ugly hacks which prevent userspace tools to try to load modules - * - corrections in Makefiles - * - minor compatibility defines and tweaks - * - inode->c_index is used as orphans counter - * - ll_lookup_finish_locks() doesn't release intent - * because on 2.6 it may be needed several times - * - check that nd isn't NULL before using - * - ll_update_inode() decoded dev number wrong way - * - PDE define is used to retrieve procfs-related data - * - rw26.c is almost copy of rw24.c - * - super25.c registers lustre and lustre_lite - * - * - 2.6 kernel patches: - * - 2.6.0-mm2 - * - dev_read_only_2.6.0.patch stores dev number, not struct block_device * - * - ext3-init-generation-2.6.0.patch - lustre dislikes when ext3 resets - * s_next_generation to 0 upon mount - * - ext3-map_inode_page-2.6.0.patch - added fix to unmap underlaying metadata - * - ext3-start_this_handle-must-return-error.patch - jbd returned 0 always: - * posssible oops - * - vfs_nointent_2.6.0-test6.patch - small contexts changes - * - invalidate_show-2.6.0.patch - port onto 2.6 - * - iopen-2.6.0-test6.patch - several fixes - * - vfs_intent_2.6.0.patch - port onto 2.5.0 - * - kernel_text_address-2.6.0.patch - * - export_symbols-2.6.0.patch - * - * - kgdb_2.6.0 series - * + * $Log: skproc.c,v $ + * Revision 1.11 2003/12/11 16:03:57 mlindner + * Fix: Create backup from pnmi data structure + * @@ -143425,53 +142515,18 @@ * * Name: skqueue.c - * Project: Gigabit Ethernet Adapters, Schedule-Modul -- * Version: $Revision: 1.1.2.1 $ -- * Date: $Date: 2004/01/09 22:31:09 $ +- * Version: $Revision: 1.19 $ +- * Date: $Date: 2003/05/13 18:00:07 $ + * Project: Gigabit Ethernet Adapters, Event Scheduler Module -+ * Version: $Revision: 1.1.2.1 $ -+ * Date: $Date: 2004/01/09 22:31:09 $ ++ * Version: $Revision: 1.20 $ ++ * Date: $Date: 2003/09/16 13:44:00 $ * Purpose: Management of an event queue. * ******************************************************************************/ @@ -27,6 +27,10 @@ * History: * - * $Log: 2.6.0-mm2.patch,v $ - * Revision 1.1.2.1 2004/01/09 22:31:09 alex - * - 2.6 fixes: - * - mds_lock_new_child() uses specific namespace to avoid deadlock - * if i_generations == 0 - * - portals_debug_copy_to_user() uses kmap_atomic() instead of - * kmap() because it's called beinged locked with disabled interrupts - * - ugly hacks which prevent userspace tools to try to load modules - * - corrections in Makefiles - * - minor compatibility defines and tweaks - * - inode->c_index is used as orphans counter - * - ll_lookup_finish_locks() doesn't release intent - * because on 2.6 it may be needed several times - * - check that nd isn't NULL before using - * - ll_update_inode() decoded dev number wrong way - * - PDE define is used to retrieve procfs-related data - * - rw26.c is almost copy of rw24.c - * - super25.c registers lustre and lustre_lite - * - * - 2.6 kernel patches: - * - 2.6.0-mm2 - * - dev_read_only_2.6.0.patch stores dev number, not struct block_device * - * - ext3-init-generation-2.6.0.patch - lustre dislikes when ext3 resets - * s_next_generation to 0 upon mount - * - ext3-map_inode_page-2.6.0.patch - added fix to unmap underlaying metadata - * - ext3-start_this_handle-must-return-error.patch - jbd returned 0 always: - * posssible oops - * - vfs_nointent_2.6.0-test6.patch - small contexts changes - * - invalidate_show-2.6.0.patch - port onto 2.6 - * - iopen-2.6.0-test6.patch - several fixes - * - vfs_intent_2.6.0.patch - port onto 2.5.0 - * - kernel_text_address-2.6.0.patch - * - export_symbols-2.6.0.patch - * - * - kgdb_2.6.0 series - * + * $Log: skqueue.c,v $ + * Revision 1.20 2003/09/16 13:44:00 rschmidt + * Added (C) Marvell to SysKonnectFileId + * Editorial changes @@ -143496,8 +142551,8 @@ + */ #if (defined(DEBUG) || ((!defined(LINT)) && (!defined(SK_SLIM)))) static const char SysKonnectFileId[] = -- "$Header: /cvsroot/cfs/lustre/kernel_patches/patches/Attic/2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $" ; -+ "@(#) $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ (C) Marvell."; +- "$Header: /usr56/projects/ge/schedule/skqueue.c,v 1.19 2003/05/13 18:00:07 mkarl Exp $" ; ++ "@(#) $Id: skqueue.c,v 1.20 2003/09/16 13:44:00 rschmidt Exp $ (C) Marvell."; #endif #include "h/skdrv1st.h" /* Driver Specific Definitions */ @@ -143666,53 +142721,18 @@ * * Name: sktimer.c - * Project: Gigabit Ethernet Adapters, Schedule-Modul -- * Version: $Revision: 1.1.2.1 $ -- * Date: $Date: 2004/01/09 22:31:09 $ +- * Version: $Revision: 1.13 $ +- * Date: $Date: 2003/05/13 18:01:01 $ + * Project: Gigabit Ethernet Adapters, Event Scheduler Module -+ * Version: $Revision: 1.1.2.1 $ -+ * Date: $Date: 2004/01/09 22:31:09 $ ++ * Version: $Revision: 1.14 $ ++ * Date: $Date: 2003/09/16 13:46:51 $ * Purpose: High level timer functions. * ******************************************************************************/ @@ -27,6 +27,10 @@ * History: * - * $Log: 2.6.0-mm2.patch,v $ - * Revision 1.1.2.1 2004/01/09 22:31:09 alex - * - 2.6 fixes: - * - mds_lock_new_child() uses specific namespace to avoid deadlock - * if i_generations == 0 - * - portals_debug_copy_to_user() uses kmap_atomic() instead of - * kmap() because it's called beinged locked with disabled interrupts - * - ugly hacks which prevent userspace tools to try to load modules - * - corrections in Makefiles - * - minor compatibility defines and tweaks - * - inode->c_index is used as orphans counter - * - ll_lookup_finish_locks() doesn't release intent - * because on 2.6 it may be needed several times - * - check that nd isn't NULL before using - * - ll_update_inode() decoded dev number wrong way - * - PDE define is used to retrieve procfs-related data - * - rw26.c is almost copy of rw24.c - * - super25.c registers lustre and lustre_lite - * - * - 2.6 kernel patches: - * - 2.6.0-mm2 - * - dev_read_only_2.6.0.patch stores dev number, not struct block_device * - * - ext3-init-generation-2.6.0.patch - lustre dislikes when ext3 resets - * s_next_generation to 0 upon mount - * - ext3-map_inode_page-2.6.0.patch - added fix to unmap underlaying metadata - * - ext3-start_this_handle-must-return-error.patch - jbd returned 0 always: - * posssible oops - * - vfs_nointent_2.6.0-test6.patch - small contexts changes - * - invalidate_show-2.6.0.patch - port onto 2.6 - * - iopen-2.6.0-test6.patch - several fixes - * - vfs_intent_2.6.0.patch - port onto 2.5.0 - * - kernel_text_address-2.6.0.patch - * - export_symbols-2.6.0.patch - * - * - kgdb_2.6.0 series - * + * $Log: sktimer.c,v $ + * Revision 1.14 2003/09/16 13:46:51 rschmidt + * Added (C) Marvell to SysKonnectFileId + * Editorial changes @@ -143738,8 +142758,8 @@ + */ #if (defined(DEBUG) || ((!defined(LINT)) && (!defined(SK_SLIM)))) static const char SysKonnectFileId[] = -- "$Header: /cvsroot/cfs/lustre/kernel_patches/patches/Attic/2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $" ; -+ "@(#) $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ (C) Marvell."; +- "$Header: /usr56/projects/ge/schedule/sktimer.c,v 1.13 2003/05/13 18:01:01 mkarl Exp $" ; ++ "@(#) $Id: sktimer.c,v 1.14 2003/09/16 13:46:51 rschmidt Exp $ (C) Marvell."; #endif #include "h/skdrv1st.h" /* Driver Specific Definitions */ @@ -143988,52 +143008,17 @@ * * Name: skxmac2.c * Project: Gigabit Ethernet Adapters, Common Modules -- * Version: $Revision: 1.1.2.1 $ -- * Date: $Date: 2004/01/09 22:31:09 $ -+ * Version: $Revision: 1.1.2.1 $ -+ * Date: $Date: 2004/01/09 22:31:09 $ +- * Version: $Revision: 1.99 $ +- * Date: $Date: 2003/07/11 12:19:33 $ ++ * Version: $Revision: 1.102 $ ++ * Date: $Date: 2003/10/02 16:53:58 $ * Purpose: Contains functions to initialize the MACs and PHYs * ******************************************************************************/ @@ -27,6 +27,23 @@ * History: * - * $Log: 2.6.0-mm2.patch,v $ - * Revision 1.1.2.1 2004/01/09 22:31:09 alex - * - 2.6 fixes: - * - mds_lock_new_child() uses specific namespace to avoid deadlock - * if i_generations == 0 - * - portals_debug_copy_to_user() uses kmap_atomic() instead of - * kmap() because it's called beinged locked with disabled interrupts - * - ugly hacks which prevent userspace tools to try to load modules - * - corrections in Makefiles - * - minor compatibility defines and tweaks - * - inode->c_index is used as orphans counter - * - ll_lookup_finish_locks() doesn't release intent - * because on 2.6 it may be needed several times - * - check that nd isn't NULL before using - * - ll_update_inode() decoded dev number wrong way - * - PDE define is used to retrieve procfs-related data - * - rw26.c is almost copy of rw24.c - * - super25.c registers lustre and lustre_lite - * - * - 2.6 kernel patches: - * - 2.6.0-mm2 - * - dev_read_only_2.6.0.patch stores dev number, not struct block_device * - * - ext3-init-generation-2.6.0.patch - lustre dislikes when ext3 resets - * s_next_generation to 0 upon mount - * - ext3-map_inode_page-2.6.0.patch - added fix to unmap underlaying metadata - * - ext3-start_this_handle-must-return-error.patch - jbd returned 0 always: - * posssible oops - * - vfs_nointent_2.6.0-test6.patch - small contexts changes - * - invalidate_show-2.6.0.patch - port onto 2.6 - * - iopen-2.6.0-test6.patch - several fixes - * - vfs_intent_2.6.0.patch - port onto 2.5.0 - * - kernel_text_address-2.6.0.patch - * - export_symbols-2.6.0.patch - * - * - kgdb_2.6.0 series - * + * $Log: skxmac2.c,v $ + * Revision 1.102 2003/10/02 16:53:58 rschmidt + * Changed setting of GMAC parameters with new macros. + * Added define SLIM around SkGm...LowPowerMode(). @@ -144067,8 +143052,8 @@ #if (defined(DEBUG) || ((!defined(LINT)) && (!defined(SK_SLIM)))) static const char SysKonnectFileId[] = -- "@(#) $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ (C) Marvell."; -+ "@(#) $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ (C) Marvell."; +- "@(#) $Id: skxmac2.c,v 1.99 2003/07/11 12:19:33 rschmidt Exp $ (C) Marvell."; ++ "@(#) $Id: skxmac2.c,v 1.102 2003/10/02 16:53:58 rschmidt Exp $ (C) Marvell."; #endif #ifdef GENESIS @@ -158041,10 +157026,10 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * -- * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ +- * $Id: //depot/aic7xxx/aic7xxx/aic7770.c#30 $ - * - * $FreeBSD$ -+ * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ ++ * $Id: //depot/aic7xxx/aic7xxx/aic7770.c#34 $ */ #ifdef __linux__ @@ -158104,8 +157089,8 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * -- * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ -+ * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ +- * $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic7770_osm.c#13 $ ++ * $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic7770_osm.c#16 $ */ #include "aic7xxx_osm.h" @@ -158360,10 +157345,10 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * -- * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ +- * $Id: //depot/aic7xxx/aic7xxx/aic79xx.c#194 $ - * - * $FreeBSD$ -+ * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ ++ * $Id: //depot/aic7xxx/aic7xxx/aic79xx.c#224 $ */ #ifdef __linux__ @@ -160939,8 +159924,8 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * -- * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ -+ * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ +- * $Id: //depot/aic7xxx/aic7xxx/aic79xx.h#90 $ ++ * $Id: //depot/aic7xxx/aic7xxx/aic79xx.h#101 $ * * $FreeBSD$ */ @@ -161166,8 +160151,8 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * -- * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ -+ * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ +- * $Id: //depot/aic7xxx/aic7xxx/aic79xx_inline.h#50 $ ++ * $Id: //depot/aic7xxx/aic7xxx/aic79xx_inline.h#55 $ * * $FreeBSD$ */ @@ -161425,8 +160410,8 @@ /* * Adaptec AIC79xx device driver for Linux. * -- * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ -+ * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ +- * $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic79xx_osm.c#169 $ ++ * $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic79xx_osm.c#193 $ * * -------------------------------------------------------------------------- * Copyright (c) 1994-2000 Justin T. Gibbs. @@ -164402,8 +163387,8 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * -- * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ -+ * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ +- * $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic79xx_osm.h#133 $ ++ * $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic79xx_osm.h#153 $ * */ #ifndef _AIC79XX_LINUX_H_ @@ -165455,8 +164440,8 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * -- * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ -+ * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ +- * $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic79xx_osm_pci.c#23 $ ++ * $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic79xx_osm_pci.c#29 $ */ #include "aic79xx_osm.h" @@ -165769,10 +164754,10 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * -- * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ +- * $Id: //depot/aic7xxx/aic7xxx/aic79xx_pci.c#73 $ - * - * $FreeBSD$ -+ * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ ++ * $Id: //depot/aic7xxx/aic7xxx/aic79xx_pci.c#84 $ */ #ifdef __linux__ @@ -166183,8 +165168,8 @@ * String handling code courtesy of Gerard Roudier's * sym driver. * -- * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ -+ * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ +- * $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic79xx_proc.c#17 $ ++ * $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic79xx_proc.c#20 $ */ #include "aic79xx_osm.h" #include "aic79xx_inline.h" @@ -166262,8 +165247,8 @@ * * $FreeBSD$ */ --VERSION = "$Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $" -+VERSION = "$Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $" +-VERSION = "$Id: //depot/aic7xxx/aic7xxx/aic79xx.reg#69 $" ++VERSION = "$Id: //depot/aic7xxx/aic7xxx/aic79xx.reg#70 $" /* * This file is processed by the aic7xxx_asm utility for use in assembling @@ -166354,10 +165339,10 @@ * DO NOT EDIT - This file is automatically generated * from the following source files: * -- * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ -- * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ -+ * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ -+ * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ +- * $Id: //depot/aic7xxx/aic7xxx/aic79xx.seq#94 $ +- * $Id: //depot/aic7xxx/aic7xxx/aic79xx.reg#69 $ ++ * $Id: //depot/aic7xxx/aic7xxx/aic79xx.seq#107 $ ++ * $Id: //depot/aic7xxx/aic7xxx/aic79xx.reg#70 $ */ typedef int (ahd_reg_print_t)(u_int, u_int *, u_int); typedef struct ahd_reg_parse_entry { @@ -166593,10 +165578,10 @@ * DO NOT EDIT - This file is automatically generated * from the following source files: * -- * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ -- * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ -+ * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ -+ * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ +- * $Id: //depot/aic7xxx/aic7xxx/aic79xx.seq#93 $ +- * $Id: //depot/aic7xxx/aic7xxx/aic79xx.reg#68 $ ++ * $Id: //depot/aic7xxx/aic7xxx/aic79xx.seq#107 $ ++ * $Id: //depot/aic7xxx/aic7xxx/aic79xx.reg#70 $ */ #include "aic79xx_osm.h" @@ -166795,8 +165780,8 @@ * $FreeBSD$ */ --VERSION = "$Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $" -+VERSION = "$Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $" +-VERSION = "$Id: //depot/aic7xxx/aic7xxx/aic79xx.seq#94 $" ++VERSION = "$Id: //depot/aic7xxx/aic7xxx/aic79xx.seq#107 $" PATCH_ARG_LIST = "struct ahd_softc *ahd" PREFIX = "ahd_" @@ -167143,10 +166128,10 @@ * DO NOT EDIT - This file is automatically generated * from the following source files: * -- * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ -- * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ -+ * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ -+ * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ +- * $Id: //depot/aic7xxx/aic7xxx/aic79xx.seq#94 $ +- * $Id: //depot/aic7xxx/aic7xxx/aic79xx.reg#69 $ ++ * $Id: //depot/aic7xxx/aic7xxx/aic79xx.seq#107 $ ++ * $Id: //depot/aic7xxx/aic7xxx/aic79xx.reg#70 $ */ static uint8_t seqprog[] = { 0xff, 0x02, 0x06, 0x78, @@ -168438,10 +167423,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * -- * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ +- * $Id: //depot/aic7xxx/aic7xxx/aic7xxx_93cx6.c#17 $ - * - * $FreeBSD$ -+ * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ ++ * $Id: //depot/aic7xxx/aic7xxx/aic7xxx_93cx6.c#19 $ */ /* @@ -168530,10 +167515,10 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * -- * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ +- * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.c#131 $ - * - * $FreeBSD$ -+ * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ ++ * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.c#147 $ */ #ifdef __linux__ @@ -169831,8 +168816,8 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * -- * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ -+ * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ +- * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.h#77 $ ++ * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.h#85 $ * * $FreeBSD$ */ @@ -169994,8 +168979,8 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * -- * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ -+ * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ +- * $Id: //depot/aic7xxx/aic7xxx/aic7xxx_inline.h#43 $ ++ * $Id: //depot/aic7xxx/aic7xxx/aic7xxx_inline.h#47 $ * * $FreeBSD$ */ @@ -170111,8 +169096,8 @@ /* * Adaptec AIC7xxx device driver for Linux. * -- * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ -+ * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ +- * $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic7xxx_osm.c#232 $ ++ * $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic7xxx_osm.c#256 $ * * Copyright (c) 1994 John Aycock * The University of Calgary Department of Computer Science. @@ -173077,8 +172062,8 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * -- * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ -+ * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ +- * $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic7xxx_osm.h#147 $ ++ * $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic7xxx_osm.h#166 $ * */ #ifndef _AIC7XXX_LINUX_H_ @@ -174084,8 +173069,8 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * -- * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ -+ * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ +- * $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c#45 $ ++ * $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c#52 $ */ #include "aic7xxx_osm.h" @@ -174387,10 +173372,10 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * -- * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ +- * $Id: //depot/aic7xxx/aic7xxx/aic7xxx_pci.c#66 $ - * - * $FreeBSD$ -+ * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ ++ * $Id: //depot/aic7xxx/aic7xxx/aic7xxx_pci.c#78 $ */ #ifdef __linux__ @@ -174987,8 +173972,8 @@ * String handling code courtesy of Gerard Roudier's * sym driver. * -- * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ -+ * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ +- * $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic7xxx_proc.c#27 $ ++ * $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic7xxx_proc.c#32 $ */ #include "aic7xxx_osm.h" #include "aic7xxx_inline.h" @@ -175094,8 +174079,8 @@ * * $FreeBSD$ */ --VERSION = "$Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $" -+VERSION = "$Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $" +-VERSION = "$Id: //depot/aic7xxx/aic7xxx/aic7xxx.reg#39 $" ++VERSION = "$Id: //depot/aic7xxx/aic7xxx/aic7xxx.reg#40 $" /* * This file is processed by the aic7xxx_asm utility for use in assembling @@ -175121,10 +174106,10 @@ * DO NOT EDIT - This file is automatically generated * from the following source files: * -- * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ -- * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ -+ * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ -+ * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ +- * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.seq#56 $ +- * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.reg#39 $ ++ * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.seq#58 $ ++ * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.reg#40 $ */ typedef int (ahc_reg_print_t)(u_int, u_int *, u_int); typedef struct ahc_reg_parse_entry { @@ -175150,10 +174135,10 @@ * DO NOT EDIT - This file is automatically generated * from the following source files: * -- * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ -- * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ -+ * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ -+ * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ +- * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.seq#54 $ +- * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.reg#38 $ ++ * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.seq#58 $ ++ * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.reg#40 $ */ #include "aic7xxx_osm.h" @@ -175225,8 +174210,8 @@ * $FreeBSD$ */ --VERSION = "$Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $" -+VERSION = "$Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $" +-VERSION = "$Id: //depot/aic7xxx/aic7xxx/aic7xxx.seq#56 $" ++VERSION = "$Id: //depot/aic7xxx/aic7xxx/aic7xxx.seq#58 $" PATCH_ARG_LIST = "struct ahc_softc *ahc" PREFIX = "ahc_" @@ -175253,10 +174238,10 @@ * DO NOT EDIT - This file is automatically generated * from the following source files: * -- * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ -- * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ -+ * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ -+ * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ +- * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.seq#56 $ +- * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.reg#39 $ ++ * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.seq#58 $ ++ * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.reg#40 $ */ static uint8_t seqprog[] = { 0xb2, 0x00, 0x00, 0x08, @@ -176641,8 +175626,8 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * -- * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ -+ * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ +- * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm.c#22 $ ++ * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm.c#23 $ * * $FreeBSD$ */ @@ -176693,8 +175678,8 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * -- * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ -+ * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ +- * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm_macro_scan.l#7 $ ++ * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm_macro_scan.l#8 $ * * $FreeBSD$ */ @@ -176712,8 +175697,8 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * -- * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ -+ * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ +- * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm_scan.l#18 $ ++ * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm_scan.l#19 $ * * $FreeBSD$ */ @@ -176786,7 +175771,7 @@ --- linux-2.6.0/drivers/scsi/aic7xxx/aiclib.c 2003-07-27 12:14:39.000000000 -0700 +++ 25/drivers/scsi/aic7xxx/aiclib.c 2003-12-28 23:21:40.000000000 -0800 @@ -30,16 +30,6 @@ - * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ + * $Id$ */ -#include @@ -178506,7 +177491,7 @@ + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGES. + * -+ * $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ ++ * $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic79xx_osm_pci.c#25 $ + */ + +void @@ -178552,8 +177537,8 @@ @@ -1,18 +1,16 @@ # # AIC7XXX and AIC79XX 2.5.X Kernel configuration File. --# $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ -+# $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ +-# $Id: //depot/linux-aic79xx-2.5.0/drivers/scsi/aic7xxx/Kconfig.aic7xxx#6 $ ++# $Id: //depot/linux-aic79xx-2.5.0/drivers/scsi/aic7xxx/Kconfig.aic7xxx#8 $ # config SCSI_AIC7XXX tristate "Adaptec AIC7xxx Fast -> U160 support (New Driver)" @@ -178585,8 +177570,8 @@ # # Makefile for the Linux aic7xxx SCSI driver. # --# $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ -+# $Id: 2.6.0-mm2.patch,v 1.1.2.1 2004/01/09 22:31:09 alex Exp $ +-# $Id: //depot/linux-aic79xx-2.5.0/drivers/scsi/aic7xxx/Makefile#6 $ ++# $Id: //depot/linux-aic79xx-2.5.0/drivers/scsi/aic7xxx/Makefile#8 $ # # Let kbuild descend into aicasm when cleaning -- 1.8.3.1